From c0c9cf858c4637dd64c1efd9d5812a35f3a240e7 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 2 Nov 2017 11:39:03 -0400 Subject: [PATCH 001/685] Fix MembershipListener test --- test/MembershipListenerTest.js | 64 ++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index a448f49ae..e83ac8c5a 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -1,7 +1,7 @@ var HazelcastClient = require('../.').Client; var Controller = require('./RC'); -var assert = require('chai').assert; -var sinon = require('sinon'); +var expect = require('chai').expect; +var Promise = require('bluebird'); describe('MembershipListener', function() { this.timeout(10000); var cluster; @@ -30,47 +30,60 @@ describe('MembershipListener', function() { }); it('sees member added event', function(done) { - var memberAddedSpy = sinon.spy(); var newMember; - client.clusterService.on('memberAdded', memberAddedSpy); + var err = undefined; + var listenerCalledResolver = Promise.defer(); + + client.clusterService.on('memberAdded', function (member) { + listenerCalledResolver.resolve(member); + }); + Controller.startMember(cluster.id).then(function(res) { newMember = res; - assert.isTrue(memberAddedSpy.calledOnce); - assert.equal(memberAddedSpy.getCall(0).args[0].address.host, newMember.host); - assert.equal(memberAddedSpy.getCall(0).args[0].address.port, newMember.port); - }).catch(function(err) { - done(err); - }).finally(function() { + return listenerCalledResolver.promise; + }).then(function (addedMember) { + expect(addedMember.address.host).to.equal(newMember.host); + expect(addedMember.address.port).to.equal(newMember.port); + }).catch(function (e) { + err = e; + }).finally(function(e) { Controller.shutdownMember(cluster.id, newMember.uuid).then(function() { - done(); + done(err); }); }); + }); it('sees member removed event', function(done) { - var memberRemovedSpy = sinon.spy(); var newMember; - client.clusterService.on('memberRemoved', memberRemovedSpy); + var listenerCalledResolver = Promise.defer(); + + client.clusterService.on('memberRemoved', function (member) { + listenerCalledResolver.resolve(member); + }); + Controller.startMember(cluster.id).then(function(res) { newMember = res; return Controller.shutdownMember(cluster.id, newMember.uuid); }).then(function() { - assert.isTrue(memberRemovedSpy.calledOnce); - assert.equal(memberRemovedSpy.getCall(0).args[0].address.host, newMember.host); - assert.equal(memberRemovedSpy.getCall(0).args[0].address.port, newMember.port); - done(); - }).catch(function(err) { - done(err); + return listenerCalledResolver.promise; + }).then(function(removedMember) { + try { + expect(removedMember.address.host).to.equal(newMember.host); + expect(removedMember.address.port).to.equal(newMember.port); + done(); + } catch (e) { + done(e); + } }); }); it('sees member attribute change put event', function(done) { client.clusterService.on('memberAttributeChange', function(uuid, key, op, value) { if(op === 'put') { - assert.equal(uuid, member.uuid); - assert.equal(key, 'test'); - assert.equal(op, 'put'); - assert.equal(value, '123'); + expect(uuid).to.equal(member.uuid); + expect(key).to.equal('test'); + expect(value).to.equal('123'); done(); } }); @@ -82,9 +95,8 @@ describe('MembershipListener', function() { it('sees member attribute change remove event', function(done) { client.clusterService.on('memberAttributeChange', function(uuid, key, op, value) { if (op === 'remove') { - assert.equal(uuid, member.uuid); - assert.equal(key, 'test'); - assert.equal(op, 'remove'); + expect(uuid).to.equal(member.uuid); + expect(key, 'test'); done(); } }); From 89ca2721b60ad1cca55ae9597b39012d1678bd9e Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 2 Nov 2017 14:06:12 -0400 Subject: [PATCH 002/685] update tsdoc --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 341eaab16..0d9372ce6 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "rimraf": "2.6.2", "sinon": "4.0.0", "tslint": "5.7.0", - "typedoc": "0.5.0", + "typedoc": "0.9.0", "typescript": "2.5.2", "winston": "2.3.1" }, @@ -35,7 +35,7 @@ "coverage": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "coverage-all": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", - "generate-docs": "rimraf docs && typedoc --out docs/ --exclude **/codec/**/* --module commonjs src/ node_modules/@types/node/index.d.ts node_modules/typescript/lib/lib.es2015.d.ts --excludeExternals", + "generate-docs": "rimraf docs && typedoc --out docs/ --exclude **/codec/**/* --module commonjs src/ --excludeExternals", "lint": "tslint --project tsconfig.json -t stylish" }, "repository": { From c3cc7314337c64ab2de545334a22d575125be744 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 2 Nov 2017 14:37:39 -0400 Subject: [PATCH 003/685] Revert "update tsdoc" This reverts commit 1acadad --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0d9372ce6..341eaab16 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "rimraf": "2.6.2", "sinon": "4.0.0", "tslint": "5.7.0", - "typedoc": "0.9.0", + "typedoc": "0.5.0", "typescript": "2.5.2", "winston": "2.3.1" }, @@ -35,7 +35,7 @@ "coverage": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "coverage-all": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", - "generate-docs": "rimraf docs && typedoc --out docs/ --exclude **/codec/**/* --module commonjs src/ --excludeExternals", + "generate-docs": "rimraf docs && typedoc --out docs/ --exclude **/codec/**/* --module commonjs src/ node_modules/@types/node/index.d.ts node_modules/typescript/lib/lib.es2015.d.ts --excludeExternals", "lint": "tslint --project tsconfig.json -t stylish" }, "repository": { From 1641c6cfaddeaa5ed69cacc6828159c72ea5187b Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 2 Nov 2017 14:52:57 -0400 Subject: [PATCH 004/685] remove unreasonable timeout from nearcache test beforeEach hook --- test/nearcache/NearCacheTest.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/nearcache/NearCacheTest.js b/test/nearcache/NearCacheTest.js index 150a18cbc..28f497bf9 100644 --- a/test/nearcache/NearCacheTest.js +++ b/test/nearcache/NearCacheTest.js @@ -128,7 +128,6 @@ describe('NearCacheImpl', function() { var nearCache; beforeEach(function () { - this.timeout(50); nearCache = new NearCacheImpl(testConfig, createSerializationService()); }); From 5e8dec9494332d5e36980e1f8ad0729ddfcdd4a4 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 2 Nov 2017 15:48:12 -0400 Subject: [PATCH 005/685] ListenersOnReconnect test fails due to timeout at cleanup phase(not related to test, only remote-controlle shutdown). Increases timeout --- test/ListenersOnReconnectTest.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 89c37444d..58781a438 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -19,7 +19,7 @@ describe('Listeners on reconnect', function () { }); afterEach(function() { - this.timeout(20000); + this.timeout(30000); client.shutdown(); return Controller.shutdownCluster(cluster.id); }); @@ -76,7 +76,7 @@ describe('Listeners on reconnect', function () { * - the other unrelated connection */ - it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it.only('kill two members [1,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.terminateMember); }); From 8c60a4f438e4ff716588bfa6c4ae3de5733bc308 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 3 Nov 2017 08:37:12 -0400 Subject: [PATCH 006/685] undo .only on listenersonreconnect test --- test/ListenersOnReconnectTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 58781a438..f6da6d7c5 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -76,7 +76,7 @@ describe('Listeners on reconnect', function () { * - the other unrelated connection */ - it.only('kill two members [1,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.terminateMember); }); From 478967657fa03924d75ade30b0099db0891da397 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 3 Nov 2017 09:34:14 -0400 Subject: [PATCH 007/685] 0.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 341eaab16..cd69418a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hazelcast-client", - "version": "0.6.1", + "version": "0.6.2", "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", "main": "lib/index.js", "dependencies": { From 29419257221cb616f07673fe5bf51bd02b8ab8da Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 3 Nov 2017 10:05:51 -0400 Subject: [PATCH 008/685] update readme with new docs link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6bb4786b5..97f1f0559 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. -You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.6.1/docs/). +You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.6.2/docs/). # Serialization Considerations From e35ad6f3e8469c3f47acf1e32f1ebfae7b608d15 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 3 Nov 2017 10:19:51 -0400 Subject: [PATCH 009/685] create-build-info.js uses sync mkdir --- create-build-info.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/create-build-info.js b/create-build-info.js index e6fa54e7b..49d7b9c7b 100644 --- a/create-build-info.js +++ b/create-build-info.js @@ -1,5 +1,3 @@ -const buildInfoTs = 'src/BuildInfo.ts'; - var fs = require('fs'); var pjson = require('./package.json'); var tsjon = require('./tsconfig.json'); @@ -16,6 +14,6 @@ var infoExport = 'module.exports = ' + JSON.stringify(buildInfo) + ';'; if (!fs.existsSync(libDir)) { - fs.mkdir(libDir); + fs.mkdirSync(libDir); } fs.writeFileSync(libDir + '/BuildInfo.js', infoExport); From cd9aed0255a655fa444275b60e7acb3d2ac15542 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 6 Nov 2017 22:44:27 -0500 Subject: [PATCH 010/685] compatibility-fix --- src/codec/AtomicLongAddAndGetCodec.ts | 9 ++++++--- src/codec/AtomicLongAlterAndGetCodec.ts | 9 ++++++--- src/codec/AtomicLongApplyCodec.ts | 9 ++++++--- src/codec/AtomicLongCompareAndSetCodec.ts | 9 ++++++--- src/codec/AtomicLongDecrementAndGetCodec.ts | 9 ++++++--- src/codec/AtomicLongGetAndAddCodec.ts | 9 ++++++--- src/codec/AtomicLongGetAndAlterCodec.ts | 9 ++++++--- src/codec/AtomicLongGetAndIncrementCodec.ts | 9 ++++++--- src/codec/AtomicLongGetAndSetCodec.ts | 9 ++++++--- src/codec/AtomicLongGetCodec.ts | 9 ++++++--- src/codec/AtomicLongIncrementAndGetCodec.ts | 9 ++++++--- src/codec/AtomicReferenceAlterAndGetCodec.ts | 9 ++++++--- src/codec/AtomicReferenceApplyCodec.ts | 9 ++++++--- src/codec/AtomicReferenceCompareAndSetCodec.ts | 9 ++++++--- src/codec/AtomicReferenceContainsCodec.ts | 9 ++++++--- src/codec/AtomicReferenceGetAndAlterCodec.ts | 9 ++++++--- src/codec/AtomicReferenceGetAndSetCodec.ts | 9 ++++++--- src/codec/AtomicReferenceGetCodec.ts | 9 ++++++--- src/codec/AtomicReferenceIsNullCodec.ts | 9 ++++++--- src/codec/AtomicReferenceSetAndGetCodec.ts | 9 ++++++--- src/codec/CacheAddEntryListenerCodec.ts | 9 ++++++--- src/codec/CacheAddInvalidationListenerCodec.ts | 9 ++++++--- ...CacheAddNearCacheInvalidationListenerCodec.ts | 12 +++++++++--- src/codec/CacheAddPartitionLostListenerCodec.ts | 9 ++++++--- src/codec/CacheAssignAndGetUuidsCodec.ts | 12 +++++++++--- src/codec/CacheContainsKeyCodec.ts | 9 ++++++--- src/codec/CacheCreateConfigCodec.ts | 9 ++++++--- src/codec/CacheEntryProcessorCodec.ts | 9 ++++++--- src/codec/CacheEventJournalReadCodec.ts | 16 +++++++++++++--- src/codec/CacheEventJournalSubscribeCodec.ts | 14 +++++++++++--- ...cheFetchNearCacheInvalidationMetadataCodec.ts | 14 +++++++++++--- src/codec/CacheGetAllCodec.ts | 9 ++++++--- src/codec/CacheGetAndRemoveCodec.ts | 9 ++++++--- src/codec/CacheGetAndReplaceCodec.ts | 9 ++++++--- src/codec/CacheGetCodec.ts | 9 ++++++--- src/codec/CacheGetConfigCodec.ts | 9 ++++++--- src/codec/CacheIterateCodec.ts | 11 ++++++++--- src/codec/CacheIterateEntriesCodec.ts | 14 +++++++++++--- src/codec/CachePutCodec.ts | 9 ++++++--- src/codec/CachePutIfAbsentCodec.ts | 9 ++++++--- src/codec/CacheRemoveCodec.ts | 9 ++++++--- src/codec/CacheRemoveEntryListenerCodec.ts | 9 ++++++--- .../CacheRemoveInvalidationListenerCodec.ts | 9 ++++++--- .../CacheRemovePartitionLostListenerCodec.ts | 9 ++++++--- src/codec/CacheReplaceCodec.ts | 9 ++++++--- src/codec/CacheSizeCodec.ts | 9 ++++++--- src/codec/CardinalityEstimatorEstimateCodec.ts | 12 +++++++++--- .../ClientAddDistributedObjectListenerCodec.ts | 9 ++++++--- src/codec/ClientAddMembershipListenerCodec.ts | 9 ++++++--- src/codec/ClientAddPartitionLostListenerCodec.ts | 9 ++++++--- src/codec/ClientAuthenticationCodec.ts | 14 ++++++++++++-- src/codec/ClientAuthenticationCustomCodec.ts | 14 ++++++++++++-- src/codec/ClientGetDistributedObjectsCodec.ts | 9 ++++++--- src/codec/ClientGetPartitionsCodec.ts | 14 +++++++++++--- ...ClientRemoveDistributedObjectListenerCodec.ts | 9 ++++++--- .../ClientRemovePartitionLostListenerCodec.ts | 9 ++++++--- src/codec/ConditionAwaitCodec.ts | 9 ++++++--- src/codec/ContinuousQueryAddListenerCodec.ts | 9 ++++++--- src/codec/ContinuousQueryDestroyCacheCodec.ts | 9 ++++++--- src/codec/ContinuousQueryMadePublishableCodec.ts | 9 ++++++--- src/codec/ContinuousQueryPublisherCreateCodec.ts | 9 ++++++--- ...ntinuousQueryPublisherCreateWithValueCodec.ts | 9 ++++++--- src/codec/ContinuousQuerySetReadCursorCodec.ts | 9 ++++++--- src/codec/CountDownLatchAwaitCodec.ts | 9 ++++++--- src/codec/CountDownLatchGetCountCodec.ts | 9 ++++++--- src/codec/CountDownLatchTrySetCountCodec.ts | 9 ++++++--- src/codec/DurableExecutorIsShutdownCodec.ts | 12 +++++++++--- ...rableExecutorRetrieveAndDisposeResultCodec.ts | 12 +++++++++--- src/codec/DurableExecutorRetrieveResultCodec.ts | 12 +++++++++--- .../DurableExecutorSubmitToPartitionCodec.ts | 12 +++++++++--- src/codec/ExecutorServiceCancelOnAddressCodec.ts | 9 ++++++--- .../ExecutorServiceCancelOnPartitionCodec.ts | 9 ++++++--- src/codec/ExecutorServiceIsShutdownCodec.ts | 9 ++++++--- src/codec/ExecutorServiceSubmitToAddressCodec.ts | 9 ++++++--- .../ExecutorServiceSubmitToPartitionCodec.ts | 9 ++++++--- src/codec/ListAddAllCodec.ts | 9 ++++++--- src/codec/ListAddAllWithIndexCodec.ts | 9 ++++++--- src/codec/ListAddCodec.ts | 9 ++++++--- src/codec/ListAddListenerCodec.ts | 9 ++++++--- src/codec/ListCompareAndRemoveAllCodec.ts | 9 ++++++--- src/codec/ListCompareAndRetainAllCodec.ts | 9 ++++++--- src/codec/ListContainsAllCodec.ts | 9 ++++++--- src/codec/ListContainsCodec.ts | 9 ++++++--- src/codec/ListGetAllCodec.ts | 9 ++++++--- src/codec/ListGetCodec.ts | 9 ++++++--- src/codec/ListIndexOfCodec.ts | 9 ++++++--- src/codec/ListIsEmptyCodec.ts | 9 ++++++--- src/codec/ListIteratorCodec.ts | 9 ++++++--- src/codec/ListLastIndexOfCodec.ts | 9 ++++++--- src/codec/ListListIteratorCodec.ts | 9 ++++++--- src/codec/ListRemoveCodec.ts | 9 ++++++--- src/codec/ListRemoveListenerCodec.ts | 9 ++++++--- src/codec/ListRemoveWithIndexCodec.ts | 9 ++++++--- src/codec/ListSetCodec.ts | 9 ++++++--- src/codec/ListSizeCodec.ts | 9 ++++++--- src/codec/ListSubCodec.ts | 9 ++++++--- src/codec/LockGetLockCountCodec.ts | 9 ++++++--- src/codec/LockGetRemainingLeaseTimeCodec.ts | 9 ++++++--- src/codec/LockIsLockedByCurrentThreadCodec.ts | 9 ++++++--- src/codec/LockIsLockedCodec.ts | 9 ++++++--- src/codec/LockTryLockCodec.ts | 9 ++++++--- src/codec/MapAddEntryListenerCodec.ts | 9 ++++++--- src/codec/MapAddEntryListenerToKeyCodec.ts | 9 ++++++--- ...MapAddEntryListenerToKeyWithPredicateCodec.ts | 9 ++++++--- .../MapAddEntryListenerWithPredicateCodec.ts | 9 ++++++--- src/codec/MapAddInterceptorCodec.ts | 9 ++++++--- src/codec/MapAddNearCacheEntryListenerCodec.ts | 9 ++++++--- .../MapAddNearCacheInvalidationListenerCodec.ts | 12 +++++++++--- src/codec/MapAddPartitionLostListenerCodec.ts | 9 ++++++--- src/codec/MapAggregateCodec.ts | 12 +++++++++--- src/codec/MapAggregateWithPredicateCodec.ts | 12 +++++++++--- src/codec/MapAssignAndGetUuidsCodec.ts | 12 +++++++++--- src/codec/MapContainsKeyCodec.ts | 9 ++++++--- src/codec/MapContainsValueCodec.ts | 9 ++++++--- src/codec/MapEntriesWithPagingPredicateCodec.ts | 9 ++++++--- src/codec/MapEntriesWithPredicateCodec.ts | 9 ++++++--- src/codec/MapEntrySetCodec.ts | 9 ++++++--- src/codec/MapEventJournalReadCodec.ts | 16 +++++++++++++--- src/codec/MapEventJournalSubscribeCodec.ts | 14 +++++++++++--- src/codec/MapEvictCodec.ts | 9 ++++++--- src/codec/MapExecuteOnAllKeysCodec.ts | 9 ++++++--- src/codec/MapExecuteOnKeyCodec.ts | 9 ++++++--- src/codec/MapExecuteOnKeysCodec.ts | 9 ++++++--- src/codec/MapExecuteWithPredicateCodec.ts | 9 ++++++--- src/codec/MapFetchEntriesCodec.ts | 14 +++++++++++--- src/codec/MapFetchKeysCodec.ts | 14 +++++++++++--- ...MapFetchNearCacheInvalidationMetadataCodec.ts | 14 +++++++++++--- src/codec/MapFetchWithQueryCodec.ts | 14 +++++++++++--- src/codec/MapGetAllCodec.ts | 9 ++++++--- src/codec/MapGetCodec.ts | 9 ++++++--- src/codec/MapGetEntryViewCodec.ts | 9 ++++++--- src/codec/MapIsEmptyCodec.ts | 9 ++++++--- src/codec/MapIsLockedCodec.ts | 9 ++++++--- src/codec/MapKeySetCodec.ts | 9 ++++++--- src/codec/MapKeySetWithPagingPredicateCodec.ts | 9 ++++++--- src/codec/MapKeySetWithPredicateCodec.ts | 9 ++++++--- src/codec/MapProjectCodec.ts | 12 +++++++++--- src/codec/MapProjectWithPredicateCodec.ts | 12 +++++++++--- src/codec/MapPutCodec.ts | 9 ++++++--- src/codec/MapPutIfAbsentCodec.ts | 9 ++++++--- src/codec/MapReduceCancelCodec.ts | 9 ++++++--- src/codec/MapReduceForCustomCodec.ts | 9 ++++++--- src/codec/MapReduceForListCodec.ts | 9 ++++++--- src/codec/MapReduceForMapCodec.ts | 9 ++++++--- src/codec/MapReduceForMultiMapCodec.ts | 9 ++++++--- src/codec/MapReduceForSetCodec.ts | 9 ++++++--- src/codec/MapReduceJobProcessInformationCodec.ts | 11 ++++++++--- src/codec/MapRemoveCodec.ts | 9 ++++++--- src/codec/MapRemoveEntryListenerCodec.ts | 9 ++++++--- src/codec/MapRemoveIfSameCodec.ts | 9 ++++++--- src/codec/MapRemoveInterceptorCodec.ts | 9 ++++++--- src/codec/MapRemovePartitionLostListenerCodec.ts | 9 ++++++--- src/codec/MapReplaceCodec.ts | 9 ++++++--- src/codec/MapReplaceIfSameCodec.ts | 9 ++++++--- src/codec/MapSizeCodec.ts | 9 ++++++--- src/codec/MapSubmitToKeyCodec.ts | 9 ++++++--- src/codec/MapTryLockCodec.ts | 9 ++++++--- src/codec/MapTryPutCodec.ts | 9 ++++++--- src/codec/MapTryRemoveCodec.ts | 9 ++++++--- src/codec/MapValuesCodec.ts | 9 ++++++--- src/codec/MapValuesWithPagingPredicateCodec.ts | 9 ++++++--- src/codec/MapValuesWithPredicateCodec.ts | 9 ++++++--- src/codec/MultiMapAddEntryListenerCodec.ts | 9 ++++++--- src/codec/MultiMapAddEntryListenerToKeyCodec.ts | 9 ++++++--- src/codec/MultiMapContainsEntryCodec.ts | 9 ++++++--- src/codec/MultiMapContainsKeyCodec.ts | 9 ++++++--- src/codec/MultiMapContainsValueCodec.ts | 9 ++++++--- src/codec/MultiMapEntrySetCodec.ts | 9 ++++++--- src/codec/MultiMapGetCodec.ts | 9 ++++++--- src/codec/MultiMapIsLockedCodec.ts | 9 ++++++--- src/codec/MultiMapKeySetCodec.ts | 9 ++++++--- src/codec/MultiMapPutCodec.ts | 9 ++++++--- src/codec/MultiMapRemoveCodec.ts | 9 ++++++--- src/codec/MultiMapRemoveEntryCodec.ts | 9 ++++++--- src/codec/MultiMapRemoveEntryListenerCodec.ts | 9 ++++++--- src/codec/MultiMapSizeCodec.ts | 9 ++++++--- src/codec/MultiMapTryLockCodec.ts | 9 ++++++--- src/codec/MultiMapValueCountCodec.ts | 9 ++++++--- src/codec/MultiMapValuesCodec.ts | 9 ++++++--- src/codec/QueueAddAllCodec.ts | 9 ++++++--- src/codec/QueueAddListenerCodec.ts | 9 ++++++--- src/codec/QueueCompareAndRemoveAllCodec.ts | 9 ++++++--- src/codec/QueueCompareAndRetainAllCodec.ts | 9 ++++++--- src/codec/QueueContainsAllCodec.ts | 9 ++++++--- src/codec/QueueContainsCodec.ts | 9 ++++++--- src/codec/QueueDrainToCodec.ts | 9 ++++++--- src/codec/QueueDrainToMaxSizeCodec.ts | 9 ++++++--- src/codec/QueueIsEmptyCodec.ts | 9 ++++++--- src/codec/QueueIteratorCodec.ts | 9 ++++++--- src/codec/QueueOfferCodec.ts | 9 ++++++--- src/codec/QueuePeekCodec.ts | 9 ++++++--- src/codec/QueuePollCodec.ts | 9 ++++++--- src/codec/QueueRemainingCapacityCodec.ts | 9 ++++++--- src/codec/QueueRemoveCodec.ts | 9 ++++++--- src/codec/QueueRemoveListenerCodec.ts | 9 ++++++--- src/codec/QueueSizeCodec.ts | 9 ++++++--- src/codec/QueueTakeCodec.ts | 9 ++++++--- src/codec/ReplicatedMapAddEntryListenerCodec.ts | 9 ++++++--- .../ReplicatedMapAddEntryListenerToKeyCodec.ts | 9 ++++++--- ...MapAddEntryListenerToKeyWithPredicateCodec.ts | 9 ++++++--- ...catedMapAddEntryListenerWithPredicateCodec.ts | 9 ++++++--- ...eplicatedMapAddNearCacheEntryListenerCodec.ts | 9 ++++++--- src/codec/ReplicatedMapContainsKeyCodec.ts | 9 ++++++--- src/codec/ReplicatedMapContainsValueCodec.ts | 9 ++++++--- src/codec/ReplicatedMapEntrySetCodec.ts | 9 ++++++--- src/codec/ReplicatedMapGetCodec.ts | 9 ++++++--- src/codec/ReplicatedMapIsEmptyCodec.ts | 9 ++++++--- src/codec/ReplicatedMapKeySetCodec.ts | 9 ++++++--- src/codec/ReplicatedMapPutCodec.ts | 9 ++++++--- src/codec/ReplicatedMapRemoveCodec.ts | 9 ++++++--- .../ReplicatedMapRemoveEntryListenerCodec.ts | 9 ++++++--- src/codec/ReplicatedMapSizeCodec.ts | 9 ++++++--- src/codec/ReplicatedMapValuesCodec.ts | 9 ++++++--- src/codec/RingbufferAddAllCodec.ts | 9 ++++++--- src/codec/RingbufferAddCodec.ts | 9 ++++++--- src/codec/RingbufferCapacityCodec.ts | 9 ++++++--- src/codec/RingbufferHeadSequenceCodec.ts | 9 ++++++--- src/codec/RingbufferReadManyCodec.ts | 13 ++++++++++--- src/codec/RingbufferReadOneCodec.ts | 9 ++++++--- src/codec/RingbufferRemainingCapacityCodec.ts | 9 ++++++--- src/codec/RingbufferSizeCodec.ts | 9 ++++++--- src/codec/RingbufferTailSequenceCodec.ts | 9 ++++++--- .../ScheduledExecutorCancelFromAddressCodec.ts | 12 +++++++++--- .../ScheduledExecutorCancelFromPartitionCodec.ts | 12 +++++++++--- ...heduledExecutorGetAllScheduledFuturesCodec.ts | 12 +++++++++--- .../ScheduledExecutorGetDelayFromAddressCodec.ts | 12 +++++++++--- ...cheduledExecutorGetDelayFromPartitionCodec.ts | 12 +++++++++--- ...ScheduledExecutorGetResultFromAddressCodec.ts | 12 +++++++++--- ...heduledExecutorGetResultFromPartitionCodec.ts | 12 +++++++++--- .../ScheduledExecutorGetStatsFromAddressCodec.ts | 11 +++++++++-- ...cheduledExecutorGetStatsFromPartitionCodec.ts | 11 +++++++++-- ...heduledExecutorIsCancelledFromAddressCodec.ts | 12 +++++++++--- ...duledExecutorIsCancelledFromPartitionCodec.ts | 12 +++++++++--- .../ScheduledExecutorIsDoneFromAddressCodec.ts | 12 +++++++++--- .../ScheduledExecutorIsDoneFromPartitionCodec.ts | 12 +++++++++--- src/codec/SemaphoreAvailablePermitsCodec.ts | 9 ++++++--- src/codec/SemaphoreDrainPermitsCodec.ts | 9 ++++++--- src/codec/SemaphoreInitCodec.ts | 9 ++++++--- src/codec/SemaphoreTryAcquireCodec.ts | 9 ++++++--- src/codec/SetAddAllCodec.ts | 9 ++++++--- src/codec/SetAddCodec.ts | 9 ++++++--- src/codec/SetAddListenerCodec.ts | 9 ++++++--- src/codec/SetCompareAndRemoveAllCodec.ts | 9 ++++++--- src/codec/SetCompareAndRetainAllCodec.ts | 9 ++++++--- src/codec/SetContainsAllCodec.ts | 9 ++++++--- src/codec/SetContainsCodec.ts | 9 ++++++--- src/codec/SetGetAllCodec.ts | 9 ++++++--- src/codec/SetIsEmptyCodec.ts | 9 ++++++--- src/codec/SetRemoveCodec.ts | 9 ++++++--- src/codec/SetRemoveListenerCodec.ts | 9 ++++++--- src/codec/SetSizeCodec.ts | 9 ++++++--- src/codec/TopicAddMessageListenerCodec.ts | 9 ++++++--- src/codec/TopicRemoveMessageListenerCodec.ts | 9 ++++++--- src/codec/TransactionCreateCodec.ts | 9 ++++++--- src/codec/TransactionalListAddCodec.ts | 9 ++++++--- src/codec/TransactionalListRemoveCodec.ts | 9 ++++++--- src/codec/TransactionalListSizeCodec.ts | 9 ++++++--- src/codec/TransactionalMapContainsKeyCodec.ts | 9 ++++++--- src/codec/TransactionalMapGetCodec.ts | 9 ++++++--- src/codec/TransactionalMapGetForUpdateCodec.ts | 9 ++++++--- src/codec/TransactionalMapIsEmptyCodec.ts | 9 ++++++--- src/codec/TransactionalMapKeySetCodec.ts | 9 ++++++--- .../TransactionalMapKeySetWithPredicateCodec.ts | 9 ++++++--- src/codec/TransactionalMapPutCodec.ts | 9 ++++++--- src/codec/TransactionalMapPutIfAbsentCodec.ts | 9 ++++++--- src/codec/TransactionalMapRemoveCodec.ts | 9 ++++++--- src/codec/TransactionalMapRemoveIfSameCodec.ts | 9 ++++++--- src/codec/TransactionalMapReplaceCodec.ts | 9 ++++++--- src/codec/TransactionalMapReplaceIfSameCodec.ts | 9 ++++++--- src/codec/TransactionalMapSizeCodec.ts | 9 ++++++--- src/codec/TransactionalMapValuesCodec.ts | 9 ++++++--- .../TransactionalMapValuesWithPredicateCodec.ts | 9 ++++++--- src/codec/TransactionalMultiMapGetCodec.ts | 9 ++++++--- src/codec/TransactionalMultiMapPutCodec.ts | 9 ++++++--- src/codec/TransactionalMultiMapRemoveCodec.ts | 9 ++++++--- .../TransactionalMultiMapRemoveEntryCodec.ts | 9 ++++++--- src/codec/TransactionalMultiMapSizeCodec.ts | 9 ++++++--- .../TransactionalMultiMapValueCountCodec.ts | 9 ++++++--- src/codec/TransactionalQueueOfferCodec.ts | 9 ++++++--- src/codec/TransactionalQueuePeekCodec.ts | 9 ++++++--- src/codec/TransactionalQueuePollCodec.ts | 9 ++++++--- src/codec/TransactionalQueueSizeCodec.ts | 9 ++++++--- src/codec/TransactionalQueueTakeCodec.ts | 9 ++++++--- src/codec/TransactionalSetAddCodec.ts | 9 ++++++--- src/codec/TransactionalSetRemoveCodec.ts | 9 ++++++--- src/codec/TransactionalSetSizeCodec.ts | 9 ++++++--- .../XATransactionCollectTransactionsCodec.ts | 9 ++++++--- src/codec/XATransactionCreateCodec.ts | 9 ++++++--- 288 files changed, 1885 insertions(+), 860 deletions(-) diff --git a/src/codec/AtomicLongAddAndGetCodec.ts b/src/codec/AtomicLongAddAndGetCodec.ts index b39c22741..e1ead4abb 100644 --- a/src/codec/AtomicLongAddAndGetCodec.ts +++ b/src/codec/AtomicLongAddAndGetCodec.ts @@ -38,11 +38,14 @@ export class AtomicLongAddAndGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongAlterAndGetCodec.ts b/src/codec/AtomicLongAlterAndGetCodec.ts index 8939afcca..ea7e740ad 100644 --- a/src/codec/AtomicLongAlterAndGetCodec.ts +++ b/src/codec/AtomicLongAlterAndGetCodec.ts @@ -38,11 +38,14 @@ export class AtomicLongAlterAndGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongApplyCodec.ts b/src/codec/AtomicLongApplyCodec.ts index f876f990a..da940bfb2 100644 --- a/src/codec/AtomicLongApplyCodec.ts +++ b/src/codec/AtomicLongApplyCodec.ts @@ -38,14 +38,17 @@ export class AtomicLongApplyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongCompareAndSetCodec.ts b/src/codec/AtomicLongCompareAndSetCodec.ts index a8c987a33..33ed413a0 100644 --- a/src/codec/AtomicLongCompareAndSetCodec.ts +++ b/src/codec/AtomicLongCompareAndSetCodec.ts @@ -40,11 +40,14 @@ export class AtomicLongCompareAndSetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongDecrementAndGetCodec.ts b/src/codec/AtomicLongDecrementAndGetCodec.ts index 1cd5c2f4f..c279333f6 100644 --- a/src/codec/AtomicLongDecrementAndGetCodec.ts +++ b/src/codec/AtomicLongDecrementAndGetCodec.ts @@ -36,11 +36,14 @@ export class AtomicLongDecrementAndGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongGetAndAddCodec.ts b/src/codec/AtomicLongGetAndAddCodec.ts index 8d4c8904d..1b3091fa4 100644 --- a/src/codec/AtomicLongGetAndAddCodec.ts +++ b/src/codec/AtomicLongGetAndAddCodec.ts @@ -38,11 +38,14 @@ export class AtomicLongGetAndAddCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongGetAndAlterCodec.ts b/src/codec/AtomicLongGetAndAlterCodec.ts index ba5f23fc1..d44aa2165 100644 --- a/src/codec/AtomicLongGetAndAlterCodec.ts +++ b/src/codec/AtomicLongGetAndAlterCodec.ts @@ -38,11 +38,14 @@ export class AtomicLongGetAndAlterCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongGetAndIncrementCodec.ts b/src/codec/AtomicLongGetAndIncrementCodec.ts index 961b231b7..e5c92f133 100644 --- a/src/codec/AtomicLongGetAndIncrementCodec.ts +++ b/src/codec/AtomicLongGetAndIncrementCodec.ts @@ -36,11 +36,14 @@ export class AtomicLongGetAndIncrementCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongGetAndSetCodec.ts b/src/codec/AtomicLongGetAndSetCodec.ts index 182acca7f..1c3e6d5fa 100644 --- a/src/codec/AtomicLongGetAndSetCodec.ts +++ b/src/codec/AtomicLongGetAndSetCodec.ts @@ -38,11 +38,14 @@ export class AtomicLongGetAndSetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongGetCodec.ts b/src/codec/AtomicLongGetCodec.ts index 7997006d3..3dd5f7d77 100644 --- a/src/codec/AtomicLongGetCodec.ts +++ b/src/codec/AtomicLongGetCodec.ts @@ -36,11 +36,14 @@ export class AtomicLongGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicLongIncrementAndGetCodec.ts b/src/codec/AtomicLongIncrementAndGetCodec.ts index 55727832e..f8d9c63d9 100644 --- a/src/codec/AtomicLongIncrementAndGetCodec.ts +++ b/src/codec/AtomicLongIncrementAndGetCodec.ts @@ -36,11 +36,14 @@ export class AtomicLongIncrementAndGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceAlterAndGetCodec.ts b/src/codec/AtomicReferenceAlterAndGetCodec.ts index 6439ff09c..ccc6efea2 100644 --- a/src/codec/AtomicReferenceAlterAndGetCodec.ts +++ b/src/codec/AtomicReferenceAlterAndGetCodec.ts @@ -38,14 +38,17 @@ export class AtomicReferenceAlterAndGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceApplyCodec.ts b/src/codec/AtomicReferenceApplyCodec.ts index dca50203d..0aeca4257 100644 --- a/src/codec/AtomicReferenceApplyCodec.ts +++ b/src/codec/AtomicReferenceApplyCodec.ts @@ -38,14 +38,17 @@ export class AtomicReferenceApplyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceCompareAndSetCodec.ts b/src/codec/AtomicReferenceCompareAndSetCodec.ts index 672b0de8b..13c45b319 100644 --- a/src/codec/AtomicReferenceCompareAndSetCodec.ts +++ b/src/codec/AtomicReferenceCompareAndSetCodec.ts @@ -52,11 +52,14 @@ export class AtomicReferenceCompareAndSetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceContainsCodec.ts b/src/codec/AtomicReferenceContainsCodec.ts index 72fddd19e..a367a5086 100644 --- a/src/codec/AtomicReferenceContainsCodec.ts +++ b/src/codec/AtomicReferenceContainsCodec.ts @@ -44,11 +44,14 @@ export class AtomicReferenceContainsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceGetAndAlterCodec.ts b/src/codec/AtomicReferenceGetAndAlterCodec.ts index 5ff4e6dfe..72f8bd512 100644 --- a/src/codec/AtomicReferenceGetAndAlterCodec.ts +++ b/src/codec/AtomicReferenceGetAndAlterCodec.ts @@ -38,14 +38,17 @@ export class AtomicReferenceGetAndAlterCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceGetAndSetCodec.ts b/src/codec/AtomicReferenceGetAndSetCodec.ts index 8f1659666..6a4a7d768 100644 --- a/src/codec/AtomicReferenceGetAndSetCodec.ts +++ b/src/codec/AtomicReferenceGetAndSetCodec.ts @@ -44,14 +44,17 @@ export class AtomicReferenceGetAndSetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceGetCodec.ts b/src/codec/AtomicReferenceGetCodec.ts index 9db2acbbc..0f8fa67c2 100644 --- a/src/codec/AtomicReferenceGetCodec.ts +++ b/src/codec/AtomicReferenceGetCodec.ts @@ -36,14 +36,17 @@ export class AtomicReferenceGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceIsNullCodec.ts b/src/codec/AtomicReferenceIsNullCodec.ts index ee9d4e562..9fe063485 100644 --- a/src/codec/AtomicReferenceIsNullCodec.ts +++ b/src/codec/AtomicReferenceIsNullCodec.ts @@ -36,11 +36,14 @@ export class AtomicReferenceIsNullCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/AtomicReferenceSetAndGetCodec.ts b/src/codec/AtomicReferenceSetAndGetCodec.ts index 2735bd147..e9af3ff85 100644 --- a/src/codec/AtomicReferenceSetAndGetCodec.ts +++ b/src/codec/AtomicReferenceSetAndGetCodec.ts @@ -44,14 +44,17 @@ export class AtomicReferenceSetAndGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheAddEntryListenerCodec.ts b/src/codec/CacheAddEntryListenerCodec.ts index 1d41606ed..f3cf94238 100644 --- a/src/codec/CacheAddEntryListenerCodec.ts +++ b/src/codec/CacheAddEntryListenerCodec.ts @@ -38,11 +38,14 @@ export class CacheAddEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventCache: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/CacheAddInvalidationListenerCodec.ts b/src/codec/CacheAddInvalidationListenerCodec.ts index 88e12fb70..6f68dc1a6 100644 --- a/src/codec/CacheAddInvalidationListenerCodec.ts +++ b/src/codec/CacheAddInvalidationListenerCodec.ts @@ -38,11 +38,14 @@ export class CacheAddInvalidationListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventCacheinvalidation: any, handleEventCachebatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/CacheAddNearCacheInvalidationListenerCodec.ts b/src/codec/CacheAddNearCacheInvalidationListenerCodec.ts index fd376a79e..da4d30da0 100644 --- a/src/codec/CacheAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/CacheAddNearCacheInvalidationListenerCodec.ts @@ -38,11 +38,17 @@ export class CacheAddNearCacheInvalidationListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventCacheinvalidation: any, handleEventCachebatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/CacheAddPartitionLostListenerCodec.ts b/src/codec/CacheAddPartitionLostListenerCodec.ts index 4c69865e5..ee67df8cc 100644 --- a/src/codec/CacheAddPartitionLostListenerCodec.ts +++ b/src/codec/CacheAddPartitionLostListenerCodec.ts @@ -38,11 +38,14 @@ export class CacheAddPartitionLostListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventCachepartitionlost: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/CacheAssignAndGetUuidsCodec.ts b/src/codec/CacheAssignAndGetUuidsCodec.ts index 85ef4c27b..ed900eb9d 100644 --- a/src/codec/CacheAssignAndGetUuidsCodec.ts +++ b/src/codec/CacheAssignAndGetUuidsCodec.ts @@ -34,8 +34,14 @@ export class CacheAssignAndGetUuidsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'partitionUuidList': null}; + // Decode response from client message + var parameters: any = { + 'partitionUuidList': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var partitionUuidListSize = clientMessage.readInt32(); var partitionUuidList: any = []; @@ -49,8 +55,8 @@ export class CacheAssignAndGetUuidsCodec { partitionUuidList.push(partitionUuidListItem) } parameters['partitionUuidList'] = partitionUuidList; - return parameters; + return parameters; } diff --git a/src/codec/CacheContainsKeyCodec.ts b/src/codec/CacheContainsKeyCodec.ts index 9c84fca93..6082becd0 100644 --- a/src/codec/CacheContainsKeyCodec.ts +++ b/src/codec/CacheContainsKeyCodec.ts @@ -38,11 +38,14 @@ export class CacheContainsKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CacheCreateConfigCodec.ts b/src/codec/CacheCreateConfigCodec.ts index 73f3d953b..ffe3232ed 100644 --- a/src/codec/CacheCreateConfigCodec.ts +++ b/src/codec/CacheCreateConfigCodec.ts @@ -38,14 +38,17 @@ export class CacheCreateConfigCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheEntryProcessorCodec.ts b/src/codec/CacheEntryProcessorCodec.ts index ad40b377a..deeca2c2a 100644 --- a/src/codec/CacheEntryProcessorCodec.ts +++ b/src/codec/CacheEntryProcessorCodec.ts @@ -53,14 +53,17 @@ export class CacheEntryProcessorCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheEventJournalReadCodec.ts b/src/codec/CacheEventJournalReadCodec.ts index 8c6ecbb5a..9af964360 100644 --- a/src/codec/CacheEventJournalReadCodec.ts +++ b/src/codec/CacheEventJournalReadCodec.ts @@ -58,10 +58,19 @@ export class CacheEventJournalReadCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'readCount': null, 'items': null, 'itemSeqs': null}; + // Decode response from client message + var parameters: any = { + 'readCount': null, + 'items': null, + 'itemSeqs': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['readCount'] = clientMessage.readInt32(); + var itemsSize = clientMessage.readInt32(); var items: any = []; for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { @@ -71,6 +80,7 @@ export class CacheEventJournalReadCodec { } parameters['items'] = items; + if (clientMessage.readBoolean() !== true) { var itemSeqsSize = clientMessage.readInt32(); @@ -82,8 +92,8 @@ export class CacheEventJournalReadCodec { } parameters['itemSeqs'] = itemSeqs; } - return parameters; + return parameters; } diff --git a/src/codec/CacheEventJournalSubscribeCodec.ts b/src/codec/CacheEventJournalSubscribeCodec.ts index 06490b293..6ba5efef5 100644 --- a/src/codec/CacheEventJournalSubscribeCodec.ts +++ b/src/codec/CacheEventJournalSubscribeCodec.ts @@ -36,12 +36,20 @@ export class CacheEventJournalSubscribeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'oldestSequence': null, 'newestSequence': null}; + // Decode response from client message + var parameters: any = { + 'oldestSequence': null, + 'newestSequence': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['oldestSequence'] = clientMessage.readLong(); + parameters['newestSequence'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts index 7f7ed5d98..dee407a4e 100644 --- a/src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts @@ -47,8 +47,15 @@ export class CacheFetchNearCacheInvalidationMetadataCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'namePartitionSequenceList': null, 'partitionUuidList': null}; + // Decode response from client message + var parameters: any = { + 'namePartitionSequenceList': null, + 'partitionUuidList': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var namePartitionSequenceListSize = clientMessage.readInt32(); var namePartitionSequenceList: any = []; @@ -74,6 +81,7 @@ export class CacheFetchNearCacheInvalidationMetadataCodec { } parameters['namePartitionSequenceList'] = namePartitionSequenceList; + var partitionUuidListSize = clientMessage.readInt32(); var partitionUuidList: any = []; for (var partitionUuidListIndex = 0; partitionUuidListIndex < partitionUuidListSize; partitionUuidListIndex++) { @@ -86,8 +94,8 @@ export class CacheFetchNearCacheInvalidationMetadataCodec { partitionUuidList.push(partitionUuidListItem) } parameters['partitionUuidList'] = partitionUuidList; - return parameters; + return parameters; } diff --git a/src/codec/CacheGetAllCodec.ts b/src/codec/CacheGetAllCodec.ts index fe9c9de8c..53682fac2 100644 --- a/src/codec/CacheGetAllCodec.ts +++ b/src/codec/CacheGetAllCodec.ts @@ -55,8 +55,11 @@ export class CacheGetAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -70,8 +73,8 @@ export class CacheGetAllCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/CacheGetAndRemoveCodec.ts b/src/codec/CacheGetAndRemoveCodec.ts index c9efc9534..4884b233f 100644 --- a/src/codec/CacheGetAndRemoveCodec.ts +++ b/src/codec/CacheGetAndRemoveCodec.ts @@ -40,14 +40,17 @@ export class CacheGetAndRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheGetAndReplaceCodec.ts b/src/codec/CacheGetAndReplaceCodec.ts index 9ed85008e..d6d4120ba 100644 --- a/src/codec/CacheGetAndReplaceCodec.ts +++ b/src/codec/CacheGetAndReplaceCodec.ts @@ -50,14 +50,17 @@ export class CacheGetAndReplaceCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheGetCodec.ts b/src/codec/CacheGetCodec.ts index 2441a2462..fc247457d 100644 --- a/src/codec/CacheGetCodec.ts +++ b/src/codec/CacheGetCodec.ts @@ -46,14 +46,17 @@ export class CacheGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheGetConfigCodec.ts b/src/codec/CacheGetConfigCodec.ts index f73300417..10a8a11dd 100644 --- a/src/codec/CacheGetConfigCodec.ts +++ b/src/codec/CacheGetConfigCodec.ts @@ -38,14 +38,17 @@ export class CacheGetConfigCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheIterateCodec.ts b/src/codec/CacheIterateCodec.ts index e7cc4bf99..38526422b 100644 --- a/src/codec/CacheIterateCodec.ts +++ b/src/codec/CacheIterateCodec.ts @@ -42,10 +42,15 @@ export class CacheIterateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'tableIndex': null, 'keys': null}; + // Decode response from client message + var parameters: any = { + 'tableIndex': null, + 'keys': null + }; + parameters['tableIndex'] = clientMessage.readInt32(); + var keysSize = clientMessage.readInt32(); var keys: any = []; for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { @@ -54,8 +59,8 @@ export class CacheIterateCodec { keys.push(keysItem) } parameters['keys'] = keys; - return parameters; + return parameters; } diff --git a/src/codec/CacheIterateEntriesCodec.ts b/src/codec/CacheIterateEntriesCodec.ts index 9d75982fb..2e731f09f 100644 --- a/src/codec/CacheIterateEntriesCodec.ts +++ b/src/codec/CacheIterateEntriesCodec.ts @@ -42,10 +42,18 @@ export class CacheIterateEntriesCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'tableIndex': null, 'entries': null}; + // Decode response from client message + var parameters: any = { + 'tableIndex': null, + 'entries': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['tableIndex'] = clientMessage.readInt32(); + var entriesSize = clientMessage.readInt32(); var entries: any = []; for (var entriesIndex = 0; entriesIndex < entriesSize; entriesIndex++) { @@ -58,8 +66,8 @@ export class CacheIterateEntriesCodec { entries.push(entriesItem) } parameters['entries'] = entries; - return parameters; + return parameters; } diff --git a/src/codec/CachePutCodec.ts b/src/codec/CachePutCodec.ts index d92644fb7..7325bb0a1 100644 --- a/src/codec/CachePutCodec.ts +++ b/src/codec/CachePutCodec.ts @@ -52,14 +52,17 @@ export class CachePutCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CachePutIfAbsentCodec.ts b/src/codec/CachePutIfAbsentCodec.ts index 1f7e5fe01..52125964f 100644 --- a/src/codec/CachePutIfAbsentCodec.ts +++ b/src/codec/CachePutIfAbsentCodec.ts @@ -50,11 +50,14 @@ export class CachePutIfAbsentCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CacheRemoveCodec.ts b/src/codec/CacheRemoveCodec.ts index 60ed2bc7d..a8161c931 100644 --- a/src/codec/CacheRemoveCodec.ts +++ b/src/codec/CacheRemoveCodec.ts @@ -48,11 +48,14 @@ export class CacheRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CacheRemoveEntryListenerCodec.ts b/src/codec/CacheRemoveEntryListenerCodec.ts index 3db520cb9..40dd11e60 100644 --- a/src/codec/CacheRemoveEntryListenerCodec.ts +++ b/src/codec/CacheRemoveEntryListenerCodec.ts @@ -38,11 +38,14 @@ export class CacheRemoveEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CacheRemoveInvalidationListenerCodec.ts b/src/codec/CacheRemoveInvalidationListenerCodec.ts index 84ca8cf3e..4eb2b7380 100644 --- a/src/codec/CacheRemoveInvalidationListenerCodec.ts +++ b/src/codec/CacheRemoveInvalidationListenerCodec.ts @@ -38,11 +38,14 @@ export class CacheRemoveInvalidationListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CacheRemovePartitionLostListenerCodec.ts b/src/codec/CacheRemovePartitionLostListenerCodec.ts index a8e263004..6badb8d48 100644 --- a/src/codec/CacheRemovePartitionLostListenerCodec.ts +++ b/src/codec/CacheRemovePartitionLostListenerCodec.ts @@ -38,11 +38,14 @@ export class CacheRemovePartitionLostListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CacheReplaceCodec.ts b/src/codec/CacheReplaceCodec.ts index 7ffd5fc1b..30ce90e35 100644 --- a/src/codec/CacheReplaceCodec.ts +++ b/src/codec/CacheReplaceCodec.ts @@ -58,14 +58,17 @@ export class CacheReplaceCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/CacheSizeCodec.ts b/src/codec/CacheSizeCodec.ts index d13e613f6..e3cbd8e44 100644 --- a/src/codec/CacheSizeCodec.ts +++ b/src/codec/CacheSizeCodec.ts @@ -36,11 +36,14 @@ export class CacheSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/CardinalityEstimatorEstimateCodec.ts b/src/codec/CardinalityEstimatorEstimateCodec.ts index b5972d220..c4ee50bc4 100644 --- a/src/codec/CardinalityEstimatorEstimateCodec.ts +++ b/src/codec/CardinalityEstimatorEstimateCodec.ts @@ -36,11 +36,17 @@ export class CardinalityEstimatorEstimateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index 8a191c43a..a879053af 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -36,11 +36,14 @@ export class ClientAddDistributedObjectListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventDistributedobject: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ClientAddMembershipListenerCodec.ts b/src/codec/ClientAddMembershipListenerCodec.ts index 4851e9c41..d572db2b1 100644 --- a/src/codec/ClientAddMembershipListenerCodec.ts +++ b/src/codec/ClientAddMembershipListenerCodec.ts @@ -36,11 +36,14 @@ export class ClientAddMembershipListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventMember: any, handleEventMemberlist: any, handleEventMemberattributechange: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 3a6879410..8b12aa2af 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -36,11 +36,14 @@ export class ClientAddPartitionLostListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventPartitionlost: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index 3c0b208b5..1bc1ae8ce 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -62,7 +62,7 @@ export class ClientAuthenticationCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message + // Decode response from client message var parameters: any = { 'status': null, 'address': null, @@ -72,21 +72,31 @@ export class ClientAuthenticationCodec { 'serverHazelcastVersion': null, 'clientUnregisteredMembers': null }; + parameters['status'] = clientMessage.readByte(); + if (clientMessage.readBoolean() !== true) { parameters['address'] = AddressCodec.decode(clientMessage, toObjectFunction); } + if (clientMessage.readBoolean() !== true) { parameters['uuid'] = clientMessage.readString(); } + if (clientMessage.readBoolean() !== true) { parameters['ownerUuid'] = clientMessage.readString(); } + parameters['serializationVersion'] = clientMessage.readByte(); + + if (clientMessage.isComplete()) { + return parameters; + } parameters['serverHazelcastVersion'] = clientMessage.readString(); + parameters.serverHazelcastVersionExist = true; if (clientMessage.readBoolean() !== true) { @@ -99,8 +109,8 @@ export class ClientAuthenticationCodec { } parameters['clientUnregisteredMembers'] = clientUnregisteredMembers; } + parameters.clientUnregisteredMembersExist = true; return parameters; - } diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 5569795ab..2f0fd0fa9 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -60,7 +60,7 @@ export class ClientAuthenticationCustomCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message + // Decode response from client message var parameters: any = { 'status': null, 'address': null, @@ -70,21 +70,31 @@ export class ClientAuthenticationCustomCodec { 'serverHazelcastVersion': null, 'clientUnregisteredMembers': null }; + parameters['status'] = clientMessage.readByte(); + if (clientMessage.readBoolean() !== true) { parameters['address'] = AddressCodec.decode(clientMessage, toObjectFunction); } + if (clientMessage.readBoolean() !== true) { parameters['uuid'] = clientMessage.readString(); } + if (clientMessage.readBoolean() !== true) { parameters['ownerUuid'] = clientMessage.readString(); } + parameters['serializationVersion'] = clientMessage.readByte(); + + if (clientMessage.isComplete()) { + return parameters; + } parameters['serverHazelcastVersion'] = clientMessage.readString(); + parameters.serverHazelcastVersionExist = true; if (clientMessage.readBoolean() !== true) { @@ -97,8 +107,8 @@ export class ClientAuthenticationCustomCodec { } parameters['clientUnregisteredMembers'] = clientUnregisteredMembers; } + parameters.clientUnregisteredMembersExist = true; return parameters; - } diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index dc0d03c46..543f6215f 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -34,8 +34,11 @@ export class ClientGetDistributedObjectsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -45,8 +48,8 @@ export class ClientGetDistributedObjectsCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ClientGetPartitionsCodec.ts b/src/codec/ClientGetPartitionsCodec.ts index 246e664c8..9d8a84302 100644 --- a/src/codec/ClientGetPartitionsCodec.ts +++ b/src/codec/ClientGetPartitionsCodec.ts @@ -34,8 +34,12 @@ export class ClientGetPartitionsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'partitions': null, 'partitionStateVersion': null}; + // Decode response from client message + var parameters: any = { + 'partitions': null, + 'partitionStateVersion': null + }; + var partitionsSize = clientMessage.readInt32(); var partitions: any = []; @@ -56,9 +60,13 @@ export class ClientGetPartitionsCodec { partitions.push(partitionsItem) } parameters['partitions'] = partitions; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['partitionStateVersion'] = clientMessage.readInt32(); + parameters.partitionStateVersionExist = true; return parameters; - } diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index 91d52ea02..69b413a50 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -36,11 +36,14 @@ export class ClientRemoveDistributedObjectListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index 89022ae07..a9259dab1 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -36,11 +36,14 @@ export class ClientRemovePartitionLostListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ConditionAwaitCodec.ts b/src/codec/ConditionAwaitCodec.ts index 0e679c111..85b42ff39 100644 --- a/src/codec/ConditionAwaitCodec.ts +++ b/src/codec/ConditionAwaitCodec.ts @@ -44,11 +44,14 @@ export class ConditionAwaitCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ContinuousQueryAddListenerCodec.ts b/src/codec/ContinuousQueryAddListenerCodec.ts index 6b7e0dc36..e53333d21 100644 --- a/src/codec/ContinuousQueryAddListenerCodec.ts +++ b/src/codec/ContinuousQueryAddListenerCodec.ts @@ -38,11 +38,14 @@ export class ContinuousQueryAddListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventQuerycachesingle: any, handleEventQuerycachebatch: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ContinuousQueryDestroyCacheCodec.ts b/src/codec/ContinuousQueryDestroyCacheCodec.ts index 88dfa83cd..566a6c237 100644 --- a/src/codec/ContinuousQueryDestroyCacheCodec.ts +++ b/src/codec/ContinuousQueryDestroyCacheCodec.ts @@ -38,11 +38,14 @@ export class ContinuousQueryDestroyCacheCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ContinuousQueryMadePublishableCodec.ts b/src/codec/ContinuousQueryMadePublishableCodec.ts index a9c34177b..5cda46bf9 100644 --- a/src/codec/ContinuousQueryMadePublishableCodec.ts +++ b/src/codec/ContinuousQueryMadePublishableCodec.ts @@ -38,11 +38,14 @@ export class ContinuousQueryMadePublishableCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ContinuousQueryPublisherCreateCodec.ts b/src/codec/ContinuousQueryPublisherCreateCodec.ts index 2cc8c638a..f63977b47 100644 --- a/src/codec/ContinuousQueryPublisherCreateCodec.ts +++ b/src/codec/ContinuousQueryPublisherCreateCodec.ts @@ -50,8 +50,11 @@ export class ContinuousQueryPublisherCreateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -61,8 +64,8 @@ export class ContinuousQueryPublisherCreateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts b/src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts index bed593b87..958ac9261 100644 --- a/src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts +++ b/src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts @@ -50,8 +50,11 @@ export class ContinuousQueryPublisherCreateWithValueCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -65,8 +68,8 @@ export class ContinuousQueryPublisherCreateWithValueCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ContinuousQuerySetReadCursorCodec.ts b/src/codec/ContinuousQuerySetReadCursorCodec.ts index 5b6e58203..c9ec49588 100644 --- a/src/codec/ContinuousQuerySetReadCursorCodec.ts +++ b/src/codec/ContinuousQuerySetReadCursorCodec.ts @@ -40,11 +40,14 @@ export class ContinuousQuerySetReadCursorCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CountDownLatchAwaitCodec.ts b/src/codec/CountDownLatchAwaitCodec.ts index ac222e9d2..7d7502598 100644 --- a/src/codec/CountDownLatchAwaitCodec.ts +++ b/src/codec/CountDownLatchAwaitCodec.ts @@ -38,11 +38,14 @@ export class CountDownLatchAwaitCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/CountDownLatchGetCountCodec.ts b/src/codec/CountDownLatchGetCountCodec.ts index fa7ff35c3..8beefeaba 100644 --- a/src/codec/CountDownLatchGetCountCodec.ts +++ b/src/codec/CountDownLatchGetCountCodec.ts @@ -36,11 +36,14 @@ export class CountDownLatchGetCountCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/CountDownLatchTrySetCountCodec.ts b/src/codec/CountDownLatchTrySetCountCodec.ts index 9998ac706..966ca3dd6 100644 --- a/src/codec/CountDownLatchTrySetCountCodec.ts +++ b/src/codec/CountDownLatchTrySetCountCodec.ts @@ -38,11 +38,14 @@ export class CountDownLatchTrySetCountCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/DurableExecutorIsShutdownCodec.ts b/src/codec/DurableExecutorIsShutdownCodec.ts index bf7a1903c..f422b5ef9 100644 --- a/src/codec/DurableExecutorIsShutdownCodec.ts +++ b/src/codec/DurableExecutorIsShutdownCodec.ts @@ -36,11 +36,17 @@ export class DurableExecutorIsShutdownCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts b/src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts index ba2e05d33..3fa9255a2 100644 --- a/src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts +++ b/src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts @@ -38,14 +38,20 @@ export class DurableExecutorRetrieveAndDisposeResultCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/DurableExecutorRetrieveResultCodec.ts b/src/codec/DurableExecutorRetrieveResultCodec.ts index 7c659b48d..22429162e 100644 --- a/src/codec/DurableExecutorRetrieveResultCodec.ts +++ b/src/codec/DurableExecutorRetrieveResultCodec.ts @@ -38,14 +38,20 @@ export class DurableExecutorRetrieveResultCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/DurableExecutorSubmitToPartitionCodec.ts b/src/codec/DurableExecutorSubmitToPartitionCodec.ts index 074bc784f..be36c8cb2 100644 --- a/src/codec/DurableExecutorSubmitToPartitionCodec.ts +++ b/src/codec/DurableExecutorSubmitToPartitionCodec.ts @@ -38,11 +38,17 @@ export class DurableExecutorSubmitToPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/ExecutorServiceCancelOnAddressCodec.ts b/src/codec/ExecutorServiceCancelOnAddressCodec.ts index 1ad437c7e..e25793a05 100644 --- a/src/codec/ExecutorServiceCancelOnAddressCodec.ts +++ b/src/codec/ExecutorServiceCancelOnAddressCodec.ts @@ -40,11 +40,14 @@ export class ExecutorServiceCancelOnAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ExecutorServiceCancelOnPartitionCodec.ts b/src/codec/ExecutorServiceCancelOnPartitionCodec.ts index 3e4b53f30..044171fc4 100644 --- a/src/codec/ExecutorServiceCancelOnPartitionCodec.ts +++ b/src/codec/ExecutorServiceCancelOnPartitionCodec.ts @@ -40,11 +40,14 @@ export class ExecutorServiceCancelOnPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ExecutorServiceIsShutdownCodec.ts b/src/codec/ExecutorServiceIsShutdownCodec.ts index 251cd03ed..f2cd34f1b 100644 --- a/src/codec/ExecutorServiceIsShutdownCodec.ts +++ b/src/codec/ExecutorServiceIsShutdownCodec.ts @@ -36,11 +36,14 @@ export class ExecutorServiceIsShutdownCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ExecutorServiceSubmitToAddressCodec.ts b/src/codec/ExecutorServiceSubmitToAddressCodec.ts index 798ba02c0..d3ad4315b 100644 --- a/src/codec/ExecutorServiceSubmitToAddressCodec.ts +++ b/src/codec/ExecutorServiceSubmitToAddressCodec.ts @@ -42,14 +42,17 @@ export class ExecutorServiceSubmitToAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ExecutorServiceSubmitToPartitionCodec.ts b/src/codec/ExecutorServiceSubmitToPartitionCodec.ts index d8ba26e33..78634fe62 100644 --- a/src/codec/ExecutorServiceSubmitToPartitionCodec.ts +++ b/src/codec/ExecutorServiceSubmitToPartitionCodec.ts @@ -42,14 +42,17 @@ export class ExecutorServiceSubmitToPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 770c13f3b..787f2d881 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -47,11 +47,14 @@ export class ListAddAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index adb295d07..9d207eead 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -49,11 +49,14 @@ export class ListAddAllWithIndexCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index a83bae21c..378da69c2 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -38,11 +38,14 @@ export class ListAddCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index b087549b8..a235691ca 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -40,11 +40,14 @@ export class ListAddListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventItem: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index e200b8f0c..5ba235d35 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -47,11 +47,14 @@ export class ListCompareAndRemoveAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index cee27cd6c..822cff2a5 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -47,11 +47,14 @@ export class ListCompareAndRetainAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index 3cacce6e9..1dad04e4f 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -47,11 +47,14 @@ export class ListContainsAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index d74a4f14f..83803609b 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -38,11 +38,14 @@ export class ListContainsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index 800a1a968..8d1b9854e 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -36,8 +36,11 @@ export class ListGetAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class ListGetAllCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index f4389c767..7d81ecd37 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -38,14 +38,17 @@ export class ListGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index ee1e2c390..02f1e375a 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -38,11 +38,14 @@ export class ListIndexOfCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index 0c7bff379..daba41501 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -36,11 +36,14 @@ export class ListIsEmptyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index e98af333f..4220fba82 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -36,8 +36,11 @@ export class ListIteratorCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class ListIteratorCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index 679fc0789..3a0ab9847 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -38,11 +38,14 @@ export class ListLastIndexOfCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index 4c731e88a..13260c5d3 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -38,8 +38,11 @@ export class ListListIteratorCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -49,8 +52,8 @@ export class ListListIteratorCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index 49e118830..fb0f1cb2b 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -38,11 +38,14 @@ export class ListRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index 19b847fd8..39fd19467 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -38,11 +38,14 @@ export class ListRemoveListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index 140357337..3feb552cb 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -38,14 +38,17 @@ export class ListRemoveWithIndexCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 244640e20..183e9f69e 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -40,14 +40,17 @@ export class ListSetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index 638c6dde3..e59973f3d 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -36,11 +36,14 @@ export class ListSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index 9f657180a..1156479bb 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -40,8 +40,11 @@ export class ListSubCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class ListSubCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/LockGetLockCountCodec.ts b/src/codec/LockGetLockCountCodec.ts index c248423f1..8dc0691f6 100644 --- a/src/codec/LockGetLockCountCodec.ts +++ b/src/codec/LockGetLockCountCodec.ts @@ -36,11 +36,14 @@ export class LockGetLockCountCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/LockGetRemainingLeaseTimeCodec.ts b/src/codec/LockGetRemainingLeaseTimeCodec.ts index 4464e2074..c8b430c70 100644 --- a/src/codec/LockGetRemainingLeaseTimeCodec.ts +++ b/src/codec/LockGetRemainingLeaseTimeCodec.ts @@ -36,11 +36,14 @@ export class LockGetRemainingLeaseTimeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/LockIsLockedByCurrentThreadCodec.ts b/src/codec/LockIsLockedByCurrentThreadCodec.ts index 5a46b6f90..f264ad6ef 100644 --- a/src/codec/LockIsLockedByCurrentThreadCodec.ts +++ b/src/codec/LockIsLockedByCurrentThreadCodec.ts @@ -38,11 +38,14 @@ export class LockIsLockedByCurrentThreadCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/LockIsLockedCodec.ts b/src/codec/LockIsLockedCodec.ts index 5c1ba9322..27345e568 100644 --- a/src/codec/LockIsLockedCodec.ts +++ b/src/codec/LockIsLockedCodec.ts @@ -36,11 +36,14 @@ export class LockIsLockedCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/LockTryLockCodec.ts b/src/codec/LockTryLockCodec.ts index 6a4f08f42..3647c051f 100644 --- a/src/codec/LockTryLockCodec.ts +++ b/src/codec/LockTryLockCodec.ts @@ -44,11 +44,14 @@ export class LockTryLockCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index f8b162f25..93cd65ebd 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -42,11 +42,14 @@ export class MapAddEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index f4b32ed16..0d55fda65 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -44,11 +44,14 @@ export class MapAddEntryListenerToKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index 27a879870..bc827bacd 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -46,11 +46,14 @@ export class MapAddEntryListenerToKeyWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index e10fca380..9b54bd49a 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -44,11 +44,14 @@ export class MapAddEntryListenerWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index 001d9a49c..6bba3d1f8 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -38,11 +38,14 @@ export class MapAddInterceptorCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } diff --git a/src/codec/MapAddNearCacheEntryListenerCodec.ts b/src/codec/MapAddNearCacheEntryListenerCodec.ts index f8799eace..dc3217df3 100644 --- a/src/codec/MapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/MapAddNearCacheEntryListenerCodec.ts @@ -40,11 +40,14 @@ export class MapAddNearCacheEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventImapinvalidation: any, handleEventImapbatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index 4445f4ab5..047dcd423 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -40,11 +40,17 @@ export class MapAddNearCacheInvalidationListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventImapinvalidation: any, handleEventImapbatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index a6190d9cd..f39c5495e 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -38,11 +38,14 @@ export class MapAddPartitionLostListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventMappartitionlost: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index b9a3224a9..8b85fa994 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -38,14 +38,20 @@ export class MapAggregateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index 1e26f5903..01694e686 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -40,14 +40,20 @@ export class MapAggregateWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapAssignAndGetUuidsCodec.ts b/src/codec/MapAssignAndGetUuidsCodec.ts index 94ff12c35..26ffbfda2 100644 --- a/src/codec/MapAssignAndGetUuidsCodec.ts +++ b/src/codec/MapAssignAndGetUuidsCodec.ts @@ -34,8 +34,14 @@ export class MapAssignAndGetUuidsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'partitionUuidList': null}; + // Decode response from client message + var parameters: any = { + 'partitionUuidList': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var partitionUuidListSize = clientMessage.readInt32(); var partitionUuidList: any = []; @@ -49,8 +55,8 @@ export class MapAssignAndGetUuidsCodec { partitionUuidList.push(partitionUuidListItem) } parameters['partitionUuidList'] = partitionUuidList; - return parameters; + return parameters; } diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index e5ad6e682..0e1859c4b 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -40,11 +40,14 @@ export class MapContainsKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 491b61582..08275cfb9 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -38,11 +38,14 @@ export class MapContainsValueCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index c5cd37c89..c8a36da60 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -38,8 +38,11 @@ export class MapEntriesWithPagingPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class MapEntriesWithPagingPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index 717493b75..4a1d4e9a7 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -38,8 +38,11 @@ export class MapEntriesWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class MapEntriesWithPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index b2338302f..2bac4eb14 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -36,8 +36,11 @@ export class MapEntrySetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class MapEntrySetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index d661027f0..5fa40d4e4 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -58,10 +58,19 @@ export class MapEventJournalReadCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'readCount': null, 'items': null, 'itemSeqs': null}; + // Decode response from client message + var parameters: any = { + 'readCount': null, + 'items': null, + 'itemSeqs': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['readCount'] = clientMessage.readInt32(); + var itemsSize = clientMessage.readInt32(); var items: any = []; for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { @@ -71,6 +80,7 @@ export class MapEventJournalReadCodec { } parameters['items'] = items; + if (clientMessage.readBoolean() !== true) { var itemSeqsSize = clientMessage.readInt32(); @@ -82,8 +92,8 @@ export class MapEventJournalReadCodec { } parameters['itemSeqs'] = itemSeqs; } - return parameters; + return parameters; } diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index f2acaaaa9..cbfa0bf6c 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -36,12 +36,20 @@ export class MapEventJournalSubscribeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'oldestSequence': null, 'newestSequence': null}; + // Decode response from client message + var parameters: any = { + 'oldestSequence': null, + 'newestSequence': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['oldestSequence'] = clientMessage.readLong(); + parameters['newestSequence'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index e3502af13..363c3d191 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -40,11 +40,14 @@ export class MapEvictCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index 84c158ea6..b35825796 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -38,8 +38,11 @@ export class MapExecuteOnAllKeysCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class MapExecuteOnAllKeysCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index 9e339fedb..73a52c4c8 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -42,14 +42,17 @@ export class MapExecuteOnKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index 531f8d8e2..bd9c15ef3 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -49,8 +49,11 @@ export class MapExecuteOnKeysCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -64,8 +67,8 @@ export class MapExecuteOnKeysCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index faeae63d5..913165ba1 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -40,8 +40,11 @@ export class MapExecuteWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -55,8 +58,8 @@ export class MapExecuteWithPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index 35b224ec7..477562626 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -42,10 +42,18 @@ export class MapFetchEntriesCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'tableIndex': null, 'entries': null}; + // Decode response from client message + var parameters: any = { + 'tableIndex': null, + 'entries': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['tableIndex'] = clientMessage.readInt32(); + var entriesSize = clientMessage.readInt32(); var entries: any = []; for (var entriesIndex = 0; entriesIndex < entriesSize; entriesIndex++) { @@ -58,8 +66,8 @@ export class MapFetchEntriesCodec { entries.push(entriesItem) } parameters['entries'] = entries; - return parameters; + return parameters; } diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index 7060cf39a..e4772c164 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -42,10 +42,18 @@ export class MapFetchKeysCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'tableIndex': null, 'keys': null}; + // Decode response from client message + var parameters: any = { + 'tableIndex': null, + 'keys': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['tableIndex'] = clientMessage.readInt32(); + var keysSize = clientMessage.readInt32(); var keys: any = []; for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { @@ -54,8 +62,8 @@ export class MapFetchKeysCodec { keys.push(keysItem) } parameters['keys'] = keys; - return parameters; + return parameters; } diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index fa9cb1dfb..d9db23612 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -47,8 +47,15 @@ export class MapFetchNearCacheInvalidationMetadataCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'namePartitionSequenceList': null, 'partitionUuidList': null}; + // Decode response from client message + var parameters: any = { + 'namePartitionSequenceList': null, + 'partitionUuidList': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var namePartitionSequenceListSize = clientMessage.readInt32(); var namePartitionSequenceList: any = []; @@ -74,6 +81,7 @@ export class MapFetchNearCacheInvalidationMetadataCodec { } parameters['namePartitionSequenceList'] = namePartitionSequenceList; + var partitionUuidListSize = clientMessage.readInt32(); var partitionUuidList: any = []; for (var partitionUuidListIndex = 0; partitionUuidListIndex < partitionUuidListSize; partitionUuidListIndex++) { @@ -86,8 +94,8 @@ export class MapFetchNearCacheInvalidationMetadataCodec { partitionUuidList.push(partitionUuidListItem) } parameters['partitionUuidList'] = partitionUuidList; - return parameters; + return parameters; } diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index b1d17d267..debf8c891 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -44,8 +44,15 @@ export class MapFetchWithQueryCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'results': null, 'nextTableIndexToReadFrom': null}; + // Decode response from client message + var parameters: any = { + 'results': null, + 'nextTableIndexToReadFrom': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var resultsSize = clientMessage.readInt32(); var results: any = []; @@ -55,9 +62,10 @@ export class MapFetchWithQueryCodec { results.push(resultsItem) } parameters['results'] = results; + parameters['nextTableIndexToReadFrom'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index 35d3485a3..2f3a42699 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -47,8 +47,11 @@ export class MapGetAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -62,8 +65,8 @@ export class MapGetAllCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index fc316725c..99f44f967 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -40,14 +40,17 @@ export class MapGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index f198dc182..5904abfb6 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -40,14 +40,17 @@ export class MapGetEntryViewCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = EntryViewCodec.decode(clientMessage, toObjectFunction); } - return parameters; + return parameters; } diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index d0ab2bca7..e58245ee0 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -36,11 +36,14 @@ export class MapIsEmptyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index 4c0b04bfa..a10e6eb4d 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -38,11 +38,14 @@ export class MapIsLockedCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index 7dbf58bf5..53d0f7f48 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -36,8 +36,11 @@ export class MapKeySetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class MapKeySetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index 4801ba419..a48811aaa 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -38,8 +38,11 @@ export class MapKeySetWithPagingPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -49,8 +52,8 @@ export class MapKeySetWithPagingPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index 5e2edf547..2af2c432a 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -38,8 +38,11 @@ export class MapKeySetWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -49,8 +52,8 @@ export class MapKeySetWithPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 8fa3241db..4b29a9a96 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -38,8 +38,14 @@ export class MapProjectCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var responseSize = clientMessage.readInt32(); var response: any = []; @@ -49,8 +55,8 @@ export class MapProjectCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index 249a6a91d..0ab96edca 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -40,8 +40,14 @@ export class MapProjectWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +57,8 @@ export class MapProjectWithPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index 3861150b6..3c05e420a 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -44,14 +44,17 @@ export class MapPutCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index bc221109c..e7fc14e6e 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -44,14 +44,17 @@ export class MapPutIfAbsentCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapReduceCancelCodec.ts b/src/codec/MapReduceCancelCodec.ts index 7a907195b..a396b8021 100644 --- a/src/codec/MapReduceCancelCodec.ts +++ b/src/codec/MapReduceCancelCodec.ts @@ -38,11 +38,14 @@ export class MapReduceCancelCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapReduceForCustomCodec.ts b/src/codec/MapReduceForCustomCodec.ts index e6afab48a..4093404d0 100644 --- a/src/codec/MapReduceForCustomCodec.ts +++ b/src/codec/MapReduceForCustomCodec.ts @@ -93,8 +93,11 @@ export class MapReduceForCustomCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -108,8 +111,8 @@ export class MapReduceForCustomCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapReduceForListCodec.ts b/src/codec/MapReduceForListCodec.ts index 6cbb52b8a..4a92a2e84 100644 --- a/src/codec/MapReduceForListCodec.ts +++ b/src/codec/MapReduceForListCodec.ts @@ -93,8 +93,11 @@ export class MapReduceForListCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -108,8 +111,8 @@ export class MapReduceForListCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapReduceForMapCodec.ts b/src/codec/MapReduceForMapCodec.ts index 6f91e2b89..076fe323f 100644 --- a/src/codec/MapReduceForMapCodec.ts +++ b/src/codec/MapReduceForMapCodec.ts @@ -93,8 +93,11 @@ export class MapReduceForMapCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -108,8 +111,8 @@ export class MapReduceForMapCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapReduceForMultiMapCodec.ts b/src/codec/MapReduceForMultiMapCodec.ts index 4df6bd27e..99e24cf50 100644 --- a/src/codec/MapReduceForMultiMapCodec.ts +++ b/src/codec/MapReduceForMultiMapCodec.ts @@ -93,8 +93,11 @@ export class MapReduceForMultiMapCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -108,8 +111,8 @@ export class MapReduceForMultiMapCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapReduceForSetCodec.ts b/src/codec/MapReduceForSetCodec.ts index 34c40d769..366b0068f 100644 --- a/src/codec/MapReduceForSetCodec.ts +++ b/src/codec/MapReduceForSetCodec.ts @@ -93,8 +93,11 @@ export class MapReduceForSetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -108,8 +111,8 @@ export class MapReduceForSetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapReduceJobProcessInformationCodec.ts b/src/codec/MapReduceJobProcessInformationCodec.ts index a1cd7b547..a369e6dba 100644 --- a/src/codec/MapReduceJobProcessInformationCodec.ts +++ b/src/codec/MapReduceJobProcessInformationCodec.ts @@ -38,8 +38,12 @@ export class MapReduceJobProcessInformationCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'jobPartitionStates': null, 'processRecords': null}; + // Decode response from client message + var parameters: any = { + 'jobPartitionStates': null, + 'processRecords': null + }; + var jobPartitionStatesSize = clientMessage.readInt32(); var jobPartitionStates: any = []; @@ -49,9 +53,10 @@ export class MapReduceJobProcessInformationCodec { jobPartitionStates.push(jobPartitionStatesItem) } parameters['jobPartitionStates'] = jobPartitionStates; + parameters['processRecords'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index 0274e314c..cb8d8a954 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -40,14 +40,17 @@ export class MapRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index 53f35a47d..f732c7fb2 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -38,11 +38,14 @@ export class MapRemoveEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index 3aabecf81..9966bada7 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -42,11 +42,14 @@ export class MapRemoveIfSameCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index 8516acd42..838ed130e 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -38,11 +38,14 @@ export class MapRemoveInterceptorCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index adb706b05..9cd56072c 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -38,11 +38,14 @@ export class MapRemovePartitionLostListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index 263c08273..35a7a10e4 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -42,14 +42,17 @@ export class MapReplaceCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index d2fbfecdf..9170c1d35 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -44,11 +44,14 @@ export class MapReplaceIfSameCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index 8a4ce5a47..876d374b9 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -36,11 +36,14 @@ export class MapSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 0a7c39e22..5b5ed145c 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -42,14 +42,17 @@ export class MapSubmitToKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index ed8c0d082..c5dcc548f 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -46,11 +46,14 @@ export class MapTryLockCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index 1f6c41a29..135900fc0 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -44,11 +44,14 @@ export class MapTryPutCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index 539190e86..25280723b 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -42,11 +42,14 @@ export class MapTryRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 847b8399e..87ab9ab9f 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -36,8 +36,11 @@ export class MapValuesCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class MapValuesCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index d12e01bbf..6228bc276 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -38,8 +38,11 @@ export class MapValuesWithPagingPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class MapValuesWithPagingPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 50b3e3f79..60dce3867 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -38,8 +38,11 @@ export class MapValuesWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -49,8 +52,8 @@ export class MapValuesWithPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index 99fcf8b2a..f0cdfb453 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -40,11 +40,14 @@ export class MultiMapAddEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index 47ff99017..238b848e1 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -42,11 +42,14 @@ export class MultiMapAddEntryListenerToKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 40e70335c..0936e7c5f 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -42,11 +42,14 @@ export class MultiMapContainsEntryCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index 4ca37c27a..f6c3338c4 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -40,11 +40,14 @@ export class MultiMapContainsKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index b1de88eac..b77d9e60d 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -38,11 +38,14 @@ export class MultiMapContainsValueCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index 34004b5e1..e72c1ee61 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -36,8 +36,11 @@ export class MultiMapEntrySetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class MultiMapEntrySetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index ba802fe28..b3041d669 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -40,8 +40,11 @@ export class MultiMapGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class MultiMapGetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index 377eb8d0b..ee184b3ba 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -38,11 +38,14 @@ export class MultiMapIsLockedCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 0252b0ea1..f339bb230 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -36,8 +36,11 @@ export class MultiMapKeySetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class MultiMapKeySetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index 0bab87b46..5236715ae 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -42,11 +42,14 @@ export class MultiMapPutCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index e176aa11a..a8a31d4fa 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -40,8 +40,11 @@ export class MultiMapRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class MultiMapRemoveCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index 1325aaaef..4b5ccdc9b 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -42,11 +42,14 @@ export class MultiMapRemoveEntryCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 0f3fc7082..83e86db7f 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -38,11 +38,14 @@ export class MultiMapRemoveEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index aa70e6f6a..d8fbe81ab 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -36,11 +36,14 @@ export class MultiMapSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index 36d9fa461..7ea619880 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -46,11 +46,14 @@ export class MultiMapTryLockCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index bde0caacb..f9919cc16 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -40,11 +40,14 @@ export class MultiMapValueCountCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index 441b30d91..92e5341e4 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -36,8 +36,11 @@ export class MultiMapValuesCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class MultiMapValuesCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index 1de3183e2..28b6e343a 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -47,11 +47,14 @@ export class QueueAddAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index 4442b06b5..62b35f634 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -40,11 +40,14 @@ export class QueueAddListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventItem: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index 2fde2c4bc..aa20f9f63 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -47,11 +47,14 @@ export class QueueCompareAndRemoveAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index 9a6ee98b0..0d1307395 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -47,11 +47,14 @@ export class QueueCompareAndRetainAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index f42c9a604..3de38d5ef 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -47,11 +47,14 @@ export class QueueContainsAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index 459f8ceea..28cb2a757 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -38,11 +38,14 @@ export class QueueContainsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index d7675380d..883509204 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -36,8 +36,11 @@ export class QueueDrainToCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class QueueDrainToCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index d882ff38f..88b890986 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -38,8 +38,11 @@ export class QueueDrainToMaxSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -49,8 +52,8 @@ export class QueueDrainToMaxSizeCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index 7f4060833..7d5245d02 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -36,11 +36,14 @@ export class QueueIsEmptyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index f57d046a1..41ee0c083 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -36,8 +36,11 @@ export class QueueIteratorCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class QueueIteratorCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index f6fc5dbe9..81584a947 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -40,11 +40,14 @@ export class QueueOfferCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index f876bd563..cb991f682 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -36,14 +36,17 @@ export class QueuePeekCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index d5abca5cf..27fae0cc8 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -38,14 +38,17 @@ export class QueuePollCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index 7c9e27379..9cd3a11c0 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -36,11 +36,14 @@ export class QueueRemainingCapacityCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index 6d43de430..83e0de32f 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -38,11 +38,14 @@ export class QueueRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index f7cbe7948..25c9f7cc5 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -38,11 +38,14 @@ export class QueueRemoveListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index cc6006365..5a2874d80 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -36,11 +36,14 @@ export class QueueSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index ab0f529db..9dc0b9c27 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -36,14 +36,17 @@ export class QueueTakeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index 919797755..f806d7c88 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -38,11 +38,14 @@ export class ReplicatedMapAddEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index 99d56da6b..760493d53 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -40,11 +40,14 @@ export class ReplicatedMapAddEntryListenerToKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index 37bc16d51..aa5f30d9c 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -42,11 +42,14 @@ export class ReplicatedMapAddEntryListenerToKeyWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 977ac2580..0a79830fc 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -40,11 +40,14 @@ export class ReplicatedMapAddEntryListenerWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index ab6ddea43..a331cce73 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -40,11 +40,14 @@ export class ReplicatedMapAddNearCacheEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index 74d0099fa..9fc981c3b 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -38,11 +38,14 @@ export class ReplicatedMapContainsKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 1d2ee9a39..6eb9ffafd 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -38,11 +38,14 @@ export class ReplicatedMapContainsValueCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index eeb886763..3def0c4eb 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -36,8 +36,11 @@ export class ReplicatedMapEntrySetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class ReplicatedMapEntrySetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index a4adf0609..d220e0ee3 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -38,14 +38,17 @@ export class ReplicatedMapGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index 4b95b2027..4ad225134 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -36,11 +36,14 @@ export class ReplicatedMapIsEmptyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index 02c0b31d5..551c55d95 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -36,8 +36,11 @@ export class ReplicatedMapKeySetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class ReplicatedMapKeySetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index a86ed6663..0981527a5 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -42,14 +42,17 @@ export class ReplicatedMapPutCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index 75982c8fb..1c616e1bf 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -38,14 +38,17 @@ export class ReplicatedMapRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index bb4abb41f..70d346341 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -38,11 +38,14 @@ export class ReplicatedMapRemoveEntryListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index 61e50be29..8b75d8b42 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -36,11 +36,14 @@ export class ReplicatedMapSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index be9b462d5..021a2c448 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -36,8 +36,11 @@ export class ReplicatedMapValuesCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class ReplicatedMapValuesCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index 494d4b1eb..21c4a781d 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -49,11 +49,14 @@ export class RingbufferAddAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 67e4cdb9b..37d1e26e5 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -40,11 +40,14 @@ export class RingbufferAddCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index 5c3010e54..a773d4769 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -36,11 +36,14 @@ export class RingbufferCapacityCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index 81204fa20..b0b8eafe9 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -36,11 +36,14 @@ export class RingbufferHeadSequenceCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index 175f6343b..56a25a1e0 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -50,10 +50,16 @@ export class RingbufferReadManyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'readCount': null, 'items': null, 'itemSeqs': null}; + // Decode response from client message + var parameters: any = { + 'readCount': null, + 'items': null, + 'itemSeqs': null + }; + parameters['readCount'] = clientMessage.readInt32(); + var itemsSize = clientMessage.readInt32(); var items: any = []; for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { @@ -66,6 +72,7 @@ export class RingbufferReadManyCodec { if (clientMessage.isComplete()) { return parameters; } + if (clientMessage.readBoolean() !== true) { var itemSeqsSize = clientMessage.readInt32(); @@ -77,8 +84,8 @@ export class RingbufferReadManyCodec { } parameters['itemSeqs'] = itemSeqs; } + parameters.itemSeqsExist = true; return parameters; - } diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index 099f7d49d..4d49afaee 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -38,14 +38,17 @@ export class RingbufferReadOneCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index 08766b5ec..2fc248ed3 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -36,11 +36,14 @@ export class RingbufferRemainingCapacityCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index f70607866..e331e1cd8 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -36,11 +36,14 @@ export class RingbufferSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index ff6cd2a79..8c3047c25 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -36,11 +36,14 @@ export class RingbufferTailSequenceCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorCancelFromAddressCodec.ts b/src/codec/ScheduledExecutorCancelFromAddressCodec.ts index 08b5823c4..d2d48ac30 100644 --- a/src/codec/ScheduledExecutorCancelFromAddressCodec.ts +++ b/src/codec/ScheduledExecutorCancelFromAddressCodec.ts @@ -42,11 +42,17 @@ export class ScheduledExecutorCancelFromAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorCancelFromPartitionCodec.ts b/src/codec/ScheduledExecutorCancelFromPartitionCodec.ts index 8d060e85a..c8f33499e 100644 --- a/src/codec/ScheduledExecutorCancelFromPartitionCodec.ts +++ b/src/codec/ScheduledExecutorCancelFromPartitionCodec.ts @@ -40,11 +40,17 @@ export class ScheduledExecutorCancelFromPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts b/src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts index 0ad4e84f9..3b801b899 100644 --- a/src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts +++ b/src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts @@ -36,8 +36,14 @@ export class ScheduledExecutorGetAllScheduledFuturesCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'handlers': null}; + // Decode response from client message + var parameters: any = { + 'handlers': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } var handlersSize = clientMessage.readInt32(); var handlers: any = []; @@ -58,8 +64,8 @@ export class ScheduledExecutorGetAllScheduledFuturesCodec { handlers.push(handlersItem) } parameters['handlers'] = handlers; - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts b/src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts index b804f5e33..1bb9ad96b 100644 --- a/src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts +++ b/src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts @@ -40,11 +40,17 @@ export class ScheduledExecutorGetDelayFromAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts b/src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts index 017b7ea4d..742d83544 100644 --- a/src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts +++ b/src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts @@ -38,11 +38,17 @@ export class ScheduledExecutorGetDelayFromPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorGetResultFromAddressCodec.ts b/src/codec/ScheduledExecutorGetResultFromAddressCodec.ts index 0ad52405e..8ab211fc4 100644 --- a/src/codec/ScheduledExecutorGetResultFromAddressCodec.ts +++ b/src/codec/ScheduledExecutorGetResultFromAddressCodec.ts @@ -40,14 +40,20 @@ export class ScheduledExecutorGetResultFromAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts b/src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts index a0d264e3c..99e423a6f 100644 --- a/src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts +++ b/src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts @@ -38,14 +38,20 @@ export class ScheduledExecutorGetResultFromPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts b/src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts index ca8cfa6a2..8947ba0b8 100644 --- a/src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts +++ b/src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts @@ -40,19 +40,26 @@ export class ScheduledExecutorGetStatsFromAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message + // Decode response from client message var parameters: any = { 'lastIdleTimeNanos': null, 'totalIdleTimeNanos': null, 'totalRuns': null, 'totalRunTimeNanos': null }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['lastIdleTimeNanos'] = clientMessage.readLong(); + parameters['totalIdleTimeNanos'] = clientMessage.readLong(); + parameters['totalRuns'] = clientMessage.readLong(); + parameters['totalRunTimeNanos'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts b/src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts index 1fb3bdcba..259fd14cf 100644 --- a/src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts +++ b/src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts @@ -38,19 +38,26 @@ export class ScheduledExecutorGetStatsFromPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message + // Decode response from client message var parameters: any = { 'lastIdleTimeNanos': null, 'totalIdleTimeNanos': null, 'totalRuns': null, 'totalRunTimeNanos': null }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['lastIdleTimeNanos'] = clientMessage.readLong(); + parameters['totalIdleTimeNanos'] = clientMessage.readLong(); + parameters['totalRuns'] = clientMessage.readLong(); + parameters['totalRunTimeNanos'] = clientMessage.readLong(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts b/src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts index 96898c670..aff524149 100644 --- a/src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts +++ b/src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts @@ -40,11 +40,17 @@ export class ScheduledExecutorIsCancelledFromAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts b/src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts index eb62d1bec..e576f634a 100644 --- a/src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts +++ b/src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts @@ -38,11 +38,17 @@ export class ScheduledExecutorIsCancelledFromPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts b/src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts index fdb14c2ca..e0eaaa875 100644 --- a/src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts +++ b/src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts @@ -40,11 +40,17 @@ export class ScheduledExecutorIsDoneFromAddressCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts b/src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts index 7e7e929fb..6e313c4a9 100644 --- a/src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts +++ b/src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts @@ -38,11 +38,17 @@ export class ScheduledExecutorIsDoneFromPartitionCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SemaphoreAvailablePermitsCodec.ts b/src/codec/SemaphoreAvailablePermitsCodec.ts index fb9cdb4de..e3361edc6 100644 --- a/src/codec/SemaphoreAvailablePermitsCodec.ts +++ b/src/codec/SemaphoreAvailablePermitsCodec.ts @@ -36,11 +36,14 @@ export class SemaphoreAvailablePermitsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/SemaphoreDrainPermitsCodec.ts b/src/codec/SemaphoreDrainPermitsCodec.ts index 4cd309073..656068302 100644 --- a/src/codec/SemaphoreDrainPermitsCodec.ts +++ b/src/codec/SemaphoreDrainPermitsCodec.ts @@ -36,11 +36,14 @@ export class SemaphoreDrainPermitsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/SemaphoreInitCodec.ts b/src/codec/SemaphoreInitCodec.ts index 94a287405..e899cbc80 100644 --- a/src/codec/SemaphoreInitCodec.ts +++ b/src/codec/SemaphoreInitCodec.ts @@ -38,11 +38,14 @@ export class SemaphoreInitCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SemaphoreTryAcquireCodec.ts b/src/codec/SemaphoreTryAcquireCodec.ts index 6dc48d223..234d2fd76 100644 --- a/src/codec/SemaphoreTryAcquireCodec.ts +++ b/src/codec/SemaphoreTryAcquireCodec.ts @@ -40,11 +40,14 @@ export class SemaphoreTryAcquireCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index 2db2e20a8..6f5c1cb5e 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -47,11 +47,14 @@ export class SetAddAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index a82d2ad4c..4e3f2ef0f 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -38,11 +38,14 @@ export class SetAddCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index 7776bb22a..6640f4bed 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -40,11 +40,14 @@ export class SetAddListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventItem: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index d094a0b51..f36804ef0 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -47,11 +47,14 @@ export class SetCompareAndRemoveAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index c1d4e9b52..2d738eaf3 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -47,11 +47,14 @@ export class SetCompareAndRetainAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index 1e3a3c5ce..84753e9be 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -47,11 +47,14 @@ export class SetContainsAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index 3a7e8d0b5..05b1edc13 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -38,11 +38,14 @@ export class SetContainsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index e3a537a3a..844ba2f3b 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -36,8 +36,11 @@ export class SetGetAllCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -47,8 +50,8 @@ export class SetGetAllCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index a8a8b33e7..cacdd5f6e 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -36,11 +36,14 @@ export class SetIsEmptyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index e5083965d..145401e2e 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -38,11 +38,14 @@ export class SetRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index fd112c0e4..6d4d6998d 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -38,11 +38,14 @@ export class SetRemoveListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index 82257cbc1..ac7979596 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -36,11 +36,14 @@ export class SetSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index f53f739d4..757e59671 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -38,11 +38,14 @@ export class TopicAddMessageListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } static handle(clientMessage: ClientMessage, handleEventTopic: any, toObjectFunction: (data: Data) => any = null) { diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index a090458ad..45d59264e 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -38,11 +38,14 @@ export class TopicRemoveMessageListenerCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionCreateCodec.ts b/src/codec/TransactionCreateCodec.ts index f5bdb2aad..09e3b0c9a 100644 --- a/src/codec/TransactionCreateCodec.ts +++ b/src/codec/TransactionCreateCodec.ts @@ -42,11 +42,14 @@ export class TransactionCreateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalListAddCodec.ts b/src/codec/TransactionalListAddCodec.ts index f29e3394c..ad0b19820 100644 --- a/src/codec/TransactionalListAddCodec.ts +++ b/src/codec/TransactionalListAddCodec.ts @@ -42,11 +42,14 @@ export class TransactionalListAddCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalListRemoveCodec.ts b/src/codec/TransactionalListRemoveCodec.ts index 2e59f8a76..f0bf4c8b8 100644 --- a/src/codec/TransactionalListRemoveCodec.ts +++ b/src/codec/TransactionalListRemoveCodec.ts @@ -42,11 +42,14 @@ export class TransactionalListRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalListSizeCodec.ts b/src/codec/TransactionalListSizeCodec.ts index 8ac1a7628..4f58f28b9 100644 --- a/src/codec/TransactionalListSizeCodec.ts +++ b/src/codec/TransactionalListSizeCodec.ts @@ -40,11 +40,14 @@ export class TransactionalListSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapContainsKeyCodec.ts b/src/codec/TransactionalMapContainsKeyCodec.ts index 9afa386a0..28244757f 100644 --- a/src/codec/TransactionalMapContainsKeyCodec.ts +++ b/src/codec/TransactionalMapContainsKeyCodec.ts @@ -42,11 +42,14 @@ export class TransactionalMapContainsKeyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapGetCodec.ts b/src/codec/TransactionalMapGetCodec.ts index b43b0c437..f75cfde87 100644 --- a/src/codec/TransactionalMapGetCodec.ts +++ b/src/codec/TransactionalMapGetCodec.ts @@ -42,14 +42,17 @@ export class TransactionalMapGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapGetForUpdateCodec.ts b/src/codec/TransactionalMapGetForUpdateCodec.ts index 11197aea1..d976ea1d4 100644 --- a/src/codec/TransactionalMapGetForUpdateCodec.ts +++ b/src/codec/TransactionalMapGetForUpdateCodec.ts @@ -42,14 +42,17 @@ export class TransactionalMapGetForUpdateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapIsEmptyCodec.ts b/src/codec/TransactionalMapIsEmptyCodec.ts index cdadc9972..a4159f4ba 100644 --- a/src/codec/TransactionalMapIsEmptyCodec.ts +++ b/src/codec/TransactionalMapIsEmptyCodec.ts @@ -40,11 +40,14 @@ export class TransactionalMapIsEmptyCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapKeySetCodec.ts b/src/codec/TransactionalMapKeySetCodec.ts index f2b43b57c..dad774a70 100644 --- a/src/codec/TransactionalMapKeySetCodec.ts +++ b/src/codec/TransactionalMapKeySetCodec.ts @@ -40,8 +40,11 @@ export class TransactionalMapKeySetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class TransactionalMapKeySetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts index 84c9445d9..a5a2b029a 100644 --- a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts +++ b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts @@ -42,8 +42,11 @@ export class TransactionalMapKeySetWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class TransactionalMapKeySetWithPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapPutCodec.ts b/src/codec/TransactionalMapPutCodec.ts index 81e36e6c8..b9476ff7d 100644 --- a/src/codec/TransactionalMapPutCodec.ts +++ b/src/codec/TransactionalMapPutCodec.ts @@ -46,14 +46,17 @@ export class TransactionalMapPutCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapPutIfAbsentCodec.ts b/src/codec/TransactionalMapPutIfAbsentCodec.ts index 9969763c1..f2a7860ad 100644 --- a/src/codec/TransactionalMapPutIfAbsentCodec.ts +++ b/src/codec/TransactionalMapPutIfAbsentCodec.ts @@ -44,14 +44,17 @@ export class TransactionalMapPutIfAbsentCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapRemoveCodec.ts b/src/codec/TransactionalMapRemoveCodec.ts index 2c7a0c8a5..041bc500b 100644 --- a/src/codec/TransactionalMapRemoveCodec.ts +++ b/src/codec/TransactionalMapRemoveCodec.ts @@ -42,14 +42,17 @@ export class TransactionalMapRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapRemoveIfSameCodec.ts b/src/codec/TransactionalMapRemoveIfSameCodec.ts index e29a808ca..b5437dc22 100644 --- a/src/codec/TransactionalMapRemoveIfSameCodec.ts +++ b/src/codec/TransactionalMapRemoveIfSameCodec.ts @@ -44,11 +44,14 @@ export class TransactionalMapRemoveIfSameCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapReplaceCodec.ts b/src/codec/TransactionalMapReplaceCodec.ts index 8ddd1efbc..2842bf4e8 100644 --- a/src/codec/TransactionalMapReplaceCodec.ts +++ b/src/codec/TransactionalMapReplaceCodec.ts @@ -44,14 +44,17 @@ export class TransactionalMapReplaceCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapReplaceIfSameCodec.ts b/src/codec/TransactionalMapReplaceIfSameCodec.ts index 085396eec..7f896fee0 100644 --- a/src/codec/TransactionalMapReplaceIfSameCodec.ts +++ b/src/codec/TransactionalMapReplaceIfSameCodec.ts @@ -46,11 +46,14 @@ export class TransactionalMapReplaceIfSameCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapSizeCodec.ts b/src/codec/TransactionalMapSizeCodec.ts index e8655be0c..3861e15c3 100644 --- a/src/codec/TransactionalMapSizeCodec.ts +++ b/src/codec/TransactionalMapSizeCodec.ts @@ -40,11 +40,14 @@ export class TransactionalMapSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapValuesCodec.ts b/src/codec/TransactionalMapValuesCodec.ts index 26a7e3a95..a74b2858b 100644 --- a/src/codec/TransactionalMapValuesCodec.ts +++ b/src/codec/TransactionalMapValuesCodec.ts @@ -40,8 +40,11 @@ export class TransactionalMapValuesCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -51,8 +54,8 @@ export class TransactionalMapValuesCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMapValuesWithPredicateCodec.ts b/src/codec/TransactionalMapValuesWithPredicateCodec.ts index 06af4fd1b..0a6c50a43 100644 --- a/src/codec/TransactionalMapValuesWithPredicateCodec.ts +++ b/src/codec/TransactionalMapValuesWithPredicateCodec.ts @@ -42,8 +42,11 @@ export class TransactionalMapValuesWithPredicateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class TransactionalMapValuesWithPredicateCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMultiMapGetCodec.ts b/src/codec/TransactionalMultiMapGetCodec.ts index aa0eba34f..c1c73fd37 100644 --- a/src/codec/TransactionalMultiMapGetCodec.ts +++ b/src/codec/TransactionalMultiMapGetCodec.ts @@ -42,8 +42,11 @@ export class TransactionalMultiMapGetCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class TransactionalMultiMapGetCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMultiMapPutCodec.ts b/src/codec/TransactionalMultiMapPutCodec.ts index f425dfbda..8aad69a6c 100644 --- a/src/codec/TransactionalMultiMapPutCodec.ts +++ b/src/codec/TransactionalMultiMapPutCodec.ts @@ -44,11 +44,14 @@ export class TransactionalMultiMapPutCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMultiMapRemoveCodec.ts b/src/codec/TransactionalMultiMapRemoveCodec.ts index b6884e9c1..a43abd0e7 100644 --- a/src/codec/TransactionalMultiMapRemoveCodec.ts +++ b/src/codec/TransactionalMultiMapRemoveCodec.ts @@ -42,8 +42,11 @@ export class TransactionalMultiMapRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -53,8 +56,8 @@ export class TransactionalMultiMapRemoveCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts index f779f4cad..662e79823 100644 --- a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts +++ b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts @@ -44,11 +44,14 @@ export class TransactionalMultiMapRemoveEntryCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMultiMapSizeCodec.ts b/src/codec/TransactionalMultiMapSizeCodec.ts index 67edb34db..e0224ffea 100644 --- a/src/codec/TransactionalMultiMapSizeCodec.ts +++ b/src/codec/TransactionalMultiMapSizeCodec.ts @@ -40,11 +40,14 @@ export class TransactionalMultiMapSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalMultiMapValueCountCodec.ts b/src/codec/TransactionalMultiMapValueCountCodec.ts index aad880b94..fa16be382 100644 --- a/src/codec/TransactionalMultiMapValueCountCodec.ts +++ b/src/codec/TransactionalMultiMapValueCountCodec.ts @@ -42,11 +42,14 @@ export class TransactionalMultiMapValueCountCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalQueueOfferCodec.ts b/src/codec/TransactionalQueueOfferCodec.ts index 594a771bc..ccaa82ca5 100644 --- a/src/codec/TransactionalQueueOfferCodec.ts +++ b/src/codec/TransactionalQueueOfferCodec.ts @@ -44,11 +44,14 @@ export class TransactionalQueueOfferCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalQueuePeekCodec.ts b/src/codec/TransactionalQueuePeekCodec.ts index d6a38473a..5a5f509cf 100644 --- a/src/codec/TransactionalQueuePeekCodec.ts +++ b/src/codec/TransactionalQueuePeekCodec.ts @@ -42,14 +42,17 @@ export class TransactionalQueuePeekCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalQueuePollCodec.ts b/src/codec/TransactionalQueuePollCodec.ts index 0c890da88..bdd936e9a 100644 --- a/src/codec/TransactionalQueuePollCodec.ts +++ b/src/codec/TransactionalQueuePollCodec.ts @@ -42,14 +42,17 @@ export class TransactionalQueuePollCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalQueueSizeCodec.ts b/src/codec/TransactionalQueueSizeCodec.ts index 75e10c2b3..7a0a20b96 100644 --- a/src/codec/TransactionalQueueSizeCodec.ts +++ b/src/codec/TransactionalQueueSizeCodec.ts @@ -40,11 +40,14 @@ export class TransactionalQueueSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalQueueTakeCodec.ts b/src/codec/TransactionalQueueTakeCodec.ts index c7fb280ff..b8ca8ce9f 100644 --- a/src/codec/TransactionalQueueTakeCodec.ts +++ b/src/codec/TransactionalQueueTakeCodec.ts @@ -40,14 +40,17 @@ export class TransactionalQueueTakeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + if (clientMessage.readBoolean() !== true) { parameters['response'] = toObjectFunction(clientMessage.readData()); } - return parameters; + return parameters; } diff --git a/src/codec/TransactionalSetAddCodec.ts b/src/codec/TransactionalSetAddCodec.ts index b1cff2aca..7f119cb48 100644 --- a/src/codec/TransactionalSetAddCodec.ts +++ b/src/codec/TransactionalSetAddCodec.ts @@ -42,11 +42,14 @@ export class TransactionalSetAddCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalSetRemoveCodec.ts b/src/codec/TransactionalSetRemoveCodec.ts index c8cf6d1c4..b7a035e9e 100644 --- a/src/codec/TransactionalSetRemoveCodec.ts +++ b/src/codec/TransactionalSetRemoveCodec.ts @@ -42,11 +42,14 @@ export class TransactionalSetRemoveCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readBoolean(); - return parameters; + return parameters; } diff --git a/src/codec/TransactionalSetSizeCodec.ts b/src/codec/TransactionalSetSizeCodec.ts index 2d7f1cbed..71df2f7a0 100644 --- a/src/codec/TransactionalSetSizeCodec.ts +++ b/src/codec/TransactionalSetSizeCodec.ts @@ -40,11 +40,14 @@ export class TransactionalSetSizeCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readInt32(); - return parameters; + return parameters; } diff --git a/src/codec/XATransactionCollectTransactionsCodec.ts b/src/codec/XATransactionCollectTransactionsCodec.ts index 83ba8964c..ade6672fb 100644 --- a/src/codec/XATransactionCollectTransactionsCodec.ts +++ b/src/codec/XATransactionCollectTransactionsCodec.ts @@ -34,8 +34,11 @@ export class XATransactionCollectTransactionsCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + var responseSize = clientMessage.readInt32(); var response: any = []; @@ -45,8 +48,8 @@ export class XATransactionCollectTransactionsCodec { response.push(responseItem) } parameters['response'] = response; - return parameters; + return parameters; } diff --git a/src/codec/XATransactionCreateCodec.ts b/src/codec/XATransactionCreateCodec.ts index b6ace9d95..95344f74d 100644 --- a/src/codec/XATransactionCreateCodec.ts +++ b/src/codec/XATransactionCreateCodec.ts @@ -38,11 +38,14 @@ export class XATransactionCreateCodec { } static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { -// Decode response from client message - var parameters: any = {'response': null}; + // Decode response from client message + var parameters: any = { + 'response': null + }; + parameters['response'] = clientMessage.readString(); - return parameters; + return parameters; } From 0707736093ca57580da515ef37835e4e50162c9b Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 7 Nov 2017 09:48:25 -0500 Subject: [PATCH 011/685] clusterservice test fix --- test/ClusterServiceTest.js | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 569d087e3..a0fdfb666 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -2,13 +2,14 @@ var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; var Config = require('../.').Config; -var Address = require('../lib/Address'); +var Promise = require('bluebird'); describe('ClusterService', function() { this.timeout(15000); var cluster; var ownerMember; - before(function(done) { + + beforeEach(function(done) { Controller.createCluster(null, null).then(function(res) { cluster = res; Controller.startMember(cluster.id).then(function(res) { @@ -28,28 +29,35 @@ describe('ClusterService', function() { }); }); - after(function() { + afterEach(function() { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - it('should know when a new member joins to cluster', function() { + it('should know when a new member joins to cluster', function(done) { var member2; - return Controller.startMember(cluster.id).then(function(res) { + + client.getClusterService().once('memberAdded', function () { + expect(client.clusterService.getSize()).to.be.eq(2); + done(); + }); + + Controller.startMember(cluster.id).then(function(res) { member2 = res; - return expect(client.clusterService.getSize()).to.be.eq(2); - }).then(function() { - return Controller.shutdownMember(cluster.id, member2.uuid); }); }); - it('should know when a member leaves cluster', function() { + it('should know when a member leaves cluster', function(done) { var member2; - return Controller.startMember(cluster.id).then(function(res) { + + client.getClusterService().once('memberRemoved', function () { + expect(client.getClusterService().getSize()).to.be.eq(1); + done(); + }); + + Controller.startMember(cluster.id).then(function(res) { member2 = res; - return Controller.shutdownMember(cluster.id, member2.uuid); - }).then(function() { - return expect(client.clusterService.getSize()).to.be.eq(1); + Controller.shutdownMember(cluster.id, member2.uuid); }); }); From c0d58e52c28f9ef85c0c5f85d9a8326544e16aa6 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 7 Nov 2017 09:03:44 -0500 Subject: [PATCH 012/685] hazelcast version update to 3.9 for tests --- scripts/download-rc.sh | 2 +- test/atomiclong/AtomicLongTest.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 9de3760e2..89095caab 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,5 +1,5 @@ #!/bin/sh -HZ_VERSION="3.8" +HZ_VERSION="3.9" HAZELCAST_TEST_VERSION=${HZ_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} diff --git a/test/atomiclong/AtomicLongTest.js b/test/atomiclong/AtomicLongTest.js index 042f7b3ae..3d7647d81 100644 --- a/test/atomiclong/AtomicLongTest.js +++ b/test/atomiclong/AtomicLongTest.js @@ -31,7 +31,7 @@ describe("AtomicLong Proxy", function () { }); afterEach(function () { - l.destroy(); + return l.destroy(); }); after(function () { From 868184f95830f5d50f44122d3133bae965985058 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 7 Nov 2017 11:21:14 -0500 Subject: [PATCH 013/685] adds between predicate test and fixes between predicate serialization --- src/serialization/DefaultPredicates.ts | 4 ++-- test/map/MapPredicateTest.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index c01d73375..3252a5c2d 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -70,14 +70,14 @@ export class BetweenPredicate extends AbstractPredicate { readData(input: DataInput): any { this.field = input.readUTF(); - this.from = input.readObject(); this.to = input.readObject(); + this.from = input.readObject(); } writeData(output: DataOutput): void { output.writeUTF(this.field); - output.writeObject(this.from); output.writeObject(this.to); + output.writeObject(this.from); } getClassId(): number { diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index a9c5097bd..1c1054a02 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -137,6 +137,10 @@ describe("Predicates", function() { return testPredicate(Predicates.or(Predicates.greaterEqual('this', 49), Predicates.lessEqual('this', 0)), [0, 49]); }); + it('Between', function() { + return testPredicate(Predicates.isBetween('this', 47, 49), [47, 48, 49]); + }); + it('Null predicate throws error', function() { return expect(testPredicate.bind(null, null, [0, 49])).throw(assert.AssertionError); }); From be9a09a0782059bfb52f9e37f882e94de147c327 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 8 Nov 2017 10:09:21 -0500 Subject: [PATCH 014/685] non-smart listener service does not need periodic connection refresh --- src/ListenerService.ts | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/ListenerService.ts b/src/ListenerService.ts index ca3feef32..166f15f37 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -11,7 +11,7 @@ import {UuidUtil} from './util/UuidUtil'; import * as Promise from 'bluebird'; import {Invocation} from './invocation/InvocationService'; import {Member} from './core/Member'; -import ClientMessage = require('./ClientMessage'); +import * as assert from 'assert'; import {ListenerMessageCodec} from './ListenerMessageCodec'; export class ListenerService implements ConnectionHeartbeatListener { @@ -42,7 +42,9 @@ export class ListenerService implements ConnectionHeartbeatListener { start() { this.client.getConnectionManager().on('connectionOpened', this.onConnectionAdded.bind(this)); this.client.getConnectionManager().on('connectionClosed', this.onConnectionRemoved.bind(this)); - this.connectionRefreshTask = this.connectionRefreshHandler(); + if (this.isSmart() ) { + this.connectionRefreshTask = this.connectionRefreshHandler(); + } } protected connectionRefreshHandler(): void { @@ -139,7 +141,14 @@ export class ListenerService implements ConnectionHeartbeatListener { } registerListener(codec: ListenerMessageCodec, registerHandlerFunc: any): Promise { - return this.trySyncConnectToAllConnections().then(() => { + let readyToRegisterPromise: Promise; + if (this.isSmart()) { + readyToRegisterPromise = this.trySyncConnectToAllConnections(); + } else { + //No need for preparation, just return a resolved promise + readyToRegisterPromise = Promise.resolve(); + } + return readyToRegisterPromise.then(() => { return this.registerListenerInternal(codec, registerHandlerFunc); }); } @@ -209,17 +218,13 @@ export class ListenerService implements ConnectionHeartbeatListener { } private trySyncConnectToAllConnections(): Promise { - if (this.isSmart()) { - var members = this.client.getClusterService().getMembers(); - var promises: Promise[] = []; - members.forEach((member: Member) => { - promises.push(this.client.getConnectionManager().getOrConnect(member.address)); - }); - return Promise.all(promises).thenReturn(); - } else { - let owner = this.client.getClusterService().getOwnerConnection(); - return this.client.getConnectionManager().getOrConnect(owner.address).thenReturn(); - } + assert(this.isSmart()); + var members = this.client.getClusterService().getMembers(); + var promises: Promise[] = []; + members.forEach((member: Member) => { + promises.push(this.client.getConnectionManager().getOrConnect(member.address)); + }); + return Promise.all(promises).thenReturn(); } isSmart(): boolean { From 431ea870fce9ad32f7674836ff687735f8b57d8f Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 1 Nov 2017 14:53:36 -0400 Subject: [PATCH 015/685] ProxyManager cleanup --- src/Address.ts | 1 - src/HazelcastClient.ts | 23 +++++----- src/proxy/ProxyManager.ts | 89 ++++++++++++++++++--------------------- 3 files changed, 54 insertions(+), 59 deletions(-) diff --git a/src/Address.ts b/src/Address.ts index 8f6957cca..b03aef4e1 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -19,7 +19,6 @@ class Address implements IdentifiedDataSerializable { } } - readData(input: DataInput): any { this.port = input.readInt(); this.type = input.readByte(); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index d7d67b2d3..6a4d5ab7a 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -11,7 +11,7 @@ import {ClientGetDistributedObjectsCodec} from './codec/ClientGetDistributedObje import {DistributedObject} from './DistributedObject'; import {ClientInfo} from './ClientInfo'; import ClientConnectionManager = require('./invocation/ClientConnectionManager'); -import ProxyManager = require('./proxy/ProxyManager'); +import {ProxyManager} from './proxy/ProxyManager'; import PartitionService = require('./PartitionService'); import ClusterService = require('./invocation/ClusterService'); import Heartbeat = require('./HeartbeatService'); @@ -79,6 +79,7 @@ export default class HazelcastClient { }).then(() => { this.lifecycleService.emitLifecycleEvent(LifecycleEvent.started); }).then(() => { + this.proxyManager.init(); this.listenerService.start(); this.loggingService.info('HazelcastClient', 'Client started'); return this; @@ -118,7 +119,7 @@ export default class HazelcastClient { * @returns {IMap} */ getMap(name: string): IMap { - return >this.proxyManager.getOrCreateProxy(name, this.proxyManager.MAP_SERVICE); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.MAP_SERVICE); } /** @@ -127,7 +128,7 @@ export default class HazelcastClient { * @returns {ISet} */ getSet(name: string): ISet { - return >this.proxyManager.getOrCreateProxy(name, this.proxyManager.SET_SERVICE); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.SET_SERVICE); } /** @@ -136,7 +137,7 @@ export default class HazelcastClient { * @returns {ILock} */ getLock(name: string): ILock { - return this.proxyManager.getOrCreateProxy(name, this.proxyManager.LOCK_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.LOCK_SERVICE); } @@ -146,7 +147,7 @@ export default class HazelcastClient { * @returns {IQueue} */ getQueue(name: string): IQueue { - return >this.proxyManager.getOrCreateProxy(name, this.proxyManager.QUEUE_SERVICE); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.QUEUE_SERVICE); } /** @@ -155,7 +156,7 @@ export default class HazelcastClient { * @returns {IQueue} */ getList(name: string): IList { - return >this.proxyManager.getOrCreateProxy(name, this.proxyManager.LIST_SERVICE); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.LIST_SERVICE); } /** @@ -164,7 +165,7 @@ export default class HazelcastClient { * @returns {MultiMap} */ getMultiMap(name: string): MultiMap { - return >this.proxyManager.getOrCreateProxy(name, this.proxyManager.MULTIMAP_SERVICE); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.MULTIMAP_SERVICE); } /** @@ -173,7 +174,7 @@ export default class HazelcastClient { * @returns {IRingbuffer} */ getRingbuffer(name: string): IRingbuffer { - return >this.proxyManager.getOrCreateProxy(name, this.proxyManager.RINGBUFFER_SERVICE); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE); } /** @@ -186,11 +187,11 @@ export default class HazelcastClient { } getReplicatedMap(name: string): IReplicatedMap { - return >this.proxyManager.getOrCreateProxy(name, this.proxyManager.REPLICATEDMAP_SERVICE); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE); } getAtomicLong(name: string): IAtomicLong { - return this.proxyManager.getOrCreateProxy(name, this.proxyManager.ATOMICLONG_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.ATOMICLONG_SERVICE); } /** @@ -199,7 +200,7 @@ export default class HazelcastClient { * @returns {ISemaphore} */ getSemaphore(name: string): ISemaphore { - return this.proxyManager.getOrCreateProxy(name, this.proxyManager.SEMAPHORE_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.SEMAPHORE_SERVICE); } /** diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index fb42df0ae..9c730a9f6 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -3,7 +3,6 @@ import {DistributedObject} from '../DistributedObject'; import {MapProxy} from './MapProxy'; import {SetProxy} from './SetProxy'; import {ClientCreateProxyCodec} from '../codec/ClientCreateProxyCodec'; -import ClientConnection = require('../invocation/ClientConnection'); import ClientMessage = require('../ClientMessage'); import {ClientDestroyProxyCodec} from '../codec/ClientDestroyProxyCodec'; import {ClientAddDistributedObjectListenerCodec} from '../codec/ClientAddDistributedObjectListenerCodec'; @@ -24,34 +23,22 @@ import {Invocation} from '../invocation/InvocationService'; import {Member} from '../core/Member'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; -class ProxyManager { - public MAP_SERVICE: string = 'hz:impl:mapService'; - public SET_SERVICE: string = 'hz:impl:setService'; - public LOCK_SERVICE: string = 'hz:impl:lockService'; - public QUEUE_SERVICE: string = 'hz:impl:queueService'; - public LIST_SERVICE: string = 'hz:impl:listService'; - public MULTIMAP_SERVICE: string = 'hz:impl:multiMapService'; - public RINGBUFFER_SERVICE: string = 'hz:impl:ringbufferService'; - public REPLICATEDMAP_SERVICE: string = 'hz:impl:replicatedMapService'; - public SEMAPHORE_SERVICE: string = 'hz:impl:semaphoreService'; - public ATOMICLONG_SERVICE: string = 'hz:impl:atomicLongService'; +export class ProxyManager { + public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; + public static readonly SET_SERVICE: string = 'hz:impl:setService'; + public static readonly LOCK_SERVICE: string = 'hz:impl:lockService'; + public static readonly QUEUE_SERVICE: string = 'hz:impl:queueService'; + public static readonly LIST_SERVICE: string = 'hz:impl:listService'; + public static readonly MULTIMAP_SERVICE: string = 'hz:impl:multiMapService'; + public static readonly RINGBUFFER_SERVICE: string = 'hz:impl:ringbufferService'; + public static readonly REPLICATEDMAP_SERVICE: string = 'hz:impl:replicatedMapService'; + public static readonly SEMAPHORE_SERVICE: string = 'hz:impl:semaphoreService'; + public static readonly ATOMICLONG_SERVICE: string = 'hz:impl:atomicLongService'; - public service: any = { - 'hz:impl:mapService': MapProxy, - 'hz:impl:setService': SetProxy, - 'hz:impl:queueService': QueueProxy, - 'hz:impl:listService': ListProxy, - 'hz:impl:lockService': LockProxy, - 'hz:impl:multiMapService': MultiMapProxy, - 'hz:impl:ringbufferService': RingbufferProxy, - 'hz:impl:replicatedMapService': ReplicatedMapProxy, - 'hz:impl:semaphoreService': SemaphoreProxy, - 'hz:impl:atomicLongService': AtomicLongProxy - }; - - private proxies: { [proxyName: string]: DistributedObject; } = {}; - private client: HazelcastClient; - private logger = LoggingService.getLoggingService(); + public readonly service: {[serviceName: string]: any} = {}; + private readonly proxies: { [proxyName: string]: DistributedObject; } = {}; + private readonly client: HazelcastClient; + private readonly logger = LoggingService.getLoggingService(); private readonly invocationTimeoutMillis: number; private readonly invocationRetryPauseMillis: number; @@ -61,12 +48,25 @@ class ProxyManager { this.invocationRetryPauseMillis = this.client.getInvocationService().getInvocationRetryPauseMillis(); } + public init(): void { + this.service[ProxyManager.MAP_SERVICE] = MapProxy; + this.service[ProxyManager.SET_SERVICE] = SetProxy; + this.service[ProxyManager.QUEUE_SERVICE] = QueueProxy; + this.service[ProxyManager.LIST_SERVICE] = ListProxy; + this.service[ProxyManager.LOCK_SERVICE] = LockProxy; + this.service[ProxyManager.MULTIMAP_SERVICE] = MultiMapProxy; + this.service[ProxyManager.RINGBUFFER_SERVICE] = RingbufferProxy; + this.service[ProxyManager.REPLICATEDMAP_SERVICE] = ReplicatedMapProxy; + this.service[ProxyManager.SEMAPHORE_SERVICE] = SemaphoreProxy; + this.service[ProxyManager.ATOMICLONG_SERVICE] = AtomicLongProxy; + } + public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): DistributedObject { if (this.proxies[name]) { return this.proxies[name]; } else { - var newProxy: DistributedObject; - if (serviceName === this.MAP_SERVICE && this.client.getConfig().nearCacheConfigs[name]) { + let newProxy: DistributedObject; + if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().nearCacheConfigs[name]) { newProxy = new NearCachedMapProxy(this.client, serviceName, name); } else { newProxy = new this.service[serviceName](this.client, serviceName, name); @@ -80,18 +80,16 @@ class ProxyManager { } private createProxy(proxyObject: DistributedObject): Promise { - var promise = Promise.defer(); - + let promise = Promise.defer(); this.initializeProxy(proxyObject, promise, Date.now() + this.invocationTimeoutMillis); - return promise.promise; } private findNextAddress(): Address { - var members = this.client.getClusterService().getMembers(); - var liteMember: Member = null; - for (var i = 0; i < members.length; i++) { - var currentMember = members[i]; + let members = this.client.getClusterService().getMembers(); + let liteMember: Member = null; + for (let i = 0; i < members.length; i++) { + let currentMember = members[i]; if (currentMember != null && currentMember.isLiteMember === false) { return currentMember.address; } else if (currentMember != null && currentMember.isLiteMember) { @@ -108,9 +106,9 @@ class ProxyManager { private initializeProxy(proxyObject: DistributedObject, promise: Promise.Resolver, deadline: number): void { if (Date.now() <= deadline) { - var address: Address = this.findNextAddress(); - var request = ClientCreateProxyCodec.encodeRequest(proxyObject.getName(), proxyObject.getServiceName(), address); - var invocation = new Invocation(this.client, request); + let address: Address = this.findNextAddress(); + let request = ClientCreateProxyCodec.encodeRequest(proxyObject.getName(), proxyObject.getServiceName(), address); + let invocation = new Invocation(this.client, request); invocation.address = address; this.client.getInvocationService().invoke(invocation).then((response) => { promise.resolve(response); @@ -126,16 +124,14 @@ class ProxyManager { destroyProxy(name: string, serviceName: string): Promise { delete this.proxies[name]; - var clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); + let clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); clientMessage.setPartitionId(-1); - return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).then(function () { - return; - }); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).return(); } addDistributedObjectListener(listenerFunc: Function): Promise { - var handler = function (clientMessage: ClientMessage) { - var converterFunc = function (name: string, serviceName: string, eventType: string) { + let handler = function (clientMessage: ClientMessage) { + let converterFunc = function (name: string, serviceName: string, eventType: string) { if (eventType === 'CREATED') { listenerFunc(name, serviceName, 'created'); } else if (eventType === 'DESTROYED') { @@ -166,4 +162,3 @@ class ProxyManager { }; } } -export = ProxyManager; From babd67fc262ea8ca2701ae4302d933a21c38f68e Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 1 Nov 2017 15:58:23 -0400 Subject: [PATCH 016/685] export refactor --- src/ClientMessage.ts | 2 +- src/HazelcastClient.ts | 8 ++++---- src/HeartbeatService.ts | 7 ++----- src/ListenerService.ts | 2 +- src/PartitionService.ts | 8 +++----- src/core/ConnectionHeartbeatListener.ts | 3 ++- src/invocation/ClientConnection.ts | 8 +++----- src/invocation/ClientConnectionManager.ts | 8 +++----- src/invocation/ClientEventRegistration.ts | 2 +- src/invocation/ClusterService.ts | 10 ++++------ src/invocation/ConnectionAuthenticator.ts | 11 ++++------- src/invocation/InvocationService.ts | 4 ++-- src/proxy/MapProxy.ts | 7 +++---- 13 files changed, 33 insertions(+), 47 deletions(-) diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 92b87ff1a..ea88aab1d 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -20,7 +20,7 @@ | ... */ -import Long = require('long'); +import * as Long from 'long'; import {BitsUtil} from './BitsUtil'; import {Data} from './serialization/Data'; import {HeapData} from './serialization/HeapData'; diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 6a4d5ab7a..c051abbb1 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -10,11 +10,11 @@ import {LifecycleService, LifecycleEvent} from './LifecycleService'; import {ClientGetDistributedObjectsCodec} from './codec/ClientGetDistributedObjectsCodec'; import {DistributedObject} from './DistributedObject'; import {ClientInfo} from './ClientInfo'; -import ClientConnectionManager = require('./invocation/ClientConnectionManager'); +import {ClientConnectionManager} from './invocation/ClientConnectionManager'; import {ProxyManager} from './proxy/ProxyManager'; -import PartitionService = require('./PartitionService'); -import ClusterService = require('./invocation/ClusterService'); -import Heartbeat = require('./HeartbeatService'); +import {PartitionService} from './PartitionService'; +import {ClusterService} from './invocation/ClusterService'; +import {Heartbeat} from './HeartbeatService'; import {IQueue} from './proxy/IQueue'; import {IList} from './proxy/IList'; import {ILock} from './proxy/ILock'; diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts index 2c53fe3fe..87621ab92 100644 --- a/src/HeartbeatService.ts +++ b/src/HeartbeatService.ts @@ -1,9 +1,8 @@ import {ClientPingCodec} from './codec/ClientPingCodec'; import HazelcastClient from './HazelcastClient'; -import ClientConnection = require('./invocation/ClientConnection'); +import {ClientConnection} from './invocation/ClientConnection'; import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; import {LoggingService} from './logging/LoggingService'; -import Address = require('./Address'); const PROPERTY_HEARTBEAT_INTERVAL: string = 'hazelcast.client.heartbeat.interval'; const PROPERTY_HEARTBEAT_TIMEOUT: string = 'hazelcast.client.heartbeat.timeout'; @@ -11,7 +10,7 @@ const PROPERTY_HEARTBEAT_TIMEOUT: string = 'hazelcast.client.heartbeat.timeout'; /** * Hearbeat Service */ -class Heartbeat { +export class Heartbeat { private client: HazelcastClient; private heartbeatTimeout: number; private heartbeatInterval: number; @@ -98,5 +97,3 @@ class Heartbeat { } } - -export = Heartbeat; diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 166f15f37..96610fbdc 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -2,7 +2,6 @@ import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; import HazelcastClient from './HazelcastClient'; import {EventEmitter} from 'events'; import {LoggingService} from './logging/LoggingService'; -import ClientConnection = require('./invocation/ClientConnection'); import {ClientEventRegistration} from './invocation/ClientEventRegistration'; import {RegistrationKey} from './invocation/RegistrationKey'; import {HazelcastError} from './HazelcastError'; @@ -13,6 +12,7 @@ import {Invocation} from './invocation/InvocationService'; import {Member} from './core/Member'; import * as assert from 'assert'; import {ListenerMessageCodec} from './ListenerMessageCodec'; +import {ClientConnection} from './invocation/ClientConnection'; export class ListenerService implements ConnectionHeartbeatListener { private client: HazelcastClient; diff --git a/src/PartitionService.ts b/src/PartitionService.ts index f9f5f045f..ca272fffd 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -1,12 +1,12 @@ import * as Promise from 'bluebird'; +import HazelcastClient from './HazelcastClient'; import GetPartitionsCodec = require('./codec/GetPartitionsCodec'); -import ClientMessage = require('./ClientMessage'); import Address = require('./Address'); -import HazelcastClient from './HazelcastClient'; +import ClientMessage = require('./ClientMessage'); const PARTITION_REFRESH_INTERVAL = 10000; -class PartitionService { +export class PartitionService { private client: HazelcastClient; private partitionMap: {[partitionId: number]: Address} = {}; @@ -79,5 +79,3 @@ class PartitionService { return this.partitionCount; } } - -export = PartitionService; diff --git a/src/core/ConnectionHeartbeatListener.ts b/src/core/ConnectionHeartbeatListener.ts index 3272f1e0e..c4d230caf 100644 --- a/src/core/ConnectionHeartbeatListener.ts +++ b/src/core/ConnectionHeartbeatListener.ts @@ -1,4 +1,5 @@ -import ClientConnection = require('../invocation/ClientConnection'); +import {ClientConnection} from '../invocation/ClientConnection'; + /** * Listener interface for heartbeat service. */ diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 3b3fb282f..13acaa691 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -1,14 +1,14 @@ import net = require('net'); import tls = require('tls'); import stream = require('stream'); +import Address = require('../Address'); import * as Promise from 'bluebird'; import {BitsUtil} from '../BitsUtil'; import {LoggingService} from '../logging/LoggingService'; import {ClientNetworkConfig} from '../Config'; -import Address = require('../Address'); -import ClientConnectionManager = require('./ClientConnectionManager'); +import {ClientConnectionManager} from './ClientConnectionManager'; -class ClientConnection { +export class ClientConnection { address: Address; localAddress: Address; socket: stream.Duplex; @@ -124,5 +124,3 @@ class ClientConnection { }); } } - -export = ClientConnection; diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index b7b15cd8a..706efcf4a 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -3,9 +3,9 @@ import {LoggingService} from '../logging/LoggingService'; import {EventEmitter} from 'events'; import HazelcastClient from '../HazelcastClient'; import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; +import {ClientConnection} from './ClientConnection'; +import {ConnectionAuthenticator} from './ConnectionAuthenticator'; import Address = require('../Address'); -import ClientConnection = require('./ClientConnection'); -import ConnectionAuthenticator = require('./ConnectionAuthenticator'); const EMIT_CONNECTION_CLOSED = 'connectionClosed'; const EMIT_CONNECTION_OPENED = 'connectionOpened'; @@ -13,7 +13,7 @@ const EMIT_CONNECTION_OPENED = 'connectionOpened'; /** * Maintains connections between the client and members of the cluster. */ -class ClientConnectionManager extends EventEmitter { +export class ClientConnectionManager extends EventEmitter { private client: HazelcastClient; private pendingConnections: {[address: string]: Promise.Resolver} = {}; private logger = LoggingService.getLoggingService(); @@ -120,5 +120,3 @@ class ClientConnectionManager extends EventEmitter { return authenticator.authenticate(ownerConnection); } } - -export = ClientConnectionManager; diff --git a/src/invocation/ClientEventRegistration.ts b/src/invocation/ClientEventRegistration.ts index beffbe0d0..206db4066 100644 --- a/src/invocation/ClientEventRegistration.ts +++ b/src/invocation/ClientEventRegistration.ts @@ -1,6 +1,6 @@ import * as Long from 'long'; -import ClientConnection = require('./ClientConnection'); import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ClientConnection} from './ClientConnection'; export class ClientEventRegistration { readonly serverRegistrationId: string; diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index b2712f6e7..ef1f3d00b 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -1,13 +1,13 @@ -import ClientConnection = require('./ClientConnection'); -import Address = require('../Address'); +import {ClientConnection} from './ClientConnection'; import * as Promise from 'bluebird'; import {ClientAddMembershipListenerCodec} from '../codec/ClientAddMembershipListenerCodec'; -import ClientMessage = require('../ClientMessage'); import {Member} from '../core/Member'; import {LoggingService} from '../logging/LoggingService'; import {EventEmitter} from 'events'; import {ClientInfo} from '../ClientInfo'; import HazelcastClient from '../HazelcastClient'; +import Address = require('../Address'); +import ClientMessage = require('../ClientMessage'); const MEMBER_ADDED = 1; const MEMBER_REMOVED = 2; @@ -23,7 +23,7 @@ const ATTRIBUTE_CHANGE: {[key: string]: string} = { /** * Manages the relationship of this client with the cluster. */ -class ClusterService extends EventEmitter { +export class ClusterService extends EventEmitter { /** * The unique identifier of the owner server node. This node is responsible for resource cleanup @@ -226,5 +226,3 @@ class ClusterService extends EventEmitter { this.emit(EMIT_MEMBER_REMOVED, member); } } - -export = ClusterService; diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index 572e1e1cf..d3f08c04e 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -2,13 +2,12 @@ import * as Promise from 'bluebird'; import {ClientAuthenticationCodec} from '../codec/ClientAuthenticationCodec'; import HazelcastClient from '../HazelcastClient'; import {ClientAuthenticationCustomCodec} from '../codec/ClientAuthenticationCustomCodec'; - -import ClientConnection = require('./ClientConnection'); -import ClientMessage = require('../ClientMessage'); -import ClusterService = require('./ClusterService'); +import {ClientConnection} from './ClientConnection'; +import {ClusterService} from './ClusterService'; import {BuildInfoLoader} from '../BuildInfoLoader'; +import ClientMessage = require('../ClientMessage'); -class ConnectionAuthenticator { +export class ConnectionAuthenticator { private connection: ClientConnection; private client: HazelcastClient; @@ -65,5 +64,3 @@ class ConnectionAuthenticator { return clientMessage; } } - -export = ConnectionAuthenticator; diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index c86c01346..732fa394f 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -1,12 +1,12 @@ -import ClientConnection = require('./ClientConnection'); import ClientMessage = require('../ClientMessage'); -import Long = require('long'); +import * as Long from 'long'; import Address = require('../Address'); import ExceptionCodec = require('../codec/ExceptionCodec'); import * as Promise from 'bluebird'; import {BitsUtil} from '../BitsUtil'; import {LoggingService} from '../logging/LoggingService'; import HazelcastClient from '../HazelcastClient'; +import {ClientConnection} from './ClientConnection'; var EXCEPTION_MESSAGE_TYPE = 109; const MAX_FAST_INVOCATION_COUNT = 5; diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index e5794dcf5..414b83750 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -3,8 +3,6 @@ import {IMap} from './IMap'; import * as Promise from 'bluebird'; import {Data} from '../serialization/Data'; import {MapPutCodec} from '../codec/MapPutCodec'; -import ClientMessage = require('../ClientMessage'); -import murmur = require('../invocation/Murmur'); import {MapGetCodec} from '../codec/MapGetCodec'; import {MapClearCodec} from '../codec/MapClearCodec'; import {MapSizeCodec} from '../codec/MapSizeCodec'; @@ -44,8 +42,8 @@ import {MapAddEntryListenerCodec} from '../codec/MapAddEntryListenerCodec'; import {EntryEventType} from '../core/EntryEventType'; import {MapAddEntryListenerToKeyCodec} from '../codec/MapAddEntryListenerToKeyCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; -import {assertNotNull, getSortedQueryResultSet, assertArray} from '../Util'; -import {Predicate, IterationType} from '../core/Predicate'; +import {assertArray, assertNotNull, getSortedQueryResultSet} from '../Util'; +import {IterationType, Predicate} from '../core/Predicate'; import {MapEntriesWithPredicateCodec} from '../codec/MapEntriesWithPredicateCodec'; import {MapKeySetWithPredicateCodec} from '../codec/MapKeySetWithPredicateCodec'; import {MapValuesWithPredicateCodec} from '../codec/MapValuesWithPredicateCodec'; @@ -61,6 +59,7 @@ import {MapExecuteOnKeyCodec} from '../codec/MapExecuteOnKeyCodec'; import {MapExecuteOnKeysCodec} from '../codec/MapExecuteOnKeysCodec'; import * as SerializationUtil from '../serialization/SerializationUtil'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import ClientMessage = require('../ClientMessage'); export class MapProxy extends BaseProxy implements IMap { From 29b032b445aef8bc54aefe37e02b8711217feb78 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 10 Nov 2017 15:31:33 -0500 Subject: [PATCH 017/685] update ssl ca to the one used in ssl-mutual-authentication folder on hazelcast side --- test/ssl/ClientSslTest.js | 4 ++-- test/ssl/hazelcast-ssl.xml | 12 +++++++----- test/ssl/hazelcast.pem | 15 --------------- test/ssl/server1.pem | 20 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 test/ssl/hazelcast.pem create mode 100644 test/ssl/server1.pem diff --git a/test/ssl/ClientSslTest.js b/test/ssl/ClientSslTest.js index d19734742..b7fc7a263 100644 --- a/test/ssl/ClientSslTest.js +++ b/test/ssl/ClientSslTest.js @@ -14,8 +14,8 @@ var markEnterprise = require('../Util').markEnterprise; var authorizedSslConfig = new Config.ClientConfig(); authorizedSslConfig.networkConfig.sslOptions = {rejectUnauthorized: true, - ca: [ fs.readFileSync(__dirname + '/hazelcast.pem') ], - servername:'Hazelcast, Inc' + ca: [ fs.readFileSync(__dirname + '/server1.pem') ], + servername:'foo.bar.com' }; var unauthorizedSslConfig = new Config.ClientConfig(); diff --git a/test/ssl/hazelcast-ssl.xml b/test/ssl/hazelcast-ssl.xml index 52343d063..c826f0eee 100644 --- a/test/ssl/hazelcast-ssl.xml +++ b/test/ssl/hazelcast-ssl.xml @@ -47,12 +47,14 @@ com.hazelcast.nio.ssl.ClasspathSSLContextFactory - com/hazelcast/nio/ssl/hazelcast.keystore - com/hazelcast/nio/ssl/hazelcast.truststore - 123456 - 123456 - SunX509 + com/hazelcast/nio/ssl-mutual-auth/server1.keystore + password + + SunX509 TLS diff --git a/test/ssl/hazelcast.pem b/test/ssl/hazelcast.pem deleted file mode 100644 index 7b12495d5..000000000 --- a/test/ssl/hazelcast.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUzCCAbygAwIBAgIEUiROSjANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJU -UjERMA8GA1UECBMISXN0YW5idWwxETAPBgNVBAcTCElzdGFuYnVsMRIwEAYDVQQK -EwlIYXplbGNhc3QxDDAKBgNVBAsMA1ImRDEXMBUGA1UEAxMOSGF6ZWxjYXN0LCBJ -bmMwHhcNMTMwOTAyMDgzNzMwWhcNMjMwNzEyMDgzNzMwWjBuMQswCQYDVQQGEwJU -UjERMA8GA1UECBMISXN0YW5idWwxETAPBgNVBAcTCElzdGFuYnVsMRIwEAYDVQQK -EwlIYXplbGNhc3QxDDAKBgNVBAsMA1ImRDEXMBUGA1UEAxMOSGF6ZWxjYXN0LCBJ -bmMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJVr0Aj6B6nFef8hdLflwwLB -271XPuI9+KMZwPnEwivPqRtbs3Bj9IiyzM5RavZxqrUHrnoTgeMLZhw08GS1WG+K -BTlTkjHJ5NHbBwImBfvLzXTQo/KfmvWph+AlJm4j0iPAKWfrwiI2vnLuiNhCs0GZ -KYOZaysosqScKWRWLYM/AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAEvQo6VdQri4S -EtjgktSDTS2WcRXKE6RvESoOp7OfOenI6KeS0K81KCJ7ha+ILjl6iwj4Jkwm3Si1 -XGFx/wcILQkjXm6tBl4EC6YrpJq1EXR6MyP6GcDk1mQ9QfA/Vf6ocsAiBxUX4WDl -0yfw/PKQ1CfbCkIFYhFaM2gyAeDdkF8= ------END CERTIFICATE----- diff --git a/test/ssl/server1.pem b/test/ssl/server1.pem new file mode 100644 index 000000000..dc647d9dd --- /dev/null +++ b/test/ssl/server1.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDUzCCAjugAwIBAgIEI2J/sTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV +UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD +VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyN1oX +DTI3MDYxNjEyMjYyN1owWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG +A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm +b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKv/z3l/ +gJVUELF+pKkn0NV1rJq5aQGOMi1RE8cMbmmY9qz35Bo932VWJa6YJdkpBovnubuV +SsFu6/tp2DKrZ27v0IdQegsQMdnOfe2nbniRa6V/78z/2MF5BsH+dcnhgdecqqen +uYv2UW6f6ZjpP4pjRIYJ02CIOFGEsf9PVehn815KEwhgoWkz7gVHVafmYbmLW93e +CeVzK7a3/ELSmNlG0PDl0RmM0QnVZnCgCVJHK2yYbjGiosCLxHflwgf9hO9JTwnx +1LYjuUY2wJeDPFfW/bS6bQ/hBuYlYW3t2agBFGEbhmNj95ReDdXSpfXcYL3KICqQ +sx32vMgVsy1fL+ECAwEAAaMhMB8wHQYDVR0OBBYEFACbwiUEgAeQ1NEN2TJ04Zn3 +FgedMA0GCSqGSIb3DQEBCwUAA4IBAQCKw8JegZGGYLv1vXAZLvr2qx37JWhlaq3w +No7SrB2h8WfJaBoSULk27m4IrgXC5Rzahl9YMWYSDb7y4vPTXaLT54sy97yE14d+ +Kut8txTLsLfvTqyiNGBHUZL0nkGvcrs1pjRN1EwXi5pMuxqHbvBs834xUJzwXGEv +fsVyf1OTLd0nU0WIoGCnI2Jm4yHqfN1789GIiRmcZMgMlunI5391UXP7PgWg9abi +MzpiahvnWbpzuT/ETHXNIVFFLC21SMAw1G14ahdEfz+8ipH0CoQ3neIeF9kULXKC +QvnHwDQlPJGycP++cJoiSPQoS1ihbMC36E3PI/INv1zpNaHrzqlG +-----END CERTIFICATE----- From d58042fcde1cb9642f0f756254f776f40f827c86 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 13 Nov 2017 16:29:08 -0500 Subject: [PATCH 018/685] mutual auth tests --- test/ssl/ClientSSLAuthenticationTest.js | 105 ++++++++++++++++++++++++ test/ssl/client1.pem | 20 +++++ test/ssl/client2.pem | 20 +++++ test/ssl/hazelcast-ma-optional.xml | 62 ++++++++++++++ test/ssl/hazelcast-ma-required.xml | 62 ++++++++++++++ test/ssl/server2.pem | 20 +++++ 6 files changed, 289 insertions(+) create mode 100644 test/ssl/ClientSSLAuthenticationTest.js create mode 100644 test/ssl/client1.pem create mode 100644 test/ssl/client2.pem create mode 100644 test/ssl/hazelcast-ma-optional.xml create mode 100644 test/ssl/hazelcast-ma-required.xml create mode 100644 test/ssl/server2.pem diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js new file mode 100644 index 000000000..9120901d0 --- /dev/null +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -0,0 +1,105 @@ +var chai = require("chai"); +var expect = chai.expect; +var fs = require('fs'); +var chaiAsPromised = require("chai-as-promised"); +chai.use(chaiAsPromised); +var Client = require("../../.").Client; +var Controller = require('./../RC'); +var Config = require('../..').Config; +var Promise = require('bluebird'); +var markEnterprise = require('../Util').markEnterprise; + +var serverKnowsClient = [true, false]; +var clientKnowsServer = [true, false]; +var mutualAuthRequired = [true, false]; + +describe('SSL Client Authentication Test', function () { + var cluster; + var member; + var client; + + var maRequiredXML = __dirname + '/hazelcast-ma-required.xml'; + var maOptionalXML = __dirname + '/hazelcast-ma-optional.xml'; + + afterEach(function () { + if (client) + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + function createMemberWithXML(xmlFile) { + return Controller.createCluster(null, fs.readFileSync(xmlFile, 'utf8')).then(function(cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }).then(function (m) { + member = m; + return Promise.resolve(); + }); + } + + function createClientConfigWithSSLOpts(key, ca) { + var sslOpts = { + servername: 'foo.bar.com', + rejectUnauthorized: true, + cert: fs.readFileSync(__dirname + key), + ca: fs.readFileSync(__dirname + ca) + }; + var cfg = new Config.ClientConfig(); + cfg.networkConfig.sslOptions = sslOpts; + return cfg; + } + + it('ma:required, they both know each other should connect', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server1.pem')); + }).then(function(cl) { + client = cl; + }) + }); + + it('ma:required, server knows client, client does not know server should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))).to.throw; + }); + }); + + it('ma:required, server does not know client, client knows server should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server1.pem'))).to.throw; + }); + }); + + it('ma:required, neither one knows the other should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server2.pem'))).to.throw; + }); + }); + + it('ma:optional, they both know each other should connect', function () { + return createMemberWithXML(maOptionalXML).then(function () { + return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server1.pem')); + }).then(function(cl) { + client = cl; + }); + }); + + it('ma:optional, server knows client, client does not know server should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))).to.throw; + }); + }); + + it('ma:optional, server does not know client, client knows server should connect', function () { + return createMemberWithXML(maOptionalXML).then(function () { + return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server1.pem')); + }).then(function(cl) { + client = cl; + }) + }); + + it('ma:optional, neither knows the otherr should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server2.pem'))).to.throw; + }); + }); +}); diff --git a/test/ssl/client1.pem b/test/ssl/client1.pem new file mode 100644 index 000000000..5cc9604ab --- /dev/null +++ b/test/ssl/client1.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDUzCCAjugAwIBAgIEYtZhRjANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV +UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD +VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyOFoX +DTI3MDYxNjEyMjYyOFowWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG +A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm +b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKL+xBBd +OLIlMIN54lStfR97DEdDhHu4qyKThhDnX8hDAoiYz4xrtiDsE2PnBqTht/VSMg9d +5t02/Mp27Xem7UnBnM+uH8gUfZGuVjeyYVcZuKr8UEBK1TJPJ9ujSYfGvXlMbATx +0UzraUFn7DGH0x8U7XoZnEWHZKEn8+Rev2XbUqzI7jpcADn5IWXbUuzQC+fHuf4l +G1/+JhXzdlItNdQyC2pYvNl2NCtTGbQHpUZ/fzyzQVSg67QiNE/lhIS+h6qr8zox +mJ/iTqHpyss7fKNn/BVahDZndYeh6ErT88PjDIffOlGTKmCxSkhnhW06uAVa+NN8 +RdA1f5HuLjnOg1sCAwEAAaMhMB8wHQYDVR0OBBYEFNn+zJY4Z6Pb5Qdw91GmVq// +qKiZMA0GCSqGSIb3DQEBCwUAA4IBAQAoxqXhg+FPIgVYX+/F/VL7CIiJOr9nwZB8 +g9gE2PcIOrQQtFwgoNsuMGdqClv2M0RBFtXk6xlk8GVEfOPzRWmVpPZ9lElew6BD +sdXP/1W4eltKNJSakZEPETiEUWhUpcqkHWzuFDtG2XDf75j05YbGOyl1VQJvZ9wP +XDI/rjEqKxDg6bm1r+c5HUq+Xe3wBEhQgLcYkNag1E9n8h/7bSPMp8YDrsoFQjKv +QIGmFUR1Um6we9lX7eaInXzrho9o4+O8T9mw30Iapkpl93WlEn8VuACXOXH0a4Se +uiXSX/9tHzdC0O4ygWOg9GTNw3fIvUiZkDgF91gYgV2/i2OPbpUn +-----END CERTIFICATE----- diff --git a/test/ssl/client2.pem b/test/ssl/client2.pem new file mode 100644 index 000000000..fca10df6e --- /dev/null +++ b/test/ssl/client2.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDUzCCAjugAwIBAgIELChsqzANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV +UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD +VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyOVoX +DTI3MDYxNjEyMjYyOVowWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG +A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm +b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAXHMGv +anqYQQE/PO75/9OZwJojX/VgFHLUPE6sNPGCPZAaNNqAGTBniOqmFhkW/9WJA9wq +fIvMx5Blbc3Ictc7Crhopf4dsoiSobmTrZ+hwZjlPMHM70DcTtKUeB3vwhrH0HTd +PHFFGV4X6oYdJCt8qubIyU6DcoTiIYkSI/R7of2CEfLCkPymBtJj20c9oTReaew9 +mW/rrUj0RrH75gvs3ZCGXBQyBAhwv9VqyDSIORj5uo785EDk53OV5Qj7JfKuIfax +cXIH7jq3L4TVos9q1E7QDorvuxGwqDMxrMdyqgnSkOagJ7/PINhsYdW6X8d8m/n5 +B3UPvy+Z/s4chPcCAwEAAaMhMB8wHQYDVR0OBBYEFAWHXjsl8atiO0qurSm18CY0 +6c+hMA0GCSqGSIb3DQEBCwUAA4IBAQB6ipD1AaO5AMMpry/m2QB/lDiRmhK5VtNK +GflYrOyjtWKuWBC4n8dWfavqiGSOX7MDerilRt+FMrtgdEZet+sHdMqo139/Zk6J +k0AcsMHE2M8larah1T/ah7fOpQAJEK6SB6x9LKruJwQIj1juGBFGAo8YrigKQY9u +IKWjqOjcK0js4fHLZVGdmHxpU2fAs9UTeFF4EztchRzg30McrUKCiN9sLC0jdm2O +VYLTLC4PcBzAGPBFuIz+MxA+BU5iECZWjXrGKIUw57AtMf4owj4leBuoywLH0iHa +RAvKPHwtknKBSfL4Gqle1zYy2OlyMPqr3TOc+BpPmJp/OWFEVVus +-----END CERTIFICATE----- diff --git a/test/ssl/hazelcast-ma-optional.xml b/test/ssl/hazelcast-ma-optional.xml new file mode 100644 index 000000000..df0e27653 --- /dev/null +++ b/test/ssl/hazelcast-ma-optional.xml @@ -0,0 +1,62 @@ + + + + + + dev + dev-pass + + http://localhost:8080/mancenter + + 5701 + + + 0 + + + + 224.7.7.7 + 54327 + + + 127.0.0.1 + + + 127.0.0.1 + + + com.hazelcast.nio.ssl.ClasspathSSLContextFactory + + + com/hazelcast/nio/ssl-mutual-auth/server1.keystore + password + com/hazelcast/nio/ssl-mutual-auth/server1_knows_client1/server1.truststore + password + SunX509 + OPTIONAL + SunX509 + TLS + + + + + diff --git a/test/ssl/hazelcast-ma-required.xml b/test/ssl/hazelcast-ma-required.xml new file mode 100644 index 000000000..8ecb61d46 --- /dev/null +++ b/test/ssl/hazelcast-ma-required.xml @@ -0,0 +1,62 @@ + + + + + + dev + dev-pass + + http://localhost:8080/mancenter + + 5701 + + + 0 + + + + 224.7.7.7 + 54327 + + + 127.0.0.1 + + + 127.0.0.1 + + + com.hazelcast.nio.ssl.ClasspathSSLContextFactory + + + com/hazelcast/nio/ssl-mutual-auth/server1.keystore + password + com/hazelcast/nio/ssl-mutual-auth/server1_knows_client1/server1.truststore + password + SunX509 + REQUIRED + SunX509 + TLS + + + + + diff --git a/test/ssl/server2.pem b/test/ssl/server2.pem new file mode 100644 index 000000000..3def749a2 --- /dev/null +++ b/test/ssl/server2.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDUzCCAjugAwIBAgIEDXVHLjANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV +UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD +VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyN1oX +DTI3MDYxNjEyMjYyN1owWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG +A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm +b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcBdREB +G6ZzdIisiQdNBisZo85yLo5jj2j18UQ4deDaLucgS0WgsPzNCXI7J/Q4qrVS04Mo +1xGmx2NNGfh2NYzgmrvzbU/Q8sj8j55Yml8n39/1nb1OzpAJSz/Q6mKR1bCzuW1e +t/+7UFSI+mHudzM3cW1J+JBRu6y0kGGGueapUi3N9v9Ua9O/XWJo7AdE2LFpx0g7 +QuKXLXlbesHbeGSEZCbJq+Ej8LmO0AUbX9IhNk8j0OYgOdJ8Ru8Lsd4nM+6WKCK5 +Tx4XxKTn3fXA+bIS0LfaI/OViIYVd4xwdU2wdB/k/6kb6txWJCdom9Vy3n4tGsFE +Y5GaBhRiuqqV7Z0CAwEAAaMhMB8wHQYDVR0OBBYEFMtJ7selX81GdXYIK6BjTY4+ +l3aBMA0GCSqGSIb3DQEBCwUAA4IBAQCfqKSU/tY/hNI4m2toxFLS7KTAIfoEFscz +D9PQbA/4GQxIhrKEy1Zh20VWY0bsKQE3ZPLjyf/OGaZcFelmCnTZ0CvdoSA75iEA +UpOL5VJROHHB/Rwm7gVNXtBvssy1AfLbBOndtvGkHw9DAHV2stLVxwifWzuFOPxV +vVXonEBdlF/MbODNFHbSmjziH6i25wBWOp1ADvpm6OI4ELmGGyLw1mRuAhffVr8R +u9ECRnj/25O/C7YSjBtuajPwKmncssIhRMZCiiNGIUJ7uMr0yKRramBerEa1Qck5 +XU41VDAPijajphCDhVrKKq6U0NOaql4wTN85LcZykqGmEB6Pq6Iu +-----END CERTIFICATE----- From 5b63573a49b21402dba6dd9a8168174c71eef079 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 14 Nov 2017 15:10:45 -0500 Subject: [PATCH 019/685] mutual-authentication tests --- scripts/dev-test-rc.sh | 2 +- src/invocation/ClusterService.ts | 3 ++- test/ssl/ClientSSLAuthenticationTest.js | 35 ++++++++++++++----------- test/ssl/hazelcast-ma-optional.xml | 2 +- test/ssl/hazelcast-ma-required.xml | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index d7acf409e..faab389c8 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,5 +1,5 @@ #!/bin/sh -HZ_VERSION="3.8" +HZ_VERSION="3.9" HAZELCAST_TEST_VERSION=${HZ_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index ef1f3d00b..aab930a5a 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -8,6 +8,7 @@ import {ClientInfo} from '../ClientInfo'; import HazelcastClient from '../HazelcastClient'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); +import {IllegalStateError} from '../HazelcastError'; const MEMBER_ADDED = 1; const MEMBER_REMOVED = 2; @@ -139,7 +140,7 @@ export class ClusterService extends EventEmitter { if (this.knownAddresses.length <= index) { attemptLimit = attemptLimit - 1; if (attemptLimit === 0) { - var error = new RangeError('Unable to connect to any of the following addresses: ' + + var error = new IllegalStateError('Unable to connect to any of the following addresses: ' + this.knownAddresses.map((element: Address) => { return element.toString(); }).join(', ')); diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 9120901d0..2a96439af 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -6,29 +6,27 @@ chai.use(chaiAsPromised); var Client = require("../../.").Client; var Controller = require('./../RC'); var Config = require('../..').Config; +var HzErrors = require('../..').HazelcastErrors; var Promise = require('bluebird'); var markEnterprise = require('../Util').markEnterprise; -var serverKnowsClient = [true, false]; -var clientKnowsServer = [true, false]; -var mutualAuthRequired = [true, false]; - describe('SSL Client Authentication Test', function () { var cluster; var member; - var client; var maRequiredXML = __dirname + '/hazelcast-ma-required.xml'; var maOptionalXML = __dirname + '/hazelcast-ma-optional.xml'; + before(function () { + markEnterprise(this); + }); + afterEach(function () { - if (client) - client.shutdown(); return Controller.shutdownCluster(cluster.id); }); function createMemberWithXML(xmlFile) { - return Controller.createCluster(null, fs.readFileSync(xmlFile, 'utf8')).then(function(cl) { + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8')).then(function(cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function (m) { @@ -46,20 +44,23 @@ describe('SSL Client Authentication Test', function () { }; var cfg = new Config.ClientConfig(); cfg.networkConfig.sslOptions = sslOpts; + cfg.networkConfig.connectionAttemptLimit = 1; return cfg; } it('ma:required, they both know each other should connect', function () { return createMemberWithXML(maRequiredXML).then(function () { return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server1.pem')); - }).then(function(cl) { - client = cl; - }) + }).then(function(client) { + client.shutdown(); + }); }); it('ma:required, server knows client, client does not know server should fail', function () { + this.timeout(5000); return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))).to.throw; + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))) + .to.be.rejectedWith(HzErrors.IllegalStateError); }); }); @@ -78,14 +79,15 @@ describe('SSL Client Authentication Test', function () { it('ma:optional, they both know each other should connect', function () { return createMemberWithXML(maOptionalXML).then(function () { return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server1.pem')); - }).then(function(cl) { - client = cl; + }).then(function(client) { + client.shutdown(); }); }); it('ma:optional, server knows client, client does not know server should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))).to.throw; + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))) + .to.be.rejectedWith(HzErrors.IllegalStateError); }); }); @@ -99,7 +101,8 @@ describe('SSL Client Authentication Test', function () { it('ma:optional, neither knows the otherr should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server2.pem'))).to.throw; + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server2.pem'))) + .to.be.rejectedWith(HzErrors.IllegalStateError); }); }); }); diff --git a/test/ssl/hazelcast-ma-optional.xml b/test/ssl/hazelcast-ma-optional.xml index df0e27653..21cedd07f 100644 --- a/test/ssl/hazelcast-ma-optional.xml +++ b/test/ssl/hazelcast-ma-optional.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - diff --git a/test/ssl/hazelcast-ma-required.xml b/test/ssl/hazelcast-ma-required.xml index 8ecb61d46..95155e29d 100644 --- a/test/ssl/hazelcast-ma-required.xml +++ b/test/ssl/hazelcast-ma-required.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - From df04e48a1580d8836e60537d779ec024584f4b0a Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 15 Nov 2017 11:25:37 -0500 Subject: [PATCH 020/685] code sample for ssl --- code_samples/ssl_authentication.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 code_samples/ssl_authentication.js diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js new file mode 100644 index 000000000..de218c907 --- /dev/null +++ b/code_samples/ssl_authentication.js @@ -0,0 +1,20 @@ +var Config = require('../.').Config; +var HazelcastClient = require('../.').Client; + +if (process.argv.length < 5 ) { + console.log('Usage: \n' + + 'node ssl_authentication.js [servername] [certificate-file] [trusted-ca]'); + return +} + +var cfg = new Config.ClientConfig(); +cfg.networkConfig.sslOptions = { + servername: process.argv[2], + cert: process.argv[3], + ca: process.argv[4], +}; + +HazelcastClient.newHazelcastClient(cfg).then(function (client) { + console.log('This client is authenticated using ssl.'); + client.shutdown(); +}); From 41e5d166467d665e0283b89f76baabbc7ae9c985 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 16 Nov 2017 08:12:53 -0500 Subject: [PATCH 021/685] rc 0.3-snapshot --- scripts/dev-test-rc.sh | 2 +- scripts/download-rc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index d7acf409e..285688706 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -3,7 +3,7 @@ HZ_VERSION="3.8" HAZELCAST_TEST_VERSION=${HZ_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.2-SNAPSHOT" +HAZELCAST_RC_VERSION="0.3-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 89095caab..f5a0e7182 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -3,7 +3,7 @@ HZ_VERSION="3.9" HAZELCAST_TEST_VERSION=${HZ_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.2-SNAPSHOT" +HAZELCAST_RC_VERSION="0.3-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" From b11c9a21623ce59e3650860674a23bae6430f67c Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 27 Oct 2017 15:11:08 -0400 Subject: [PATCH 022/685] refactor tests depend on Java classes --- scripts/dev-test-rc.sh | 47 ++++++++++-- scripts/download-rc.sh | 63 ++++++++++++++-- test/javaclasses/ComparatorFactory.class | Bin 695 -> 0 bytes test/javaclasses/ComparatorFactory.java | 16 ----- test/javaclasses/CustomComparator.js | 40 +++++++++++ test/javaclasses/EntryProcessorFactory.class | Bin 584 -> 0 bytes test/javaclasses/EntryProcessorFactory.java | 13 ---- test/javaclasses/IdentifiedEntryProcessor.js | 21 ++++++ test/javaclasses/IdentifiedFactory.js | 16 +++++ test/javaclasses/NodejsMapStore.class | Bin 3509 -> 0 bytes test/javaclasses/NodejsMapStore.java | 57 --------------- test/javaclasses/ReverseValueComparator.class | Bin 1855 -> 0 bytes test/javaclasses/ReverseValueComparator.java | 34 --------- test/javaclasses/SimpleEntryProcessor.class | Bin 1518 -> 0 bytes test/javaclasses/SimpleEntryProcessor.java | 37 ---------- test/map/MapEntryProcessorTest.js | 67 ++++++------------ test/map/MapPredicateTest.js | 15 ++-- ...or.xml => hazelcast_identifiedfactory.xml} | 4 +- test/map/hazelcast_mapstore.xml | 2 +- test/map/hazelcast_predicate.xml | 34 --------- 20 files changed, 209 insertions(+), 257 deletions(-) delete mode 100644 test/javaclasses/ComparatorFactory.class delete mode 100644 test/javaclasses/ComparatorFactory.java create mode 100644 test/javaclasses/CustomComparator.js delete mode 100644 test/javaclasses/EntryProcessorFactory.class delete mode 100644 test/javaclasses/EntryProcessorFactory.java create mode 100644 test/javaclasses/IdentifiedEntryProcessor.js create mode 100644 test/javaclasses/IdentifiedFactory.js delete mode 100644 test/javaclasses/NodejsMapStore.class delete mode 100644 test/javaclasses/NodejsMapStore.java delete mode 100644 test/javaclasses/ReverseValueComparator.class delete mode 100644 test/javaclasses/ReverseValueComparator.java delete mode 100644 test/javaclasses/SimpleEntryProcessor.class delete mode 100644 test/javaclasses/SimpleEntryProcessor.java rename test/map/{hazelcast_entryprocessor.xml => hazelcast_identifiedfactory.xml} (78%) delete mode 100644 test/map/hazelcast_predicate.xml diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index cf71560df..4535f582a 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh HZ_VERSION="3.9" -HAZELCAST_TEST_VERSION=${HZ_VERSION} +HAZELCAST_TEST_VERSION="3.10-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.3-SNAPSHOT" @@ -18,15 +18,52 @@ else ENTERPRISE_REPO=${ENTERPRISE_RELEASE_REPO} fi -mvn dependency:get -DrepoUrl=${SNAPSHOT_REPO} -Dartifact=com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION} -Ddest=hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar -mvn dependency:get -DrepoUrl=${REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_VERSION} -Ddest=hazelcast-${HAZELCAST_VERSION}.jar +if [ -f "hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar" ]; then + echo "remote controller already exist, not downloading from maven." +else + echo "Downloading: remote-controller jar com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION}" + mvn -q dependency:get -DrepoUrl=${SNAPSHOT_REPO} -Dartifact=com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION} -Ddest=hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar + if [ $? -ne 0 ]; then + echo "Failed download remote-controller jar com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION}" + exit 1 + fi +fi + +if [ -f "hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar" ]; then + echo "hazelcast-test.jar already exists, not downloading from maven." +else + echo "Downloading: hazelcast test jar com.hazelcast:hazelcast:${HAZELCAST_TEST_VERSION}:jar:tests" + mvn -q dependency:get -DrepoUrl=${TEST_REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar + if [ $? -ne 0 ]; then + echo "Failed download hazelcast test jar com.hazelcast:hazelcast:${HAZELCAST_TEST_VERSION}:jar:tests" + exit 1 + fi +fi if [ -n "${HAZELCAST_ENTERPRISE_KEY}" ]; then - mvn dependency:get -DrepoUrl=${REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_VERSION}:jar:tests -Ddest=hazelcast-tests-${HAZELCAST_VERSION}.jar - mvn dependency:get -DrepoUrl=${ENTERPRISE_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_VERSION} -Ddest=hazelcast-enterprise-${HAZELCAST_VERSION}.jar + if [ -f "hazelcast-enterprise-${HAZELCAST_ENTERPRISE_VERSION}.jar" ]; then + echo "hazelcast-enterprise.jar already exists, not downloading from maven." + else + echo "Downloading: hazelcast enterprise jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_ENTERPRISE_VERSION}" + mvn -q dependency:get -DrepoUrl=${ENTERPRISE_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_ENTERPRISE_VERSION} -Ddest=hazelcast-enterprise-${HAZELCAST_ENTERPRISE_VERSION}.jar + if [ $? -ne 0 ]; then + echo "Failed download hazelcast enterprise jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_ENTERPRISE_VERSION}" + exit 1 + fi + fi CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-enterprise-${HAZELCAST_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:hazelcast-tests-${HAZELCAST_VERSION}.jar:test/javaclasses" echo "Starting Remote Controller ... enterprise ..." else + if [ -f "hazelcast-${HAZELCAST_VERSION}.jar" ]; then + echo "hazelcast.jar already exists, not downloading from maven." + else + echo "Downloading: hazelcast jar com.hazelcast:hazelcast:${HAZELCAST_VERSION}" + mvn -q dependency:get -DrepoUrl=${REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_VERSION} -Ddest=hazelcast-${HAZELCAST_VERSION}.jar + if [ $? -ne 0 ]; then + echo "Failed download hazelcast jar com.hazelcast:hazelcast:${HAZELCAST_VERSION}" + exit 1 + fi + fi CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:test/javaclasses" echo "Starting Remote Controller ... oss ..." fi diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index f5a0e7182..9532ac3cf 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,6 +1,7 @@ #!/bin/sh HZ_VERSION="3.9" -HAZELCAST_TEST_VERSION=${HZ_VERSION} +HZ_TEST_VERSION="3.10-SNAPSHOT" +HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.3-SNAPSHOT" @@ -18,16 +19,64 @@ else ENTERPRISE_REPO=${ENTERPRISE_RELEASE_REPO} fi -mvn dependency:get -DrepoUrl=${SNAPSHOT_REPO} -Dartifact=com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION} -Ddest=hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar -mvn dependency:get -DrepoUrl=${REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_VERSION} -Ddest=hazelcast-${HAZELCAST_VERSION}.jar +if [[ ${HZ_TEST_VERSION} == *-SNAPSHOT ]] +then + TEST_REPO=${SNAPSHOT_REPO} + ENTRERPRISE_TEST_REPO=${ENTERPRISE_SNAPSHOT_REPO} +else + TEST_REPO=${RELEASE_REPO} + ENTRERPRISE_TEST_REPO=${ENTERPRISE_RELEASE_REPO} +fi + +if [ -f "hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar" ]; then + echo "remote controller already exist, not downloading from maven." +else + echo "Downloading: remote-controller jar com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION}" + mvn -q dependency:get -DrepoUrl=${SNAPSHOT_REPO} -Dartifact=com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION} -Ddest=hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar + if [ $? -ne 0 ]; then + echo "Failed download remote-controller jar com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION}" + exit 1 + fi +fi + +if [ -f "hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar" ]; then + echo "hazelcast-test.jar already exists, not downloading from maven." +else + echo "Downloading: hazelcast test jar com.hazelcast:hazelcast:${HAZELCAST_TEST_VERSION}:jar:tests" + mvn -q dependency:get -DrepoUrl=${TEST_REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar + if [ $? -ne 0 ]; then + echo "Failed download hazelcast test jar com.hazelcast:hazelcast:${HAZELCAST_TEST_VERSION}:jar:tests" + exit 1 + fi +fi + +CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar:test/javaclasses" if [ -n "${HAZELCAST_ENTERPRISE_KEY}" ]; then - mvn dependency:get -DrepoUrl=${REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_VERSION}:jar:tests -Ddest=hazelcast-tests-${HAZELCAST_VERSION}.jar - mvn dependency:get -DrepoUrl=${ENTERPRISE_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_VERSION} -Ddest=hazelcast-enterprise-${HAZELCAST_VERSION}.jar - CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-enterprise-${HAZELCAST_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:hazelcast-tests-${HAZELCAST_VERSION}.jar:test/javaclasses" + if [ -f "hazelcast-enterprise-${HAZELCAST_ENTERPRISE_VERSION}.jar" ]; then + echo "hazelcast-enterprise.jar already exists, not downloading from maven." + else + echo "Downloading: hazelcast enterprise jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_ENTERPRISE_VERSION}" + mvn -q dependency:get -DrepoUrl=${ENTERPRISE_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_ENTERPRISE_VERSION} -Ddest=hazelcast-enterprise-${HAZELCAST_ENTERPRISE_VERSION}.jar + if [ $? -ne 0 ]; then + echo "Failed download hazelcast enterprise jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_ENTERPRISE_VERSION}" + exit 1 + fi + fi + CLASSPATH="hazelcast-enterprise-${HAZELCAST_ENTERPRISE_VERSION}.jar:"${CLASSPATH} echo "Starting Remote Controller ... enterprise ..." else - CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:test/javaclasses" + if [ -f "hazelcast-${HAZELCAST_VERSION}.jar" ]; then + echo "hazelcast.jar already exists, not downloading from maven." + else + echo "Downloading: hazelcast jar com.hazelcast:hazelcast:${HAZELCAST_VERSION}" + mvn -q dependency:get -DrepoUrl=${REPO} -Dartifact=com.hazelcast:hazelcast:${HAZELCAST_VERSION} -Ddest=hazelcast-${HAZELCAST_VERSION}.jar + if [ $? -ne 0 ]; then + echo "Failed download hazelcast jar com.hazelcast:hazelcast:${HAZELCAST_VERSION}" + exit 1 + fi + fi + CLASSPATH="hazelcast-${HAZELCAST_VERSION}.jar:"${CLASSPATH} echo "Starting Remote Controller ... oss ..." fi diff --git a/test/javaclasses/ComparatorFactory.class b/test/javaclasses/ComparatorFactory.class deleted file mode 100644 index a1ad05b18a207e67ea21255cc5f0637c0262f402..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 695 zcmah`O>fgc5Pf4iapNRyX(6 zKcT>(QY-Zb@S_m3wh@RTaoCxi*?Di?%zpoIc@5wh9z|$ky@dwuh1iJTV?D(E5D!8; zB-|?Wi7sY(FP}`gV4D|&wd8%39CAAUX=ob*$VXKW`8SD`6NE%Go31)**G(K zJk!FJnlrX0&*J`AXVx4TJ$}WO2fyB=m!q<$Q{5jEs88q)EUV+!Jgr46?5MP!AsXcK zLg{_u6!&h3dV0hs+(CqP2McIP$-mbkOT2+4EIV|Za`q{HJ37+J5}yBWs=sHcw}Z#> zc});PIg!&MAM2O*w%CqDv3L^S*uDULk&B0}SO)?EEQ;+^1z5teL?Rk1VjcLMRD0sv z8^LFUU*Vn8xrBa6u_zwWwSl(u?Uq!%s=THWAXaf($nKOVYKg?2BrEnOWw8`p!T)%H U;2S(AP<}>iCD7Ts5_wqr3E^g$L;wH) diff --git a/test/javaclasses/ComparatorFactory.java b/test/javaclasses/ComparatorFactory.java deleted file mode 100644 index a9a43d59e..000000000 --- a/test/javaclasses/ComparatorFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -import com.hazelcast.nio.serialization.DataSerializableFactory; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; - -public class ComparatorFactory implements DataSerializableFactory { - - private static ReverseValueComparator reverseComparator = new ReverseValueComparator(); - - @Override - public IdentifiedDataSerializable create(int typeId) { - if (typeId == 1) { - return reverseComparator; - } else { - return null; - } - } -} diff --git a/test/javaclasses/CustomComparator.js b/test/javaclasses/CustomComparator.js new file mode 100644 index 000000000..a12d25244 --- /dev/null +++ b/test/javaclasses/CustomComparator.js @@ -0,0 +1,40 @@ +/** + * + * @param type + * 0 -> lexicographical order + * 1 -> reverse lexicographical + * 2 -> length increasing order + * @constructor + */ +function CustomComparator(type, iterationType) { + this.type = type; + this.iterationType = iterationType; +} + +CustomComparator.prototype.getFactoryId = function () { + return 66; +}; + +CustomComparator.prototype.getClassId = function () { + return 2; +}; + +CustomComparator.prototype.writeData = function (outp) { + outp.writeInt(this.type); + outp.writeInt(this.iterationType); +}; + +CustomComparator.prototype.readData = function (inp) { + this.type = inp.readInt(); + this.iterationType = inp.readInt(); +}; + +CustomComparator.prototype.sort = function (o1, o2) { + if (this.type === 0) { + return o1[1] - o2[1]; + } else { + return o2[1] - o1[1]; + } +}; + +module.exports = CustomComparator; diff --git a/test/javaclasses/EntryProcessorFactory.class b/test/javaclasses/EntryProcessorFactory.class deleted file mode 100644 index b3510e001e4e99540a9e2212983919c31c51ff27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmah`O-sW-5Pg%TMx(V_YwO3!n|d(d#e<>;wNR)Z5D`3Xx2vwE*^;b6{WboCdMYUR z1N>3qq>Tqf@G@`a?Y=iN%*W^JJAiGh_$Xr0L(PYiVco-$hh@UVo{qKMCluBLbSV;@)j8?fTb&Z>t>f4x{qw{~m8K?X2x(2y-(`21 zC}CNCu-@EgNz)B(#gmGpNNo^n6Qqj$BK;(+HgVAGsMzXjtvW}-itzi5`(;+P-&4&F zftrL;Xob8#5xsm6KQs@CR1KYty7K2VTX*77%)rAWp&IILFH%4M5f*5q&VRf7-XJ%_8eF~vufu0?7>0+Amnehk4 z5?6#-lsRVN3pR5Y%d74)rr+RP4N(}-fT;p9n^{J1w<7l|F_YQV#**BQ#hAl98&*at LDsj5Nse|elYAS}e diff --git a/test/javaclasses/EntryProcessorFactory.java b/test/javaclasses/EntryProcessorFactory.java deleted file mode 100644 index 25653fb74..000000000 --- a/test/javaclasses/EntryProcessorFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -import com.hazelcast.nio.serialization.DataSerializableFactory; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; - -public class EntryProcessorFactory implements DataSerializableFactory { - @Override - public IdentifiedDataSerializable create(int typeId) { - if (typeId == 1) { - return new SimpleEntryProcessor(); - } else { - return null; - } - } -} diff --git a/test/javaclasses/IdentifiedEntryProcessor.js b/test/javaclasses/IdentifiedEntryProcessor.js new file mode 100644 index 000000000..b92a51169 --- /dev/null +++ b/test/javaclasses/IdentifiedEntryProcessor.js @@ -0,0 +1,21 @@ +function IdentifiedEntryProcessor(value) { + this.value = value; +} + +IdentifiedEntryProcessor.prototype.readData = function (inp) { + this.value = inp.readUTF(); +}; + +IdentifiedEntryProcessor.prototype.writeData = function(outp) { + outp.writeUTF(this.value); +}; + +IdentifiedEntryProcessor.prototype.getFactoryId = function () { + return 66; +}; + +IdentifiedEntryProcessor.prototype.getClassId = function() { + return 1; +}; + +module.exports = IdentifiedEntryProcessor; diff --git a/test/javaclasses/IdentifiedFactory.js b/test/javaclasses/IdentifiedFactory.js new file mode 100644 index 000000000..8dc63075d --- /dev/null +++ b/test/javaclasses/IdentifiedFactory.js @@ -0,0 +1,16 @@ +var IdentifiedEntryProcessor = require('./IdentifiedFactory'); +var CustomComparator = require('./CustomComparator'); + +function IdentifiedFactory() { + +} + +IdentifiedFactory.prototype.create = function (type) { + if (type === 1) { + return new IdentifiedEntryProcessor(); + } else if (type == 2) { + return new CustomComparator(); + } +}; + +module.exports = IdentifiedFactory; diff --git a/test/javaclasses/NodejsMapStore.class b/test/javaclasses/NodejsMapStore.class deleted file mode 100644 index 818dabbfd7311c13e78f21510d9fce94f87afb86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3509 zcmbVPTXz#>6y1~Cw8=ERKnty)&_tU>{~q(uxZ7e$?>W1EsDHJMaEy#E1T z{RO=0T3S|QE%n(aAAI%Q-{4YlpKm6~GEB-i+Wa+>YRFyd#fyb(j%^v7{p{@8vM9EwO$tf)(7B>8eaK zI@ZG2fdyH)BS?h1fvil|b>wv9b!=z|7VUh&(lDG{GdIn6$3l9-Dio}o9iOcZ z=gf_h8roBtm7HmpDQRoyz1g_KXJq=-8r$z-)e* zE;^H$oHbusU$P3<%%v<>dXo9HnO!ss8JW9_0edx5)Xmr?XkwxwuL%kwzebRIEUd;5p}QT+HRH!fe(o7A=O? z>tI)o3@aZ%f~<9!_k4JR5z-)3}@n$WV9wQT0Fw?#pSLAzt1lH2d~Gn>z5 zt+buV=TwdZEEDFk&%@Vap&{0CqeY}bbF#IgmevwvAe%RrH5_Qg!SP#PxVqRYN|k${ zGU5q%%oDDZu?~_m|4Uf)04+jq4os*=+|Vv7IlD)_fjAXD(zwz-IVmVFgZ%Jiab6{NQix=!fIfo2R13(bqkbbdX)YTmc9X|rgvrxvU@6;_R@ z1rrZ|+b4xvIF&CI($@Kmw7wnn-EB%bm4SWO&p@Biyf2u=RXR7Y2YYqc21?justp`P zlDEsi2e`{CX5b#~8~6|p=&c6HlTNcT@R4kFHTFmYALD_5A2jd@uIl*Iz{{91@ENXZ z=&m7E<2Z-&20lm9z-1&gMC+;5xo~vX@Z3`bWyh#FQ600VHdhJd_n^**oHPv9jQ;JL z$M(EYVh67Do@Z2(Cyj2su#ab?qErCYN>lf+5*QP$ubRbq>nngK~ z7+SGxUK~Pmu;_f8LIrC*zsWM$StC`u=)|Qd`yksF^}&Ar3>W}K<)2Tgg74?~W5kCS zU~tT;;&YHIGw^c+bj2P)i#>+#<|FvOL*N@_J;bN{YLRDvCxS-4nN zh~?*6N9;mx^Mlq(qI}qc@$MHBO_?AF_p>>e&nej40 z8s-SEYnY!bqfNtC7~`N_!%qlL2V(t!G9ofDWYnQXTZle<@~cD>fY9nwXuZ%m8pJM4 zV>gSsUqu$9%^>HKIK+{Ny+Jb6=P^_Ak2jhq+&|Izg+KXcdL; zFGO`r>p1xbrrd;_q8%?2pThDiZAETFNmxdwuUWypi14hWqR+9dMrXJRYIp^&a!(My z;a(Cv?Soz~z0GTWk|9?=y^2ct>5{JwD0a*Iec4=r7D52tV^bfnyIQM?8>om)3p65lLqeK+B+hgODnc1)1 zQb*~q2dLcvBETM8aRCxczjM_EU_yaJp9a!V1-XpZU6456!Y3Hp!tO>Y-Ux!#!{>0- jJ={p4_h|qw1%~XX@di@#>%%qXM|vAS#rzj)D%AcDm3t7I diff --git a/test/javaclasses/NodejsMapStore.java b/test/javaclasses/NodejsMapStore.java deleted file mode 100644 index 91d2da5a2..000000000 --- a/test/javaclasses/NodejsMapStore.java +++ /dev/null @@ -1,57 +0,0 @@ -import com.hazelcast.core.MapStore; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -public class NodejsMapStore implements MapStore { - - private ConcurrentMap store = new ConcurrentHashMap(); - - @Override - public void store(String key, String value) { - store.put(key, value); - } - - @Override - public void storeAll(Map map) { - final Set> entrySet = map.entrySet(); - for (Map.Entry entry : entrySet) { - store(entry.getKey(), entry.getValue()); - } - } - - @Override - public void delete(String key) { - store.remove(key); - } - - @Override - public void deleteAll(Collection keys) { - for (String key : keys) { - delete(key); - } - } - - @Override - public String load(String key) { - return store.get(key); - } - - @Override - public Map loadAll(Collection keys) { - final Map map = new HashMap(); - for (String key : keys) { - map.put(key, load(key)); - } - return map; - } - - @Override - public Set loadAllKeys() { - return store.keySet(); - } -} \ No newline at end of file diff --git a/test/javaclasses/ReverseValueComparator.class b/test/javaclasses/ReverseValueComparator.class deleted file mode 100644 index b2e2389fa081cf37d6e4c8c8ff72c9f2b90780a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1855 zcma)7TT|0O6#h1C2`xoXt^z73Lb+%JMHCRn;WE>iDl_8nzLXW>)TEOpDEu4WeenfH z9~_?jQI6jxEe#N{581PO_FTVn&gS=@pT7Xi<7E!*c-VmqEEA7%NMX*z;~Y#pF|lCc zsfk4s&ji|5Y{&Lj1yY5n9f9OLrxKFC99 z1-@OeUd!ruD7Ku)oGJnWg{~~raomqdA6_Cr7s003nhYY z9mr!YUkhvnel_rybT0eY`+*jt1sStdi#h!`5ncWgYAD4cB4;R+kfk zt|<;h#XgoA6sx$W9N&I#s}Pj!#+_~~g17AkURiD0dZdPvr{6vx|;w* z9h%1qUYOv}_9VcE)j$ya3QNve) zP770)E5;V4Q@$VSoy$3|&slsHb*Vd>@$$*Q7@xIv7|0^W$Ipb&;BoEb$s!e`nd$Ek z-?%YwjcZ%T%%Y2XElL4&<2osyI`mOWD|@6V(!rS@Fa%DKnr&=OkTwp!@-7v#mk;fY zMmlwS)J8uBLLYh+UGcSC1)L*xyUYhZ-DTe!_t$1zK)V>Hs*V?2ZFu?&o} z4DPg`*`KI6N-(3`7eY_O<05Dyp<)z1yD0=s!*&<wd+mOp~M0SR}r>DxK3ar^w9mJ3-q;VB)3itVfxugF8b&HH;6?OPZtE41bwDZP~w5 COs=N@ diff --git a/test/javaclasses/ReverseValueComparator.java b/test/javaclasses/ReverseValueComparator.java deleted file mode 100644 index 6b7a28031..000000000 --- a/test/javaclasses/ReverseValueComparator.java +++ /dev/null @@ -1,34 +0,0 @@ -import com.hazelcast.nio.ObjectDataInput; -import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; - -import java.io.IOException; -import java.util.Comparator; -import java.util.Map; - -public class ReverseValueComparator implements Comparator>, IdentifiedDataSerializable { - @Override - public int compare(Map.Entry o1, Map.Entry o2) { - return o1.getValue().compareTo(o2.getValue()) * (-1); - } - - @Override - public int getFactoryId() { - return 1; - } - - @Override - public int getId() { - return 1; - } - - @Override - public void writeData(ObjectDataOutput out) throws IOException { - //Empty - } - - @Override - public void readData(ObjectDataInput in) throws IOException { - //Empty - } -} diff --git a/test/javaclasses/SimpleEntryProcessor.class b/test/javaclasses/SimpleEntryProcessor.class deleted file mode 100644 index bebe85af876ef0eae6b0e3b96d643aff4d186eb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1518 zcma)6TTc@~6#k~SEv3jEL=m|O1q!PuUI0-*NSYKesloU-v?C1J?l!x#DEuZL^aX+@ z#%F(&@yu?iZBvnl&Y3xLzH`oe-|7DP{p|;UMQoheOfSE!JS-sp(;(@k{ z`tqTHM+TM*JZ4C&N?WQmhG=GHk0G|{lmtU(UfSZdU)~q)TfT3Rrzh_exwXe#sn1ns zOdU#(VIW_S<%%V?Y~`N3ah;;@JjY#ONFNBb&5O!$PjaQ8M2;a&PJL?o=t?DCam5*? zGx?%ZHV^r!u!`JMrY#+FcmGHfl@8eTRmE2;y1}U9D~8GIgfpbJJ{3hpNyqjKJYh(> zf|tUIQ&(5a*_Q<)(q@>rvR)X>U{u1l8+b;~4A>wJa<(npO^bV;Ag*RI`6GVJO>z>PGPL6ENIGz^2yt_@#WCE=#Aisz(Y^}V8$#u{Fv@e=C{eXXi7WEur7^NP8? z?$j&yuHHi)rRc#EkqPMIdJ3@-7(E-k@iKYyuxViDtJ2joU5^OKuTn&WCY2Mqnp4+QN_w^8G>?DD4ky3$ zP;>-gm(Rc$^naelj6MJfvZN=iopdtEGP3d6bFi_USMHJ?NzqwTXUO zH8@LFgCnuedaXmI>yVKea^M=s?v}_w+@$=v=2B3J`e<%;FaQovm~Jv`R_}&zi`LuZ zjgcLu-yMwnFWK-vlHJ85VFhl4FW`itqm?WE` LyKy|lM565vc79Ly diff --git a/test/javaclasses/SimpleEntryProcessor.java b/test/javaclasses/SimpleEntryProcessor.java deleted file mode 100644 index 13aa6f0aa..000000000 --- a/test/javaclasses/SimpleEntryProcessor.java +++ /dev/null @@ -1,37 +0,0 @@ -import com.hazelcast.map.AbstractEntryProcessor; -import com.hazelcast.nio.ObjectDataInput; -import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; - -import java.io.IOException; -import java.util.Map; - -public class SimpleEntryProcessor extends AbstractEntryProcessor implements IdentifiedDataSerializable { - @Override - public int getFactoryId() { - return 1; - } - - @Override - public int getId() { - return 1; - } - - @Override - public void writeData(ObjectDataOutput out) throws IOException { - //Empty - } - - @Override - public void readData(ObjectDataInput in) throws IOException { - //Empty - } - - @Override - public Object process(Map.Entry entry) { - String val = (String)entry.getValue(); - val += "processed"; - entry.setValue(val); - return val; - } -} diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index 992112a87..906db6c76 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -6,33 +6,8 @@ var Controller = require('../RC'); var fs = require('fs'); var _fillMap = require('../Util').fillMap; -function SimpleEntryProcessor() { - -} - -SimpleEntryProcessor.prototype.readData = function () { - //Empty -}; - -SimpleEntryProcessor.prototype.writeData = function () { - //Empty -}; - -SimpleEntryProcessor.prototype.getFactoryId = function () { - return 1; -}; - -SimpleEntryProcessor.prototype.getClassId = function () { - return 1; -}; - -var entryProcessorFactory = { - create: function (type) { - if (type == 1) { - return new SimpleEntryProcessor(); - } - } -}; +var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +var IdentifiedEntryProcessor = require('../javaclasses/IdentifiedEntryProcessor'); describe('Entry Processor', function() { var MAP_SIZE = 1000; @@ -42,12 +17,12 @@ describe('Entry Processor', function() { function _createConfig() { var cfg = new Config.ClientConfig(); - cfg.serializationConfig.dataSerializableFactories[1] = entryProcessorFactory; + cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); return cfg; } before(function() { - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_entryprocessor.xml', 'utf8')).then(function (res) { + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')).then(function (res) { cluster = res; return Controller.startMember(cluster.id); }).then(function(member) { @@ -74,79 +49,79 @@ describe('Entry Processor', function() { it('executeOnEntries should modify entries', function () { this.timeout(4000); - return map.executeOnEntries(new SimpleEntryProcessor()).then(function() { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed')).then(function() { return map.entrySet(); }).then(function (entries) { expect(entries.every(function(entry) { - return entry[1] == entry[0] + 'processed'; + return entry[1] == 'processed'; })).to.be.true; }); }); it('executeOnEntries should return modified entries', function () { this.timeout(4000); - return map.executeOnEntries(new SimpleEntryProcessor()).then(function(entries) { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed')).then(function(entries) { expect(entries).to.have.lengthOf(MAP_SIZE); expect(entries.every(function(entry) { - return entry[1] == entry[0] + 'processed'; + return entry[1] == 'processed'; })).to.be.true; }); }); it('executeOnEntries with predicate should modify entries', function () { this.timeout(4000); - return map.executeOnEntries(new SimpleEntryProcessor(), Predicates.regex('this', '^[01]$')).then(function() { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function() { return map.getAll(["0", "1", "2"]); }).then(function (entries) { - return expect(entries).to.deep.have.members([['0', '0processed'], ['1', '1processed'], ['2', '2']]); + return expect(entries).to.deep.have.members([['0', 'processed'], ['1', 'processed'], ['2', '2']]); }); }); it('executeOnEntries with predicate should return modified entries', function () { this.timeout(4000); - return map.executeOnEntries(new SimpleEntryProcessor(), Predicates.regex('this', '^[01]$')).then(function(entries) { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function(entries) { expect(entries).to.have.lengthOf(2); expect(entries.every(function(entry) { - return entry[1] == entry[0] + 'processed'; + return entry[1] == 'processed'; })).to.be.true; }); }); it('executeOnKey should return modified value', function() { this.timeout(4000); - return map.executeOnKey('4', new SimpleEntryProcessor()).then(function (retVal) { - return expect(retVal).to.equal('4processed'); + return map.executeOnKey('4', new IdentifiedEntryProcessor('processed')).then(function (retVal) { + return expect(retVal).to.equal('processed'); }); }); it('executeOnKey should modify the value', function() { this.timeout(4000); - return map.executeOnKey('4', new SimpleEntryProcessor()).then(function() { + return map.executeOnKey('4', new IdentifiedEntryProcessor('processed')).then(function() { return map.get('4'); }).then(function (value) { - return expect(value).to.equal('4processed'); + return expect(value).to.equal('processed'); }); }); it('executeOnKeys should return modified entries', function() { this.timeout(4000); - return map.executeOnKeys(['4', '5'], new SimpleEntryProcessor()).then(function (entries) { - return expect(entries).to.deep.have.members([['4', '4processed'], ['5', '5processed']]); + return map.executeOnKeys(['4', '5'], new IdentifiedEntryProcessor('processed')).then(function (entries) { + return expect(entries).to.deep.have.members([['4', 'processed'], ['5', 'processed']]); }); }); it('executeOnKeys should modify the entries', function() { this.timeout(4000); - return map.executeOnKeys(['4', '5'], new SimpleEntryProcessor()).then(function() { + return map.executeOnKeys(['4', '5'], new IdentifiedEntryProcessor('processed')).then(function() { return map.getAll(['4', '5']); }).then(function (entries) { - return expect(entries).to.deep.have.members([['4', '4processed'], ['5', '5processed']]); + return expect(entries).to.deep.have.members([['4', 'processed'], ['5', 'processed']]); }); }); it('executeOnKeys with empty array should return empty array', function() { this.timeout(4000); - return map.executeOnKeys([], new SimpleEntryProcessor()).then(function (entries) { + return map.executeOnKeys([], new IdentifiedEntryProcessor('processed')).then(function (entries) { return expect(entries).to.have.lengthOf(0); }); }); diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 1c1054a02..bc85f8a19 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -6,10 +6,11 @@ var assert = require('assert'); var Promise = require("bluebird"); var Controller = require('./../RC'); var Util = require('./../Util'); -var ReverseValueComparator = require('./ComparatorFactory').ReverseValueComparator; -var ComparatorFactory = require('./ComparatorFactory').ComparatorFactory; var fs = require('fs'); +var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +var CustomComparator = require('../javaclasses/CustomComparator'); + describe("Predicates", function() { var cluster; @@ -18,13 +19,17 @@ describe("Predicates", function() { function _createConfig() { var cfg = new Config.ClientConfig(); - cfg.serializationConfig.dataSerializableFactories[1] = ComparatorFactory; + cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); return cfg; } + function createReverseValueComparator() { + return new CustomComparator(1, Predicates.IterationType.ENTRY); + } + before(function () { this.timeout(32000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_predicate.xml', 'utf8')).then(function(res) { + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')).then(function(res) { cluster = res; return Controller.startMember(cluster.id); }).then(function(member) { @@ -166,7 +171,7 @@ describe("Predicates", function() { }); it('Paging with reverse comparator should have elements in reverse order', function() { - var paging = Predicates.paging(Predicates.lessThan('this', 40), 3, new ReverseValueComparator()); + var paging = Predicates.paging(Predicates.lessThan('this', 40), 3, createReverseValueComparator()); return testPredicate(paging, [39, 38, 37], true); }); diff --git a/test/map/hazelcast_entryprocessor.xml b/test/map/hazelcast_identifiedfactory.xml similarity index 78% rename from test/map/hazelcast_entryprocessor.xml rename to test/map/hazelcast_identifiedfactory.xml index 5b9c8cda0..81d4158da 100644 --- a/test/map/hazelcast_entryprocessor.xml +++ b/test/map/hazelcast_identifiedfactory.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - EntryProcessorFactory + + com.hazelcast.client.test.IdentifiedFactory diff --git a/test/map/hazelcast_mapstore.xml b/test/map/hazelcast_mapstore.xml index e33c1485d..7a530cb6a 100644 --- a/test/map/hazelcast_mapstore.xml +++ b/test/map/hazelcast_mapstore.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - NodejsMapStore + com.hazelcast.client.test.SampleMapStore diff --git a/test/map/hazelcast_predicate.xml b/test/map/hazelcast_predicate.xml deleted file mode 100644 index ccc14b460..000000000 --- a/test/map/hazelcast_predicate.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - ComparatorFactory - - - - From bef9d5b126f496fa5badbea93e82c83c3786a921 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 20 Nov 2017 13:31:05 -0500 Subject: [PATCH 023/685] skip intermittently failing reliable topic test --- test/topic/TopicTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/topic/TopicTest.js b/test/topic/TopicTest.js index f4e9f4f11..745c03d39 100644 --- a/test/topic/TopicTest.js +++ b/test/topic/TopicTest.js @@ -37,7 +37,7 @@ var generateItems = function (client, howMany) { } return all; }; -describe("Reliable Topic Proxy", function () { +describe.skip("Reliable Topic Proxy", function () { var cluster; var clientOne; From 58f73cb022da240a96b3cc7a59d7f210f0a7392d Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 21 Nov 2017 15:03:19 -0500 Subject: [PATCH 024/685] refactor ClientConnection.send to return a promise --- src/invocation/ClientConnection.ts | 16 ++++- src/invocation/InvocationService.ts | 96 +++++++++++++++-------------- 2 files changed, 63 insertions(+), 49 deletions(-) diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 13acaa691..8ad1c43f2 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -83,8 +83,20 @@ export class ClientConnection { return ready.promise; } - write(buffer: Buffer, cb: (err: any) => void ): void { - this.socket.write(buffer, 'utf8', cb); + write(buffer: Buffer): Promise { + let deferred = Promise.defer(); + try { + this.socket.write(buffer, (err: any) => { + if (err) { + deferred.reject(err); + } else { + deferred.resolve(); + } + }); + } catch (err) { + deferred.reject(err); + } + return deferred.promise; } /** diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 732fa394f..b90acc893 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -7,6 +7,8 @@ import {BitsUtil} from '../BitsUtil'; import {LoggingService} from '../logging/LoggingService'; import HazelcastClient from '../HazelcastClient'; import {ClientConnection} from './ClientConnection'; +import {IllegalStateError, ClientNotActiveError} from '../HazelcastError'; +import * as assert from 'assert'; var EXCEPTION_MESSAGE_TYPE = 109; const MAX_FAST_INVOCATION_COUNT = 5; @@ -172,76 +174,76 @@ export class InvocationService { } private invokeSmart(invocation: Invocation): void { - if (this.isShutdown) { - return; - } - try { - invocation.invokeCount++; - if (invocation.hasOwnProperty('connection')) { - this.send(invocation, invocation.connection); - } else if (invocation.hasPartitionId()) { - this.invokeOnPartitionOwner(invocation, invocation.partitionId); - } else if (invocation.hasOwnProperty('address')) { - this.invokeOnAddress(invocation, invocation.address); - } else { - this.send(invocation, this.client.getClusterService().getOwnerConnection()); - } - } catch (e) { - this.notifyError(invocation, e); + let invocationPromise: Promise; + invocation.invokeCount++; + if (invocation.hasOwnProperty('connection')) { + invocationPromise = this.send(invocation, invocation.connection); + } else if (invocation.hasPartitionId()) { + invocationPromise = this.invokeOnPartitionOwner(invocation, invocation.partitionId); + } else if (invocation.hasOwnProperty('address')) { + invocationPromise = this.invokeOnAddress(invocation, invocation.address); + } else { + invocationPromise = this.invokeOnOwner(invocation); } + invocationPromise.catch((err) => { + this.notifyError(invocation, err); + }); } private invokeNonSmart(invocation: Invocation): void { - if (this.isShutdown) { - return; + let invocationPromise: Promise; + invocation.invokeCount++; + if (invocation.hasOwnProperty('connection')) { + invocationPromise = this.send(invocation, invocation.connection); + } else { + invocationPromise = this.invokeOnOwner(invocation); } - try { - invocation.invokeCount++; - if (invocation.hasOwnProperty('connection')) { - this.send(invocation, invocation.connection); - } else { - this.send(invocation, this.client.getClusterService().getOwnerConnection()); - } - } catch (e) { - this.notifyError(invocation, e); + invocationPromise.catch((err) => { + this.notifyError(invocation, err); + }); + } + + private invokeOnOwner(invocation: Invocation): Promise { + let owner = this.client.getClusterService().getOwnerConnection(); + if (owner == null) { + return Promise.reject(new IllegalStateError('Unisocket client\'s owner connection is not available.')); } + return this.send(invocation, owner); } - private invokeOnAddress(invocation: Invocation, address: Address): void { - this.client.getConnectionManager().getOrConnect(address).then((connection: ClientConnection) => { + private invokeOnAddress(invocation: Invocation, address: Address): Promise { + return this.client.getConnectionManager().getOrConnect(address).then((connection: ClientConnection) => { if (connection == null) { - this.notifyError(invocation, new Error(address.toString() + ' is not available.')); - return; + throw new Error(address.toString() + ' is not available.'); } - this.send(invocation, connection); + return this.send(invocation, connection); }); } - private invokeOnPartitionOwner(invocation: Invocation, partitionId: number): void { + private invokeOnPartitionOwner(invocation: Invocation, partitionId: number): Promise { var ownerAddress = this.client.getPartitionService().getAddressForPartition(partitionId); - this.client.getConnectionManager().getOrConnect(ownerAddress).then((connection: ClientConnection) => { + return this.client.getConnectionManager().getOrConnect(ownerAddress).then((connection: ClientConnection) => { if (connection == null) { - this.notifyError(invocation, new Error(ownerAddress.toString() + '(partition owner) is not available.')); - return; + throw new Error(ownerAddress.toString() + '(partition owner) is not available.'); } - this.send(invocation, connection); + return this.send(invocation, connection); }); } - private send(invocation: Invocation, connection: ClientConnection): void { + private send(invocation: Invocation, connection: ClientConnection): Promise { + assert(connection != null); + if (this.isShutdown) { + return Promise.reject(new ClientNotActiveError('Client is shutdown.')); + } this.registerInvocation(invocation); - this.write(invocation, connection); + return this.write(invocation, connection); } - private write(invocation: Invocation, connection: ClientConnection): void { - connection.write(invocation.request.getBuffer(), (err: any) => { - if (err) { - this.notifyError(invocation, err); - } - }); + private write(invocation: Invocation, connection: ClientConnection): Promise { + return connection.write(invocation.request.getBuffer()); } - private notifyError(invocation: Invocation, error: Error) { + private notifyError(invocation: Invocation, error: Error): void { var correlationId = invocation.request.getCorrelationId().toNumber(); if (this.isRetryable(invocation)) { this.logger.debug('InvocationService', @@ -252,7 +254,7 @@ export class InvocationService { setTimeout(this.doInvoke.bind(this, invocation), this.getInvocationRetryPauseMillis()); } } else { - this.logger.warn('InvocationService', 'Sending message ' + correlationId + 'failed'); + this.logger.warn('InvocationService', 'Sending message ' + correlationId + ' failed'); delete this.pending[invocation.request.getCorrelationId().toNumber()]; invocation.deferred.reject(error); } From 4b66d0647632995fe0ded3f345b6be16e47c0b4f Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 29 Nov 2017 10:06:46 -0500 Subject: [PATCH 025/685] increase timeout for cluster shutdown in ssl tests --- test/ssl/ClientSSLAuthenticationTest.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 2a96439af..ff3e38386 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -22,6 +22,7 @@ describe('SSL Client Authentication Test', function () { }); afterEach(function () { + this.timeout(4000); return Controller.shutdownCluster(cluster.id); }); From a055325b755020cbe491874343cbdc052527d0de Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 1 Dec 2017 14:59:55 -0500 Subject: [PATCH 026/685] include codecs counting coverage --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cd69418a6..58557c60d 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "pretest": "./scripts/download-rc.sh", "test": "mocha --recursive", "precoverage": "./scripts/download-rc.sh", - "coverage": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", - "coverage-all": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", + "coverage": "rimraf coverage && istanbul cover--root lib/ --include-all-sources _mocha -- --recursive --reporter spec", + "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", "generate-docs": "rimraf docs && typedoc --out docs/ --exclude **/codec/**/* --module commonjs src/ node_modules/@types/node/index.d.ts node_modules/typescript/lib/lib.es2015.d.ts --excludeExternals", "lint": "tslint --project tsconfig.json -t stylish" From 06cc07967e6439ff4d01d7c6ebe44667825e97ef Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 1 Dec 2017 15:03:31 -0500 Subject: [PATCH 027/685] fix type in coverage command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 58557c60d..64ea510cf 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "pretest": "./scripts/download-rc.sh", "test": "mocha --recursive", "precoverage": "./scripts/download-rc.sh", - "coverage": "rimraf coverage && istanbul cover--root lib/ --include-all-sources _mocha -- --recursive --reporter spec", + "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", "generate-docs": "rimraf docs && typedoc --out docs/ --exclude **/codec/**/* --module commonjs src/ node_modules/@types/node/index.d.ts node_modules/typescript/lib/lib.es2015.d.ts --excludeExternals", From b33a0912061e62bc3db315019e277c5910571b59 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 1 Dec 2017 15:21:43 -0500 Subject: [PATCH 028/685] deletes unused codecs --- src/codec/AtomicReferenceAlterAndGetCodec.ts | 55 ----- src/codec/AtomicReferenceAlterCodec.ts | 43 ---- src/codec/AtomicReferenceApplyCodec.ts | 55 ----- src/codec/AtomicReferenceClearCodec.ts | 41 ---- .../AtomicReferenceCompareAndSetCodec.ts | 66 ------ src/codec/AtomicReferenceContainsCodec.ts | 58 ----- src/codec/AtomicReferenceGetAndAlterCodec.ts | 55 ----- src/codec/AtomicReferenceGetAndSetCodec.ts | 61 ----- src/codec/AtomicReferenceGetCodec.ts | 53 ----- src/codec/AtomicReferenceIsNullCodec.ts | 50 ---- src/codec/AtomicReferenceMessageType.ts | 15 -- src/codec/AtomicReferenceSetAndGetCodec.ts | 61 ----- src/codec/AtomicReferenceSetCodec.ts | 49 ---- src/codec/CacheAddEntryListenerCodec.ts | 79 ------- .../CacheAddInvalidationListenerCodec.ts | 147 ------------ ...heAddNearCacheInvalidationListenerCodec.ts | 150 ------------ .../CacheAddPartitionLostListenerCodec.ts | 68 ------ src/codec/CacheAssignAndGetUuidsCodec.ts | 63 ------ src/codec/CacheClearCodec.ts | 41 ---- src/codec/CacheContainsKeyCodec.ts | 52 ----- src/codec/CacheCreateConfigCodec.ts | 55 ----- src/codec/CacheDestroyCodec.ts | 41 ---- src/codec/CacheEntryProcessorCodec.ts | 70 ------ src/codec/CacheEventJournalReadCodec.ts | 100 -------- src/codec/CacheEventJournalSubscribeCodec.ts | 56 ----- ...FetchNearCacheInvalidationMetadataCodec.ts | 102 --------- src/codec/CacheGetAllCodec.ts | 81 ------- src/codec/CacheGetAndRemoveCodec.ts | 57 ----- src/codec/CacheGetAndReplaceCodec.ts | 67 ------ src/codec/CacheGetCodec.ts | 63 ------ src/codec/CacheGetConfigCodec.ts | 55 ----- src/codec/CacheIterateCodec.ts | 67 ------ src/codec/CacheIterateEntriesCodec.ts | 74 ------ src/codec/CacheListenerRegistrationCodec.ts | 47 ---- src/codec/CacheLoadAllCodec.ts | 54 ----- src/codec/CacheManagementConfigCodec.ts | 47 ---- src/codec/CacheMessageType.ts | 37 --- src/codec/CachePutAllCodec.ts | 68 ------ src/codec/CachePutCodec.ts | 69 ------ src/codec/CachePutIfAbsentCodec.ts | 64 ------ src/codec/CacheRemoveAllCodec.ts | 43 ---- src/codec/CacheRemoveAllKeysCodec.ts | 54 ----- src/codec/CacheRemoveCodec.ts | 62 ----- src/codec/CacheRemoveEntryListenerCodec.ts | 52 ----- .../CacheRemoveInvalidationListenerCodec.ts | 52 ----- .../CacheRemovePartitionLostListenerCodec.ts | 52 ----- src/codec/CacheReplaceCodec.ts | 75 ------ src/codec/CacheSizeCodec.ts | 50 ---- src/codec/CardinalityEstimatorAddCodec.ts | 43 ---- .../CardinalityEstimatorEstimateCodec.ts | 53 ----- src/codec/CardinalityEstimatorMessageType.ts | 5 - src/codec/ClientStatisticsCodec.ts | 41 ---- src/codec/ConditionAwaitCodec.ts | 58 ----- src/codec/ConditionBeforeAwaitCodec.ts | 47 ---- src/codec/ConditionMessageType.ts | 7 - src/codec/ConditionSignalAllCodec.ts | 45 ---- src/codec/ConditionSignalCodec.ts | 45 ---- src/codec/ContinuousQueryAddListenerCodec.ts | 87 ------- src/codec/ContinuousQueryDestroyCacheCodec.ts | 52 ----- .../ContinuousQueryMadePublishableCodec.ts | 52 ----- src/codec/ContinuousQueryMessageType.ts | 9 - .../ContinuousQueryPublisherCreateCodec.ts | 72 ------ ...nuousQueryPublisherCreateWithValueCodec.ts | 76 ------- .../ContinuousQuerySetReadCursorCodec.ts | 54 ----- src/codec/CountDownLatchAwaitCodec.ts | 52 ----- src/codec/CountDownLatchCountDownCodec.ts | 41 ---- src/codec/CountDownLatchGetCountCodec.ts | 50 ---- src/codec/CountDownLatchMessageType.ts | 7 - src/codec/CountDownLatchTrySetCountCodec.ts | 52 ----- .../DurableExecutorDisposeResultCodec.ts | 43 ---- src/codec/DurableExecutorIsShutdownCodec.ts | 53 ----- src/codec/DurableExecutorMessageType.ts | 9 - ...leExecutorRetrieveAndDisposeResultCodec.ts | 58 ----- .../DurableExecutorRetrieveResultCodec.ts | 58 ----- src/codec/DurableExecutorShutdownCodec.ts | 41 ---- .../DurableExecutorSubmitToPartitionCodec.ts | 55 ----- src/codec/DynamicConfigAddCacheConfigCodec.ts | 195 ---------------- ...onfigAddCardinalityEstimatorConfigCodec.ts | 45 ---- ...amicConfigAddDurableExecutorConfigCodec.ts | 47 ---- ...DynamicConfigAddEventJournalConfigCodec.ts | 61 ----- .../DynamicConfigAddExecutorConfigCodec.ts | 47 ---- src/codec/DynamicConfigAddListConfigCodec.ts | 66 ------ src/codec/DynamicConfigAddLockConfigCodec.ts | 49 ---- src/codec/DynamicConfigAddMapConfigCodec.ts | 214 ------------------ .../DynamicConfigAddMultiMapConfigCodec.ts | 68 ------ src/codec/DynamicConfigAddQueueConfigCodec.ts | 84 ------- ...ynamicConfigAddReliableTopicConfigCodec.ts | 72 ------ ...ynamicConfigAddReplicatedMapConfigCodec.ts | 66 ------ .../DynamicConfigAddRingbufferConfigCodec.ts | 59 ----- ...icConfigAddScheduledExecutorConfigCodec.ts | 47 ---- .../DynamicConfigAddSemaphoreConfigCodec.ts | 47 ---- src/codec/DynamicConfigAddSetConfigCodec.ts | 66 ------ src/codec/DynamicConfigAddTopicConfigCodec.ts | 64 ------ src/codec/DynamicConfigMessageType.ts | 20 -- .../ExecutorServiceCancelOnAddressCodec.ts | 54 ----- .../ExecutorServiceCancelOnPartitionCodec.ts | 54 ----- src/codec/ExecutorServiceIsShutdownCodec.ts | 50 ---- src/codec/ExecutorServiceMessageType.ts | 9 - src/codec/ExecutorServiceShutdownCodec.ts | 41 ---- .../ExecutorServiceSubmitToAddressCodec.ts | 59 ----- .../ExecutorServiceSubmitToPartitionCodec.ts | 59 ----- src/codec/MapReduceCancelCodec.ts | 52 ----- src/codec/MapReduceForCustomCodec.ts | 119 ---------- src/codec/MapReduceForListCodec.ts | 119 ---------- src/codec/MapReduceForMapCodec.ts | 119 ---------- src/codec/MapReduceForMultiMapCodec.ts | 119 ---------- src/codec/MapReduceForSetCodec.ts | 119 ---------- .../MapReduceJobProcessInformationCodec.ts | 63 ------ src/codec/MapReduceMessageType.ts | 10 - ...ScheduledExecutorCancelFromAddressCodec.ts | 59 ----- ...heduledExecutorCancelFromPartitionCodec.ts | 57 ----- ...cheduledExecutorDisposeFromAddressCodec.ts | 45 ---- ...eduledExecutorDisposeFromPartitionCodec.ts | 43 ---- ...uledExecutorGetAllScheduledFuturesCodec.ts | 72 ------ ...heduledExecutorGetDelayFromAddressCodec.ts | 57 ----- ...duledExecutorGetDelayFromPartitionCodec.ts | 55 ----- ...eduledExecutorGetResultFromAddressCodec.ts | 60 ----- ...uledExecutorGetResultFromPartitionCodec.ts | 58 ----- ...heduledExecutorGetStatsFromAddressCodec.ts | 66 ------ ...duledExecutorGetStatsFromPartitionCodec.ts | 64 ------ ...uledExecutorIsCancelledFromAddressCodec.ts | 57 ----- ...edExecutorIsCancelledFromPartitionCodec.ts | 55 ----- ...ScheduledExecutorIsDoneFromAddressCodec.ts | 57 ----- ...heduledExecutorIsDoneFromPartitionCodec.ts | 55 ----- src/codec/ScheduledExecutorMessageType.ts | 21 -- src/codec/ScheduledExecutorShutdownCodec.ts | 43 ---- .../ScheduledExecutorSubmitToAddressCodec.ts | 53 ----- ...ScheduledExecutorSubmitToPartitionCodec.ts | 51 ----- src/codec/TransactionCommitCodec.ts | 43 ---- src/codec/TransactionCreateCodec.ts | 56 ----- src/codec/TransactionMessageType.ts | 6 - src/codec/TransactionRollbackCodec.ts | 43 ---- src/codec/TransactionalListAddCodec.ts | 56 ----- src/codec/TransactionalListMessageType.ts | 6 - src/codec/TransactionalListRemoveCodec.ts | 56 ----- src/codec/TransactionalListSizeCodec.ts | 54 ----- src/codec/TransactionalMapContainsKeyCodec.ts | 56 ----- src/codec/TransactionalMapDeleteCodec.ts | 47 ---- src/codec/TransactionalMapGetCodec.ts | 59 ----- .../TransactionalMapGetForUpdateCodec.ts | 59 ----- src/codec/TransactionalMapIsEmptyCodec.ts | 54 ----- src/codec/TransactionalMapKeySetCodec.ts | 62 ----- ...ransactionalMapKeySetWithPredicateCodec.ts | 64 ------ src/codec/TransactionalMapMessageType.ts | 20 -- src/codec/TransactionalMapPutCodec.ts | 63 ------ src/codec/TransactionalMapPutIfAbsentCodec.ts | 61 ----- src/codec/TransactionalMapRemoveCodec.ts | 59 ----- .../TransactionalMapRemoveIfSameCodec.ts | 58 ----- src/codec/TransactionalMapReplaceCodec.ts | 61 ----- .../TransactionalMapReplaceIfSameCodec.ts | 60 ----- src/codec/TransactionalMapSetCodec.ts | 49 ---- src/codec/TransactionalMapSizeCodec.ts | 54 ----- src/codec/TransactionalMapValuesCodec.ts | 62 ----- ...ransactionalMapValuesWithPredicateCodec.ts | 64 ------ src/codec/TransactionalMultiMapGetCodec.ts | 64 ------ src/codec/TransactionalMultiMapMessageType.ts | 9 - src/codec/TransactionalMultiMapPutCodec.ts | 58 ----- src/codec/TransactionalMultiMapRemoveCodec.ts | 64 ------ .../TransactionalMultiMapRemoveEntryCodec.ts | 58 ----- src/codec/TransactionalMultiMapSizeCodec.ts | 54 ----- .../TransactionalMultiMapValueCountCodec.ts | 56 ----- src/codec/TransactionalQueueMessageType.ts | 8 - src/codec/TransactionalQueueOfferCodec.ts | 58 ----- src/codec/TransactionalQueuePeekCodec.ts | 59 ----- src/codec/TransactionalQueuePollCodec.ts | 59 ----- src/codec/TransactionalQueueSizeCodec.ts | 54 ----- src/codec/TransactionalQueueTakeCodec.ts | 57 ----- src/codec/TransactionalSetAddCodec.ts | 56 ----- src/codec/TransactionalSetMessageType.ts | 6 - src/codec/TransactionalSetRemoveCodec.ts | 56 ----- src/codec/TransactionalSetSizeCodec.ts | 54 ----- src/codec/XATransactionClearRemoteCodec.ts | 41 ---- .../XATransactionCollectTransactionsCodec.ts | 56 ----- src/codec/XATransactionCommitCodec.ts | 43 ---- src/codec/XATransactionCreateCodec.ts | 52 ----- src/codec/XATransactionFinalizeCodec.ts | 43 ---- src/codec/XATransactionMessageType.ts | 10 - src/codec/XATransactionPrepareCodec.ts | 41 ---- src/codec/XATransactionRollbackCodec.ts | 41 ---- 179 files changed, 10121 deletions(-) delete mode 100644 src/codec/AtomicReferenceAlterAndGetCodec.ts delete mode 100644 src/codec/AtomicReferenceAlterCodec.ts delete mode 100644 src/codec/AtomicReferenceApplyCodec.ts delete mode 100644 src/codec/AtomicReferenceClearCodec.ts delete mode 100644 src/codec/AtomicReferenceCompareAndSetCodec.ts delete mode 100644 src/codec/AtomicReferenceContainsCodec.ts delete mode 100644 src/codec/AtomicReferenceGetAndAlterCodec.ts delete mode 100644 src/codec/AtomicReferenceGetAndSetCodec.ts delete mode 100644 src/codec/AtomicReferenceGetCodec.ts delete mode 100644 src/codec/AtomicReferenceIsNullCodec.ts delete mode 100644 src/codec/AtomicReferenceMessageType.ts delete mode 100644 src/codec/AtomicReferenceSetAndGetCodec.ts delete mode 100644 src/codec/AtomicReferenceSetCodec.ts delete mode 100644 src/codec/CacheAddEntryListenerCodec.ts delete mode 100644 src/codec/CacheAddInvalidationListenerCodec.ts delete mode 100644 src/codec/CacheAddNearCacheInvalidationListenerCodec.ts delete mode 100644 src/codec/CacheAddPartitionLostListenerCodec.ts delete mode 100644 src/codec/CacheAssignAndGetUuidsCodec.ts delete mode 100644 src/codec/CacheClearCodec.ts delete mode 100644 src/codec/CacheContainsKeyCodec.ts delete mode 100644 src/codec/CacheCreateConfigCodec.ts delete mode 100644 src/codec/CacheDestroyCodec.ts delete mode 100644 src/codec/CacheEntryProcessorCodec.ts delete mode 100644 src/codec/CacheEventJournalReadCodec.ts delete mode 100644 src/codec/CacheEventJournalSubscribeCodec.ts delete mode 100644 src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts delete mode 100644 src/codec/CacheGetAllCodec.ts delete mode 100644 src/codec/CacheGetAndRemoveCodec.ts delete mode 100644 src/codec/CacheGetAndReplaceCodec.ts delete mode 100644 src/codec/CacheGetCodec.ts delete mode 100644 src/codec/CacheGetConfigCodec.ts delete mode 100644 src/codec/CacheIterateCodec.ts delete mode 100644 src/codec/CacheIterateEntriesCodec.ts delete mode 100644 src/codec/CacheListenerRegistrationCodec.ts delete mode 100644 src/codec/CacheLoadAllCodec.ts delete mode 100644 src/codec/CacheManagementConfigCodec.ts delete mode 100644 src/codec/CacheMessageType.ts delete mode 100644 src/codec/CachePutAllCodec.ts delete mode 100644 src/codec/CachePutCodec.ts delete mode 100644 src/codec/CachePutIfAbsentCodec.ts delete mode 100644 src/codec/CacheRemoveAllCodec.ts delete mode 100644 src/codec/CacheRemoveAllKeysCodec.ts delete mode 100644 src/codec/CacheRemoveCodec.ts delete mode 100644 src/codec/CacheRemoveEntryListenerCodec.ts delete mode 100644 src/codec/CacheRemoveInvalidationListenerCodec.ts delete mode 100644 src/codec/CacheRemovePartitionLostListenerCodec.ts delete mode 100644 src/codec/CacheReplaceCodec.ts delete mode 100644 src/codec/CacheSizeCodec.ts delete mode 100644 src/codec/CardinalityEstimatorAddCodec.ts delete mode 100644 src/codec/CardinalityEstimatorEstimateCodec.ts delete mode 100644 src/codec/CardinalityEstimatorMessageType.ts delete mode 100644 src/codec/ClientStatisticsCodec.ts delete mode 100644 src/codec/ConditionAwaitCodec.ts delete mode 100644 src/codec/ConditionBeforeAwaitCodec.ts delete mode 100644 src/codec/ConditionMessageType.ts delete mode 100644 src/codec/ConditionSignalAllCodec.ts delete mode 100644 src/codec/ConditionSignalCodec.ts delete mode 100644 src/codec/ContinuousQueryAddListenerCodec.ts delete mode 100644 src/codec/ContinuousQueryDestroyCacheCodec.ts delete mode 100644 src/codec/ContinuousQueryMadePublishableCodec.ts delete mode 100644 src/codec/ContinuousQueryMessageType.ts delete mode 100644 src/codec/ContinuousQueryPublisherCreateCodec.ts delete mode 100644 src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts delete mode 100644 src/codec/ContinuousQuerySetReadCursorCodec.ts delete mode 100644 src/codec/CountDownLatchAwaitCodec.ts delete mode 100644 src/codec/CountDownLatchCountDownCodec.ts delete mode 100644 src/codec/CountDownLatchGetCountCodec.ts delete mode 100644 src/codec/CountDownLatchMessageType.ts delete mode 100644 src/codec/CountDownLatchTrySetCountCodec.ts delete mode 100644 src/codec/DurableExecutorDisposeResultCodec.ts delete mode 100644 src/codec/DurableExecutorIsShutdownCodec.ts delete mode 100644 src/codec/DurableExecutorMessageType.ts delete mode 100644 src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts delete mode 100644 src/codec/DurableExecutorRetrieveResultCodec.ts delete mode 100644 src/codec/DurableExecutorShutdownCodec.ts delete mode 100644 src/codec/DurableExecutorSubmitToPartitionCodec.ts delete mode 100644 src/codec/DynamicConfigAddCacheConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddCardinalityEstimatorConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddDurableExecutorConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddEventJournalConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddExecutorConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddListConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddLockConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddMapConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddMultiMapConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddQueueConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddReliableTopicConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddReplicatedMapConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddRingbufferConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddScheduledExecutorConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddSemaphoreConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddSetConfigCodec.ts delete mode 100644 src/codec/DynamicConfigAddTopicConfigCodec.ts delete mode 100644 src/codec/DynamicConfigMessageType.ts delete mode 100644 src/codec/ExecutorServiceCancelOnAddressCodec.ts delete mode 100644 src/codec/ExecutorServiceCancelOnPartitionCodec.ts delete mode 100644 src/codec/ExecutorServiceIsShutdownCodec.ts delete mode 100644 src/codec/ExecutorServiceMessageType.ts delete mode 100644 src/codec/ExecutorServiceShutdownCodec.ts delete mode 100644 src/codec/ExecutorServiceSubmitToAddressCodec.ts delete mode 100644 src/codec/ExecutorServiceSubmitToPartitionCodec.ts delete mode 100644 src/codec/MapReduceCancelCodec.ts delete mode 100644 src/codec/MapReduceForCustomCodec.ts delete mode 100644 src/codec/MapReduceForListCodec.ts delete mode 100644 src/codec/MapReduceForMapCodec.ts delete mode 100644 src/codec/MapReduceForMultiMapCodec.ts delete mode 100644 src/codec/MapReduceForSetCodec.ts delete mode 100644 src/codec/MapReduceJobProcessInformationCodec.ts delete mode 100644 src/codec/MapReduceMessageType.ts delete mode 100644 src/codec/ScheduledExecutorCancelFromAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorCancelFromPartitionCodec.ts delete mode 100644 src/codec/ScheduledExecutorDisposeFromAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorDisposeFromPartitionCodec.ts delete mode 100644 src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts delete mode 100644 src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts delete mode 100644 src/codec/ScheduledExecutorGetResultFromAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts delete mode 100644 src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts delete mode 100644 src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts delete mode 100644 src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts delete mode 100644 src/codec/ScheduledExecutorMessageType.ts delete mode 100644 src/codec/ScheduledExecutorShutdownCodec.ts delete mode 100644 src/codec/ScheduledExecutorSubmitToAddressCodec.ts delete mode 100644 src/codec/ScheduledExecutorSubmitToPartitionCodec.ts delete mode 100644 src/codec/TransactionCommitCodec.ts delete mode 100644 src/codec/TransactionCreateCodec.ts delete mode 100644 src/codec/TransactionMessageType.ts delete mode 100644 src/codec/TransactionRollbackCodec.ts delete mode 100644 src/codec/TransactionalListAddCodec.ts delete mode 100644 src/codec/TransactionalListMessageType.ts delete mode 100644 src/codec/TransactionalListRemoveCodec.ts delete mode 100644 src/codec/TransactionalListSizeCodec.ts delete mode 100644 src/codec/TransactionalMapContainsKeyCodec.ts delete mode 100644 src/codec/TransactionalMapDeleteCodec.ts delete mode 100644 src/codec/TransactionalMapGetCodec.ts delete mode 100644 src/codec/TransactionalMapGetForUpdateCodec.ts delete mode 100644 src/codec/TransactionalMapIsEmptyCodec.ts delete mode 100644 src/codec/TransactionalMapKeySetCodec.ts delete mode 100644 src/codec/TransactionalMapKeySetWithPredicateCodec.ts delete mode 100644 src/codec/TransactionalMapMessageType.ts delete mode 100644 src/codec/TransactionalMapPutCodec.ts delete mode 100644 src/codec/TransactionalMapPutIfAbsentCodec.ts delete mode 100644 src/codec/TransactionalMapRemoveCodec.ts delete mode 100644 src/codec/TransactionalMapRemoveIfSameCodec.ts delete mode 100644 src/codec/TransactionalMapReplaceCodec.ts delete mode 100644 src/codec/TransactionalMapReplaceIfSameCodec.ts delete mode 100644 src/codec/TransactionalMapSetCodec.ts delete mode 100644 src/codec/TransactionalMapSizeCodec.ts delete mode 100644 src/codec/TransactionalMapValuesCodec.ts delete mode 100644 src/codec/TransactionalMapValuesWithPredicateCodec.ts delete mode 100644 src/codec/TransactionalMultiMapGetCodec.ts delete mode 100644 src/codec/TransactionalMultiMapMessageType.ts delete mode 100644 src/codec/TransactionalMultiMapPutCodec.ts delete mode 100644 src/codec/TransactionalMultiMapRemoveCodec.ts delete mode 100644 src/codec/TransactionalMultiMapRemoveEntryCodec.ts delete mode 100644 src/codec/TransactionalMultiMapSizeCodec.ts delete mode 100644 src/codec/TransactionalMultiMapValueCountCodec.ts delete mode 100644 src/codec/TransactionalQueueMessageType.ts delete mode 100644 src/codec/TransactionalQueueOfferCodec.ts delete mode 100644 src/codec/TransactionalQueuePeekCodec.ts delete mode 100644 src/codec/TransactionalQueuePollCodec.ts delete mode 100644 src/codec/TransactionalQueueSizeCodec.ts delete mode 100644 src/codec/TransactionalQueueTakeCodec.ts delete mode 100644 src/codec/TransactionalSetAddCodec.ts delete mode 100644 src/codec/TransactionalSetMessageType.ts delete mode 100644 src/codec/TransactionalSetRemoveCodec.ts delete mode 100644 src/codec/TransactionalSetSizeCodec.ts delete mode 100644 src/codec/XATransactionClearRemoteCodec.ts delete mode 100644 src/codec/XATransactionCollectTransactionsCodec.ts delete mode 100644 src/codec/XATransactionCommitCodec.ts delete mode 100644 src/codec/XATransactionCreateCodec.ts delete mode 100644 src/codec/XATransactionFinalizeCodec.ts delete mode 100644 src/codec/XATransactionMessageType.ts delete mode 100644 src/codec/XATransactionPrepareCodec.ts delete mode 100644 src/codec/XATransactionRollbackCodec.ts diff --git a/src/codec/AtomicReferenceAlterAndGetCodec.ts b/src/codec/AtomicReferenceAlterAndGetCodec.ts deleted file mode 100644 index ccc6efea2..000000000 --- a/src/codec/AtomicReferenceAlterAndGetCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_ALTERANDGET; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class AtomicReferenceAlterAndGetCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceAlterCodec.ts b/src/codec/AtomicReferenceAlterCodec.ts deleted file mode 100644 index 33e0f33a6..000000000 --- a/src/codec/AtomicReferenceAlterCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_ALTER; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class AtomicReferenceAlterCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/AtomicReferenceApplyCodec.ts b/src/codec/AtomicReferenceApplyCodec.ts deleted file mode 100644 index 0aeca4257..000000000 --- a/src/codec/AtomicReferenceApplyCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_APPLY; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class AtomicReferenceApplyCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceClearCodec.ts b/src/codec/AtomicReferenceClearCodec.ts deleted file mode 100644 index 0040eedfe..000000000 --- a/src/codec/AtomicReferenceClearCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class AtomicReferenceClearCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/AtomicReferenceCompareAndSetCodec.ts b/src/codec/AtomicReferenceCompareAndSetCodec.ts deleted file mode 100644 index 13c45b319..000000000 --- a/src/codec/AtomicReferenceCompareAndSetCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_COMPAREANDSET; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class AtomicReferenceCompareAndSetCodec { - - - static calculateSize(name: string, expected: Data, updated: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expected !== null) { - dataSize += BitsUtil.calculateSizeData(expected); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (updated !== null) { - dataSize += BitsUtil.calculateSizeData(updated); - } - return dataSize; - } - - static encodeRequest(name: string, expected: Data, updated: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, expected, updated)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(expected === null); - if (expected !== null) { - clientMessage.appendData(expected); - } - clientMessage.appendBoolean(updated === null); - if (updated !== null) { - clientMessage.appendData(updated); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceContainsCodec.ts b/src/codec/AtomicReferenceContainsCodec.ts deleted file mode 100644 index a367a5086..000000000 --- a/src/codec/AtomicReferenceContainsCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_CONTAINS; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class AtomicReferenceContainsCodec { - - - static calculateSize(name: string, expected: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expected !== null) { - dataSize += BitsUtil.calculateSizeData(expected); - } - return dataSize; - } - - static encodeRequest(name: string, expected: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, expected)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(expected === null); - if (expected !== null) { - clientMessage.appendData(expected); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceGetAndAlterCodec.ts b/src/codec/AtomicReferenceGetAndAlterCodec.ts deleted file mode 100644 index 72f8bd512..000000000 --- a/src/codec/AtomicReferenceGetAndAlterCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_GETANDALTER; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class AtomicReferenceGetAndAlterCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceGetAndSetCodec.ts b/src/codec/AtomicReferenceGetAndSetCodec.ts deleted file mode 100644 index 6a4a7d768..000000000 --- a/src/codec/AtomicReferenceGetAndSetCodec.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_GETANDSET; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class AtomicReferenceGetAndSetCodec { - - - static calculateSize(name: string, newValue: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (newValue !== null) { - dataSize += BitsUtil.calculateSizeData(newValue); - } - return dataSize; - } - - static encodeRequest(name: string, newValue: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, newValue)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(newValue === null); - if (newValue !== null) { - clientMessage.appendData(newValue); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceGetCodec.ts b/src/codec/AtomicReferenceGetCodec.ts deleted file mode 100644 index 0f8fa67c2..000000000 --- a/src/codec/AtomicReferenceGetCodec.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_GET; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class AtomicReferenceGetCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceIsNullCodec.ts b/src/codec/AtomicReferenceIsNullCodec.ts deleted file mode 100644 index 9fe063485..000000000 --- a/src/codec/AtomicReferenceIsNullCodec.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_ISNULL; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class AtomicReferenceIsNullCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceMessageType.ts b/src/codec/AtomicReferenceMessageType.ts deleted file mode 100644 index 6eb0bffc5..000000000 --- a/src/codec/AtomicReferenceMessageType.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* tslint:disable */ -export class AtomicReferenceMessageType { - static ATOMICREFERENCE_APPLY = 0x0b01; - static ATOMICREFERENCE_ALTER = 0x0b02; - static ATOMICREFERENCE_ALTERANDGET = 0x0b03; - static ATOMICREFERENCE_GETANDALTER = 0x0b04; - static ATOMICREFERENCE_CONTAINS = 0x0b05; - static ATOMICREFERENCE_COMPAREANDSET = 0x0b06; - static ATOMICREFERENCE_GET = 0x0b08; - static ATOMICREFERENCE_SET = 0x0b09; - static ATOMICREFERENCE_CLEAR = 0x0b0a; - static ATOMICREFERENCE_GETANDSET = 0x0b0b; - static ATOMICREFERENCE_SETANDGET = 0x0b0c; - static ATOMICREFERENCE_ISNULL = 0x0b0d; -} diff --git a/src/codec/AtomicReferenceSetAndGetCodec.ts b/src/codec/AtomicReferenceSetAndGetCodec.ts deleted file mode 100644 index e9af3ff85..000000000 --- a/src/codec/AtomicReferenceSetAndGetCodec.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_SETANDGET; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class AtomicReferenceSetAndGetCodec { - - - static calculateSize(name: string, newValue: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (newValue !== null) { - dataSize += BitsUtil.calculateSizeData(newValue); - } - return dataSize; - } - - static encodeRequest(name: string, newValue: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, newValue)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(newValue === null); - if (newValue !== null) { - clientMessage.appendData(newValue); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/AtomicReferenceSetCodec.ts b/src/codec/AtomicReferenceSetCodec.ts deleted file mode 100644 index b22294a3d..000000000 --- a/src/codec/AtomicReferenceSetCodec.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {AtomicReferenceMessageType} from './AtomicReferenceMessageType'; - -var REQUEST_TYPE = AtomicReferenceMessageType.ATOMICREFERENCE_SET; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class AtomicReferenceSetCodec { - - - static calculateSize(name: string, newValue: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (newValue !== null) { - dataSize += BitsUtil.calculateSizeData(newValue); - } - return dataSize; - } - - static encodeRequest(name: string, newValue: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, newValue)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(newValue === null); - if (newValue !== null) { - clientMessage.appendData(newValue); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheAddEntryListenerCodec.ts b/src/codec/CacheAddEntryListenerCodec.ts deleted file mode 100644 index f3cf94238..000000000 --- a/src/codec/CacheAddEntryListenerCodec.ts +++ /dev/null @@ -1,79 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ADDENTRYLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class CacheAddEntryListenerCodec { - - - static calculateSize(name: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - static handle(clientMessage: ClientMessage, handleEventCache: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_CACHE && handleEventCache !== null) { - var messageFinished = false; - var type: number = undefined; - if (!messageFinished) { - type = clientMessage.readInt32(); - } - var keys: any = undefined; - if (!messageFinished) { - - var keysSize = clientMessage.readInt32(); - keys = []; - for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { - var keysItem: any; - keysItem = CacheEventDataCodec.decode(clientMessage, toObjectFunction); - keys.push(keysItem) - } - } - var completionId: number = undefined; - if (!messageFinished) { - completionId = clientMessage.readInt32(); - } - handleEventCache(type, keys, completionId); - } - } - -} diff --git a/src/codec/CacheAddInvalidationListenerCodec.ts b/src/codec/CacheAddInvalidationListenerCodec.ts deleted file mode 100644 index 6f68dc1a6..000000000 --- a/src/codec/CacheAddInvalidationListenerCodec.ts +++ /dev/null @@ -1,147 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ADDINVALIDATIONLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class CacheAddInvalidationListenerCodec { - - - static calculateSize(name: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - static handle(clientMessage: ClientMessage, handleEventCacheinvalidation: any, handleEventCachebatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_CACHEINVALIDATION && handleEventCacheinvalidation !== null) { - var messageFinished = false; - var name: string = undefined; - if (!messageFinished) { - name = clientMessage.readString(); - } - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var sourceUuid: string = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - sourceUuid = clientMessage.readString(); - } - } - var partitionUuid: any = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - partitionUuid = UUIDCodec.decode(clientMessage, toObjectFunction); - } - var sequence: any = undefined; - if (!messageFinished) { - sequence = clientMessage.readLong(); - } - handleEventCacheinvalidation(name, key, sourceUuid, partitionUuid, sequence); - } - if (messageType === BitsUtil.EVENT_CACHEBATCHINVALIDATION && handleEventCachebatchinvalidation !== null) { - var messageFinished = false; - var name: string = undefined; - if (!messageFinished) { - name = clientMessage.readString(); - } - var keys: any = undefined; - if (!messageFinished) { - - var keysSize = clientMessage.readInt32(); - keys = []; - for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { - var keysItem: Data; - keysItem = clientMessage.readData(); - keys.push(keysItem) - } - } - var sourceUuids: any = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - - var sourceUuidsSize = clientMessage.readInt32(); - sourceUuids = []; - for (var sourceUuidsIndex = 0; sourceUuidsIndex < sourceUuidsSize; sourceUuidsIndex++) { - var sourceUuidsItem: string; - sourceUuidsItem = clientMessage.readString(); - sourceUuids.push(sourceUuidsItem) - } - } - } - var partitionUuids: any = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - - var partitionUuidsSize = clientMessage.readInt32(); - partitionUuids = []; - for (var partitionUuidsIndex = 0; partitionUuidsIndex < partitionUuidsSize; partitionUuidsIndex++) { - var partitionUuidsItem: any; - partitionUuidsItem = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuids.push(partitionUuidsItem) - } - } - var sequences: any = undefined; - if (!messageFinished) { - - var sequencesSize = clientMessage.readInt32(); - sequences = []; - for (var sequencesIndex = 0; sequencesIndex < sequencesSize; sequencesIndex++) { - var sequencesItem: any; - sequencesItem = clientMessage.readLong(); - sequences.push(sequencesItem) - } - } - handleEventCachebatchinvalidation(name, keys, sourceUuids, partitionUuids, sequences); - } - } - -} diff --git a/src/codec/CacheAddNearCacheInvalidationListenerCodec.ts b/src/codec/CacheAddNearCacheInvalidationListenerCodec.ts deleted file mode 100644 index da4d30da0..000000000 --- a/src/codec/CacheAddNearCacheInvalidationListenerCodec.ts +++ /dev/null @@ -1,150 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ADDNEARCACHEINVALIDATIONLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class CacheAddNearCacheInvalidationListenerCodec { - - - static calculateSize(name: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - static handle(clientMessage: ClientMessage, handleEventCacheinvalidation: any, handleEventCachebatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_CACHEINVALIDATION && handleEventCacheinvalidation !== null) { - var messageFinished = false; - var name: string = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - name = clientMessage.readString(); - } - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var sourceUuid: string = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - sourceUuid = clientMessage.readString(); - } - } - var partitionUuid: any = undefined; - if (!messageFinished) { - partitionUuid = UUIDCodec.decode(clientMessage, toObjectFunction); - } - var sequence: any = undefined; - if (!messageFinished) { - sequence = clientMessage.readLong(); - } - handleEventCacheinvalidation(name, key, sourceUuid, partitionUuid, sequence); - } - if (messageType === BitsUtil.EVENT_CACHEBATCHINVALIDATION && handleEventCachebatchinvalidation !== null) { - var messageFinished = false; - var name: string = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - name = clientMessage.readString(); - } - var keys: any = undefined; - if (!messageFinished) { - - var keysSize = clientMessage.readInt32(); - keys = []; - for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { - var keysItem: Data; - keysItem = clientMessage.readData(); - keys.push(keysItem) - } - } - var sourceUuids: any = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - - var sourceUuidsSize = clientMessage.readInt32(); - sourceUuids = []; - for (var sourceUuidsIndex = 0; sourceUuidsIndex < sourceUuidsSize; sourceUuidsIndex++) { - var sourceUuidsItem: string; - sourceUuidsItem = clientMessage.readString(); - sourceUuids.push(sourceUuidsItem) - } - } - } - var partitionUuids: any = undefined; - if (!messageFinished) { - - var partitionUuidsSize = clientMessage.readInt32(); - partitionUuids = []; - for (var partitionUuidsIndex = 0; partitionUuidsIndex < partitionUuidsSize; partitionUuidsIndex++) { - var partitionUuidsItem: any; - partitionUuidsItem = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuids.push(partitionUuidsItem) - } - } - var sequences: any = undefined; - if (!messageFinished) { - - var sequencesSize = clientMessage.readInt32(); - sequences = []; - for (var sequencesIndex = 0; sequencesIndex < sequencesSize; sequencesIndex++) { - var sequencesItem: any; - sequencesItem = clientMessage.readLong(); - sequences.push(sequencesItem) - } - } - handleEventCachebatchinvalidation(name, keys, sourceUuids, partitionUuids, sequences); - } - } - -} diff --git a/src/codec/CacheAddPartitionLostListenerCodec.ts b/src/codec/CacheAddPartitionLostListenerCodec.ts deleted file mode 100644 index ee67df8cc..000000000 --- a/src/codec/CacheAddPartitionLostListenerCodec.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ADDPARTITIONLOSTLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class CacheAddPartitionLostListenerCodec { - - - static calculateSize(name: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - static handle(clientMessage: ClientMessage, handleEventCachepartitionlost: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_CACHEPARTITIONLOST && handleEventCachepartitionlost !== null) { - var messageFinished = false; - var partitionId: number = undefined; - if (!messageFinished) { - partitionId = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - handleEventCachepartitionlost(partitionId, uuid); - } - } - -} diff --git a/src/codec/CacheAssignAndGetUuidsCodec.ts b/src/codec/CacheAssignAndGetUuidsCodec.ts deleted file mode 100644 index ed900eb9d..000000000 --- a/src/codec/CacheAssignAndGetUuidsCodec.ts +++ /dev/null @@ -1,63 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ASSIGNANDGETUUIDS; -var RESPONSE_TYPE = 123; -var RETRYABLE = true; - - -export class CacheAssignAndGetUuidsCodec { - - - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'partitionUuidList': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - var partitionUuidListSize = clientMessage.readInt32(); - var partitionUuidList: any = []; - for (var partitionUuidListIndex = 0; partitionUuidListIndex < partitionUuidListSize; partitionUuidListIndex++) { - var partitionUuidListItem: any; - var partitionUuidListItemKey: number; - var partitionUuidListItemVal: any; - partitionUuidListItemKey = clientMessage.readInt32(); - partitionUuidListItemVal = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuidListItem = [partitionUuidListItemKey, partitionUuidListItemVal]; - partitionUuidList.push(partitionUuidListItem) - } - parameters['partitionUuidList'] = partitionUuidList; - - return parameters; - } - - -} diff --git a/src/codec/CacheClearCodec.ts b/src/codec/CacheClearCodec.ts deleted file mode 100644 index 399a39073..000000000 --- a/src/codec/CacheClearCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CacheClearCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheContainsKeyCodec.ts b/src/codec/CacheContainsKeyCodec.ts deleted file mode 100644 index 6082becd0..000000000 --- a/src/codec/CacheContainsKeyCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_CONTAINSKEY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class CacheContainsKeyCodec { - - - static calculateSize(name: string, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CacheCreateConfigCodec.ts b/src/codec/CacheCreateConfigCodec.ts deleted file mode 100644 index ffe3232ed..000000000 --- a/src/codec/CacheCreateConfigCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_CREATECONFIG; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class CacheCreateConfigCodec { - - - static calculateSize(cacheConfig: Data, createAlsoOnOthers: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeData(cacheConfig); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(cacheConfig: Data, createAlsoOnOthers: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(cacheConfig, createAlsoOnOthers)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendData(cacheConfig); - clientMessage.appendBoolean(createAlsoOnOthers); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CacheDestroyCodec.ts b/src/codec/CacheDestroyCodec.ts deleted file mode 100644 index 36e228d1c..000000000 --- a/src/codec/CacheDestroyCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_DESTROY; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CacheDestroyCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheEntryProcessorCodec.ts b/src/codec/CacheEntryProcessorCodec.ts deleted file mode 100644 index deeca2c2a..000000000 --- a/src/codec/CacheEntryProcessorCodec.ts +++ /dev/null @@ -1,70 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ENTRYPROCESSOR; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class CacheEntryProcessorCodec { - - - static calculateSize(name: string, key: Data, entryProcessor: Data, args: any, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(entryProcessor); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - args.forEach((argsItem: any) => { - dataSize += BitsUtil.calculateSizeData(argsItem); - }); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, entryProcessor: Data, args: any, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, entryProcessor, args, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(entryProcessor); - clientMessage.appendInt32(args.length); - - args.forEach((argsItem: any) => { - clientMessage.appendData(argsItem); - }); - - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CacheEventJournalReadCodec.ts b/src/codec/CacheEventJournalReadCodec.ts deleted file mode 100644 index 9af964360..000000000 --- a/src/codec/CacheEventJournalReadCodec.ts +++ /dev/null @@ -1,100 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_EVENTJOURNALREAD; -var RESPONSE_TYPE = 115; -var RETRYABLE = true; - - -export class CacheEventJournalReadCodec { - - - static calculateSize(name: string, startSequence: any, minSize: number, maxSize: number, predicate: Data, projection: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (predicate !== null) { - dataSize += BitsUtil.calculateSizeData(predicate); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (projection !== null) { - dataSize += BitsUtil.calculateSizeData(projection); - } - return dataSize; - } - - static encodeRequest(name: string, startSequence: any, minSize: number, maxSize: number, predicate: Data, projection: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, startSequence, minSize, maxSize, predicate, projection)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(startSequence); - clientMessage.appendInt32(minSize); - clientMessage.appendInt32(maxSize); - clientMessage.appendBoolean(predicate === null); - if (predicate !== null) { - clientMessage.appendData(predicate); - } - clientMessage.appendBoolean(projection === null); - if (projection !== null) { - clientMessage.appendData(projection); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'readCount': null, - 'items': null, - 'itemSeqs': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['readCount'] = clientMessage.readInt32(); - - - var itemsSize = clientMessage.readInt32(); - var items: any = []; - for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { - var itemsItem: Data; - itemsItem = clientMessage.readData(); - items.push(itemsItem) - } - parameters['items'] = items; - - - if (clientMessage.readBoolean() !== true) { - - var itemSeqsSize = clientMessage.readInt32(); - var itemSeqs: any = []; - for (var itemSeqsIndex = 0; itemSeqsIndex < itemSeqsSize; itemSeqsIndex++) { - var itemSeqsItem: any; - itemSeqsItem = clientMessage.readLong(); - itemSeqs.push(itemSeqsItem) - } - parameters['itemSeqs'] = itemSeqs; - } - - return parameters; - } - - -} diff --git a/src/codec/CacheEventJournalSubscribeCodec.ts b/src/codec/CacheEventJournalSubscribeCodec.ts deleted file mode 100644 index 6ba5efef5..000000000 --- a/src/codec/CacheEventJournalSubscribeCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_EVENTJOURNALSUBSCRIBE; -var RESPONSE_TYPE = 125; -var RETRYABLE = true; - - -export class CacheEventJournalSubscribeCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'oldestSequence': null, - 'newestSequence': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['oldestSequence'] = clientMessage.readLong(); - - parameters['newestSequence'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts deleted file mode 100644 index dee407a4e..000000000 --- a/src/codec/CacheFetchNearCacheInvalidationMetadataCodec.ts +++ /dev/null @@ -1,102 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_FETCHNEARCACHEINVALIDATIONMETADATA; -var RESPONSE_TYPE = 122; -var RETRYABLE = false; - - -export class CacheFetchNearCacheInvalidationMetadataCodec { - - - static calculateSize(names: any, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - names.forEach((namesItem: any) => { - dataSize += BitsUtil.calculateSizeString(namesItem); - }); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(names: any, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(names, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendInt32(names.length); - - names.forEach((namesItem: any) => { - clientMessage.appendString(namesItem); - }); - - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'namePartitionSequenceList': null, - 'partitionUuidList': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - var namePartitionSequenceListSize = clientMessage.readInt32(); - var namePartitionSequenceList: any = []; - for (var namePartitionSequenceListIndex = 0; namePartitionSequenceListIndex < namePartitionSequenceListSize; namePartitionSequenceListIndex++) { - var namePartitionSequenceListItem: any; - var namePartitionSequenceListItemKey: string; - var namePartitionSequenceListItemVal: any; - namePartitionSequenceListItemKey = clientMessage.readString(); - - var namePartitionSequenceListItemValSize = clientMessage.readInt32(); - var namePartitionSequenceListItemVal: any = []; - for (var namePartitionSequenceListItemValIndex = 0; namePartitionSequenceListItemValIndex < namePartitionSequenceListItemValSize; namePartitionSequenceListItemValIndex++) { - var namePartitionSequenceListItemValItem: any; - var namePartitionSequenceListItemValItemKey: number; - var namePartitionSequenceListItemValItemVal: any; - namePartitionSequenceListItemValItemKey = clientMessage.readInt32(); - namePartitionSequenceListItemValItemVal = clientMessage.readLong(); - namePartitionSequenceListItemValItem = [namePartitionSequenceListItemValItemKey, namePartitionSequenceListItemValItemVal]; - namePartitionSequenceListItemVal.push(namePartitionSequenceListItemValItem) - } - namePartitionSequenceListItem = [namePartitionSequenceListItemKey, namePartitionSequenceListItemVal]; - namePartitionSequenceList.push(namePartitionSequenceListItem) - } - parameters['namePartitionSequenceList'] = namePartitionSequenceList; - - - var partitionUuidListSize = clientMessage.readInt32(); - var partitionUuidList: any = []; - for (var partitionUuidListIndex = 0; partitionUuidListIndex < partitionUuidListSize; partitionUuidListIndex++) { - var partitionUuidListItem: any; - var partitionUuidListItemKey: number; - var partitionUuidListItemVal: any; - partitionUuidListItemKey = clientMessage.readInt32(); - partitionUuidListItemVal = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuidListItem = [partitionUuidListItemKey, partitionUuidListItemVal]; - partitionUuidList.push(partitionUuidListItem) - } - parameters['partitionUuidList'] = partitionUuidList; - - return parameters; - } - - -} diff --git a/src/codec/CacheGetAllCodec.ts b/src/codec/CacheGetAllCodec.ts deleted file mode 100644 index 53682fac2..000000000 --- a/src/codec/CacheGetAllCodec.ts +++ /dev/null @@ -1,81 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_GETALL; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; - - -export class CacheGetAllCodec { - - - static calculateSize(name: string, keys: any, expiryPolicy: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(expiryPolicy); - } - return dataSize; - } - - static encodeRequest(name: string, keys: any, expiryPolicy: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, keys, expiryPolicy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - clientMessage.appendBoolean(expiryPolicy === null); - if (expiryPolicy !== null) { - clientMessage.appendData(expiryPolicy); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/CacheGetAndRemoveCodec.ts b/src/codec/CacheGetAndRemoveCodec.ts deleted file mode 100644 index 4884b233f..000000000 --- a/src/codec/CacheGetAndRemoveCodec.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_GETANDREMOVE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class CacheGetAndRemoveCodec { - - - static calculateSize(name: string, key: Data, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CacheGetAndReplaceCodec.ts b/src/codec/CacheGetAndReplaceCodec.ts deleted file mode 100644 index d6d4120ba..000000000 --- a/src/codec/CacheGetAndReplaceCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_GETANDREPLACE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class CacheGetAndReplaceCodec { - - - static calculateSize(name: string, key: Data, value: Data, expiryPolicy: Data, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(expiryPolicy); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, expiryPolicy: Data, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, expiryPolicy, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendBoolean(expiryPolicy === null); - if (expiryPolicy !== null) { - clientMessage.appendData(expiryPolicy); - } - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CacheGetCodec.ts b/src/codec/CacheGetCodec.ts deleted file mode 100644 index fc247457d..000000000 --- a/src/codec/CacheGetCodec.ts +++ /dev/null @@ -1,63 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_GET; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class CacheGetCodec { - - - static calculateSize(name: string, key: Data, expiryPolicy: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(expiryPolicy); - } - return dataSize; - } - - static encodeRequest(name: string, key: Data, expiryPolicy: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, expiryPolicy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendBoolean(expiryPolicy === null); - if (expiryPolicy !== null) { - clientMessage.appendData(expiryPolicy); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CacheGetConfigCodec.ts b/src/codec/CacheGetConfigCodec.ts deleted file mode 100644 index 10a8a11dd..000000000 --- a/src/codec/CacheGetConfigCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_GETCONFIG; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class CacheGetConfigCodec { - - - static calculateSize(name: string, simpleName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(simpleName); - return dataSize; - } - - static encodeRequest(name: string, simpleName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, simpleName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(simpleName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CacheIterateCodec.ts b/src/codec/CacheIterateCodec.ts deleted file mode 100644 index 38526422b..000000000 --- a/src/codec/CacheIterateCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ITERATE; -var RESPONSE_TYPE = 116; -var RETRYABLE = false; - - -export class CacheIterateCodec { - - - static calculateSize(name: string, partitionId: number, tableIndex: number, batch: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, partitionId: number, tableIndex: number, batch: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, partitionId, tableIndex, batch)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(partitionId); - clientMessage.appendInt32(tableIndex); - clientMessage.appendInt32(batch); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'tableIndex': null, - 'keys': null - }; - - parameters['tableIndex'] = clientMessage.readInt32(); - - - var keysSize = clientMessage.readInt32(); - var keys: any = []; - for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { - var keysItem: Data; - keysItem = clientMessage.readData(); - keys.push(keysItem) - } - parameters['keys'] = keys; - - return parameters; - } - - -} diff --git a/src/codec/CacheIterateEntriesCodec.ts b/src/codec/CacheIterateEntriesCodec.ts deleted file mode 100644 index 2e731f09f..000000000 --- a/src/codec/CacheIterateEntriesCodec.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_ITERATEENTRIES; -var RESPONSE_TYPE = 118; -var RETRYABLE = true; - - -export class CacheIterateEntriesCodec { - - - static calculateSize(name: string, partitionId: number, tableIndex: number, batch: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, partitionId: number, tableIndex: number, batch: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, partitionId, tableIndex, batch)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(partitionId); - clientMessage.appendInt32(tableIndex); - clientMessage.appendInt32(batch); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'tableIndex': null, - 'entries': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['tableIndex'] = clientMessage.readInt32(); - - - var entriesSize = clientMessage.readInt32(); - var entries: any = []; - for (var entriesIndex = 0; entriesIndex < entriesSize; entriesIndex++) { - var entriesItem: any; - var entriesItemKey: Data; - var entriesItemVal: any; - entriesItemKey = clientMessage.readData(); - entriesItemVal = clientMessage.readData(); - entriesItem = [entriesItemKey, entriesItemVal]; - entries.push(entriesItem) - } - parameters['entries'] = entries; - - return parameters; - } - - -} diff --git a/src/codec/CacheListenerRegistrationCodec.ts b/src/codec/CacheListenerRegistrationCodec.ts deleted file mode 100644 index f04b5e8ff..000000000 --- a/src/codec/CacheListenerRegistrationCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_LISTENERREGISTRATION; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CacheListenerRegistrationCodec { - - - static calculateSize(name: string, listenerConfig: Data, shouldRegister: boolean, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(listenerConfig); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(name: string, listenerConfig: Data, shouldRegister: boolean, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, listenerConfig, shouldRegister, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(listenerConfig); - clientMessage.appendBoolean(shouldRegister); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheLoadAllCodec.ts b/src/codec/CacheLoadAllCodec.ts deleted file mode 100644 index c558871c4..000000000 --- a/src/codec/CacheLoadAllCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_LOADALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CacheLoadAllCodec { - - - static calculateSize(name: string, keys: any, replaceExistingValues: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, keys: any, replaceExistingValues: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, keys, replaceExistingValues)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - clientMessage.appendBoolean(replaceExistingValues); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheManagementConfigCodec.ts b/src/codec/CacheManagementConfigCodec.ts deleted file mode 100644 index c9c39ab00..000000000 --- a/src/codec/CacheManagementConfigCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_MANAGEMENTCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class CacheManagementConfigCodec { - - - static calculateSize(name: string, isStat: boolean, enabled: boolean, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(name: string, isStat: boolean, enabled: boolean, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, isStat, enabled, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(isStat); - clientMessage.appendBoolean(enabled); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheMessageType.ts b/src/codec/CacheMessageType.ts deleted file mode 100644 index ebe1706ea..000000000 --- a/src/codec/CacheMessageType.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* tslint:disable */ -export class CacheMessageType { - static CACHE_ADDENTRYLISTENER = 0x1501; - static CACHE_ADDINVALIDATIONLISTENER = 0x1502; - static CACHE_CLEAR = 0x1503; - static CACHE_REMOVEALLKEYS = 0x1504; - static CACHE_REMOVEALL = 0x1505; - static CACHE_CONTAINSKEY = 0x1506; - static CACHE_CREATECONFIG = 0x1507; - static CACHE_DESTROY = 0x1508; - static CACHE_ENTRYPROCESSOR = 0x1509; - static CACHE_GETALL = 0x150a; - static CACHE_GETANDREMOVE = 0x150b; - static CACHE_GETANDREPLACE = 0x150c; - static CACHE_GETCONFIG = 0x150d; - static CACHE_GET = 0x150e; - static CACHE_ITERATE = 0x150f; - static CACHE_LISTENERREGISTRATION = 0x1510; - static CACHE_LOADALL = 0x1511; - static CACHE_MANAGEMENTCONFIG = 0x1512; - static CACHE_PUTIFABSENT = 0x1513; - static CACHE_PUT = 0x1514; - static CACHE_REMOVEENTRYLISTENER = 0x1515; - static CACHE_REMOVEINVALIDATIONLISTENER = 0x1516; - static CACHE_REMOVE = 0x1517; - static CACHE_REPLACE = 0x1518; - static CACHE_SIZE = 0x1519; - static CACHE_ADDPARTITIONLOSTLISTENER = 0x151a; - static CACHE_REMOVEPARTITIONLOSTLISTENER = 0x151b; - static CACHE_PUTALL = 0x151c; - static CACHE_ITERATEENTRIES = 0x151d; - static CACHE_ADDNEARCACHEINVALIDATIONLISTENER = 0x151e; - static CACHE_FETCHNEARCACHEINVALIDATIONMETADATA = 0x151f; - static CACHE_ASSIGNANDGETUUIDS = 0x1520; - static CACHE_EVENTJOURNALSUBSCRIBE = 0x1521; - static CACHE_EVENTJOURNALREAD = 0x1522; -} diff --git a/src/codec/CachePutAllCodec.ts b/src/codec/CachePutAllCodec.ts deleted file mode 100644 index 0814bf18d..000000000 --- a/src/codec/CachePutAllCodec.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_PUTALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CachePutAllCodec { - - - static calculateSize(name: string, entries: any, expiryPolicy: Data, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - entries.forEach((entriesItem: any) => { - var key: Data = entriesItem[0]; - var val: Data = entriesItem[1]; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(val); - }); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(expiryPolicy); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, entries: any, expiryPolicy: Data, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entries, expiryPolicy, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(entries.length); - - entries.forEach((entriesItem: any) => { - var key: Data = entriesItem[0]; - var val: Data = entriesItem[1]; - clientMessage.appendData(key); - clientMessage.appendData(val); - }); - - clientMessage.appendBoolean(expiryPolicy === null); - if (expiryPolicy !== null) { - clientMessage.appendData(expiryPolicy); - } - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CachePutCodec.ts b/src/codec/CachePutCodec.ts deleted file mode 100644 index 7325bb0a1..000000000 --- a/src/codec/CachePutCodec.ts +++ /dev/null @@ -1,69 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_PUT; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class CachePutCodec { - - - static calculateSize(name: string, key: Data, value: Data, expiryPolicy: Data, get: boolean, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(expiryPolicy); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, expiryPolicy: Data, get: boolean, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, expiryPolicy, get, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendBoolean(expiryPolicy === null); - if (expiryPolicy !== null) { - clientMessage.appendData(expiryPolicy); - } - clientMessage.appendBoolean(get); - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CachePutIfAbsentCodec.ts b/src/codec/CachePutIfAbsentCodec.ts deleted file mode 100644 index 52125964f..000000000 --- a/src/codec/CachePutIfAbsentCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_PUTIFABSENT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class CachePutIfAbsentCodec { - - - static calculateSize(name: string, key: Data, value: Data, expiryPolicy: Data, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(expiryPolicy); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, expiryPolicy: Data, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, expiryPolicy, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendBoolean(expiryPolicy === null); - if (expiryPolicy !== null) { - clientMessage.appendData(expiryPolicy); - } - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CacheRemoveAllCodec.ts b/src/codec/CacheRemoveAllCodec.ts deleted file mode 100644 index bd6eb2e53..000000000 --- a/src/codec/CacheRemoveAllCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_REMOVEALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CacheRemoveAllCodec { - - - static calculateSize(name: string, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheRemoveAllKeysCodec.ts b/src/codec/CacheRemoveAllKeysCodec.ts deleted file mode 100644 index 8c3ada0d3..000000000 --- a/src/codec/CacheRemoveAllKeysCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_REMOVEALLKEYS; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CacheRemoveAllKeysCodec { - - - static calculateSize(name: string, keys: any, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, keys: any, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, keys, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CacheRemoveCodec.ts b/src/codec/CacheRemoveCodec.ts deleted file mode 100644 index a8161c931..000000000 --- a/src/codec/CacheRemoveCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_REMOVE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class CacheRemoveCodec { - - - static calculateSize(name: string, key: Data, currentValue: Data, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (currentValue !== null) { - dataSize += BitsUtil.calculateSizeData(currentValue); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, currentValue: Data, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, currentValue, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendBoolean(currentValue === null); - if (currentValue !== null) { - clientMessage.appendData(currentValue); - } - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CacheRemoveEntryListenerCodec.ts b/src/codec/CacheRemoveEntryListenerCodec.ts deleted file mode 100644 index 40dd11e60..000000000 --- a/src/codec/CacheRemoveEntryListenerCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_REMOVEENTRYLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class CacheRemoveEntryListenerCodec { - - - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CacheRemoveInvalidationListenerCodec.ts b/src/codec/CacheRemoveInvalidationListenerCodec.ts deleted file mode 100644 index 4eb2b7380..000000000 --- a/src/codec/CacheRemoveInvalidationListenerCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_REMOVEINVALIDATIONLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class CacheRemoveInvalidationListenerCodec { - - - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CacheRemovePartitionLostListenerCodec.ts b/src/codec/CacheRemovePartitionLostListenerCodec.ts deleted file mode 100644 index 6badb8d48..000000000 --- a/src/codec/CacheRemovePartitionLostListenerCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_REMOVEPARTITIONLOSTLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class CacheRemovePartitionLostListenerCodec { - - - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CacheReplaceCodec.ts b/src/codec/CacheReplaceCodec.ts deleted file mode 100644 index 30ce90e35..000000000 --- a/src/codec/CacheReplaceCodec.ts +++ /dev/null @@ -1,75 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_REPLACE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class CacheReplaceCodec { - - - static calculateSize(name: string, key: Data, oldValue: Data, newValue: Data, expiryPolicy: Data, completionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (oldValue !== null) { - dataSize += BitsUtil.calculateSizeData(oldValue); - } - dataSize += BitsUtil.calculateSizeData(newValue); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(expiryPolicy); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, oldValue: Data, newValue: Data, expiryPolicy: Data, completionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, oldValue, newValue, expiryPolicy, completionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendBoolean(oldValue === null); - if (oldValue !== null) { - clientMessage.appendData(oldValue); - } - clientMessage.appendData(newValue); - clientMessage.appendBoolean(expiryPolicy === null); - if (expiryPolicy !== null) { - clientMessage.appendData(expiryPolicy); - } - clientMessage.appendInt32(completionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/CacheSizeCodec.ts b/src/codec/CacheSizeCodec.ts deleted file mode 100644 index e3cbd8e44..000000000 --- a/src/codec/CacheSizeCodec.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CacheMessageType} from './CacheMessageType'; - -var REQUEST_TYPE = CacheMessageType.CACHE_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; - - -export class CacheSizeCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/CardinalityEstimatorAddCodec.ts b/src/codec/CardinalityEstimatorAddCodec.ts deleted file mode 100644 index 0252f73c9..000000000 --- a/src/codec/CardinalityEstimatorAddCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CardinalityEstimatorMessageType} from './CardinalityEstimatorMessageType'; - -var REQUEST_TYPE = CardinalityEstimatorMessageType.CARDINALITYESTIMATOR_ADD; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CardinalityEstimatorAddCodec { - - - static calculateSize(name: string, hash: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, hash: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, hash)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(hash); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CardinalityEstimatorEstimateCodec.ts b/src/codec/CardinalityEstimatorEstimateCodec.ts deleted file mode 100644 index c4ee50bc4..000000000 --- a/src/codec/CardinalityEstimatorEstimateCodec.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CardinalityEstimatorMessageType} from './CardinalityEstimatorMessageType'; - -var REQUEST_TYPE = CardinalityEstimatorMessageType.CARDINALITYESTIMATOR_ESTIMATE; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class CardinalityEstimatorEstimateCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/CardinalityEstimatorMessageType.ts b/src/codec/CardinalityEstimatorMessageType.ts deleted file mode 100644 index ba5bdd7d4..000000000 --- a/src/codec/CardinalityEstimatorMessageType.ts +++ /dev/null @@ -1,5 +0,0 @@ -/* tslint:disable */ -export class CardinalityEstimatorMessageType { - static CARDINALITYESTIMATOR_ADD = 0x1c01; - static CARDINALITYESTIMATOR_ESTIMATE = 0x1c02; -} diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts deleted file mode 100644 index 32f9c13b0..000000000 --- a/src/codec/ClientStatisticsCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_STATISTICS; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class ClientStatisticsCodec { - - - static calculateSize(stats: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(stats); - return dataSize; - } - - static encodeRequest(stats: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(stats)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(stats); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ConditionAwaitCodec.ts b/src/codec/ConditionAwaitCodec.ts deleted file mode 100644 index 85b42ff39..000000000 --- a/src/codec/ConditionAwaitCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ConditionMessageType} from './ConditionMessageType'; - -var REQUEST_TYPE = ConditionMessageType.CONDITION_AWAIT; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ConditionAwaitCodec { - - - static calculateSize(name: string, threadId: any, timeout: any, lockName: string, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(lockName); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, threadId: any, timeout: any, lockName: string, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, threadId, timeout, lockName, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(threadId); - clientMessage.appendLong(timeout); - clientMessage.appendString(lockName); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ConditionBeforeAwaitCodec.ts b/src/codec/ConditionBeforeAwaitCodec.ts deleted file mode 100644 index 86e847735..000000000 --- a/src/codec/ConditionBeforeAwaitCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ConditionMessageType} from './ConditionMessageType'; - -var REQUEST_TYPE = ConditionMessageType.CONDITION_BEFOREAWAIT; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class ConditionBeforeAwaitCodec { - - - static calculateSize(name: string, threadId: any, lockName: string, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(lockName); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, threadId: any, lockName: string, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, threadId, lockName, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(threadId); - clientMessage.appendString(lockName); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ConditionMessageType.ts b/src/codec/ConditionMessageType.ts deleted file mode 100644 index 88f36a211..000000000 --- a/src/codec/ConditionMessageType.ts +++ /dev/null @@ -1,7 +0,0 @@ -/* tslint:disable */ -export class ConditionMessageType { - static CONDITION_AWAIT = 0x0801; - static CONDITION_BEFOREAWAIT = 0x0802; - static CONDITION_SIGNAL = 0x0803; - static CONDITION_SIGNALALL = 0x0804; -} diff --git a/src/codec/ConditionSignalAllCodec.ts b/src/codec/ConditionSignalAllCodec.ts deleted file mode 100644 index 57cad7e8f..000000000 --- a/src/codec/ConditionSignalAllCodec.ts +++ /dev/null @@ -1,45 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ConditionMessageType} from './ConditionMessageType'; - -var REQUEST_TYPE = ConditionMessageType.CONDITION_SIGNALALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class ConditionSignalAllCodec { - - - static calculateSize(name: string, threadId: any, lockName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(lockName); - return dataSize; - } - - static encodeRequest(name: string, threadId: any, lockName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, threadId, lockName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(threadId); - clientMessage.appendString(lockName); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ConditionSignalCodec.ts b/src/codec/ConditionSignalCodec.ts deleted file mode 100644 index ae73d0c95..000000000 --- a/src/codec/ConditionSignalCodec.ts +++ /dev/null @@ -1,45 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ConditionMessageType} from './ConditionMessageType'; - -var REQUEST_TYPE = ConditionMessageType.CONDITION_SIGNAL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class ConditionSignalCodec { - - - static calculateSize(name: string, threadId: any, lockName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(lockName); - return dataSize; - } - - static encodeRequest(name: string, threadId: any, lockName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, threadId, lockName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(threadId); - clientMessage.appendString(lockName); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ContinuousQueryAddListenerCodec.ts b/src/codec/ContinuousQueryAddListenerCodec.ts deleted file mode 100644 index e53333d21..000000000 --- a/src/codec/ContinuousQueryAddListenerCodec.ts +++ /dev/null @@ -1,87 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ContinuousQueryMessageType} from './ContinuousQueryMessageType'; - -var REQUEST_TYPE = ContinuousQueryMessageType.CONTINUOUSQUERY_ADDLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class ContinuousQueryAddListenerCodec { - - - static calculateSize(listenerName: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(listenerName); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(listenerName: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(listenerName, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(listenerName); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - static handle(clientMessage: ClientMessage, handleEventQuerycachesingle: any, handleEventQuerycachebatch: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_QUERYCACHESINGLE && handleEventQuerycachesingle !== null) { - var messageFinished = false; - var data: any = undefined; - if (!messageFinished) { - data = QueryCacheEventDataCodec.decode(clientMessage, toObjectFunction); - } - handleEventQuerycachesingle(data); - } - if (messageType === BitsUtil.EVENT_QUERYCACHEBATCH && handleEventQuerycachebatch !== null) { - var messageFinished = false; - var events: any = undefined; - if (!messageFinished) { - - var eventsSize = clientMessage.readInt32(); - events = []; - for (var eventsIndex = 0; eventsIndex < eventsSize; eventsIndex++) { - var eventsItem: any; - eventsItem = QueryCacheEventDataCodec.decode(clientMessage, toObjectFunction); - events.push(eventsItem) - } - } - var source: string = undefined; - if (!messageFinished) { - source = clientMessage.readString(); - } - var partitionId: number = undefined; - if (!messageFinished) { - partitionId = clientMessage.readInt32(); - } - handleEventQuerycachebatch(events, source, partitionId); - } - } - -} diff --git a/src/codec/ContinuousQueryDestroyCacheCodec.ts b/src/codec/ContinuousQueryDestroyCacheCodec.ts deleted file mode 100644 index 566a6c237..000000000 --- a/src/codec/ContinuousQueryDestroyCacheCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ContinuousQueryMessageType} from './ContinuousQueryMessageType'; - -var REQUEST_TYPE = ContinuousQueryMessageType.CONTINUOUSQUERY_DESTROYCACHE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class ContinuousQueryDestroyCacheCodec { - - - static calculateSize(mapName: string, cacheName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(mapName); - dataSize += BitsUtil.calculateSizeString(cacheName); - return dataSize; - } - - static encodeRequest(mapName: string, cacheName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(mapName, cacheName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(mapName); - clientMessage.appendString(cacheName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ContinuousQueryMadePublishableCodec.ts b/src/codec/ContinuousQueryMadePublishableCodec.ts deleted file mode 100644 index 5cda46bf9..000000000 --- a/src/codec/ContinuousQueryMadePublishableCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ContinuousQueryMessageType} from './ContinuousQueryMessageType'; - -var REQUEST_TYPE = ContinuousQueryMessageType.CONTINUOUSQUERY_MADEPUBLISHABLE; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ContinuousQueryMadePublishableCodec { - - - static calculateSize(mapName: string, cacheName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(mapName); - dataSize += BitsUtil.calculateSizeString(cacheName); - return dataSize; - } - - static encodeRequest(mapName: string, cacheName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(mapName, cacheName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(mapName); - clientMessage.appendString(cacheName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ContinuousQueryMessageType.ts b/src/codec/ContinuousQueryMessageType.ts deleted file mode 100644 index f8b1438d3..000000000 --- a/src/codec/ContinuousQueryMessageType.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* tslint:disable */ -export class ContinuousQueryMessageType { - static CONTINUOUSQUERY_PUBLISHERCREATEWITHVALUE = 0x1801; - static CONTINUOUSQUERY_PUBLISHERCREATE = 0x1802; - static CONTINUOUSQUERY_MADEPUBLISHABLE = 0x1803; - static CONTINUOUSQUERY_ADDLISTENER = 0x1804; - static CONTINUOUSQUERY_SETREADCURSOR = 0x1805; - static CONTINUOUSQUERY_DESTROYCACHE = 0x1806; -} diff --git a/src/codec/ContinuousQueryPublisherCreateCodec.ts b/src/codec/ContinuousQueryPublisherCreateCodec.ts deleted file mode 100644 index f63977b47..000000000 --- a/src/codec/ContinuousQueryPublisherCreateCodec.ts +++ /dev/null @@ -1,72 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ContinuousQueryMessageType} from './ContinuousQueryMessageType'; - -var REQUEST_TYPE = ContinuousQueryMessageType.CONTINUOUSQUERY_PUBLISHERCREATE; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; - - -export class ContinuousQueryPublisherCreateCodec { - - - static calculateSize(mapName: string, cacheName: string, predicate: Data, batchSize: number, bufferSize: number, delaySeconds: any, populate: boolean, coalesce: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(mapName); - dataSize += BitsUtil.calculateSizeString(cacheName); - dataSize += BitsUtil.calculateSizeData(predicate); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(mapName: string, cacheName: string, predicate: Data, batchSize: number, bufferSize: number, delaySeconds: any, populate: boolean, coalesce: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(mapName, cacheName, predicate, batchSize, bufferSize, delaySeconds, populate, coalesce)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(mapName); - clientMessage.appendString(cacheName); - clientMessage.appendData(predicate); - clientMessage.appendInt32(batchSize); - clientMessage.appendInt32(bufferSize); - clientMessage.appendLong(delaySeconds); - clientMessage.appendBoolean(populate); - clientMessage.appendBoolean(coalesce); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts b/src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts deleted file mode 100644 index 958ac9261..000000000 --- a/src/codec/ContinuousQueryPublisherCreateWithValueCodec.ts +++ /dev/null @@ -1,76 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ContinuousQueryMessageType} from './ContinuousQueryMessageType'; - -var REQUEST_TYPE = ContinuousQueryMessageType.CONTINUOUSQUERY_PUBLISHERCREATEWITHVALUE; -var RESPONSE_TYPE = 117; -var RETRYABLE = true; - - -export class ContinuousQueryPublisherCreateWithValueCodec { - - - static calculateSize(mapName: string, cacheName: string, predicate: Data, batchSize: number, bufferSize: number, delaySeconds: any, populate: boolean, coalesce: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(mapName); - dataSize += BitsUtil.calculateSizeString(cacheName); - dataSize += BitsUtil.calculateSizeData(predicate); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(mapName: string, cacheName: string, predicate: Data, batchSize: number, bufferSize: number, delaySeconds: any, populate: boolean, coalesce: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(mapName, cacheName, predicate, batchSize, bufferSize, delaySeconds, populate, coalesce)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(mapName); - clientMessage.appendString(cacheName); - clientMessage.appendData(predicate); - clientMessage.appendInt32(batchSize); - clientMessage.appendInt32(bufferSize); - clientMessage.appendLong(delaySeconds); - clientMessage.appendBoolean(populate); - clientMessage.appendBoolean(coalesce); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/ContinuousQuerySetReadCursorCodec.ts b/src/codec/ContinuousQuerySetReadCursorCodec.ts deleted file mode 100644 index c9ec49588..000000000 --- a/src/codec/ContinuousQuerySetReadCursorCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ContinuousQueryMessageType} from './ContinuousQueryMessageType'; - -var REQUEST_TYPE = ContinuousQueryMessageType.CONTINUOUSQUERY_SETREADCURSOR; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class ContinuousQuerySetReadCursorCodec { - - - static calculateSize(mapName: string, cacheName: string, sequence: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(mapName); - dataSize += BitsUtil.calculateSizeString(cacheName); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(mapName: string, cacheName: string, sequence: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(mapName, cacheName, sequence)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(mapName); - clientMessage.appendString(cacheName); - clientMessage.appendLong(sequence); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CountDownLatchAwaitCodec.ts b/src/codec/CountDownLatchAwaitCodec.ts deleted file mode 100644 index 7d7502598..000000000 --- a/src/codec/CountDownLatchAwaitCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CountDownLatchMessageType} from './CountDownLatchMessageType'; - -var REQUEST_TYPE = CountDownLatchMessageType.COUNTDOWNLATCH_AWAIT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class CountDownLatchAwaitCodec { - - - static calculateSize(name: string, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/CountDownLatchCountDownCodec.ts b/src/codec/CountDownLatchCountDownCodec.ts deleted file mode 100644 index 7cb0b1968..000000000 --- a/src/codec/CountDownLatchCountDownCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CountDownLatchMessageType} from './CountDownLatchMessageType'; - -var REQUEST_TYPE = CountDownLatchMessageType.COUNTDOWNLATCH_COUNTDOWN; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class CountDownLatchCountDownCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/CountDownLatchGetCountCodec.ts b/src/codec/CountDownLatchGetCountCodec.ts deleted file mode 100644 index 8beefeaba..000000000 --- a/src/codec/CountDownLatchGetCountCodec.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CountDownLatchMessageType} from './CountDownLatchMessageType'; - -var REQUEST_TYPE = CountDownLatchMessageType.COUNTDOWNLATCH_GETCOUNT; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; - - -export class CountDownLatchGetCountCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/CountDownLatchMessageType.ts b/src/codec/CountDownLatchMessageType.ts deleted file mode 100644 index 73247d237..000000000 --- a/src/codec/CountDownLatchMessageType.ts +++ /dev/null @@ -1,7 +0,0 @@ -/* tslint:disable */ -export class CountDownLatchMessageType { - static COUNTDOWNLATCH_AWAIT = 0x0c01; - static COUNTDOWNLATCH_COUNTDOWN = 0x0c02; - static COUNTDOWNLATCH_GETCOUNT = 0x0c03; - static COUNTDOWNLATCH_TRYSETCOUNT = 0x0c04; -} diff --git a/src/codec/CountDownLatchTrySetCountCodec.ts b/src/codec/CountDownLatchTrySetCountCodec.ts deleted file mode 100644 index 966ca3dd6..000000000 --- a/src/codec/CountDownLatchTrySetCountCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {CountDownLatchMessageType} from './CountDownLatchMessageType'; - -var REQUEST_TYPE = CountDownLatchMessageType.COUNTDOWNLATCH_TRYSETCOUNT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class CountDownLatchTrySetCountCodec { - - - static calculateSize(name: string, count: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, count: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, count)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(count); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/DurableExecutorDisposeResultCodec.ts b/src/codec/DurableExecutorDisposeResultCodec.ts deleted file mode 100644 index e21170010..000000000 --- a/src/codec/DurableExecutorDisposeResultCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DurableExecutorMessageType} from './DurableExecutorMessageType'; - -var REQUEST_TYPE = DurableExecutorMessageType.DURABLEEXECUTOR_DISPOSERESULT; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class DurableExecutorDisposeResultCodec { - - - static calculateSize(name: string, sequence: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, sequence: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, sequence)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(sequence); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DurableExecutorIsShutdownCodec.ts b/src/codec/DurableExecutorIsShutdownCodec.ts deleted file mode 100644 index f422b5ef9..000000000 --- a/src/codec/DurableExecutorIsShutdownCodec.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DurableExecutorMessageType} from './DurableExecutorMessageType'; - -var REQUEST_TYPE = DurableExecutorMessageType.DURABLEEXECUTOR_ISSHUTDOWN; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class DurableExecutorIsShutdownCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/DurableExecutorMessageType.ts b/src/codec/DurableExecutorMessageType.ts deleted file mode 100644 index a5ef1995f..000000000 --- a/src/codec/DurableExecutorMessageType.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* tslint:disable */ -export class DurableExecutorMessageType { - static DURABLEEXECUTOR_SHUTDOWN = 0x1b01; - static DURABLEEXECUTOR_ISSHUTDOWN = 0x1b02; - static DURABLEEXECUTOR_SUBMITTOPARTITION = 0x1b03; - static DURABLEEXECUTOR_RETRIEVERESULT = 0x1b04; - static DURABLEEXECUTOR_DISPOSERESULT = 0x1b05; - static DURABLEEXECUTOR_RETRIEVEANDDISPOSERESULT = 0x1b06; -} diff --git a/src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts b/src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts deleted file mode 100644 index 3fa9255a2..000000000 --- a/src/codec/DurableExecutorRetrieveAndDisposeResultCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DurableExecutorMessageType} from './DurableExecutorMessageType'; - -var REQUEST_TYPE = DurableExecutorMessageType.DURABLEEXECUTOR_RETRIEVEANDDISPOSERESULT; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class DurableExecutorRetrieveAndDisposeResultCodec { - - - static calculateSize(name: string, sequence: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, sequence: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, sequence)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(sequence); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/DurableExecutorRetrieveResultCodec.ts b/src/codec/DurableExecutorRetrieveResultCodec.ts deleted file mode 100644 index 22429162e..000000000 --- a/src/codec/DurableExecutorRetrieveResultCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DurableExecutorMessageType} from './DurableExecutorMessageType'; - -var REQUEST_TYPE = DurableExecutorMessageType.DURABLEEXECUTOR_RETRIEVERESULT; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class DurableExecutorRetrieveResultCodec { - - - static calculateSize(name: string, sequence: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, sequence: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, sequence)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(sequence); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/DurableExecutorShutdownCodec.ts b/src/codec/DurableExecutorShutdownCodec.ts deleted file mode 100644 index ba6876cc0..000000000 --- a/src/codec/DurableExecutorShutdownCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DurableExecutorMessageType} from './DurableExecutorMessageType'; - -var REQUEST_TYPE = DurableExecutorMessageType.DURABLEEXECUTOR_SHUTDOWN; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DurableExecutorShutdownCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DurableExecutorSubmitToPartitionCodec.ts b/src/codec/DurableExecutorSubmitToPartitionCodec.ts deleted file mode 100644 index be36c8cb2..000000000 --- a/src/codec/DurableExecutorSubmitToPartitionCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DurableExecutorMessageType} from './DurableExecutorMessageType'; - -var REQUEST_TYPE = DurableExecutorMessageType.DURABLEEXECUTOR_SUBMITTOPARTITION; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; - - -export class DurableExecutorSubmitToPartitionCodec { - - - static calculateSize(name: string, callable: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(callable); - return dataSize; - } - - static encodeRequest(name: string, callable: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, callable)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(callable); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/DynamicConfigAddCacheConfigCodec.ts b/src/codec/DynamicConfigAddCacheConfigCodec.ts deleted file mode 100644 index 20dcfa8ce..000000000 --- a/src/codec/DynamicConfigAddCacheConfigCodec.ts +++ /dev/null @@ -1,195 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDCACHECONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddCacheConfigCodec { - - - static calculateSize(name: string, keyType: string, valueType: string, statisticsEnabled: boolean, managementEnabled: boolean, readThrough: boolean, writeThrough: boolean, cacheLoaderFactory: string, cacheWriterFactory: string, cacheLoader: string, cacheWriter: string, backupCount: number, asyncBackupCount: number, inMemoryFormat: string, quorumName: string, mergePolicy: string, disablePerEntryInvalidationEvents: boolean, partitionLostListenerConfigs: any, expiryPolicyFactoryClassName: string, timedExpiryPolicyFactoryConfig: any, cacheEntryListeners: any, evictionConfig: any, wanReplicationRef: any, hotRestartConfig: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (keyType !== null) { - dataSize += BitsUtil.calculateSizeString(keyType); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (valueType !== null) { - dataSize += BitsUtil.calculateSizeString(valueType); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (cacheLoaderFactory !== null) { - dataSize += BitsUtil.calculateSizeString(cacheLoaderFactory); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (cacheWriterFactory !== null) { - dataSize += BitsUtil.calculateSizeString(cacheWriterFactory); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (cacheLoader !== null) { - dataSize += BitsUtil.calculateSizeString(cacheLoader); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (cacheWriter !== null) { - dataSize += BitsUtil.calculateSizeString(cacheWriter); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(inMemoryFormat); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (quorumName !== null) { - dataSize += BitsUtil.calculateSizeString(quorumName); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (mergePolicy !== null) { - dataSize += BitsUtil.calculateSizeString(mergePolicy); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (partitionLostListenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - partitionLostListenerConfigs.forEach((partitionLostListenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(partitionLostListenerConfigsItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (expiryPolicyFactoryClassName !== null) { - dataSize += BitsUtil.calculateSizeString(expiryPolicyFactoryClassName); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (timedExpiryPolicyFactoryConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.cachesimpleconfig.expirypolicyfactoryconfig.timedexpirypolicyfactoryconfig(timedExpiryPolicyFactoryConfig); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (cacheEntryListeners !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - cacheEntryListeners.forEach((cacheEntryListenersItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.cachesimpleentrylistenerconfig(cacheEntryListenersItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (evictionConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.evictionconfigholder(evictionConfig); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (wanReplicationRef !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.wanreplicationref(wanReplicationRef); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (hotRestartConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.hotrestartconfig(hotRestartConfig); - } - return dataSize; - } - - static encodeRequest(name: string, keyType: string, valueType: string, statisticsEnabled: boolean, managementEnabled: boolean, readThrough: boolean, writeThrough: boolean, cacheLoaderFactory: string, cacheWriterFactory: string, cacheLoader: string, cacheWriter: string, backupCount: number, asyncBackupCount: number, inMemoryFormat: string, quorumName: string, mergePolicy: string, disablePerEntryInvalidationEvents: boolean, partitionLostListenerConfigs: any, expiryPolicyFactoryClassName: string, timedExpiryPolicyFactoryConfig: any, cacheEntryListeners: any, evictionConfig: any, wanReplicationRef: any, hotRestartConfig: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, keyType, valueType, statisticsEnabled, managementEnabled, readThrough, writeThrough, cacheLoaderFactory, cacheWriterFactory, cacheLoader, cacheWriter, backupCount, asyncBackupCount, inMemoryFormat, quorumName, mergePolicy, disablePerEntryInvalidationEvents, partitionLostListenerConfigs, expiryPolicyFactoryClassName, timedExpiryPolicyFactoryConfig, cacheEntryListeners, evictionConfig, wanReplicationRef, hotRestartConfig)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(keyType === null); - if (keyType !== null) { - clientMessage.appendString(keyType); - } - clientMessage.appendBoolean(valueType === null); - if (valueType !== null) { - clientMessage.appendString(valueType); - } - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.appendBoolean(managementEnabled); - clientMessage.appendBoolean(readThrough); - clientMessage.appendBoolean(writeThrough); - clientMessage.appendBoolean(cacheLoaderFactory === null); - if (cacheLoaderFactory !== null) { - clientMessage.appendString(cacheLoaderFactory); - } - clientMessage.appendBoolean(cacheWriterFactory === null); - if (cacheWriterFactory !== null) { - clientMessage.appendString(cacheWriterFactory); - } - clientMessage.appendBoolean(cacheLoader === null); - if (cacheLoader !== null) { - clientMessage.appendString(cacheLoader); - } - clientMessage.appendBoolean(cacheWriter === null); - if (cacheWriter !== null) { - clientMessage.appendString(cacheWriter); - } - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.appendString(inMemoryFormat); - clientMessage.appendBoolean(quorumName === null); - if (quorumName !== null) { - clientMessage.appendString(quorumName); - } - clientMessage.appendBoolean(mergePolicy === null); - if (mergePolicy !== null) { - clientMessage.appendString(mergePolicy); - } - clientMessage.appendBoolean(disablePerEntryInvalidationEvents); - clientMessage.appendBoolean(partitionLostListenerConfigs === null); - if (partitionLostListenerConfigs !== null) { - clientMessage.appendInt32(partitionLostListenerConfigs.length); - - partitionLostListenerConfigs.forEach((partitionLostListenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, partitionLostListenerConfigsItem); - }); - - } - clientMessage.appendBoolean(expiryPolicyFactoryClassName === null); - if (expiryPolicyFactoryClassName !== null) { - clientMessage.appendString(expiryPolicyFactoryClassName); - } - clientMessage.appendBoolean(timedExpiryPolicyFactoryConfig === null); - if (timedExpiryPolicyFactoryConfig !== null) { - TimedExpiryPolicyFactoryConfigCodec.encode(clientMessage, timedExpiryPolicyFactoryConfig); - } - clientMessage.appendBoolean(cacheEntryListeners === null); - if (cacheEntryListeners !== null) { - clientMessage.appendInt32(cacheEntryListeners.length); - - cacheEntryListeners.forEach((cacheEntryListenersItem: any) => { - CacheSimpleEntryListenerConfigCodec.encode(clientMessage, cacheEntryListenersItem); - }); - - } - clientMessage.appendBoolean(evictionConfig === null); - if (evictionConfig !== null) { - EvictionConfigCodec.encode(clientMessage, evictionConfig); - } - clientMessage.appendBoolean(wanReplicationRef === null); - if (wanReplicationRef !== null) { - WanReplicationRefCodec.encode(clientMessage, wanReplicationRef); - } - clientMessage.appendBoolean(hotRestartConfig === null); - if (hotRestartConfig !== null) { - HotRestartConfigCodec.encode(clientMessage, hotRestartConfig); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddCardinalityEstimatorConfigCodec.ts b/src/codec/DynamicConfigAddCardinalityEstimatorConfigCodec.ts deleted file mode 100644 index 1e9d267d2..000000000 --- a/src/codec/DynamicConfigAddCardinalityEstimatorConfigCodec.ts +++ /dev/null @@ -1,45 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDCARDINALITYESTIMATORCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddCardinalityEstimatorConfigCodec { - - - static calculateSize(name: string, backupCount: number, asyncBackupCount: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, backupCount: number, asyncBackupCount: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, backupCount, asyncBackupCount)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddDurableExecutorConfigCodec.ts b/src/codec/DynamicConfigAddDurableExecutorConfigCodec.ts deleted file mode 100644 index 5938939fa..000000000 --- a/src/codec/DynamicConfigAddDurableExecutorConfigCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDDURABLEEXECUTORCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddDurableExecutorConfigCodec { - - - static calculateSize(name: string, poolSize: number, durability: number, capacity: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, poolSize: number, durability: number, capacity: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, poolSize, durability, capacity)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(poolSize); - clientMessage.appendInt32(durability); - clientMessage.appendInt32(capacity); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddEventJournalConfigCodec.ts b/src/codec/DynamicConfigAddEventJournalConfigCodec.ts deleted file mode 100644 index e9f65244a..000000000 --- a/src/codec/DynamicConfigAddEventJournalConfigCodec.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDEVENTJOURNALCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddEventJournalConfigCodec { - - - static calculateSize(mapName: string, cacheName: string, enabled: boolean, capacity: number, timeToLiveSeconds: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (mapName !== null) { - dataSize += BitsUtil.calculateSizeString(mapName); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (cacheName !== null) { - dataSize += BitsUtil.calculateSizeString(cacheName); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(mapName: string, cacheName: string, enabled: boolean, capacity: number, timeToLiveSeconds: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(mapName, cacheName, enabled, capacity, timeToLiveSeconds)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendBoolean(mapName === null); - if (mapName !== null) { - clientMessage.appendString(mapName); - } - clientMessage.appendBoolean(cacheName === null); - if (cacheName !== null) { - clientMessage.appendString(cacheName); - } - clientMessage.appendBoolean(enabled); - clientMessage.appendInt32(capacity); - clientMessage.appendInt32(timeToLiveSeconds); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddExecutorConfigCodec.ts b/src/codec/DynamicConfigAddExecutorConfigCodec.ts deleted file mode 100644 index 00b86efbb..000000000 --- a/src/codec/DynamicConfigAddExecutorConfigCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDEXECUTORCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddExecutorConfigCodec { - - - static calculateSize(name: string, poolSize: number, queueCapacity: number, statisticsEnabled: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, poolSize: number, queueCapacity: number, statisticsEnabled: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, poolSize, queueCapacity, statisticsEnabled)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(poolSize); - clientMessage.appendInt32(queueCapacity); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddListConfigCodec.ts b/src/codec/DynamicConfigAddListConfigCodec.ts deleted file mode 100644 index 60d16cd83..000000000 --- a/src/codec/DynamicConfigAddListConfigCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDLISTCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddListConfigCodec { - - - static calculateSize(name: string, listenerConfigs: any, backupCount: number, asyncBackupCount: number, maxSize: number, statisticsEnabled: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, listenerConfigs: any, backupCount: number, asyncBackupCount: number, maxSize: number, statisticsEnabled: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, listenerConfigs, backupCount, asyncBackupCount, maxSize, statisticsEnabled)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.appendInt32(maxSize); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddLockConfigCodec.ts b/src/codec/DynamicConfigAddLockConfigCodec.ts deleted file mode 100644 index de73e3431..000000000 --- a/src/codec/DynamicConfigAddLockConfigCodec.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDLOCKCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddLockConfigCodec { - - - static calculateSize(name: string, quorumName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (quorumName !== null) { - dataSize += BitsUtil.calculateSizeString(quorumName); - } - return dataSize; - } - - static encodeRequest(name: string, quorumName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, quorumName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(quorumName === null); - if (quorumName !== null) { - clientMessage.appendString(quorumName); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddMapConfigCodec.ts b/src/codec/DynamicConfigAddMapConfigCodec.ts deleted file mode 100644 index b151596df..000000000 --- a/src/codec/DynamicConfigAddMapConfigCodec.ts +++ /dev/null @@ -1,214 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDMAPCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddMapConfigCodec { - - - static calculateSize(name: string, backupCount: number, asyncBackupCount: number, timeToLiveSeconds: number, maxIdleSeconds: number, evictionPolicy: string, readBackupData: boolean, cacheDeserializedValues: string, mergePolicy: string, inMemoryFormat: string, listenerConfigs: any, partitionLostListenerConfigs: any, statisticsEnabled: boolean, quorumName: string, mapEvictionPolicy: Data, maxSizeConfigMaxSizePolicy: string, maxSizeConfigSize: number, mapStoreConfig: any, nearCacheConfig: any, wanReplicationRef: any, mapIndexConfigs: any, mapAttributeConfigs: any, queryCacheConfigs: any, partitioningStrategyClassName: string, partitioningStrategyImplementation: Data, hotRestartConfig: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(evictionPolicy); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(cacheDeserializedValues); - dataSize += BitsUtil.calculateSizeString(mergePolicy); - dataSize += BitsUtil.calculateSizeString(inMemoryFormat); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (partitionLostListenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - partitionLostListenerConfigs.forEach((partitionLostListenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(partitionLostListenerConfigsItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (quorumName !== null) { - dataSize += BitsUtil.calculateSizeString(quorumName); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (mapEvictionPolicy !== null) { - dataSize += BitsUtil.calculateSizeData(mapEvictionPolicy); - } - dataSize += BitsUtil.calculateSizeString(maxSizeConfigMaxSizePolicy); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (mapStoreConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.mapstoreconfigholder(mapStoreConfig); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (nearCacheConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.nearcacheconfigholder(nearCacheConfig); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (wanReplicationRef !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.wanreplicationref(wanReplicationRef); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (mapIndexConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - mapIndexConfigs.forEach((mapIndexConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.mapindexconfig(mapIndexConfigsItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (mapAttributeConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - mapAttributeConfigs.forEach((mapAttributeConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.mapattributeconfig(mapAttributeConfigsItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (queryCacheConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - queryCacheConfigs.forEach((queryCacheConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.querycacheconfigholder(queryCacheConfigsItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (partitioningStrategyClassName !== null) { - dataSize += BitsUtil.calculateSizeString(partitioningStrategyClassName); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (partitioningStrategyImplementation !== null) { - dataSize += BitsUtil.calculateSizeData(partitioningStrategyImplementation); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (hotRestartConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.config.hotrestartconfig(hotRestartConfig); - } - return dataSize; - } - - static encodeRequest(name: string, backupCount: number, asyncBackupCount: number, timeToLiveSeconds: number, maxIdleSeconds: number, evictionPolicy: string, readBackupData: boolean, cacheDeserializedValues: string, mergePolicy: string, inMemoryFormat: string, listenerConfigs: any, partitionLostListenerConfigs: any, statisticsEnabled: boolean, quorumName: string, mapEvictionPolicy: Data, maxSizeConfigMaxSizePolicy: string, maxSizeConfigSize: number, mapStoreConfig: any, nearCacheConfig: any, wanReplicationRef: any, mapIndexConfigs: any, mapAttributeConfigs: any, queryCacheConfigs: any, partitioningStrategyClassName: string, partitioningStrategyImplementation: Data, hotRestartConfig: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, backupCount, asyncBackupCount, timeToLiveSeconds, maxIdleSeconds, evictionPolicy, readBackupData, cacheDeserializedValues, mergePolicy, inMemoryFormat, listenerConfigs, partitionLostListenerConfigs, statisticsEnabled, quorumName, mapEvictionPolicy, maxSizeConfigMaxSizePolicy, maxSizeConfigSize, mapStoreConfig, nearCacheConfig, wanReplicationRef, mapIndexConfigs, mapAttributeConfigs, queryCacheConfigs, partitioningStrategyClassName, partitioningStrategyImplementation, hotRestartConfig)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.appendInt32(timeToLiveSeconds); - clientMessage.appendInt32(maxIdleSeconds); - clientMessage.appendString(evictionPolicy); - clientMessage.appendBoolean(readBackupData); - clientMessage.appendString(cacheDeserializedValues); - clientMessage.appendString(mergePolicy); - clientMessage.appendString(inMemoryFormat); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.appendBoolean(partitionLostListenerConfigs === null); - if (partitionLostListenerConfigs !== null) { - clientMessage.appendInt32(partitionLostListenerConfigs.length); - - partitionLostListenerConfigs.forEach((partitionLostListenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, partitionLostListenerConfigsItem); - }); - - } - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.appendBoolean(quorumName === null); - if (quorumName !== null) { - clientMessage.appendString(quorumName); - } - clientMessage.appendBoolean(mapEvictionPolicy === null); - if (mapEvictionPolicy !== null) { - clientMessage.appendData(mapEvictionPolicy); - } - clientMessage.appendString(maxSizeConfigMaxSizePolicy); - clientMessage.appendInt32(maxSizeConfigSize); - clientMessage.appendBoolean(mapStoreConfig === null); - if (mapStoreConfig !== null) { - MapStoreConfigCodec.encode(clientMessage, mapStoreConfig); - } - clientMessage.appendBoolean(nearCacheConfig === null); - if (nearCacheConfig !== null) { - NearCacheConfigCodec.encode(clientMessage, nearCacheConfig); - } - clientMessage.appendBoolean(wanReplicationRef === null); - if (wanReplicationRef !== null) { - WanReplicationRefCodec.encode(clientMessage, wanReplicationRef); - } - clientMessage.appendBoolean(mapIndexConfigs === null); - if (mapIndexConfigs !== null) { - clientMessage.appendInt32(mapIndexConfigs.length); - - mapIndexConfigs.forEach((mapIndexConfigsItem: any) => { - MapIndexConfigCodec.encode(clientMessage, mapIndexConfigsItem); - }); - - } - clientMessage.appendBoolean(mapAttributeConfigs === null); - if (mapAttributeConfigs !== null) { - clientMessage.appendInt32(mapAttributeConfigs.length); - - mapAttributeConfigs.forEach((mapAttributeConfigsItem: any) => { - MapAttributeConfigCodec.encode(clientMessage, mapAttributeConfigsItem); - }); - - } - clientMessage.appendBoolean(queryCacheConfigs === null); - if (queryCacheConfigs !== null) { - clientMessage.appendInt32(queryCacheConfigs.length); - - queryCacheConfigs.forEach((queryCacheConfigsItem: any) => { - QueryCacheConfigCodec.encode(clientMessage, queryCacheConfigsItem); - }); - - } - clientMessage.appendBoolean(partitioningStrategyClassName === null); - if (partitioningStrategyClassName !== null) { - clientMessage.appendString(partitioningStrategyClassName); - } - clientMessage.appendBoolean(partitioningStrategyImplementation === null); - if (partitioningStrategyImplementation !== null) { - clientMessage.appendData(partitioningStrategyImplementation); - } - clientMessage.appendBoolean(hotRestartConfig === null); - if (hotRestartConfig !== null) { - HotRestartConfigCodec.encode(clientMessage, hotRestartConfig); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddMultiMapConfigCodec.ts b/src/codec/DynamicConfigAddMultiMapConfigCodec.ts deleted file mode 100644 index b999eb05f..000000000 --- a/src/codec/DynamicConfigAddMultiMapConfigCodec.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDMULTIMAPCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddMultiMapConfigCodec { - - - static calculateSize(name: string, collectionType: string, listenerConfigs: any, binary: boolean, backupCount: number, asyncBackupCount: number, statisticsEnabled: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(collectionType); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, collectionType: string, listenerConfigs: any, binary: boolean, backupCount: number, asyncBackupCount: number, statisticsEnabled: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, collectionType, listenerConfigs, binary, backupCount, asyncBackupCount, statisticsEnabled)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(collectionType); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.appendBoolean(binary); - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddQueueConfigCodec.ts b/src/codec/DynamicConfigAddQueueConfigCodec.ts deleted file mode 100644 index 8ba2e99d4..000000000 --- a/src/codec/DynamicConfigAddQueueConfigCodec.ts +++ /dev/null @@ -1,84 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDQUEUECONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddQueueConfigCodec { - - - static calculateSize(name: string, listenerConfigs: any, backupCount: number, asyncBackupCount: number, maxSize: number, emptyQueueTtl: number, statisticsEnabled: boolean, quorumName: string, queueStoreConfig: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (quorumName !== null) { - dataSize += BitsUtil.calculateSizeString(quorumName); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (queueStoreConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.queuestoreconfigholder(queueStoreConfig); - } - return dataSize; - } - - static encodeRequest(name: string, listenerConfigs: any, backupCount: number, asyncBackupCount: number, maxSize: number, emptyQueueTtl: number, statisticsEnabled: boolean, quorumName: string, queueStoreConfig: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, listenerConfigs, backupCount, asyncBackupCount, maxSize, emptyQueueTtl, statisticsEnabled, quorumName, queueStoreConfig)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.appendInt32(maxSize); - clientMessage.appendInt32(emptyQueueTtl); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.appendBoolean(quorumName === null); - if (quorumName !== null) { - clientMessage.appendString(quorumName); - } - clientMessage.appendBoolean(queueStoreConfig === null); - if (queueStoreConfig !== null) { - QueueStoreConfigCodec.encode(clientMessage, queueStoreConfig); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddReliableTopicConfigCodec.ts b/src/codec/DynamicConfigAddReliableTopicConfigCodec.ts deleted file mode 100644 index 234ebd27f..000000000 --- a/src/codec/DynamicConfigAddReliableTopicConfigCodec.ts +++ /dev/null @@ -1,72 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDRELIABLETOPICCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddReliableTopicConfigCodec { - - - static calculateSize(name: string, listenerConfigs: any, readBatchSize: number, statisticsEnabled: boolean, topicOverloadPolicy: string, executor: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(topicOverloadPolicy); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (executor !== null) { - dataSize += BitsUtil.calculateSizeData(executor); - } - return dataSize; - } - - static encodeRequest(name: string, listenerConfigs: any, readBatchSize: number, statisticsEnabled: boolean, topicOverloadPolicy: string, executor: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, listenerConfigs, readBatchSize, statisticsEnabled, topicOverloadPolicy, executor)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.appendInt32(readBatchSize); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.appendString(topicOverloadPolicy); - clientMessage.appendBoolean(executor === null); - if (executor !== null) { - clientMessage.appendData(executor); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddReplicatedMapConfigCodec.ts b/src/codec/DynamicConfigAddReplicatedMapConfigCodec.ts deleted file mode 100644 index eee1127fc..000000000 --- a/src/codec/DynamicConfigAddReplicatedMapConfigCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDREPLICATEDMAPCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddReplicatedMapConfigCodec { - - - static calculateSize(name: string, inMemoryFormat: string, asyncFillup: boolean, statisticsEnabled: boolean, mergePolicy: string, listenerConfigs: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(inMemoryFormat); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(mergePolicy); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - return dataSize; - } - - static encodeRequest(name: string, inMemoryFormat: string, asyncFillup: boolean, statisticsEnabled: boolean, mergePolicy: string, listenerConfigs: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, inMemoryFormat, asyncFillup, statisticsEnabled, mergePolicy, listenerConfigs)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(inMemoryFormat); - clientMessage.appendBoolean(asyncFillup); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.appendString(mergePolicy); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddRingbufferConfigCodec.ts b/src/codec/DynamicConfigAddRingbufferConfigCodec.ts deleted file mode 100644 index 74619f74f..000000000 --- a/src/codec/DynamicConfigAddRingbufferConfigCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDRINGBUFFERCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddRingbufferConfigCodec { - - - static calculateSize(name: string, capacity: number, backupCount: number, asyncBackupCount: number, timeToLiveSeconds: number, inMemoryFormat: string, ringbufferStoreConfig: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(inMemoryFormat); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (ringbufferStoreConfig !== null) { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.ringbufferstoreconfigholder(ringbufferStoreConfig); - } - return dataSize; - } - - static encodeRequest(name: string, capacity: number, backupCount: number, asyncBackupCount: number, timeToLiveSeconds: number, inMemoryFormat: string, ringbufferStoreConfig: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, capacity, backupCount, asyncBackupCount, timeToLiveSeconds, inMemoryFormat, ringbufferStoreConfig)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(capacity); - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.appendInt32(timeToLiveSeconds); - clientMessage.appendString(inMemoryFormat); - clientMessage.appendBoolean(ringbufferStoreConfig === null); - if (ringbufferStoreConfig !== null) { - RingbufferStoreConfigCodec.encode(clientMessage, ringbufferStoreConfig); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddScheduledExecutorConfigCodec.ts b/src/codec/DynamicConfigAddScheduledExecutorConfigCodec.ts deleted file mode 100644 index a1155f647..000000000 --- a/src/codec/DynamicConfigAddScheduledExecutorConfigCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDSCHEDULEDEXECUTORCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddScheduledExecutorConfigCodec { - - - static calculateSize(name: string, poolSize: number, durability: number, capacity: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, poolSize: number, durability: number, capacity: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, poolSize, durability, capacity)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(poolSize); - clientMessage.appendInt32(durability); - clientMessage.appendInt32(capacity); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddSemaphoreConfigCodec.ts b/src/codec/DynamicConfigAddSemaphoreConfigCodec.ts deleted file mode 100644 index 8c00ce0e7..000000000 --- a/src/codec/DynamicConfigAddSemaphoreConfigCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDSEMAPHORECONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddSemaphoreConfigCodec { - - - static calculateSize(name: string, initialPermits: number, backupCount: number, asyncBackupCount: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, initialPermits: number, backupCount: number, asyncBackupCount: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, initialPermits, backupCount, asyncBackupCount)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(initialPermits); - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddSetConfigCodec.ts b/src/codec/DynamicConfigAddSetConfigCodec.ts deleted file mode 100644 index f1f875b89..000000000 --- a/src/codec/DynamicConfigAddSetConfigCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDSETCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddSetConfigCodec { - - - static calculateSize(name: string, listenerConfigs: any, backupCount: number, asyncBackupCount: number, maxSize: number, statisticsEnabled: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, listenerConfigs: any, backupCount: number, asyncBackupCount: number, maxSize: number, statisticsEnabled: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, listenerConfigs, backupCount, asyncBackupCount, maxSize, statisticsEnabled)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.appendInt32(backupCount); - clientMessage.appendInt32(asyncBackupCount); - clientMessage.appendInt32(maxSize); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigAddTopicConfigCodec.ts b/src/codec/DynamicConfigAddTopicConfigCodec.ts deleted file mode 100644 index e026f798b..000000000 --- a/src/codec/DynamicConfigAddTopicConfigCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {DynamicConfigMessageType} from './DynamicConfigMessageType'; - -var REQUEST_TYPE = DynamicConfigMessageType.DYNAMICCONFIG_ADDTOPICCONFIG; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class DynamicConfigAddTopicConfigCodec { - - - static calculateSize(name: string, globalOrderingEnabled: boolean, statisticsEnabled: boolean, multiThreadingEnabled: boolean, listenerConfigs: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (listenerConfigs !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - listenerConfigs.forEach((listenerConfigsItem: any) => { - dataSize += BitsUtil.calculateSizeCom.hazelcast.client.impl.protocol.task.dynamicconfig.listenerconfigholder(listenerConfigsItem); - }); - } - return dataSize; - } - - static encodeRequest(name: string, globalOrderingEnabled: boolean, statisticsEnabled: boolean, multiThreadingEnabled: boolean, listenerConfigs: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, globalOrderingEnabled, statisticsEnabled, multiThreadingEnabled, listenerConfigs)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(globalOrderingEnabled); - clientMessage.appendBoolean(statisticsEnabled); - clientMessage.appendBoolean(multiThreadingEnabled); - clientMessage.appendBoolean(listenerConfigs === null); - if (listenerConfigs !== null) { - clientMessage.appendInt32(listenerConfigs.length); - - listenerConfigs.forEach((listenerConfigsItem: any) => { - ListenerConfigCodec.encode(clientMessage, listenerConfigsItem); - }); - - } - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/DynamicConfigMessageType.ts b/src/codec/DynamicConfigMessageType.ts deleted file mode 100644 index 42f69bba2..000000000 --- a/src/codec/DynamicConfigMessageType.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* tslint:disable */ -export class DynamicConfigMessageType { - static DYNAMICCONFIG_ADDMULTIMAPCONFIG = 0x1e01; - static DYNAMICCONFIG_ADDRINGBUFFERCONFIG = 0x1e02; - static DYNAMICCONFIG_ADDCARDINALITYESTIMATORCONFIG = 0x1e03; - static DYNAMICCONFIG_ADDLOCKCONFIG = 0x1e04; - static DYNAMICCONFIG_ADDLISTCONFIG = 0x1e05; - static DYNAMICCONFIG_ADDSETCONFIG = 0x1e06; - static DYNAMICCONFIG_ADDREPLICATEDMAPCONFIG = 0x1e07; - static DYNAMICCONFIG_ADDTOPICCONFIG = 0x1e08; - static DYNAMICCONFIG_ADDEXECUTORCONFIG = 0x1e09; - static DYNAMICCONFIG_ADDDURABLEEXECUTORCONFIG = 0x1e0a; - static DYNAMICCONFIG_ADDSCHEDULEDEXECUTORCONFIG = 0x1e0b; - static DYNAMICCONFIG_ADDSEMAPHORECONFIG = 0x1e0c; - static DYNAMICCONFIG_ADDQUEUECONFIG = 0x1e0d; - static DYNAMICCONFIG_ADDMAPCONFIG = 0x1e0e; - static DYNAMICCONFIG_ADDRELIABLETOPICCONFIG = 0x1e0f; - static DYNAMICCONFIG_ADDCACHECONFIG = 0x1e10; - static DYNAMICCONFIG_ADDEVENTJOURNALCONFIG = 0x1e11; -} diff --git a/src/codec/ExecutorServiceCancelOnAddressCodec.ts b/src/codec/ExecutorServiceCancelOnAddressCodec.ts deleted file mode 100644 index e25793a05..000000000 --- a/src/codec/ExecutorServiceCancelOnAddressCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ExecutorServiceMessageType} from './ExecutorServiceMessageType'; - -var REQUEST_TYPE = ExecutorServiceMessageType.EXECUTORSERVICE_CANCELONADDRESS; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class ExecutorServiceCancelOnAddressCodec { - - - static calculateSize(uuid: string, address: Address, interrupt: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(uuid); - dataSize += BitsUtil.calculateSizeAddress(address); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(uuid: string, address: Address, interrupt: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(uuid, address, interrupt)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(uuid); - AddressCodec.encode(clientMessage, address); - clientMessage.appendBoolean(interrupt); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ExecutorServiceCancelOnPartitionCodec.ts b/src/codec/ExecutorServiceCancelOnPartitionCodec.ts deleted file mode 100644 index 044171fc4..000000000 --- a/src/codec/ExecutorServiceCancelOnPartitionCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ExecutorServiceMessageType} from './ExecutorServiceMessageType'; - -var REQUEST_TYPE = ExecutorServiceMessageType.EXECUTORSERVICE_CANCELONPARTITION; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class ExecutorServiceCancelOnPartitionCodec { - - - static calculateSize(uuid: string, partitionId: number, interrupt: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(uuid); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(uuid: string, partitionId: number, interrupt: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(uuid, partitionId, interrupt)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(uuid); - clientMessage.appendInt32(partitionId); - clientMessage.appendBoolean(interrupt); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ExecutorServiceIsShutdownCodec.ts b/src/codec/ExecutorServiceIsShutdownCodec.ts deleted file mode 100644 index f2cd34f1b..000000000 --- a/src/codec/ExecutorServiceIsShutdownCodec.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ExecutorServiceMessageType} from './ExecutorServiceMessageType'; - -var REQUEST_TYPE = ExecutorServiceMessageType.EXECUTORSERVICE_ISSHUTDOWN; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class ExecutorServiceIsShutdownCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ExecutorServiceMessageType.ts b/src/codec/ExecutorServiceMessageType.ts deleted file mode 100644 index c06076513..000000000 --- a/src/codec/ExecutorServiceMessageType.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* tslint:disable */ -export class ExecutorServiceMessageType { - static EXECUTORSERVICE_SHUTDOWN = 0x0901; - static EXECUTORSERVICE_ISSHUTDOWN = 0x0902; - static EXECUTORSERVICE_CANCELONPARTITION = 0x0903; - static EXECUTORSERVICE_CANCELONADDRESS = 0x0904; - static EXECUTORSERVICE_SUBMITTOPARTITION = 0x0905; - static EXECUTORSERVICE_SUBMITTOADDRESS = 0x0906; -} diff --git a/src/codec/ExecutorServiceShutdownCodec.ts b/src/codec/ExecutorServiceShutdownCodec.ts deleted file mode 100644 index b6bc2f984..000000000 --- a/src/codec/ExecutorServiceShutdownCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ExecutorServiceMessageType} from './ExecutorServiceMessageType'; - -var REQUEST_TYPE = ExecutorServiceMessageType.EXECUTORSERVICE_SHUTDOWN; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class ExecutorServiceShutdownCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ExecutorServiceSubmitToAddressCodec.ts b/src/codec/ExecutorServiceSubmitToAddressCodec.ts deleted file mode 100644 index d3ad4315b..000000000 --- a/src/codec/ExecutorServiceSubmitToAddressCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ExecutorServiceMessageType} from './ExecutorServiceMessageType'; - -var REQUEST_TYPE = ExecutorServiceMessageType.EXECUTORSERVICE_SUBMITTOADDRESS; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class ExecutorServiceSubmitToAddressCodec { - - - static calculateSize(name: string, uuid: string, callable: Data, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(uuid); - dataSize += BitsUtil.calculateSizeData(callable); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(name: string, uuid: string, callable: Data, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, uuid, callable, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(uuid); - clientMessage.appendData(callable); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/ExecutorServiceSubmitToPartitionCodec.ts b/src/codec/ExecutorServiceSubmitToPartitionCodec.ts deleted file mode 100644 index 78634fe62..000000000 --- a/src/codec/ExecutorServiceSubmitToPartitionCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ExecutorServiceMessageType} from './ExecutorServiceMessageType'; - -var REQUEST_TYPE = ExecutorServiceMessageType.EXECUTORSERVICE_SUBMITTOPARTITION; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class ExecutorServiceSubmitToPartitionCodec { - - - static calculateSize(name: string, uuid: string, callable: Data, partitionId: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(uuid); - dataSize += BitsUtil.calculateSizeData(callable); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, uuid: string, callable: Data, partitionId: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, uuid, callable, partitionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(uuid); - clientMessage.appendData(callable); - clientMessage.appendInt32(partitionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/MapReduceCancelCodec.ts b/src/codec/MapReduceCancelCodec.ts deleted file mode 100644 index a396b8021..000000000 --- a/src/codec/MapReduceCancelCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {MapReduceMessageType} from './MapReduceMessageType'; - -var REQUEST_TYPE = MapReduceMessageType.MAPREDUCE_CANCEL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class MapReduceCancelCodec { - - - static calculateSize(name: string, jobId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(jobId); - return dataSize; - } - - static encodeRequest(name: string, jobId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, jobId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(jobId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/MapReduceForCustomCodec.ts b/src/codec/MapReduceForCustomCodec.ts deleted file mode 100644 index 4093404d0..000000000 --- a/src/codec/MapReduceForCustomCodec.ts +++ /dev/null @@ -1,119 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {MapReduceMessageType} from './MapReduceMessageType'; - -var REQUEST_TYPE = MapReduceMessageType.MAPREDUCE_FORCUSTOM; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; - - -export class MapReduceForCustomCodec { - - - static calculateSize(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, keyValueSource: Data, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(jobId); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (predicate !== null) { - dataSize += BitsUtil.calculateSizeData(predicate); - } - dataSize += BitsUtil.calculateSizeData(mapper); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (combinerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(combinerFactory); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (reducerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(reducerFactory); - } - dataSize += BitsUtil.calculateSizeData(keyValueSource); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (keys !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (topologyChangedStrategy !== null) { - dataSize += BitsUtil.calculateSizeString(topologyChangedStrategy); - } - return dataSize; - } - - static encodeRequest(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, keyValueSource: Data, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, jobId, predicate, mapper, combinerFactory, reducerFactory, keyValueSource, chunkSize, keys, topologyChangedStrategy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(jobId); - clientMessage.appendBoolean(predicate === null); - if (predicate !== null) { - clientMessage.appendData(predicate); - } - clientMessage.appendData(mapper); - clientMessage.appendBoolean(combinerFactory === null); - if (combinerFactory !== null) { - clientMessage.appendData(combinerFactory); - } - clientMessage.appendBoolean(reducerFactory === null); - if (reducerFactory !== null) { - clientMessage.appendData(reducerFactory); - } - clientMessage.appendData(keyValueSource); - clientMessage.appendInt32(chunkSize); - clientMessage.appendBoolean(keys === null); - if (keys !== null) { - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - } - clientMessage.appendBoolean(topologyChangedStrategy === null); - if (topologyChangedStrategy !== null) { - clientMessage.appendString(topologyChangedStrategy); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/MapReduceForListCodec.ts b/src/codec/MapReduceForListCodec.ts deleted file mode 100644 index 4a92a2e84..000000000 --- a/src/codec/MapReduceForListCodec.ts +++ /dev/null @@ -1,119 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {MapReduceMessageType} from './MapReduceMessageType'; - -var REQUEST_TYPE = MapReduceMessageType.MAPREDUCE_FORLIST; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; - - -export class MapReduceForListCodec { - - - static calculateSize(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, listName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(jobId); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (predicate !== null) { - dataSize += BitsUtil.calculateSizeData(predicate); - } - dataSize += BitsUtil.calculateSizeData(mapper); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (combinerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(combinerFactory); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (reducerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(reducerFactory); - } - dataSize += BitsUtil.calculateSizeString(listName); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (keys !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (topologyChangedStrategy !== null) { - dataSize += BitsUtil.calculateSizeString(topologyChangedStrategy); - } - return dataSize; - } - - static encodeRequest(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, listName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, jobId, predicate, mapper, combinerFactory, reducerFactory, listName, chunkSize, keys, topologyChangedStrategy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(jobId); - clientMessage.appendBoolean(predicate === null); - if (predicate !== null) { - clientMessage.appendData(predicate); - } - clientMessage.appendData(mapper); - clientMessage.appendBoolean(combinerFactory === null); - if (combinerFactory !== null) { - clientMessage.appendData(combinerFactory); - } - clientMessage.appendBoolean(reducerFactory === null); - if (reducerFactory !== null) { - clientMessage.appendData(reducerFactory); - } - clientMessage.appendString(listName); - clientMessage.appendInt32(chunkSize); - clientMessage.appendBoolean(keys === null); - if (keys !== null) { - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - } - clientMessage.appendBoolean(topologyChangedStrategy === null); - if (topologyChangedStrategy !== null) { - clientMessage.appendString(topologyChangedStrategy); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/MapReduceForMapCodec.ts b/src/codec/MapReduceForMapCodec.ts deleted file mode 100644 index 076fe323f..000000000 --- a/src/codec/MapReduceForMapCodec.ts +++ /dev/null @@ -1,119 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {MapReduceMessageType} from './MapReduceMessageType'; - -var REQUEST_TYPE = MapReduceMessageType.MAPREDUCE_FORMAP; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; - - -export class MapReduceForMapCodec { - - - static calculateSize(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, mapName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(jobId); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (predicate !== null) { - dataSize += BitsUtil.calculateSizeData(predicate); - } - dataSize += BitsUtil.calculateSizeData(mapper); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (combinerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(combinerFactory); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (reducerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(reducerFactory); - } - dataSize += BitsUtil.calculateSizeString(mapName); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (keys !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (topologyChangedStrategy !== null) { - dataSize += BitsUtil.calculateSizeString(topologyChangedStrategy); - } - return dataSize; - } - - static encodeRequest(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, mapName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, jobId, predicate, mapper, combinerFactory, reducerFactory, mapName, chunkSize, keys, topologyChangedStrategy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(jobId); - clientMessage.appendBoolean(predicate === null); - if (predicate !== null) { - clientMessage.appendData(predicate); - } - clientMessage.appendData(mapper); - clientMessage.appendBoolean(combinerFactory === null); - if (combinerFactory !== null) { - clientMessage.appendData(combinerFactory); - } - clientMessage.appendBoolean(reducerFactory === null); - if (reducerFactory !== null) { - clientMessage.appendData(reducerFactory); - } - clientMessage.appendString(mapName); - clientMessage.appendInt32(chunkSize); - clientMessage.appendBoolean(keys === null); - if (keys !== null) { - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - } - clientMessage.appendBoolean(topologyChangedStrategy === null); - if (topologyChangedStrategy !== null) { - clientMessage.appendString(topologyChangedStrategy); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/MapReduceForMultiMapCodec.ts b/src/codec/MapReduceForMultiMapCodec.ts deleted file mode 100644 index 99e24cf50..000000000 --- a/src/codec/MapReduceForMultiMapCodec.ts +++ /dev/null @@ -1,119 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {MapReduceMessageType} from './MapReduceMessageType'; - -var REQUEST_TYPE = MapReduceMessageType.MAPREDUCE_FORMULTIMAP; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; - - -export class MapReduceForMultiMapCodec { - - - static calculateSize(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, multiMapName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(jobId); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (predicate !== null) { - dataSize += BitsUtil.calculateSizeData(predicate); - } - dataSize += BitsUtil.calculateSizeData(mapper); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (combinerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(combinerFactory); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (reducerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(reducerFactory); - } - dataSize += BitsUtil.calculateSizeString(multiMapName); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (keys !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (topologyChangedStrategy !== null) { - dataSize += BitsUtil.calculateSizeString(topologyChangedStrategy); - } - return dataSize; - } - - static encodeRequest(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, multiMapName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, jobId, predicate, mapper, combinerFactory, reducerFactory, multiMapName, chunkSize, keys, topologyChangedStrategy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(jobId); - clientMessage.appendBoolean(predicate === null); - if (predicate !== null) { - clientMessage.appendData(predicate); - } - clientMessage.appendData(mapper); - clientMessage.appendBoolean(combinerFactory === null); - if (combinerFactory !== null) { - clientMessage.appendData(combinerFactory); - } - clientMessage.appendBoolean(reducerFactory === null); - if (reducerFactory !== null) { - clientMessage.appendData(reducerFactory); - } - clientMessage.appendString(multiMapName); - clientMessage.appendInt32(chunkSize); - clientMessage.appendBoolean(keys === null); - if (keys !== null) { - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - } - clientMessage.appendBoolean(topologyChangedStrategy === null); - if (topologyChangedStrategy !== null) { - clientMessage.appendString(topologyChangedStrategy); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/MapReduceForSetCodec.ts b/src/codec/MapReduceForSetCodec.ts deleted file mode 100644 index 366b0068f..000000000 --- a/src/codec/MapReduceForSetCodec.ts +++ /dev/null @@ -1,119 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {MapReduceMessageType} from './MapReduceMessageType'; - -var REQUEST_TYPE = MapReduceMessageType.MAPREDUCE_FORSET; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; - - -export class MapReduceForSetCodec { - - - static calculateSize(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, setName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(jobId); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (predicate !== null) { - dataSize += BitsUtil.calculateSizeData(predicate); - } - dataSize += BitsUtil.calculateSizeData(mapper); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (combinerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(combinerFactory); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (reducerFactory !== null) { - dataSize += BitsUtil.calculateSizeData(reducerFactory); - } - dataSize += BitsUtil.calculateSizeString(setName); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (keys !== null) { - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (topologyChangedStrategy !== null) { - dataSize += BitsUtil.calculateSizeString(topologyChangedStrategy); - } - return dataSize; - } - - static encodeRequest(name: string, jobId: string, predicate: Data, mapper: Data, combinerFactory: Data, reducerFactory: Data, setName: string, chunkSize: number, keys: any, topologyChangedStrategy: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, jobId, predicate, mapper, combinerFactory, reducerFactory, setName, chunkSize, keys, topologyChangedStrategy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(jobId); - clientMessage.appendBoolean(predicate === null); - if (predicate !== null) { - clientMessage.appendData(predicate); - } - clientMessage.appendData(mapper); - clientMessage.appendBoolean(combinerFactory === null); - if (combinerFactory !== null) { - clientMessage.appendData(combinerFactory); - } - clientMessage.appendBoolean(reducerFactory === null); - if (reducerFactory !== null) { - clientMessage.appendData(reducerFactory); - } - clientMessage.appendString(setName); - clientMessage.appendInt32(chunkSize); - clientMessage.appendBoolean(keys === null); - if (keys !== null) { - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - } - clientMessage.appendBoolean(topologyChangedStrategy === null); - if (topologyChangedStrategy !== null) { - clientMessage.appendString(topologyChangedStrategy); - } - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/MapReduceJobProcessInformationCodec.ts b/src/codec/MapReduceJobProcessInformationCodec.ts deleted file mode 100644 index a369e6dba..000000000 --- a/src/codec/MapReduceJobProcessInformationCodec.ts +++ /dev/null @@ -1,63 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {MapReduceMessageType} from './MapReduceMessageType'; - -var REQUEST_TYPE = MapReduceMessageType.MAPREDUCE_JOBPROCESSINFORMATION; -var RESPONSE_TYPE = 112; -var RETRYABLE = true; - - -export class MapReduceJobProcessInformationCodec { - - - static calculateSize(name: string, jobId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(jobId); - return dataSize; - } - - static encodeRequest(name: string, jobId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, jobId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(jobId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'jobPartitionStates': null, - 'processRecords': null - }; - - - var jobPartitionStatesSize = clientMessage.readInt32(); - var jobPartitionStates: any = []; - for (var jobPartitionStatesIndex = 0; jobPartitionStatesIndex < jobPartitionStatesSize; jobPartitionStatesIndex++) { - var jobPartitionStatesItem: any; - jobPartitionStatesItem = JobPartitionStateCodec.decode(clientMessage, toObjectFunction); - jobPartitionStates.push(jobPartitionStatesItem) - } - parameters['jobPartitionStates'] = jobPartitionStates; - - parameters['processRecords'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/MapReduceMessageType.ts b/src/codec/MapReduceMessageType.ts deleted file mode 100644 index 8616095c8..000000000 --- a/src/codec/MapReduceMessageType.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable */ -export class MapReduceMessageType { - static MAPREDUCE_CANCEL = 0x0f01; - static MAPREDUCE_JOBPROCESSINFORMATION = 0x0f02; - static MAPREDUCE_FORMAP = 0x0f03; - static MAPREDUCE_FORLIST = 0x0f04; - static MAPREDUCE_FORSET = 0x0f05; - static MAPREDUCE_FORMULTIMAP = 0x0f06; - static MAPREDUCE_FORCUSTOM = 0x0f07; -} diff --git a/src/codec/ScheduledExecutorCancelFromAddressCodec.ts b/src/codec/ScheduledExecutorCancelFromAddressCodec.ts deleted file mode 100644 index d2d48ac30..000000000 --- a/src/codec/ScheduledExecutorCancelFromAddressCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_CANCELFROMADDRESS; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ScheduledExecutorCancelFromAddressCodec { - - - static calculateSize(schedulerName: string, taskName: string, address: Address, mayInterruptIfRunning: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeAddress(address); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, address: Address, mayInterruptIfRunning: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, address, mayInterruptIfRunning)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - AddressCodec.encode(clientMessage, address); - clientMessage.appendBoolean(mayInterruptIfRunning); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorCancelFromPartitionCodec.ts b/src/codec/ScheduledExecutorCancelFromPartitionCodec.ts deleted file mode 100644 index c8f33499e..000000000 --- a/src/codec/ScheduledExecutorCancelFromPartitionCodec.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_CANCELFROMPARTITION; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ScheduledExecutorCancelFromPartitionCodec { - - - static calculateSize(schedulerName: string, taskName: string, mayInterruptIfRunning: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, mayInterruptIfRunning: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, mayInterruptIfRunning)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - clientMessage.appendBoolean(mayInterruptIfRunning); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorDisposeFromAddressCodec.ts b/src/codec/ScheduledExecutorDisposeFromAddressCodec.ts deleted file mode 100644 index 81222c996..000000000 --- a/src/codec/ScheduledExecutorDisposeFromAddressCodec.ts +++ /dev/null @@ -1,45 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_DISPOSEFROMADDRESS; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class ScheduledExecutorDisposeFromAddressCodec { - - - static calculateSize(schedulerName: string, taskName: string, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ScheduledExecutorDisposeFromPartitionCodec.ts b/src/codec/ScheduledExecutorDisposeFromPartitionCodec.ts deleted file mode 100644 index e5f77067e..000000000 --- a/src/codec/ScheduledExecutorDisposeFromPartitionCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_DISPOSEFROMPARTITION; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class ScheduledExecutorDisposeFromPartitionCodec { - - - static calculateSize(schedulerName: string, taskName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts b/src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts deleted file mode 100644 index 3b801b899..000000000 --- a/src/codec/ScheduledExecutorGetAllScheduledFuturesCodec.ts +++ /dev/null @@ -1,72 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_GETALLSCHEDULEDFUTURES; -var RESPONSE_TYPE = 121; -var RETRYABLE = true; - - -export class ScheduledExecutorGetAllScheduledFuturesCodec { - - - static calculateSize(schedulerName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - return dataSize; - } - - static encodeRequest(schedulerName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'handlers': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - var handlersSize = clientMessage.readInt32(); - var handlers: any = []; - for (var handlersIndex = 0; handlersIndex < handlersSize; handlersIndex++) { - var handlersItem: any; - var handlersItemKey: any; - var handlersItemVal: any; - handlersItemKey = MemberCodec.decode(clientMessage, toObjectFunction); - - var handlersItemValSize = clientMessage.readInt32(); - var handlersItemVal: any = []; - for (var handlersItemValIndex = 0; handlersItemValIndex < handlersItemValSize; handlersItemValIndex++) { - var handlersItemValItem: any; - handlersItemValItem = ScheduledTaskHandlerCodec.decode(clientMessage, toObjectFunction); - handlersItemVal.push(handlersItemValItem) - } - handlersItem = [handlersItemKey, handlersItemVal]; - handlers.push(handlersItem) - } - parameters['handlers'] = handlers; - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts b/src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts deleted file mode 100644 index 1bb9ad96b..000000000 --- a/src/codec/ScheduledExecutorGetDelayFromAddressCodec.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_GETDELAYFROMADDRESS; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; - - -export class ScheduledExecutorGetDelayFromAddressCodec { - - - static calculateSize(schedulerName: string, taskName: string, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts b/src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts deleted file mode 100644 index 742d83544..000000000 --- a/src/codec/ScheduledExecutorGetDelayFromPartitionCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_GETDELAYFROMPARTITION; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; - - -export class ScheduledExecutorGetDelayFromPartitionCodec { - - - static calculateSize(schedulerName: string, taskName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorGetResultFromAddressCodec.ts b/src/codec/ScheduledExecutorGetResultFromAddressCodec.ts deleted file mode 100644 index 8ab211fc4..000000000 --- a/src/codec/ScheduledExecutorGetResultFromAddressCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_GETRESULTFROMADDRESS; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class ScheduledExecutorGetResultFromAddressCodec { - - - static calculateSize(schedulerName: string, taskName: string, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts b/src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts deleted file mode 100644 index 99e423a6f..000000000 --- a/src/codec/ScheduledExecutorGetResultFromPartitionCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_GETRESULTFROMPARTITION; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; - - -export class ScheduledExecutorGetResultFromPartitionCodec { - - - static calculateSize(schedulerName: string, taskName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts b/src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts deleted file mode 100644 index 8947ba0b8..000000000 --- a/src/codec/ScheduledExecutorGetStatsFromAddressCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_GETSTATSFROMADDRESS; -var RESPONSE_TYPE = 120; -var RETRYABLE = true; - - -export class ScheduledExecutorGetStatsFromAddressCodec { - - - static calculateSize(schedulerName: string, taskName: string, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'lastIdleTimeNanos': null, - 'totalIdleTimeNanos': null, - 'totalRuns': null, - 'totalRunTimeNanos': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['lastIdleTimeNanos'] = clientMessage.readLong(); - - parameters['totalIdleTimeNanos'] = clientMessage.readLong(); - - parameters['totalRuns'] = clientMessage.readLong(); - - parameters['totalRunTimeNanos'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts b/src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts deleted file mode 100644 index 259fd14cf..000000000 --- a/src/codec/ScheduledExecutorGetStatsFromPartitionCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_GETSTATSFROMPARTITION; -var RESPONSE_TYPE = 120; -var RETRYABLE = true; - - -export class ScheduledExecutorGetStatsFromPartitionCodec { - - - static calculateSize(schedulerName: string, taskName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'lastIdleTimeNanos': null, - 'totalIdleTimeNanos': null, - 'totalRuns': null, - 'totalRunTimeNanos': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['lastIdleTimeNanos'] = clientMessage.readLong(); - - parameters['totalIdleTimeNanos'] = clientMessage.readLong(); - - parameters['totalRuns'] = clientMessage.readLong(); - - parameters['totalRunTimeNanos'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts b/src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts deleted file mode 100644 index aff524149..000000000 --- a/src/codec/ScheduledExecutorIsCancelledFromAddressCodec.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_ISCANCELLEDFROMADDRESS; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ScheduledExecutorIsCancelledFromAddressCodec { - - - static calculateSize(schedulerName: string, taskName: string, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts b/src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts deleted file mode 100644 index e576f634a..000000000 --- a/src/codec/ScheduledExecutorIsCancelledFromPartitionCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_ISCANCELLEDFROMPARTITION; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ScheduledExecutorIsCancelledFromPartitionCodec { - - - static calculateSize(schedulerName: string, taskName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts b/src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts deleted file mode 100644 index e0eaaa875..000000000 --- a/src/codec/ScheduledExecutorIsDoneFromAddressCodec.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_ISDONEFROMADDRESS; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ScheduledExecutorIsDoneFromAddressCodec { - - - static calculateSize(schedulerName: string, taskName: string, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts b/src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts deleted file mode 100644 index 6e313c4a9..000000000 --- a/src/codec/ScheduledExecutorIsDoneFromPartitionCodec.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_ISDONEFROMPARTITION; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class ScheduledExecutorIsDoneFromPartitionCodec { - - - static calculateSize(schedulerName: string, taskName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeString(taskName); - return dataSize; - } - - static encodeRequest(schedulerName: string, taskName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, taskName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendString(taskName); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/ScheduledExecutorMessageType.ts b/src/codec/ScheduledExecutorMessageType.ts deleted file mode 100644 index bc4d4074f..000000000 --- a/src/codec/ScheduledExecutorMessageType.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* tslint:disable */ -export class ScheduledExecutorMessageType { - static SCHEDULEDEXECUTOR_SHUTDOWN = 0x1d01; - static SCHEDULEDEXECUTOR_SUBMITTOPARTITION = 0x1d02; - static SCHEDULEDEXECUTOR_SUBMITTOADDRESS = 0x1d03; - static SCHEDULEDEXECUTOR_GETALLSCHEDULEDFUTURES = 0x1d04; - static SCHEDULEDEXECUTOR_GETSTATSFROMPARTITION = 0x1d05; - static SCHEDULEDEXECUTOR_GETSTATSFROMADDRESS = 0x1d06; - static SCHEDULEDEXECUTOR_GETDELAYFROMPARTITION = 0x1d07; - static SCHEDULEDEXECUTOR_GETDELAYFROMADDRESS = 0x1d08; - static SCHEDULEDEXECUTOR_CANCELFROMPARTITION = 0x1d09; - static SCHEDULEDEXECUTOR_CANCELFROMADDRESS = 0x1d0a; - static SCHEDULEDEXECUTOR_ISCANCELLEDFROMPARTITION = 0x1d0b; - static SCHEDULEDEXECUTOR_ISCANCELLEDFROMADDRESS = 0x1d0c; - static SCHEDULEDEXECUTOR_ISDONEFROMPARTITION = 0x1d0d; - static SCHEDULEDEXECUTOR_ISDONEFROMADDRESS = 0x1d0e; - static SCHEDULEDEXECUTOR_GETRESULTFROMPARTITION = 0x1d0f; - static SCHEDULEDEXECUTOR_GETRESULTFROMADDRESS = 0x1d10; - static SCHEDULEDEXECUTOR_DISPOSEFROMPARTITION = 0x1d11; - static SCHEDULEDEXECUTOR_DISPOSEFROMADDRESS = 0x1d12; -} diff --git a/src/codec/ScheduledExecutorShutdownCodec.ts b/src/codec/ScheduledExecutorShutdownCodec.ts deleted file mode 100644 index 4dcddd896..000000000 --- a/src/codec/ScheduledExecutorShutdownCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_SHUTDOWN; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class ScheduledExecutorShutdownCodec { - - - static calculateSize(schedulerName: string, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(schedulerName: string, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ScheduledExecutorSubmitToAddressCodec.ts b/src/codec/ScheduledExecutorSubmitToAddressCodec.ts deleted file mode 100644 index e65b2c097..000000000 --- a/src/codec/ScheduledExecutorSubmitToAddressCodec.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_SUBMITTOADDRESS; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class ScheduledExecutorSubmitToAddressCodec { - - - static calculateSize(schedulerName: string, address: Address, type: any, taskName: string, task: Data, initialDelayInMillis: any, periodInMillis: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.calculateSizeAddress(address); - dataSize += BitsUtil.BYTE_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeData(task); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(schedulerName: string, address: Address, type: any, taskName: string, task: Data, initialDelayInMillis: any, periodInMillis: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, address, type, taskName, task, initialDelayInMillis, periodInMillis)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - AddressCodec.encode(clientMessage, address); - clientMessage.appendByte(type); - clientMessage.appendString(taskName); - clientMessage.appendData(task); - clientMessage.appendLong(initialDelayInMillis); - clientMessage.appendLong(periodInMillis); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ScheduledExecutorSubmitToPartitionCodec.ts b/src/codec/ScheduledExecutorSubmitToPartitionCodec.ts deleted file mode 100644 index c6719e446..000000000 --- a/src/codec/ScheduledExecutorSubmitToPartitionCodec.ts +++ /dev/null @@ -1,51 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {ScheduledExecutorMessageType} from './ScheduledExecutorMessageType'; - -var REQUEST_TYPE = ScheduledExecutorMessageType.SCHEDULEDEXECUTOR_SUBMITTOPARTITION; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class ScheduledExecutorSubmitToPartitionCodec { - - - static calculateSize(schedulerName: string, type: any, taskName: string, task: Data, initialDelayInMillis: any, periodInMillis: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(schedulerName); - dataSize += BitsUtil.BYTE_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(taskName); - dataSize += BitsUtil.calculateSizeData(task); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(schedulerName: string, type: any, taskName: string, task: Data, initialDelayInMillis: any, periodInMillis: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(schedulerName, type, taskName, task, initialDelayInMillis, periodInMillis)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(schedulerName); - clientMessage.appendByte(type); - clientMessage.appendString(taskName); - clientMessage.appendData(task); - clientMessage.appendLong(initialDelayInMillis); - clientMessage.appendLong(periodInMillis); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/TransactionCommitCodec.ts b/src/codec/TransactionCommitCodec.ts deleted file mode 100644 index e358f4cff..000000000 --- a/src/codec/TransactionCommitCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionMessageType} from './TransactionMessageType'; - -var REQUEST_TYPE = TransactionMessageType.TRANSACTION_COMMIT; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class TransactionCommitCodec { - - - static calculateSize(transactionId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(transactionId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(transactionId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(transactionId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(transactionId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/TransactionCreateCodec.ts b/src/codec/TransactionCreateCodec.ts deleted file mode 100644 index 09e3b0c9a..000000000 --- a/src/codec/TransactionCreateCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionMessageType} from './TransactionMessageType'; - -var REQUEST_TYPE = TransactionMessageType.TRANSACTION_CREATE; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class TransactionCreateCodec { - - - static calculateSize(timeout: any, durability: number, transactionType: number, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(timeout: any, durability: number, transactionType: number, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(timeout, durability, transactionType, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendLong(timeout); - clientMessage.appendInt32(durability); - clientMessage.appendInt32(transactionType); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionMessageType.ts b/src/codec/TransactionMessageType.ts deleted file mode 100644 index 38299d4ff..000000000 --- a/src/codec/TransactionMessageType.ts +++ /dev/null @@ -1,6 +0,0 @@ -/* tslint:disable */ -export class TransactionMessageType { - static TRANSACTION_COMMIT = 0x1701; - static TRANSACTION_CREATE = 0x1702; - static TRANSACTION_ROLLBACK = 0x1703; -} diff --git a/src/codec/TransactionRollbackCodec.ts b/src/codec/TransactionRollbackCodec.ts deleted file mode 100644 index 4f393e6a0..000000000 --- a/src/codec/TransactionRollbackCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionMessageType} from './TransactionMessageType'; - -var REQUEST_TYPE = TransactionMessageType.TRANSACTION_ROLLBACK; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class TransactionRollbackCodec { - - - static calculateSize(transactionId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(transactionId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(transactionId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(transactionId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(transactionId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/TransactionalListAddCodec.ts b/src/codec/TransactionalListAddCodec.ts deleted file mode 100644 index ad0b19820..000000000 --- a/src/codec/TransactionalListAddCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalListMessageType} from './TransactionalListMessageType'; - -var REQUEST_TYPE = TransactionalListMessageType.TRANSACTIONALLIST_ADD; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalListAddCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, item: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(item); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, item: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, item)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(item); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalListMessageType.ts b/src/codec/TransactionalListMessageType.ts deleted file mode 100644 index 769e5cd83..000000000 --- a/src/codec/TransactionalListMessageType.ts +++ /dev/null @@ -1,6 +0,0 @@ -/* tslint:disable */ -export class TransactionalListMessageType { - static TRANSACTIONALLIST_ADD = 0x1301; - static TRANSACTIONALLIST_REMOVE = 0x1302; - static TRANSACTIONALLIST_SIZE = 0x1303; -} diff --git a/src/codec/TransactionalListRemoveCodec.ts b/src/codec/TransactionalListRemoveCodec.ts deleted file mode 100644 index f0bf4c8b8..000000000 --- a/src/codec/TransactionalListRemoveCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalListMessageType} from './TransactionalListMessageType'; - -var REQUEST_TYPE = TransactionalListMessageType.TRANSACTIONALLIST_REMOVE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalListRemoveCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, item: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(item); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, item: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, item)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(item); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalListSizeCodec.ts b/src/codec/TransactionalListSizeCodec.ts deleted file mode 100644 index 4f58f28b9..000000000 --- a/src/codec/TransactionalListSizeCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalListMessageType} from './TransactionalListMessageType'; - -var REQUEST_TYPE = TransactionalListMessageType.TRANSACTIONALLIST_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; - - -export class TransactionalListSizeCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapContainsKeyCodec.ts b/src/codec/TransactionalMapContainsKeyCodec.ts deleted file mode 100644 index 28244757f..000000000 --- a/src/codec/TransactionalMapContainsKeyCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_CONTAINSKEY; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalMapContainsKeyCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapDeleteCodec.ts b/src/codec/TransactionalMapDeleteCodec.ts deleted file mode 100644 index aa04b7f63..000000000 --- a/src/codec/TransactionalMapDeleteCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_DELETE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class TransactionalMapDeleteCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/TransactionalMapGetCodec.ts b/src/codec/TransactionalMapGetCodec.ts deleted file mode 100644 index f75cfde87..000000000 --- a/src/codec/TransactionalMapGetCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_GET; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalMapGetCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapGetForUpdateCodec.ts b/src/codec/TransactionalMapGetForUpdateCodec.ts deleted file mode 100644 index d976ea1d4..000000000 --- a/src/codec/TransactionalMapGetForUpdateCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_GETFORUPDATE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalMapGetForUpdateCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapIsEmptyCodec.ts b/src/codec/TransactionalMapIsEmptyCodec.ts deleted file mode 100644 index a4159f4ba..000000000 --- a/src/codec/TransactionalMapIsEmptyCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_ISEMPTY; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalMapIsEmptyCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapKeySetCodec.ts b/src/codec/TransactionalMapKeySetCodec.ts deleted file mode 100644 index dad774a70..000000000 --- a/src/codec/TransactionalMapKeySetCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_KEYSET; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; - - -export class TransactionalMapKeySetCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts deleted file mode 100644 index a5a2b029a..000000000 --- a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_KEYSETWITHPREDICATE; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; - - -export class TransactionalMapKeySetWithPredicateCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapMessageType.ts b/src/codec/TransactionalMapMessageType.ts deleted file mode 100644 index 74055b573..000000000 --- a/src/codec/TransactionalMapMessageType.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* tslint:disable */ -export class TransactionalMapMessageType { - static TRANSACTIONALMAP_CONTAINSKEY = 0x1001; - static TRANSACTIONALMAP_GET = 0x1002; - static TRANSACTIONALMAP_GETFORUPDATE = 0x1003; - static TRANSACTIONALMAP_SIZE = 0x1004; - static TRANSACTIONALMAP_ISEMPTY = 0x1005; - static TRANSACTIONALMAP_PUT = 0x1006; - static TRANSACTIONALMAP_SET = 0x1007; - static TRANSACTIONALMAP_PUTIFABSENT = 0x1008; - static TRANSACTIONALMAP_REPLACE = 0x1009; - static TRANSACTIONALMAP_REPLACEIFSAME = 0x100a; - static TRANSACTIONALMAP_REMOVE = 0x100b; - static TRANSACTIONALMAP_DELETE = 0x100c; - static TRANSACTIONALMAP_REMOVEIFSAME = 0x100d; - static TRANSACTIONALMAP_KEYSET = 0x100e; - static TRANSACTIONALMAP_KEYSETWITHPREDICATE = 0x100f; - static TRANSACTIONALMAP_VALUES = 0x1010; - static TRANSACTIONALMAP_VALUESWITHPREDICATE = 0x1011; -} diff --git a/src/codec/TransactionalMapPutCodec.ts b/src/codec/TransactionalMapPutCodec.ts deleted file mode 100644 index b9476ff7d..000000000 --- a/src/codec/TransactionalMapPutCodec.ts +++ /dev/null @@ -1,63 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_PUT; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalMapPutCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, value: Data, ttl: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, value: Data, ttl: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, value, ttl)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(ttl); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapPutIfAbsentCodec.ts b/src/codec/TransactionalMapPutIfAbsentCodec.ts deleted file mode 100644 index f2a7860ad..000000000 --- a/src/codec/TransactionalMapPutIfAbsentCodec.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_PUTIFABSENT; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalMapPutIfAbsentCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapRemoveCodec.ts b/src/codec/TransactionalMapRemoveCodec.ts deleted file mode 100644 index 041bc500b..000000000 --- a/src/codec/TransactionalMapRemoveCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_REMOVE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalMapRemoveCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapRemoveIfSameCodec.ts b/src/codec/TransactionalMapRemoveIfSameCodec.ts deleted file mode 100644 index b5437dc22..000000000 --- a/src/codec/TransactionalMapRemoveIfSameCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_REMOVEIFSAME; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalMapRemoveIfSameCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapReplaceCodec.ts b/src/codec/TransactionalMapReplaceCodec.ts deleted file mode 100644 index 2842bf4e8..000000000 --- a/src/codec/TransactionalMapReplaceCodec.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_REPLACE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalMapReplaceCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapReplaceIfSameCodec.ts b/src/codec/TransactionalMapReplaceIfSameCodec.ts deleted file mode 100644 index 7f896fee0..000000000 --- a/src/codec/TransactionalMapReplaceIfSameCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_REPLACEIFSAME; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalMapReplaceIfSameCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, oldValue: Data, newValue: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(oldValue); - dataSize += BitsUtil.calculateSizeData(newValue); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, oldValue: Data, newValue: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, oldValue, newValue)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(oldValue); - clientMessage.appendData(newValue); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapSetCodec.ts b/src/codec/TransactionalMapSetCodec.ts deleted file mode 100644 index 492a1726a..000000000 --- a/src/codec/TransactionalMapSetCodec.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_SET; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class TransactionalMapSetCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/TransactionalMapSizeCodec.ts b/src/codec/TransactionalMapSizeCodec.ts deleted file mode 100644 index 3861e15c3..000000000 --- a/src/codec/TransactionalMapSizeCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; - - -export class TransactionalMapSizeCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapValuesCodec.ts b/src/codec/TransactionalMapValuesCodec.ts deleted file mode 100644 index a74b2858b..000000000 --- a/src/codec/TransactionalMapValuesCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_VALUES; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; - - -export class TransactionalMapValuesCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMapValuesWithPredicateCodec.ts b/src/codec/TransactionalMapValuesWithPredicateCodec.ts deleted file mode 100644 index 0a6c50a43..000000000 --- a/src/codec/TransactionalMapValuesWithPredicateCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMapMessageType} from './TransactionalMapMessageType'; - -var REQUEST_TYPE = TransactionalMapMessageType.TRANSACTIONALMAP_VALUESWITHPREDICATE; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; - - -export class TransactionalMapValuesWithPredicateCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMultiMapGetCodec.ts b/src/codec/TransactionalMultiMapGetCodec.ts deleted file mode 100644 index c1c73fd37..000000000 --- a/src/codec/TransactionalMultiMapGetCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMultiMapMessageType} from './TransactionalMultiMapMessageType'; - -var REQUEST_TYPE = TransactionalMultiMapMessageType.TRANSACTIONALMULTIMAP_GET; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; - - -export class TransactionalMultiMapGetCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMultiMapMessageType.ts b/src/codec/TransactionalMultiMapMessageType.ts deleted file mode 100644 index ef8602c9e..000000000 --- a/src/codec/TransactionalMultiMapMessageType.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* tslint:disable */ -export class TransactionalMultiMapMessageType { - static TRANSACTIONALMULTIMAP_PUT = 0x1101; - static TRANSACTIONALMULTIMAP_GET = 0x1102; - static TRANSACTIONALMULTIMAP_REMOVE = 0x1103; - static TRANSACTIONALMULTIMAP_REMOVEENTRY = 0x1104; - static TRANSACTIONALMULTIMAP_VALUECOUNT = 0x1105; - static TRANSACTIONALMULTIMAP_SIZE = 0x1106; -} diff --git a/src/codec/TransactionalMultiMapPutCodec.ts b/src/codec/TransactionalMultiMapPutCodec.ts deleted file mode 100644 index 8aad69a6c..000000000 --- a/src/codec/TransactionalMultiMapPutCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMultiMapMessageType} from './TransactionalMultiMapMessageType'; - -var REQUEST_TYPE = TransactionalMultiMapMessageType.TRANSACTIONALMULTIMAP_PUT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalMultiMapPutCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMultiMapRemoveCodec.ts b/src/codec/TransactionalMultiMapRemoveCodec.ts deleted file mode 100644 index a43abd0e7..000000000 --- a/src/codec/TransactionalMultiMapRemoveCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMultiMapMessageType} from './TransactionalMultiMapMessageType'; - -var REQUEST_TYPE = TransactionalMultiMapMessageType.TRANSACTIONALMULTIMAP_REMOVE; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; - - -export class TransactionalMultiMapRemoveCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts deleted file mode 100644 index 662e79823..000000000 --- a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMultiMapMessageType} from './TransactionalMultiMapMessageType'; - -var REQUEST_TYPE = TransactionalMultiMapMessageType.TRANSACTIONALMULTIMAP_REMOVEENTRY; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalMultiMapRemoveEntryCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMultiMapSizeCodec.ts b/src/codec/TransactionalMultiMapSizeCodec.ts deleted file mode 100644 index e0224ffea..000000000 --- a/src/codec/TransactionalMultiMapSizeCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMultiMapMessageType} from './TransactionalMultiMapMessageType'; - -var REQUEST_TYPE = TransactionalMultiMapMessageType.TRANSACTIONALMULTIMAP_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; - - -export class TransactionalMultiMapSizeCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalMultiMapValueCountCodec.ts b/src/codec/TransactionalMultiMapValueCountCodec.ts deleted file mode 100644 index fa16be382..000000000 --- a/src/codec/TransactionalMultiMapValueCountCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalMultiMapMessageType} from './TransactionalMultiMapMessageType'; - -var REQUEST_TYPE = TransactionalMultiMapMessageType.TRANSACTIONALMULTIMAP_VALUECOUNT; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; - - -export class TransactionalMultiMapValueCountCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalQueueMessageType.ts b/src/codec/TransactionalQueueMessageType.ts deleted file mode 100644 index 8f3d4480d..000000000 --- a/src/codec/TransactionalQueueMessageType.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* tslint:disable */ -export class TransactionalQueueMessageType { - static TRANSACTIONALQUEUE_OFFER = 0x1401; - static TRANSACTIONALQUEUE_TAKE = 0x1402; - static TRANSACTIONALQUEUE_POLL = 0x1403; - static TRANSACTIONALQUEUE_PEEK = 0x1404; - static TRANSACTIONALQUEUE_SIZE = 0x1405; -} diff --git a/src/codec/TransactionalQueueOfferCodec.ts b/src/codec/TransactionalQueueOfferCodec.ts deleted file mode 100644 index ccaa82ca5..000000000 --- a/src/codec/TransactionalQueueOfferCodec.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalQueueMessageType} from './TransactionalQueueMessageType'; - -var REQUEST_TYPE = TransactionalQueueMessageType.TRANSACTIONALQUEUE_OFFER; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalQueueOfferCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, item: Data, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(item); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, item: Data, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, item, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(item); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalQueuePeekCodec.ts b/src/codec/TransactionalQueuePeekCodec.ts deleted file mode 100644 index 5a5f509cf..000000000 --- a/src/codec/TransactionalQueuePeekCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalQueueMessageType} from './TransactionalQueueMessageType'; - -var REQUEST_TYPE = TransactionalQueueMessageType.TRANSACTIONALQUEUE_PEEK; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalQueuePeekCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalQueuePollCodec.ts b/src/codec/TransactionalQueuePollCodec.ts deleted file mode 100644 index bdd936e9a..000000000 --- a/src/codec/TransactionalQueuePollCodec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalQueueMessageType} from './TransactionalQueueMessageType'; - -var REQUEST_TYPE = TransactionalQueueMessageType.TRANSACTIONALQUEUE_POLL; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalQueuePollCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalQueueSizeCodec.ts b/src/codec/TransactionalQueueSizeCodec.ts deleted file mode 100644 index 7a0a20b96..000000000 --- a/src/codec/TransactionalQueueSizeCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalQueueMessageType} from './TransactionalQueueMessageType'; - -var REQUEST_TYPE = TransactionalQueueMessageType.TRANSACTIONALQUEUE_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; - - -export class TransactionalQueueSizeCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalQueueTakeCodec.ts b/src/codec/TransactionalQueueTakeCodec.ts deleted file mode 100644 index b8ca8ce9f..000000000 --- a/src/codec/TransactionalQueueTakeCodec.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalQueueMessageType} from './TransactionalQueueMessageType'; - -var REQUEST_TYPE = TransactionalQueueMessageType.TRANSACTIONALQUEUE_TAKE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class TransactionalQueueTakeCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/TransactionalSetAddCodec.ts b/src/codec/TransactionalSetAddCodec.ts deleted file mode 100644 index 7f119cb48..000000000 --- a/src/codec/TransactionalSetAddCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalSetMessageType} from './TransactionalSetMessageType'; - -var REQUEST_TYPE = TransactionalSetMessageType.TRANSACTIONALSET_ADD; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalSetAddCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, item: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(item); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, item: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, item)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(item); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalSetMessageType.ts b/src/codec/TransactionalSetMessageType.ts deleted file mode 100644 index ab2dad43c..000000000 --- a/src/codec/TransactionalSetMessageType.ts +++ /dev/null @@ -1,6 +0,0 @@ -/* tslint:disable */ -export class TransactionalSetMessageType { - static TRANSACTIONALSET_ADD = 0x1201; - static TRANSACTIONALSET_REMOVE = 0x1202; - static TRANSACTIONALSET_SIZE = 0x1203; -} diff --git a/src/codec/TransactionalSetRemoveCodec.ts b/src/codec/TransactionalSetRemoveCodec.ts deleted file mode 100644 index b7a035e9e..000000000 --- a/src/codec/TransactionalSetRemoveCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalSetMessageType} from './TransactionalSetMessageType'; - -var REQUEST_TYPE = TransactionalSetMessageType.TRANSACTIONALSET_REMOVE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class TransactionalSetRemoveCodec { - - - static calculateSize(name: string, txnId: string, threadId: any, item: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(item); - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any, item: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId, item)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.appendData(item); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/TransactionalSetSizeCodec.ts b/src/codec/TransactionalSetSizeCodec.ts deleted file mode 100644 index 71df2f7a0..000000000 --- a/src/codec/TransactionalSetSizeCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {TransactionalSetMessageType} from './TransactionalSetMessageType'; - -var REQUEST_TYPE = TransactionalSetMessageType.TRANSACTIONALSET_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; - - -export class TransactionalSetSizeCodec { - - - static calculateSize(name: string, txnId: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(txnId); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, txnId: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, txnId, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(txnId); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/XATransactionClearRemoteCodec.ts b/src/codec/XATransactionClearRemoteCodec.ts deleted file mode 100644 index 4d69ba4a5..000000000 --- a/src/codec/XATransactionClearRemoteCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {XATransactionMessageType} from './XATransactionMessageType'; - -var REQUEST_TYPE = XATransactionMessageType.XATRANSACTION_CLEARREMOTE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class XATransactionClearRemoteCodec { - - - static calculateSize(xid: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeJavax.transaction.xa.xid(xid); - return dataSize; - } - - static encodeRequest(xid: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(xid)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - XIDCodec.encode(clientMessage, xid); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/XATransactionCollectTransactionsCodec.ts b/src/codec/XATransactionCollectTransactionsCodec.ts deleted file mode 100644 index ade6672fb..000000000 --- a/src/codec/XATransactionCollectTransactionsCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {XATransactionMessageType} from './XATransactionMessageType'; - -var REQUEST_TYPE = XATransactionMessageType.XATRANSACTION_COLLECTTRANSACTIONS; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; - - -export class XATransactionCollectTransactionsCodec { - - - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem) - } - parameters['response'] = response; - - return parameters; - } - - -} diff --git a/src/codec/XATransactionCommitCodec.ts b/src/codec/XATransactionCommitCodec.ts deleted file mode 100644 index f5be6b1ac..000000000 --- a/src/codec/XATransactionCommitCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {XATransactionMessageType} from './XATransactionMessageType'; - -var REQUEST_TYPE = XATransactionMessageType.XATRANSACTION_COMMIT; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class XATransactionCommitCodec { - - - static calculateSize(transactionId: string, onePhase: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(transactionId); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(transactionId: string, onePhase: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(transactionId, onePhase)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(transactionId); - clientMessage.appendBoolean(onePhase); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/XATransactionCreateCodec.ts b/src/codec/XATransactionCreateCodec.ts deleted file mode 100644 index 95344f74d..000000000 --- a/src/codec/XATransactionCreateCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {XATransactionMessageType} from './XATransactionMessageType'; - -var REQUEST_TYPE = XATransactionMessageType.XATRANSACTION_CREATE; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class XATransactionCreateCodec { - - - static calculateSize(xid: any, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeJavax.transaction.xa.xid(xid); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(xid: any, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(xid, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - XIDCodec.encode(clientMessage, xid); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - -} diff --git a/src/codec/XATransactionFinalizeCodec.ts b/src/codec/XATransactionFinalizeCodec.ts deleted file mode 100644 index 4fc3a5530..000000000 --- a/src/codec/XATransactionFinalizeCodec.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {XATransactionMessageType} from './XATransactionMessageType'; - -var REQUEST_TYPE = XATransactionMessageType.XATRANSACTION_FINALIZE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class XATransactionFinalizeCodec { - - - static calculateSize(xid: any, isCommit: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeJavax.transaction.xa.xid(xid); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(xid: any, isCommit: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(xid, isCommit)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - XIDCodec.encode(clientMessage, xid); - clientMessage.appendBoolean(isCommit); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/XATransactionMessageType.ts b/src/codec/XATransactionMessageType.ts deleted file mode 100644 index 83bd9051e..000000000 --- a/src/codec/XATransactionMessageType.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable */ -export class XATransactionMessageType { - static XATRANSACTION_CLEARREMOTE = 0x1601; - static XATRANSACTION_COLLECTTRANSACTIONS = 0x1602; - static XATRANSACTION_FINALIZE = 0x1603; - static XATRANSACTION_COMMIT = 0x1604; - static XATRANSACTION_CREATE = 0x1605; - static XATRANSACTION_PREPARE = 0x1606; - static XATRANSACTION_ROLLBACK = 0x1607; -} diff --git a/src/codec/XATransactionPrepareCodec.ts b/src/codec/XATransactionPrepareCodec.ts deleted file mode 100644 index 1a63de68d..000000000 --- a/src/codec/XATransactionPrepareCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {XATransactionMessageType} from './XATransactionMessageType'; - -var REQUEST_TYPE = XATransactionMessageType.XATRANSACTION_PREPARE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class XATransactionPrepareCodec { - - - static calculateSize(transactionId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(transactionId); - return dataSize; - } - - static encodeRequest(transactionId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(transactionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(transactionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/XATransactionRollbackCodec.ts b/src/codec/XATransactionRollbackCodec.ts deleted file mode 100644 index 6e2ea3db8..000000000 --- a/src/codec/XATransactionRollbackCodec.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {XATransactionMessageType} from './XATransactionMessageType'; - -var REQUEST_TYPE = XATransactionMessageType.XATRANSACTION_ROLLBACK; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class XATransactionRollbackCodec { - - - static calculateSize(transactionId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(transactionId); - return dataSize; - } - - static encodeRequest(transactionId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(transactionId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(transactionId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} From 5dededa83c0c3e35d627d4831aea679040d86c42 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 7 Dec 2017 16:40:57 -0500 Subject: [PATCH 029/685] adds UUID class support instead of string where appropriate --- src/ClientInfo.ts | 1 + src/ListenerService.ts | 2 +- src/codec/UUIDCodec.ts | 8 +++---- src/core/Member.ts | 3 ++- src/core/UUID.ts | 33 ++++++++++++++++++++++++--- src/invocation/ClusterService.ts | 1 + src/proxy/topic/ReliableTopicProxy.ts | 2 +- src/util/UuidUtil.ts | 18 +++++++++++---- 8 files changed, 52 insertions(+), 16 deletions(-) diff --git a/src/ClientInfo.ts b/src/ClientInfo.ts index e35893f25..149797379 100644 --- a/src/ClientInfo.ts +++ b/src/ClientInfo.ts @@ -1,4 +1,5 @@ import Address = require('./Address'); +import {UUID} from './core/UUID'; export class ClientInfo { /** * Unique id of this client instance. It is provided by owner server instance. diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 96610fbdc..a095c2436 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -155,7 +155,7 @@ export class ListenerService implements ConnectionHeartbeatListener { protected registerListenerInternal(codec: ListenerMessageCodec, listenerHandlerFunc: Function): Promise { let activeConnections = copyObjectShallow(this.client.getConnectionManager().getActiveConnections()); - let userRegistrationKey: string = UuidUtil.generate(); + let userRegistrationKey: string = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; let deferred = Promise.defer(); let registerRequest = codec.encodeAddRequest(this.isSmart()); diff --git a/src/codec/UUIDCodec.ts b/src/codec/UUIDCodec.ts index a5cbeb984..76d232ab1 100644 --- a/src/codec/UUIDCodec.ts +++ b/src/codec/UUIDCodec.ts @@ -3,10 +3,8 @@ import {UUID} from '../core/UUID'; export class UUIDCodec { static decode(clientMessage: ClientMessage, toObject: Function): UUID { - var uuid: UUID = { - 'mostSignificant': clientMessage.readLong(), - 'leastSignificant': clientMessage.readLong() - }; - return uuid; + let most = clientMessage.readLong(); + let least = clientMessage.readLong(); + return new UUID(most, least); } } diff --git a/src/core/Member.ts b/src/core/Member.ts index 5ce82bc9b..c2f2c645d 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -1,4 +1,5 @@ import Address = require('../Address'); +import {UUID} from './UUID'; export class Member { /** * Network address of member. @@ -22,6 +23,6 @@ export class Member { } toString() { - return 'Member[ uuid: ' + this.uuid + ', address: ' + this.address.toString() + ']'; + return 'Member[ uuid: ' + this.uuid.toString() + ', address: ' + this.address.toString() + ']'; } } diff --git a/src/core/UUID.ts b/src/core/UUID.ts index b37f27d02..89e08c41a 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -1,5 +1,32 @@ import * as Long from 'long'; -export interface UUID { - leastSignificant: Long; - mostSignificant: Long; +export class UUID { + readonly leastSignificant: Long; + readonly mostSignificant: Long; + + constructor(mostSig: Long, leastSig: Long) { + this.mostSignificant = mostSig; + this.leastSignificant = leastSig; + } + + equals(other: UUID) { + if (other == null) { + return false; + } + return other.mostSignificant.equals(this.mostSignificant) && other.leastSignificant.equals(this.leastSignificant); + } + + /* tslint:disable:no-bitwise */ + toString(): string { + let mostHigh = this.mostSignificant.getHighBitsUnsigned(); // (32) 32 32 32 + let mostLow = this.mostSignificant.getLowBitsUnsigned(); // 32 (32) 32 32 + let leastHigh = this.leastSignificant.getHighBitsUnsigned(); // 32 32 (32) 32 + let leastLow = this.leastSignificant.getLowBitsUnsigned(); // 32 32 32 (32) + + let div1 = mostHigh.toString(16); + let div2 = (mostLow >>> 16).toString(16); + let div3 = (mostLow & ((1 << 16) - 1)).toString(16); + let div4 = (leastHigh >>> 16).toString(16); + let div5 = (leastHigh & ((1 << 16) - 1)).toString(16) + leastLow.toString(16); + return div1 + '-' + div2 + '-' + div3 + '-' + div4 + '-' + div5; + } } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index aab930a5a..16c31efb7 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -9,6 +9,7 @@ import HazelcastClient from '../HazelcastClient'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); import {IllegalStateError} from '../HazelcastError'; +import {UUID} from '../core/UUID'; const MEMBER_ADDED = 1; const MEMBER_REMOVED = 2; diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index a1a174340..ba2a915bd 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -39,7 +39,7 @@ export class ReliableTopicProxy implements ITopic { } addMessageListener(listener: TopicMessageListener): string { - var listenerId = UuidUtil.generate(); + var listenerId = UuidUtil.generate().toString(); var runner = new ReliableTopicListenerRunner(listenerId, listener, this.ringbuffer, this.batchSize, this.serializationService, this); diff --git a/src/util/UuidUtil.ts b/src/util/UuidUtil.ts index deefa564f..dcea579c8 100644 --- a/src/util/UuidUtil.ts +++ b/src/util/UuidUtil.ts @@ -1,9 +1,17 @@ /* tslint:disable:no-bitwise */ +import {UUID} from '../core/UUID'; +import * as Long from 'long'; + +const INT_BOUND = 0xFFFFFFFF; + +function randomUInt(): number { + return Math.floor(Math.random() * INT_BOUND); +} + export class UuidUtil { - static generate(): string { - return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) { - var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8); - return v.toString(16); - }); + static generate(): UUID { + let mostS = new Long(randomUInt(), randomUInt(), true); + let leastS = new Long(randomUInt(), randomUInt(), true); + return new UUID(mostS, leastS); } } From 5ba091b5a089a738668472f2666c358ef82329e6 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 12 Dec 2017 14:00:32 -0500 Subject: [PATCH 030/685] fixes issue when cluster service member list contains dead members --- src/Address.ts | 15 +++++++++++++++ src/core/Member.ts | 13 +++++++++++++ src/invocation/ClusterService.ts | 11 +++++++---- test/ClusterServiceTest.js | 24 ++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/src/Address.ts b/src/Address.ts index b03aef4e1..87e76f209 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -39,6 +39,21 @@ class Address implements IdentifiedDataSerializable { return ADDRESS_CLASS_ID; } + equals(other: Address): boolean { + if (other === this) { + return true; + } + if (other == null) { + return false; + } + if (other.host === this.host && + other.port === this.port && + other.type === this.type) { + return true; + } + return false; + } + toString(): string { return this.host + ':' + this.port; } diff --git a/src/core/Member.ts b/src/core/Member.ts index c2f2c645d..5801c7fab 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -22,6 +22,19 @@ export class Member { this.attributes = attributes; } + equals(other: Member): boolean { + if (other === this) { + return true; + } + if (other == null) { + return false; + } + if (other.address.equals(this.address) && other.uuid === this.uuid && other.isLiteMember === this.isLiteMember) { + return true; + } + return false; + } + toString() { return 'Member[ uuid: ' + this.uuid.toString() + ', address: ' + this.address.toString() + ']'; } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 16c31efb7..9b371b752 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -9,7 +9,7 @@ import HazelcastClient from '../HazelcastClient'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); import {IllegalStateError} from '../HazelcastError'; -import {UUID} from '../core/UUID'; +import * as assert from 'assert'; const MEMBER_ADDED = 1; const MEMBER_REMOVED = 2; @@ -223,8 +223,11 @@ export class ClusterService extends EventEmitter { } private memberRemoved(member: Member) { - this.members.splice(this.members.indexOf(member), 1); - this.client.getConnectionManager().destroyConnection(member.address); - this.emit(EMIT_MEMBER_REMOVED, member); + let memberIndex = this.members.findIndex(member.equals, member); + let removedMemberList = this.members.splice(memberIndex, 1); + assert(removedMemberList.length === 1); + let removedMember = removedMemberList[0]; + this.client.getConnectionManager().destroyConnection(removedMember.address); + this.emit(EMIT_MEMBER_REMOVED, removedMember); } } diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index a0fdfb666..d43cb9eb1 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -61,6 +61,30 @@ describe('ClusterService', function() { }); }); + it('getMembers returns correct list after a member is removed', function (done) { + this.timeout(20000); + var member2; + var member3; + client.getClusterService().once('memberRemoved', function () { + var remainingMemberList = client.getClusterService().getMembers(); + try { + expect(remainingMemberList).to.have.length(2); + expect(remainingMemberList[0].address.port).to.equal(ownerMember.port); + expect(remainingMemberList[1].address.port).to.equal(member3.port); + done(); + } catch (e) { + done(e); + } + }); + Controller.startMember(cluster.id).then(function (res) { + member2 = res; + return Controller.startMember(cluster.id); + }).then(function (res) { + member3 = res; + Controller.shutdownMember(cluster.id, member2.uuid); + }); + }); + it('should throw with message containing wrong host addresses in config', function() { var configuredAddresses = [ {host: '0.0.0.0', port: '5709'}, From 145f010ad4a43480ca5613a191b99b3e33c9f8c2 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 12 Dec 2017 14:41:36 -0500 Subject: [PATCH 031/685] refactor NearCachedMapTest so it is runnable from ide --- test/map/NearCachedMapTest.js | 441 +++++++++++++++++----------------- 1 file changed, 221 insertions(+), 220 deletions(-) diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 0bc10e572..6d832bfcb 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -8,277 +8,278 @@ var Config = require('../../.').Config; var fs = require('fs'); var _fillMap = require('../Util').fillMap; -[true, false].forEach(function(invalidateOnChange) { - describe("NearCachedMap", function() { - - var cluster; - var client1; - var client2; - var map1; - var map2; - - before(function () { - this.timeout(32000); - var cfg = new Config.ClientConfig(); - var ncc = new Config.NearCacheConfig(); - ncc.name = 'nc-map'; - ncc.invalidateOnChange = invalidateOnChange; - cfg.nearCacheConfigs['ncc-map'] = ncc; - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function(res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function(member) { - return HazelcastClient.newHazelcastClient(cfg).then(function(hazelcastClient) { - client1 = hazelcastClient; - }); - }).then(function () { - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client2 = hazelcastClient; + +describe("NearCachedMap", function() { + [true, false].forEach(function(invalidateOnChange) { + describe('invalidate on change=' + invalidateOnChange, function () { + var cluster; + var client1; + var client2; + var map1; + var map2; + + before(function () { + this.timeout(32000); + var cfg = new Config.ClientConfig(); + var ncc = new Config.NearCacheConfig(); + ncc.name = 'nc-map'; + ncc.invalidateOnChange = invalidateOnChange; + cfg.nearCacheConfigs['ncc-map'] = ncc; + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { + cluster = res; + return Controller.startMember(cluster.id); + }).then(function (member) { + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + client1 = hazelcastClient; + }); + }).then(function () { + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + client2 = hazelcastClient; + }); }); }); - }); - beforeEach(function() { - this.timeout(10000); - map1 = client1.getMap('ncc-map'); - map2 = client2.getMap('ncc-map'); - return _fillMap(map1); - }); + beforeEach(function () { + this.timeout(10000); + map1 = client1.getMap('ncc-map'); + map2 = client2.getMap('ncc-map'); + return _fillMap(map1); + }); - afterEach(function() { - return map1.destroy(); - }); + afterEach(function () { + return map1.destroy(); + }); - after(function() { - client1.shutdown(); - client2.shutdown(); - return Controller.shutdownCluster(cluster.id); - }); + after(function () { + client1.shutdown(); + client2.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); - function getNearCacheStats(map) { - return map.nearCache.getStatistics(); - } - - function expectStats(map, hit, miss, entryCount) { - var stats = getNearCacheStats(map); - expect(stats.hitCount).to.equal(hit); - expect(stats.missCount).to.equal(miss); - return expect(stats.entryCount).to.equal(entryCount); - } - - it('second get should hit', function() { - return map1.get('key0').then(function () { - return map1.get('key0'); - }).then(function (val) { - var stats = getNearCacheStats(map1); - expect(val).to.equal('val0'); - expect(stats.missCount).to.equal(1); - expect(stats.entryCount).to.equal(1); - expect(stats.hitCount).to.equal(1); - }) - }); + function getNearCacheStats(map) { + return map.nearCache.getStatistics(); + } - it('remove operation removes entry from near cache', function () { - return map1.get('key1').then(function () { - return map1.remove('key1'); - }).then(function() { - return map1.get('key1'); - }).then(function (val) { - var stats = getNearCacheStats(map1); - expect(val).to.be.be.null; - expect(stats.hitCount).to.equal(0); - expect(stats.missCount).to.equal(2); - expect(stats.entryCount).to.equal(1); + function expectStats(map, hit, miss, entryCount) { + var stats = getNearCacheStats(map); + expect(stats.hitCount).to.equal(hit); + expect(stats.missCount).to.equal(miss); + return expect(stats.entryCount).to.equal(entryCount); + } + + it('second get should hit', function () { + return map1.get('key0').then(function () { + return map1.get('key0'); + }).then(function (val) { + var stats = getNearCacheStats(map1); + expect(val).to.equal('val0'); + expect(stats.missCount).to.equal(1); + expect(stats.entryCount).to.equal(1); + expect(stats.hitCount).to.equal(1); + }) }); - }); - it('update invalidates the near cache', function () { - return map1.get('key1').then(function () { - return map1.put('key1', 'something else'); - }).then(function() { - return map1.get('key1'); - }).then(function (val) { - var stats = getNearCacheStats(map1); - expect(val).to.be.equal('something else'); - expect(stats.hitCount).to.equal(0); - expect(stats.missCount).to.equal(2); - expect(stats.entryCount).to.equal(1); + it('remove operation removes entry from near cache', function () { + return map1.get('key1').then(function () { + return map1.remove('key1'); + }).then(function () { + return map1.get('key1'); + }).then(function (val) { + var stats = getNearCacheStats(map1); + expect(val).to.be.be.null; + expect(stats.hitCount).to.equal(0); + expect(stats.missCount).to.equal(2); + expect(stats.entryCount).to.equal(1); + }); }); - }); - it('get returns null if the entry was removed by another client', function () { - if (!invalidateOnChange) { - this.skip(); - } - return map1.get('key1').then(function () { - return map2.remove('key1'); - }).then(function () { - return Util.promiseLater(1000, map1.get.bind(map1, 'key1')); - }).then(function (val) { - expectStats(map1, 0, 2, 1); - return expect(val).to.be.null; + it('update invalidates the near cache', function () { + return map1.get('key1').then(function () { + return map1.put('key1', 'something else'); + }).then(function () { + return map1.get('key1'); + }).then(function (val) { + var stats = getNearCacheStats(map1); + expect(val).to.be.equal('something else'); + expect(stats.hitCount).to.equal(0); + expect(stats.missCount).to.equal(2); + expect(stats.entryCount).to.equal(1); + }); }); - }); - it('clear clears nearcache', function () { - return map1.get('key1').then(function () { - return map1.clear(); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('get returns null if the entry was removed by another client', function () { + if (!invalidateOnChange) { + this.skip(); + } + return map1.get('key1').then(function () { + return map2.remove('key1'); + }).then(function () { + return Util.promiseLater(1000, map1.get.bind(map1, 'key1')); + }).then(function (val) { + expectStats(map1, 0, 2, 1); + return expect(val).to.be.null; + }); }); - }); - it('containsKey true(in near cache)', function () { - return map1.get('key1').then(function () { - return map1.containsKey('key1'); - }).then(function (c) { - expectStats(map1, 1, 1, 1); - return expect(c).to.be.true; + it('clear clears nearcache', function () { + return map1.get('key1').then(function () { + return map1.clear(); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('containsKey false(in near cache)', function () { - return map1.get('exx').then(function () { - return map1.containsKey('exx'); - }).then(function (c) { - expectStats(map1, 1, 1, 1); - return expect(c).to.be.false; + it('containsKey true(in near cache)', function () { + return map1.get('key1').then(function () { + return map1.containsKey('key1'); + }).then(function (c) { + expectStats(map1, 1, 1, 1); + return expect(c).to.be.true; + }); }); - }); - it('containsKey true', function () { - return map1.containsKey('key1').then(function (c) { - expectStats(map1, 0, 1, 0); - return expect(c).to.be.true; + it('containsKey false(in near cache)', function () { + return map1.get('exx').then(function () { + return map1.containsKey('exx'); + }).then(function (c) { + expectStats(map1, 1, 1, 1); + return expect(c).to.be.false; + }); }); - }); - it('containsKey false', function () { - return map1.containsKey('exx').then(function (c) { - expectStats(map1, 0, 1, 0); - return expect(c).to.be.false; + it('containsKey true', function () { + return map1.containsKey('key1').then(function (c) { + expectStats(map1, 0, 1, 0); + return expect(c).to.be.true; + }); }); - }); - it('delete invalidates the cache', function () { - return map1.get('key1').then(function () { - return map1.delete('key1'); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('containsKey false', function () { + return map1.containsKey('exx').then(function (c) { + expectStats(map1, 0, 1, 0); + return expect(c).to.be.false; + }); }); - }); - it('evictAll evicts near cache', function () { - return map1.get('key1').then(function () { - return map1.evictAll(); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('delete invalidates the cache', function () { + return map1.get('key1').then(function () { + return map1.delete('key1'); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('evict evicts the entry', function () { - return map1.getAll(['key1', 'key2']).then(function () { - return map1.evict('key1'); - }).then(function () { - return expectStats(map1, 0, 2, 1); + it('evictAll evicts near cache', function () { + return map1.get('key1').then(function () { + return map1.evictAll(); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('getAll', function () { - return map1.getAll(['key1', 'key2']).then(function (vals) { - expect(vals).to.deep.have.members([ - ['key1', 'val1'], - ['key2', 'val2'] - ]); - return expectStats(map1, 0, 2, 2); + it('evict evicts the entry', function () { + return map1.getAll(['key1', 'key2']).then(function () { + return map1.evict('key1'); + }).then(function () { + return expectStats(map1, 0, 2, 1); + }); }); - }); - it('getAll second call should hit', function () { - return map1.getAll(['key1', 'key2']).then(function (vals) { - return map1.getAll(['key1', 'key2', 'key3']); - }).then(function(vals) { - expect(vals).to.deep.have.members([ - ['key1', 'val1'], - ['key2', 'val2'], - ['key3', 'val3'] - ]); - return expectStats(map1, 2, 3, 3); + it('getAll', function () { + return map1.getAll(['key1', 'key2']).then(function (vals) { + expect(vals).to.deep.have.members([ + ['key1', 'val1'], + ['key2', 'val2'] + ]); + return expectStats(map1, 0, 2, 2); + }); }); - }); - it('executeOnKey invalidates the entry'); + it('getAll second call should hit', function () { + return map1.getAll(['key1', 'key2']).then(function (vals) { + return map1.getAll(['key1', 'key2', 'key3']); + }).then(function (vals) { + expect(vals).to.deep.have.members([ + ['key1', 'val1'], + ['key2', 'val2'], + ['key3', 'val3'] + ]); + return expectStats(map1, 2, 3, 3); + }); + }); - it('executeOnKeys invalidates entries'); + it('executeOnKey invalidates the entry'); - it('loadAll invalidates the cache'); + it('executeOnKeys invalidates entries'); - it('putAll invalidates entries', function() { - return map1.getAll(['key1', 'key2']).then(function () { - return map1.putAll([ - ['key1', 'newVal1'], - ['key2', 'newVal2'] - ]); - }).then(function () { - return expectStats(map1, 0, 2, 0); + it('loadAll invalidates the cache'); + + it('putAll invalidates entries', function () { + return map1.getAll(['key1', 'key2']).then(function () { + return map1.putAll([ + ['key1', 'newVal1'], + ['key2', 'newVal2'] + ]); + }).then(function () { + return expectStats(map1, 0, 2, 0); + }); }); - }); - it('putIfAbsent (existing key) invalidates the entry', function () { - return map1.get('key1').then(function () { - return map1.putIfAbsent('key1', 'valnew'); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('putIfAbsent (existing key) invalidates the entry', function () { + return map1.get('key1').then(function () { + return map1.putIfAbsent('key1', 'valnew'); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('putTransient invalidates the entry', function () { - return map1.get('key1').then(function () { - return map1.putTransient('key1', 'vald'); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('putTransient invalidates the entry', function () { + return map1.get('key1').then(function () { + return map1.putTransient('key1', 'vald'); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('replace invalidates the entry', function () { - return map1.get('key1').then(function () { - return map1.replace('key1', 'newVal'); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('replace invalidates the entry', function () { + return map1.get('key1').then(function () { + return map1.replace('key1', 'newVal'); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('replaceIfSame invalidates the entry', function () { - return map1.get('key1').then(function () { - return map1.replaceIfSame('key1', 'val1', 'newVal'); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('replaceIfSame invalidates the entry', function () { + return map1.get('key1').then(function () { + return map1.replaceIfSame('key1', 'val1', 'newVal'); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('set invalidates the entry', function() { - return map1.get('key1').then(function () { - return map1.set('key1', 'newVal'); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('set invalidates the entry', function () { + return map1.get('key1').then(function () { + return map1.set('key1', 'newVal'); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('tryPut invalidates the entry', function() { - return map1.get('key1').then(function () { - return map1.tryPut('key1', 'newVal', 1000); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('tryPut invalidates the entry', function () { + return map1.get('key1').then(function () { + return map1.tryPut('key1', 'newVal', 1000); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); - }); - it('tryRemove invalidates the entry', function() { - return map1.get('key1').then(function () { - return map1.tryRemove('key1', 1000); - }).then(function () { - return expectStats(map1, 0, 1, 0); + it('tryRemove invalidates the entry', function () { + return map1.get('key1').then(function () { + return map1.tryRemove('key1', 1000); + }).then(function () { + return expectStats(map1, 0, 1, 0); + }); }); }); - }); }); From 5ff2ba0f41f7943f76038aec9982e0643a59109c Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 17 Nov 2017 16:09:06 -0500 Subject: [PATCH 032/685] adds getConnectedServerVersion to BaseProxy --- src/BuildMetadata.ts | 29 +++++++++++++++++ src/invocation/ClientConnection.ts | 14 +++++++++ src/invocation/ConnectionAuthenticator.ts | 2 ++ src/proxy/BaseProxy.ts | 9 ++++++ test/BuildMetadataTest.js | 23 ++++++++++++++ test/ClientProxyTest.js | 38 +++++++++++++++++++++++ test/ListenersOnReconnectTest.js | 1 - 7 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/BuildMetadata.ts create mode 100644 test/BuildMetadataTest.js create mode 100644 test/ClientProxyTest.js diff --git a/src/BuildMetadata.ts b/src/BuildMetadata.ts new file mode 100644 index 000000000..a2482d419 --- /dev/null +++ b/src/BuildMetadata.ts @@ -0,0 +1,29 @@ +export class BuildMetadata { + public static readonly UNKNOWN_VERSION_ID = -1; + + private static readonly MAJOR_VERSION_MULTIPLIER = 10000; + private static readonly MINOR_VERSION_MULTIPLIER = 100; + + private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?$/; + + public static calculateVersion(versionString: string): number { + if (versionString == null) { + return BuildMetadata.UNKNOWN_VERSION_ID; + } + const info = BuildMetadata.PATTERN.exec(versionString); + if (info == null) { + return -1; + } + const major = Number.parseInt(info[1]); + const minor = Number.parseInt(info[2]); + let patch: number; + if (info[3] == null) { + patch = 0; + } else { + patch = Number.parseInt(info[3]); + } + return BuildMetadata.MAJOR_VERSION_MULTIPLIER * major + BuildMetadata.MINOR_VERSION_MULTIPLIER * minor + patch; + } + +} + diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 8ad1c43f2..317d30186 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -7,6 +7,7 @@ import {BitsUtil} from '../BitsUtil'; import {LoggingService} from '../logging/LoggingService'; import {ClientNetworkConfig} from '../Config'; import {ClientConnectionManager} from './ClientConnectionManager'; +import {BuildMetadata} from '../BuildMetadata'; export class ClientConnection { address: Address; @@ -20,6 +21,8 @@ export class ClientConnection { private clientNetworkConfig: ClientNetworkConfig; private connectionManager: ClientConnectionManager; private closedTime: number; + private connectedServerVersionString: string; + private connectedServerVersion: number; constructor(connectionManager: ClientConnectionManager, address: Address, clientNetworkConfig: ClientNetworkConfig) { this.address = address; @@ -28,6 +31,8 @@ export class ClientConnection { this.lastRead = 0; this.connectionManager = connectionManager; this.closedTime = 0; + this.connectedServerVersionString = null; + this.connectedServerVersion = BuildMetadata.UNKNOWN_VERSION_ID; } /** @@ -99,6 +104,15 @@ export class ClientConnection { return deferred.promise; } + setConnectedServerVersion(versionString: string): void { + this.connectedServerVersionString = versionString; + this.connectedServerVersion = BuildMetadata.calculateVersion(versionString); + } + + getConnectedServerVersion(): number { + return this.connectedServerVersion; + } + /** * Closes this connection. */ diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index d3f08c04e..fc4f56019 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -28,9 +28,11 @@ export class ConnectionAuthenticator { var authResponse = ClientAuthenticationCodec.decodeResponse(msg); if (authResponse.status === 0) { this.connection.address = authResponse.address; + this.connection.setConnectedServerVersion(authResponse.serverHazelcastVersion); if (ownerConnection) { this.clusterService.uuid = authResponse.uuid; this.clusterService.ownerUuid = authResponse.ownerUuid; + } } else { throw new Error('Could not authenticate connection to ' + this.connection.getAddress().toString()); diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 818c0a132..f4100d70a 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -2,6 +2,7 @@ import {Data} from '../serialization/Data'; import ClientMessage = require('../ClientMessage'); import * as Promise from 'bluebird'; import HazelcastClient from '../HazelcastClient'; +import {BuildMetadata} from '../BuildMetadata'; /** * Common super class for any proxy. @@ -91,6 +92,14 @@ export class BaseProxy { return this.client.getSerializationService().toObject(data); } + protected getConnectedServerVersion(): number { + let activeConnections = this.client.getConnectionManager().getActiveConnections(); + for (let address in activeConnections) { + return activeConnections[address].getConnectedServerVersion(); + } + return BuildMetadata.UNKNOWN_VERSION_ID; + } + getPartitionKey() : string { return this.name; } diff --git a/test/BuildMetadataTest.js b/test/BuildMetadataTest.js new file mode 100644 index 000000000..e748c641c --- /dev/null +++ b/test/BuildMetadataTest.js @@ -0,0 +1,23 @@ +var BuildMetadata = require('../lib/BuildMetadata').BuildMetadata; +var assert = require('chai').assert; + +describe('BuildMetadata', function() { + it('version calculation test', function() { + assert.equal(-1, BuildMetadata.calculateVersion(null)); + assert.equal(-1, BuildMetadata.calculateVersion("")); + assert.equal(-1, BuildMetadata.calculateVersion("a.3.7.5")); + assert.equal(-1, BuildMetadata.calculateVersion("3.a.5")); + assert.equal(-1, BuildMetadata.calculateVersion("3,7.5")); + assert.equal(-1, BuildMetadata.calculateVersion("3.7,5")); + assert.equal(-1, BuildMetadata.calculateVersion("10.99.RC1")); + + assert.equal(30700, BuildMetadata.calculateVersion("3.7")); + assert.equal(30700, BuildMetadata.calculateVersion("3.7-SNAPSHOT")); + assert.equal(30702, BuildMetadata.calculateVersion("3.7.2")); + assert.equal(30702, BuildMetadata.calculateVersion("3.7.2-SNAPSHOT")); + assert.equal(109902, BuildMetadata.calculateVersion("10.99.2-SNAPSHOT")); + assert.equal(19930, BuildMetadata.calculateVersion("1.99.30")); + assert.equal(109930, BuildMetadata.calculateVersion("10.99.30-SNAPSHOT")); + assert.equal(109900, BuildMetadata.calculateVersion("10.99-RC1")); + }); +}); diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js new file mode 100644 index 000000000..778e99b71 --- /dev/null +++ b/test/ClientProxyTest.js @@ -0,0 +1,38 @@ +var MapProxy = require('../lib/proxy/MapProxy').MapProxy; +var ConnectionManager = require('../lib/invocation/ClientConnectionManager').ClientConnectionManager; +var ClientConnection = require('../lib/invocation/ClientConnection').ClientConnection; +var HazelcastClient = require('../.').Client; +var sinon = require('sinon'); +var assert = require('chai').assert; +var sandbox = sinon.createSandbox(); + +describe('Generic proxy test', function() { + + afterEach(function() { + sandbox.restore(); + }); + + it('Client without active connection should return unknown version', function() { + var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); + connectionManagerStub.getActiveConnections.returns({}); + var clientStub = sandbox.stub(HazelcastClient.prototype); + clientStub.getConnectionManager.returns(connectionManagerStub); + + var mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); + assert.equal(mapProxy.getConnectedServerVersion(), -1); + }); + + it('Client with a 3.7 server connection should return the version', function() { + var connectionStub = sandbox.stub(ClientConnection.prototype); + connectionStub.getConnectedServerVersion.returns('30700'); + var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); + connectionManagerStub.getActiveConnections.returns({ + 'localhost': connectionStub + }); + var clientStub = sandbox.stub(HazelcastClient.prototype); + clientStub.getConnectionManager.returns(connectionManagerStub); + + var mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); + assert.equal(mapProxy.getConnectedServerVersion(), 30700); + }); +}) diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index f6da6d7c5..68a3bfed4 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -26,7 +26,6 @@ describe('Listeners on reconnect', function () { [true, false].forEach(function (isSmart) { - function closeTwoMembersOfThreeAndTestListener(done, membersToClose, turnoffMember) { var map; Controller.startMember(cluster.id).then(function (m) { From 2c5b5c8bc707825a2275df31ab02f0d3d1d5dd5e Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 21 Nov 2017 09:19:14 -0500 Subject: [PATCH 033/685] eventually consistent near cache structure --- scripts/download-rc.sh | 2 +- src/Config.ts | 4 +- src/HazelcastClient.ts | 9 ++ .../AlwaysFreshStaleReadDetectorImpl.ts | 21 +++ src/nearcache/InvalidationAwareWrapper.ts | 6 +- src/nearcache/MetadataContainer.ts | 46 ++++++ src/nearcache/MetadataFetcher.ts | 84 +++++++++++ src/nearcache/NearCache.ts | 45 ++++++ src/nearcache/RepairingHandler.ts | 112 ++++++++++++++ src/nearcache/RepairingTask.ts | 70 +++++++++ src/nearcache/StaleReadDetector.ts | 10 ++ src/nearcache/StaleReadDetectorImpl.ts | 29 ++++ src/proxy/NearCachedMapProxy.ts | 88 ++++++++--- test/Util.js | 22 ++- ...stortInvalidationMetadataEntryProcessor.js | 27 ++++ test/javaclasses/IdentifiedFactory.js | 6 +- .../InvalidationMetadataDistortionTest.js | 108 ++++++++++++++ test/nearcache/LostInvalidationsTest.js | 140 ++++++++++++++++++ .../hazelcast_eventual_nearcache.xml | 15 ++ ...cast_nearcache_batchinvalidation_false.xml | 30 ++++ test/nearcache/impl/RepairingTaskTest.js | 56 +++++++ 21 files changed, 899 insertions(+), 31 deletions(-) create mode 100644 src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts create mode 100644 src/nearcache/MetadataContainer.ts create mode 100644 src/nearcache/MetadataFetcher.ts create mode 100644 src/nearcache/RepairingHandler.ts create mode 100644 src/nearcache/RepairingTask.ts create mode 100644 src/nearcache/StaleReadDetector.ts create mode 100644 src/nearcache/StaleReadDetectorImpl.ts create mode 100644 test/javaclasses/DistortInvalidationMetadataEntryProcessor.js create mode 100644 test/nearcache/InvalidationMetadataDistortionTest.js create mode 100644 test/nearcache/LostInvalidationsTest.js create mode 100644 test/nearcache/hazelcast_eventual_nearcache.xml create mode 100644 test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml create mode 100644 test/nearcache/impl/RepairingTaskTest.js diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 9532ac3cf..c67a874f0 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,5 +1,5 @@ #!/bin/sh -HZ_VERSION="3.9" +HZ_VERSION="3.10-SNAPSHOT" HZ_TEST_VERSION="3.10-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} diff --git a/src/Config.ts b/src/Config.ts index 8ea79df3d..4693cdf43 100644 --- a/src/Config.ts +++ b/src/Config.ts @@ -219,7 +219,9 @@ export class ClientConfig { 'hazelcast.client.heartbeat.interval': 5000, 'hazelcast.client.heartbeat.timeout': 60000, 'hazelcast.client.invocation.retry.pause.millis': 1000, - 'hazelcast.client.invocation.timeout.millis': 120000 + 'hazelcast.client.invocation.timeout.millis': 120000, + 'hazelcast.invalidation.reconciliation.interval.seconds': 60, + 'hazelcast.invalidation.max.tolerated.miss.count': 10 }; groupConfig: GroupConfig = new GroupConfig(); networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index c051abbb1..8bd72cf73 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -26,6 +26,7 @@ import {IReplicatedMap} from './proxy/IReplicatedMap'; import {ISemaphore} from './proxy/ISemaphore'; import {IAtomicLong} from './proxy/IAtomicLong'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; +import {RepairingTask} from './nearcache/RepairingTask'; export default class HazelcastClient { @@ -41,6 +42,7 @@ export default class HazelcastClient { private proxyManager: ProxyManager; private heartbeat: Heartbeat; private lockReferenceIdGenerator: LockReferenceIdGenerator; + private mapRepairingTask: RepairingTask; /** * Creates a new client object and automatically connects to cluster. @@ -248,6 +250,13 @@ export default class HazelcastClient { return this.lifecycleService; } + getRepairingTask(): RepairingTask { + if (this.mapRepairingTask == null) { + this.mapRepairingTask = new RepairingTask(this); + } + return this.mapRepairingTask; + } + /** * Registers a distributed object listener to cluster. * @param listenerFunc Callback function will be called with following arguments. diff --git a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts new file mode 100644 index 000000000..1209e8acc --- /dev/null +++ b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts @@ -0,0 +1,21 @@ +import {StaleReadDetector} from './StaleReadDetector'; +import {MetadataContainer} from './MetadataContainer'; +import {DataRecord} from './NearCache'; + +export class AlwaysFreshStaleReadDetector implements StaleReadDetector { + isStaleRead(key: any, record: DataRecord): boolean { + return false; + } + + getPartitionId(key: any): number { + return 0; + } + + getMetadataContainer(partitionId: number): MetadataContainer { + return null; + } +} + +const INSTANCE = new AlwaysFreshStaleReadDetector(); + +export {INSTANCE}; diff --git a/src/nearcache/InvalidationAwareWrapper.ts b/src/nearcache/InvalidationAwareWrapper.ts index c646b2f4c..3e7b09114 100644 --- a/src/nearcache/InvalidationAwareWrapper.ts +++ b/src/nearcache/InvalidationAwareWrapper.ts @@ -1,8 +1,8 @@ import {NearCache, NearCacheStatistics} from './NearCache'; import {Data} from '../serialization/Data'; import {KeyStateMarker, KeyStateMarkerImpl} from './KeyStateMarker'; +import {StaleReadDetector} from './StaleReadDetector'; export class InvalidationAwareWrapper implements NearCache { - private nearCache: NearCache; private keyStateMarker: KeyStateMarker; @@ -44,4 +44,8 @@ export class InvalidationAwareWrapper implements NearCache { getKeyStateMarker(): KeyStateMarker { return this.keyStateMarker; } + + setStaleReadDetector(detector: StaleReadDetector): void { + this.nearCache.setStaleReadDetector(detector); + } } diff --git a/src/nearcache/MetadataContainer.ts b/src/nearcache/MetadataContainer.ts new file mode 100644 index 000000000..7f91e3074 --- /dev/null +++ b/src/nearcache/MetadataContainer.ts @@ -0,0 +1,46 @@ +import * as Long from 'long'; + +export class MetadataContainer { + private sequence: Long = Long.fromNumber(0); + private staleSequence: Long = Long.fromNumber(0); + private missedSequenceCount: Long = Long.fromNumber(0); + private uuid: string; + + reset(): void { + this.sequence = Long.fromNumber(0); + this.staleSequence = Long.fromNumber(0); + this.missedSequenceCount = Long.fromNumber(0); + } + + setSequence(sequence: Long): void { + this.sequence = sequence; + } + + getSequence(): Long { + return this.sequence; + } + + setStaleSequence(staleSequence: Long): void { + this.staleSequence = staleSequence; + } + + getStaleSequence(): Long { + return this.staleSequence; + } + + increaseMissedSequenceCount(missed: Long): void { + this.missedSequenceCount = this.missedSequenceCount.add(missed); + } + + getMissedSequenceCount(): Long { + return this.missedSequenceCount; + } + + setUuid(uuid: string) { + this.uuid = uuid; + } + + getUuid(): string { + return this.uuid; + } +} diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts new file mode 100644 index 000000000..42c68858c --- /dev/null +++ b/src/nearcache/MetadataFetcher.ts @@ -0,0 +1,84 @@ +import {RepairingHandler} from './RepairingHandler'; +import HazelcastClient from '../HazelcastClient'; +import {PartitionService} from '../PartitionService'; +import {MapFetchNearCacheInvalidationMetadataCodec} from '../codec/MapFetchNearCacheInvalidationMetadataCodec'; +import {Invocation} from '../invocation/InvocationService'; +import * as Promise from 'bluebird'; +import ClientMessage = require('../ClientMessage'); +import {LoggingService} from '../logging/LoggingService'; + +export class MetadataFetcher { + + private client: HazelcastClient; + private partitionService: PartitionService; + private logger: LoggingService = LoggingService.getLoggingService(); + + constructor(client: HazelcastClient) { + this.client = client; + this.partitionService = this.client.getPartitionService(); + } + + initHandler(handler: RepairingHandler): Promise { + let scanPromise = this.scanMembers([handler.getName()])[0]; + return scanPromise.then((response: ClientMessage) => { + let metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(response); + handler.initUuid(metadata.partitionUuidList); + handler.initSequence(metadata.namePartitionSequenceList[0]); + }); + } + + fetchMetadata(handlers: Map): Promise { + let objectNames = this.getObjectNames(handlers); + let promises = this.scanMembers(objectNames); + return Promise.each(promises, (clientMessage: ClientMessage) => { + this.processResponse(clientMessage, handlers); + }).return(); + } + + private getObjectNames(handlers: Map): string[] { + let names: string[] = []; + handlers.forEach((handler: RepairingHandler) => { + names.push(handler.getName()); + }); + return names; + } + + protected processResponse(responseMessage: ClientMessage, handlers: Map): void { + let metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(responseMessage); + handlers.forEach((handler: RepairingHandler) => { + try { + this.repairUuids(handler, metadata.partitionUuidList); + this.repairSequences(handler, metadata.namePartitionSequenceList); + } catch (e) { + this.logger.warn('MetadataFetcher', 'Can not get invalidation metadata ' + e.message); + } + }); + } + + protected repairUuids(handler: RepairingHandler, partitionIdUuidList: [number, string][]): void { + partitionIdUuidList.forEach((entry: [number, string]) => { + handler.checkOrRepairUuid(entry[0], entry[1]); + }); + } + + protected repairSequences(handler: RepairingHandler, partitionIdSequenceList: [string, [number, Long][]][]): void { + partitionIdSequenceList.forEach((partitionIdSeq: [string, [number, Long][]]) => { + let pairs = partitionIdSeq[1]; + pairs.forEach((pair: [number, Long]) => { + handler.checkOrRepairSequence(pair[0], pair[1]); + }); + }); + } + + protected scanMembers(objectNames: string[]): Promise[] { + let members = this.client.getClusterService().getMembers(); + let promises: Promise[] = []; + members.forEach((member) => { + let request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.address); + let promise = this.client.getInvocationService().invoke(new Invocation(this.client, request)); + promises.push(promise); + }); + return promises; + } + +} diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 92e203270..7383b22e4 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -3,6 +3,9 @@ import {EvictionPolicy, InMemoryFormat, NearCacheConfig} from '../Config'; import {shuffleArray} from '../Util'; import {SerializationService} from '../serialization/SerializationService'; import {DataKeyedHashMap} from '../DataStoreHashMap'; +import {StaleReadDetector} from './StaleReadDetector'; +import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; +import * as Long from 'long'; export class DataRecord { key: Data; @@ -11,6 +14,8 @@ export class DataRecord { private expirationTime: number; private lastAccessTime: number; private accessHit: number; + private invalidationSequence: Long; + private uuid: string; constructor(key: Data, value: Data | any, creationTime?: number, ttl?: number) { this.key = key; @@ -27,6 +32,8 @@ export class DataRecord { } this.lastAccessTime = this.creationTime; this.accessHit = 0; + this.invalidationSequence = Long.fromNumber(0); + this.uuid = null; } public static lruComp(x: DataRecord, y: DataRecord) { @@ -58,6 +65,22 @@ export class DataRecord { hitRecord(): void { this.accessHit++; } + + getInvalidationSequence(): Long { + return this.invalidationSequence; + } + + setInvalidationSequence(sequence: Long): void { + this.invalidationSequence = sequence; + } + + hasSameUuid(uuid: string): boolean { + return uuid != null && this.uuid != null && uuid === this.uuid; + } + + setUuid(uuid: string): void { + this.uuid = uuid; + } } export interface NearCacheStatistics { @@ -75,6 +98,7 @@ export interface NearCache { clear(): void; getStatistics(): NearCacheStatistics; isInvalidatedOnChange(): boolean; + setStaleReadDetector(detector: StaleReadDetector): void; } export class NearCacheImpl implements NearCache { @@ -90,6 +114,7 @@ export class NearCacheImpl implements NearCache { private evictionSamplingCount: number; private evictionSamplingPoolSize: number; private evictionCandidatePool: Array; + private staleReadDetector: StaleReadDetector = AlwaysFreshStaleReadDetectorImpl.INSTANCE; internalStore: DataKeyedHashMap; @@ -124,6 +149,10 @@ export class NearCacheImpl implements NearCache { this.internalStore = new DataKeyedHashMap(); } + setStaleReadDetector(staleReadDetector: StaleReadDetector): void { + this.staleReadDetector = staleReadDetector; + } + /** * Creates a new {DataRecord} for given key and value. Then, puts the record in near cache. * If the number of records in near cache exceeds {evictionMaxSize}, it removes expired items first. @@ -139,9 +168,20 @@ export class NearCacheImpl implements NearCache { value = this.serializationService.toData(value); } var dr = new DataRecord(key, value, undefined, this.timeToLiveSeconds); + this.initInvalidationMetadata(dr); this.internalStore.set(key, dr); } + private initInvalidationMetadata(dr: DataRecord): void { + if (this.staleReadDetector === AlwaysFreshStaleReadDetectorImpl.INSTANCE) { + return; + } + let partitionId = this.staleReadDetector.getPartitionId(dr.key); + let metadataContainer = this.staleReadDetector.getMetadataContainer(partitionId); + dr.setInvalidationSequence(metadataContainer.getSequence()); + dr.setUuid(metadataContainer.getUuid()); + } + /** * * @param key @@ -153,6 +193,11 @@ export class NearCacheImpl implements NearCache { this.missCount++; return undefined; } + if (this.staleReadDetector.isStaleRead(key, dr)) { + this.internalStore.delete(key); + this.missCount++; + return undefined; + } if (dr.isExpired(this.maxIdleSeconds)) { this.expireRecord(key); this.missCount++; diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts new file mode 100644 index 000000000..c9aa6a2fc --- /dev/null +++ b/src/nearcache/RepairingHandler.ts @@ -0,0 +1,112 @@ +import {NearCache} from './NearCache'; +import {MetadataContainer} from './MetadataContainer'; +import {PartitionService} from '../PartitionService'; +import {Data} from '../serialization/Data'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; + +export class RepairingHandler { + + private readonly nearCache: NearCache; + private readonly partitionCount: number; + private readonly partitionService: PartitionService; + private readonly localUuid: string; + private readonly name: string; + private containers: MetadataContainer[]; + + constructor(name: string, partitionService: PartitionService, nearCache: NearCache, localUuid: string) { + this.nearCache = nearCache; + this.name = name; + this.partitionService = partitionService; + this.partitionCount = this.partitionService.getPartitionCount(); + this.localUuid = localUuid; + this.containers = []; + for (let i = 0; i < this.partitionCount; i++) { + this.containers[i] = new MetadataContainer(); + } + } + + initUuid(partitionIdUuidPairsList: [number, string][]): void { + for (let i = 0; i < partitionIdUuidPairsList.length; i++) { + let item = partitionIdUuidPairsList[i]; + let partitionId = item[0]; + let partitionUuid = item[1]; + this.getMetadataContainer(partitionId).setUuid(partitionUuid); + } + + } + + initSequence(partitionIdSequencePairsList: [string, [number, Long][]]): void { + let list = partitionIdSequencePairsList[1]; + for (let i = 0; i < list.length; i++) { + let item = list[i]; + let partitionId = item[0]; + let partitionSequence = item[1]; + this.getMetadataContainer(partitionId).setSequence(partitionSequence); + } + } + + handle(key: Data, sourceUuid: string, partitionUuid: string, sequence: Long): void { + if (this.localUuid !== sourceUuid) { + if (key == null) { + this.nearCache.clear(); + } else { + this.nearCache.invalidate(key); + } + } + let partitionId = this.getPartitionIdOrDefault(key); + this.checkOrRepairSequence(partitionId, sequence); + this.checkOrRepairUuid(partitionId, partitionUuid); + } + + handleBatch(keys: any[], sourceUuids: string[], partitionUuids: string[], sequences: Long[]): void { + throw new Error('Not implemented'); + } + + checkOrRepairSequence(partitionId: number, nextSequence: Long): void { + let metadata = this.getMetadataContainer(partitionId); + let current = metadata.getSequence(); + if (current.greaterThanOrEqual(nextSequence)) { + return; + } + let missed = nextSequence.subtract(current).subtract(1); + if (missed.greaterThan(0)) { + metadata.increaseMissedSequenceCount(missed); + } + metadata.setSequence(current); + } + + checkOrRepairUuid(partitionId: number, newuuid: string): void { + let metadata = this.getMetadataContainer(partitionId); + let currentUuid = metadata.getUuid(); + if (currentUuid === newuuid) { + return; + } + metadata.setUuid(newuuid); + metadata.reset(); + } + + updateLastKnownStaleSequence(metadataContainer: MetadataContainer, partitionId: number): void { + let lastStaleSequence = metadataContainer.getStaleSequence(); + let lastSequence = metadataContainer.getStaleSequence(); + if (lastStaleSequence < lastSequence) { + metadataContainer.setStaleSequence(lastSequence); + } + } + + getMetadataContainer(partitionId: number): MetadataContainer { + return this.containers[partitionId]; + } + + getName(): string { + return this.name; + } + + private getPartitionIdOrDefault(key: Data) { + if (key != null) { + return this.partitionService.getPartitionId(key); + } else { + return this.partitionService.getPartitionId(this.name); + } + } +} diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts new file mode 100644 index 000000000..32d76fbbb --- /dev/null +++ b/src/nearcache/RepairingTask.ts @@ -0,0 +1,70 @@ +import {RepairingHandler} from './RepairingHandler'; +import {NearCache} from './NearCache'; +import HazelcastClient from '../HazelcastClient'; +import {MetadataFetcher} from './MetadataFetcher'; + +const PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.reconciliation.interval.seconds'; +const PROPERTY_MAX_TOLERATED_MISS_COUNT = 'hazelcast.invalidation.max.tolerated.miss.count'; +const MIN_ALLOWED_RECONCILIATION_INTERVAL_SECONDS = 30; + +export class RepairingTask { + + private antientropyTaskHandle: number; + private lastAntiEntropyRunTime: number; + private handlers: Map; + private reconcilliationInterval: number; + private maxToleratedMissCount: number; + private localUuid: string; + private metadataFetcher: MetadataFetcher; + private client: HazelcastClient; + + constructor(client: HazelcastClient) { + this.client = client; + let config = this.client.getConfig(); + this.handlers = new Map(); + this.localUuid = this.client.getLocalEndpoint().uuid; + let requestedReconciliationSeconds = config.properties[PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS]; + this.reconcilliationInterval = this.getReconciliationIntervalMillis(requestedReconciliationSeconds); + this.maxToleratedMissCount = config.properties[PROPERTY_MAX_TOLERATED_MISS_COUNT]; + this.metadataFetcher = new MetadataFetcher(client); + } + + registerAndGetHandler(objectName: string, nearCache: NearCache): RepairingHandler { + let handler = this.handlers.get(objectName); + if (handler !== undefined) { + return handler; + } + handler = new RepairingHandler(objectName, this.client.getPartitionService(), nearCache, this.localUuid); + this.metadataFetcher.initHandler(handler); + this.handlers.set(objectName, handler); + return handler; + } + + deregisterHandler(objectName: string): void { + this.handlers.delete(objectName); + } + + start(): void { + // create anti entropy task. + } + + stop(): void { + // stop and remove anti entropy task. + } + + antiEntropyTask(): void { + // fixSequenceGaps + } + + private getReconciliationIntervalMillis(seconds: number): number { + if (seconds === 0 || seconds >= MIN_ALLOWED_RECONCILIATION_INTERVAL_SECONDS) { + return seconds * 1000; + } else { + let message = 'Reconciliation interval can be at least ' + MIN_ALLOWED_RECONCILIATION_INTERVAL_SECONDS + ' seconds ' + + 'if not 0. Configured interval is ' + seconds + ' seconds. ' + + 'Note: configuring a value of 0 seconds disables the reconciliation task.'; + throw new RangeError(message); + } + } + +} diff --git a/src/nearcache/StaleReadDetector.ts b/src/nearcache/StaleReadDetector.ts new file mode 100644 index 000000000..688214ac6 --- /dev/null +++ b/src/nearcache/StaleReadDetector.ts @@ -0,0 +1,10 @@ +import {DataRecord} from './NearCache'; +import {MetadataContainer} from './MetadataContainer'; + +export interface StaleReadDetector { + isStaleRead(key: any, record: DataRecord): boolean; + + getPartitionId(key: any): number; + + getMetadataContainer(partitionId: number): MetadataContainer; +} diff --git a/src/nearcache/StaleReadDetectorImpl.ts b/src/nearcache/StaleReadDetectorImpl.ts new file mode 100644 index 000000000..8793b0ff5 --- /dev/null +++ b/src/nearcache/StaleReadDetectorImpl.ts @@ -0,0 +1,29 @@ +import {StaleReadDetector} from './StaleReadDetector'; +import {DataRecord} from './NearCache'; +import {MetadataContainer} from './MetadataContainer'; +import {RepairingHandler} from './RepairingHandler'; +import {PartitionService} from '../PartitionService'; + +export class StaleReadDetectorImpl implements StaleReadDetector { + + private readonly repairingHandler: RepairingHandler; + private readonly partitionService: PartitionService; + + constructor(handler: RepairingHandler, partitionService: PartitionService) { + this.repairingHandler = handler; + this.partitionService = partitionService; + } + + isStaleRead(key: any, record: DataRecord): boolean { + let metadata = this.getMetadataContainer(this.getPartitionId(record.key)); + return !record.hasSameUuid(metadata.getUuid()) || record.getInvalidationSequence() < metadata.getStaleSequence(); + } + + getMetadataContainer(partitionId: number): MetadataContainer { + return this.repairingHandler.getMetadataContainer(partitionId); + } + + getPartitionId(key: any): number { + return this.partitionService.getPartitionId(key); + } +} diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 85937cb2f..565a20264 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -11,6 +11,11 @@ import {KeyStateMarker, TrueKeyStateMarker} from '../nearcache/KeyStateMarker'; import {DataKeyedHashMap} from '../DataStoreHashMap'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; +import {BuildMetadata} from '../BuildMetadata'; +import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; +import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetectorImpl'; + +const MIN_EVENTUALLY_CONSISTENT_NEARCACHE_VERSION = BuildMetadata.calculateVersion('3.8'); export class NearCachedMapProxy extends MapProxy { @@ -190,8 +195,6 @@ export class NearCachedMapProxy extends MapProxy { } return result; }); - - } protected replaceIfSameInternal(keyData: Data, oldValueData: Data, newValueData: Data): Promise { @@ -214,38 +217,81 @@ export class NearCachedMapProxy extends MapProxy { } private addNearCacheInvalidationListener(): Promise { - var nearCache = this.nearCache; - var invalidationHandler = function(keyData: Data) { + let codec = this.createInvalidationListenerCodec(this.name, EntryEventType.INVALIDATION); + if (this.supportsRepairableNearCache()) { + return this.client.getListenerService().registerListener(codec, this.createNearCacheEventHandler()); + } else { + return this.client.getListenerService().registerListener(codec, this.createPre38NearCacheEventHandler()); + } + } + + private createInvalidationListenerCodec(name: string, flags: number): ListenerMessageCodec { + if (this.supportsRepairableNearCache()) { + return { + encodeAddRequest: function(localOnly: boolean): ClientMessage { + return MapAddNearCacheInvalidationListenerCodec.encodeRequest(name, flags, localOnly); + + }, + decodeAddResponse: function(msg: ClientMessage): string { + return MapAddNearCacheInvalidationListenerCodec.decodeResponse(msg).response; + }, + encodeRemoveRequest: function(listenerId: string): ClientMessage { + return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); + } + }; + } else { + return { + encodeAddRequest: function(localOnly: boolean): ClientMessage { + return MapAddNearCacheEntryListenerCodec.encodeRequest(name, flags, localOnly); + }, + decodeAddResponse: function(msg: ClientMessage): string { + return MapAddNearCacheEntryListenerCodec.decodeResponse(msg).response; + }, + encodeRemoveRequest: function(listenerId: string): ClientMessage { + return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); + } + }; + } + } + + private supportsRepairableNearCache(): boolean { + return this.getConnectedServerVersion() >= MIN_EVENTUALLY_CONSISTENT_NEARCACHE_VERSION; + } + + private createPre38NearCacheEventHandler() { + let nearCache = this.nearCache; + let handle = function(keyData: Data) { if (keyData == null) { nearCache.clear(); } else { nearCache.invalidate(keyData); } }; - var invalidationBatchHandler = function (keys: Array) { + let handleBatch = function (keys: Array) { keys.forEach((key: Data) => { nearCache.invalidate(key); }); }; - let codec = this.createInvalidationListenerCodec(this.name, EntryEventType.INVALIDATION); - return this.client.getListenerService().registerListener(codec, - (m: ClientMessage) => { MapAddNearCacheEntryListenerCodec.handle(m, invalidationHandler, invalidationBatchHandler); } - ); + return function(m: ClientMessage) { + MapAddNearCacheEntryListenerCodec.handle(m, handle, handleBatch); + }; } - private createInvalidationListenerCodec(name: string, flags: number): ListenerMessageCodec { - return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { - return MapAddNearCacheEntryListenerCodec.encodeRequest(name, flags, localOnly); - }, - decodeAddResponse: function(msg: ClientMessage): string { - return MapAddNearCacheEntryListenerCodec.decodeResponse(msg).response; - }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { - return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + private createNearCacheEventHandler() { + let repairingTask = this.client.getRepairingTask(); + let repairingHandler = repairingTask.registerAndGetHandler(this.getName(), this.nearCache); + let staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); + this.nearCache.setStaleReadDetector(staleReadDetector); + let handle = function(key: Data, partitionUuid: string, sourceUuid: string, sequence: Long) { + repairingHandler.handle(key, partitionUuid, sourceUuid, sequence); + }; + let handleBatch = function (keys: Data[], partitionUuids: string[], sourceUuids: string[], sequences: Long[]) { + repairingHandler.handleBatch(keys, partitionUuids, sourceUuids, sequences); }; - } + return function(m: ClientMessage) { + MapAddNearCacheInvalidationListenerCodec.handle(m, handle, handleBatch); + }; + } } diff --git a/test/Util.js b/test/Util.js index 53e67824c..a6383bc2e 100644 --- a/test/Util.js +++ b/test/Util.js @@ -1,11 +1,15 @@ var expect = require('chai').expect; var promiseLater = function (time, func) { - return new Promise(function(resolve, reject) { - setTimeout(function() { - resolve(func()); - }, time); - }); + if (func === undefined) { + func = function(){}; + } + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve(func()); + }, time); + }); }; + var expectAlmostEqual = function (actual, expected) { if (expected === null) { return expect(actual).to.equal(expected); @@ -52,5 +56,13 @@ exports.markEnterprise = function (_this) { } }; +exports.promiseWaitMilliseconds = function (milliseconds) { + return new Promise(function(resolve, reject) { + setTimeout(function() { + resolve(); + }, milliseconds); + }); +} + exports.promiseLater = promiseLater; exports.expectAlmostEqual = expectAlmostEqual; diff --git a/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js new file mode 100644 index 000000000..9b33db59a --- /dev/null +++ b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js @@ -0,0 +1,27 @@ +function DistortInvalidationMetadataEntryProcessor(mapName, mapSize, duration) { + this.mapSize = mapSize; + this.mapName = mapName; + this.duration = duration; +} + +DistortInvalidationMetadataEntryProcessor.prototype.readData = function (inp) { + this.mapName = inp.readUTF(); + this.mapSize = inp.readInt(); + this.duration = inp.readInt(); +}; + +DistortInvalidationMetadataEntryProcessor.prototype.writeData = function (outp) { + outp.writeUTF(this.mapName); + outp.writeInt(this.mapSize); + outp.writeInt(this.duration); +}; + +DistortInvalidationMetadataEntryProcessor.prototype.getFactoryId = function () { + return 66; +}; + +DistortInvalidationMetadataEntryProcessor.prototype.getClassId = function() { + return 3; +}; + +module.exports = DistortInvalidationMetadataEntryProcessor; diff --git a/test/javaclasses/IdentifiedFactory.js b/test/javaclasses/IdentifiedFactory.js index 8dc63075d..f33a04563 100644 --- a/test/javaclasses/IdentifiedFactory.js +++ b/test/javaclasses/IdentifiedFactory.js @@ -1,15 +1,17 @@ var IdentifiedEntryProcessor = require('./IdentifiedFactory'); +var DistortInvalidationMetadataEntryProcessor = require('./DistortInvalidationMetadataEntryProcessor'); var CustomComparator = require('./CustomComparator'); function IdentifiedFactory() { - } IdentifiedFactory.prototype.create = function (type) { if (type === 1) { return new IdentifiedEntryProcessor(); - } else if (type == 2) { + } else if (type === 2) { return new CustomComparator(); + } else if (type === 3) { + return new DistortInvalidationMetadataEntryProcessor(); } }; diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js new file mode 100644 index 000000000..5f3870a44 --- /dev/null +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -0,0 +1,108 @@ +var Controller = require('../RC'); +var Client = require('../..').Client; +var Config = require('../..').Config; +var fs = require('fs'); +var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +var DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortInvalidationMetadataEntryProcessor'); +var Promise = require('bluebird'); +var expect = require('chai').expect; + +describe('Invalidation metadata distortion', function () { + + var cluster; + var member; + var client; + var validationClient; + var mapName = 'nc-map'; + var mapSize = 10; + + before(function () { + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }).then(function (mem) { + member = mem; + }); + }); + + after(function () { + return Controller.shutdownCluster(cluster.id); + }); + + afterEach(function () { + client.shutdown(); + validationClient.shutdown(); + }); + + function createConfig(withNearCache) { + var cfg = new Config.ClientConfig(); + if (withNearCache) { + var ncc = new Config.NearCacheConfig(); + ncc.name = mapName; + cfg.nearCacheConfigs[mapName] = ncc; + } + cfg.serializationConfig.defaultNumberType = "integer"; + cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); + return cfg; + } + + beforeEach(function () { + return Client.newHazelcastClient(createConfig(true)).then(function (cl) { + client = cl; + return Client.newHazelcastClient(createConfig(false)); + }).then(function (cl) { + validationClient = cl; + }); + }); + + + it('lost invalidation', function (done) { + this.timeout(13000); + var stopTest = false; + + var map = client.getMap(mapName); + var ignoredKey = mapSize; + + var populatePromises = []; + for (var i = 0; i < mapSize; i++) { + populatePromises.push(map.put(i, i)); + } + populatePromises.push(map.put(ignoredKey, ignoredKey)); + + function compareActualAndExpected(actualMap, verificationMap, index) { + return actualMap.get(index).then(function (actual) { + return verificationMap.get(index).then(function (expected) { + return expect(actual).to.equal(expected); + }); + }); + } + + function populateNearCacheAndCompare() { + if (!stopTest) { + var promises = []; + for (var i = 0; i < mapSize; i++) { + promises.push(map.get(i)); + } + Promise.all(promises).then(function() { + setTimeout(populateNearCacheAndCompare, 0); + }); + } else { + var comparisonPromises = []; + for (var i = 0; i < mapSize; i++) { + comparisonPromises.push(compareActualAndExpected(map, validationClient.getMap(mapName), i)); + } + Promise.all(comparisonPromises).then(() => {done()}).catch(done); + } + } + + Promise.all(populatePromises).then(function () { + map.executeOnKey(ignoredKey, new DistortInvalidationMetadataEntryProcessor(mapName, mapSize, 5)).then(function () { + stopTest = true; + }).catch(function (err) { + done(err); + }); + setTimeout(populateNearCacheAndCompare, 100); + }) + + }); +}); diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js new file mode 100644 index 000000000..affe9fafe --- /dev/null +++ b/test/nearcache/LostInvalidationsTest.js @@ -0,0 +1,140 @@ +var RC = require('../RC'); +var HazelcastClient = require('../../').Client; +var expect = require('chai').expect; +var Config = require('../../').Config; +var fs = require('fs'); +var Long = require('long'); +var Util = require('../Util'); +var Promise = require('bluebird'); + +describe('LostInvalidation', function() { + this.timeout(30000); + + var cluster; + var member; + var client; + var modifyingClient; + + var entryCount = 1000; + var mapName = 'ncmap'; + + function createConfig() { + var cfg = new Config.ClientConfig(); + var ncConfig = new Config.NearCacheConfig(); + ncConfig.name = mapName; + cfg.nearCacheConfigs[mapName] = ncConfig; + return cfg; + } + + before(function() { + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function(resp) { + cluster = resp; + return RC.startMember(cluster.id); + }).then(function (m) { + member = m; + }); + }); + + beforeEach(function () { + return HazelcastClient.newHazelcastClient(createConfig()).then(function (resp) { + client = resp; + return HazelcastClient.newHazelcastClient(); + }).then(function (resp) { + modifyingClient = resp; + }); + }); + + afterEach(function () { + client.shutdown(); + modifyingClient.shutdown(); + }); + + after(function() { + return RC.shutdownCluster(cluster.id); + }); + + it('client eventually receives an update that invalidation event for which was dropped', function() { + var map = client.getMap(mapName); + var key = 'key'; + var value = 'val'; + var updatedval = 'updatedval'; + var invalidationHandlerStub; + return Util.promiseWaitMilliseconds(100).then(function(resp) { + invalidationHandlerStub = blockInvalidationEvents(client, map, 1); + return modifyingClient.getMap(mapName).put(key, value); + }).then(function() { + return map.get(key); + }).then(function() { + return modifyingClient.getMap(mapName).put(key, updatedval); + }).then(function () { + return Util.promiseWaitMilliseconds(1000); + }).then(function () { + unblockInvalidationEvents(client, invalidationHandlerStub); + return Util.promiseWaitMilliseconds(1000); + }).then(function() { + return map.get(key); + }).then(function (result) { + return expect(result).to.equal(updatedval); + }); + }); + + it('lost invalidation stress test', function() { + var map = client.getMap(mapName); + var invalidationHandlerStub; + return Util.promiseWaitMilliseconds(100).then(function(resp) { + invalidationHandlerStub = blockInvalidationEvents(client, map); + var entries = []; + for (var i = 0 ; i < entryCount; i++) { + entries.push([i, i]); + } + return modifyingClient.getMap(mapName).putAll(entries); + }).then(function() { + var requestedKeys = []; + for (var i = 0; i < entryCount; i++) { + requestedKeys.push(i); + } + //populate near cache + return map.getAll(requestedKeys); + }).then(function() { + var entries = []; + for (var i = 0; i < entryCount; i++) { + entries.push([i, i + entryCount]); + } + return modifyingClient.getMap(mapName).putAll(entries); + }).then(function () { + unblockInvalidationEvents(client, invalidationHandlerStub); + return Util.promiseWaitMilliseconds(2000); + }).then(function() { + var promises = []; + for (var i = 0; i < entryCount; i++) { + var promise = (function (key) { + return map.get(key).then((val) => { + return expect(val).to.equal(key + entryCount); + }); + })(i); + promises.push(promise); + } + return Promise.all(promises); + }); + }); + + function blockInvalidationEvents(client, nearCachedMap, notifyAfterNumberOfEvents) { + var listenerId = nearCachedMap.invalidationListenerId; + var clientRegistrationKey = client.getListenerService().activeRegistrations.get(listenerId).get(client.clusterService.getOwnerConnection()); + var correlationId = clientRegistrationKey.correlationId; + var handler = client.getInvocationService().eventHandlers[correlationId.toNumber()].handler; + var numberOfBlockedInvalidations = 0; + var deferred = Promise.defer(); + client.getInvocationService().eventHandlers[correlationId.toNumber()].handler = function() { + numberOfBlockedInvalidations++; + if (notifyAfterNumberOfEvents !== undefined && notifyAfterNumberOfEvents === numberOfBlockedInvalidations) { + deferred.resolve(); + } + }; + return {handler: handler, correlationId: correlationId, notificationHandler: deferred.promise}; + } + + function unblockInvalidationEvents(client, metadata) { + client.getInvocationService().eventHandlers[metadata.correlationId.toNumber()].handler = metadata.handler; + } +}); diff --git a/test/nearcache/hazelcast_eventual_nearcache.xml b/test/nearcache/hazelcast_eventual_nearcache.xml new file mode 100644 index 000000000..1726c2f7c --- /dev/null +++ b/test/nearcache/hazelcast_eventual_nearcache.xml @@ -0,0 +1,15 @@ + + + + false + + + + + com.hazelcast.client.test.IdentifiedFactory + + + + diff --git a/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml new file mode 100644 index 000000000..aa50cf312 --- /dev/null +++ b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml @@ -0,0 +1,30 @@ + + + + + + + + false + + diff --git a/test/nearcache/impl/RepairingTaskTest.js b/test/nearcache/impl/RepairingTaskTest.js new file mode 100644 index 000000000..184788903 --- /dev/null +++ b/test/nearcache/impl/RepairingTaskTest.js @@ -0,0 +1,56 @@ +var Client = require('../../../').Client; +var Config = require('../../../').Config; +var Controller = require('../../RC'); +var chai = require('chai'); +var expect = chai.expect; + +describe('RepairingTask', function() { + + var cluster; + var member; + var client; + + before(function () { + return Controller.createCluster(null, null).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }).then(function (me) { + member = me; + }); + }); + + afterEach(function () { + if (client != null) { + client.shutdown(); + } + }); + + function startClientWithReconciliationInterval(reconciliationInterval) { + var cfg = new Config.ClientConfig(); + var nccConfig = new Config.NearCacheConfig(); + nccConfig.name = 'test'; + cfg.nearCacheConfigs['test'] = nccConfig; + cfg.properties['hazelcast.invalidation.reconciliation.interval.seconds'] = reconciliationInterval; + return Client.newHazelcastClient(cfg).then(function(cl) { + client = cl; + }); + } + + it('throws when reconciliation interval is set to below 30 seconds', function() { + return startClientWithReconciliationInterval(2).then(function() { + return expect(client.getRepairingTask.bind(client)).to.throw(); + }); + }); + + it('reconciliation interval is used when set to 50', function() { + return startClientWithReconciliationInterval(50).then(function() { + return expect(client.getRepairingTask().reconcilliationInterval).to.equal(50000); + }); + }); + + it('no reconciliation task is run when interval is set to 0', function() { + return startClientWithReconciliationInterval(0).then(function() { + return expect(client.getRepairingTask().antientropyTaskHandle).to.be.undefined; + }); + }); +}); From fee3d710929dcefdecfcbda2ec19f9ae9950db7e Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 7 Dec 2017 15:34:58 -0500 Subject: [PATCH 034/685] anti entropy task for near cache --- src/Config.ts | 3 +- src/HazelcastClient.ts | 1 + src/nearcache/MetadataContainer.ts | 7 +- src/nearcache/MetadataFetcher.ts | 7 +- src/nearcache/NearCache.ts | 9 +-- src/nearcache/RepairingHandler.ts | 25 ++++--- src/nearcache/RepairingTask.ts | 69 ++++++++++++++++--- src/nearcache/StaleReadDetectorImpl.ts | 2 +- src/proxy/NearCachedMapProxy.ts | 9 +-- .../InvalidationMetadataDistortionTest.js | 2 +- test/nearcache/LostInvalidationsTest.js | 5 +- test/nearcache/impl/RepairingTaskTest.js | 4 ++ 12 files changed, 103 insertions(+), 40 deletions(-) diff --git a/src/Config.ts b/src/Config.ts index 4693cdf43..8773cb7b5 100644 --- a/src/Config.ts +++ b/src/Config.ts @@ -221,7 +221,8 @@ export class ClientConfig { 'hazelcast.client.invocation.retry.pause.millis': 1000, 'hazelcast.client.invocation.timeout.millis': 120000, 'hazelcast.invalidation.reconciliation.interval.seconds': 60, - 'hazelcast.invalidation.max.tolerated.miss.count': 10 + 'hazelcast.invalidation.max.tolerated.miss.count': 10, + 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30 }; groupConfig: GroupConfig = new GroupConfig(); networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 8bd72cf73..24d42ab17 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -288,6 +288,7 @@ export default class HazelcastClient { * Shuts down this client instance. */ shutdown(): void { + this.getRepairingTask().shutdown(); this.partitionService.shutdown(); this.lifecycleService.emitLifecycleEvent(LifecycleEvent.shuttingDown); this.heartbeat.cancel(); diff --git a/src/nearcache/MetadataContainer.ts b/src/nearcache/MetadataContainer.ts index 7f91e3074..77a82ac17 100644 --- a/src/nearcache/MetadataContainer.ts +++ b/src/nearcache/MetadataContainer.ts @@ -1,10 +1,11 @@ import * as Long from 'long'; +import {UUID} from '../core/UUID'; export class MetadataContainer { private sequence: Long = Long.fromNumber(0); private staleSequence: Long = Long.fromNumber(0); private missedSequenceCount: Long = Long.fromNumber(0); - private uuid: string; + private uuid: UUID; reset(): void { this.sequence = Long.fromNumber(0); @@ -36,11 +37,11 @@ export class MetadataContainer { return this.missedSequenceCount; } - setUuid(uuid: string) { + setUuid(uuid: UUID) { this.uuid = uuid; } - getUuid(): string { + getUuid(): UUID { return this.uuid; } } diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index 42c68858c..85cad818e 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -6,6 +6,7 @@ import {Invocation} from '../invocation/InvocationService'; import * as Promise from 'bluebird'; import ClientMessage = require('../ClientMessage'); import {LoggingService} from '../logging/LoggingService'; +import {UUID} from '../core/UUID'; export class MetadataFetcher { @@ -55,8 +56,8 @@ export class MetadataFetcher { }); } - protected repairUuids(handler: RepairingHandler, partitionIdUuidList: [number, string][]): void { - partitionIdUuidList.forEach((entry: [number, string]) => { + protected repairUuids(handler: RepairingHandler, partitionIdUuidList: [number, UUID][]): void { + partitionIdUuidList.forEach((entry: [number, UUID]) => { handler.checkOrRepairUuid(entry[0], entry[1]); }); } @@ -65,7 +66,7 @@ export class MetadataFetcher { partitionIdSequenceList.forEach((partitionIdSeq: [string, [number, Long][]]) => { let pairs = partitionIdSeq[1]; pairs.forEach((pair: [number, Long]) => { - handler.checkOrRepairSequence(pair[0], pair[1]); + handler.checkOrRepairSequence(pair[0], pair[1], true); }); }); } diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 7383b22e4..4586321bb 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -6,6 +6,7 @@ import {DataKeyedHashMap} from '../DataStoreHashMap'; import {StaleReadDetector} from './StaleReadDetector'; import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; import * as Long from 'long'; +import {UUID} from '../core/UUID'; export class DataRecord { key: Data; @@ -15,7 +16,7 @@ export class DataRecord { private lastAccessTime: number; private accessHit: number; private invalidationSequence: Long; - private uuid: string; + private uuid: UUID; constructor(key: Data, value: Data | any, creationTime?: number, ttl?: number) { this.key = key; @@ -74,11 +75,11 @@ export class DataRecord { this.invalidationSequence = sequence; } - hasSameUuid(uuid: string): boolean { - return uuid != null && this.uuid != null && uuid === this.uuid; + hasSameUuid(uuid: UUID): boolean { + return uuid.equals(this.uuid); } - setUuid(uuid: string): void { + setUuid(uuid: UUID): void { this.uuid = uuid; } } diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index c9aa6a2fc..c135147f3 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -26,7 +26,7 @@ export class RepairingHandler { } } - initUuid(partitionIdUuidPairsList: [number, string][]): void { + initUuid(partitionIdUuidPairsList: [number, UUID][]): void { for (let i = 0; i < partitionIdUuidPairsList.length; i++) { let item = partitionIdUuidPairsList[i]; let partitionId = item[0]; @@ -46,7 +46,7 @@ export class RepairingHandler { } } - handle(key: Data, sourceUuid: string, partitionUuid: string, sequence: Long): void { + handle(key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long): void { if (this.localUuid !== sourceUuid) { if (key == null) { this.nearCache.clear(); @@ -59,37 +59,40 @@ export class RepairingHandler { this.checkOrRepairUuid(partitionId, partitionUuid); } - handleBatch(keys: any[], sourceUuids: string[], partitionUuids: string[], sequences: Long[]): void { + handleBatch(keys: any[], sourceUuids: string[], partitionUuids: UUID[], sequences: Long[]): void { throw new Error('Not implemented'); } - checkOrRepairSequence(partitionId: number, nextSequence: Long): void { + checkOrRepairSequence(partitionId: number, nextSequence: Long, viaAntiEntropy: boolean = false): void { let metadata = this.getMetadataContainer(partitionId); let current = metadata.getSequence(); if (current.greaterThanOrEqual(nextSequence)) { return; } - let missed = nextSequence.subtract(current).subtract(1); + metadata.setSequence(nextSequence); + let missed = nextSequence.subtract(current); + if (!viaAntiEntropy) { + missed = missed.subtract(1); + } if (missed.greaterThan(0)) { metadata.increaseMissedSequenceCount(missed); } - metadata.setSequence(current); } - checkOrRepairUuid(partitionId: number, newuuid: string): void { + checkOrRepairUuid(partitionId: number, newuuid: UUID): void { let metadata = this.getMetadataContainer(partitionId); let currentUuid = metadata.getUuid(); - if (currentUuid === newuuid) { + if (currentUuid.equals(newuuid)) { return; } metadata.setUuid(newuuid); metadata.reset(); } - updateLastKnownStaleSequence(metadataContainer: MetadataContainer, partitionId: number): void { + updateLastKnownStaleSequence(metadataContainer: MetadataContainer): void { let lastStaleSequence = metadataContainer.getStaleSequence(); - let lastSequence = metadataContainer.getStaleSequence(); - if (lastStaleSequence < lastSequence) { + let lastSequence = metadataContainer.getSequence(); + if (lastStaleSequence.lessThan(lastSequence)) { metadataContainer.setStaleSequence(lastSequence); } } diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index 32d76fbbb..76840029d 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -2,31 +2,38 @@ import {RepairingHandler} from './RepairingHandler'; import {NearCache} from './NearCache'; import HazelcastClient from '../HazelcastClient'; import {MetadataFetcher} from './MetadataFetcher'; +import * as assert from 'assert'; +import * as Long from 'long'; +import {LoggingService} from '../logging/LoggingService'; const PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.reconciliation.interval.seconds'; +const PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.min.reconciliation.interval.seconds'; const PROPERTY_MAX_TOLERATED_MISS_COUNT = 'hazelcast.invalidation.max.tolerated.miss.count'; -const MIN_ALLOWED_RECONCILIATION_INTERVAL_SECONDS = 30; export class RepairingTask { - private antientropyTaskHandle: number; - private lastAntiEntropyRunTime: number; + private antientropyTaskHandle: any; private handlers: Map; private reconcilliationInterval: number; private maxToleratedMissCount: number; private localUuid: string; private metadataFetcher: MetadataFetcher; private client: HazelcastClient; + private partitionCount: number; + private readonly minAllowedReconciliationSeconds: number; + private readonly logger = LoggingService.getLoggingService(); constructor(client: HazelcastClient) { this.client = client; let config = this.client.getConfig(); - this.handlers = new Map(); - this.localUuid = this.client.getLocalEndpoint().uuid; + this.minAllowedReconciliationSeconds = config.properties[PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS]; let requestedReconciliationSeconds = config.properties[PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS]; this.reconcilliationInterval = this.getReconciliationIntervalMillis(requestedReconciliationSeconds); + this.handlers = new Map(); + this.localUuid = this.client.getLocalEndpoint().uuid; this.maxToleratedMissCount = config.properties[PROPERTY_MAX_TOLERATED_MISS_COUNT]; this.metadataFetcher = new MetadataFetcher(client); + this.partitionCount = this.client.getPartitionService().getPartitionCount(); } registerAndGetHandler(objectName: string, nearCache: NearCache): RepairingHandler { @@ -37,6 +44,9 @@ export class RepairingTask { handler = new RepairingHandler(objectName, this.client.getPartitionService(), nearCache, this.localUuid); this.metadataFetcher.initHandler(handler); this.handlers.set(objectName, handler); + if (this.antientropyTaskHandle === undefined) { + this.start(); + } return handler; } @@ -45,22 +55,59 @@ export class RepairingTask { } start(): void { - // create anti entropy task. + assert(this.reconcilliationInterval > 0); + this.antientropyTaskHandle = setInterval(this.antiEntropyTask.bind(this), this.reconcilliationInterval); } - stop(): void { - // stop and remove anti entropy task. + shutdown(): void { + if (this.antientropyTaskHandle != null) { + clearInterval(this.antientropyTaskHandle); + } } antiEntropyTask(): void { - // fixSequenceGaps + if (this.client.getLifecycleService().isRunning()) { + this.handlers.forEach((handler: RepairingHandler) => { + if (this.isAboveMaxToleratedMissCount(handler)) { + this.updateLastKnownStaleSequences(handler); + } + }); + this.metadataFetcher.fetchMetadata(this.handlers); + } else { + this.shutdown(); + this.logger.debug('RepairingTask', 'Anti entropy task was on although client was not running.' + + 'Anti entropy task was shutdown forcibly.'); + } + } + + private isAboveMaxToleratedMissCount(handler: RepairingHandler): boolean { + let totalMissCount = Long.fromNumber(0); + for (let i = 0; i < this.partitionCount; i++) { + let added = handler.getMetadataContainer(i).getMissedSequenceCount(); + totalMissCount = totalMissCount.add(added); + if (totalMissCount.greaterThanOrEqual(this.maxToleratedMissCount)) { + return true; + } + } + return false; + } + + private updateLastKnownStaleSequences(handler: RepairingHandler): void { + for (let i = 0; i < this.partitionCount; i++) { + let container = handler.getMetadataContainer(i); + let missedCount = container.getMissedSequenceCount(); + if (missedCount.notEquals(0)) { + container.increaseMissedSequenceCount(missedCount.negate()); + handler.updateLastKnownStaleSequence(container); + } + } } private getReconciliationIntervalMillis(seconds: number): number { - if (seconds === 0 || seconds >= MIN_ALLOWED_RECONCILIATION_INTERVAL_SECONDS) { + if (seconds === 0 || seconds >= this.minAllowedReconciliationSeconds) { return seconds * 1000; } else { - let message = 'Reconciliation interval can be at least ' + MIN_ALLOWED_RECONCILIATION_INTERVAL_SECONDS + ' seconds ' + + let message = 'Reconciliation interval can be at least ' + this.minAllowedReconciliationSeconds + ' seconds ' + 'if not 0. Configured interval is ' + seconds + ' seconds. ' + 'Note: configuring a value of 0 seconds disables the reconciliation task.'; throw new RangeError(message); diff --git a/src/nearcache/StaleReadDetectorImpl.ts b/src/nearcache/StaleReadDetectorImpl.ts index 8793b0ff5..eeb7fca03 100644 --- a/src/nearcache/StaleReadDetectorImpl.ts +++ b/src/nearcache/StaleReadDetectorImpl.ts @@ -16,7 +16,7 @@ export class StaleReadDetectorImpl implements StaleReadDetector { isStaleRead(key: any, record: DataRecord): boolean { let metadata = this.getMetadataContainer(this.getPartitionId(record.key)); - return !record.hasSameUuid(metadata.getUuid()) || record.getInvalidationSequence() < metadata.getStaleSequence(); + return !record.hasSameUuid(metadata.getUuid()) || record.getInvalidationSequence().lessThan(metadata.getStaleSequence()); } getMetadataContainer(partitionId: number): MetadataContainer { diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 565a20264..dd8f150c2 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -14,6 +14,7 @@ import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec' import {BuildMetadata} from '../BuildMetadata'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetectorImpl'; +import {UUID} from '../core/UUID'; const MIN_EVENTUALLY_CONSISTENT_NEARCACHE_VERSION = BuildMetadata.calculateVersion('3.8'); @@ -283,11 +284,11 @@ export class NearCachedMapProxy extends MapProxy { let repairingHandler = repairingTask.registerAndGetHandler(this.getName(), this.nearCache); let staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); this.nearCache.setStaleReadDetector(staleReadDetector); - let handle = function(key: Data, partitionUuid: string, sourceUuid: string, sequence: Long) { - repairingHandler.handle(key, partitionUuid, sourceUuid, sequence); + let handle = function(key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long) { + repairingHandler.handle(key, sourceUuid, partitionUuid, sequence); }; - let handleBatch = function (keys: Data[], partitionUuids: string[], sourceUuids: string[], sequences: Long[]) { - repairingHandler.handleBatch(keys, partitionUuids, sourceUuids, sequences); + let handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]) { + repairingHandler.handleBatch(keys, sourceUuids, partititonUuids, sequences); }; return function(m: ClientMessage) { diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index 5f3870a44..0a8b7b917 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -7,7 +7,7 @@ var DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortI var Promise = require('bluebird'); var expect = require('chai').expect; -describe('Invalidation metadata distortion', function () { +describe.skip('Invalidation metadata distortion', function () { var cluster; var member; diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index affe9fafe..9eaae30a0 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -23,6 +23,9 @@ describe('LostInvalidation', function() { var ncConfig = new Config.NearCacheConfig(); ncConfig.name = mapName; cfg.nearCacheConfigs[mapName] = ncConfig; + cfg.properties['hazelcast.invalidation.reconciliation.interval.seconds'] = 1; + cfg.properties['hazelcast.invalidation.min.reconciliation.interval.seconds'] = 1; + cfg.properties['hazelcast.invalidation.max.tolerated.miss.count'] = 2; return cfg; } @@ -53,7 +56,7 @@ describe('LostInvalidation', function() { return RC.shutdownCluster(cluster.id); }); - it('client eventually receives an update that invalidation event for which was dropped', function() { + it('client eventually receives an update for which the invalidation event was dropped', function() { var map = client.getMap(mapName); var key = 'key'; var value = 'val'; diff --git a/test/nearcache/impl/RepairingTaskTest.js b/test/nearcache/impl/RepairingTaskTest.js index 184788903..28c825d3d 100644 --- a/test/nearcache/impl/RepairingTaskTest.js +++ b/test/nearcache/impl/RepairingTaskTest.js @@ -25,6 +25,10 @@ describe('RepairingTask', function() { } }); + after(function () { + return Controller.shutdownCluster(cluster.id); + }); + function startClientWithReconciliationInterval(reconciliationInterval) { var cfg = new Config.ClientConfig(); var nccConfig = new Config.NearCacheConfig(); From 4d647c5536728140f0e6b8e5d218573995e4d76f Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 8 Dec 2017 15:27:38 -0500 Subject: [PATCH 035/685] Migrated partitions causes near cache entries to be invalidated --- src/HazelcastClient.ts | 4 +- src/nearcache/RepairingHandler.ts | 2 +- src/proxy/BaseProxy.ts | 8 +- src/proxy/NearCachedMapProxy.ts | 12 +++ test/nearcache/MigratedDataTest.js | 121 +++++++++++++++++++++++++++++ 5 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 test/nearcache/MigratedDataTest.js diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 24d42ab17..9ca1ac9dd 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -288,7 +288,9 @@ export default class HazelcastClient { * Shuts down this client instance. */ shutdown(): void { - this.getRepairingTask().shutdown(); + if (this.mapRepairingTask !== undefined) { + this.mapRepairingTask.shutdown(); + } this.partitionService.shutdown(); this.lifecycleService.emitLifecycleEvent(LifecycleEvent.shuttingDown); this.heartbeat.cancel(); diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index c135147f3..714aebd8d 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -82,7 +82,7 @@ export class RepairingHandler { checkOrRepairUuid(partitionId: number, newuuid: UUID): void { let metadata = this.getMetadataContainer(partitionId); let currentUuid = metadata.getUuid(); - if (currentUuid.equals(newuuid)) { + if (currentUuid != null && currentUuid.equals(newuuid)) { return; } metadata.setUuid(newuuid); diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index f4100d70a..78fda1920 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -126,6 +126,12 @@ export class BaseProxy { * @returns */ destroy() : Promise { - return this.client.getProxyManager().destroyProxy(this.name, this.serviceName); + return this.client.getProxyManager().destroyProxy(this.name, this.serviceName).then(() => { + return this.postDestroy(); + }); + } + + protected postDestroy(): Promise { + return Promise.resolve(); } } diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index dd8f150c2..06b5c9b89 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -115,6 +115,18 @@ export class NearCachedMapProxy extends MapProxy { }); } + private removeNearCacheInvalidationListener() { + return this.client.getListenerService().deregisterListener(this.invalidationListenerId); + } + + protected postDestroy(): Promise { + return this.removeNearCacheInvalidationListener().then( () => { + this.client.getRepairingTask().deregisterHandler(this.name); + }).then(() => { + return super.postDestroy(); + }); + } + protected putIfAbsentInternal(keyData: Data, valueData: Data, ttl: number): Promise { return super.putIfAbsentInternal(keyData, valueData, ttl).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); } diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js new file mode 100644 index 000000000..407759674 --- /dev/null +++ b/test/nearcache/MigratedDataTest.js @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2008-2017, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var RC = require('../RC'); +var HazelcastClient = require('../../').Client; +var expect = require('chai').expect; +var Config = require('../../').Config; +var fs = require('fs'); +var Long = require('long'); +var Util = require('../Util'); +var Promise = require('bluebird'); +var Address = require('../../.').Address; + +describe('MigratedData', function() { + this.timeout(20000); + + var cluster; + var member1; + var member2; + var client; + + var mapName = 'ncmap'; + + function createConfig() { + var cfg = new Config.ClientConfig(); + var ncConfig = new Config.NearCacheConfig(); + ncConfig.name = mapName; + cfg.nearCacheConfigs[mapName] = ncConfig; + cfg.properties['hazelcast.invalidation.reconciliation.interval.seconds'] = 1; + cfg.properties['hazelcast.invalidation.min.reconciliation.interval.seconds'] = 1; + return cfg; + } + + before(function() { + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function(resp) { + cluster = resp; + return RC.startMember(cluster.id); + }).then(function (m) { + member1 = m; + return RC.startMember(cluster.id); + }).then(function (m) { + member2 = m; + }); + }); + + beforeEach(function () { + return HazelcastClient.newHazelcastClient(createConfig()).then(function (resp) { + client = resp; + }); + }); + + afterEach(function () { + client.shutdown(); + }); + + after(function() { + return RC.shutdownCluster(cluster.id); + }); + + it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', function() { + var map = client.getMap(mapName); + var survivingMember; + var key = 1; + return map.put(key, 1).then(function () { + return map.get(key); + }).then(function () { + return map.get(key); + }).then(function() { + var partitionService = client.getPartitionService(); + var partitionIdForKey = partitionService.getPartitionId(key); + var addressForKey = partitionService.getAddressForPartition(partitionIdForKey); + if (addressForKey.equals(new Address(member1.host, member1.port))) { + survivingMember = member2; + return RC.terminateMember(cluster.id, member1.uuid); + } else { + survivingMember = member1; + return RC.terminateMember(cluster.id, member2.uuid); + } + }).then(function () { + var partitionService = client.getPartitionService(); + var partitionIdForKey= partitionService.getPartitionId(key); + return waitUntilPartitionMovesTo(partitionService, partitionIdForKey, new Address(survivingMember.host, survivingMember.port)); + }).then(function () { + return Util.promiseWaitMilliseconds(1500); + }).then(function () { + return map.get(key); + }).then(function () { + var stats = map.nearCache.getStatistics(); + expect(stats.hitCount).to.equal(1); + expect(stats.missCount).to.equal(2); + expect(stats.entryCount).to.equal(1); + }) + }); + + function waitUntilPartitionMovesTo(partitionService, partitionId, address) { + var deferred = Promise.defer(); + (function resolveOrTimeout(remainingTries) { + if (partitionService.getAddressForPartition(partitionId).equals(address)) { + deferred.resolve(); + } else if (remainingTries > 0) { + setTimeout(resolveOrTimeout, 1000, remainingTries-1); + } else { + deferred.reject('Partition ' + partitionId + ' was not moved to ' + address.toString()); + } + })(20); + return deferred.promise; + } +}); From 67e9019560fadcff086418961ac920d95ed5379f Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 27 Dec 2017 15:14:57 +0300 Subject: [PATCH 036/685] near cache metadatafetcher uses only DATA_MEMBERS --- scripts/download-rc.sh | 2 +- src/core/MemberSelector.ts | 5 +++++ src/core/MemberSelectors.ts | 12 ++++++++++++ src/invocation/ClusterService.ts | 15 +++++++++++++-- src/nearcache/MetadataFetcher.ts | 3 ++- .../InvalidationMetadataDistortionTest.js | 2 +- test/nearcache/MigratedDataTest.js | 2 +- 7 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 src/core/MemberSelector.ts create mode 100644 src/core/MemberSelectors.ts diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index c67a874f0..68641462e 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,5 +1,5 @@ #!/bin/sh -HZ_VERSION="3.10-SNAPSHOT" +HZ_VERSION="3.9.1" HZ_TEST_VERSION="3.10-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} diff --git a/src/core/MemberSelector.ts b/src/core/MemberSelector.ts new file mode 100644 index 000000000..b1a33dac7 --- /dev/null +++ b/src/core/MemberSelector.ts @@ -0,0 +1,5 @@ +import {Member} from './Member'; + +export interface MemberSelector { + select(member: Member): boolean; +} diff --git a/src/core/MemberSelectors.ts b/src/core/MemberSelectors.ts new file mode 100644 index 000000000..ee792c371 --- /dev/null +++ b/src/core/MemberSelectors.ts @@ -0,0 +1,12 @@ +import {MemberSelector} from './MemberSelector'; +import {Member} from './Member'; + +export class DataMemberSelector implements MemberSelector { + select(member: Member): boolean { + return !member.isLiteMember; + } +} + +export class MemberSelectors { + static readonly DATA_MEMBER_SELECTOR = new DataMemberSelector(); +} diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 9b371b752..0fbaddcd3 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -10,6 +10,7 @@ import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; +import {MemberSelector} from '../core/MemberSelector'; const MEMBER_ADDED = 1; const MEMBER_REMOVED = 2; @@ -85,8 +86,18 @@ export class ClusterService extends EventEmitter { * Returns the list of members in the cluster. * @returns */ - getMembers() { - return this.members; + getMembers(selector?: MemberSelector) { + if (selector === undefined) { + return this.members; + } else { + let members: Member[] = []; + this.members.forEach(function (member) { + if (selector.select(member)) { + members.push(member); + } + }); + return members; + } } /** diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index 85cad818e..0aff1970d 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -7,6 +7,7 @@ import * as Promise from 'bluebird'; import ClientMessage = require('../ClientMessage'); import {LoggingService} from '../logging/LoggingService'; import {UUID} from '../core/UUID'; +import {MemberSelectors} from '../core/MemberSelectors'; export class MetadataFetcher { @@ -72,7 +73,7 @@ export class MetadataFetcher { } protected scanMembers(objectNames: string[]): Promise[] { - let members = this.client.getClusterService().getMembers(); + let members = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); let promises: Promise[] = []; members.forEach((member) => { let request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.address); diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index 0a8b7b917..5f3870a44 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -7,7 +7,7 @@ var DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortI var Promise = require('bluebird'); var expect = require('chai').expect; -describe.skip('Invalidation metadata distortion', function () { +describe('Invalidation metadata distortion', function () { var cluster; var member; diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index 407759674..1d2d92941 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -113,7 +113,7 @@ describe('MigratedData', function() { } else if (remainingTries > 0) { setTimeout(resolveOrTimeout, 1000, remainingTries-1); } else { - deferred.reject('Partition ' + partitionId + ' was not moved to ' + address.toString()); + deferred.reject(new Error('Partition ' + partitionId + ' was not moved to ' + address.toString())); } })(20); return deferred.promise; From 6f44b4412f212a1a8ac618fd28095f73b67b4f78 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 28 Dec 2017 14:46:30 +0300 Subject: [PATCH 037/685] fixes portable definition lookup issue --- src/serialization/portable/PortableContext.ts | 2 +- test/serialization/PortableObjects.js | 28 ++++++++- .../PortableSerializersLiveTest.js | 62 +++++++++++++++++++ 3 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 test/serialization/PortableSerializersLiveTest.js diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index 15496e693..08d0e34e2 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -83,7 +83,7 @@ export class PortableContext { lookupOrRegisterClassDefinition(portable: Portable): ClassDefinition { var version = this.getClassVersion(portable); var definition = this.lookupClassDefinition(portable.getFactoryId(), portable.getClassId(), version); - if (definition === null) { + if (definition == null) { definition = this.generateClassDefinitionForPortable(portable); this.registerClassDefinition(definition); } diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index 56b194b5d..3f0f06b25 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -130,11 +130,11 @@ PortableObjectV2.prototype.getVersion = function() { PortableObjectV2.prototype.getFactoryId = function() { return 10; -} +}; PortableObjectV2.prototype.getClassId = function() { return 111; -} +}; PortableObjectV2.prototype.writePortable = function(writer) { writer.writeUTF('a_new_prop', this.a_new_prop); @@ -185,7 +185,31 @@ PortableObjectV2.prototype.readPortable = function(reader) { this.portables = reader.readPortableArray('portables'); }; +function SimplePortable(str) { + this.aString = str; +} + +SimplePortable.prototype.getFactoryId = function () { + return 10; +}; + +SimplePortable.prototype.getClassId = function () { + return 21; +}; + +SimplePortable.prototype.readPortable = function (reader) { + this.aString = reader.readUTF('aString'); +}; + +SimplePortable.prototype.writePortable = function (writer) { + writer.writeUTF('aString', this.aString); +}; + +function SimplePortable2(str) { + this.aString = str; +} exports.PortableObject = PortableObject; exports.PortableObjectV2 = PortableObjectV2; exports.InnerPortableObject = InnerPortableObject; +exports.SimplePortable = SimplePortable; diff --git a/test/serialization/PortableSerializersLiveTest.js b/test/serialization/PortableSerializersLiveTest.js new file mode 100644 index 000000000..65f7e8216 --- /dev/null +++ b/test/serialization/PortableSerializersLiveTest.js @@ -0,0 +1,62 @@ +var Client = require('../../.').Client; +var Config = require('../../.').Config; +var RC = require('../RC'); +var expect = require('chai').expect; +var SimplePortable = require('./PortableObjects').SimplePortable; +var InnerPortable = require('./PortableObjects').InnerPortableObject; +var Promise = require('bluebird'); + +describe('Default serializers with live instance', function() { + var cluster; + var member; + var client; + var map; + + before(function() { + return RC.createCluster(null, null).then(function (res) { + cluster = res; + }).then(function() { + return RC.startMember(cluster.id); + }).then(function (m) { + member = m; + var cfg = new Config.ClientConfig(); + cfg.serializationConfig.portableFactories[10] = { + create: function(classId) { + if (classId === 222) { + return new InnerPortable(); + } else if (classId === 21) { + return new SimplePortable(); + } else { + return null; + } + } + }; + return Client.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; + map = client.getMap('test'); + }); + }); + + after(function() { + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + it('two portables write and read', function () { + var simplePortable = new SimplePortable('atext'); + var innerPortable = new InnerPortable('str1', 'str2'); + return map.put('simpleportable', simplePortable).then(function () { + return map.put('innerportable', innerPortable); + }).then(function() { + return map.get('simpleportable'); + }).then(function (sp) { + return map.get('innerportable').then(function (ip) { + expect(sp).to.deep.equal(simplePortable); + expect(ip).to.deep.equal(innerPortable); + return Promise.resolve(); + }); + }); + }); + +}); From 5d60079318d68a8f1e2ac5a04749f9a306a9b1f4 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 17 Nov 2017 16:09:06 -0500 Subject: [PATCH 038/685] batch invalidation --- src/nearcache/RepairingHandler.ts | 4 +- .../NearCacheSimpleInvalidationTest.js | 82 +++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 test/nearcache/NearCacheSimpleInvalidationTest.js diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index 714aebd8d..9559e958f 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -60,7 +60,9 @@ export class RepairingHandler { } handleBatch(keys: any[], sourceUuids: string[], partitionUuids: UUID[], sequences: Long[]): void { - throw new Error('Not implemented'); + for (var i = 0; i < keys.length; i++) { + this.handle(keys[i], sourceUuids[i], partitionUuids[i], sequences[i]); + } } checkOrRepairSequence(partitionId: number, nextSequence: Long, viaAntiEntropy: boolean = false): void { diff --git a/test/nearcache/NearCacheSimpleInvalidationTest.js b/test/nearcache/NearCacheSimpleInvalidationTest.js new file mode 100644 index 000000000..eb222e9c3 --- /dev/null +++ b/test/nearcache/NearCacheSimpleInvalidationTest.js @@ -0,0 +1,82 @@ +var fs = require('fs'); +var chai = require('chai'); +var chaiAsPromised = require('chai-as-promised'); +chai.use(chaiAsPromised); +var expect = chai.expect; +var Config = require('../../.').Config; +var Controller = require('../RC'); +var HazelcastClient = require('../../.').Client; + +describe('NearCacheSimpleInvalidation', function() { + var cluster; + var client; + var updaterClient; + var mapName = 'nccmap'; + + function createClientConfig() { + var cfg = new Config.ClientConfig(); + var ncConfig = new Config.NearCacheConfig(); + ncConfig.name = mapName; + cfg.nearCacheConfigs[mapName] = ncConfig; + return cfg; + } + + [false, true].forEach(function (batchInvalidationEnabled) { + describe('batch invalidations enabled=' + batchInvalidationEnabled, function () { + before(function() { + if (batchInvalidationEnabled) { + var clusterConfig =null; + } else { + var clusterConfig = fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8'); + } + return Controller.createCluster(null, clusterConfig).then(function(res) { + cluster = res; + return Controller.startMember(cluster.id); + }).then(function () { + return HazelcastClient.newHazelcastClient(createClientConfig()); + }).then(function (cl) { + client = cl; + return HazelcastClient.newHazelcastClient(); + }).then(function (cl) { + updaterClient = cl; + }); + }); + + after(function() { + client.shutdown(); + updaterClient.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + it('client observes outside invalidations', function () { + var entryCount = 1000; + var map = client.getMap(mapName); + var getPromise = Promise.resolve(); + for (var i = 0; i < entryCount; i++) { + getPromise = getPromise.then(map.get.bind(map, '' + i)); + } + return getPromise.then(function () { + var stats = map.nearCache.getStatistics(); + expect(stats.missCount).to.equal(entryCount); + expect(stats.entryCount).to.equal(entryCount); + var putPromise = Promise.resolve(); + for (var i = 0; i < entryCount; i++) { + putPromise = putPromise.then(map.put.bind(map, '' + i, 'changedvalue', undefined)); + } + return putPromise; + }).then(function () { + var getPromise = Promise.resolve(); + for (var i = 0; i < entryCount; i++) { + getPromise = getPromise.then(map.get.bind(map, '' + i)); + } + return getPromise; + }).then(function () { + var stats = map.nearCache.getStatistics(); + expect(stats.entryCount).to.equal(entryCount); + expect(stats.hitCount).to.equal(0); + expect(stats.missCount).to.equal(entryCount * 2); + }); + }); + }); + }); +}); From b45a1611281c73ea9065abd53d1ef6a4338d9bbc Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 28 Dec 2017 15:58:31 +0300 Subject: [PATCH 039/685] increase timeout in invalidation test --- test/nearcache/NearCacheSimpleInvalidationTest.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/nearcache/NearCacheSimpleInvalidationTest.js b/test/nearcache/NearCacheSimpleInvalidationTest.js index eb222e9c3..62f093ffe 100644 --- a/test/nearcache/NearCacheSimpleInvalidationTest.js +++ b/test/nearcache/NearCacheSimpleInvalidationTest.js @@ -49,6 +49,7 @@ describe('NearCacheSimpleInvalidation', function() { }); it('client observes outside invalidations', function () { + this.timeout(4000); var entryCount = 1000; var map = client.getMap(mapName); var getPromise = Promise.resolve(); From 528ff56559acab18df45b76c0fe4a1757c7cab6d Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 29 Dec 2017 10:42:26 +0300 Subject: [PATCH 040/685] proxy manager does not retry when client is shutdown --- src/proxy/ProxyManager.ts | 18 +++++++++++++++--- test/ClientReconnectTest.js | 3 --- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 9c730a9f6..0d57cf58d 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -22,6 +22,7 @@ import Address = require('../Address'); import {Invocation} from '../invocation/InvocationService'; import {Member} from '../core/Member'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; export class ProxyManager { public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; @@ -113,15 +114,26 @@ export class ProxyManager { this.client.getInvocationService().invoke(invocation).then((response) => { promise.resolve(response); }).catch((error) => { - this.logger.warn('ProxyManager', 'Create proxy request for ' + proxyObject.getName() + - ' failed. Retrying in ' + this.invocationRetryPauseMillis + 'ms.'); - setTimeout(this.initializeProxy.bind(this, proxyObject, promise, deadline), this.invocationRetryPauseMillis); + if (this.isRetryable(error)) { + this.logger.warn('ProxyManager', 'Create proxy request for ' + proxyObject.getName() + + ' failed. Retrying in ' + this.invocationRetryPauseMillis + 'ms. ' + error); + setTimeout(this.initializeProxy.bind(this, proxyObject, promise, deadline), this.invocationRetryPauseMillis); + } else { + this.logger.warn('ProxyManager', 'Create proxy request for ' + proxyObject.getName() + ' failed ' + error); + } }); } else { promise.reject('Create proxy request timed-out for ' + proxyObject.getName()); } } + protected isRetryable(error: HazelcastError): boolean { + if (error instanceof ClientNotActiveError) { + return false; + } + return true; + } + destroyProxy(name: string, serviceName: string): Promise { delete this.proxies[name]; let clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index 93bebe64a..b22e8d661 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -20,7 +20,6 @@ describe('Client reconnect', function () { var map; return Controller.createCluster(null, null).then(function(cl) { cluster = cl; - clusterId = cluster.id; return Controller.startMember(cluster.id); }).then(function(m) { member = m; @@ -50,7 +49,6 @@ describe('Client reconnect', function () { var map; Controller.createCluster(null, null).then(function(cl) { cluster = cl; - clusterId = cluster.id; return Controller.startMember(cluster.id); }).then(function(m) { member = m; @@ -86,7 +84,6 @@ describe('Client reconnect', function () { var map; return Controller.createCluster(null, null).then(function(cl) { cluster = cl; - clusterId = cluster.id; return Controller.startMember(cluster.id); }).then(function(m) { member = m; From 7d8088c8c16a54ce992f5d4b5d0c0838920e75d0 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 14 Dec 2017 14:12:13 -0500 Subject: [PATCH 041/685] near cache removed entry stale read test --- test/map/NearCachedMapTest.js | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 6d832bfcb..a69967171 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -1,6 +1,6 @@ var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; -var Predicates = require("../../lib/index.js").Predicates; +var HazelcastClient = require("../../.").Client; +var Predicates = require("../../.").Predicates; var Promise = require("bluebird"); var Controller = require('./../RC'); var Util = require('./../Util'); @@ -280,6 +280,32 @@ describe("NearCachedMap", function() { return expectStats(map1, 0, 1, 0); }); }); + + it.only('client does not read removed entry', function (done) { + var removeReturned = false; + var largeObject = {}; + for (var i = 0; i < 10000; i++) { + largeObject[i] = 'uselessstring'; + } + map1.put('largekey', largeObject).then(function () { + map1.get('largekey').then(function (val) { + try { + if (!removeReturned) { + throw new Error('Get returned earlier than remove! Test scenario is not valid!') + } + expect(val).to.be.null; + done(); + } catch (e) { + done(e); + } + }); + map1.remove('largekey').then(function () { + removeReturned = true; + }); + + }); + + }) }); }); }); From 9c780a37a06b92d0910d4507719dc8693e955990 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 27 Dec 2017 00:38:38 +0300 Subject: [PATCH 042/685] stress test for near cache --- test/map/NearCachedMapStressTest.js | 93 +++++++++++++++++++++++++++++ test/map/NearCachedMapTest.js | 2 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 test/map/NearCachedMapStressTest.js diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js new file mode 100644 index 000000000..327af0260 --- /dev/null +++ b/test/map/NearCachedMapStressTest.js @@ -0,0 +1,93 @@ +var expect = require('chai').expect; +var Promise = require('bluebird'); +var Config = require('../../.').Config; +var HazelcastClient = require('../../.').Client; +var Controller = require('../RC'); +var fs = require('fs'); + +describe('NearCachedMapStress', function () { + + var cluster; + var client1; + var mapName = 'stressncmap'; + + before(function () { + var cfg = new Config.ClientConfig(); + var ncc = new Config.NearCacheConfig(); + ncc.name = 'nc-map'; + ncc.invalidateOnChange = true; + cfg.nearCacheConfigs['ncc-map'] = ncc; + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { + cluster = res; + return Controller.startMember(cluster.id); + }).then(function (member) { + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + client1 = hazelcastClient; + }); + }); + }); + + after(function () { + client1.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + function getRandomInt(lowerLim, upperLim) { + return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; + } + + function fireGet(numFires, lowerKeyLim, upperKeyLim) { + var promises = []; + for (var i = 0; i < numFires; i++) { + promises.push(client1.getMap(mapName).get(''+getRandomInt(lowerKeyLim, upperKeyLim))); + } + return Promise.all(promises); + } + + function fireRemoveAndGet(numFires, lowerKeyLim, upperKeyLim) { + var promises = []; + for (var i = 0; i < numFires; i++) { + (function () { + var key = '' + getRandomInt(lowerKeyLim, upperKeyLim); + var p = client1.getMap(mapName).remove(key).then(function () { + return client1.getMap(mapName).get(key); + }).then(function (value) { + return expect(value).to.be.null; + }); + promises.push(p); + })(); + } + return Promise.all(promises); + } + + var totalNumKeys = 50000; + + function step() { + var interval = 300; + var lowerKey = getRandomInt(0, totalNumKeys - interval); + var gets = fireGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); + var removes = fireRemoveAndGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); + return Promise.all([gets, removes]); + } + + it('get does not read removed item', function (done) { + this.timeout(50000); + var rounds = 1000; + var map = client1.getMap(mapName); + var putPromises = []; + for (var i = 0; i < totalNumKeys; i++) { + putPromises.push(map.put('' + i, 'val')); + } + Promise.all(putPromises).then(function () { + var prevStep = Promise.resolve(); + for (var i = 0; i < rounds; i++) { + prevStep = prevStep.then(step); + } + prevStep.then(function () { + done(); + }).catch(function (reason) { + done(reason); + }); + }); + }); +}); diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index a69967171..69b490308 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -281,7 +281,7 @@ describe("NearCachedMap", function() { }); }); - it.only('client does not read removed entry', function (done) { + it('client does not read removed entry', function (done) { var removeReturned = false; var largeObject = {}; for (var i = 0; i < 10000; i++) { From 8b49d802546d966acd608157e1792497b931d69f Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 27 Dec 2017 13:56:44 +0300 Subject: [PATCH 043/685] Reservation mechanism for updating near cache entries --- .../AlwaysFreshStaleReadDetectorImpl.ts | 2 +- src/nearcache/DataRecord.ts | 112 ++++++++++++++++ src/nearcache/InvalidationAwareWrapper.ts | 51 ------- src/nearcache/KeyStateMarker.ts | 99 -------------- src/nearcache/NearCache.ts | 124 +++++++---------- src/nearcache/StaleReadDetector.ts | 2 +- src/nearcache/StaleReadDetectorImpl.ts | 2 +- src/proxy/NearCachedMapProxy.ts | 76 +++-------- test/Util.js | 6 +- test/map/NearCachedMapRemoveStressTest.js | 93 +++++++++++++ test/map/NearCachedMapStressTest.js | 125 ++++++++++-------- test/map/NearCachedMapTest.js | 26 ---- test/nearcache/NearCacheTest.js | 2 +- 13 files changed, 346 insertions(+), 374 deletions(-) create mode 100644 src/nearcache/DataRecord.ts delete mode 100644 src/nearcache/InvalidationAwareWrapper.ts delete mode 100644 src/nearcache/KeyStateMarker.ts create mode 100644 test/map/NearCachedMapRemoveStressTest.js diff --git a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts index 1209e8acc..41c1cc783 100644 --- a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts +++ b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts @@ -1,6 +1,6 @@ import {StaleReadDetector} from './StaleReadDetector'; import {MetadataContainer} from './MetadataContainer'; -import {DataRecord} from './NearCache'; +import {DataRecord} from './DataRecord'; export class AlwaysFreshStaleReadDetector implements StaleReadDetector { isStaleRead(key: any, record: DataRecord): boolean { diff --git a/src/nearcache/DataRecord.ts b/src/nearcache/DataRecord.ts new file mode 100644 index 000000000..65a4c6998 --- /dev/null +++ b/src/nearcache/DataRecord.ts @@ -0,0 +1,112 @@ +import {Data} from '../serialization/Data'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; + +export class DataRecord { + static readonly NOT_RESERVED = Long.NEG_ONE; + static readonly RESERVED = Long.fromNumber(-2); + static readonly READ_PERMITTED = Long.fromNumber(-3); + + key: Data; + value: Data | any; + private creationTime: number; + private expirationTime: number; + private lastAccessTime: number; + private accessHit: number; + private invalidationSequence: Long; + private uuid: UUID; + private status: Long; + private ttl: number; + + constructor(key: Data, value: Data | any, creationTime?: number, ttl?: number) { + this.key = key; + this.value = value; + this.ttl = ttl; + if (creationTime) { + this.creationTime = creationTime; + } else { + this.creationTime = new Date().getTime(); + } + if (ttl) { + this.expirationTime = this.creationTime + ttl * 1000; + } else { + this.expirationTime = undefined; + } + this.lastAccessTime = this.creationTime; + this.accessHit = 0; + this.invalidationSequence = Long.fromNumber(0); + this.uuid = null; + this.status = DataRecord.READ_PERMITTED; + } + + public static lruComp(x: DataRecord, y: DataRecord) { + return x.lastAccessTime - y.lastAccessTime; + } + + public static lfuComp(x: DataRecord, y: DataRecord) { + return x.accessHit - y.accessHit; + } + + public static randomComp(x: DataRecord, y: DataRecord) { + return Math.random() - 0.5; + } + + isExpired(maxIdleSeconds: number) { + var now = new Date().getTime(); + if ((this.expirationTime > 0 && this.expirationTime < now) || + (maxIdleSeconds > 0 && this.lastAccessTime + maxIdleSeconds * 1000 < now)) { + return true; + } else { + return false; + } + } + + setAccessTime(): void { + this.lastAccessTime = new Date().getTime(); + } + + hitRecord(): void { + this.accessHit++; + } + + getInvalidationSequence(): Long { + return this.invalidationSequence; + } + + setInvalidationSequence(sequence: Long): void { + this.invalidationSequence = sequence; + } + + hasSameUuid(uuid: UUID): boolean { + return uuid.equals(this.uuid); + } + + setUuid(uuid: UUID): void { + this.uuid = uuid; + } + + casStatus(expected: Long, update: Long): boolean { + if (expected.equals(this.status)) { + this.status = update; + return true; + } + return false; + } + + getStatus(): Long { + return this.status; + } + + setCreationTime(creationTime?: number): void { + if (creationTime) { + this.creationTime = creationTime; + } else { + this.creationTime = new Date().getTime(); + } + if (this.ttl) { + this.expirationTime = this.creationTime + this.ttl * 1000; + } else { + this.expirationTime = undefined; + } + } +} diff --git a/src/nearcache/InvalidationAwareWrapper.ts b/src/nearcache/InvalidationAwareWrapper.ts deleted file mode 100644 index 3e7b09114..000000000 --- a/src/nearcache/InvalidationAwareWrapper.ts +++ /dev/null @@ -1,51 +0,0 @@ -import {NearCache, NearCacheStatistics} from './NearCache'; -import {Data} from '../serialization/Data'; -import {KeyStateMarker, KeyStateMarkerImpl} from './KeyStateMarker'; -import {StaleReadDetector} from './StaleReadDetector'; -export class InvalidationAwareWrapper implements NearCache { - private nearCache: NearCache; - private keyStateMarker: KeyStateMarker; - - public static asInvalidationAware(nearCache: NearCache, markerCount: number): InvalidationAwareWrapper { - return new InvalidationAwareWrapper(nearCache, markerCount); - } - - private constructor(nearCache: NearCache, markerCount: number) { - this.nearCache = nearCache; - this.keyStateMarker = new KeyStateMarkerImpl(markerCount); - } - - put(key: Data, value: any): void { - return this.nearCache.put(key, value); - } - - get(key: Data): Data|any { - return this.nearCache.get(key); - } - - invalidate(key: Data): void { - this.keyStateMarker.removeIfMarked(key); - return this.nearCache.invalidate(key); - } - - clear(): void { - this.keyStateMarker.unmarkAllForcibly(); - return this.nearCache.clear(); - } - - getStatistics(): NearCacheStatistics { - return this.nearCache.getStatistics(); - } - - isInvalidatedOnChange(): boolean { - return this.nearCache.isInvalidatedOnChange(); - } - - getKeyStateMarker(): KeyStateMarker { - return this.keyStateMarker; - } - - setStaleReadDetector(detector: StaleReadDetector): void { - this.nearCache.setStaleReadDetector(detector); - } -} diff --git a/src/nearcache/KeyStateMarker.ts b/src/nearcache/KeyStateMarker.ts deleted file mode 100644 index 0b31c42c3..000000000 --- a/src/nearcache/KeyStateMarker.ts +++ /dev/null @@ -1,99 +0,0 @@ -import {Data} from '../serialization/Data'; -export interface KeyStateMarker { - markIfUnmarked(key: Data): boolean; - unmarkIfMarked(key: Data): boolean; - removeIfMarked(key: Data): boolean; - unmarkForcibly(key: Data): void; - unmarkAllForcibly(): void; - -} - -enum KeyState { - UNMARKED = 0, - MARKED = 1, - REMOVED = 2 -} - -export class KeyStateMarkerImpl implements KeyStateMarker { - - private marks: KeyState[]; - - constructor(markerCount: number) { - this.marks = []; - for (let i = markerCount - 1; i >= 0; i--) { - this.marks[i] = KeyState.UNMARKED; - } - } - - markIfUnmarked(key: Data): boolean { - return this.compareAndSet(key, KeyState.UNMARKED, KeyState.MARKED); - } - - unmarkIfMarked(key: Data): boolean { - return this.compareAndSet(key, KeyState.MARKED, KeyState.UNMARKED); - } - - removeIfMarked(key: Data): boolean { - return this.compareAndSet(key, KeyState.MARKED, KeyState.REMOVED); - } - - unmarkForcibly(key: Data): void { - let slot = this.getSlot(key); - this.marks[slot] = KeyState.UNMARKED; - } - - unmarkAllForcibly(): void { - for (let i = 0; i < this.marks.length; i++) { - this.marks[i] = KeyState.UNMARKED; - } - } - - private compareAndSet(key: Data, expect: KeyState, update: KeyState): boolean { - let slot = this.getSlot(key); - if (this.marks[slot] === expect) { - this.marks[slot] = update; - return true; - } else { - return false; - } - } - - private getSlot(data: Data): number { - return this.hashToIndex(data.getPartitionHash(), this.marks.length); - } - - private hashToIndex(hash: number, len: number): number { - return Math.abs(hash) % len; - } - -} - -export class TrueKeyStateMarker implements KeyStateMarker { - - static INSTANCE = new TrueKeyStateMarker(); - - private constructor() { - //Empty method - } - - markIfUnmarked(key: Data): boolean { - return true; - } - - unmarkIfMarked(key: Data): boolean { - return true; - } - - removeIfMarked(key: Data): boolean { - return true; - } - - unmarkForcibly(key: Data): void { - //Empty method - } - - unmarkAllForcibly(): void { - //Empty method - } - -} diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 4586321bb..0e5f1dd46 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -5,84 +5,8 @@ import {SerializationService} from '../serialization/SerializationService'; import {DataKeyedHashMap} from '../DataStoreHashMap'; import {StaleReadDetector} from './StaleReadDetector'; import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; +import {DataRecord} from './DataRecord'; import * as Long from 'long'; -import {UUID} from '../core/UUID'; - -export class DataRecord { - key: Data; - value: Data | any; - private creationTime: number; - private expirationTime: number; - private lastAccessTime: number; - private accessHit: number; - private invalidationSequence: Long; - private uuid: UUID; - - constructor(key: Data, value: Data | any, creationTime?: number, ttl?: number) { - this.key = key; - this.value = value; - if (creationTime) { - this.creationTime = creationTime; - } else { - this.creationTime = new Date().getTime(); - } - if (ttl) { - this.expirationTime = this.creationTime + ttl * 1000; - } else { - this.expirationTime = undefined; - } - this.lastAccessTime = this.creationTime; - this.accessHit = 0; - this.invalidationSequence = Long.fromNumber(0); - this.uuid = null; - } - - public static lruComp(x: DataRecord, y: DataRecord) { - return x.lastAccessTime - y.lastAccessTime; - } - - public static lfuComp(x: DataRecord, y: DataRecord) { - return x.accessHit - y.accessHit; - } - - public static randomComp(x: DataRecord, y: DataRecord) { - return Math.random() - 0.5; - } - - isExpired(maxIdleSeconds: number) { - var now = new Date().getTime(); - if ( (this.expirationTime > 0 && this.expirationTime < now) || - (maxIdleSeconds > 0 && this.lastAccessTime + maxIdleSeconds * 1000 < now)) { - return true; - } else { - return false; - } - } - - setAccessTime(): void { - this.lastAccessTime = new Date().getTime(); - } - - hitRecord(): void { - this.accessHit++; - } - - getInvalidationSequence(): Long { - return this.invalidationSequence; - } - - setInvalidationSequence(sequence: Long): void { - this.invalidationSequence = sequence; - } - - hasSameUuid(uuid: UUID): boolean { - return uuid.equals(this.uuid); - } - - setUuid(uuid: UUID): void { - this.uuid = uuid; - } -} export interface NearCacheStatistics { evictedCount: number; @@ -100,6 +24,8 @@ export interface NearCache { getStatistics(): NearCacheStatistics; isInvalidatedOnChange(): boolean; setStaleReadDetector(detector: StaleReadDetector): void; + tryReserveForUpdate(key: Data): Long; + tryPublishReserved(key: Data, value: any, reservationId: Long): any; } export class NearCacheImpl implements NearCache { @@ -116,6 +42,7 @@ export class NearCacheImpl implements NearCache { private evictionSamplingPoolSize: number; private evictionCandidatePool: Array; private staleReadDetector: StaleReadDetector = AlwaysFreshStaleReadDetectorImpl.INSTANCE; + private reservationCounter: Long = Long.ZERO; internalStore: DataKeyedHashMap; @@ -150,6 +77,49 @@ export class NearCacheImpl implements NearCache { this.internalStore = new DataKeyedHashMap(); } + nextReservationId(): Long { + let res = this.reservationCounter; + this.reservationCounter = this.reservationCounter.add(1); + return res; + } + + tryReserveForUpdate(key: Data): Long { + let internalRecord = this.internalStore.get(key); + let resId = this.nextReservationId(); + if (internalRecord === undefined) { + this.doEvictionIfRequired(); + let dr = new DataRecord(key, undefined, undefined, this.timeToLiveSeconds); + dr.casStatus(DataRecord.READ_PERMITTED, resId); + this.internalStore.set(key, dr); + return resId; + } + if (internalRecord.casStatus(DataRecord.READ_PERMITTED, resId)) { + return resId; + } + return DataRecord.NOT_RESERVED; + } + + tryPublishReserved(key: Data, value: any, reservationId: Long): any { + let internalRecord = this.internalStore.get(key); + if (internalRecord && internalRecord.casStatus(reservationId, DataRecord.READ_PERMITTED)) { + if (this.inMemoryFormat === InMemoryFormat.OBJECT) { + internalRecord.value = this.serializationService.toObject(value); + } else { + internalRecord.value = this.serializationService.toData(value); + } + internalRecord.setCreationTime(); + this.initInvalidationMetadata(internalRecord); + } else if (internalRecord === undefined) { + return undefined; + } else { + if (this.inMemoryFormat === InMemoryFormat.BINARY) { + return this.serializationService.toObject(internalRecord.value); + } else { + return internalRecord.value; + } + } + } + setStaleReadDetector(staleReadDetector: StaleReadDetector): void { this.staleReadDetector = staleReadDetector; } diff --git a/src/nearcache/StaleReadDetector.ts b/src/nearcache/StaleReadDetector.ts index 688214ac6..0e9debf58 100644 --- a/src/nearcache/StaleReadDetector.ts +++ b/src/nearcache/StaleReadDetector.ts @@ -1,4 +1,4 @@ -import {DataRecord} from './NearCache'; +import {DataRecord} from './DataRecord'; import {MetadataContainer} from './MetadataContainer'; export interface StaleReadDetector { diff --git a/src/nearcache/StaleReadDetectorImpl.ts b/src/nearcache/StaleReadDetectorImpl.ts index eeb7fca03..ed654d769 100644 --- a/src/nearcache/StaleReadDetectorImpl.ts +++ b/src/nearcache/StaleReadDetectorImpl.ts @@ -1,5 +1,5 @@ import {StaleReadDetector} from './StaleReadDetector'; -import {DataRecord} from './NearCache'; +import {DataRecord} from './DataRecord'; import {MetadataContainer} from './MetadataContainer'; import {RepairingHandler} from './RepairingHandler'; import {PartitionService} from '../PartitionService'; diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 06b5c9b89..2c882adda 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -6,8 +6,6 @@ import * as Promise from 'bluebird'; import {MapAddNearCacheEntryListenerCodec} from '../codec/MapAddNearCacheEntryListenerCodec'; import {EntryEventType} from '../core/EntryEventType'; import ClientMessage = require('../ClientMessage'); -import {InvalidationAwareWrapper} from '../nearcache/InvalidationAwareWrapper'; -import {KeyStateMarker, TrueKeyStateMarker} from '../nearcache/KeyStateMarker'; import {DataKeyedHashMap} from '../DataStoreHashMap'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; @@ -22,48 +20,17 @@ export class NearCachedMapProxy extends MapProxy { private nearCache: NearCache; private invalidationListenerId: string; - private keyStateMarker: KeyStateMarker; constructor(client: HazelcastClient, servicename: string, name: string) { super(client, servicename, name); this.nearCache = new NearCacheImpl(this.client.getConfig().nearCacheConfigs[name], this.client.getSerializationService()); - this.keyStateMarker = TrueKeyStateMarker.INSTANCE; if (this.nearCache.isInvalidatedOnChange()) { - let partitionCount = client.getPartitionService().getPartitionCount(); - this.nearCache = InvalidationAwareWrapper.asInvalidationAware(this.nearCache, partitionCount); - this.keyStateMarker = this.getKeyStateMarker(); this.addNearCacheInvalidationListener().then((id: string) => { this.invalidationListenerId = id; }); } } - private tryToPutNearCache(key: Data, value: V | Data) { - try { - this.nearCache.put(key, value); - } finally { - this.resetToUnmarkedState(key); - } - } - - private resetToUnmarkedState(key: Data): void { - if (this.keyStateMarker.unmarkIfMarked(key)) { - return; - } - this.nearCache.invalidate(key); - this.keyStateMarker.unmarkForcibly(key); - } - - private unmarkRemainingMarkedKeys(markers: DataKeyedHashMap): void { - let entries: Array<[Data, boolean]> = markers.entries(); - entries.forEach((entry: [Data, any]) => { - let marked = entry[1]; - if (marked) { - this.keyStateMarker.unmarkForcibly(entry[0]); - } - }); - } - private invalidatCacheEntryAndReturn(keyData: Data, retVal: T): T { this.nearCache.invalidate(keyData); return retVal; @@ -74,10 +41,6 @@ export class NearCachedMapProxy extends MapProxy { return retVal; } - getKeyStateMarker(): KeyStateMarker { - return (this.nearCache).getKeyStateMarker(); - } - clear(): Promise { return super.clear().then(this.invalidateCacheAndReturn.bind(this)); } @@ -149,14 +112,11 @@ export class NearCachedMapProxy extends MapProxy { if (cachedValue !== undefined) { return Promise.resolve(cachedValue); } else { - let marked = this.keyStateMarker.markIfUnmarked(keyData); + let reservation = this.nearCache.tryReserveForUpdate(keyData); return super.getInternal(keyData).then((val: V) => { - if (marked) { - this.tryToPutNearCache(keyData, val); - } + this.nearCache.tryPublishReserved(keyData, val, reservation); return val; }).catch((err: any) => { - this.resetToUnmarkedState(keyData); throw err; }); } @@ -171,7 +131,6 @@ export class NearCachedMapProxy extends MapProxy { } protected getAllInternal(partitionsToKeys: {[id: string]: any}, result: any[] = []): Promise { - let markers = new DataKeyedHashMap(); try { for (var partition in partitionsToKeys) { var partitionArray = partitionsToKeys[partition]; @@ -181,31 +140,26 @@ export class NearCachedMapProxy extends MapProxy { if (cachedResult !== undefined) { result.push([this.toObject(partitionArray[i]), cachedResult]); partitionArray = partitionArray.splice(i, 1); - } else if (this.nearCache.isInvalidatedOnChange()) { - markers.set(key, this.keyStateMarker.markIfUnmarked(key)); } } } } catch (err) { - this.unmarkRemainingMarkedKeys(markers); return Promise.resolve([]); } - return super.getAllInternal(partitionsToKeys, result).then((serializedEntryArray: [Data, Data][]) => { - try { - serializedEntryArray.forEach((serializedEntry: [Data, Data]) => { - let key = serializedEntry[0]; - let value = serializedEntry[1]; - let marked = markers.get(key); - markers.delete(key); - if (marked !== undefined && marked) { - this.tryToPutNearCache(key, value); - } else if (!this.nearCache.isInvalidatedOnChange()) { - this.nearCache.put(key, value); - } - }); - } finally { - this.unmarkRemainingMarkedKeys(markers); + let reservations: Long[] = []; + for (var partition in partitionsToKeys) { + var partitionArray = partitionsToKeys[partition]; + for (var i = 0; i < partitionArray.length; i++) { + let key = partitionArray[i]; + reservations.push(this.nearCache.tryReserveForUpdate(key)); } + } + return super.getAllInternal(partitionsToKeys, result).then((serializedEntryArray: [Data, Data][]) => { + serializedEntryArray.forEach((serializedEntry: [Data, Data], index: number) => { + let key = serializedEntry[0]; + let value = serializedEntry[1]; + this.nearCache.tryPublishReserved(key, value, reservations[index]); + }); return result; }); } diff --git a/test/Util.js b/test/Util.js index a6383bc2e..4ff0e239a 100644 --- a/test/Util.js +++ b/test/Util.js @@ -62,7 +62,11 @@ exports.promiseWaitMilliseconds = function (milliseconds) { resolve(); }, milliseconds); }); -} +}; + +exports.getRandomInt = function(lowerLim, upperLim) { + return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; +}; exports.promiseLater = promiseLater; exports.expectAlmostEqual = expectAlmostEqual; diff --git a/test/map/NearCachedMapRemoveStressTest.js b/test/map/NearCachedMapRemoveStressTest.js new file mode 100644 index 000000000..c6e05f2f4 --- /dev/null +++ b/test/map/NearCachedMapRemoveStressTest.js @@ -0,0 +1,93 @@ +var expect = require('chai').expect; +var Promise = require('bluebird'); +var Config = require('../../.').Config; +var HazelcastClient = require('../../.').Client; +var Controller = require('../RC'); +var fs = require('fs'); + +describe('NearCachedMapRemoveStress', function () { + + var cluster; + var client1; + var mapName = 'stressncmap'; + + before(function () { + var cfg = new Config.ClientConfig(); + var ncc = new Config.NearCacheConfig(); + ncc.name = 'nc-map'; + ncc.invalidateOnChange = true; + cfg.nearCacheConfigs['ncc-map'] = ncc; + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { + cluster = res; + return Controller.startMember(cluster.id); + }).then(function (member) { + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + client1 = hazelcastClient; + }); + }); + }); + + after(function () { + client1.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + function getRandomInt(lowerLim, upperLim) { + return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; + } + + function fireGet(numFires, lowerKeyLim, upperKeyLim) { + var promises = []; + for (var i = 0; i < numFires; i++) { + promises.push(client1.getMap(mapName).get(''+getRandomInt(lowerKeyLim, upperKeyLim))); + } + return Promise.all(promises); + } + + function fireRemoveAndGet(numFires, lowerKeyLim, upperKeyLim) { + var promises = []; + for (var i = 0; i < numFires; i++) { + (function () { + var key = '' + getRandomInt(lowerKeyLim, upperKeyLim); + var p = client1.getMap(mapName).remove(key).then(function () { + return client1.getMap(mapName).get(key); + }).then(function (value) { + return expect(value).to.be.null; + }); + promises.push(p); + })(); + } + return Promise.all(promises); + } + + var totalNumKeys = 50000; + + function step() { + var interval = 300; + var lowerKey = getRandomInt(0, totalNumKeys - interval); + var gets = fireGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); + var removes = fireRemoveAndGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); + return Promise.all([gets, removes]); + } + + it('get does not read removed item', function (done) { + this.timeout(50000); + var rounds = 1000; + var map = client1.getMap(mapName); + var putPromises = []; + for (var i = 0; i < totalNumKeys; i++) { + putPromises.push(map.put('' + i, 'val')); + } + Promise.all(putPromises).then(function () { + var prevStep = Promise.resolve(); + for (var i = 0; i < rounds; i++) { + prevStep = prevStep.then(step); + } + prevStep.then(function () { + done(); + }).catch(function (reason) { + done(reason); + }); + }); + }); +}); diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index 327af0260..e35ce8e47 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -4,90 +4,105 @@ var Config = require('../../.').Config; var HazelcastClient = require('../../.').Client; var Controller = require('../RC'); var fs = require('fs'); +var getRandomInt = require('../Util').getRandomInt; describe('NearCachedMapStress', function () { var cluster; var client1; + var validatingClient; + var numberOfEntries = 1000; var mapName = 'stressncmap'; + var runningOperations = 0; + var completedOperations = 0; + var concurrencyLevel = 32; + var totalNumOperations = 100000; + var completedDeferred = Promise.defer(); + var putPercent = 15; + var removePercent = 20; + var getPercent = 100 - putPercent - removePercent; + var totalGetOperations = 0; before(function () { var cfg = new Config.ClientConfig(); var ncc = new Config.NearCacheConfig(); - ncc.name = 'nc-map'; + ncc.name = mapName; ncc.invalidateOnChange = true; - cfg.nearCacheConfigs['ncc-map'] = ncc; + cfg.nearCacheConfigs[mapName] = ncc; return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client1 = hazelcastClient; - }); + return HazelcastClient.newHazelcastClient(cfg); + }).then(function (cl) { + client1 = cl; + return HazelcastClient.newHazelcastClient(); + }).then(function (cl) { + validatingClient = cl; }); }); after(function () { client1.shutdown(); + validatingClient.shutdown(); return Controller.shutdownCluster(cluster.id); }); - function getRandomInt(lowerLim, upperLim) { - return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; - } - - function fireGet(numFires, lowerKeyLim, upperKeyLim) { - var promises = []; - for (var i = 0; i < numFires; i++) { - promises.push(client1.getMap(mapName).get(''+getRandomInt(lowerKeyLim, upperKeyLim))); + function completeOperation() { + runningOperations--; + completedOperations++; + if (completedOperations >= totalNumOperations && runningOperations === 0) { + completedDeferred.resolve(); } - return Promise.all(promises); - } - - function fireRemoveAndGet(numFires, lowerKeyLim, upperKeyLim) { - var promises = []; - for (var i = 0; i < numFires; i++) { - (function () { - var key = '' + getRandomInt(lowerKeyLim, upperKeyLim); - var p = client1.getMap(mapName).remove(key).then(function () { - return client1.getMap(mapName).get(key); - }).then(function (value) { - return expect(value).to.be.null; - }); - promises.push(p); - })(); - } - return Promise.all(promises); - } - - var totalNumKeys = 50000; - - function step() { - var interval = 300; - var lowerKey = getRandomInt(0, totalNumKeys - interval); - var gets = fireGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); - var removes = fireRemoveAndGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); - return Promise.all([gets, removes]); } - it('get does not read removed item', function (done) { - this.timeout(50000); - var rounds = 1000; + it('stress test with put, get and remove', function (done) { + this.timeout(20000); var map = client1.getMap(mapName); - var putPromises = []; - for (var i = 0; i < totalNumKeys; i++) { - putPromises.push(map.put('' + i, 'val')); - } - Promise.all(putPromises).then(function () { - var prevStep = Promise.resolve(); - for (var i = 0; i < rounds; i++) { - prevStep = prevStep.then(step); + (function innerOperation() { + if (completedOperations >= totalNumOperations) { + return; + } + if (runningOperations >= concurrencyLevel) { + setTimeout(innerOperation, 1); + } else { + runningOperations++; + var op = getRandomInt(0, 100); + if (op < putPercent) { + map.put(getRandomInt(0, numberOfEntries), getRandomInt(0, 10000)).then(completeOperation); + } else if(op < removePercent) { + map.remove(getRandomInt(0, numberOfEntries)).then(completeOperation); + } else { + totalGetOperations++; + map.get(getRandomInt(0, numberOfEntries)).then(completeOperation); + } + process.nextTick(innerOperation); } - prevStep.then(function () { + })(); + + completedDeferred.promise.then(function () { + var p = []; + for (var i = 0; i < numberOfEntries; i++) { + (function () { + var key = i; + var promise = validatingClient.getMap(mapName).get(key).then(function (expected) { + return client1.getMap(mapName).get(key).then(function (actual) { + return expect(actual).to.be.equal(expected); + }) + }); + p.push(promise); + })(); + } + Promise.all(p).then(function () { + var stats = client1.getMap(mapName).nearCache.getStatistics(); + expect(stats.hitCount + stats.missCount).to.equal(totalGetOperations + numberOfEntries); + expect(stats.entryCount).to.be.greaterThan(numberOfEntries / 100 * getPercent ); + expect(stats.missCount).to.be.lessThan(totalNumOperations / 2); + expect(stats.hitCount).to.be.greaterThan(totalNumOperations / 2); done(); - }).catch(function (reason) { - done(reason); + }).catch(function (e) { + done(e); }); }); - }); + }) }); diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 69b490308..aaf7712d3 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -280,32 +280,6 @@ describe("NearCachedMap", function() { return expectStats(map1, 0, 1, 0); }); }); - - it('client does not read removed entry', function (done) { - var removeReturned = false; - var largeObject = {}; - for (var i = 0; i < 10000; i++) { - largeObject[i] = 'uselessstring'; - } - map1.put('largekey', largeObject).then(function () { - map1.get('largekey').then(function (val) { - try { - if (!removeReturned) { - throw new Error('Get returned earlier than remove! Test scenario is not valid!') - } - expect(val).to.be.null; - done(); - } catch (e) { - done(e); - } - }); - map1.remove('largekey').then(function () { - removeReturned = true; - }); - - }); - - }) }); }); }); diff --git a/test/nearcache/NearCacheTest.js b/test/nearcache/NearCacheTest.js index 28f497bf9..a83b239b4 100644 --- a/test/nearcache/NearCacheTest.js +++ b/test/nearcache/NearCacheTest.js @@ -5,7 +5,7 @@ var expect = chai.expect; var Config = require('../../.').Config; var Controller = require('../RC'); var HazelcastClient = require('../../.').Client; -var DataRecord = require('../../lib/nearcache/NearCache').DataRecord; +var DataRecord = require('../../lib/nearcache/DataRecord').DataRecord; var NearCacheImpl = require('../../lib/nearcache/NearCache').NearCacheImpl; var EvictionPolicy = Config.EvictionPolicy; var promiseLater = require('../Util').promiseLater; From 7d128da8c716bb47fb0ff8b62de11cf8f7e98fe5 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 29 Dec 2017 11:41:59 +0300 Subject: [PATCH 044/685] removes redundant stress test for nearcache --- test/map/NearCachedMapRemoveStressTest.js | 93 ----------------------- test/map/NearCachedMapStressTest.js | 8 +- 2 files changed, 5 insertions(+), 96 deletions(-) delete mode 100644 test/map/NearCachedMapRemoveStressTest.js diff --git a/test/map/NearCachedMapRemoveStressTest.js b/test/map/NearCachedMapRemoveStressTest.js deleted file mode 100644 index c6e05f2f4..000000000 --- a/test/map/NearCachedMapRemoveStressTest.js +++ /dev/null @@ -1,93 +0,0 @@ -var expect = require('chai').expect; -var Promise = require('bluebird'); -var Config = require('../../.').Config; -var HazelcastClient = require('../../.').Client; -var Controller = require('../RC'); -var fs = require('fs'); - -describe('NearCachedMapRemoveStress', function () { - - var cluster; - var client1; - var mapName = 'stressncmap'; - - before(function () { - var cfg = new Config.ClientConfig(); - var ncc = new Config.NearCacheConfig(); - ncc.name = 'nc-map'; - ncc.invalidateOnChange = true; - cfg.nearCacheConfigs['ncc-map'] = ncc; - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function (member) { - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client1 = hazelcastClient; - }); - }); - }); - - after(function () { - client1.shutdown(); - return Controller.shutdownCluster(cluster.id); - }); - - function getRandomInt(lowerLim, upperLim) { - return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; - } - - function fireGet(numFires, lowerKeyLim, upperKeyLim) { - var promises = []; - for (var i = 0; i < numFires; i++) { - promises.push(client1.getMap(mapName).get(''+getRandomInt(lowerKeyLim, upperKeyLim))); - } - return Promise.all(promises); - } - - function fireRemoveAndGet(numFires, lowerKeyLim, upperKeyLim) { - var promises = []; - for (var i = 0; i < numFires; i++) { - (function () { - var key = '' + getRandomInt(lowerKeyLim, upperKeyLim); - var p = client1.getMap(mapName).remove(key).then(function () { - return client1.getMap(mapName).get(key); - }).then(function (value) { - return expect(value).to.be.null; - }); - promises.push(p); - })(); - } - return Promise.all(promises); - } - - var totalNumKeys = 50000; - - function step() { - var interval = 300; - var lowerKey = getRandomInt(0, totalNumKeys - interval); - var gets = fireGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); - var removes = fireRemoveAndGet(getRandomInt(0, 300), lowerKey, lowerKey + interval); - return Promise.all([gets, removes]); - } - - it('get does not read removed item', function (done) { - this.timeout(50000); - var rounds = 1000; - var map = client1.getMap(mapName); - var putPromises = []; - for (var i = 0; i < totalNumKeys; i++) { - putPromises.push(map.put('' + i, 'val')); - } - Promise.all(putPromises).then(function () { - var prevStep = Promise.resolve(); - for (var i = 0; i < rounds; i++) { - prevStep = prevStep.then(step); - } - prevStep.then(function () { - done(); - }).catch(function (reason) { - done(reason); - }); - }); - }); -}); diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index e35ce8e47..af00d891c 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -70,7 +70,7 @@ describe('NearCachedMapStress', function () { var op = getRandomInt(0, 100); if (op < putPercent) { map.put(getRandomInt(0, numberOfEntries), getRandomInt(0, 10000)).then(completeOperation); - } else if(op < removePercent) { + } else if(op < putPercent + removePercent) { map.remove(getRandomInt(0, numberOfEntries)).then(completeOperation); } else { totalGetOperations++; @@ -82,6 +82,7 @@ describe('NearCachedMapStress', function () { completedDeferred.promise.then(function () { var p = []; + //Value correctness check for (var i = 0; i < numberOfEntries; i++) { (function () { var key = i; @@ -93,12 +94,13 @@ describe('NearCachedMapStress', function () { p.push(promise); })(); } + //Near cache usage check Promise.all(p).then(function () { var stats = client1.getMap(mapName).nearCache.getStatistics(); expect(stats.hitCount + stats.missCount).to.equal(totalGetOperations + numberOfEntries); expect(stats.entryCount).to.be.greaterThan(numberOfEntries / 100 * getPercent ); - expect(stats.missCount).to.be.lessThan(totalNumOperations / 2); - expect(stats.hitCount).to.be.greaterThan(totalNumOperations / 2); + expect(stats.missCount).to.be.greaterThan(100); + expect(stats.hitCount).to.be.greaterThan(100); done(); }).catch(function (e) { done(e); From 2a76fd2a16f7991635a14f33e55251521b7bc4d5 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 29 Dec 2017 17:19:51 +0300 Subject: [PATCH 045/685] near cache sample --- code_samples/near_cache.js | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 code_samples/near_cache.js diff --git a/code_samples/near_cache.js b/code_samples/near_cache.js new file mode 100644 index 000000000..429d55e33 --- /dev/null +++ b/code_samples/near_cache.js @@ -0,0 +1,41 @@ +var Client = require('../.').Client; +var Config = require('../.').Config; + +var nearCachedMapName = 'nearCachedMap'; +var regularMapName = 'reqularMap'; +var client; + +var cfg = new Config.ClientConfig(); +var nearCacheConfig = new Config.NearCacheConfig(); +nearCacheConfig.name = nearCachedMapName; +nearCacheConfig.invalidateOnChange = true; +cfg.nearCacheConfigs[nearCachedMapName] = nearCacheConfig; + +function do50000Gets(client, mapName) { + var timerStart; + var timerEnd; + + return client.getMap(mapName).put('item', 'anItem').then(function () { + //warm up the cache + return client.getMap(mapName).get('item') + }).then(function () { + timerStart = Date.now(); + var requests = []; + for(var i = 0; i < 50000; i++) { + requests.push(client.getMap(mapName).get('item')); + } + return Promise.all(requests); + }).then(function () { + timerEnd = Date.now(); + console.log('Took ' + (timerEnd - timerStart) + ' ms to do 50000 gets on ' + mapName + '.'); + }); +} + +Client.newHazelcastClient(cfg).then(function (cl) { + client = cl; + return do50000Gets(client, nearCachedMapName); +}).then(function () { + return do50000Gets(client, regularMapName); +}).then(function () { + client.shutdown(); +}); From 1759bdb628b64ce9761fd2acdcb50987dc168400 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 2 Jan 2018 11:50:27 +0300 Subject: [PATCH 046/685] changes == to .equals() --- src/invocation/ClusterService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 0fbaddcd3..ac315c659 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -131,7 +131,7 @@ export class ClusterService extends EventEmitter { private onConnectionClosed(connection: ClientConnection) { this.logger.warn('ClusterService', 'Connection closed to ' + connection.address.toString()); - if (connection.address === this.getOwnerConnection().address) { + if (connection.address.equals(this.getOwnerConnection().address)) { this.ownerConnection = null; this.connectToCluster().catch(this.client.shutdown.bind(this.client)); } @@ -139,7 +139,7 @@ export class ClusterService extends EventEmitter { private onHeartbeatStopped(connection: ClientConnection): void { this.logger.warn('ClusterService', connection.address.toString() + ' stopped heartbeating.'); - if (connection.getAddress() === this.ownerConnection.address) { + if (connection.getAddress().equals(this.ownerConnection.address)) { this.client.getConnectionManager().destroyConnection(connection.address); } } From fe9e41c21dc34b786aacdc72cde8cac0d41a516e Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 3 Jan 2018 09:55:19 +0300 Subject: [PATCH 047/685] increases timeout for near cache stress test --- test/map/NearCachedMapStressTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index af00d891c..5d9bf7183 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -57,7 +57,7 @@ describe('NearCachedMapStress', function () { } it('stress test with put, get and remove', function (done) { - this.timeout(20000); + this.timeout(120000); var map = client1.getMap(mapName); (function innerOperation() { if (completedOperations >= totalNumOperations) { From 8efbd26c170ffaa6537d1acdfb9c39749e1bc760 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 4 Jan 2018 10:24:02 +0300 Subject: [PATCH 048/685] update readme --- README.md | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 97f1f0559..49d22db7b 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ [![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-This document explains Node.js client for Hazelcast which uses Hazelcast's Open Client Protocol 1.0. This client works with Hazelcast 3.6 and higher. +This document explains Node.js client for Hazelcast which uses Hazelcast's Open Client Protocol 1.6. This client works with Hazelcast 3.6 and higher. **Hazelcast** is a clustering and highly scalable data distribution platform. With its various distributed data structures, distributed caching capabilities, elastic nature and more importantly with so many happy users, Hazelcast is a feature-rich, enterprise-ready and developer-friendly in-memory data grid solution. @@ -33,20 +33,25 @@ This document explains Node.js client for Hazelcast which uses Hazelcast's Open Hazelcast Node.js client supports the following data structures and features: -* Map (including entry processors and `PartitionAware` keys) and MultiMap -* ReplicatedMap +* Map +* Queue +* Set +* List +* Multi Map +* Replicated Map +* Ringbuffer +* Reliable Topic * Near Cache support for Map -* Queue, Set, and List * Lock +* Semaphore +* Atomic Long +* Event Listeners +* Entry Processors +* Predicates * Smart Client +* Unisocket Client * Hazelcast Native Serialization -* Distributed Object Listener * Lifecycle Service -* Ringbuffer -* Reliable Topic -* Semaphore -* Replicated Map -* Atomic Long * SSL connection support (requires enterprise server) # Installing the Client @@ -59,6 +64,8 @@ npm install hazelcast-client --save # Using the Client +Hazelcast Node.js Client connects to a Hazelcast IMDG cluster. See [https://hazelcast.org/download/](https://hazelcast.org/download/). + Following script illustrates a basic example in which a map is created in Hazelcast Node.js client and an entry is added to that map: ```javascript @@ -177,6 +184,6 @@ Hazelcast is available under the Apache 2 License. Please see the [Licensing app # Copyright -Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved. +Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. Visit [www.hazelcast.com](http://www.hazelcast.com) for more information. From f542bb25d5384f6768e63c2db3181df704312c86 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 4 Jan 2018 10:25:41 +0300 Subject: [PATCH 049/685] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49d22db7b..702e1bd3b 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ If you have nested objects, these nested objects also need to be serializable. R If you have arrays of custom objects, you can serialize/deserialize them like the following: -``` +```javascript writeData(dataOutput) { ... dataOutput.writeInt(this.arrayOfCustomObjects); From 766053036358e2ed163b73fd02d6834e1d205d4b Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 5 Jan 2018 10:22:55 +0300 Subject: [PATCH 050/685] fix DataRecord.equals --- src/nearcache/DataRecord.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nearcache/DataRecord.ts b/src/nearcache/DataRecord.ts index 65a4c6998..101e4dbbc 100644 --- a/src/nearcache/DataRecord.ts +++ b/src/nearcache/DataRecord.ts @@ -78,7 +78,7 @@ export class DataRecord { } hasSameUuid(uuid: UUID): boolean { - return uuid.equals(this.uuid); + return uuid != null && this.uuid != null && this.uuid.equals(uuid); } setUuid(uuid: UUID): void { From 4ccf49c19e5bfe1feca526bf9eabbf66547fb9f2 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 2 Jan 2018 11:12:39 +0300 Subject: [PATCH 051/685] updates copyright --- code_samples/custom_serializer.js | 16 +++++++++++++++ code_samples/distributedobject_listener.js | 16 +++++++++++++++ code_samples/global_serializer.js | 16 +++++++++++++++ code_samples/lifecycle_listener.js | 16 +++++++++++++++ code_samples/list.js | 16 +++++++++++++++ code_samples/logging.js | 16 +++++++++++++++ code_samples/map.js | 16 +++++++++++++++ code_samples/map_entry_listener.js | 16 +++++++++++++++ code_samples/paging_predicate.js | 16 +++++++++++++++ code_samples/queue.js | 20 +++++++++++++++++-- code_samples/set.js | 16 +++++++++++++++ code_samples/ssl_authentication.js | 16 +++++++++++++++ src/Address.ts | 16 +++++++++++++++ src/BitsUtil.ts | 16 +++++++++++++++ src/BuildInfoLoader.ts | 16 +++++++++++++++ src/BuildMetadata.ts | 16 +++++++++++++++ src/ClientInfo.ts | 16 +++++++++++++++ src/ClientMessage.ts | 16 +++++++++++++++ src/ClusterDataFactory.ts | 16 +++++++++++++++ src/Config.ts | 16 +++++++++++++++ src/DataStoreHashMap.ts | 16 +++++++++++++++ src/DistributedObject.ts | 16 +++++++++++++++ src/HazelcastClient.ts | 16 +++++++++++++++ src/HazelcastError.ts | 16 +++++++++++++++ src/HeartbeatService.ts | 16 +++++++++++++++ src/LifecycleService.ts | 16 +++++++++++++++ src/ListenerMessageCodec.ts | 16 +++++++++++++++ src/ListenerService.ts | 16 +++++++++++++++ src/LockReferenceIdGenerator.ts | 16 +++++++++++++++ src/PartitionService.ts | 16 +++++++++++++++ src/Util.ts | 16 +++++++++++++++ src/codec/AddressCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongAddAndGetCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongAlterAndGetCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongAlterCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongApplyCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongCompareAndSetCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongDecrementAndGetCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongGetAndAddCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongGetAndAlterCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongGetAndIncrementCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongGetAndSetCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongGetCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongIncrementAndGetCodec.ts | 16 +++++++++++++++ src/codec/AtomicLongMessageType.ts | 16 +++++++++++++++ src/codec/AtomicLongSetCodec.ts | 16 +++++++++++++++ ...ClientAddDistributedObjectListenerCodec.ts | 16 +++++++++++++++ src/codec/ClientAddMembershipListenerCodec.ts | 16 +++++++++++++++ src/codec/ClientAddPartitionListenerCodec.ts | 16 +++++++++++++++ .../ClientAddPartitionLostListenerCodec.ts | 16 +++++++++++++++ src/codec/ClientAuthenticationCodec.ts | 16 +++++++++++++++ src/codec/ClientAuthenticationCustomCodec.ts | 16 +++++++++++++++ src/codec/ClientCreateProxyCodec.ts | 16 +++++++++++++++ src/codec/ClientDeployClassesCodec.ts | 16 +++++++++++++++ src/codec/ClientDestroyProxyCodec.ts | 16 +++++++++++++++ src/codec/ClientGetDistributedObjectsCodec.ts | 16 +++++++++++++++ src/codec/ClientGetPartitionsCodec.ts | 16 +++++++++++++++ src/codec/ClientMessageType.ts | 16 +++++++++++++++ src/codec/ClientPingCodec.ts | 16 +++++++++++++++ src/codec/ClientRemoveAllListenersCodec.ts | 16 +++++++++++++++ ...entRemoveDistributedObjectListenerCodec.ts | 16 +++++++++++++++ .../ClientRemovePartitionLostListenerCodec.ts | 16 +++++++++++++++ src/codec/DistributedObjectInfoCodec.ts | 16 +++++++++++++++ src/codec/EntryViewCodec.ts | 16 +++++++++++++++ src/codec/ExceptionCodec.ts | 16 +++++++++++++++ src/codec/GetPartitionsCodec.ts | 16 +++++++++++++++ src/codec/ImmutableLazyDataList.ts | 16 +++++++++++++++ src/codec/ListAddAllCodec.ts | 16 +++++++++++++++ src/codec/ListAddAllWithIndexCodec.ts | 16 +++++++++++++++ src/codec/ListAddCodec.ts | 16 +++++++++++++++ src/codec/ListAddListenerCodec.ts | 16 +++++++++++++++ src/codec/ListAddWithIndexCodec.ts | 16 +++++++++++++++ src/codec/ListClearCodec.ts | 16 +++++++++++++++ src/codec/ListCompareAndRemoveAllCodec.ts | 16 +++++++++++++++ src/codec/ListCompareAndRetainAllCodec.ts | 16 +++++++++++++++ src/codec/ListContainsAllCodec.ts | 16 +++++++++++++++ src/codec/ListContainsCodec.ts | 16 +++++++++++++++ src/codec/ListGetAllCodec.ts | 16 +++++++++++++++ src/codec/ListGetCodec.ts | 16 +++++++++++++++ src/codec/ListIndexOfCodec.ts | 16 +++++++++++++++ src/codec/ListIsEmptyCodec.ts | 16 +++++++++++++++ src/codec/ListIteratorCodec.ts | 16 +++++++++++++++ src/codec/ListLastIndexOfCodec.ts | 16 +++++++++++++++ src/codec/ListListIteratorCodec.ts | 16 +++++++++++++++ src/codec/ListMessageType.ts | 16 +++++++++++++++ src/codec/ListRemoveCodec.ts | 16 +++++++++++++++ src/codec/ListRemoveListenerCodec.ts | 16 +++++++++++++++ src/codec/ListRemoveWithIndexCodec.ts | 16 +++++++++++++++ src/codec/ListSetCodec.ts | 16 +++++++++++++++ src/codec/ListSizeCodec.ts | 16 +++++++++++++++ src/codec/ListSubCodec.ts | 16 +++++++++++++++ src/codec/LockForceUnlockCodec.ts | 16 +++++++++++++++ src/codec/LockGetLockCountCodec.ts | 16 +++++++++++++++ src/codec/LockGetRemainingLeaseTimeCodec.ts | 16 +++++++++++++++ src/codec/LockIsLockedByCurrentThreadCodec.ts | 16 +++++++++++++++ src/codec/LockIsLockedCodec.ts | 16 +++++++++++++++ src/codec/LockLockCodec.ts | 16 +++++++++++++++ src/codec/LockMessageType.ts | 16 +++++++++++++++ src/codec/LockTryLockCodec.ts | 16 +++++++++++++++ src/codec/LockUnlockCodec.ts | 16 +++++++++++++++ src/codec/MapAddEntryListenerCodec.ts | 16 +++++++++++++++ src/codec/MapAddEntryListenerToKeyCodec.ts | 16 +++++++++++++++ ...AddEntryListenerToKeyWithPredicateCodec.ts | 16 +++++++++++++++ .../MapAddEntryListenerWithPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapAddIndexCodec.ts | 16 +++++++++++++++ src/codec/MapAddInterceptorCodec.ts | 16 +++++++++++++++ .../MapAddNearCacheEntryListenerCodec.ts | 16 +++++++++++++++ ...apAddNearCacheInvalidationListenerCodec.ts | 16 +++++++++++++++ src/codec/MapAddPartitionLostListenerCodec.ts | 16 +++++++++++++++ src/codec/MapAggregateCodec.ts | 16 +++++++++++++++ src/codec/MapAggregateWithPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapAssignAndGetUuidsCodec.ts | 16 +++++++++++++++ src/codec/MapClearCodec.ts | 16 +++++++++++++++ src/codec/MapClearNearCacheCodec.ts | 16 +++++++++++++++ src/codec/MapContainsKeyCodec.ts | 16 +++++++++++++++ src/codec/MapContainsValueCodec.ts | 16 +++++++++++++++ src/codec/MapDeleteCodec.ts | 16 +++++++++++++++ .../MapEntriesWithPagingPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapEntriesWithPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapEntrySetCodec.ts | 16 +++++++++++++++ src/codec/MapEventJournalReadCodec.ts | 16 +++++++++++++++ src/codec/MapEventJournalSubscribeCodec.ts | 16 +++++++++++++++ src/codec/MapEvictAllCodec.ts | 16 +++++++++++++++ src/codec/MapEvictCodec.ts | 16 +++++++++++++++ src/codec/MapExecuteOnAllKeysCodec.ts | 16 +++++++++++++++ src/codec/MapExecuteOnKeyCodec.ts | 16 +++++++++++++++ src/codec/MapExecuteOnKeysCodec.ts | 16 +++++++++++++++ src/codec/MapExecuteWithPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapFetchEntriesCodec.ts | 16 +++++++++++++++ src/codec/MapFetchKeysCodec.ts | 16 +++++++++++++++ ...FetchNearCacheInvalidationMetadataCodec.ts | 16 +++++++++++++++ src/codec/MapFetchWithQueryCodec.ts | 16 +++++++++++++++ src/codec/MapFlushCodec.ts | 16 +++++++++++++++ src/codec/MapForceUnlockCodec.ts | 16 +++++++++++++++ src/codec/MapGetAllCodec.ts | 16 +++++++++++++++ src/codec/MapGetCodec.ts | 16 +++++++++++++++ src/codec/MapGetEntryViewCodec.ts | 16 +++++++++++++++ src/codec/MapIsEmptyCodec.ts | 16 +++++++++++++++ src/codec/MapIsLockedCodec.ts | 16 +++++++++++++++ src/codec/MapKeySetCodec.ts | 16 +++++++++++++++ .../MapKeySetWithPagingPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapKeySetWithPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapLoadAllCodec.ts | 16 +++++++++++++++ src/codec/MapLoadGivenKeysCodec.ts | 16 +++++++++++++++ src/codec/MapLockCodec.ts | 16 +++++++++++++++ src/codec/MapMessageType.ts | 16 +++++++++++++++ src/codec/MapProjectCodec.ts | 16 +++++++++++++++ src/codec/MapProjectWithPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapPutAllCodec.ts | 16 +++++++++++++++ src/codec/MapPutCodec.ts | 16 +++++++++++++++ src/codec/MapPutIfAbsentCodec.ts | 16 +++++++++++++++ src/codec/MapPutTransientCodec.ts | 16 +++++++++++++++ src/codec/MapRemoveAllCodec.ts | 16 +++++++++++++++ src/codec/MapRemoveCodec.ts | 16 +++++++++++++++ src/codec/MapRemoveEntryListenerCodec.ts | 16 +++++++++++++++ src/codec/MapRemoveIfSameCodec.ts | 16 +++++++++++++++ src/codec/MapRemoveInterceptorCodec.ts | 16 +++++++++++++++ .../MapRemovePartitionLostListenerCodec.ts | 16 +++++++++++++++ src/codec/MapReplaceCodec.ts | 16 +++++++++++++++ src/codec/MapReplaceIfSameCodec.ts | 16 +++++++++++++++ src/codec/MapSetCodec.ts | 16 +++++++++++++++ src/codec/MapSizeCodec.ts | 16 +++++++++++++++ src/codec/MapSubmitToKeyCodec.ts | 16 +++++++++++++++ src/codec/MapTryLockCodec.ts | 16 +++++++++++++++ src/codec/MapTryPutCodec.ts | 16 +++++++++++++++ src/codec/MapTryRemoveCodec.ts | 16 +++++++++++++++ src/codec/MapUnlockCodec.ts | 16 +++++++++++++++ src/codec/MapValuesCodec.ts | 16 +++++++++++++++ .../MapValuesWithPagingPredicateCodec.ts | 16 +++++++++++++++ src/codec/MapValuesWithPredicateCodec.ts | 16 +++++++++++++++ src/codec/MemberCodec.ts | 16 +++++++++++++++ src/codec/MultiMapAddEntryListenerCodec.ts | 16 +++++++++++++++ .../MultiMapAddEntryListenerToKeyCodec.ts | 16 +++++++++++++++ src/codec/MultiMapClearCodec.ts | 16 +++++++++++++++ src/codec/MultiMapContainsEntryCodec.ts | 16 +++++++++++++++ src/codec/MultiMapContainsKeyCodec.ts | 16 +++++++++++++++ src/codec/MultiMapContainsValueCodec.ts | 16 +++++++++++++++ src/codec/MultiMapEntrySetCodec.ts | 16 +++++++++++++++ src/codec/MultiMapForceUnlockCodec.ts | 16 +++++++++++++++ src/codec/MultiMapGetCodec.ts | 16 +++++++++++++++ src/codec/MultiMapIsLockedCodec.ts | 16 +++++++++++++++ src/codec/MultiMapKeySetCodec.ts | 16 +++++++++++++++ src/codec/MultiMapLockCodec.ts | 16 +++++++++++++++ src/codec/MultiMapMessageType.ts | 16 +++++++++++++++ src/codec/MultiMapPutCodec.ts | 16 +++++++++++++++ src/codec/MultiMapRemoveCodec.ts | 16 +++++++++++++++ src/codec/MultiMapRemoveEntryCodec.ts | 16 +++++++++++++++ src/codec/MultiMapRemoveEntryListenerCodec.ts | 16 +++++++++++++++ src/codec/MultiMapSizeCodec.ts | 16 +++++++++++++++ src/codec/MultiMapTryLockCodec.ts | 16 +++++++++++++++ src/codec/MultiMapUnlockCodec.ts | 16 +++++++++++++++ src/codec/MultiMapValueCountCodec.ts | 16 +++++++++++++++ src/codec/MultiMapValuesCodec.ts | 16 +++++++++++++++ src/codec/QueueAddAllCodec.ts | 16 +++++++++++++++ src/codec/QueueAddListenerCodec.ts | 16 +++++++++++++++ src/codec/QueueClearCodec.ts | 16 +++++++++++++++ src/codec/QueueCompareAndRemoveAllCodec.ts | 16 +++++++++++++++ src/codec/QueueCompareAndRetainAllCodec.ts | 16 +++++++++++++++ src/codec/QueueContainsAllCodec.ts | 16 +++++++++++++++ src/codec/QueueContainsCodec.ts | 16 +++++++++++++++ src/codec/QueueDrainToCodec.ts | 16 +++++++++++++++ src/codec/QueueDrainToMaxSizeCodec.ts | 16 +++++++++++++++ src/codec/QueueIsEmptyCodec.ts | 16 +++++++++++++++ src/codec/QueueIteratorCodec.ts | 16 +++++++++++++++ src/codec/QueueMessageType.ts | 16 +++++++++++++++ src/codec/QueueOfferCodec.ts | 16 +++++++++++++++ src/codec/QueuePeekCodec.ts | 16 +++++++++++++++ src/codec/QueuePollCodec.ts | 16 +++++++++++++++ src/codec/QueuePutCodec.ts | 16 +++++++++++++++ src/codec/QueueRemainingCapacityCodec.ts | 16 +++++++++++++++ src/codec/QueueRemoveCodec.ts | 16 +++++++++++++++ src/codec/QueueRemoveListenerCodec.ts | 16 +++++++++++++++ src/codec/QueueSizeCodec.ts | 16 +++++++++++++++ src/codec/QueueTakeCodec.ts | 16 +++++++++++++++ .../ReplicatedMapAddEntryListenerCodec.ts | 16 +++++++++++++++ ...ReplicatedMapAddEntryListenerToKeyCodec.ts | 16 +++++++++++++++ ...AddEntryListenerToKeyWithPredicateCodec.ts | 16 +++++++++++++++ ...edMapAddEntryListenerWithPredicateCodec.ts | 16 +++++++++++++++ ...icatedMapAddNearCacheEntryListenerCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapClearCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapContainsKeyCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapContainsValueCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapEntrySetCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapGetCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapIsEmptyCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapKeySetCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapMessageType.ts | 16 +++++++++++++++ src/codec/ReplicatedMapPutAllCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapPutCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapRemoveCodec.ts | 16 +++++++++++++++ .../ReplicatedMapRemoveEntryListenerCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapSizeCodec.ts | 16 +++++++++++++++ src/codec/ReplicatedMapValuesCodec.ts | 16 +++++++++++++++ src/codec/RingbufferAddAllCodec.ts | 16 +++++++++++++++ src/codec/RingbufferAddCodec.ts | 16 +++++++++++++++ src/codec/RingbufferCapacityCodec.ts | 16 +++++++++++++++ src/codec/RingbufferHeadSequenceCodec.ts | 16 +++++++++++++++ src/codec/RingbufferMessageType.ts | 16 +++++++++++++++ src/codec/RingbufferReadManyCodec.ts | 16 +++++++++++++++ src/codec/RingbufferReadOneCodec.ts | 16 +++++++++++++++ src/codec/RingbufferRemainingCapacityCodec.ts | 16 +++++++++++++++ src/codec/RingbufferSizeCodec.ts | 16 +++++++++++++++ src/codec/RingbufferTailSequenceCodec.ts | 16 +++++++++++++++ src/codec/SemaphoreAcquireCodec.ts | 16 +++++++++++++++ src/codec/SemaphoreAvailablePermitsCodec.ts | 16 +++++++++++++++ src/codec/SemaphoreDrainPermitsCodec.ts | 16 +++++++++++++++ src/codec/SemaphoreInitCodec.ts | 16 +++++++++++++++ src/codec/SemaphoreMessageType.ts | 16 +++++++++++++++ src/codec/SemaphoreReducePermitsCodec.ts | 16 +++++++++++++++ src/codec/SemaphoreReleaseCodec.ts | 16 +++++++++++++++ src/codec/SemaphoreTryAcquireCodec.ts | 16 +++++++++++++++ src/codec/SetAddAllCodec.ts | 16 +++++++++++++++ src/codec/SetAddCodec.ts | 16 +++++++++++++++ src/codec/SetAddListenerCodec.ts | 16 +++++++++++++++ src/codec/SetClearCodec.ts | 16 +++++++++++++++ src/codec/SetCompareAndRemoveAllCodec.ts | 16 +++++++++++++++ src/codec/SetCompareAndRetainAllCodec.ts | 16 +++++++++++++++ src/codec/SetContainsAllCodec.ts | 16 +++++++++++++++ src/codec/SetContainsCodec.ts | 16 +++++++++++++++ src/codec/SetGetAllCodec.ts | 16 +++++++++++++++ src/codec/SetIsEmptyCodec.ts | 16 +++++++++++++++ src/codec/SetMessageType.ts | 16 +++++++++++++++ src/codec/SetRemoveCodec.ts | 16 +++++++++++++++ src/codec/SetRemoveListenerCodec.ts | 16 +++++++++++++++ src/codec/SetSizeCodec.ts | 16 +++++++++++++++ src/codec/TopicAddMessageListenerCodec.ts | 16 +++++++++++++++ src/codec/TopicMessageType.ts | 16 +++++++++++++++ src/codec/TopicPublishCodec.ts | 16 +++++++++++++++ src/codec/TopicRemoveMessageListenerCodec.ts | 16 +++++++++++++++ src/codec/UUIDCodec.ts | 16 +++++++++++++++ src/codec/Utils.ts | 16 +++++++++++++++ src/core/Comparator.ts | 18 ++++++++++++++++- src/core/ConnectionHeartbeatListener.ts | 16 +++++++++++++++ src/core/EntryEventType.ts | 16 +++++++++++++++ src/core/EntryView.ts | 16 +++++++++++++++ src/core/ItemListener.ts | 16 +++++++++++++++ src/core/MapListener.ts | 16 +++++++++++++++ src/core/Member.ts | 16 +++++++++++++++ src/core/MemberSelector.ts | 16 +++++++++++++++ src/core/MemberSelectors.ts | 16 +++++++++++++++ src/core/OverflowPolicy.ts | 16 +++++++++++++++ src/core/PartitionAware.ts | 16 +++++++++++++++ src/core/Predicate.ts | 16 +++++++++++++++ src/core/UUID.ts | 16 +++++++++++++++ src/exception/Exception.ts | 16 +++++++++++++++ src/exception/StackTraceElement.ts | 16 +++++++++++++++ src/index.ts | 16 +++++++++++++++ src/invocation/ClientConnection.ts | 16 +++++++++++++++ src/invocation/ClientConnectionManager.ts | 16 +++++++++++++++ src/invocation/ClientEventRegistration.ts | 16 +++++++++++++++ src/invocation/ClusterService.ts | 16 +++++++++++++++ src/invocation/ConnectionAuthenticator.ts | 16 +++++++++++++++ src/invocation/InvocationService.ts | 16 +++++++++++++++ src/invocation/Murmur.ts | 16 +++++++++++++++ src/invocation/RegistrationKey.ts | 16 +++++++++++++++ src/logging/DefaultLogger.ts | 16 +++++++++++++++ src/logging/LoggingService.ts | 16 +++++++++++++++ src/logging/NoLogger.ts | 16 +++++++++++++++ .../AlwaysFreshStaleReadDetectorImpl.ts | 16 +++++++++++++++ src/nearcache/DataRecord.ts | 16 +++++++++++++++ src/nearcache/MetadataContainer.ts | 16 +++++++++++++++ src/nearcache/MetadataFetcher.ts | 16 +++++++++++++++ src/nearcache/NearCache.ts | 16 +++++++++++++++ src/nearcache/RepairingHandler.ts | 16 +++++++++++++++ src/nearcache/RepairingTask.ts | 16 +++++++++++++++ src/nearcache/StaleReadDetector.ts | 15 ++++++++++++++ src/nearcache/StaleReadDetectorImpl.ts | 16 +++++++++++++++ src/proxy/AtomicLongProxy.ts | 16 +++++++++++++++ src/proxy/BaseProxy.ts | 16 +++++++++++++++ src/proxy/IAtomicLong.ts | 16 +++++++++++++++ src/proxy/IList.ts | 16 +++++++++++++++ src/proxy/ILock.ts | 16 +++++++++++++++ src/proxy/IMap.ts | 16 +++++++++++++++ src/proxy/IQueue.ts | 16 +++++++++++++++ src/proxy/IReplicatedMap.ts | 16 +++++++++++++++ src/proxy/IRingbuffer.ts | 16 +++++++++++++++ src/proxy/ISemaphore.ts | 16 +++++++++++++++ src/proxy/ISet.ts | 16 +++++++++++++++ src/proxy/ListProxy.ts | 16 +++++++++++++++ src/proxy/LockProxy.ts | 16 +++++++++++++++ src/proxy/MapProxy.ts | 16 +++++++++++++++ src/proxy/MultiMap.ts | 18 ++++++++++++++++- src/proxy/MultiMapProxy.ts | 16 +++++++++++++++ src/proxy/NearCachedMapProxy.ts | 16 +++++++++++++++ src/proxy/PartitionSpecificProxy.ts | 16 +++++++++++++++ src/proxy/ProxyManager.ts | 16 +++++++++++++++ src/proxy/QueueProxy.ts | 16 +++++++++++++++ src/proxy/ReplicatedMapProxy.ts | 16 +++++++++++++++ src/proxy/RingbufferProxy.ts | 16 +++++++++++++++ src/proxy/SemaphoreProxy.ts | 16 +++++++++++++++ src/proxy/SetProxy.ts | 16 +++++++++++++++ src/proxy/topic/ITopic.ts | 16 +++++++++++++++ src/proxy/topic/RawTopicMessage.ts | 16 +++++++++++++++ .../topic/ReliableTopicListenerRunner.ts | 16 +++++++++++++++ src/proxy/topic/ReliableTopicProxy.ts | 16 +++++++++++++++ src/proxy/topic/TopicMessage.ts | 16 +++++++++++++++ src/proxy/topic/TopicMessageListener.ts | 16 +++++++++++++++ src/proxy/topic/TopicOverloadPolicy.ts | 16 +++++++++++++++ src/serialization/Data.ts | 16 +++++++++++++++ src/serialization/DefaultPredicates.ts | 16 +++++++++++++++ src/serialization/DefaultSerializer.ts | 16 +++++++++++++++ src/serialization/HeapData.ts | 16 +++++++++++++++ src/serialization/ObjectData.ts | 16 +++++++++++++++ src/serialization/PredicateFactory.ts | 16 +++++++++++++++ src/serialization/Serializable.ts | 16 +++++++++++++++ src/serialization/SerializationService.ts | 16 +++++++++++++++ src/serialization/SerializationUtil.ts | 16 +++++++++++++++ src/serialization/portable/ClassDefinition.ts | 16 +++++++++++++++ .../portable/ClassDefinitionContext.ts | 16 +++++++++++++++ .../portable/ClassDefinitionWriter.ts | 16 +++++++++++++++ .../portable/DefaultPortableReader.ts | 16 +++++++++++++++ .../portable/DefaultPortableWriter.ts | 16 +++++++++++++++ .../portable/MorphingPortableReader.ts | 16 +++++++++++++++ src/serialization/portable/PortableContext.ts | 16 +++++++++++++++ .../portable/PortableSerializer.ts | 16 +++++++++++++++ src/util/ArrayComparator.ts | 16 +++++++++++++++ src/util/UuidUtil.ts | 16 +++++++++++++++ test/BuildMetadataTest.js | 16 +++++++++++++++ test/ClientProxyTest.js | 16 +++++++++++++++ test/ClientReconnectTest.js | 16 +++++++++++++++ test/ClusterServiceTest.js | 16 +++++++++++++++ test/ConnectionManagerTest.js | 16 +++++++++++++++ test/HazelcastClientTest.js | 16 +++++++++++++++ test/HeartbeatTest.js | 16 +++++++++++++++ test/LifecycleServiceTest.js | 16 +++++++++++++++ test/ListenerServiceTest.js | 16 +++++++++++++++ test/ListenersOnReconnectTest.js | 16 +++++++++++++++ test/LoggingTest.js | 16 +++++++++++++++ test/LostConnectionTest.js | 16 +++++++++++++++ test/MembershipListenerTest.js | 16 +++++++++++++++ test/RC.js | 16 +++++++++++++++ test/Util.js | 16 +++++++++++++++ test/atomiclong/AtomicLongTest.js | 16 +++++++++++++++ test/javaclasses/CustomComparator.js | 16 +++++++++++++++ ...stortInvalidationMetadataEntryProcessor.js | 16 +++++++++++++++ test/javaclasses/IdentifiedEntryProcessor.js | 16 +++++++++++++++ test/javaclasses/IdentifiedFactory.js | 16 +++++++++++++++ test/list/ListProxyTest.js | 16 +++++++++++++++ test/lock/LockProxyTest.js | 16 +++++++++++++++ test/map/ComparatorFactory.js | 16 +++++++++++++++ test/map/MapEntryProcessorTest.js | 16 +++++++++++++++ test/map/MapPartitionAwareTest.js | 16 +++++++++++++++ test/map/MapPredicateTest.js | 16 +++++++++++++++ test/map/MapProxyTest.js | 16 +++++++++++++++ test/map/MapStoreTest.js | 16 +++++++++++++++ test/map/NearCachedMapStressTest.js | 16 +++++++++++++++ test/map/NearCachedMapTest.js | 16 +++++++++++++++ test/map/hazelcast_identifiedfactory.xml | 16 +++++++++++++++ test/map/hazelcast_mapstore.xml | 16 +++++++++++++++ ...cast_nearcache_batchinvalidation_false.xml | 2 +- test/multimap/MultiMapProxyListenersTest.js | 16 +++++++++++++++ test/multimap/MultiMapProxyLockTest.js | 16 +++++++++++++++ test/multimap/MultiMapProxyTest.js | 16 +++++++++++++++ .../InvalidationMetadataDistortionTest.js | 16 +++++++++++++++ test/nearcache/LostInvalidationsTest.js | 16 +++++++++++++++ test/nearcache/MigratedDataTest.js | 2 +- .../NearCacheSimpleInvalidationTest.js | 16 +++++++++++++++ test/nearcache/NearCacheTest.js | 16 +++++++++++++++ .../hazelcast_eventual_nearcache.xml | 16 +++++++++++++++ ...cast_nearcache_batchinvalidation_false.xml | 2 +- test/nearcache/impl/RepairingTaskTest.js | 16 +++++++++++++++ test/queue/QueueProxyTest.js | 16 +++++++++++++++ test/queue/hazelcast_queue.xml | 16 +++++++++++++++ test/replicatedmap/ReplicatedMapProxyTest.js | 16 +++++++++++++++ .../replicatedmap/hazelcast_replicatedmap.xml | 16 +++++++++++++++ test/ringbuffer/RingbufferTest.js | 16 +++++++++++++++ test/ringbuffer/hazelcast_ringbuffer.xml | 16 +++++++++++++++ test/semaphore/SemaphoreProxyTest.js | 16 +++++++++++++++ test/serialization/APortable.js | 16 +++++++++++++++ .../AnIdentifiedDataSerializable.js | 16 +++++++++++++++ test/serialization/AnInnerPortable.js | 16 +++++++++++++++ test/serialization/BinaryCompatibilityTest.js | 16 +++++++++++++++ test/serialization/CustomSerializable.js | 16 +++++++++++++++ test/serialization/CustomSerializerTest.js | 16 +++++++++++++++ .../DefaultSerializersLiveTest.js | 16 +++++++++++++++ test/serialization/DefaultSerializersTest.js | 16 +++++++++++++++ test/serialization/GlobalSerializerTest.js | 16 +++++++++++++++ .../IdentifiedDataSerializableTest.js | 16 +++++++++++++++ test/serialization/ObjectDataTest.js | 16 +++++++++++++++ test/serialization/PortableObjects.js | 16 +++++++++++++++ test/serialization/PortableTest.js | 16 +++++++++++++++ test/serialization/ReferenceObjects.js | 16 +++++++++++++++ .../portable/ClassDefinitionTest.js | 18 ++++++++++++++++- test/set/SetProxyTest.js | 16 +++++++++++++++ test/ssl/ClientSSLAuthenticationTest.js | 16 +++++++++++++++ test/ssl/ClientSslTest.js | 16 +++++++++++++++ test/ssl/hazelcast-ma-optional.xml | 2 +- test/ssl/hazelcast-ma-required.xml | 2 +- test/ssl/hazelcast-ssl.xml | 2 +- test/topic/TopicTest.js | 16 +++++++++++++++ test/topic/hazelcast_topic.xml | 16 +++++++++++++++ tsconfig.json | 2 +- 432 files changed, 6811 insertions(+), 12 deletions(-) diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index fb25c372b..ad4a5f104 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; var Config = require('../.').Config; var cfg = new Config.ClientConfig(); diff --git a/code_samples/distributedobject_listener.js b/code_samples/distributedobject_listener.js index e434e5213..597d3af2f 100644 --- a/code_samples/distributedobject_listener.js +++ b/code_samples/distributedobject_listener.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; Client.newHazelcastClient().then(function(hazelcastClient) { hazelcastClient.addDistributedObjectListener(function(serviceName, name, event) { diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index 7f0ddcde1..407d0c5f7 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /** * JSON serialization is not capable if handling circular references. * We will use Mousse serializer to serialize our self referring objects. diff --git a/code_samples/lifecycle_listener.js b/code_samples/lifecycle_listener.js index c9896ef43..bc755c6cb 100644 --- a/code_samples/lifecycle_listener.js +++ b/code_samples/lifecycle_listener.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var HazelcastClient = require('../.').Client; var Config = require('../.').Config; var cfg = new Config.ClientConfig(); diff --git a/code_samples/list.js b/code_samples/list.js index 00d7fec13..83e394b10 100644 --- a/code_samples/list.js +++ b/code_samples/list.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; var addPerson = function(list, val){ diff --git a/code_samples/logging.js b/code_samples/logging.js index 39528e299..92de62f6c 100644 --- a/code_samples/logging.js +++ b/code_samples/logging.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var winston = require('winston'); var Config = require('../.').Config; var HazelcastClient = require('../.').Client; diff --git a/code_samples/map.js b/code_samples/map.js index be90b5465..66387a50e 100644 --- a/code_samples/map.js +++ b/code_samples/map.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; var insertPerson = function (map, key, val, ttl) { return map.put(key, val, ttl).then(function(previousVal) { diff --git a/code_samples/map_entry_listener.js b/code_samples/map_entry_listener.js index 5d6fe545e..3a72e23fc 100644 --- a/code_samples/map_entry_listener.js +++ b/code_samples/map_entry_listener.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; var listener = { added: function(key, oldVal, newVal) { diff --git a/code_samples/paging_predicate.js b/code_samples/paging_predicate.js index 056fe5f7e..111a130d8 100644 --- a/code_samples/paging_predicate.js +++ b/code_samples/paging_predicate.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; var Config = require('../.').Config; var Predicates = require('../.').Predicates; diff --git a/code_samples/queue.js b/code_samples/queue.js index 7b78ba209..e90c5faf6 100644 --- a/code_samples/queue.js +++ b/code_samples/queue.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; var insertPerson = function (queue, val) { @@ -14,8 +30,8 @@ var pollPerson = function(queue){ var peekPerson = function(queue){ return queue.peek().then(function(previousVal){ - console.log('Peeked value: ' + JSON.stringify(previousVal)); - }); + console.log('Peeked value: ' + JSON.stringify(previousVal)); + }); }; var shutdownHz = function(client) { diff --git a/code_samples/set.js b/code_samples/set.js index e658c43c3..0b1327021 100644 --- a/code_samples/set.js +++ b/code_samples/set.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../.').Client; var insertPerson = function(myset, val){ diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js index de218c907..ae2bdec04 100644 --- a/code_samples/ssl_authentication.js +++ b/code_samples/ssl_authentication.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Config = require('../.').Config; var HazelcastClient = require('../.').Client; diff --git a/src/Address.ts b/src/Address.ts index 87e76f209..e8fa47e04 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {IdentifiedDataSerializable} from './serialization/Serializable'; import {DataInput, DataOutput} from './serialization/Data'; import {ADDRESS_CLASS_ID, CLUSTER_DATA_FACTORY_ID} from './ClusterDataFactory'; diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index c802b08da..636c64756 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable:no-bitwise */ import {Data} from './serialization/Data'; import Address = require('./Address'); diff --git a/src/BuildInfoLoader.ts b/src/BuildInfoLoader.ts index feede2e46..2acc560ff 100644 --- a/src/BuildInfoLoader.ts +++ b/src/BuildInfoLoader.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + const BuildInfo = require('./BuildInfo'); export class BuildInfoLoader { diff --git a/src/BuildMetadata.ts b/src/BuildMetadata.ts index a2482d419..e7b12b447 100644 --- a/src/BuildMetadata.ts +++ b/src/BuildMetadata.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export class BuildMetadata { public static readonly UNKNOWN_VERSION_ID = -1; diff --git a/src/ClientInfo.ts b/src/ClientInfo.ts index 149797379..191bfed3d 100644 --- a/src/ClientInfo.ts +++ b/src/ClientInfo.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import Address = require('./Address'); import {UUID} from './core/UUID'; export class ClientInfo { diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index ea88aab1d..09af0d8e8 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable:no-bitwise */ /* Client Message is the carrier framed data as defined below. diff --git a/src/ClusterDataFactory.ts b/src/ClusterDataFactory.ts index 471c87174..0332c410b 100644 --- a/src/ClusterDataFactory.ts +++ b/src/ClusterDataFactory.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {IdentifiedDataSerializableFactory, IdentifiedDataSerializable} from './serialization/Serializable'; import Address = require('./Address'); diff --git a/src/Config.ts b/src/Config.ts index 8773cb7b5..7d02ceb33 100644 --- a/src/Config.ts +++ b/src/Config.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import Address = require('./Address'); import {IdentifiedDataSerializableFactory, PortableFactory} from './serialization/Serializable'; import {TopicOverloadPolicy} from './proxy/topic/TopicOverloadPolicy'; diff --git a/src/DataStoreHashMap.ts b/src/DataStoreHashMap.ts index 6295df241..a2333b3a3 100644 --- a/src/DataStoreHashMap.ts +++ b/src/DataStoreHashMap.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Data} from './serialization/Data'; export class DataKeyedHashMap { diff --git a/src/DistributedObject.ts b/src/DistributedObject.ts index 4eeb4cdf2..a88e8de93 100644 --- a/src/DistributedObject.ts +++ b/src/DistributedObject.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; export interface DistributedObject { /** diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 9ca1ac9dd..783d19ab9 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; import {InvocationService} from './invocation/InvocationService'; import {ListenerService} from './ListenerService'; diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index 778e42603..e0e767a4f 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export class HazelcastError extends Error { cause: Error; diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts index 87621ab92..efd952c24 100644 --- a/src/HeartbeatService.ts +++ b/src/HeartbeatService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {ClientPingCodec} from './codec/ClientPingCodec'; import HazelcastClient from './HazelcastClient'; import {ClientConnection} from './invocation/ClientConnection'; diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index 5956e198a..b5ebd1ffd 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {EventEmitter} from 'events'; import HazelcastClient from './HazelcastClient'; diff --git a/src/ListenerMessageCodec.ts b/src/ListenerMessageCodec.ts index c2ba6796f..2541362f6 100644 --- a/src/ListenerMessageCodec.ts +++ b/src/ListenerMessageCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import ClientMessage = require('./ClientMessage'); export interface ListenerMessageCodec { diff --git a/src/ListenerService.ts b/src/ListenerService.ts index a095c2436..495702135 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; import HazelcastClient from './HazelcastClient'; import {EventEmitter} from 'events'; diff --git a/src/LockReferenceIdGenerator.ts b/src/LockReferenceIdGenerator.ts index a2e4b5189..823d64062 100644 --- a/src/LockReferenceIdGenerator.ts +++ b/src/LockReferenceIdGenerator.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Long from 'long'; export class LockReferenceIdGenerator { diff --git a/src/PartitionService.ts b/src/PartitionService.ts index ca272fffd..e90f0fe58 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import HazelcastClient from './HazelcastClient'; import GetPartitionsCodec = require('./codec/GetPartitionsCodec'); diff --git a/src/Util.ts b/src/Util.ts index 2a8e477ef..1577eb601 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import Long = require('long'); import {PagingPredicate} from './serialization/DefaultPredicates'; import {IterationType} from './core/Predicate'; diff --git a/src/codec/AddressCodec.ts b/src/codec/AddressCodec.ts index 3ae3a1e0b..941e606b7 100644 --- a/src/codec/AddressCodec.ts +++ b/src/codec/AddressCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import Address = require('../Address'); diff --git a/src/codec/AtomicLongAddAndGetCodec.ts b/src/codec/AtomicLongAddAndGetCodec.ts index e1ead4abb..8ecbdb543 100644 --- a/src/codec/AtomicLongAddAndGetCodec.ts +++ b/src/codec/AtomicLongAddAndGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongAlterAndGetCodec.ts b/src/codec/AtomicLongAlterAndGetCodec.ts index ea7e740ad..69320cbcb 100644 --- a/src/codec/AtomicLongAlterAndGetCodec.ts +++ b/src/codec/AtomicLongAlterAndGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongAlterCodec.ts b/src/codec/AtomicLongAlterCodec.ts index b5ecc532c..020327209 100644 --- a/src/codec/AtomicLongAlterCodec.ts +++ b/src/codec/AtomicLongAlterCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongApplyCodec.ts b/src/codec/AtomicLongApplyCodec.ts index da940bfb2..ee687540f 100644 --- a/src/codec/AtomicLongApplyCodec.ts +++ b/src/codec/AtomicLongApplyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongCompareAndSetCodec.ts b/src/codec/AtomicLongCompareAndSetCodec.ts index 33ed413a0..e427272cb 100644 --- a/src/codec/AtomicLongCompareAndSetCodec.ts +++ b/src/codec/AtomicLongCompareAndSetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongDecrementAndGetCodec.ts b/src/codec/AtomicLongDecrementAndGetCodec.ts index c279333f6..25b2edd60 100644 --- a/src/codec/AtomicLongDecrementAndGetCodec.ts +++ b/src/codec/AtomicLongDecrementAndGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongGetAndAddCodec.ts b/src/codec/AtomicLongGetAndAddCodec.ts index 1b3091fa4..45b70b647 100644 --- a/src/codec/AtomicLongGetAndAddCodec.ts +++ b/src/codec/AtomicLongGetAndAddCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongGetAndAlterCodec.ts b/src/codec/AtomicLongGetAndAlterCodec.ts index d44aa2165..324571085 100644 --- a/src/codec/AtomicLongGetAndAlterCodec.ts +++ b/src/codec/AtomicLongGetAndAlterCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongGetAndIncrementCodec.ts b/src/codec/AtomicLongGetAndIncrementCodec.ts index e5c92f133..796ac64df 100644 --- a/src/codec/AtomicLongGetAndIncrementCodec.ts +++ b/src/codec/AtomicLongGetAndIncrementCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongGetAndSetCodec.ts b/src/codec/AtomicLongGetAndSetCodec.ts index 1c3e6d5fa..c804d5409 100644 --- a/src/codec/AtomicLongGetAndSetCodec.ts +++ b/src/codec/AtomicLongGetAndSetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongGetCodec.ts b/src/codec/AtomicLongGetCodec.ts index 3dd5f7d77..b3da3898f 100644 --- a/src/codec/AtomicLongGetCodec.ts +++ b/src/codec/AtomicLongGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongIncrementAndGetCodec.ts b/src/codec/AtomicLongIncrementAndGetCodec.ts index f8d9c63d9..a999f3f95 100644 --- a/src/codec/AtomicLongIncrementAndGetCodec.ts +++ b/src/codec/AtomicLongIncrementAndGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/AtomicLongMessageType.ts b/src/codec/AtomicLongMessageType.ts index 2c9831664..8e586f2be 100644 --- a/src/codec/AtomicLongMessageType.ts +++ b/src/codec/AtomicLongMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class AtomicLongMessageType { static ATOMICLONG_APPLY = 0x0a01; diff --git a/src/codec/AtomicLongSetCodec.ts b/src/codec/AtomicLongSetCodec.ts index 2b5c6c2ab..6b6f82e88 100644 --- a/src/codec/AtomicLongSetCodec.ts +++ b/src/codec/AtomicLongSetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index a879053af..19001ab68 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientAddMembershipListenerCodec.ts b/src/codec/ClientAddMembershipListenerCodec.ts index d572db2b1..2755caf9a 100644 --- a/src/codec/ClientAddMembershipListenerCodec.ts +++ b/src/codec/ClientAddMembershipListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientAddPartitionListenerCodec.ts b/src/codec/ClientAddPartitionListenerCodec.ts index 15a9f09ad..4922c2b3d 100644 --- a/src/codec/ClientAddPartitionListenerCodec.ts +++ b/src/codec/ClientAddPartitionListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 8b12aa2af..5ff9a8c7e 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index 1bc1ae8ce..5dbf16211 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 2f0fd0fa9..10c0d0931 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientCreateProxyCodec.ts b/src/codec/ClientCreateProxyCodec.ts index cd60dc466..4bde0a4f5 100644 --- a/src/codec/ClientCreateProxyCodec.ts +++ b/src/codec/ClientCreateProxyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index e6de85fa3..34aff22d7 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientDestroyProxyCodec.ts b/src/codec/ClientDestroyProxyCodec.ts index 357acab4e..48cda8e90 100644 --- a/src/codec/ClientDestroyProxyCodec.ts +++ b/src/codec/ClientDestroyProxyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index 543f6215f..589f57373 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientGetPartitionsCodec.ts b/src/codec/ClientGetPartitionsCodec.ts index 9d8a84302..de1859da5 100644 --- a/src/codec/ClientGetPartitionsCodec.ts +++ b/src/codec/ClientGetPartitionsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientMessageType.ts b/src/codec/ClientMessageType.ts index c48c69758..c9577db2f 100644 --- a/src/codec/ClientMessageType.ts +++ b/src/codec/ClientMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class ClientMessageType { static CLIENT_AUTHENTICATION = 0x0002; diff --git a/src/codec/ClientPingCodec.ts b/src/codec/ClientPingCodec.ts index a021f1e95..982897752 100644 --- a/src/codec/ClientPingCodec.ts +++ b/src/codec/ClientPingCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientRemoveAllListenersCodec.ts b/src/codec/ClientRemoveAllListenersCodec.ts index 1420f91cd..e5ade15a9 100644 --- a/src/codec/ClientRemoveAllListenersCodec.ts +++ b/src/codec/ClientRemoveAllListenersCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index 69b413a50..54d712866 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index a9259dab1..e084087e4 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/DistributedObjectInfoCodec.ts b/src/codec/DistributedObjectInfoCodec.ts index 99e911135..b2eb4bb04 100644 --- a/src/codec/DistributedObjectInfoCodec.ts +++ b/src/codec/DistributedObjectInfoCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import Address = require('../Address'); diff --git a/src/codec/EntryViewCodec.ts b/src/codec/EntryViewCodec.ts index 38ea4aa95..324fe4a83 100644 --- a/src/codec/EntryViewCodec.ts +++ b/src/codec/EntryViewCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {Data} from '../serialization/Data'; diff --git a/src/codec/ExceptionCodec.ts b/src/codec/ExceptionCodec.ts index 76d9d654d..32722a55b 100644 --- a/src/codec/ExceptionCodec.ts +++ b/src/codec/ExceptionCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import ImmutableLazyDataList = require('./ImmutableLazyDataList'); diff --git a/src/codec/GetPartitionsCodec.ts b/src/codec/GetPartitionsCodec.ts index e46feb4bd..684a1a387 100644 --- a/src/codec/GetPartitionsCodec.ts +++ b/src/codec/GetPartitionsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import Address = require('../Address'); diff --git a/src/codec/ImmutableLazyDataList.ts b/src/codec/ImmutableLazyDataList.ts index 7fd838576..19ecb4f0d 100644 --- a/src/codec/ImmutableLazyDataList.ts +++ b/src/codec/ImmutableLazyDataList.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable:no-bitwise */ import {Data} from '../serialization/Data'; diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 787f2d881..f0e856f0c 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index 9d207eead..464be0d3e 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index 378da69c2..6966f3c16 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index a235691ca..23db30e52 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListAddWithIndexCodec.ts b/src/codec/ListAddWithIndexCodec.ts index 4d313e594..4424c2e98 100644 --- a/src/codec/ListAddWithIndexCodec.ts +++ b/src/codec/ListAddWithIndexCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListClearCodec.ts b/src/codec/ListClearCodec.ts index 0540d2f7c..df8d7be18 100644 --- a/src/codec/ListClearCodec.ts +++ b/src/codec/ListClearCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index 5ba235d35..1d22f20c3 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 822cff2a5..4e43879a6 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index 1dad04e4f..be1427814 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index 83803609b..7526635d7 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index 8d1b9854e..e6ef137a2 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index 7d81ecd37..7f6fea80f 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index 02f1e375a..533134bb0 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index daba41501..486e7f09b 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 4220fba82..424ba4634 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index 3a0ab9847..13a48e08e 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index 13260c5d3..b18e6a3c3 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListMessageType.ts b/src/codec/ListMessageType.ts index c7271a2ef..3e85880a7 100644 --- a/src/codec/ListMessageType.ts +++ b/src/codec/ListMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class ListMessageType { static LIST_SIZE = 0x0501; diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index fb0f1cb2b..3f42674e8 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index 39fd19467..5d7325138 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index 3feb552cb..2dd6d677b 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 183e9f69e..be8509a53 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index e59973f3d..a42e904af 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index 1156479bb..85fb47b2e 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockForceUnlockCodec.ts b/src/codec/LockForceUnlockCodec.ts index 210bbdc71..0c9db38b8 100644 --- a/src/codec/LockForceUnlockCodec.ts +++ b/src/codec/LockForceUnlockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockGetLockCountCodec.ts b/src/codec/LockGetLockCountCodec.ts index 8dc0691f6..b33498d99 100644 --- a/src/codec/LockGetLockCountCodec.ts +++ b/src/codec/LockGetLockCountCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockGetRemainingLeaseTimeCodec.ts b/src/codec/LockGetRemainingLeaseTimeCodec.ts index c8b430c70..95ea58bee 100644 --- a/src/codec/LockGetRemainingLeaseTimeCodec.ts +++ b/src/codec/LockGetRemainingLeaseTimeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockIsLockedByCurrentThreadCodec.ts b/src/codec/LockIsLockedByCurrentThreadCodec.ts index f264ad6ef..cc3cc9e26 100644 --- a/src/codec/LockIsLockedByCurrentThreadCodec.ts +++ b/src/codec/LockIsLockedByCurrentThreadCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockIsLockedCodec.ts b/src/codec/LockIsLockedCodec.ts index 27345e568..184667f39 100644 --- a/src/codec/LockIsLockedCodec.ts +++ b/src/codec/LockIsLockedCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockLockCodec.ts b/src/codec/LockLockCodec.ts index e6defbae6..230b2a501 100644 --- a/src/codec/LockLockCodec.ts +++ b/src/codec/LockLockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockMessageType.ts b/src/codec/LockMessageType.ts index 3e67e52fb..09bfb80a7 100644 --- a/src/codec/LockMessageType.ts +++ b/src/codec/LockMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class LockMessageType { static LOCK_ISLOCKED = 0x0701; diff --git a/src/codec/LockTryLockCodec.ts b/src/codec/LockTryLockCodec.ts index 3647c051f..e1f38f5a1 100644 --- a/src/codec/LockTryLockCodec.ts +++ b/src/codec/LockTryLockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/LockUnlockCodec.ts b/src/codec/LockUnlockCodec.ts index c8f219660..a025b23e9 100644 --- a/src/codec/LockUnlockCodec.ts +++ b/src/codec/LockUnlockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index 93cd65ebd..d227132cc 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index 0d55fda65..5cc45755f 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index bc827bacd..f3ee847b3 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index 9b54bd49a..d0312fbcb 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index 27ef72ca2..1cf73f5c3 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index 6bba3d1f8..66df2990c 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddNearCacheEntryListenerCodec.ts b/src/codec/MapAddNearCacheEntryListenerCodec.ts index dc3217df3..7eb5c603a 100644 --- a/src/codec/MapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/MapAddNearCacheEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index 047dcd423..9c8551f5c 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index f39c5495e..24dfdf7ae 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index 8b85fa994..8a9ce696e 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index 01694e686..e70a38285 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapAssignAndGetUuidsCodec.ts b/src/codec/MapAssignAndGetUuidsCodec.ts index 26ffbfda2..73c00ef64 100644 --- a/src/codec/MapAssignAndGetUuidsCodec.ts +++ b/src/codec/MapAssignAndGetUuidsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapClearCodec.ts b/src/codec/MapClearCodec.ts index 273e92dd7..110b39313 100644 --- a/src/codec/MapClearCodec.ts +++ b/src/codec/MapClearCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapClearNearCacheCodec.ts b/src/codec/MapClearNearCacheCodec.ts index b55d05b10..9c95099f7 100644 --- a/src/codec/MapClearNearCacheCodec.ts +++ b/src/codec/MapClearNearCacheCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 0e1859c4b..10f0c4313 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 08275cfb9..285cce769 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapDeleteCodec.ts b/src/codec/MapDeleteCodec.ts index 1b34acd40..e3d7a92ff 100644 --- a/src/codec/MapDeleteCodec.ts +++ b/src/codec/MapDeleteCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index c8a36da60..36aaaa759 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index 4a1d4e9a7..67aeb0254 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index 2bac4eb14..bf4bdd192 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index 5fa40d4e4..0c100dee3 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index cbfa0bf6c..aeaddae75 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapEvictAllCodec.ts b/src/codec/MapEvictAllCodec.ts index beed596df..aab0a9d14 100644 --- a/src/codec/MapEvictAllCodec.ts +++ b/src/codec/MapEvictAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index 363c3d191..67c813b0a 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index b35825796..85b150d95 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index 73a52c4c8..455ee74d4 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index bd9c15ef3..886fa3fbe 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 913165ba1..701dd9784 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index 477562626..5c0c28707 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index e4772c164..06db399d8 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index d9db23612..dcb95ebc6 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index debf8c891..c4bf784be 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapFlushCodec.ts b/src/codec/MapFlushCodec.ts index cf4888d60..98ca84369 100644 --- a/src/codec/MapFlushCodec.ts +++ b/src/codec/MapFlushCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapForceUnlockCodec.ts b/src/codec/MapForceUnlockCodec.ts index 893210a4b..54029d8de 100644 --- a/src/codec/MapForceUnlockCodec.ts +++ b/src/codec/MapForceUnlockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index 2f3a42699..66047cb52 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index 99f44f967..cfb327807 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index 5904abfb6..ec50014a2 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index e58245ee0..d6c58d597 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index a10e6eb4d..3129dd6bc 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index 53d0f7f48..435c1f700 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index a48811aaa..9ba27eb43 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index 2af2c432a..38809be10 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapLoadAllCodec.ts b/src/codec/MapLoadAllCodec.ts index a5692a5e6..78f773b51 100644 --- a/src/codec/MapLoadAllCodec.ts +++ b/src/codec/MapLoadAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapLoadGivenKeysCodec.ts b/src/codec/MapLoadGivenKeysCodec.ts index 38f4eb8e8..18325c713 100644 --- a/src/codec/MapLoadGivenKeysCodec.ts +++ b/src/codec/MapLoadGivenKeysCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapLockCodec.ts b/src/codec/MapLockCodec.ts index a9dd2fa06..eb4ef1e2d 100644 --- a/src/codec/MapLockCodec.ts +++ b/src/codec/MapLockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapMessageType.ts b/src/codec/MapMessageType.ts index 002694b86..eed04054f 100644 --- a/src/codec/MapMessageType.ts +++ b/src/codec/MapMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class MapMessageType { static MAP_PUT = 0x0101; diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 4b29a9a96..11a73118d 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index 0ab96edca..d74dd1d8a 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapPutAllCodec.ts b/src/codec/MapPutAllCodec.ts index 368e96e64..5d7f5e51d 100644 --- a/src/codec/MapPutAllCodec.ts +++ b/src/codec/MapPutAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index 3c05e420a..bb74d8165 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index e7fc14e6e..3e7f27c43 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapPutTransientCodec.ts b/src/codec/MapPutTransientCodec.ts index f813afb3d..35459fc31 100644 --- a/src/codec/MapPutTransientCodec.ts +++ b/src/codec/MapPutTransientCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapRemoveAllCodec.ts b/src/codec/MapRemoveAllCodec.ts index 922d70a3b..f9c7d9824 100644 --- a/src/codec/MapRemoveAllCodec.ts +++ b/src/codec/MapRemoveAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index cb8d8a954..b369c1897 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index f732c7fb2..47ad45f03 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index 9966bada7..0fb2bd28e 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index 838ed130e..a38de4852 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index 9cd56072c..429dc4e88 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index 35a7a10e4..db01e9d52 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index 9170c1d35..4bb035a54 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapSetCodec.ts b/src/codec/MapSetCodec.ts index 03c39d75e..d05089e2b 100644 --- a/src/codec/MapSetCodec.ts +++ b/src/codec/MapSetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index 876d374b9..26e9f2279 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 5b5ed145c..2d919cc72 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index c5dcc548f..5a40fde9a 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index 135900fc0..5b42cbb2b 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index 25280723b..fddeefeb5 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapUnlockCodec.ts b/src/codec/MapUnlockCodec.ts index cfb920b56..f0c600f6d 100644 --- a/src/codec/MapUnlockCodec.ts +++ b/src/codec/MapUnlockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 87ab9ab9f..b2ee02f08 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index 6228bc276..03c40fd18 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 60dce3867..5b628e2ad 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MemberCodec.ts b/src/codec/MemberCodec.ts index 529941d58..d7c7378b5 100644 --- a/src/codec/MemberCodec.ts +++ b/src/codec/MemberCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {Member} from '../core/Member'; diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index f0cdfb453..dba307730 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index 238b848e1..489343116 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapClearCodec.ts b/src/codec/MultiMapClearCodec.ts index e4246d77a..708a752d1 100644 --- a/src/codec/MultiMapClearCodec.ts +++ b/src/codec/MultiMapClearCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 0936e7c5f..224abe101 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index f6c3338c4..f05b8a06e 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index b77d9e60d..6247c0b25 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index e72c1ee61..99fe57a71 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapForceUnlockCodec.ts b/src/codec/MultiMapForceUnlockCodec.ts index 4597c7b18..fa23e3968 100644 --- a/src/codec/MultiMapForceUnlockCodec.ts +++ b/src/codec/MultiMapForceUnlockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index b3041d669..7080bfb17 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index ee184b3ba..34118a77c 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index f339bb230..92ddca63e 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapLockCodec.ts b/src/codec/MultiMapLockCodec.ts index a92420c3b..8adb39d33 100644 --- a/src/codec/MultiMapLockCodec.ts +++ b/src/codec/MultiMapLockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapMessageType.ts b/src/codec/MultiMapMessageType.ts index 5bdc867e7..b4b9f79c9 100644 --- a/src/codec/MultiMapMessageType.ts +++ b/src/codec/MultiMapMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class MultiMapMessageType { static MULTIMAP_PUT = 0x0201; diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index 5236715ae..36d00a846 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index a8a31d4fa..d2880948f 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index 4b5ccdc9b..51e5e4f6c 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 83e86db7f..29812b94f 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index d8fbe81ab..0ea16cc74 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index 7ea619880..8a3709a7c 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapUnlockCodec.ts b/src/codec/MultiMapUnlockCodec.ts index 8d55924f1..6697ee4a5 100644 --- a/src/codec/MultiMapUnlockCodec.ts +++ b/src/codec/MultiMapUnlockCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index f9919cc16..9efce77ef 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index 92e5341e4..de0eb5849 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index 28b6e343a..12708f3f5 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index 62b35f634..895e4a37b 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueClearCodec.ts b/src/codec/QueueClearCodec.ts index 7cc305898..2bb94bdcc 100644 --- a/src/codec/QueueClearCodec.ts +++ b/src/codec/QueueClearCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index aa20f9f63..b03e6016a 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index 0d1307395..84a4d9039 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index 3de38d5ef..99db17f93 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index 28cb2a757..a812e2fd2 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index 883509204..b2cd93310 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index 88b890986..e8cb56d70 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index 7d5245d02..96eadb91e 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index 41ee0c083..c939f4514 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueMessageType.ts b/src/codec/QueueMessageType.ts index eb02362bc..0568a9586 100644 --- a/src/codec/QueueMessageType.ts +++ b/src/codec/QueueMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class QueueMessageType { static QUEUE_OFFER = 0x0301; diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index 81584a947..1b33c88a6 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index cb991f682..dc2404591 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index 27fae0cc8..2bdde119f 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueuePutCodec.ts b/src/codec/QueuePutCodec.ts index b90f15691..cf6b41d05 100644 --- a/src/codec/QueuePutCodec.ts +++ b/src/codec/QueuePutCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index 9cd3a11c0..3451369d1 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index 83e0de32f..e47033b44 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index 25c9f7cc5..12fb1cc77 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index 5a2874d80..4285a313f 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index 9dc0b9c27..5040ae321 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index f806d7c88..dcc1f1e95 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index 760493d53..86f204a6e 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index aa5f30d9c..74ceda41f 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 0a79830fc..9b72b9bb4 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index a331cce73..aa0793560 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapClearCodec.ts b/src/codec/ReplicatedMapClearCodec.ts index 22a2c5371..c0e6965a8 100644 --- a/src/codec/ReplicatedMapClearCodec.ts +++ b/src/codec/ReplicatedMapClearCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index 9fc981c3b..ab5d488a7 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 6eb9ffafd..13a4b68a1 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index 3def0c4eb..34170a343 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index d220e0ee3..d0f5e4532 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index 4ad225134..10b02b8ce 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index 551c55d95..ebc3b024e 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapMessageType.ts b/src/codec/ReplicatedMapMessageType.ts index b0969eb2f..a0ac7297f 100644 --- a/src/codec/ReplicatedMapMessageType.ts +++ b/src/codec/ReplicatedMapMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class ReplicatedMapMessageType { static REPLICATEDMAP_PUT = 0x0e01; diff --git a/src/codec/ReplicatedMapPutAllCodec.ts b/src/codec/ReplicatedMapPutAllCodec.ts index 156fe745d..d7784668c 100644 --- a/src/codec/ReplicatedMapPutAllCodec.ts +++ b/src/codec/ReplicatedMapPutAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index 0981527a5..041002fcb 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index 1c616e1bf..040a0b302 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index 70d346341..027254f50 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index 8b75d8b42..4513da536 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index 021a2c448..3ebf6ed37 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index 21c4a781d..ac6ba7d81 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 37d1e26e5..0e8186ebd 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index a773d4769..328fa397b 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index b0b8eafe9..e83983eba 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferMessageType.ts b/src/codec/RingbufferMessageType.ts index 6cce05b82..fddb7a7f1 100644 --- a/src/codec/RingbufferMessageType.ts +++ b/src/codec/RingbufferMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class RingbufferMessageType { static RINGBUFFER_SIZE = 0x1901; diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index 56a25a1e0..d49a09323 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index 4d49afaee..477ad98d0 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index 2fc248ed3..0aea415f4 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index e331e1cd8..3e678adc5 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index 8c3047c25..1dbd767c2 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SemaphoreAcquireCodec.ts b/src/codec/SemaphoreAcquireCodec.ts index 34020c29b..ab9a5b1e8 100644 --- a/src/codec/SemaphoreAcquireCodec.ts +++ b/src/codec/SemaphoreAcquireCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SemaphoreAvailablePermitsCodec.ts b/src/codec/SemaphoreAvailablePermitsCodec.ts index e3361edc6..e2a6f9818 100644 --- a/src/codec/SemaphoreAvailablePermitsCodec.ts +++ b/src/codec/SemaphoreAvailablePermitsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SemaphoreDrainPermitsCodec.ts b/src/codec/SemaphoreDrainPermitsCodec.ts index 656068302..d3504d139 100644 --- a/src/codec/SemaphoreDrainPermitsCodec.ts +++ b/src/codec/SemaphoreDrainPermitsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SemaphoreInitCodec.ts b/src/codec/SemaphoreInitCodec.ts index e899cbc80..c1128ad6a 100644 --- a/src/codec/SemaphoreInitCodec.ts +++ b/src/codec/SemaphoreInitCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SemaphoreMessageType.ts b/src/codec/SemaphoreMessageType.ts index 83a4414bf..6d3f1b58e 100644 --- a/src/codec/SemaphoreMessageType.ts +++ b/src/codec/SemaphoreMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class SemaphoreMessageType { static SEMAPHORE_INIT = 0x0d01; diff --git a/src/codec/SemaphoreReducePermitsCodec.ts b/src/codec/SemaphoreReducePermitsCodec.ts index 7069b8980..9fda89c29 100644 --- a/src/codec/SemaphoreReducePermitsCodec.ts +++ b/src/codec/SemaphoreReducePermitsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SemaphoreReleaseCodec.ts b/src/codec/SemaphoreReleaseCodec.ts index d6e8a8557..cf6755b2c 100644 --- a/src/codec/SemaphoreReleaseCodec.ts +++ b/src/codec/SemaphoreReleaseCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SemaphoreTryAcquireCodec.ts b/src/codec/SemaphoreTryAcquireCodec.ts index 234d2fd76..50ab74c76 100644 --- a/src/codec/SemaphoreTryAcquireCodec.ts +++ b/src/codec/SemaphoreTryAcquireCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index 6f5c1cb5e..f464b1c60 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index 4e3f2ef0f..30473c700 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index 6640f4bed..29af30d9b 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetClearCodec.ts b/src/codec/SetClearCodec.ts index c6bb29365..3abb26ed9 100644 --- a/src/codec/SetClearCodec.ts +++ b/src/codec/SetClearCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index f36804ef0..4eb56fea1 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index 2d738eaf3..cc82da523 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index 84753e9be..f6f91ce32 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index 05b1edc13..6a6414c52 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index 844ba2f3b..2b1d65c03 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index cacdd5f6e..2e6a2b0fd 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetMessageType.ts b/src/codec/SetMessageType.ts index 3fe98db60..fce3298c2 100644 --- a/src/codec/SetMessageType.ts +++ b/src/codec/SetMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class SetMessageType { static SET_SIZE = 0x0601; diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index 145401e2e..0d4cbc8e1 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index 6d4d6998d..427295be4 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index ac7979596..2a1711739 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index 757e59671..f6dab79dc 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/TopicMessageType.ts b/src/codec/TopicMessageType.ts index f477bd95a..f7d2182fe 100644 --- a/src/codec/TopicMessageType.ts +++ b/src/codec/TopicMessageType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ export class TopicMessageType { static TOPIC_PUBLISH = 0x0401; diff --git a/src/codec/TopicPublishCodec.ts b/src/codec/TopicPublishCodec.ts index 954783420..ba98f8720 100644 --- a/src/codec/TopicPublishCodec.ts +++ b/src/codec/TopicPublishCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index 45d59264e..97afbc789 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; diff --git a/src/codec/UUIDCodec.ts b/src/codec/UUIDCodec.ts index 76d232ab1..8b9e756bf 100644 --- a/src/codec/UUIDCodec.ts +++ b/src/codec/UUIDCodec.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import ClientMessage = require('../ClientMessage'); import {UUID} from '../core/UUID'; diff --git a/src/codec/Utils.ts b/src/codec/Utils.ts index 7ba3c41af..82c4190b9 100644 --- a/src/codec/Utils.ts +++ b/src/codec/Utils.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export class Utils { public static getStringSize(value: string, nullable: boolean = false): number { // int32 for string length diff --git a/src/core/Comparator.ts b/src/core/Comparator.ts index 730c1e8f6..8ad6038b4 100644 --- a/src/core/Comparator.ts +++ b/src/core/Comparator.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /** * Comparator is used to compare two map entries in a distributed map. * A comparator class with the same functionality should be registered @@ -15,7 +31,7 @@ export interface Comparator { * @param a first entry * @param b second entry * @return order index - * + * */ sort(a: [any, any], b: [any, any]): number; } diff --git a/src/core/ConnectionHeartbeatListener.ts b/src/core/ConnectionHeartbeatListener.ts index c4d230caf..d0730eb16 100644 --- a/src/core/ConnectionHeartbeatListener.ts +++ b/src/core/ConnectionHeartbeatListener.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {ClientConnection} from '../invocation/ClientConnection'; /** diff --git a/src/core/EntryEventType.ts b/src/core/EntryEventType.ts index 8b834ae2d..4f77751ad 100644 --- a/src/core/EntryEventType.ts +++ b/src/core/EntryEventType.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable:no-bitwise */ export enum EntryEventType { ADDED = 1 << 0, diff --git a/src/core/EntryView.ts b/src/core/EntryView.ts index aa13b896f..a1a08a167 100644 --- a/src/core/EntryView.ts +++ b/src/core/EntryView.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Long from 'long'; export class EntryView { key: K; diff --git a/src/core/ItemListener.ts b/src/core/ItemListener.ts index e5b26f06c..4fbaf4db9 100644 --- a/src/core/ItemListener.ts +++ b/src/core/ItemListener.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Member} from './Member'; export interface ItemListener { itemAdded?: ItemEventListener; diff --git a/src/core/MapListener.ts b/src/core/MapListener.ts index 28ec8739d..f430a07e4 100644 --- a/src/core/MapListener.ts +++ b/src/core/MapListener.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export interface IMapListener { added?: EntryEventListener; removed?: EntryEventListener; diff --git a/src/core/Member.ts b/src/core/Member.ts index 5801c7fab..af815ddff 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import Address = require('../Address'); import {UUID} from './UUID'; export class Member { diff --git a/src/core/MemberSelector.ts b/src/core/MemberSelector.ts index b1a33dac7..a327cad73 100644 --- a/src/core/MemberSelector.ts +++ b/src/core/MemberSelector.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Member} from './Member'; export interface MemberSelector { diff --git a/src/core/MemberSelectors.ts b/src/core/MemberSelectors.ts index ee792c371..c5353a500 100644 --- a/src/core/MemberSelectors.ts +++ b/src/core/MemberSelectors.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {MemberSelector} from './MemberSelector'; import {Member} from './Member'; diff --git a/src/core/OverflowPolicy.ts b/src/core/OverflowPolicy.ts index c779d4f65..d809b514b 100644 --- a/src/core/OverflowPolicy.ts +++ b/src/core/OverflowPolicy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export enum OverflowPolicy { OVERWRITE = 0, FAIL = 1 diff --git a/src/core/PartitionAware.ts b/src/core/PartitionAware.ts index a4428418b..8a5fd3c84 100644 --- a/src/core/PartitionAware.ts +++ b/src/core/PartitionAware.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /** * Implementing PartitionAware allows one to override the default partitioning scheme. * Instead of using the keys themselves to spread the data around the cluster the diff --git a/src/core/Predicate.ts b/src/core/Predicate.ts index e9d55054a..91ddcd152 100644 --- a/src/core/Predicate.ts +++ b/src/core/Predicate.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {IdentifiedDataSerializable} from '../serialization/Serializable'; import { SqlPredicate, AndPredicate, FalsePredicate, BetweenPredicate, EqualPredicate, diff --git a/src/core/UUID.ts b/src/core/UUID.ts index 89e08c41a..709af3856 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Long from 'long'; export class UUID { readonly leastSignificant: Long; diff --git a/src/exception/Exception.ts b/src/exception/Exception.ts index 835e7c68a..b484bf95c 100644 --- a/src/exception/Exception.ts +++ b/src/exception/Exception.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import StackTraceElement = require('./StackTraceElement'); class RemoteException { diff --git a/src/exception/StackTraceElement.ts b/src/exception/StackTraceElement.ts index a0e94c251..b296215da 100644 --- a/src/exception/StackTraceElement.ts +++ b/src/exception/StackTraceElement.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + class StackTraceElement { declaringClass: string = null; methodName: string = null; diff --git a/src/index.ts b/src/index.ts index a645b3dbc..110e9a2fe 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import HazelcastClient from './HazelcastClient'; import * as Config from './Config'; import {ClientInfo} from './ClientInfo'; diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 317d30186..f32c401fe 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import net = require('net'); import tls = require('tls'); import stream = require('stream'); diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 706efcf4a..42ca2c82d 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {LoggingService} from '../logging/LoggingService'; import {EventEmitter} from 'events'; diff --git a/src/invocation/ClientEventRegistration.ts b/src/invocation/ClientEventRegistration.ts index 206db4066..0355cb39c 100644 --- a/src/invocation/ClientEventRegistration.ts +++ b/src/invocation/ClientEventRegistration.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Long from 'long'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {ClientConnection} from './ClientConnection'; diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 0fbaddcd3..aa00b6e72 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {ClientConnection} from './ClientConnection'; import * as Promise from 'bluebird'; import {ClientAddMembershipListenerCodec} from '../codec/ClientAddMembershipListenerCodec'; diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index fc4f56019..90a1fca46 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {ClientAuthenticationCodec} from '../codec/ClientAuthenticationCodec'; import HazelcastClient from '../HazelcastClient'; diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index b90acc893..faae2ea4e 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import ClientMessage = require('../ClientMessage'); import * as Long from 'long'; import Address = require('../Address'); diff --git a/src/invocation/Murmur.ts b/src/invocation/Murmur.ts index 9c99e9c4c..f03cf84b5 100644 --- a/src/invocation/Murmur.ts +++ b/src/invocation/Murmur.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable */ var seed = 0x01000193; diff --git a/src/invocation/RegistrationKey.ts b/src/invocation/RegistrationKey.ts index de08d520f..367587a95 100644 --- a/src/invocation/RegistrationKey.ts +++ b/src/invocation/RegistrationKey.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import ClientMessage = require('../ClientMessage'); import {ListenerMessageCodec} from '../ListenerMessageCodec'; diff --git a/src/logging/DefaultLogger.ts b/src/logging/DefaultLogger.ts index a538ac130..ea18b9f62 100644 --- a/src/logging/DefaultLogger.ts +++ b/src/logging/DefaultLogger.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {LogLevel, ILogger} from './LoggingService'; export class DefaultLogger implements ILogger { level = LogLevel.INFO; diff --git a/src/logging/LoggingService.ts b/src/logging/LoggingService.ts index b9fceb92f..f973d7024 100644 --- a/src/logging/LoggingService.ts +++ b/src/logging/LoggingService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {NoLogger} from './NoLogger'; import {DefaultLogger} from './DefaultLogger'; import {IllegalStateError} from '../HazelcastError'; diff --git a/src/logging/NoLogger.ts b/src/logging/NoLogger.ts index 416698a0a..ac1343969 100644 --- a/src/logging/NoLogger.ts +++ b/src/logging/NoLogger.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {LogLevel, ILogger} from './LoggingService'; export class NoLogger implements ILogger { log(level: LogLevel, className: string, message: string, furtherInfo: any) { diff --git a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts index 41c1cc783..5147df703 100644 --- a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts +++ b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {StaleReadDetector} from './StaleReadDetector'; import {MetadataContainer} from './MetadataContainer'; import {DataRecord} from './DataRecord'; diff --git a/src/nearcache/DataRecord.ts b/src/nearcache/DataRecord.ts index 101e4dbbc..c5f201c55 100644 --- a/src/nearcache/DataRecord.ts +++ b/src/nearcache/DataRecord.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Data} from '../serialization/Data'; import * as Long from 'long'; import {UUID} from '../core/UUID'; diff --git a/src/nearcache/MetadataContainer.ts b/src/nearcache/MetadataContainer.ts index 77a82ac17..22fb6c32b 100644 --- a/src/nearcache/MetadataContainer.ts +++ b/src/nearcache/MetadataContainer.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Long from 'long'; import {UUID} from '../core/UUID'; diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index 0aff1970d..9776b4198 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {RepairingHandler} from './RepairingHandler'; import HazelcastClient from '../HazelcastClient'; import {PartitionService} from '../PartitionService'; diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 0e5f1dd46..e3c1eccc3 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Data} from '../serialization/Data'; import {EvictionPolicy, InMemoryFormat, NearCacheConfig} from '../Config'; import {shuffleArray} from '../Util'; diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index 9559e958f..032cd5d8e 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {NearCache} from './NearCache'; import {MetadataContainer} from './MetadataContainer'; import {PartitionService} from '../PartitionService'; diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index 76840029d..f9a90c621 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {RepairingHandler} from './RepairingHandler'; import {NearCache} from './NearCache'; import HazelcastClient from '../HazelcastClient'; diff --git a/src/nearcache/StaleReadDetector.ts b/src/nearcache/StaleReadDetector.ts index 0e9debf58..2d40b023a 100644 --- a/src/nearcache/StaleReadDetector.ts +++ b/src/nearcache/StaleReadDetector.ts @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ import {DataRecord} from './DataRecord'; import {MetadataContainer} from './MetadataContainer'; diff --git a/src/nearcache/StaleReadDetectorImpl.ts b/src/nearcache/StaleReadDetectorImpl.ts index ed654d769..7e0cb06b7 100644 --- a/src/nearcache/StaleReadDetectorImpl.ts +++ b/src/nearcache/StaleReadDetectorImpl.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {StaleReadDetector} from './StaleReadDetector'; import {DataRecord} from './DataRecord'; import {MetadataContainer} from './MetadataContainer'; diff --git a/src/proxy/AtomicLongProxy.ts b/src/proxy/AtomicLongProxy.ts index 41cc4ff05..984a3eb4e 100644 --- a/src/proxy/AtomicLongProxy.ts +++ b/src/proxy/AtomicLongProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import * as Long from 'long'; import {IAtomicLong} from './IAtomicLong'; diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 78fda1920..fa3d1e50a 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Data} from '../serialization/Data'; import ClientMessage = require('../ClientMessage'); import * as Promise from 'bluebird'; diff --git a/src/proxy/IAtomicLong.ts b/src/proxy/IAtomicLong.ts index 32bd9bd81..3634594da 100644 --- a/src/proxy/IAtomicLong.ts +++ b/src/proxy/IAtomicLong.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {DistributedObject} from '../DistributedObject'; import * as Promise from 'bluebird'; import * as Long from 'long'; diff --git a/src/proxy/IList.ts b/src/proxy/IList.ts index 589e4864e..0aae80539 100644 --- a/src/proxy/IList.ts +++ b/src/proxy/IList.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {ItemListener} from '../core/ItemListener'; diff --git a/src/proxy/ILock.ts b/src/proxy/ILock.ts index 9cd8adddb..bf7f22ac1 100644 --- a/src/proxy/ILock.ts +++ b/src/proxy/ILock.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index 62e70a278..c9c115306 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {EntryView} from '../core/EntryView'; diff --git a/src/proxy/IQueue.ts b/src/proxy/IQueue.ts index 014d4bd9a..ca222410f 100644 --- a/src/proxy/IQueue.ts +++ b/src/proxy/IQueue.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {ItemListener} from '../core/ItemListener'; diff --git a/src/proxy/IReplicatedMap.ts b/src/proxy/IReplicatedMap.ts index 79e80ca63..6064a2378 100644 --- a/src/proxy/IReplicatedMap.ts +++ b/src/proxy/IReplicatedMap.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {Predicate} from '../core/Predicate'; diff --git a/src/proxy/IRingbuffer.ts b/src/proxy/IRingbuffer.ts index b56498b25..f4592d937 100644 --- a/src/proxy/IRingbuffer.ts +++ b/src/proxy/IRingbuffer.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Long from 'long'; import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; diff --git a/src/proxy/ISemaphore.ts b/src/proxy/ISemaphore.ts index 526a37c8e..a003f5a14 100644 --- a/src/proxy/ISemaphore.ts +++ b/src/proxy/ISemaphore.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import Long = require('long'); import {DistributedObject} from '../DistributedObject'; diff --git a/src/proxy/ISet.ts b/src/proxy/ISet.ts index 38ea327f9..7ca456907 100644 --- a/src/proxy/ISet.ts +++ b/src/proxy/ISet.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {ItemListener} from '../core/ItemListener'; diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index 77cff1061..f6e28fe43 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {IList} from './IList'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {ListAddCodec} from '../codec/ListAddCodec'; diff --git a/src/proxy/LockProxy.ts b/src/proxy/LockProxy.ts index f98fdec66..1c3692c98 100644 --- a/src/proxy/LockProxy.ts +++ b/src/proxy/LockProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {ILock} from './ILock'; diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 414b83750..9f5aa4703 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {BaseProxy} from './BaseProxy'; import {IMap} from './IMap'; import * as Promise from 'bluebird'; diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index 87d74aea9..f2e7df3df 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {IMapListener} from '../core/MapListener'; @@ -78,7 +94,7 @@ export interface MultiMap extends DistributedObject { containsEntry(key: K, value: V): Promise; /** - * @return the total number of values in this multi-map. + * @return the total number of values in this multi-map. */ size(): Promise; diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 961d8166e..ac8e4d31b 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {MultiMap} from './MultiMap'; diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 2c882adda..1cb81e4ad 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {MapProxy} from './MapProxy'; import HazelcastClient from '../HazelcastClient'; import {NearCacheImpl, NearCache} from '../nearcache/NearCache'; diff --git a/src/proxy/PartitionSpecificProxy.ts b/src/proxy/PartitionSpecificProxy.ts index 4914fe84b..52f792849 100644 --- a/src/proxy/PartitionSpecificProxy.ts +++ b/src/proxy/PartitionSpecificProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {BaseProxy} from './BaseProxy'; import HazelcastClient from '../HazelcastClient'; import * as Promise from 'bluebird'; diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 0d57cf58d..9887a3d59 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {MapProxy} from './MapProxy'; diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index 4f71b760a..63669f9de 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {IQueue} from './IQueue'; import {ItemEventType, ItemListener} from '../core/ItemListener'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index 68142cd1f..caf82ada1 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {IReplicatedMap} from './IReplicatedMap'; import {assertNotNull} from '../Util'; diff --git a/src/proxy/RingbufferProxy.ts b/src/proxy/RingbufferProxy.ts index 6bb2d4cc9..844f7ad63 100644 --- a/src/proxy/RingbufferProxy.ts +++ b/src/proxy/RingbufferProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {IRingbuffer} from './IRingbuffer'; diff --git a/src/proxy/SemaphoreProxy.ts b/src/proxy/SemaphoreProxy.ts index d346d1878..78b4bad2c 100644 --- a/src/proxy/SemaphoreProxy.ts +++ b/src/proxy/SemaphoreProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {ISemaphore} from './ISemaphore'; import * as Promise from 'bluebird'; diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index 0dedde956..efd043bf6 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {ISet} from './ISet'; import * as Promise from 'bluebird'; import {ItemListener} from '../core/ItemListener'; diff --git a/src/proxy/topic/ITopic.ts b/src/proxy/topic/ITopic.ts index 2f898c83b..070b3fa93 100644 --- a/src/proxy/topic/ITopic.ts +++ b/src/proxy/topic/ITopic.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {TopicMessageListener} from './TopicMessageListener'; import * as Promise from 'bluebird'; diff --git a/src/proxy/topic/RawTopicMessage.ts b/src/proxy/topic/RawTopicMessage.ts index 0b3c5cc9a..de1c2442a 100644 --- a/src/proxy/topic/RawTopicMessage.ts +++ b/src/proxy/topic/RawTopicMessage.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../../serialization/Serializable'; import {DataInput, DataOutput, Data} from '../../serialization/Data'; import Address = require('../../Address'); diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index f620f8ac9..1d68390bb 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {TopicMessageListener} from './TopicMessageListener'; import {IRingbuffer} from '../IRingbuffer'; import {RawTopicMessage} from './RawTopicMessage'; diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index ba2a915bd..e098eebcf 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Promise from 'bluebird'; import {ITopic} from './ITopic'; import {TopicMessageListener} from './TopicMessageListener'; diff --git a/src/proxy/topic/TopicMessage.ts b/src/proxy/topic/TopicMessage.ts index 088869704..35f4ef1b6 100644 --- a/src/proxy/topic/TopicMessage.ts +++ b/src/proxy/topic/TopicMessage.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import Address = require('../../Address'); import Long = require('long'); diff --git a/src/proxy/topic/TopicMessageListener.ts b/src/proxy/topic/TopicMessageListener.ts index 55192c9de..70661faf4 100644 --- a/src/proxy/topic/TopicMessageListener.ts +++ b/src/proxy/topic/TopicMessageListener.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export interface TopicMessageListener { (item: E): void; } diff --git a/src/proxy/topic/TopicOverloadPolicy.ts b/src/proxy/topic/TopicOverloadPolicy.ts index 2e885496d..3e885bcc0 100644 --- a/src/proxy/topic/TopicOverloadPolicy.ts +++ b/src/proxy/topic/TopicOverloadPolicy.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export enum TopicOverloadPolicy { /** * Using this policy, a message that has not expired can be overwritten. diff --git a/src/serialization/Data.ts b/src/serialization/Data.ts index 51c515d39..4b72e8136 100644 --- a/src/serialization/Data.ts +++ b/src/serialization/Data.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import * as Long from 'long'; export interface Data { /** diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index 3252a5c2d..778b77924 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {DataInput, DataOutput} from './Data'; import {AbstractPredicate} from './PredicateFactory'; import {IterationType, Predicate} from '../core/Predicate'; diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index 8bb7a70e2..dd780b85b 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Serializer} from './SerializationService'; import {DataInput, DataOutput} from './Data'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index cb8c23413..f6f2dc8e7 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Data} from './Data'; import murmur = require('../invocation/Murmur'); diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index aa28a482d..40b0414cc 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable:no-bitwise */ import * as Long from 'long'; import {DataOutput, Data, DataInput, PositionalDataOutput} from './Data'; diff --git a/src/serialization/PredicateFactory.ts b/src/serialization/PredicateFactory.ts index 319bca59a..bbbe07463 100644 --- a/src/serialization/PredicateFactory.ts +++ b/src/serialization/PredicateFactory.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; import {DataInput, DataOutput} from './Data'; import {Predicate} from '../core/Predicate'; diff --git a/src/serialization/Serializable.ts b/src/serialization/Serializable.ts index da9052a5b..75bba09e1 100644 --- a/src/serialization/Serializable.ts +++ b/src/serialization/Serializable.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {DataInput, DataOutput} from './Data'; import {PortableWriter, PortableReader} from './portable/PortableSerializer'; export interface IdentifiedDataSerializable { diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index dde0f374a..71f5b7c0b 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Data, DataOutput, DataInput} from './Data'; import {HeapData, DATA_OFFSET} from './HeapData'; import {SerializationConfig} from '../Config'; diff --git a/src/serialization/SerializationUtil.ts b/src/serialization/SerializationUtil.ts index be21aee9b..57102e953 100644 --- a/src/serialization/SerializationUtil.ts +++ b/src/serialization/SerializationUtil.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Data} from './Data'; export function deserializeEntryList(toObject: Function, entrySet: [Data, Data][]): [K, V][] { var deserializedSet: [K, V][] = []; diff --git a/src/serialization/portable/ClassDefinition.ts b/src/serialization/portable/ClassDefinition.ts index df8ae9c49..06f73c0c3 100644 --- a/src/serialization/portable/ClassDefinition.ts +++ b/src/serialization/portable/ClassDefinition.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export class ClassDefinition { private factoryId: number; private classId: number; diff --git a/src/serialization/portable/ClassDefinitionContext.ts b/src/serialization/portable/ClassDefinitionContext.ts index b940d6c84..24c80af65 100644 --- a/src/serialization/portable/ClassDefinitionContext.ts +++ b/src/serialization/portable/ClassDefinitionContext.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {ClassDefinition} from './ClassDefinition'; export class ClassDefinitionContext { diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index 8ba6252b1..422f168c2 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {PortableWriter} from './PortableSerializer'; import {FieldDefinition, FieldType, ClassDefinition} from './ClassDefinition'; import {PortableContext} from './PortableContext'; diff --git a/src/serialization/portable/DefaultPortableReader.ts b/src/serialization/portable/DefaultPortableReader.ts index b3eea940a..3017755bb 100644 --- a/src/serialization/portable/DefaultPortableReader.ts +++ b/src/serialization/portable/DefaultPortableReader.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {PortableReader, PortableSerializer} from './PortableSerializer'; import {DataInput} from '../Data'; import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; diff --git a/src/serialization/portable/DefaultPortableWriter.ts b/src/serialization/portable/DefaultPortableWriter.ts index f00612d72..3f134f004 100644 --- a/src/serialization/portable/DefaultPortableWriter.ts +++ b/src/serialization/portable/DefaultPortableWriter.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {PortableSerializer} from './PortableSerializer'; import {PositionalDataOutput} from '../Data'; import {ClassDefinition, FieldType, FieldDefinition} from './ClassDefinition'; diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index 992702562..12efd9520 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {DefaultPortableReader} from './DefaultPortableReader'; import {PortableSerializer} from './PortableSerializer'; import {DataInput} from '../Data'; diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index 15496e693..4033f6f63 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {SerializationService} from '../SerializationService'; import {ClassDefinitionContext} from './ClassDefinitionContext'; import {DataInput} from '../Data'; diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 2f74bd502..632efa09d 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + import {Serializer, SerializationService} from '../SerializationService'; import {PortableContext} from './PortableContext'; import {PortableFactory, Portable} from '../Serializable'; diff --git a/src/util/ArrayComparator.ts b/src/util/ArrayComparator.ts index 920b423a8..0cd477a46 100644 --- a/src/util/ArrayComparator.ts +++ b/src/util/ArrayComparator.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + export interface ArrayComparator { (a: T, b: T): number; } diff --git a/src/util/UuidUtil.ts b/src/util/UuidUtil.ts index dcea579c8..fc87094ce 100644 --- a/src/util/UuidUtil.ts +++ b/src/util/UuidUtil.ts @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /* tslint:disable:no-bitwise */ import {UUID} from '../core/UUID'; import * as Long from 'long'; diff --git a/test/BuildMetadataTest.js b/test/BuildMetadataTest.js index e748c641c..22c0788f4 100644 --- a/test/BuildMetadataTest.js +++ b/test/BuildMetadataTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var BuildMetadata = require('../lib/BuildMetadata').BuildMetadata; var assert = require('chai').assert; diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index 778e99b71..a5f6e1e1d 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var MapProxy = require('../lib/proxy/MapProxy').MapProxy; var ConnectionManager = require('../lib/invocation/ClientConnectionManager').ClientConnectionManager; var ClientConnection = require('../lib/invocation/ClientConnection').ClientConnection; diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index b22e8d661..699d999e0 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index d43cb9eb1..6d996a7a4 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; diff --git a/test/ConnectionManagerTest.js b/test/ConnectionManagerTest.js index f2fa534be..37e710c4e 100644 --- a/test/ConnectionManagerTest.js +++ b/test/ConnectionManagerTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Controller = require('./RC'); var chai = require('chai'); chai.should(); diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 94f327ed2..a59c104c3 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var Config = require('../.').Config; var Controller = require('./RC'); diff --git a/test/HeartbeatTest.js b/test/HeartbeatTest.js index a26ced40c..c14d393c3 100644 --- a/test/HeartbeatTest.js +++ b/test/HeartbeatTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var RC = require('./RC'); var HazelcastClient = require('../.').Client; var expect = require('chai').expect; diff --git a/test/LifecycleServiceTest.js b/test/LifecycleServiceTest.js index 4783d60a7..dc223ace6 100644 --- a/test/LifecycleServiceTest.js +++ b/test/LifecycleServiceTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var RC = require('./RC'); var HazelcastClient = require('../.').Client; var Config = require('../.').Config; diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index dc3475ea2..22f2b774c 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var RC = require('./RC'); var HazelcastClient = require('../.').Client; var Config = require('../.').Config; diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 68a3bfed4..528f37524 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; diff --git a/test/LoggingTest.js b/test/LoggingTest.js index ef36bc268..e35376c7b 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var sinon = require('sinon'); var winston = require('winston'); diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index b7d8b711e..d6257672b 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index e83ac8c5a..c81d366d0 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var HazelcastClient = require('../.').Client; var Controller = require('./RC'); var expect = require('chai').expect; diff --git a/test/RC.js b/test/RC.js index 5194f97d8..e608db9ff 100644 --- a/test/RC.js +++ b/test/RC.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var RemoteController = require('hazelcast-remote-controller'); var Promise = require('bluebird'); diff --git a/test/Util.js b/test/Util.js index 4ff0e239a..a73e9ac32 100644 --- a/test/Util.js +++ b/test/Util.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var promiseLater = function (time, func) { if (func === undefined) { diff --git a/test/atomiclong/AtomicLongTest.js b/test/atomiclong/AtomicLongTest.js index 3d7647d81..6c2a09d2f 100644 --- a/test/atomiclong/AtomicLongTest.js +++ b/test/atomiclong/AtomicLongTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var Long = require("long"); var HazelcastClient = require("../../lib/index.js").Client; diff --git a/test/javaclasses/CustomComparator.js b/test/javaclasses/CustomComparator.js index a12d25244..96313c66d 100644 --- a/test/javaclasses/CustomComparator.js +++ b/test/javaclasses/CustomComparator.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + /** * * @param type diff --git a/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js index 9b33db59a..ae1d33ce4 100644 --- a/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js +++ b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function DistortInvalidationMetadataEntryProcessor(mapName, mapSize, duration) { this.mapSize = mapSize; this.mapName = mapName; diff --git a/test/javaclasses/IdentifiedEntryProcessor.js b/test/javaclasses/IdentifiedEntryProcessor.js index b92a51169..2073d7454 100644 --- a/test/javaclasses/IdentifiedEntryProcessor.js +++ b/test/javaclasses/IdentifiedEntryProcessor.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function IdentifiedEntryProcessor(value) { this.value = value; } diff --git a/test/javaclasses/IdentifiedFactory.js b/test/javaclasses/IdentifiedFactory.js index f33a04563..2c68222ed 100644 --- a/test/javaclasses/IdentifiedFactory.js +++ b/test/javaclasses/IdentifiedFactory.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var IdentifiedEntryProcessor = require('./IdentifiedFactory'); var DistortInvalidationMetadataEntryProcessor = require('./DistortInvalidationMetadataEntryProcessor'); var CustomComparator = require('./CustomComparator'); diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index 97304ffae..6ae96b2f2 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); diff --git a/test/lock/LockProxyTest.js b/test/lock/LockProxyTest.js index f7d23b905..e28f44573 100644 --- a/test/lock/LockProxyTest.js +++ b/test/lock/LockProxyTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); diff --git a/test/map/ComparatorFactory.js b/test/map/ComparatorFactory.js index d70b6b211..5c28ddb1e 100644 --- a/test/map/ComparatorFactory.js +++ b/test/map/ComparatorFactory.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function noop() { //NO-OP } diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index 906db6c76..5e75880af 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var Client = require('../../').Client; var Config = require('../../.').Config; diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index 76a1fb32f..73b0a6732 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../../.').Client; var Controller = require('../RC'); var expect = require('chai').expect; diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index bc85f8a19..1c2a9de8d 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../..").Client; var Config = require('../..').Config; diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index 26b4cf508..aeeaa3e81 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../../").Client; var Predicates = require("../../").Predicates; diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index ba14c81fc..055309674 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index 5d9bf7183..a64cdc205 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var Promise = require('bluebird'); var Config = require('../../.').Config; diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index aaf7712d3..202d39ce8 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../../.").Client; var Predicates = require("../../.").Predicates; diff --git a/test/map/hazelcast_identifiedfactory.xml b/test/map/hazelcast_identifiedfactory.xml index 81d4158da..c8bc4eb92 100644 --- a/test/map/hazelcast_identifiedfactory.xml +++ b/test/map/hazelcast_identifiedfactory.xml @@ -1,4 +1,20 @@ + + diff --git a/test/map/hazelcast_mapstore.xml b/test/map/hazelcast_mapstore.xml index 7a530cb6a..868354a6b 100644 --- a/test/map/hazelcast_mapstore.xml +++ b/test/map/hazelcast_mapstore.xml @@ -1,3 +1,19 @@ + + diff --git a/test/map/hazelcast_nearcache_batchinvalidation_false.xml b/test/map/hazelcast_nearcache_batchinvalidation_false.xml index aa50cf312..0ddf7d21f 100644 --- a/test/map/hazelcast_nearcache_batchinvalidation_false.xml +++ b/test/map/hazelcast_nearcache_batchinvalidation_false.xml @@ -1,6 +1,6 @@ + diff --git a/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml index aa50cf312..0ddf7d21f 100644 --- a/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml +++ b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml @@ -1,6 +1,6 @@ + diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 8bcdf5798..5b2fbccba 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + 'use strict'; var expect = require('chai').expect; diff --git a/test/replicatedmap/hazelcast_replicatedmap.xml b/test/replicatedmap/hazelcast_replicatedmap.xml index 7a2309b0c..804715951 100644 --- a/test/replicatedmap/hazelcast_replicatedmap.xml +++ b/test/replicatedmap/hazelcast_replicatedmap.xml @@ -1,3 +1,19 @@ + + diff --git a/test/ringbuffer/RingbufferTest.js b/test/ringbuffer/RingbufferTest.js index db7804226..9d2cdac43 100644 --- a/test/ringbuffer/RingbufferTest.js +++ b/test/ringbuffer/RingbufferTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); diff --git a/test/ringbuffer/hazelcast_ringbuffer.xml b/test/ringbuffer/hazelcast_ringbuffer.xml index 5b23af0f1..766057eee 100644 --- a/test/ringbuffer/hazelcast_ringbuffer.xml +++ b/test/ringbuffer/hazelcast_ringbuffer.xml @@ -1,3 +1,19 @@ + + diff --git a/test/semaphore/SemaphoreProxyTest.js b/test/semaphore/SemaphoreProxyTest.js index 6d6480d61..d0d4beeaa 100644 --- a/test/semaphore/SemaphoreProxyTest.js +++ b/test/semaphore/SemaphoreProxyTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var HazelcastClient = require('../../lib/index.js').Client; var Controller = require('./../RC'); diff --git a/test/serialization/APortable.js b/test/serialization/APortable.js index 53c0a2bcd..b45647655 100644 --- a/test/serialization/APortable.js +++ b/test/serialization/APortable.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, doubles, shorts, floats, ints, longs, strings, portables, identifiedDataSerializable, customStreamSerializableObject, customByteArraySerializableObject, data) { diff --git a/test/serialization/AnIdentifiedDataSerializable.js b/test/serialization/AnIdentifiedDataSerializable.js index 05bee04cf..364161a76 100644 --- a/test/serialization/AnIdentifiedDataSerializable.js +++ b/test/serialization/AnIdentifiedDataSerializable.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, doubles, shorts, floats, ints , longs, strings, portable, identifiedDataSerializable, customStreamSerializable, customByteArraySerializableObject, data) { if (arguments.length === 0) return; diff --git a/test/serialization/AnInnerPortable.js b/test/serialization/AnInnerPortable.js index 241bf0202..f9863c006 100644 --- a/test/serialization/AnInnerPortable.js +++ b/test/serialization/AnInnerPortable.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function AnInnerPortable(anInt, aFloat) { this.anInt = anInt; this.aFloat = aFloat; diff --git a/test/serialization/BinaryCompatibilityTest.js b/test/serialization/BinaryCompatibilityTest.js index 4c17be892..5c4465131 100644 --- a/test/serialization/BinaryCompatibilityTest.js +++ b/test/serialization/BinaryCompatibilityTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var fs = require('fs'); var ObjectDataInput = require('../../lib/serialization/ObjectData').ObjectDataInput; var HeapData = require('../../lib/serialization/HeapData').HeapData; diff --git a/test/serialization/CustomSerializable.js b/test/serialization/CustomSerializable.js index e3424c287..39c30aa63 100644 --- a/test/serialization/CustomSerializable.js +++ b/test/serialization/CustomSerializable.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function CustomByteArraySerializable(int, float) { this.int = int; this.float = float; diff --git a/test/serialization/CustomSerializerTest.js b/test/serialization/CustomSerializerTest.js index 2bc9ff5db..261e2b448 100644 --- a/test/serialization/CustomSerializerTest.js +++ b/test/serialization/CustomSerializerTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var expect = require('chai').expect; diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index 942b528ea..b4a56c8d5 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('../../.').Client; var RC = require('../RC'); var expect = require('chai').expect; diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index 45d5d5bee..41b5727fa 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var Long = require('long'); var Config = require('../../.').Config; diff --git a/test/serialization/GlobalSerializerTest.js b/test/serialization/GlobalSerializerTest.js index f18563df8..aeaa8ffd1 100644 --- a/test/serialization/GlobalSerializerTest.js +++ b/test/serialization/GlobalSerializerTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var expect = require('chai').expect; diff --git a/test/serialization/IdentifiedDataSerializableTest.js b/test/serialization/IdentifiedDataSerializableTest.js index ec717c24e..cc7904991 100644 --- a/test/serialization/IdentifiedDataSerializableTest.js +++ b/test/serialization/IdentifiedDataSerializableTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var SerializationService = require('../../lib/serialization/SerializationService'); var Config = require('../../.').Config; diff --git a/test/serialization/ObjectDataTest.js b/test/serialization/ObjectDataTest.js index b365a170f..6c46128ea 100644 --- a/test/serialization/ObjectDataTest.js +++ b/test/serialization/ObjectDataTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var Long = require('long'); var ObjectData = require('../../lib/serialization/ObjectData'); diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index 56b194b5d..fedc708a9 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + function PortableObject(a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, a_portable, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables) { this.a_byte = a_byte; this.a_boolean = a_boolean; diff --git a/test/serialization/PortableTest.js b/test/serialization/PortableTest.js index f19caf438..7274c8860 100644 --- a/test/serialization/PortableTest.js +++ b/test/serialization/PortableTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var Long = require('long'); diff --git a/test/serialization/ReferenceObjects.js b/test/serialization/ReferenceObjects.js index abfa48506..f79ea6391 100644 --- a/test/serialization/ReferenceObjects.js +++ b/test/serialization/ReferenceObjects.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Long = require('long'); var AnInnerPortable = require('./AnInnerPortable'); var AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); diff --git a/test/serialization/portable/ClassDefinitionTest.js b/test/serialization/portable/ClassDefinitionTest.js index 0f56f00ac..9ba377500 100644 --- a/test/serialization/portable/ClassDefinitionTest.js +++ b/test/serialization/portable/ClassDefinitionTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require('chai').expect; var assert = require('chai').assert; var CD = require('../../../lib/serialization/portable/ClassDefinition').ClassDefinition; @@ -70,5 +86,5 @@ describe('ClassDefinitionTest', function(){ var res = a1.equals(b1); expect(res).to.equal(true); }); - + }); diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index 31b98b461..165658d84 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index ff3e38386..91aad5112 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var chai = require("chai"); var expect = chai.expect; var fs = require('fs'); diff --git a/test/ssl/ClientSslTest.js b/test/ssl/ClientSslTest.js index b7fc7a263..95b0d0f07 100644 --- a/test/ssl/ClientSslTest.js +++ b/test/ssl/ClientSslTest.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var chai = require("chai"); var expect = chai.expect; var chaiAsPromised = require("chai-as-promised"); diff --git a/test/ssl/hazelcast-ma-optional.xml b/test/ssl/hazelcast-ma-optional.xml index 21cedd07f..a3b1aac8b 100644 --- a/test/ssl/hazelcast-ma-optional.xml +++ b/test/ssl/hazelcast-ma-optional.xml @@ -1,6 +1,6 @@ + diff --git a/tsconfig.json b/tsconfig.json index e8f114fc6..fc2da9d52 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,7 @@ "outDir": "lib", "preserveConstEnums": true, "lib": ["es5", "es6"], - "removeComments": true, + "removeComments": false, "sourceMap": true }, "include": [ From 20415bf80a9bd5b6575c96147a7be8ef57c11d7e Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 2 Jan 2018 12:05:09 +0300 Subject: [PATCH 052/685] refactor heartbeat service --- src/HeartbeatService.ts | 23 +++++++++++++---------- src/invocation/ClientConnection.ts | 9 +++++++++ src/invocation/ClusterService.ts | 5 +++-- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts index 87621ab92..1880a4d0d 100644 --- a/src/HeartbeatService.ts +++ b/src/HeartbeatService.ts @@ -50,25 +50,30 @@ export class Heartbeat { } private heartbeatFunction() { - var estConnections = this.client.getConnectionManager().establishedConnections; - for (var address in estConnections) { + let estConnections = this.client.getConnectionManager().establishedConnections; + for (let address in estConnections) { if ( estConnections[address]) { - var conn = estConnections[address]; - var timeSinceLastRead = new Date().getTime() - conn.lastRead; + let conn = estConnections[address]; + let timeSinceLastRead = new Date().getTime() - conn.lastRead; if (timeSinceLastRead > this.heartbeatTimeout) { if (conn.heartbeating) { - setImmediate(this.onHeartbeatStopped.bind(this), conn); + conn.heartbeating = false; + this.onHeartbeatStopped(conn); } } if (timeSinceLastRead > this.heartbeatInterval) { - var req = ClientPingCodec.encodeRequest(); + let req = ClientPingCodec.encodeRequest(); this.client.getInvocationService().invokeOnConnection(conn, req) .catch((error) => { - this.logger.warn('HeartbeatService', error); + if (conn.isAlive()) { + this.logger.warn('HeartbeatService', 'Error receiving ping answer from the connection: ' + + conn + ' ' + error); + } }); } else { if (!conn.heartbeating) { - setImmediate(this.onHeartbeatRestored.bind(this), conn); + conn.heartbeating = true; + this.onHeartbeatRestored(conn); } } } @@ -77,7 +82,6 @@ export class Heartbeat { } private onHeartbeatStopped(connection: ClientConnection) { - connection.heartbeating = false; this.logger.warn('HeartbeatService', 'Heartbeat stopped on ' + connection.address.toString()); this.listeners.forEach((listener) => { if (listener.hasOwnProperty('onHeartbeatStopped')) { @@ -87,7 +91,6 @@ export class Heartbeat { } private onHeartbeatRestored(connection: ClientConnection) { - connection.heartbeating = true; this.logger.warn('HeartbeatService', 'Heartbeat restored on ' + connection.address.toString()); this.listeners.forEach((listener) => { if (listener.hasOwnProperty('onHeartbeatRestored')) { diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 317d30186..f3133da4f 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -23,6 +23,7 @@ export class ClientConnection { private closedTime: number; private connectedServerVersionString: string; private connectedServerVersion: number; + private authenticatedAsOwner: boolean; constructor(connectionManager: ClientConnectionManager, address: Address, clientNetworkConfig: ClientNetworkConfig) { this.address = address; @@ -125,6 +126,14 @@ export class ClientConnection { return this.closedTime === 0; } + isAuthenticatedAsOwner(): boolean { + return this.authenticatedAsOwner; + } + + setAuthneticatedAsOwner(asOwner: boolean): void { + this.authenticatedAsOwner = asOwner; + } + toString(): string { return this.address.toString(); } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index ac315c659..ad16ae210 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -131,7 +131,7 @@ export class ClusterService extends EventEmitter { private onConnectionClosed(connection: ClientConnection) { this.logger.warn('ClusterService', 'Connection closed to ' + connection.address.toString()); - if (connection.address.equals(this.getOwnerConnection().address)) { + if (connection.isAuthenticatedAsOwner()) { this.ownerConnection = null; this.connectToCluster().catch(this.client.shutdown.bind(this.client)); } @@ -139,7 +139,7 @@ export class ClusterService extends EventEmitter { private onHeartbeatStopped(connection: ClientConnection): void { this.logger.warn('ClusterService', connection.address.toString() + ' stopped heartbeating.'); - if (connection.getAddress().equals(this.ownerConnection.address)) { + if (connection.isAuthenticatedAsOwner()) { this.client.getConnectionManager().destroyConnection(connection.address); } } @@ -171,6 +171,7 @@ export class ClusterService extends EventEmitter { if (connection == null) { throw new Error('Could not connect to ' + currentAddress.toString()); } + connection.setAuthneticatedAsOwner(true); this.ownerConnection = connection; this.initMemberShipListener().then(() => { deferred.resolve(); From 0dadfa24ff6bd9912b10f025999cf9e6373cdcf2 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 10 Jan 2018 14:14:47 +0300 Subject: [PATCH 053/685] partition service refactor --- src/PartitionService.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/PartitionService.ts b/src/PartitionService.ts index e90f0fe58..71980acf4 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -19,6 +19,7 @@ import HazelcastClient from './HazelcastClient'; import GetPartitionsCodec = require('./codec/GetPartitionsCodec'); import Address = require('./Address'); import ClientMessage = require('./ClientMessage'); +import {LoggingService} from './logging/LoggingService'; const PARTITION_REFRESH_INTERVAL = 10000; @@ -29,6 +30,7 @@ export class PartitionService { private partitionCount: number; private partitionRefreshTask: any; private isShutdown: boolean; + private logger = LoggingService.getLoggingService(); constructor(client: HazelcastClient) { this.client = client; @@ -36,12 +38,13 @@ export class PartitionService { } initialize(): Promise { + this.partitionRefreshTask = setInterval(this.refresh.bind(this), PARTITION_REFRESH_INTERVAL); return this.refresh(); } shutdown(): void { + clearInterval(this.partitionRefreshTask); this.isShutdown = true; - clearTimeout(this.partitionRefreshTask); } /** @@ -51,8 +54,11 @@ export class PartitionService { if (this.isShutdown) { return Promise.resolve(); } - var ownerConnection = this.client.getClusterService().getOwnerConnection(); - var clientMessage: ClientMessage = GetPartitionsCodec.encodeRequest(); + let ownerConnection = this.client.getClusterService().getOwnerConnection(); + if (ownerConnection == null) { + return Promise.resolve(); + } + let clientMessage: ClientMessage = GetPartitionsCodec.encodeRequest(); return this.client.getInvocationService() .invokeOnConnection(ownerConnection, clientMessage) @@ -62,8 +68,10 @@ export class PartitionService { this.partitionMap[partitionId] = receivedPartitionMap[partitionId]; } this.partitionCount = Object.keys(this.partitionMap).length; - }).finally(() => { - this.partitionRefreshTask = setTimeout(this.refresh.bind(this), PARTITION_REFRESH_INTERVAL); + }).catch((e) => { + if (this.client.getLifecycleService().isRunning()) { + this.logger.warn('PartitionService', 'Error while fetching cluster partition table!', e); + } }); } From 2ab6f5ec161c10fab9b68c709030f331158fac61 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 11 Jan 2018 11:22:55 +0300 Subject: [PATCH 054/685] updates tsdoc --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 64ea510cf..63aef2de8 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "rimraf": "2.6.2", "sinon": "4.0.0", "tslint": "5.7.0", - "typedoc": "0.5.0", + "typedoc": "0.9.0", "typescript": "2.5.2", "winston": "2.3.1" }, @@ -35,7 +35,8 @@ "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", - "generate-docs": "rimraf docs && typedoc --out docs/ --exclude **/codec/**/* --module commonjs src/ node_modules/@types/node/index.d.ts node_modules/typescript/lib/lib.es2015.d.ts --excludeExternals", + "pregenerate-docs": "rimraf docs", + "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", "lint": "tslint --project tsconfig.json -t stylish" }, "repository": { From 6c3d985213c6fb87f01191505709ed9713a248e2 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 11 Jan 2018 12:30:45 +0300 Subject: [PATCH 055/685] removes typedoc from dev dependencies. have typedoc installed globally when you need to generate docs --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 63aef2de8..cead811ba 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "rimraf": "2.6.2", "sinon": "4.0.0", "tslint": "5.7.0", - "typedoc": "0.9.0", "typescript": "2.5.2", "winston": "2.3.1" }, From d5c748eb9dc1438e955c018e0277ba6eaead9956 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 10 Jan 2018 17:58:05 +0300 Subject: [PATCH 056/685] increases timeout for ClusterServiceTests.js. This test failed with 3.6 server because that server was slower to shutdown compared to newer servers --- test/ClusterServiceTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 6d996a7a4..6d62fb0f8 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -21,7 +21,7 @@ var Config = require('../.').Config; var Promise = require('bluebird'); describe('ClusterService', function() { - this.timeout(15000); + this.timeout(25000); var cluster; var ownerMember; From dc89ab7a7a6d4ff4928f8064e3d3bb09fdd99088 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 9 Jan 2018 10:39:40 +0300 Subject: [PATCH 057/685] adds a utility method to skip tests if expected server version is not satisfied --- scripts/dev-test-rc.sh | 6 +++--- test/Util.js | 9 +++++++++ test/nearcache/InvalidationMetadataDistortionTest.js | 3 +++ test/nearcache/LostInvalidationsTest.js | 4 ++++ test/nearcache/MigratedDataTest.js | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 4535f582a..362a971c6 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,5 +1,5 @@ #!/bin/sh -HZ_VERSION="3.9" +HZ_VERSION="3.9.1" HAZELCAST_TEST_VERSION="3.10-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} @@ -51,7 +51,7 @@ if [ -n "${HAZELCAST_ENTERPRISE_KEY}" ]; then exit 1 fi fi - CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-enterprise-${HAZELCAST_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:hazelcast-tests-${HAZELCAST_VERSION}.jar:test/javaclasses" + CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-enterprise-${HAZELCAST_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar:test/javaclasses" echo "Starting Remote Controller ... enterprise ..." else if [ -f "hazelcast-${HAZELCAST_VERSION}.jar" ]; then @@ -64,7 +64,7 @@ else exit 1 fi fi - CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:test/javaclasses" + CLASSPATH="hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar:hazelcast-${HAZELCAST_VERSION}.jar:hazelcast-${HAZELCAST_TEST_VERSION}-tests.jar" echo "Starting Remote Controller ... oss ..." fi diff --git a/test/Util.js b/test/Util.js index a73e9ac32..43571f6b4 100644 --- a/test/Util.js +++ b/test/Util.js @@ -15,6 +15,7 @@ */ var expect = require('chai').expect; +var BuildMetadata = require('../lib/BuildMetadata').BuildMetadata; var promiseLater = function (time, func) { if (func === undefined) { func = function(){}; @@ -72,6 +73,14 @@ exports.markEnterprise = function (_this) { } }; +exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { + var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion(); + var expNumber = BuildMetadata.calculateVersion(expectedVersion); + if (actNumber < expNumber) { + _this.skip(); + } +}; + exports.promiseWaitMilliseconds = function (milliseconds) { return new Promise(function(resolve, reject) { setTimeout(function() { diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index f5b2653a0..3600a1acb 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -22,6 +22,7 @@ var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); var DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortInvalidationMetadataEntryProcessor'); var Promise = require('bluebird'); var expect = require('chai').expect; +var Util = require('../Util'); describe('Invalidation metadata distortion', function () { @@ -73,6 +74,8 @@ describe('Invalidation metadata distortion', function () { it('lost invalidation', function (done) { + Util.markServerVersionAtLeast(this, client, '3.8'); + this.timeout(13000); var stopTest = false; diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index f457ec103..25e94542e 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -73,6 +73,8 @@ describe('LostInvalidation', function() { }); it('client eventually receives an update for which the invalidation event was dropped', function() { + Util.markServerVersionAtLeast(this, client, '3.8'); + var map = client.getMap(mapName); var key = 'key'; var value = 'val'; @@ -98,6 +100,8 @@ describe('LostInvalidation', function() { }); it('lost invalidation stress test', function() { + Util.markServerVersionAtLeast(this, client, '3.8'); + var map = client.getMap(mapName); var invalidationHandlerStub; return Util.promiseWaitMilliseconds(100).then(function(resp) { diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index 1edb311f6..e002e6b16 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -71,6 +71,8 @@ describe('MigratedData', function() { }); it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', function() { + Util.markServerVersionAtLeast(this, client, '3.8'); + var map = client.getMap(mapName); var survivingMember; var key = 1; From 89789345dd37db7aa8977cd513eaab9ff2930c36 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 9 Jan 2018 12:31:21 +0300 Subject: [PATCH 058/685] adds additional oss/enterprise test check --- test/Util.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/Util.js b/test/Util.js index 43571f6b4..79b770114 100644 --- a/test/Util.js +++ b/test/Util.js @@ -68,6 +68,9 @@ exports.fillMap = function (map, size, keyPrefix, valuePrefix) { }; exports.markEnterprise = function (_this) { + if (process.env.SERVER_TYPE === 'oss' || process.env.HZ_TYPE === 'oss') { + _this.skip(); + } if(!process.env.HAZELCAST_ENTERPRISE_KEY){ _this.skip(); } @@ -76,7 +79,7 @@ exports.markEnterprise = function (_this) { exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion(); var expNumber = BuildMetadata.calculateVersion(expectedVersion); - if (actNumber < expNumber) { + if (actNumber === BuildMetadata.UNKNOWN_VERSION_ID || actNumber < expNumber) { _this.skip(); } }; From c6cc2f993cea7a73108ec21ea2d242d01d69cbce Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 3 Jan 2018 13:37:43 +0300 Subject: [PATCH 059/685] refactor heartbeat test: custom address object is not neccessary any more --- test/HeartbeatTest.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/test/HeartbeatTest.js b/test/HeartbeatTest.js index c14d393c3..802a42b70 100644 --- a/test/HeartbeatTest.js +++ b/test/HeartbeatTest.js @@ -18,6 +18,7 @@ var RC = require('./RC'); var HazelcastClient = require('../.').Client; var expect = require('chai').expect; var Config = require('../.').Config; +var Util = require('./Util'); describe('Heartbeat', function() { this.timeout(30000); @@ -52,7 +53,7 @@ describe('Heartbeat', function() { return member.address.host + ':' + member.address.port; } }; - warmUpConnectionToAddress(client, address); + warmUpConnectionToAddressWithRetry(client, address); }); client.heartbeat.addListener({onHeartbeatStopped: function(connection) { client.shutdown(); @@ -78,16 +79,9 @@ describe('Heartbeat', function() { }).then(function(resp) { client = resp; client.clusterService.on('memberAdded', function(member) { - var address = { - host: member.address.host, - port: member.address.port, - toString: function() { - return member.address.host + ':' + member.address.port; - } - }; - warmUpConnectionToAddress(client, address).then(function() { - simulateHeartbeatLost(client, address, 2000); - }); + warmUpConnectionToAddressWithRetry(client, member.address, 3).then(function() { + simulateHeartbeatLost(client, member.address, 2000); + }).catch(done); }); client.heartbeat.addListener({onHeartbeatRestored: function(connection) { client.shutdown(); @@ -126,7 +120,17 @@ describe('Heartbeat', function() { client.connectionManager.establishedConnections[address].lastRead = client.connectionManager.establishedConnections[address].lastRead - timeout; } - function warmUpConnectionToAddress(client, address) { - return client.connectionManager.getOrConnect(address); + function warmUpConnectionToAddressWithRetry(client, address, retryCount) { + return client.connectionManager.getOrConnect(address).then(function (conn) { + if (conn != null) { + return conn; + } else if (conn == null && retryCount > 0) { + return Util.promiseWaitMilliseconds(300).then(function () { + return warmUpConnectionToAddressWithRetry(client, address, retryCount - 1); + }); + } else { + throw new Error('Could not warm up connection to ' + address); + } + }); } }); From d2ffc160e733d208606cfe9450f93c1c7244a302 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 3 Jan 2018 14:36:15 +0300 Subject: [PATCH 060/685] do not retry operations when client is shutdown --- src/invocation/InvocationService.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index faae2ea4e..402750459 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -261,7 +261,9 @@ export class InvocationService { private notifyError(invocation: Invocation, error: Error): void { var correlationId = invocation.request.getCorrelationId().toNumber(); - if (this.isRetryable(invocation)) { + if (!this.client.getLifecycleService().isRunning()) { + invocation.deferred.reject(new ClientNotActiveError('Client is not active.', error)); + } else if (this.isRetryable(invocation)) { this.logger.debug('InvocationService', 'Retrying(' + invocation.invokeCount + ') on correlation-id=' + correlationId, error); if (invocation.invokeCount < MAX_FAST_INVOCATION_COUNT) { From 31e639b74091b2c0ba605c932581455f7f30483e Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 10 Jan 2018 17:37:44 +0300 Subject: [PATCH 061/685] adds IterationType in index.ts so it is importable by users, fixes pagingpredicate test --- src/index.ts | 4 +++- test/javaclasses/CustomComparator.js | 35 ++++++++++++++++++++++++---- test/map/MapPredicateTest.js | 4 ++-- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/index.ts b/src/index.ts index 110e9a2fe..0f0aa45cc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -22,6 +22,7 @@ import * as Predicates from './core/Predicate'; import Address = require('./Address'); import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); import * as HazelcastErrors from './HazelcastError'; +import {IterationType} from './core/Predicate'; export { HazelcastClient as Client, @@ -31,5 +32,6 @@ export { Address, Predicates, TopicOverloadPolicy, - HazelcastErrors + HazelcastErrors, + IterationType }; diff --git a/test/javaclasses/CustomComparator.js b/test/javaclasses/CustomComparator.js index 96313c66d..57aad2a4a 100644 --- a/test/javaclasses/CustomComparator.js +++ b/test/javaclasses/CustomComparator.js @@ -14,6 +14,8 @@ * limitations under the License. */ +var IterationType = require('../../lib/').IterationType; + /** * * @param type @@ -45,12 +47,35 @@ CustomComparator.prototype.readData = function (inp) { this.iterationType = inp.readInt(); }; -CustomComparator.prototype.sort = function (o1, o2) { - if (this.type === 0) { - return o1[1] - o2[1]; - } else { - return o2[1] - o1[1]; +CustomComparator.prototype.sort = function (e1, e2) { + var str1; + var str2; + switch (this.iterationType) { + case IterationType.KEY: + str1 = e1[0].toString(); + str2 = e2[0].toString(); + break; + case IterationType.VALUE: + str1 = e1[1].toString(); + str2 = e2[1].toString(); + break; + case IterationType.ENTRY: + str1 = e1[0].toString() + e1[1].toString(); + str2 = e2[0].toString() + e2[1].toString(); + break; + default: + str1 = e1[0].toString(); + str2 = e2[0].toString(); + } + switch (this.type) { + case 0: + return str1.localeCompare(str2); + case 1: + return str2.localeCompare(str1); + case 2: + return str1.length - str2.length; } + return 0; }; module.exports = CustomComparator; diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 1c2a9de8d..7f879e332 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -187,8 +187,8 @@ describe("Predicates", function() { }); it('Paging with reverse comparator should have elements in reverse order', function() { - var paging = Predicates.paging(Predicates.lessThan('this', 40), 3, createReverseValueComparator()); - return testPredicate(paging, [39, 38, 37], true); + var paging = Predicates.paging(Predicates.lessThan('this', 10), 3, createReverseValueComparator()); + return testPredicate(paging, [9, 8, 7], true); }); it('Paging first page should have first two items', function() { From dafe2aa7e3a3b9e5f8a24053f52a0722c0a5ab62 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 2 Jan 2018 15:50:55 +0300 Subject: [PATCH 062/685] unskip reliable topic tests --- src/Address.ts | 6 ++-- src/ClusterDataFactory.ts | 7 ++-- src/ClusterDataFactoryHelper.ts | 20 ++++++++++++ src/proxy/RingbufferProxy.ts | 2 +- src/proxy/topic/RawTopicMessage.ts | 4 --- .../topic/ReliableTopicListenerRunner.ts | 4 +-- src/proxy/topic/TopicMessageListener.ts | 3 +- src/serialization/SerializationService.ts | 6 ++-- test/topic/TopicTest.js | 32 +++++++++---------- 9 files changed, 48 insertions(+), 36 deletions(-) create mode 100644 src/ClusterDataFactoryHelper.ts diff --git a/src/Address.ts b/src/Address.ts index e8fa47e04..3a5dc063f 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -16,8 +16,8 @@ import {IdentifiedDataSerializable} from './serialization/Serializable'; import {DataInput, DataOutput} from './serialization/Data'; -import {ADDRESS_CLASS_ID, CLUSTER_DATA_FACTORY_ID} from './ClusterDataFactory'; import * as net from 'net'; +import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; class Address implements IdentifiedDataSerializable { @@ -48,11 +48,11 @@ class Address implements IdentifiedDataSerializable { } getFactoryId(): number { - return CLUSTER_DATA_FACTORY_ID; + return ClusterDataFactoryHelper.FACTORY_ID; } getClassId(): number { - return ADDRESS_CLASS_ID; + return ClusterDataFactoryHelper.ADDRESS_ID; } equals(other: Address): boolean { diff --git a/src/ClusterDataFactory.ts b/src/ClusterDataFactory.ts index 0332c410b..cf5e74e30 100644 --- a/src/ClusterDataFactory.ts +++ b/src/ClusterDataFactory.ts @@ -16,15 +16,12 @@ import {IdentifiedDataSerializableFactory, IdentifiedDataSerializable} from './serialization/Serializable'; import Address = require('./Address'); - -export const ADDRESS_CLASS_ID = 1; -export const CLUSTER_DATA_FACTORY_ID = 0; +import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; export class ClusterDataFactory implements IdentifiedDataSerializableFactory { create(type: number): IdentifiedDataSerializable { - - if (type === ADDRESS_CLASS_ID) { + if (type === ClusterDataFactoryHelper.ADDRESS_ID) { return new Address(); } diff --git a/src/ClusterDataFactoryHelper.ts b/src/ClusterDataFactoryHelper.ts new file mode 100644 index 000000000..be81b9c33 --- /dev/null +++ b/src/ClusterDataFactoryHelper.ts @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +export class ClusterDataFactoryHelper { + static readonly FACTORY_ID = 0; + static readonly ADDRESS_ID = 1; +} diff --git a/src/proxy/RingbufferProxy.ts b/src/proxy/RingbufferProxy.ts index 844f7ad63..e27434b17 100644 --- a/src/proxy/RingbufferProxy.ts +++ b/src/proxy/RingbufferProxy.ts @@ -91,7 +91,7 @@ export class RingbufferProxy extends PartitionSpecificProxy implements IRingb .then>((raw: any) => { return raw['items'].map((r: Data) => { return this.toObject(r); - }); + }, this); }); } } diff --git a/src/proxy/topic/RawTopicMessage.ts b/src/proxy/topic/RawTopicMessage.ts index de1c2442a..e41732cb1 100644 --- a/src/proxy/topic/RawTopicMessage.ts +++ b/src/proxy/topic/RawTopicMessage.ts @@ -23,8 +23,6 @@ export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -18; export const RELIABLE_TOPIC_CLASS_ID = 2; export class RawTopicMessage implements IdentifiedDataSerializable { - - publishTime: Long; publisherAddress: Address; payload: Data; @@ -52,11 +50,9 @@ export class RawTopicMessage implements IdentifiedDataSerializable { export class ReliableTopicMessageFactory implements IdentifiedDataSerializableFactory { create(type: number): IdentifiedDataSerializable { - if (type === RELIABLE_TOPIC_CLASS_ID) { return new RawTopicMessage(); } - return null; } } diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 1d68390bb..184874d44 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -54,7 +54,7 @@ export class ReliableTopicListenerRunner { this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize).then((result: Array) => { if (!this.cancelled) { result.forEach((raw: RawTopicMessage) => { - var msg = new TopicMessage(); + let msg = new TopicMessage(); msg.messageObject = this.serializationService.toObject(raw.payload); msg.publisher = raw.publisherAddress; msg.publishingTime = raw.publishTime; @@ -80,7 +80,7 @@ export class ReliableTopicListenerRunner { return; } - var message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener'; + var message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; this.loggingService.warn('ReliableTopicListenerRunner', message); this.proxy.removeMessageListener(this.listenerId); diff --git a/src/proxy/topic/TopicMessageListener.ts b/src/proxy/topic/TopicMessageListener.ts index 70661faf4..edd56d31a 100644 --- a/src/proxy/topic/TopicMessageListener.ts +++ b/src/proxy/topic/TopicMessageListener.ts @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import {TopicMessage} from './TopicMessage'; export interface TopicMessageListener { - (item: E): void; + (message: TopicMessage): void; } diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 71f5b7c0b..770933d80 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -30,9 +30,9 @@ import {PortableSerializer} from './portable/PortableSerializer'; import {IdentifiedDataSerializableFactory} from './Serializable'; import * as DefaultPredicates from './DefaultPredicates'; import {PredicateFactory, PREDICATE_FACTORY_ID} from './PredicateFactory'; -import {PartitionAware} from '../core/PartitionAware'; import {RELIABLE_TOPIC_MESSAGE_FACTORY_ID, ReliableTopicMessageFactory} from '../proxy/topic/RawTopicMessage'; -import {CLUSTER_DATA_FACTORY_ID, ClusterDataFactory} from '../ClusterDataFactory'; +import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; +import {ClusterDataFactory} from '../ClusterDataFactory'; export interface SerializationService { toData(object: any, paritioningStrategy?: any) : Data; @@ -257,7 +257,7 @@ export class SerializationServiceV1 implements SerializationService { } factories[PREDICATE_FACTORY_ID] = new PredicateFactory(DefaultPredicates); factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = new ReliableTopicMessageFactory(); - factories[CLUSTER_DATA_FACTORY_ID] = new ClusterDataFactory(); + factories[ClusterDataFactoryHelper.FACTORY_ID] = new ClusterDataFactory(); this.registerSerializer('identified', new IdentifiedDataSerializableSerializer(factories)); } diff --git a/test/topic/TopicTest.js b/test/topic/TopicTest.js index f60542da8..ac8f9c2b5 100644 --- a/test/topic/TopicTest.js +++ b/test/topic/TopicTest.js @@ -24,7 +24,6 @@ var Controller = require('./../RC'); var RawTopicMessage = require('../../lib/proxy/topic/RawTopicMessage').RawTopicMessage; var fs = require('fs'); var Long = require('long'); - var Promise = require('bluebird'); var createConfig = function () { @@ -53,7 +52,7 @@ var generateItems = function (client, howMany) { } return all; }; -describe.skip("Reliable Topic Proxy", function () { +describe("Reliable Topic Proxy", function () { var cluster; var clientOne; @@ -68,7 +67,6 @@ describe.skip("Reliable Topic Proxy", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - var config = createConfig(); return Promise.all([ @@ -90,8 +88,9 @@ describe.skip("Reliable Topic Proxy", function () { }); it("writes and reads messages", function (done) { - var topicOne = clientOne.getReliableTopic("t"); - var topicTwo = clientTwo.getReliableTopic("t"); + var topicName = 't' + Math.random(); + var topicOne = clientOne.getReliableTopic(topicName); + var topicTwo = clientTwo.getReliableTopic(topicName); topicTwo.addMessageListener(function (msg) { if (msg.messageObject["value"] === "foo") { @@ -105,15 +104,16 @@ describe.skip("Reliable Topic Proxy", function () { }); it('removed message listener does not receive items after removal', function (done) { - var topicOne = clientOne.getReliableTopic("t"); - var topicTwo = clientTwo.getReliableTopic("t"); + var topicName = 't' + Math.random(); + var topicOne = clientOne.getReliableTopic(topicName); + var topicTwo = clientTwo.getReliableTopic(topicName); var receivedMessages = 0; var id = topicTwo.addMessageListener(function (msg) { receivedMessages++; if (receivedMessages > 2) { - done(new Error('Keep receiving messages after removal.')); + done(new Error('Kept receiving messages after message listener is removed.')); } }); @@ -129,11 +129,11 @@ describe.skip("Reliable Topic Proxy", function () { }, 500); }); - it("blocks when there is no more space", function (done) { + it("blocks when there is no more space", function () { var topic = clientOne.getReliableTopic("blocking"); var ringbuffer = topic.getRingbuffer(); - ringbuffer.capacity().then(function (capacity) { + return ringbuffer.capacity().then(function (capacity) { var all = []; for (var i = 0; i < capacity.toNumber() + 1; i++) { @@ -142,19 +142,19 @@ describe.skip("Reliable Topic Proxy", function () { return ringbuffer.addAll(all); }).then(function () { - var startTime = new Date().getTime(); - topic.publish(-50).then(function () { + var startTime = Date.now(); + return topic.publish(-50).then(function () { /* Here we check that the call was indeed blocking until the TTL of the first inserted entry has passed */ - var elapsed = new Date().getTime() - startTime; + var elapsed = Date.now() - startTime; if (elapsed > 2000) { - done(); + return; } else { - done(new Error("Message was published too fast, expected at least a 2 second delay, got: " + elapsed)); + throw new Error("Message was published too fast, expected at least a 2 second delay, got: " + elapsed); } }); }); @@ -173,7 +173,6 @@ describe.skip("Reliable Topic Proxy", function () { var all = generateItems(clientOne, 20); - ringbuffer.addAll(all); }); @@ -195,7 +194,6 @@ describe.skip("Reliable Topic Proxy", function () { }); }); - it("overwrites the oldest item when there is no more space", function () { var topic = clientOne.getReliableTopic("overwrite"); var ringbuffer = topic.getRingbuffer(); From 2130135a3820f44d7dbc3bb10f1179cc55dc85ac Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 15 Jan 2018 11:52:44 +0300 Subject: [PATCH 063/685] Changes hardcoded api doc link version to `current` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 702e1bd3b..005ae20dc 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. -You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.6.2/docs/). +You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). # Serialization Considerations From eee5c4f6348b32e86711322cf2d04810e631ffdf Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 16 Jan 2018 12:52:57 +0000 Subject: [PATCH 064/685] 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cead811ba..fd9ff6759 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hazelcast-client", - "version": "0.6.2", + "version": "0.7.0", "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", "main": "lib/index.js", "dependencies": { From 075ded8a8a07ecaeaeff4adab5ce8a2956caed5b Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 25 Jan 2018 10:08:49 +0300 Subject: [PATCH 065/685] adds a package-lock.json to lock dev dependencies' versions so that they do not change overnight --- package-lock.json | 2542 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 2543 insertions(+), 1 deletion(-) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..97736ef4b --- /dev/null +++ b/package-lock.json @@ -0,0 +1,2542 @@ +{ + "name": "hazelcast-client", + "version": "0.7.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@types/bluebird": { + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.12.tgz", + "integrity": "sha1-GAiBhH/2ZOnilKXc3NTI6aFQ5ac=", + "dev": true + }, + "@types/long": { + "version": "3.0.32", + "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", + "integrity": "sha1-9OWvMenpsZbY5fyopeLiCqPWC2k=", + "dev": true + }, + "@types/node": { + "version": "6.0.87", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.87.tgz", + "integrity": "sha1-WrV3T4NRozqTUJn6a+hQqgsK1WQ=", + "dev": true + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", + "dev": true + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", + "dev": true + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", + "dev": true + }, + "bluebird": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", + "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=" + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "chai": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", + "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", + "dev": true, + "requires": { + "assertion-error": "1.1.0", + "check-error": "1.0.2", + "deep-eql": "3.0.1", + "get-func-name": "2.0.0", + "pathval": "1.1.0", + "type-detect": "4.0.7" + }, + "dependencies": { + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", + "dev": true + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha1-38lARACtHI/gI+faHfHBR8S0RN8=", + "dev": true, + "requires": { + "type-detect": "4.0.7" + } + }, + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true + }, + "pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true + }, + "type-detect": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", + "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", + "dev": true + } + } + }, + "chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha1-CGRdgl3rhpbuYXJdv1kMAS6wDKA=", + "dev": true, + "requires": { + "check-error": "1.0.2" + }, + "dependencies": { + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + } + } + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "dev": true + }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "dev": true + }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } + }, + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + } + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, + "glogg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", + "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "gulp-util": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz", + "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "1.0.12", + "fancy-log": "1.3.2", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.1", + "vinyl": "0.5.3" + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "dev": true, + "requires": { + "glogg": "1.0.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "hazelcast-remote-controller": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hazelcast-remote-controller/-/hazelcast-remote-controller-1.0.0.tgz", + "integrity": "sha1-PxFIxrf6taLqm9pkA7iebf3eoZo=", + "dev": true, + "requires": { + "thrift": "0.9.3" + }, + "dependencies": { + "thrift": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/thrift/-/thrift-0.9.3.tgz", + "integrity": "sha1-mQITNkA9QuCLjvrbHDegbXmYsqY=", + "dev": true, + "requires": { + "node-int64": "0.3.3", + "q": "1.0.1", + "ws": "0.4.32" + }, + "dependencies": { + "node-int64": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz", + "integrity": "sha1-LW5rLs5d6FiLQ9iNG8QbJs0fqE0=", + "dev": true + }, + "q": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz", + "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ=", + "dev": true + }, + "ws": { + "version": "0.4.32", + "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", + "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", + "dev": true, + "requires": { + "commander": "2.1.0", + "nan": "1.0.0", + "options": "0.0.6", + "tinycolor": "0.0.1" + }, + "dependencies": { + "commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=", + "dev": true + }, + "nan": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", + "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=", + "dev": true + }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", + "dev": true + }, + "tinycolor": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", + "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=", + "dev": true + } + } + } + } + } + } + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "dev": true + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "istanbul": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", + "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", + "dev": true, + "requires": { + "abbrev": "1.0.9", + "async": "1.5.2", + "escodegen": "1.8.1", + "esprima": "2.7.3", + "glob": "5.0.15", + "handlebars": "4.0.11", + "js-yaml": "3.10.0", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "once": "1.4.0", + "resolve": "1.1.7", + "supports-color": "3.2.3", + "which": "1.3.0", + "wordwrap": "1.0.0" + }, + "dependencies": { + "abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true + }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "dev": true, + "requires": { + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" + }, + "dependencies": { + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } + } + } + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + }, + "dependencies": { + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true, + "optional": true + } + } + } + } + }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + }, + "dependencies": { + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } + } + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } + } + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + } + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + }, + "dependencies": { + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + } + } + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "optional": true + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true, + "optional": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + }, + "dependencies": { + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "optional": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "optional": true, + "requires": { + "is-buffer": "1.1.6" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", + "dev": true, + "optional": true + } + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true, + "optional": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true, + "optional": true + } + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, + "optional": true + } + } + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4" + }, + "dependencies": { + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "optional": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "optional": true, + "requires": { + "is-buffer": "1.1.6" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", + "dev": true, + "optional": true + } + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true, + "optional": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true, + "optional": true + } + } + } + } + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, + "optional": true + } + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true, + "optional": true + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, + "optional": true + } + } + } + } + } + } + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + }, + "dependencies": { + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + } + } + }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=", + "dev": true + } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1.0.9" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + } + } + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", + "dev": true, + "requires": { + "isexe": "2.0.0" + }, + "dependencies": { + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + } + } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", + "dev": true + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", + "dev": true + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", + "dev": true + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", + "dev": true + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", + "dev": true + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", + "dev": true + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "dev": true, + "requires": { + "lodash._root": "3.0.1" + } + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", + "dev": true + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + } + }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", + "dev": true + }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" + } + }, + "long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + } + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "mocha": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", + "integrity": "sha1-HgSA/jbS2lhY0etqzDhBiybqog0=", + "dev": true, + "requires": { + "browser-stdout": "1.3.0", + "commander": "2.9.0", + "debug": "2.6.8", + "diff": "3.2.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.1", + "growl": "1.9.2", + "he": "1.1.1", + "json3": "3.3.2", + "lodash.create": "3.1.1", + "mkdirp": "0.5.1", + "supports-color": "3.1.2" + }, + "dependencies": { + "browser-stdout": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", + "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", + "dev": true + }, + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + }, + "dependencies": { + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + } + } + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "diff": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", + "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", + "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + }, + "dependencies": { + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } + } + } + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } + } + }, + "growl": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", + "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "dev": true + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, + "lodash.create": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", + "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", + "dev": true, + "requires": { + "lodash._baseassign": "3.2.0", + "lodash._basecreate": "3.0.3", + "lodash._isiterateecall": "3.0.9" + }, + "dependencies": { + "lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash.keys": "3.1.2" + }, + "dependencies": { + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + }, + "dependencies": { + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", + "dev": true + } + } + } + } + }, + "lodash._basecreate": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", + "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", + "dev": true + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true + } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } + } + }, + "supports-color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", + "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + } + } + } + } + }, + "mousse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/mousse/-/mousse-0.3.1.tgz", + "integrity": "sha1-0Hq3MFiaBWSsJpa2wvVLZXgY+7Q=", + "dev": true, + "requires": { + "collections": "1.2.4", + "q": "1.0.0" + }, + "dependencies": { + "collections": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/collections/-/collections-1.2.4.tgz", + "integrity": "sha1-Pi8WRe1D188f4khAYAH6q0Ln5GM=", + "dev": true, + "requires": { + "weak-map": "1.0.5" + }, + "dependencies": { + "weak-map": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", + "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=", + "dev": true + } + } + }, + "q": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.0.0.tgz", + "integrity": "sha1-3B+SxFh75U94U7Kdwo5tJDqISY0=", + "dev": true + } + } + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "dev": true, + "requires": { + "duplexer2": "0.0.2" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "1.3.1" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "dev": true, + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, + "remap-istanbul": { + "version": "0.9.6", + "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.9.6.tgz", + "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==", + "dev": true, + "requires": { + "amdefine": "1.0.1", + "gulp-util": "3.0.7", + "istanbul": "0.4.5", + "minimatch": "3.0.4", + "source-map": "0.6.1", + "through2": "2.0.1" + } + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "dev": true + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", + "dev": true, + "requires": { + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + }, + "dependencies": { + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } + } + } + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } + } + } + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, + "sinon": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.0.0.tgz", + "integrity": "sha1-pUpfAjeqHdIhXl6ByJtCtQxP22s=", + "dev": true, + "requires": { + "diff": "3.4.0", + "formatio": "1.2.0", + "lodash.get": "4.4.2", + "lolex": "2.3.1", + "native-promise-only": "0.8.1", + "nise": "1.2.0", + "path-to-regexp": "1.7.0", + "samsam": "1.3.0", + "text-encoding": "0.6.4", + "type-detect": "4.0.7" + }, + "dependencies": { + "diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", + "dev": true + }, + "formatio": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", + "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", + "dev": true, + "requires": { + "samsam": "1.3.0" + } + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lolex": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz", + "integrity": "sha1-PSMZiURx6glQ72RpLq0qUxjP82I=", + "dev": true + }, + "native-promise-only": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", + "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=", + "dev": true + }, + "nise": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz", + "integrity": "sha1-B51srbvLErow448cmZ82rU1rqlM=", + "dev": true, + "requires": { + "formatio": "1.2.0", + "just-extend": "1.1.27", + "lolex": "1.6.0", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" + }, + "dependencies": { + "just-extend": { + "version": "1.1.27", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", + "integrity": "sha1-7G55QQ/5FORyZSq/oOYDwD1g6QU=", + "dev": true + }, + "lolex": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", + "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=", + "dev": true + } + } + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "dev": true, + "requires": { + "isarray": "0.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, + "samsam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", + "integrity": "sha1-jR2TUOJWItow3j5EumkrUiGrfFA=", + "dev": true + }, + "text-encoding": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", + "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", + "dev": true + }, + "type-detect": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", + "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", + "dev": true + } + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "sparkles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", + "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", + "dev": true + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { + "get-stdin": "4.0.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "through2": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz", + "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=", + "dev": true, + "requires": { + "readable-stream": "2.0.6", + "xtend": "4.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } + } + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", + "dev": true + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, + "tslint": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz", + "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "colors": "1.1.2", + "commander": "2.13.0", + "diff": "3.4.0", + "glob": "7.1.2", + "minimatch": "3.0.4", + "resolve": "1.5.0", + "semver": "5.5.0", + "tslib": "1.9.0", + "tsutils": "2.19.1" + }, + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + }, + "dependencies": { + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + } + } + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", + "dev": true + }, + "diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", + "dev": true + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + }, + "dependencies": { + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } + } + } + } + }, + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=", + "dev": true, + "requires": { + "path-parse": "1.0.5" + }, + "dependencies": { + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + } + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", + "dev": true + }, + "tslib": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha1-43qG/ajLuvI6BX9HPJ9Nxk5fwug=", + "dev": true + }, + "tsutils": { + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.19.1.tgz", + "integrity": "sha1-dtfr3qnXp79KBfUOrTcBsBaHCNc=", + "dev": true, + "requires": { + "tslib": "1.9.0" + } + } + } + }, + "typescript": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz", + "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=", + "dev": true + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "dev": true, + "requires": { + "clone": "1.0.3", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "winston": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz", + "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=", + "dev": true, + "requires": { + "async": "1.0.0", + "colors": "1.0.3", + "cycle": "1.0.3", + "eyes": "0.1.8", + "isstream": "0.1.2", + "stack-trace": "0.0.10" + }, + "dependencies": { + "async": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", + "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=", + "dev": true + }, + "colors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", + "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", + "dev": true + }, + "cycle": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", + "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", + "dev": true + }, + "eyes": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", + "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "dev": true + } + } + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + } + } +} diff --git a/package.json b/package.json index fd9ff6759..a6d6ed4e6 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "istanbul": "0.4.5", "mocha": "3.5.3", "mousse": "0.3.1", - "remap-istanbul": "0.9.5", + "remap-istanbul": "0.9.6", "rimraf": "2.6.2", "sinon": "4.0.0", "tslint": "5.7.0", From 837132478debfba08ffe5b749980c278103f8020 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 9 Feb 2018 09:02:45 -0500 Subject: [PATCH 066/685] fixes broken Licensing appendix link in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 005ae20dc..ef15760a7 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ http://groups.google.com/group/hazelcast # License -Hazelcast is available under the Apache 2 License. Please see the [Licensing appendix](http://docs.hazelcast.org/docs/latest/manual/html-single/hazelcast-documentation.html#license-questions) for more information. +Hazelcast is available under the Apache 2 License. Please see the [Licensing appendix](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#license-questions) for more information. # Copyright From c4eab1025bc815e365f7e68f7338cb22e3436576 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 22 Jan 2018 11:49:06 +0300 Subject: [PATCH 067/685] aggregations --- src/aggregation/Aggregator.ts | 245 ++++++++++++++++++++++ src/aggregation/AggregatorFactory.ts | 87 ++++++++ src/aggregation/Aggregators.ts | 163 ++++++++++++++ src/index.ts | 4 +- src/proxy/IMap.ts | 32 +++ src/proxy/MapProxy.ts | 23 ++ src/serialization/SerializationService.ts | 2 + test/map/MapAggregatorsDoubleTest.js | 179 ++++++++++++++++ test/map/MapAggregatorsIntTest.js | 111 ++++++++++ test/map/MapAggregatorsLongTest.js | 97 +++++++++ 10 files changed, 942 insertions(+), 1 deletion(-) create mode 100644 src/aggregation/Aggregator.ts create mode 100644 src/aggregation/AggregatorFactory.ts create mode 100644 src/aggregation/Aggregators.ts create mode 100644 test/map/MapAggregatorsDoubleTest.js create mode 100644 test/map/MapAggregatorsIntTest.js create mode 100644 test/map/MapAggregatorsLongTest.js diff --git a/src/aggregation/Aggregator.ts b/src/aggregation/Aggregator.ts new file mode 100644 index 000000000..7df6eb30a --- /dev/null +++ b/src/aggregation/Aggregator.ts @@ -0,0 +1,245 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {IdentifiedDataSerializable} from '../serialization/Serializable'; +import {DataInput, DataOutput} from '../serialization/Data'; +import * as Long from 'long'; +import {AggregatorFactory} from './AggregatorFactory'; + +export interface Aggregator { + +} + +export abstract class AbstractAggregator implements IdentifiedDataSerializable, Aggregator { + protected attributePath: string; + + constructor(attributePath?: string) { + this.attributePath = attributePath; + } + + getFactoryId(): number { + return AggregatorFactory.FACTORY_ID; + } + + abstract getClassId(): number; + + abstract readData(input: DataInput): any; + + abstract writeData(output: DataOutput): void; +} + + +export class CountAggregator extends AbstractAggregator { + readData(input: DataInput) { + this.attributePath = input.readUTF(); + //member side field, not used in client + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + //member side field, not used in client + output.writeLong(Long.ZERO); + } + + getClassId(): number { + return AggregatorFactory.COUNT; + } +} + +export class DoubleAverageAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.DOUBLE_AVG; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readDouble(); + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeDouble(0); + output.writeLong(Long.ZERO); + } +} + +export class DoubleSumAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.DOUBLE_SUM; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readDouble(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeDouble(0); + } +} + +export class NumberAverageAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.NUMBER_AVG; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readDouble(); + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeDouble(0); + output.writeLong(Long.ZERO); + } +} + +export class FixedPointSumAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.FIXED_SUM; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeLong(Long.ZERO); + } +} + +export class FloatingPointSumAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.FLOATING_POINT_SUM; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readDouble(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeDouble(0); + } +} + +export class MaxAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.MAX; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readObject(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeObject(null); + } +} + +export class MinAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.MIN; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readObject(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeObject(null); + } +} + +export class IntegerAverageAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.INT_AVG; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readLong(); + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeLong(Long.ZERO); + output.writeLong(Long.ZERO); + } +} + +export class IntegerSumAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.INT_SUM; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeLong(Long.ZERO); + } +} + +export class LongAverageAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.LONG_AVG; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readLong(); + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeLong(Long.ZERO); + output.writeLong(Long.ZERO); + } +} + +export class LongSumAggregator extends AbstractAggregator { + getClassId(): number { + return AggregatorFactory.LONG_SUM; + } + + readData(input: DataInput): any { + this.attributePath = input.readUTF(); + input.readLong(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.attributePath); + output.writeLong(Long.ZERO); + } +} diff --git a/src/aggregation/AggregatorFactory.ts b/src/aggregation/AggregatorFactory.ts new file mode 100644 index 000000000..2728b5e2b --- /dev/null +++ b/src/aggregation/AggregatorFactory.ts @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../serialization/Serializable'; +import { + Aggregator, + CountAggregator, + DoubleAverageAggregator, + DoubleSumAggregator, + FixedPointSumAggregator, + FloatingPointSumAggregator, + IntegerAverageAggregator, + IntegerSumAggregator, + LongAverageAggregator, + LongSumAggregator, + MaxAggregator, + MinAggregator, + NumberAverageAggregator +} from './Aggregator'; +import {LoggingService} from '../logging/LoggingService'; + +export class AggregatorFactory implements IdentifiedDataSerializableFactory { + + private logger = LoggingService.getLoggingService(); + static readonly FACTORY_ID = -41; + + static readonly BIG_DECIMAL_AVG = 0; //not implemented in node.js + static readonly BIG_DECIMAL_SUM = 1; //not implemented in node.js + static readonly BIG_INT_AVG = 2; //not implemented in node.js + static readonly BIG_INT_SUM = 3; //not implemented in node.js + static readonly COUNT = 4; + static readonly DISTINCT = 5; //returns java serializable, not usable in node.js + static readonly DOUBLE_AVG = 6; + static readonly DOUBLE_SUM = 7; + static readonly FIXED_SUM = 8; + static readonly FLOATING_POINT_SUM = 9; + static readonly INT_AVG = 10; + static readonly INT_SUM = 11; + static readonly LONG_AVG = 12; + static readonly LONG_SUM = 13; + static readonly MAX = 14; + static readonly MIN = 15; + static readonly NUMBER_AVG = 16; + static readonly MAX_BY = 17; //needs object to implement Java's Comparable interface + static readonly MIN_BY = 18; //needs object to implement Java's Comparable interface + + private idToConstructor: {[id: number]: Aggregator} = {}; + + constructor() { + this.idToConstructor[AggregatorFactory.COUNT] = CountAggregator; + this.idToConstructor[AggregatorFactory.DOUBLE_AVG] = DoubleAverageAggregator; + this.idToConstructor[AggregatorFactory.DOUBLE_SUM] = DoubleSumAggregator; + this.idToConstructor[AggregatorFactory.FIXED_SUM] = FixedPointSumAggregator; + this.idToConstructor[AggregatorFactory.FLOATING_POINT_SUM] = FloatingPointSumAggregator; + this.idToConstructor[AggregatorFactory.INT_AVG] = IntegerAverageAggregator; + this.idToConstructor[AggregatorFactory.INT_SUM] = IntegerSumAggregator; + this.idToConstructor[AggregatorFactory.LONG_AVG] = LongAverageAggregator; + this.idToConstructor[AggregatorFactory.LONG_SUM] = LongSumAggregator; + this.idToConstructor[AggregatorFactory.MAX] = MaxAggregator; + this.idToConstructor[AggregatorFactory.MIN] = MinAggregator; + this.idToConstructor[AggregatorFactory.NUMBER_AVG] = NumberAverageAggregator; + + } + create(type: number): IdentifiedDataSerializable { + try { + return (new (this.idToConstructor[type])()); + } catch (e) { + this.logger.error('Aggregatorfactory', 'There is no known aggregator with type id ' + type, e); + return null; + } + } + + +} diff --git a/src/aggregation/Aggregators.ts b/src/aggregation/Aggregators.ts new file mode 100644 index 000000000..9560c2f92 --- /dev/null +++ b/src/aggregation/Aggregators.ts @@ -0,0 +1,163 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import { + CountAggregator, + DoubleAverageAggregator, + DoubleSumAggregator, + FixedPointSumAggregator, + FloatingPointSumAggregator, + IntegerAverageAggregator, + IntegerSumAggregator, + LongAverageAggregator, + LongSumAggregator, + MaxAggregator, + MinAggregator, + NumberAverageAggregator +} from './Aggregator'; +import * as Long from 'long'; + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that counts the input values. + * Accepts nulls as input values. + * Aggregation result type Long. + */ +export function count(attributePath?: string): CountAggregator { + return new CountAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the average of the input values. + * Does NOT accept null input values. + * Accepts only Double input values (primitive and boxed). + * Aggregation result type is number. + */ +export function doubleAvg(attributePath?: string): DoubleAverageAggregator { + return new DoubleAverageAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the sum of the input values. + * Does NOT accept null input values. + * Accepts only Double input values (primitive and boxed). + * Aggregation result type is Double. + */ +export function doubleSum(attributePath?: string): DoubleSumAggregator { + return new DoubleSumAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the average of the input values. + * Does NOT accept null input values. + * Accepts generic Number input values. + * Aggregation result type is Double. + */ +export function numberAvg(attributePath?: string): NumberAverageAggregator { + return new NumberAverageAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the sum of the input values. + * Does NOT accept null input values. + * Accepts generic Number input values. + * Aggregation result type is {Long}. + */ +export function fixedPointSum(attributePath?: string): FixedPointSumAggregator { + return new FixedPointSumAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the sum of the input values. + * Does NOT accept null input values. + * Accepts generic Number input values. + * Aggregation result type is number. + */ +export function floatingPointSum(attributePath?: string): FloatingPointSumAggregator { + return new FloatingPointSumAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @param type of the input object. + * @return an aggregator that calculates the max of the input values. + * Accepts null input values. + * Aggregation result type is + */ +export function max(attributePath?: string): MaxAggregator { + return new MaxAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @param type of the input object. + * @return an aggregator that calculates the min of the input values. + * Accepts null input values. + * Aggregation result type is + */ +export function min(attributePath?: string): MinAggregator { + return new MinAggregator(attributePath); +} + + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the average of the input values. + * Does NOT accept null input values. + * Accepts only Integer input values (primitive and boxed). + * Aggregation result type is number. + */ +export function integerAvg(attributePath?: string): IntegerAverageAggregator { + return new IntegerAverageAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the sum of the input values. + * Does NOT accept null input values. + * Accepts only Integer input values (primitive and boxed). + * Aggregation result type is {Long}. + */ +export function integerSum(attributePath?: string): IntegerSumAggregator { + return new IntegerSumAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the average of the input values. + * Does NOT accept null input values. + * Accepts only Long input values (primitive and boxed). + * Aggregation result type is number. + */ +export function longAvg(attributePath?: string): LongAverageAggregator { + return new LongAverageAggregator(attributePath); +} + +/** + * @param attributePath extracts values from this path if given + * @return an aggregator that calculates the sum of the input values. + * Does NOT accept null input values. + * Accepts only Long input values (primitive and boxed). + * Aggregation result type is {Long}. + */ +export function longSum(attributePath?: string): LongSumAggregator { + return new LongSumAggregator(attributePath); +} diff --git a/src/index.ts b/src/index.ts index 0f0aa45cc..091a23352 100644 --- a/src/index.ts +++ b/src/index.ts @@ -23,6 +23,7 @@ import Address = require('./Address'); import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); import * as HazelcastErrors from './HazelcastError'; import {IterationType} from './core/Predicate'; +import * as Aggregators from './aggregation/Aggregators'; export { HazelcastClient as Client, @@ -33,5 +34,6 @@ export { Predicates, TopicOverloadPolicy, HazelcastErrors, - IterationType + IterationType, + Aggregators }; diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index c9c115306..09e1a692c 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -20,8 +20,40 @@ import {EntryView} from '../core/EntryView'; import {IMapListener} from '../core/MapListener'; import {Predicate} from '../core/Predicate'; import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; +import {Aggregator} from '../aggregation/Aggregator'; export interface IMap extends DistributedObject { + /** + * Applies the aggregation logic on all map entries and returns the result + *

+ * Fast-Aggregations are the successor of the Map-Reduce Aggregators. + * They are equivalent to the Map-Reduce Aggregators in most of the use-cases, but instead of running on the Map-Reduce + * engine they run on the Query infrastructure. Their performance is tens to hundreds times better due to the fact + * that they run in parallel for each partition and are highly optimized for speed and low memory consumption. + * + * @requires Hazelcast 3.8 + * @param aggregator aggregator to aggregate the entries with + * @param type of the result + * @return the result of the given type + */ + aggregate(aggregator: Aggregator): Promise; + + /** + * Applies the aggregation logic on map entries filtered with the Predicated and returns the result + *

+ * Fast-Aggregations are the successor of the Map-Reduce Aggregators. + * They are equivalent to the Map-Reduce Aggregators in most of the use-cases, but instead of running on the Map-Reduce + * engine they run on the Query infrastructure. Their performance is tens to hundreds times better due to the fact + * that they run in parallel for each partition and are highly optimized for speed and low memory consumption. + * + * @requires Hazelcast 3.8 + * @param aggregator aggregator to aggregate the entries with + * @param predicate predicate to filter the entries with + * @param type of the result + * @return the result of the given type + */ + aggregateWithPredicate(aggregator: Aggregator, predicate: Predicate): Promise; + /** * Adds an index to this map for the specified entries so that queries can run faster. * @param attribute index attribute of value diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 9f5aa4703..62730cfd7 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -76,8 +76,25 @@ import {MapExecuteOnKeysCodec} from '../codec/MapExecuteOnKeysCodec'; import * as SerializationUtil from '../serialization/SerializationUtil'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import ClientMessage = require('../ClientMessage'); +import {Aggregator} from '../aggregation/Aggregator'; +import {MapAggregateCodec} from '../codec/MapAggregateCodec'; +import {MapAggregateWithPredicateCodec} from '../codec/MapAggregateWithPredicateCodec'; export class MapProxy extends BaseProxy implements IMap { + aggregate(aggregator: Aggregator): Promise { + assertNotNull(aggregator); + let aggregatorData = this.toData(aggregator); + return this.encodeInvokeOnRandomTarget(MapAggregateCodec, aggregatorData); + } + + aggregateWithPredicate(aggregator: Aggregator, predicate: Predicate): Promise { + assertNotNull(aggregator); + assertNotNull(predicate); + this.checkNotPagingPredicate(predicate); + let aggregatorData = this.toData(aggregator); + let predicateData = this.toData(predicate); + return this.encodeInvokeOnRandomTarget(MapAggregateWithPredicateCodec, aggregatorData, predicateData); + } executeOnKeys(keys: K[], entryProcessor: IdentifiedDataSerializable|Portable): Promise { assertNotNull(keys); @@ -658,6 +675,12 @@ export class MapProxy extends BaseProxy implements IMap { }; } + private checkNotPagingPredicate(v: Predicate): void { + if (v instanceof PagingPredicate) { + throw new RangeError('Paging predicate is not supported.'); + } + } + } diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 770933d80..f473d4807 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -33,6 +33,7 @@ import {PredicateFactory, PREDICATE_FACTORY_ID} from './PredicateFactory'; import {RELIABLE_TOPIC_MESSAGE_FACTORY_ID, ReliableTopicMessageFactory} from '../proxy/topic/RawTopicMessage'; import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; import {ClusterDataFactory} from '../ClusterDataFactory'; +import {AggregatorFactory} from '../aggregation/AggregatorFactory'; export interface SerializationService { toData(object: any, paritioningStrategy?: any) : Data; @@ -258,6 +259,7 @@ export class SerializationServiceV1 implements SerializationService { factories[PREDICATE_FACTORY_ID] = new PredicateFactory(DefaultPredicates); factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = new ReliableTopicMessageFactory(); factories[ClusterDataFactoryHelper.FACTORY_ID] = new ClusterDataFactory(); + factories[AggregatorFactory.FACTORY_ID] = new AggregatorFactory(); this.registerSerializer('identified', new IdentifiedDataSerializableSerializer(factories)); } diff --git a/test/map/MapAggregatorsDoubleTest.js b/test/map/MapAggregatorsDoubleTest.js new file mode 100644 index 000000000..eae2ca1f8 --- /dev/null +++ b/test/map/MapAggregatorsDoubleTest.js @@ -0,0 +1,179 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Controller = require('../RC'); +var Client = require('../../').Client; +var Aggregators = require('../../').Aggregators; +var Predicates = require('../../').Predicates; +var _fillMap = require('../Util').fillMap; +var expect = require('chai').expect; + +describe('MapAggregatorsDoubleTest', function () { + var cluster; + var client; + var map; + + before(function () { + return Controller.createCluster(null, null).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }).then(function () { + return Client.newHazelcastClient(); + }).then(function (cl) { + client = cl; + map = client.getMap('aggregatorsMap'); + }); + }); + + after(function() { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + beforeEach(function () { + return _fillMap(map, 50, 'key', 0); + }); + + afterEach(function () { + return map.destroy(); + }); + + it('count', function () { + return map.aggregate(Aggregators.count()).then(function (count) { + return expect(count.toNumber()).to.equal(50); + }); + }); + + it('count with attribute path', function () { + return map.aggregate(Aggregators.count('this')).then(function (count) { + return expect(count.toNumber()).to.equal(50); + }); + }); + + it('count with predicate', function () { + return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterEqual('this', 1)).then(function (count) { + return expect(count.toNumber()).to.equal(49); + }); + }); + + it('doubleAvg', function () { + return map.aggregate(Aggregators.doubleAvg()).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('doubleAvg with attribute path', function () { + return map.aggregate(Aggregators.doubleAvg('this')).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('doubleAvg with predicate', function () { + return map.aggregateWithPredicate(Aggregators.doubleAvg(), Predicates.greaterEqual('this', 47)).then(function (avg) { + return expect(avg).to.equal(48); + }); + }); + + it('doubleSum', function () { + return map.aggregate(Aggregators.doubleSum()).then(function (sum) { + return expect(sum).to.equal(1225); + }); + }); + + it('doubleSum with attribute path', function () { + return map.aggregate(Aggregators.doubleSum('this')).then(function (sum) { + return expect(sum).to.equal(1225); + }); + }); + + it('doubleSum with predicate', function () { + return map.aggregateWithPredicate(Aggregators.doubleSum(), Predicates.greaterEqual('this', 47)).then(function (avg) { + return expect(avg).to.equal(144); + }); + }); + + it('floatingPointSum', function () { + return map.aggregate(Aggregators.floatingPointSum()).then(function (sum) { + return expect(sum).to.equal(1225); + }); + }); + + it('floatingPointSum with attribute path', function () { + return map.aggregate(Aggregators.floatingPointSum('this')).then(function (sum) { + return expect(sum).to.equal(1225); + }); + }); + + it('floatingPointSum with predicate', function () { + return map.aggregateWithPredicate(Aggregators.floatingPointSum(), Predicates.greaterEqual('this', 47)).then(function (sum) { + return expect(sum).to.equal(144); + }); + }); + + it('numberAvg', function () { + return map.aggregate(Aggregators.numberAvg()).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('numberAvg with attribute path', function () { + return map.aggregate(Aggregators.numberAvg('this')).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('numberAvg with predicate', function () { + return map.aggregateWithPredicate(Aggregators.numberAvg(), Predicates.greaterEqual('this', 47)).then(function (avg) { + return expect(avg).to.equal(48); + }); + }); + + it('max', function () { + return map.aggregate(Aggregators.max()).then(function (avg) { + return expect(avg).to.equal(49); + }); + }); + + it('max with attribute path', function () { + return map.aggregate(Aggregators.max('this')).then(function (avg) { + return expect(avg).to.equal(49); + }); + }); + + it('max with predicate', function () { + return map.aggregateWithPredicate(Aggregators.max(), Predicates.lessEqual('this', 3)).then(function (avg) { + return expect(avg).to.equal(3); + }); + }); + + it('min', function () { + return map.aggregate(Aggregators.min()).then(function (avg) { + return expect(avg).to.equal(0); + }); + }); + + it('min with attribute path', function () { + return map.aggregate(Aggregators.min('this')).then(function (avg) { + return expect(avg).to.equal(0); + }); + }); + + it('min with predicate', function () { + return map.aggregateWithPredicate(Aggregators.min(), Predicates.greaterEqual('this', 3)).then(function (avg) { + return expect(avg).to.equal(3); + }); + }); +}); diff --git a/test/map/MapAggregatorsIntTest.js b/test/map/MapAggregatorsIntTest.js new file mode 100644 index 000000000..e25894575 --- /dev/null +++ b/test/map/MapAggregatorsIntTest.js @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Controller = require('../RC'); +var Client = require('../../').Client; +var Config = require('../../.').Config; +var Aggregators = require('../../').Aggregators; +var Predicates = require('../../').Predicates; +var _fillMap = require('../Util').fillMap; +var expect = require('chai').expect; + +describe('MapAggregatorsIntTest', function () { + var cluster; + var client; + var map; + + before(function () { + var cfg = new Config.ClientConfig(); + cfg.serializationConfig.defaultNumberType = 'integer'; + return Controller.createCluster(null, null).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }).then(function () { + return Client.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; + map = client.getMap('aggregatorsMap'); + }); + }); + + after(function() { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + beforeEach(function () { + return _fillMap(map, 50, 'key', 0); + }); + + afterEach(function () { + return map.destroy(); + }); + + it('intAvg', function () { + return map.aggregate(Aggregators.integerAvg()).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('intAvg with attribute path', function () { + return map.aggregate(Aggregators.integerAvg('this')).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('intAvg with predicate', function () { + return map.aggregateWithPredicate(Aggregators.integerAvg(), Predicates.greaterEqual('this', 47)).then(function (avg) { + return expect(avg).to.equal(48); + }); + }); + + it('intSum', function () { + return map.aggregate(Aggregators.integerSum()).then(function (sum) { + return expect(sum.toNumber()).to.equal(1225); + }); + }); + + it('intSum with attribute path', function () { + return map.aggregate(Aggregators.integerSum('this')).then(function (sum) { + return expect(sum.toNumber()).to.equal(1225); + }); + }); + + it('intSum with predicate', function () { + return map.aggregateWithPredicate(Aggregators.integerSum(), Predicates.greaterEqual('this', 47)).then(function (sum) { + return expect(sum.toNumber()).to.equal(144); + }); + }); + + + it('fixedPointSum', function () { + return map.aggregate(Aggregators.fixedPointSum()).then(function (sum) { + return expect(sum.toNumber()).to.equal(1225); + }); + }); + + it('fixedPointSum with attribute path', function () { + return map.aggregate(Aggregators.fixedPointSum('this')).then(function (sum) { + return expect(sum.toNumber()).to.equal(1225); + }); + }); + + it('fixedPointSum with predicate', function () { + return map.aggregateWithPredicate(Aggregators.fixedPointSum(), Predicates.greaterEqual('this', 47)).then(function (sum) { + return expect(sum.toNumber()).to.equal(144); + }); + }); +}); diff --git a/test/map/MapAggregatorsLongTest.js b/test/map/MapAggregatorsLongTest.js new file mode 100644 index 000000000..4a30c99f5 --- /dev/null +++ b/test/map/MapAggregatorsLongTest.js @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Controller = require('../RC'); +var Client = require('../../').Client; +var Config = require('../../.').Config; +var Aggregators = require('../../').Aggregators; +var Predicates = require('../../').Predicates; +var Long = require('long'); +var expect = require('chai').expect; + +describe('MapAggregatorsLongTest', function () { + var cluster; + var client; + var map; + var entryCount = 50; + + before(function () { + var cfg = new Config.ClientConfig(); + cfg.serializationConfig.defaultNumberType = 'long'; + return Controller.createCluster(null, null).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }).then(function () { + return Client.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; + map = client.getMap('aggregatorsMap'); + }); + }); + + after(function() { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + beforeEach(function () { + var entries = []; + for (var i = 0; i < entryCount; i++) { + entries.push(['key' + i, Long.fromNumber(i)]); + } + return map.putAll(entries); + }); + + afterEach(function () { + return map.destroy(); + }); + + it('longAvg', function () { + return map.aggregate(Aggregators.longAvg()).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('longAvg with attribute path', function () { + return map.aggregate(Aggregators.longAvg('this')).then(function (avg) { + return expect(avg).to.equal(24.5); + }); + }); + + it('longAvg with predicate', function () { + return map.aggregateWithPredicate(Aggregators.longAvg(), Predicates.greaterEqual('this', Long.fromNumber(47))).then(function (avg) { + return expect(avg).to.equal(48); + }); + }); + + it('longSum', function () { + return map.aggregate(Aggregators.longSum()).then(function (sum) { + return expect(sum.toNumber()).to.equal(1225); + }); + }); + + it('longSum with attribute path', function () { + return map.aggregate(Aggregators.longSum('this')).then(function (sum) { + return expect(sum.toNumber()).to.equal(1225); + }); + }); + + it('longSum with predicate', function () { + return map.aggregateWithPredicate(Aggregators.longSum(), Predicates.greaterEqual('this', Long.fromNumber(47))).then(function (sum) { + return expect(sum.toNumber()).to.equal(144); + }); + }); +}); From 5f741cd3d7f9ac4d2f6c28b4c96c4a5417d13648 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 12 Feb 2018 19:05:42 +0300 Subject: [PATCH 068/685] make ttl optional in put operation --- src/proxy/IReplicatedMap.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proxy/IReplicatedMap.ts b/src/proxy/IReplicatedMap.ts index 6064a2378..c3972c602 100644 --- a/src/proxy/IReplicatedMap.ts +++ b/src/proxy/IReplicatedMap.ts @@ -32,7 +32,7 @@ export interface IReplicatedMap extends DistributedObject { * @param ttl milliseconds to be associated with the specified key-value pair. * @return old value if there was any, `null` otherwise. */ - put(key: K, value: V, ttl: Long|number): Promise; + put(key: K, value: V, ttl?: Long|number): Promise; /** * The clear operation wipes data out of the replicated maps. From 836c725043d3e84bb38100a5e7f017f49083a513 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 14 Feb 2018 14:31:21 -0500 Subject: [PATCH 069/685] refactor cluster connection --- src/HeartbeatService.ts | 14 ++-- src/ListenerService.ts | 6 +- src/invocation/ClientConnection.ts | 77 ++++++------------ src/invocation/ClientConnectionManager.ts | 98 +++++++++++++++++------ src/invocation/ClusterService.ts | 83 +++++++++---------- src/invocation/ConnectionAuthenticator.ts | 2 +- test/ClusterServiceTest.js | 34 ++++---- test/HeartbeatTest.js | 9 +-- test/ssl/ClientSSLAuthenticationTest.js | 1 + 9 files changed, 173 insertions(+), 151 deletions(-) diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts index cebd85b98..82f9c2efd 100644 --- a/src/HeartbeatService.ts +++ b/src/HeartbeatService.ts @@ -70,10 +70,10 @@ export class Heartbeat { for (let address in estConnections) { if ( estConnections[address]) { let conn = estConnections[address]; - let timeSinceLastRead = new Date().getTime() - conn.lastRead; + let timeSinceLastRead = new Date().getTime() - conn.getLastRead(); if (timeSinceLastRead > this.heartbeatTimeout) { - if (conn.heartbeating) { - conn.heartbeating = false; + if (conn.isHeartbeating()) { + conn.setHeartbeating(false); this.onHeartbeatStopped(conn); } } @@ -87,8 +87,8 @@ export class Heartbeat { } }); } else { - if (!conn.heartbeating) { - conn.heartbeating = true; + if (!conn.isHeartbeating()) { + conn.setHeartbeating(true); this.onHeartbeatRestored(conn); } } @@ -98,7 +98,7 @@ export class Heartbeat { } private onHeartbeatStopped(connection: ClientConnection) { - this.logger.warn('HeartbeatService', 'Heartbeat stopped on ' + connection.address.toString()); + this.logger.warn('HeartbeatService', 'Heartbeat stopped on ' + connection.toString()); this.listeners.forEach((listener) => { if (listener.hasOwnProperty('onHeartbeatStopped')) { setImmediate(listener.onHeartbeatStopped.bind(this), connection); @@ -107,7 +107,7 @@ export class Heartbeat { } private onHeartbeatRestored(connection: ClientConnection) { - this.logger.warn('HeartbeatService', 'Heartbeat restored on ' + connection.address.toString()); + this.logger.warn('HeartbeatService', 'Heartbeat restored on ' + connection.toString()); this.listeners.forEach((listener) => { if (listener.hasOwnProperty('onHeartbeatRestored')) { setImmediate(listener.onHeartbeatRestored.bind(this), connection); diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 495702135..51f9ac30b 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -138,7 +138,7 @@ export class ListenerService implements ConnectionHeartbeatListener { var response = codec.decodeAddResponse(responseMessage); var eventRegistration = new ClientEventRegistration(response, correlationId, invocation.connection, codec); this.logger.debug('ListenerService', - 'Listener ' + userRegistrationKey + ' re-registered on ' + connection.address.toString()); + 'Listener ' + userRegistrationKey + ' re-registered on ' + connection.toString()); deferred.resolve(eventRegistration); }).catch((e => { @@ -194,7 +194,7 @@ export class ListenerService implements ConnectionHeartbeatListener { let response = codec.decodeAddResponse(responseMessage); let clientEventRegistration = new ClientEventRegistration(response, correlationId, invocation.connection, codec); this.logger.debug('ListenerService', - 'Listener ' + userRegistrationKey + ' registered on ' + invocation.connection.address.toString()); + 'Listener ' + userRegistrationKey + ' registered on ' + invocation.connection.toString()); connectionsOnUserKey.set(activeConnections[address], clientEventRegistration); }).then(() => { deferred.resolve(userRegistrationKey); @@ -223,7 +223,7 @@ export class ListenerService implements ConnectionHeartbeatListener { registrationsOnUserKey.delete(connection); this.client.getInvocationService().removeEventHandler(eventRegistration.correlationId.low); this.logger.debug('ListenerService', - 'Listener ' + userRegistrationKey + ' unregistered from ' + invocation.connection.address.toString()); + 'Listener ' + userRegistrationKey + ' unregistered from ' + invocation.connection.toString()); this.activeRegistrations.delete(userRegistrationKey); this.userRegistrationKeyInformation.delete(userRegistrationKey); deferred.resolve(true); diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 0673a283a..621241f58 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -15,38 +15,32 @@ */ import net = require('net'); -import tls = require('tls'); -import stream = require('stream'); import Address = require('../Address'); import * as Promise from 'bluebird'; import {BitsUtil} from '../BitsUtil'; -import {LoggingService} from '../logging/LoggingService'; -import {ClientNetworkConfig} from '../Config'; -import {ClientConnectionManager} from './ClientConnectionManager'; import {BuildMetadata} from '../BuildMetadata'; +import HazelcastClient from '../HazelcastClient'; export class ClientConnection { - address: Address; - localAddress: Address; - socket: stream.Duplex; - lastRead: number; - heartbeating = true; - + private address: Address; + private localAddress: Address; + private lastRead: number; + private heartbeating = true; + private client: HazelcastClient; private readBuffer: Buffer; - private logging = LoggingService.getLoggingService(); - private clientNetworkConfig: ClientNetworkConfig; - private connectionManager: ClientConnectionManager; private closedTime: number; private connectedServerVersionString: string; private connectedServerVersion: number; private authenticatedAsOwner: boolean; + private socket: net.Socket; - constructor(connectionManager: ClientConnectionManager, address: Address, clientNetworkConfig: ClientNetworkConfig) { + constructor(client: HazelcastClient, address: Address, socket: net.Socket) { + this.client = client; + this.socket = socket; this.address = address; - this.clientNetworkConfig = clientNetworkConfig; + this.localAddress = new Address(socket.localAddress, socket.localPort); this.readBuffer = new Buffer(0); this.lastRead = 0; - this.connectionManager = connectionManager; this.closedTime = 0; this.connectedServerVersionString = null; this.connectedServerVersion = BuildMetadata.UNKNOWN_VERSION_ID; @@ -68,41 +62,8 @@ export class ClientConnection { return this.address; } - /** - * Connects to remote server and sets the hazelcast protocol. - * @returns - */ - connect(): Promise { - var ready = Promise.defer(); - - var conCallback = () => { - // Send the protocol version - var buffer = new Buffer(3); - buffer.write('CB2'); - this.socket.write(buffer); - ready.resolve(this); - }; - - if (this.clientNetworkConfig.sslOptions) { - var sslSocket = tls.connect(this.address.port, this.address.host, this.clientNetworkConfig.sslOptions, conCallback); - this.localAddress = new Address(sslSocket.address().address, sslSocket.address().port); - this.socket = sslSocket as stream.Duplex; - } else { - var netSocket = net.connect(this.address.port, this.address.host, conCallback); - this.localAddress = new Address(netSocket.localAddress, netSocket.localPort); - this.socket = netSocket as stream.Duplex; - } - - this.socket.on('error', (e: any) => { - this.logging.warn('ClientConnection', - 'Could not connect to address ' + this.address.toString(), e); - ready.reject(e); - if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { - this.connectionManager.destroyConnection(this.address); - } - }); - - return ready.promise; + setAddress(address: Address): void { + this.address = address; } write(buffer: Buffer): Promise { @@ -142,6 +103,14 @@ export class ClientConnection { return this.closedTime === 0; } + isHeartbeating(): boolean { + return this.heartbeating; + } + + setHeartbeating(heartbeating: boolean): void { + this.heartbeating = heartbeating; + } + isAuthenticatedAsOwner(): boolean { return this.authenticatedAsOwner; } @@ -150,6 +119,10 @@ export class ClientConnection { this.authenticatedAsOwner = asOwner; } + getLastRead(): number { + return this.lastRead; + } + toString(): string { return this.address.toString(); } diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 42ca2c82d..9919cc52e 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -22,6 +22,8 @@ import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; import {ClientConnection} from './ClientConnection'; import {ConnectionAuthenticator} from './ConnectionAuthenticator'; import Address = require('../Address'); +import * as net from 'net'; +import * as tls from 'tls'; const EMIT_CONNECTION_CLOSED = 'connectionClosed'; const EMIT_CONNECTION_OPENED = 'connectionOpened'; @@ -52,48 +54,97 @@ export class ClientConnectionManager extends EventEmitter { * @returns {Promise|Promise} */ getOrConnect(address: Address, ownerConnection: boolean = false): Promise { - var addressIndex = address.toString(); - var result: Promise.Resolver = Promise.defer(); - - var establishedConnection = this.establishedConnections[addressIndex]; + let addressIndex = address.toString(); + let connectionResolver: Promise.Resolver = Promise.defer(); + let establishedConnection = this.establishedConnections[addressIndex]; if (establishedConnection) { - result.resolve(establishedConnection); - return result.promise; + connectionResolver.resolve(establishedConnection); + return connectionResolver.promise; } - var pendingConnection = this.pendingConnections[addressIndex]; - + let pendingConnection = this.pendingConnections[addressIndex]; if (pendingConnection) { return pendingConnection.promise; } - this.pendingConnections[addressIndex] = result; + this.pendingConnections[addressIndex] = connectionResolver; + + let processResponseCallback = (data: Buffer) => { + this.client.getInvocationService().processResponse(data); + }; - var clientConnection = new ClientConnection(this.client.getConnectionManager(), address, - this.client.getConfig().networkConfig); + this.triggerConnect(address).then((socket: net.Socket) => { + let clientConnection = new ClientConnection(this.client, address, socket); - clientConnection.connect().then(() => { - clientConnection.registerResponseCallback((data: Buffer) => { - this.client.getInvocationService().processResponse(data); + return this.initiateCommunication(clientConnection).then(() => { + return clientConnection.registerResponseCallback(processResponseCallback); + }).then(() => { + return this.authenticate(clientConnection, ownerConnection); + }).then(() => { + this.establishedConnections[clientConnection.getAddress().toString()] = clientConnection; + this.onConnectionOpened(clientConnection); + connectionResolver.resolve(clientConnection); }); - }).then(() => { - return this.authenticate(clientConnection, ownerConnection); - }).then(() => { - this.establishedConnections[clientConnection.address.toString()] = clientConnection; - this.onConnectionOpened(clientConnection); - result.resolve(clientConnection); }).catch((e: any) => { - result.resolve(null); + connectionResolver.resolve(null); }).finally(() => { delete this.pendingConnections[addressIndex]; }); let connectionTimeout = this.client.getConfig().networkConfig.connectionTimeout; if (connectionTimeout !== 0) { - return result.promise.timeout(connectionTimeout, new HazelcastError('Connection timed-out')); + return connectionResolver.promise.timeout(connectionTimeout, new HazelcastError('Connection timed-out')); } - return result.promise; + return connectionResolver.promise; + } + + private triggerConnect(address: Address): Promise { + if (this.client.getConfig().networkConfig.sslOptions) { + let opts = this.client.getConfig().networkConfig.sslOptions; + return this.connectTLSSocket(address, opts); + } else { + return this.connectNetSocket(address); + } + } + + private connectTLSSocket(address: Address, configOpts: any): Promise { + let connectionResolver = Promise.defer(); + let socket = tls.connect(address.port, address.host, configOpts); + socket.once('secureConnect', () => { + connectionResolver.resolve(socket); + }); + socket.on('error', (e: any) => { + this.logger.warn('ClientConnectionManager', 'Could not connect to address ' + address.toString(), e); + connectionResolver.reject(e); + if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { + this.destroyConnection(address); + } + }); + return connectionResolver.promise; + } + + private connectNetSocket(address: Address): Promise { + let connectionResolver = Promise.defer(); + let socket = net.connect(address.port, address.host); + socket.once('connect', () => { + connectionResolver.resolve(socket); + }); + socket.on('error', (e: any) => { + this.logger.warn('ClientConnectionManager', 'Could not connect to address ' + address.toString(), e); + connectionResolver.reject(e); + if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { + this.destroyConnection(address); + } + }); + return connectionResolver.promise; + } + + private initiateCommunication(connection: ClientConnection): Promise { + // Send the protocol version + let buffer = new Buffer(3); + buffer.write('CB2'); + return connection.write(buffer); } /** @@ -132,7 +183,6 @@ export class ClientConnectionManager extends EventEmitter { private authenticate(connection: ClientConnection, ownerConnection: boolean): Promise { var authenticator = new ConnectionAuthenticator(connection, this.client); - return authenticator.authenticate(ownerConnection); } } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index c72d58717..c306bc761 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -90,12 +90,10 @@ export class ClusterService extends EventEmitter { } else { this.knownAddresses = this.client.getConfig().networkConfig.addresses; } - var deferred = Promise.defer(); + var attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; var attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; - this.tryAddressIndex(0, attemptLimit, attemptPeriod, deferred); - - return deferred.promise; + return this.tryAddresses(0, attemptLimit, attemptPeriod); } /** @@ -146,7 +144,7 @@ export class ClusterService extends EventEmitter { } private onConnectionClosed(connection: ClientConnection) { - this.logger.warn('ClusterService', 'Connection closed to ' + connection.address.toString()); + this.logger.warn('ClusterService', 'Connection closed to ' + connection.toString()); if (connection.isAuthenticatedAsOwner()) { this.ownerConnection = null; this.connectToCluster().catch(this.client.shutdown.bind(this.client)); @@ -154,50 +152,49 @@ export class ClusterService extends EventEmitter { } private onHeartbeatStopped(connection: ClientConnection): void { - this.logger.warn('ClusterService', connection.address.toString() + ' stopped heartbeating.'); + this.logger.warn('ClusterService', connection.toString() + ' stopped heartbeating.'); if (connection.isAuthenticatedAsOwner()) { - this.client.getConnectionManager().destroyConnection(connection.address); + this.client.getConnectionManager().destroyConnection(connection.getAddress()); } } - private tryAddressIndex(index: number - , attemptLimit: number - , attemptPeriod: number - , deferred: Promise.Resolver) { - setImmediate(() => { - if (this.knownAddresses.length <= index) { - attemptLimit = attemptLimit - 1; - if (attemptLimit === 0) { - var error = new IllegalStateError('Unable to connect to any of the following addresses: ' + - this.knownAddresses.map((element: Address) => { - return element.toString(); - }).join(', ')); - deferred.reject(error); - return; - } else { - setTimeout( - this.tryAddressIndex.bind(this, 0, attemptLimit, attemptPeriod, deferred), - attemptPeriod - ); - } + private tryAddresses(index: number, attemptLimit: number, attemptPeriod: number): Promise { + if (this.knownAddresses.length <= index) { + attemptLimit = attemptLimit - 1; + if (attemptLimit === 0) { + let error = new IllegalStateError('Unable to connect to any of the following addresses: ' + + this.knownAddresses.map((element: Address) => { + return element.toString(); + }).join(', ')); + return Promise.reject(error); } else { - var currentAddress = this.knownAddresses[index]; - this.client.getConnectionManager().getOrConnect(currentAddress, true) - .then((connection: ClientConnection) => { - if (connection == null) { - throw new Error('Could not connect to ' + currentAddress.toString()); - } - connection.setAuthneticatedAsOwner(true); - this.ownerConnection = connection; - this.initMemberShipListener().then(() => { - deferred.resolve(); - }); - }).catch((e) => { - this.logger.warn('ClusterService', e); - this.tryAddressIndex(index + 1, attemptLimit, attemptPeriod, deferred); - }); + let deferred = Promise.defer(); + setTimeout( + () => { + this.tryAddresses(0, attemptLimit, attemptPeriod).then(() => { + deferred.resolve(); + }).catch((e) => { + deferred.reject(e); + }); + }, + attemptPeriod + ); + return deferred.promise; } - }); + } else { + var currentAddress = this.knownAddresses[index]; + return this.client.getConnectionManager().getOrConnect(currentAddress, true).then((connection: ClientConnection) => { + if (connection == null) { + throw new Error('Could not connect to ' + currentAddress.toString()); + } + connection.setAuthneticatedAsOwner(true); + this.ownerConnection = connection; + return this.initMemberShipListener(); + }).catch((e) => { + this.logger.warn('ClusterService', e); + return this.tryAddresses(index + 1, attemptLimit, attemptPeriod); + }); + } } /** diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index 90a1fca46..538b838ff 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -43,7 +43,7 @@ export class ConnectionAuthenticator { .then((msg: ClientMessage) => { var authResponse = ClientAuthenticationCodec.decodeResponse(msg); if (authResponse.status === 0) { - this.connection.address = authResponse.address; + this.connection.setAddress(authResponse.address); this.connection.setConnectedServerVersion(authResponse.serverHazelcastVersion); if (ownerConnection) { this.clusterService.uuid = authResponse.uuid; diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 6d62fb0f8..0c6a48c58 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -19,11 +19,13 @@ var expect = require('chai').expect; var HazelcastClient = require('../.').Client; var Config = require('../.').Config; var Promise = require('bluebird'); +var Address = require('../.').Address; describe('ClusterService', function() { this.timeout(25000); var cluster; var ownerMember; + var client; beforeEach(function(done) { Controller.createCluster(null, null).then(function(res) { @@ -102,24 +104,28 @@ describe('ClusterService', function() { }); it('should throw with message containing wrong host addresses in config', function() { - var configuredAddresses = [ - {host: '0.0.0.0', port: '5709'}, - {host: '0.0.0.1', port: '5710'} - ]; - var cfg = new Config.ClientConfig(); - cfg.networkConfig.addresses = configuredAddresses; + cfg.networkConfig.addresses = [ + new Address('0.0.0.0', 5709), + new Address('0.0.0.1', 5710) + ]; - return HazelcastClient.newHazelcastClient(cfg).then(function(newClient) { - newClient.shutdown(); - throw new Error('Client falsely started with target addresses: ' + - configuredAddresses.map(function(element) { - return element.toString(); - }).join(', ')); - }).catch(function (err) { - return Promise.all(configuredAddresses.map(function(address) { + var falseStart = false; + return HazelcastClient.newHazelcastClient(cfg).catch(function (err) { + Promise.all(cfg.networkConfig.addresses.map(function(address) { return expect(err.message).to.include(address.toString()); })); + }).then(function(client) { + if (client) { + falseStart = true; + return client.shutdown(); + } else { + return; + } + }).then(function () { + if (falseStart) { + throw Error('Client falsely started with wrong addresses') + } }); }); diff --git a/test/HeartbeatTest.js b/test/HeartbeatTest.js index 802a42b70..c06458798 100644 --- a/test/HeartbeatTest.js +++ b/test/HeartbeatTest.js @@ -19,6 +19,7 @@ var HazelcastClient = require('../.').Client; var expect = require('chai').expect; var Config = require('../.').Config; var Util = require('./Util'); +var Address = require('../.').Address; describe('Heartbeat', function() { this.timeout(30000); @@ -46,13 +47,7 @@ describe('Heartbeat', function() { client = resp; }).then(function() { client.clusterService.on('memberAdded', function(member) { - var address = { - host: member.address.host, - port: member.address.port, - toString: function() { - return member.address.host + ':' + member.address.port; - } - }; + var address = new Address(member.address.host, member.address.port); warmUpConnectionToAddressWithRetry(client, address); }); client.heartbeat.addListener({onHeartbeatStopped: function(connection) { diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 91aad5112..0ddcac153 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -62,6 +62,7 @@ describe('SSL Client Authentication Test', function () { var cfg = new Config.ClientConfig(); cfg.networkConfig.sslOptions = sslOpts; cfg.networkConfig.connectionAttemptLimit = 1; + cfg.networkConfig.connectionTimeout = 1000; return cfg; } From 0764c15d56d55b17aad3e692daf8be604d560e9d Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 9 Feb 2018 11:20:34 -0500 Subject: [PATCH 070/685] simplify code samples --- code_samples/custom_serializer.js | 4 +- code_samples/distributedobject_listener.js | 2 +- code_samples/global_serializer.js | 4 +- code_samples/lifecycle_listener.js | 4 +- code_samples/list.js | 70 ++++----------- code_samples/logging.js | 4 +- code_samples/map.js | 70 +++++---------- code_samples/map_entry_listener.js | 2 +- code_samples/near_cache.js | 4 +- .../node_modules/hazelcast-client/index.js | 19 ++++ code_samples/paging_predicate.js | 6 +- code_samples/queue.js | 69 ++++----------- code_samples/set.js | 86 +++---------------- code_samples/ssl_authentication.js | 6 +- 14 files changed, 107 insertions(+), 243 deletions(-) create mode 100644 code_samples/node_modules/hazelcast-client/index.js diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index ad4a5f104..adf3a5308 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -14,8 +14,8 @@ * limitations under the License. */ -var Client = require('../.').Client; -var Config = require('../.').Config; +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; var cfg = new Config.ClientConfig(); function TimeOfDay(hour, minute, second) { diff --git a/code_samples/distributedobject_listener.js b/code_samples/distributedobject_listener.js index 597d3af2f..bee668544 100644 --- a/code_samples/distributedobject_listener.js +++ b/code_samples/distributedobject_listener.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var Client = require('../.').Client; +var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function(hazelcastClient) { hazelcastClient.addDistributedObjectListener(function(serviceName, name, event) { console.log('Distributed object event >>> ' + JSON.stringify({serviceName: serviceName, name: name, event: event})); diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index 407d0c5f7..fb6808620 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -19,8 +19,8 @@ * We will use Mousse serializer to serialize our self referring objects. */ var mousse = require('mousse'); -var Client = require('../.').Client; -var Config = require('../.').Config; +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; var cfg = new Config.ClientConfig(); cfg.serializationConfig.globalSerializer = { mousseSerialize: mousse.serialize, diff --git a/code_samples/lifecycle_listener.js b/code_samples/lifecycle_listener.js index bc755c6cb..4fd91a960 100644 --- a/code_samples/lifecycle_listener.js +++ b/code_samples/lifecycle_listener.js @@ -14,8 +14,8 @@ * limitations under the License. */ -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; +var HazelcastClient = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; var cfg = new Config.ClientConfig(); cfg.listeners.addLifecycleListener(function(state) { console.log('Lifecycle Event >>> ' + state); diff --git a/code_samples/list.js b/code_samples/list.js index 83e394b10..b75026dff 100644 --- a/code_samples/list.js +++ b/code_samples/list.js @@ -14,62 +14,28 @@ * limitations under the License. */ -var Client = require('../.').Client; - -var addPerson = function(list, val){ - return list.add(val).then(function(){ - console.log('Added value: ' + val); - }); -}; - -var addPersonTo = function(list, val, index){ - return list.add(val, index).then(function(){ - console.log('Added value to the ' + index + 'th index: ' + val); - }); -}; - -var removePerson = function(list, val){ - return list.remove(val).then(function(){ - console.log('Removed value: ' + val); - }); -}; - -var removePersonAt = function(list, index){ - return list.removeAt(index).then(function(previousVal){ - console.log('Removed value: ' + previousVal); - }); -}; - -var shutDownHz = function(client){ - return client.shutdown(); -}; +var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function(hazelcastClient){ + var client = hazelcastClient; var list = hazelcastClient.getList('people'); - var john = 'John'; - var jane = 'Jane'; - var thomas = 'Thomas'; - //adds the value to the end of the list - addPerson(list, john) - .then(function(){ - //adds the value to the specific index - return addPersonTo(list, jane, 2); - }) - .then(function(){ - return addPerson(list, thomas); - }) - .then(function(){ - //removes the given value in the list - return removePerson(list, jane); - }) - .then(function(){ - //removes the value in the list, specified by the index - return removePersonAt(list, 2); - }) - .then(function(){ - shutDownHz(hazelcastClient); - }) + list.add('John').then(function (value) { + console.log('Added John.'); + return list.add('Jane', 1); + }).then(function () { + console.log('Added Jane to index 1.'); + return list.add('Thomas'); + }).then(function () { + console.log('Added Thomas.'); + return list.remove('Jane'); + }).then(function (value) { + console.log('Removed Jane.'); + return list.removeAt(1); + }).then(function (value) { + console.log('Removed ' + value); + return client.shutdown(); + }); }); diff --git a/code_samples/logging.js b/code_samples/logging.js index 92de62f6c..7d7321e71 100644 --- a/code_samples/logging.js +++ b/code_samples/logging.js @@ -15,8 +15,8 @@ */ var winston = require('winston'); -var Config = require('../.').Config; -var HazelcastClient = require('../.').Client; +var Config = require('hazelcast-client').Config; +var HazelcastClient = require('hazelcast-client').Client; if(process.argv.length != 3){ console.log('Run as node logging.js [logger]'); diff --git a/code_samples/map.js b/code_samples/map.js index 66387a50e..3f5b2a20d 100644 --- a/code_samples/map.js +++ b/code_samples/map.js @@ -14,56 +14,30 @@ * limitations under the License. */ -var Client = require('../.').Client; -var insertPerson = function (map, key, val, ttl) { - return map.put(key, val, ttl).then(function(previousVal) { - console.log('Put key: ' + key + ', value: ' + JSON.stringify(val) + ', previous value: ' + JSON.stringify(previousVal)); - }); -}; +var Client = require('hazelcast-client').Client; -var removePerson = function (map, key) { - return map.remove(key).then(function() { - console.log('Removed ' + key); - }); -}; +Client.newHazelcastClient().then(function (hazelcastClient) { + var client = hazelcastClient; + var map = hazelcastClient.getMap('my-distributed-map'); -var getPerson = function (map, key) { - return map.get(key).then(function(val) { - console.log('Person with id ' + key + ': ' + JSON.stringify(val)); - }); -}; + map.put('key', 'value').then(function () { + return map.get('key'); + }).then(function (val) { + console.log(val); -var shutdownHz = function(client) { - return client.shutdown(); -}; + return map.remove('key'); + }).then(function () { + return map.put('disappearing-key', 'this string will disappear after ttl', 1000); + }).then(function (value) { + return map.get('disappearing-key'); + }).then(function (value) { + console.log(value); -Client.newHazelcastClient().then(function (hazelcastClient) { - var map = hazelcastClient.getMap('people'); - var john = {firstname: 'John', lastname: 'Doe'}; - var jane = {firstname: 'Jane', lastname: 'Doe'}; - //insert - insertPerson(map, 1, john) - .then(function () { - //get - return getPerson(map, 1); - }) - .then(function () { - //remove - return removePerson(map, 1); - }) - .then(function () { - //insert with ttl - return insertPerson(map, 2, jane, 1000); - }) - .then(function() { - return getPerson(map, 2); - }) - .then(function() { - //Jane should be erased after 1000 milliseconds - setTimeout(function() { - getPerson(map, 2).then(function() { - shutdownHz(hazelcastClient); - }); - }, 1000) - }); + setTimeout(function () { + map.get('disappearing-key').then(function (value) { + console.log(value); + return client.shutdown(); + }); + }, 1000) + }); }); diff --git a/code_samples/map_entry_listener.js b/code_samples/map_entry_listener.js index 3a72e23fc..03f909033 100644 --- a/code_samples/map_entry_listener.js +++ b/code_samples/map_entry_listener.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var Client = require('../.').Client; +var Client = require('hazelcast-client').Client; var listener = { added: function(key, oldVal, newVal) { console.log('added key: ' + key + ', old value: ' + oldVal + ', new value: ' + newVal); diff --git a/code_samples/near_cache.js b/code_samples/near_cache.js index 429d55e33..94bd55199 100644 --- a/code_samples/near_cache.js +++ b/code_samples/near_cache.js @@ -1,5 +1,5 @@ -var Client = require('../.').Client; -var Config = require('../.').Config; +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; var nearCachedMapName = 'nearCachedMap'; var regularMapName = 'reqularMap'; diff --git a/code_samples/node_modules/hazelcast-client/index.js b/code_samples/node_modules/hazelcast-client/index.js new file mode 100644 index 000000000..18d0a4364 --- /dev/null +++ b/code_samples/node_modules/hazelcast-client/index.js @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +//This dummy module serves as a link to actual hazelcast-client implementation from code_samples directory. +//This module should NOT be used anywhere outside of this code_samples directory. +module.exports = require('../../../'); diff --git a/code_samples/paging_predicate.js b/code_samples/paging_predicate.js index 111a130d8..4bc53b5ef 100644 --- a/code_samples/paging_predicate.js +++ b/code_samples/paging_predicate.js @@ -14,9 +14,9 @@ * limitations under the License. */ -var Client = require('../.').Client; -var Config = require('../.').Config; -var Predicates = require('../.').Predicates; +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; +var Predicates = require('hazelcast-client').Predicates; var cfg = new Config.ClientConfig(); //This comparator is both a comparator and an IdentifiedDataSerializable. diff --git a/code_samples/queue.js b/code_samples/queue.js index e90c5faf6..08ceefc3a 100644 --- a/code_samples/queue.js +++ b/code_samples/queue.js @@ -14,63 +14,26 @@ * limitations under the License. */ -var Client = require('../.').Client; - -var insertPerson = function (queue, val) { - return queue.add(val).then(function(previousVal) { - console.log('Added value: ' + val + ', previous value: ' + JSON.stringify(previousVal)); - }); -}; - -var pollPerson = function(queue){ - return queue.poll().then(function(previousVal) { - console.log('Polled value: ' + JSON.stringify(previousVal)); - }); -}; - -var peekPerson = function(queue){ - return queue.peek().then(function(previousVal){ - console.log('Peeked value: ' + JSON.stringify(previousVal)); - }); -}; - -var shutdownHz = function(client) { - return client.shutdown(); -}; +var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function(hazelcastClient){ + var client = hazelcastClient; var queue = hazelcastClient.getQueue('people'); - var john = 'John'; - var jane = 'Jane'; - var judy = 'Judy'; - //inserts to the back of the queue - insertPerson(queue,john) - .then(function (){ - //inserts to the back of the queue - return insertPerson(queue,jane); - }) - .then(function (){ - //inserts to the back of the queue - return insertPerson(queue,judy); - }) - .then(function (){ - //retrieves and also removes the head of the queue - return pollPerson(queue); - }) - .then(function(){ - //retrieves but not remove the head of the queue - return peekPerson(queue); - }) - .then(function (){ - return pollPerson(queue); - }) - .then(function(){ - return peekPerson(queue); - }) - .then(function(){ - shutdownHz(hazelcastClient) - }) + queue.put('Item1').then(function () { + return queue.put('Item2'); + }).then(function () { + return queue.peek(); + }).then(function (item) { + console.log('Peeked item: ' + item + '. Item is not removed from queue.'); + return queue.poll(); + }).then(function (item) { + console.log('Retrieved item: ' + item + '. Item is removed from queue.'); + return queue.poll(); + }).then(function (item) { + console.log('Retrieved item: ' + item); + return client.shutdown(); + }); }); diff --git a/code_samples/set.js b/code_samples/set.js index 0b1327021..8229fad75 100644 --- a/code_samples/set.js +++ b/code_samples/set.js @@ -14,78 +14,20 @@ * limitations under the License. */ -var Client = require('../.').Client; - -var insertPerson = function(myset, val){ - return myset.add(val).then(function(previousVal){ - console.log('Added value: ' + val + ' Insert operation: ' + previousVal); - }); -}; - -var removePerson = function(myset,val){ - return myset.remove(val).then(function() { - console.log('Removed value: ' + val); - }); -}; - - -var containPerson = function(myset, val){ - return myset.contains(val).then(function(previousVal){ - if(previousVal === true) - console.log("Set contains the value " + val) ; - else - console.log("Set does not contain the value " + val); - }); -}; - -var totalPeople = function(myset){ - return myset.size().then(function(previousVal){ - console.log("Set consists of " + previousVal + " elements"); - }); -} - -var shutdownHz = function(client) { - return client.shutdown(); -}; - +var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hazelcastClient) { - var set = hazelcastClient.getSet('people'); - var john = 'John'; - var jane = 'Jane'; - var anotherjohn = 'John'; - - //insert an element - insertPerson(set, john) - .then(function () { - //inserts a different element - return insertPerson(set, jane); - }) - .then(function () { - //trying to insert an element which has been already added to the set and so failing to add - return insertPerson(set, anotherjohn); - }) - .then(function () { - //check if an element is in the set or not - return containPerson(set, 'John'); - }) - .then(function () { - //check if an element is in the set or not - return containPerson(set, 'Jack'); - }) - .then(function () { - //total number of elements in the set - return totalPeople(set); - }) - .then(function () { - //removes the given value in the set - return removePerson(set,'John'); - }) - .then(function () { - //Because the element was removed, now we can add this element to the set back - return insertPerson(set,'John'); - }) - .then(function () { - shutdownHz(hazelcastClient); - }) + var client = hazelcastClient; + var set = hazelcastClient.getSet('my-distributed-set'); + + set.add('key').then(function () { + console.log('"key" is added to the set.'); + return set.contains('key'); + }).then(function (contains) { + console.log(contains); + return set.size(); + }).then(function (val) { + console.log('Number of elements in the set: ' + val); + return client.shutdown(); + }); }); diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js index ae2bdec04..9b6f913fb 100644 --- a/code_samples/ssl_authentication.js +++ b/code_samples/ssl_authentication.js @@ -14,8 +14,8 @@ * limitations under the License. */ -var Config = require('../.').Config; -var HazelcastClient = require('../.').Client; +var Config = require('hazelcast-client').Config; +var HazelcastClient = require('hazelcast-client').Client; if (process.argv.length < 5 ) { console.log('Usage: \n' + @@ -27,7 +27,7 @@ var cfg = new Config.ClientConfig(); cfg.networkConfig.sslOptions = { servername: process.argv[2], cert: process.argv[3], - ca: process.argv[4], + ca: process.argv[4] }; HazelcastClient.newHazelcastClient(cfg).then(function (client) { From 29f17bb7f5faaa803851b50936268bdca3615609 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 12 Feb 2018 15:22:09 -0500 Subject: [PATCH 071/685] adds aggregator code sample --- code_samples/aggregation.js | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 code_samples/aggregation.js diff --git a/code_samples/aggregation.js b/code_samples/aggregation.js new file mode 100644 index 000000000..b3a263a27 --- /dev/null +++ b/code_samples/aggregation.js @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Client = require('hazelcast-client').Client; +var Aggregators = require('hazelcast-client').Aggregators; +var Predicates = require('hazelcast-client').Predicates; + +Client.newHazelcastClient().then(function (hazelcastClient) { + var client = hazelcastClient; + var map = hazelcastClient.getMap('person-age-map'); + + map.putAll([ + ['Philip', 46], + ['Elizabeth', 44], + ['Henry', 13], + ['Paige', 15] + ]).then(function () { + return map.aggregate(Aggregators.count()); + }).then(function (count) { + console.log('There are ' + count + ' people.'); + return map.aggregateWithPredicate(Aggregators.count(), Predicates.lessEqual('this', 18)); + }).then(function (count) { + console.log('There are ' + count + ' children.'); + return map.aggregate(Aggregators.numberAvg()); + }).then(function (avgAge) { + console.log('Average age is '+ avgAge); + return client.shutdown(); + }); +}); From 31649f4b72a194dd5910e9d7cd250559ffeaa736 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 15 Jan 2018 15:56:48 +0300 Subject: [PATCH 072/685] json config --- src/hazelcast-client-full.json | 99 ++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 src/hazelcast-client-full.json diff --git a/src/hazelcast-client-full.json b/src/hazelcast-client-full.json new file mode 100644 index 000000000..db8f5cbf3 --- /dev/null +++ b/src/hazelcast-client-full.json @@ -0,0 +1,99 @@ +{ + "group": { + "name": "dev", + "password": "dev-pass" + }, + "properties": { + "hazelcast.client.heartbeat.timeout": 60000, + "hazelcast.client.invocation.retry.pause.millis": 1000, + "hazelcast.client.invocation.timeout.millis": 120000, + "hazelcast.invalidation.reconciliation.interval.seconds": 60, + "hazelcast.invalidation.max.tolerated.miss.count": 10, + "hazelcast.invalidation.min.reconciliation.interval.seconds": 30 + }, + "network": { + "clusterMembers": [ + "127.0.0.1", + "127.0.0.2" + ] + }, + "smartRouting": true, + "connectionTimeout": 5000, + "connectionAttemptPeriod": 3000, + "connectionAttemptLimit": 2, + "ssl": { + "enabled": false, + "factory": { + "path": "path/to/file", + "exportedName": "exportedName" + } + }, + "listeners": [ + { + "type": "lifecycle", + "path": "path/to/file", + "exportedName": "exportedName" + }, + { + "type": "distributedObject", + "path": "path/to/file", + "exportedName": "exportedName" + }, + { + "type": "map", + "path": "path/to/file", + "exportedName": "exportedName" + }, + { + "type": "multiMap", + "path": "path/to/file", + "exportedName": "exportedName" + } + ], + "serialization": { + "defaultNumberType": "double", + "isBigEndian": true, + "dataSerializableFactories": [ + { + "path": "path/to/file", + "exportedName": "exportedName", + "factoryId": 0 + } + ], + "portableFactories": [ + { + "path": "path/to/file", + "exportedName": "exportedName", + "factoryId": 0 + } + ], + "portableVersion": 0, + "serializers": { + "globalSerializer": { + "path": "path/to/file", + "exportedName": "exportedName" + } + } + + }, + "nearCaches": [ + { + "name": "default", + "invalidateOnChange": true, + "maxIdleSeconds": 0, + "inMemoryFormat": "binary", + "timeToLiveSeconds": 0, + "evictionPolicy": "none", + "evictionMaxSize": 2000, + "evictionSamplingCount": 8, + "evictionSamplingPoolSize": 16 + } + ], + "reliableTopics": [ + { + "name": "default", + "readBatchSize": 25, + "overloadPolicy": "block" + } + ] +} From 229e0cb8481bf5c01f4a65c1541a523cfec2baee Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 5 Feb 2018 15:47:37 -0500 Subject: [PATCH 073/685] Adds declareative configuration --- src/Address.ts | 6 +- src/Config.ts | 252 ----------------- src/HazelcastClient.ts | 17 +- src/HeartbeatService.ts | 4 +- src/LifecycleService.ts | 22 +- src/Util.ts | 107 ++++++++ src/config/ClientNetworkConfig.ts | 65 +++++ src/config/Config.ts | 74 +++++ src/config/ConfigBuilder.ts | 256 ++++++++++++++++++ src/config/EvictionPolicy.ts | 25 ++ src/config/GroupConfig.ts | 30 ++ src/config/ImportConfig.ts | 20 ++ src/config/InMemoryFormat.ts | 27 ++ src/config/JsonConfigLocator.ts | 99 +++++++ src/config/ListenerConfig.ts | 30 ++ src/config/NearCacheConfig.ts | 51 ++++ src/config/Properties.ts | 19 ++ src/config/ReliableTopicConfig.ts | 23 ++ src/config/SSLOptions.ts | 54 ++++ src/config/SerializationConfig.ts | 32 +++ src/connection/BasicSSLOptionsFactory.ts | 72 +++++ src/connection/SSLOptionsFactory.ts | 24 ++ src/hazelcast-client-full.json | 99 ------- src/index.ts | 6 +- src/invocation/ClientConnection.ts | 5 + src/invocation/ClientConnectionManager.ts | 14 + src/invocation/ClusterService.ts | 4 +- src/invocation/InvocationService.ts | 4 +- src/logging/LoggingService.ts | 7 +- src/nearcache/NearCache.ts | 4 +- src/nearcache/RepairingTask.ts | 6 +- src/proxy/topic/ReliableTopicProxy.ts | 2 +- src/serialization/SerializationService.ts | 52 +++- .../portable/PortableSerializer.ts | 15 +- test/ClusterServiceTest.js | 1 + test/LifecycleServiceTest.js | 22 ++ test/config/ConfigBuilderSSLTest.js | 50 ++++ test/config/ConfigBuilderTest.js | 130 +++++++++ test/config/ConfigLocationTest.js | 88 ++++++ test/config/hazelcast-client-full.json | 109 ++++++++ test/config/hazelcast-client-near-cache.json | 15 + .../hazelcast-client-ssl-basicssloptions.json | 14 + test/config/hazelcast-client-ssl-false.json | 14 + .../serialization/SerializationServiceTest.js | 208 ++++++++++++++ test/ssl/ClientSSLAuthenticationTest.js | 144 ++++++---- 45 files changed, 1863 insertions(+), 459 deletions(-) delete mode 100644 src/Config.ts create mode 100644 src/config/ClientNetworkConfig.ts create mode 100644 src/config/Config.ts create mode 100644 src/config/ConfigBuilder.ts create mode 100644 src/config/EvictionPolicy.ts create mode 100644 src/config/GroupConfig.ts create mode 100644 src/config/ImportConfig.ts create mode 100644 src/config/InMemoryFormat.ts create mode 100644 src/config/JsonConfigLocator.ts create mode 100644 src/config/ListenerConfig.ts create mode 100644 src/config/NearCacheConfig.ts create mode 100644 src/config/Properties.ts create mode 100644 src/config/ReliableTopicConfig.ts create mode 100644 src/config/SSLOptions.ts create mode 100644 src/config/SerializationConfig.ts create mode 100644 src/connection/BasicSSLOptionsFactory.ts create mode 100644 src/connection/SSLOptionsFactory.ts delete mode 100644 src/hazelcast-client-full.json create mode 100644 test/config/ConfigBuilderSSLTest.js create mode 100644 test/config/ConfigBuilderTest.js create mode 100644 test/config/ConfigLocationTest.js create mode 100644 test/config/hazelcast-client-full.json create mode 100644 test/config/hazelcast-client-near-cache.json create mode 100644 test/config/hazelcast-client-ssl-basicssloptions.json create mode 100644 test/config/hazelcast-client-ssl-false.json create mode 100644 test/serialization/SerializationServiceTest.js diff --git a/src/Address.ts b/src/Address.ts index 3a5dc063f..3e52de880 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -28,11 +28,7 @@ class Address implements IdentifiedDataSerializable { constructor(host?: string, port?: number) { this.host = host; this.port = port; - if (net.isIPv6(host)) { - this.type = 6; - } else { - this.type = 4; - } + this.type = net.isIP(host); } readData(input: DataInput): any { diff --git a/src/Config.ts b/src/Config.ts deleted file mode 100644 index 7d02ceb33..000000000 --- a/src/Config.ts +++ /dev/null @@ -1,252 +0,0 @@ -/* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import Address = require('./Address'); -import {IdentifiedDataSerializableFactory, PortableFactory} from './serialization/Serializable'; -import {TopicOverloadPolicy} from './proxy/topic/TopicOverloadPolicy'; -const DEFAULT_GROUP_NAME = 'dev'; -const DEFAULT_GROUP_PASSWORD = 'dev-pass'; - -/** - * Group configuration of the cluster that this client connects. - * A client will connect to only the cluster with these properties. - */ -export class GroupConfig { - /** - * Cluster group name. - */ - name: string = DEFAULT_GROUP_NAME; - /** - * Cluster group password. - */ - password: string = DEFAULT_GROUP_PASSWORD; -} - -export class SocketOptions { - //TO-DO -} - -export interface SSLOptions { - /** - * A string or Buffer containing the private key, certificate and CA certs of the client in PFX or PKCS12 format. - */ - pfx?: any; //string | Buffer - - /** - * A string or Buffer containing the private key of the client in PEM format. (Could be an array of keys). - */ - key?: any; //string | Buffer - - /** - * A string of passphrase for the private key or pfx. - */ - passphrase?: string; - - /** - * A string or Buffer containing the certificate key of the client in PEM format. (Could be an array of certs). - */ - cert?: any; //string | Buffer - - /** - * An array of strings or Buffers of trusted certificates in PEM format. If this is omitted several well known "root" - * CAs will be used, like VeriSign. These are used to authorize connections. - */ - ca?: any; //Array of string | Buffer - - /** - * If true, the server certificate is verified against the list of supplied CAs. An 'error' event is emitted if verification - * fails; err.code contains the OpenSSL error code. Default: true. - */ - rejectUnauthorized?: boolean; - - /** - * Servername for SNI (Server Name Indication) TLS extension. - */ - servername?: string; -} -/** - * Network configuration - */ -export class ClientNetworkConfig { - /** - * Client tries to connect the members at these addresses. - */ - addresses: Address[]; - - /** - * While client is trying to connect initially to one of the members in the {@link addresses}, - * all might be not available. Instead of giving up, throwing Exception and stopping client, it will - * attempt to retry as much as {@link connectionAttemptLimit} times. - */ - connectionAttemptLimit: number = 2; - /** - * Period for the next attempt to find a member to connect. - */ - connectionAttemptPeriod: number = 3000; - /** - * Timeout value in millis for nodes to accept client connection requests. - */ - connectionTimeout: number = 5000; - /** - * true if redo operations are enabled (not implemented yet) - */ - redoOperation: boolean = false; - /** - * If true, client will behave as smart client instead of dummy client. Smart client sends key based operations - * to owner of the keys. Dummy client sends all operations to a single node. See http://docs.hazelcast.org to - * learn about smart/dummy client. - */ - smartRouting: boolean = true; - /** - * Not implemented. - */ - socketOptions: SocketOptions = new SocketOptions(); - - /** - * sslOptions is by default null which disables Ssl. A none null {@link SSLOptions} value enables Ssl. - * @type {SSLOptions} - */ - sslOptions: SSLOptions = null; - - constructor() { - this.addresses = [ - new Address('localhost', 5701) - ]; - } -} - -export class SerializationConfig { - defaultNumberType: string = 'double'; - isBigEndian: boolean = true; - dataSerializableFactories: {[id: number]: IdentifiedDataSerializableFactory} = {}; - portableFactories: {[id: number]: PortableFactory} = {}; - portableVersion: number = 0; - customSerializers: any[] = []; - globalSerializer: any = null; -} - -export class ReliableTopicConfig { - readBatchSize: number = 25; - overloadPolicy: TopicOverloadPolicy = TopicOverloadPolicy.BLOCK; -} - - -export class GlobalSerializerConfig { - //TO-DO when implementing serialization -} - -export interface LifecycleListener { - (event: string): void; -} - -/** - * Represents the format that objects are kept in this client's memory. - */ -export enum InMemoryFormat { - /** - * Objects are in native JS objects - */ - OBJECT, - - /** - * Objects are in serialized form - */ - BINARY -} - -export enum EvictionPolicy { - NONE, - LRU, - LFU, - RANDOM -} - -export class NearCacheConfig { - name: string = 'default'; - /** - * 'true' to invalidate entries when they are changed in cluster, - * 'false' to invalidate entries only when they are accessed. - */ - invalidateOnChange: boolean = true; - /** - * Max number of seconds that an entry can stay in the cache until it is acceessed - */ - maxIdleSeconds: number = 0; - inMemoryFormat: InMemoryFormat = InMemoryFormat.BINARY; - /** - * Maximum number of seconds that an entry can stay in cache. - */ - timeToLiveSeconds: number = 0; - evictionPolicy: EvictionPolicy = EvictionPolicy.NONE; - evictionMaxSize: number = Number.MAX_SAFE_INTEGER; - evictionSamplingCount: number = 8; - evictionSamplingPoolSize: number = 16; - - toString(): string { - return 'NearCacheConfig[' + - 'name: ' + this.name + ', ' + - 'invalidateOnChange:' + this.invalidateOnChange + ', ' + - 'inMemoryFormat: ' + this.inMemoryFormat + ', ' + - 'ttl(sec): ' + this.timeToLiveSeconds + ', ' + - 'evictionPolicy: ' + this.evictionPolicy + ', ' + - 'evictionMaxSize: ' + this.evictionMaxSize + ', ' + - 'maxIdleSeconds: ' + this.maxIdleSeconds + ']'; - } -} - - -/** - * Configurations for LifecycleListeners. These are registered as soon as client started. - */ -export class ListenerConfig { - lifecycle: Function[] = []; - - addLifecycleListener(listener: Function) { - this.lifecycle.push(listener); - } - - getLifecycleListeners() { - return this.lifecycle; - } -} - -/** - * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. - */ -export class ClientConfig { - /** - * Name of this client instance. - */ - instanceName: string; - properties: any = { - 'hazelcast.client.heartbeat.interval': 5000, - 'hazelcast.client.heartbeat.timeout': 60000, - 'hazelcast.client.invocation.retry.pause.millis': 1000, - 'hazelcast.client.invocation.timeout.millis': 120000, - 'hazelcast.invalidation.reconciliation.interval.seconds': 60, - 'hazelcast.invalidation.max.tolerated.miss.count': 10, - 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30 - }; - groupConfig: GroupConfig = new GroupConfig(); - networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); - customCredentials: any = null; - listeners: ListenerConfig = new ListenerConfig(); - serializationConfig: SerializationConfig = new SerializationConfig(); - reliableTopicConfigs: any = { - 'default': new ReliableTopicConfig() - }; - nearCacheConfigs: {[name: string]: NearCacheConfig} = {}; -} diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 783d19ab9..b8356fe9a 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -17,7 +17,7 @@ import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; import {InvocationService} from './invocation/InvocationService'; import {ListenerService} from './ListenerService'; -import {ClientConfig} from './Config'; +import {ClientConfig} from './config/Config'; import * as Promise from 'bluebird'; import {IMap} from './proxy/IMap'; import {ISet} from './proxy/ISet'; @@ -43,6 +43,7 @@ import {ISemaphore} from './proxy/ISemaphore'; import {IAtomicLong} from './proxy/IAtomicLong'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; import {RepairingTask} from './nearcache/RepairingTask'; +import {ConfigBuilder} from './config/ConfigBuilder'; export default class HazelcastClient { @@ -66,8 +67,16 @@ export default class HazelcastClient { * @returns a new client instance */ public static newHazelcastClient(config?: ClientConfig): Promise { - var client: HazelcastClient = new HazelcastClient(config); - return client.init(); + if (config == null) { + let configBuilder = new ConfigBuilder(); + return configBuilder.loadConfig().then(() => { + let client = new HazelcastClient(configBuilder.build()); + return client.init(); + }); + } else { + let client = new HazelcastClient(config); + return client.init(); + } } constructor(config?: ClientConfig) { @@ -75,7 +84,7 @@ export default class HazelcastClient { this.config = config; } - LoggingService.initialize(this.config.properties['hazelcast.logging']); + LoggingService.initialize(this.config.properties['hazelcast.logging']); this.loggingService = LoggingService.getLoggingService(); this.invocationService = new InvocationService(this); this.listenerService = new ListenerService(this); diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts index 82f9c2efd..09d484959 100644 --- a/src/HeartbeatService.ts +++ b/src/HeartbeatService.ts @@ -39,8 +39,8 @@ export class Heartbeat { constructor(client: HazelcastClient) { this.client = client; - this.heartbeatInterval = this.client.getConfig().properties[PROPERTY_HEARTBEAT_INTERVAL]; - this.heartbeatTimeout = this.client.getConfig().properties[PROPERTY_HEARTBEAT_TIMEOUT]; + this.heartbeatInterval = this.client.getConfig().properties[PROPERTY_HEARTBEAT_INTERVAL]; + this.heartbeatTimeout = this.client.getConfig().properties[PROPERTY_HEARTBEAT_TIMEOUT]; } /** diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index b5ebd1ffd..53372205d 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -16,6 +16,8 @@ import {EventEmitter} from 'events'; import HazelcastClient from './HazelcastClient'; +import {ImportConfig} from './config/ImportConfig'; +import * as Util from './Util'; /** * Lifecycle events. @@ -54,15 +56,17 @@ export class LifecycleService extends EventEmitter { super(); this.setMaxListeners(0); this.client = client; - var listeners: Function[] = []; - try { - listeners = client.getConfig().listeners.lifecycle; - listeners.forEach((listener) => { - this.on(LifecycleEvent.name, listener); - }); - } catch (err) { - //There are no lifecyle listeners in config - } + let listeners = client.getConfig().listeners.lifecycle; + listeners.forEach((listener) => { + this.on(LifecycleEvent.name, listener); + }); + let listenerConfgs = client.getConfig().listenerConfigs; + listenerConfgs.forEach((importConfig : ImportConfig) => { + let path = importConfig.path; + let exportedName = importConfig.exportedName; + let listener = Util.loadNameFromPath(path, exportedName); + this.on(LifecycleEvent.name, listener); + }); this.emit(LifecycleEvent.name, LifecycleEvent.starting); } diff --git a/src/Util.ts b/src/Util.ts index 1577eb601..c15690a3b 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -19,6 +19,9 @@ import {PagingPredicate} from './serialization/DefaultPredicates'; import {IterationType} from './core/Predicate'; import * as assert from 'assert'; import {Comparator} from './core/Comparator'; +import * as Path from 'path'; +import {JsonConfigLocator} from './config/JsonConfigLocator'; +import Address = require('./Address'); export function assertNotNull(v: any) { assert.notEqual(v, null, 'Non null value expected.'); } @@ -110,6 +113,110 @@ export function copyObjectShallow(obj: T): T { assert(false, 'Object should be undefined or type of object.'); } +export function tryGetBoolean(val: any): boolean { + if (typeof val === 'boolean') { + return val; + } else { + throw new RangeError(val + ' is not a boolean.'); + } +} + +export function tryGetNumber(val: any): number { + if (typeof val === 'number') { + return val; + } else { + throw new RangeError(val + ' is not a number.'); + } +} + +export function tryGetArray(val: any): Array { + if (Array.isArray(val)) { + return val; + } else { + throw new RangeError(val + ' is not an array.'); + } +} + +export function tryGetString(val: any): string { + if (typeof val === 'string') { + return val; + } else { + throw new RangeError(val + ' is not a string.'); + } +} + +export function getStringOrUndefined(val: any) { + try { + return tryGetString(val); + } catch (e) { + return undefined; + } +} + +export function getBooleanOrUndefined(val: any) { + try { + return tryGetBoolean(val); + } catch (e) { + return undefined; + } +} + +export function tryGetEnum(enumClass: any | {[index: string]: number}, str: string): T { + return enumClass[str.toUpperCase()]; +} + +export function resolvePath(path: string): string { + let basePath: string; + if (process.env[JsonConfigLocator.ENV_VARIABLE_NAME]) { + basePath = Path.dirname(process.env[JsonConfigLocator.ENV_VARIABLE_NAME]); + } else { + basePath = process.cwd(); + } + return Path.resolve(basePath, path); +} + +export function loadNameFromPath(path: string, exportedName: string): any { + return require(resolvePath(path))[exportedName]; +} + +export function createAddressFromString(address: string, defaultPort?: number): Address { + let indexBracketStart = address.indexOf('['); + let indexBracketEnd = address.indexOf(']', indexBracketStart); + let indexColon = address.indexOf(':'); + let lastIndexColon = address.lastIndexOf(':'); + let host: string; + let port = defaultPort; + if (indexColon > -1 && lastIndexColon > indexColon) { + // IPv6 + if (indexBracketStart === 0 && indexBracketEnd > indexBracketStart) { + host = address.substring(indexBracketStart + 1, indexBracketEnd); + if (lastIndexColon === indexBracketEnd + 1) { + port = Number.parseInt(address.substring(lastIndexColon + 1)); + } + } else { + host = address; + } + } else if (indexColon > 0 && indexColon === lastIndexColon) { + host = address.substring(0, indexColon); + port = Number.parseInt(address.substring(indexColon + 1)); + } else { + host = address; + } + return new Address(host, port); +} + +export function mergeJson(base: any, other: any): void { + for (let key in other) { + if (Array.isArray(base[key]) && Array.isArray(other[key])) { + base[key] = base[key].concat(other[key]); + } else if (typeof base[key] === 'object' && typeof other[key] === 'object') { + mergeJson(base[key], other[key]); + } else { + base[key] = other[key]; + } + } +} + function createComparator(iterationType: IterationType): Comparator { var object: Comparator = { sort: function(a: [any, any], b: [any, any]): number { diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts new file mode 100644 index 000000000..7c116ce05 --- /dev/null +++ b/src/config/ClientNetworkConfig.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import Address = require('../Address'); +import {SSLOptions} from './SSLOptions'; +import {ImportConfig} from './ImportConfig'; +import {Properties} from './Properties'; + +/** + * Network configuration + */ +export class ClientNetworkConfig { + /** + * Client tries to connect the members at these addresses. + */ + addresses: Address[] = []; + + /** + * While client is trying to connect initially to one of the members in the {@link addresses}, + * all might be not available. Instead of giving up, throwing Exception and stopping client, it will + * attempt to retry as much as {@link connectionAttemptLimit} times. + */ + connectionAttemptLimit: number = 2; + /** + * Period for the next attempt to find a member to connect. + */ + connectionAttemptPeriod: number = 3000; + /** + * Timeout value in millis for nodes to accept client connection requests. + */ + connectionTimeout: number = 5000; + /** + * true if redo operations are enabled (not implemented yet) + */ + redoOperation: boolean = false; + /** + * If true, client will behave as smart client instead of dummy client. Smart client sends key based operations + * to owner of the keys. Dummy client sends all operations to a single node. See http://docs.hazelcast.org to + * learn about smart/dummy client. + */ + smartRouting: boolean = true; + + /** + * sslOptions is by default null which disables Ssl. A none null {@link SSLOptions} value enables Ssl. + * @type {SSLOptions} + */ + sslOptions: SSLOptions = null; + + sslOptionsFactoryConfig: ImportConfig = null; + + sslOptionsFactoryProperties: Properties = null; +} diff --git a/src/config/Config.ts b/src/config/Config.ts new file mode 100644 index 000000000..89e18252c --- /dev/null +++ b/src/config/Config.ts @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; +import {ClientNetworkConfig} from './ClientNetworkConfig'; +import {SerializationConfig} from './SerializationConfig'; +import {GroupConfig} from './GroupConfig'; +import {ReliableTopicConfig} from './ReliableTopicConfig'; +import {InMemoryFormat} from './InMemoryFormat'; +import {EvictionPolicy} from './EvictionPolicy'; +import {NearCacheConfig} from './NearCacheConfig'; +import {ListenerConfig} from './ListenerConfig'; +import {Properties} from './Properties'; +import {ImportConfig} from './ImportConfig'; + +/** + * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. + */ +export class ClientConfig { + /** + * Name of this client instance. + */ + instanceName: string; + properties: Properties = { + 'hazelcast.client.heartbeat.interval': 5000, + 'hazelcast.client.heartbeat.timeout': 60000, + 'hazelcast.client.invocation.retry.pause.millis': 1000, + 'hazelcast.client.invocation.timeout.millis': 120000, + 'hazelcast.invalidation.reconciliation.interval.seconds': 60, + 'hazelcast.invalidation.max.tolerated.miss.count': 10, + 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30 + }; + groupConfig: GroupConfig = new GroupConfig(); + networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); + customCredentials: any = null; + listeners: ListenerConfig = new ListenerConfig(); + listenerConfigs: ImportConfig[] = []; + serializationConfig: SerializationConfig = new SerializationConfig(); + reliableTopicConfigs: any = { + 'default': new ReliableTopicConfig() + }; + nearCacheConfigs: {[name: string]: NearCacheConfig} = {}; +} + +export {ClientNetworkConfig}; + +export {TopicOverloadPolicy}; + +export {SerializationConfig}; + +export {GroupConfig}; + +export {ReliableTopicConfig}; + +export {EvictionPolicy}; + +export {InMemoryFormat}; + +export {NearCacheConfig}; + +export {ImportConfig}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts new file mode 100644 index 000000000..e571c714e --- /dev/null +++ b/src/config/ConfigBuilder.ts @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientConfig} from './Config'; +import * as Promise from 'bluebird'; +import {HazelcastError} from '../HazelcastError'; +import * as path from 'path'; +import {createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; +import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; +import {ReliableTopicConfig} from './ReliableTopicConfig'; +import {InMemoryFormat} from './InMemoryFormat'; +import {EvictionPolicy} from './EvictionPolicy'; +import {NearCacheConfig} from './NearCacheConfig'; +import {ImportConfig} from './ImportConfig'; +import {Properties} from './Properties'; +import {JsonConfigLocator} from './JsonConfigLocator'; +import Address = require('../Address'); +import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; + +export class ConfigBuilder { + private clientConfig: ClientConfig = new ClientConfig(); + private loadedJson: any; + private configLocator: JsonConfigLocator = new JsonConfigLocator(); + + loadConfig(): Promise { + return this.configLocator.load().then(() => { + let loadedBuffer = this.configLocator.getBuffer(); + if (loadedBuffer) { + this.loadedJson = JSON.parse(loadedBuffer.toString()); + return this.replaceImportsWithContent(this.loadedJson); + } + }); + } + + build(): ClientConfig { + try { + this.handleConfig(this.loadedJson); + return this.clientConfig; + } catch (e) { + throw new HazelcastError('Error parsing config.', e); + } + } + + private replaceImportsWithContent(jsonObject: any): Promise { + if (jsonObject['import']) { + let includes = tryGetArray(jsonObject['import']); + return Promise.map(includes, (path: string) => { + return this.configLocator.loadImported(path); + }).map((buffer: Buffer) => { + mergeJson(jsonObject, JSON.parse(buffer.toString())); + }).return(); + } + } + + private handleConfig(jsonObject: any): void { + for (let key in jsonObject) { + if (key === 'network') { + this.handleNetwork(jsonObject[key]); + } else if (key === 'group') { + this.handleGroup(jsonObject[key]); + } else if (key === 'properties') { + this.handleProperties(jsonObject[key]); + } else if (key === 'listeners') { + this.handleListeners(jsonObject[key]); + } else if (key === 'serialization') { + this.handleSerialization(jsonObject[key]); + } else if (key === 'nearCaches') { + this.handleNearCaches(jsonObject[key]); + } else if (key === 'reliableTopics') { + this.handleReliableTopics(jsonObject[key]); + } + } + } + + private handleNetwork(jsonObject: any): void { + for (let key in jsonObject) { + if (key === 'clusterMembers') { + this.handleClusterMembers(jsonObject[key]); + } else if (key === 'smartRouting') { + this.clientConfig.networkConfig.smartRouting = tryGetBoolean(jsonObject[key]); + } else if (key === 'connectionTimeout') { + this.clientConfig.networkConfig.connectionTimeout = tryGetNumber(jsonObject[key]); + } else if (key === 'connectionAttemptPeriod') { + this.clientConfig.networkConfig.connectionAttemptPeriod = tryGetNumber(jsonObject[key]); + } else if (key === 'connectionAttemptLimit') { + this.clientConfig.networkConfig.connectionAttemptLimit = tryGetNumber(jsonObject[key]); + } else if (key === 'ssl') { + this.handleSsl(jsonObject[key]); + } + } + } + + private parseProperties(jsonObject: any): Properties { + let props: Properties = {}; + for (let key in jsonObject) { + props[key] = jsonObject[key]; + } + return props; + } + + private parseImportConfig(jsonObject: any): ImportConfig { + let importConfig: ImportConfig = {}; + importConfig.path = jsonObject['path']; + importConfig.exportedName = jsonObject['exportedName']; + return importConfig; + } + + private handleSsl(jsonObject: any) { + let sslEnabled = tryGetBoolean(jsonObject['enabled']); + if (sslEnabled) { + if (jsonObject['factory']) { + let factory = jsonObject['factory']; + let importConfig = this.parseImportConfig(factory); + if (importConfig.path == null && importConfig.exportedName !== BasicSSLOptionsFactory.name) { + throw new RangeError('Invalid configuration. Either ssl factory path should be set or exportedName ' + + ' should be ' + BasicSSLOptionsFactory.name); + } else { + this.clientConfig.networkConfig.sslOptionsFactoryConfig = this.parseImportConfig(factory); + this.clientConfig.networkConfig.sslOptionsFactoryProperties = this.parseProperties(factory['properties']); + } + } + } + } + + private handleClusterMembers(jsonObject: any) { + var addressArray = tryGetArray(jsonObject); + for (let index in addressArray) { + let address = addressArray[index]; + this.clientConfig.networkConfig.addresses.push(createAddressFromString(tryGetString(address))); + } + } + + private handleGroup(jsonObject: any): void { + for (let key in jsonObject) { + if (key === 'name') { + this.clientConfig.groupConfig.name = tryGetString(jsonObject[key]); + } else if (key === 'password') { + this.clientConfig.groupConfig.password = tryGetString(jsonObject[key]); + } + } + } + + private handleProperties(jsonObject: any): void { + for (let key in jsonObject) { + this.clientConfig.properties[key] = jsonObject[key]; + } + } + + private handleListeners(jsonObject: any): void { + let listenersArray = tryGetArray(jsonObject); + for (let index in listenersArray) { + let listenerConfig = listenersArray[index]; + this.clientConfig.listenerConfigs.push(this.parseImportConfig(listenerConfig)); + } + } + + private handleSerialization(jsonObject: any): void { + for (let key in jsonObject) { + if (key === 'defaultNumberType') { + this.clientConfig.serializationConfig.defaultNumberType = tryGetString(jsonObject[key]); + } else if (key === 'isBigEndian') { + this.clientConfig.serializationConfig.isBigEndian = tryGetBoolean(jsonObject[key]); + } else if (key === 'portableVersion') { + this.clientConfig.serializationConfig.portableVersion = tryGetNumber(jsonObject[key]); + } else if (key === 'dataSerializableFactories') { + for (let index in jsonObject[key]) { + let factory = jsonObject[key][index]; + this.clientConfig.serializationConfig + .dataSerializableFactoryConfigs[factory.factoryId] = this.parseImportConfig(factory); + } + } else if (key === 'portableFactories') { + for (let index in jsonObject[key]) { + let factory = jsonObject[key][index]; + this.clientConfig.serializationConfig + .portableFactoryConfigs[factory.factoryId] = this.parseImportConfig(factory); + } + } else if (key === 'globalSerializer') { + let globalSerializer = jsonObject[key]; + this.clientConfig.serializationConfig.globalSerializerConfig = this.parseImportConfig(globalSerializer); + } else if (key === 'serializers') { + this.handleSerializers(jsonObject[key]); + } + } + } + + private handleSerializers(jsonObject: any): void { + let serializersArray = tryGetArray(jsonObject); + for (let index in serializersArray) { + let serializer = serializersArray[index]; + this.clientConfig.serializationConfig.customSerializerConfigs[serializer.typeId] = this.parseImportConfig(serializer); + } + } + + private handleNearCaches(jsonObject: any): void { + let nearCachesArray = tryGetArray(jsonObject); + for (let index in nearCachesArray) { + let ncConfig = nearCachesArray[index]; + let nearCacheConfig = new NearCacheConfig(); + for (let name in ncConfig) { + if (name === 'name') { + nearCacheConfig.name = tryGetString(ncConfig[name]); + } else if (name === 'invalidateOnChange') { + nearCacheConfig.invalidateOnChange = tryGetBoolean(ncConfig[name]); + } else if (name === 'maxIdleSeconds') { + nearCacheConfig.maxIdleSeconds = tryGetNumber(ncConfig[name]); + } else if (name === 'inMemoryFormat') { + nearCacheConfig.inMemoryFormat = tryGetEnum(InMemoryFormat, ncConfig[name]); + } else if (name === 'timeToLiveSeconds') { + nearCacheConfig.timeToLiveSeconds = tryGetNumber(ncConfig[name]); + } else if (name === 'evictionPolicy') { + nearCacheConfig.evictionPolicy = tryGetEnum(EvictionPolicy, ncConfig[name]); + } else if (name === 'evictionMaxSize') { + nearCacheConfig.evictionMaxSize = tryGetNumber(ncConfig[name]); + } else if (name === 'evictionSamplingCount') { + nearCacheConfig.evictionSamplingCount = tryGetNumber(ncConfig[name]); + } else if (name === 'evictionSamplingPoolSize') { + nearCacheConfig.evictionSamplingPoolSize = tryGetNumber(ncConfig[name]); + } + } + this.clientConfig.nearCacheConfigs[nearCacheConfig.name] = nearCacheConfig; + } + } + + private handleReliableTopics(jsonObject: any): void { + let rtConfigsArray = tryGetArray(jsonObject); + for (let index in rtConfigsArray) { + let jsonRtCfg = rtConfigsArray[index]; + let reliableTopicConfig = new ReliableTopicConfig(); + for (let name in jsonRtCfg) { + if (name === 'name') { + reliableTopicConfig.name = jsonRtCfg[name]; + } else if (name === 'readBatchSize') { + reliableTopicConfig.readBatchSize = jsonRtCfg[name]; + } else if (name === 'overloadPolicy') { + reliableTopicConfig.overloadPolicy = tryGetEnum(TopicOverloadPolicy, jsonRtCfg[name]); + } + } + this.clientConfig.reliableTopicConfigs[reliableTopicConfig.name] = reliableTopicConfig; + } + } + + +} diff --git a/src/config/EvictionPolicy.ts b/src/config/EvictionPolicy.ts new file mode 100644 index 000000000..e0f279035 --- /dev/null +++ b/src/config/EvictionPolicy.ts @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * Represents the format that objects are kept in this client's memory. + */ +export enum EvictionPolicy { + NONE, + LRU, + LFU, + RANDOM +} diff --git a/src/config/GroupConfig.ts b/src/config/GroupConfig.ts new file mode 100644 index 000000000..85797549d --- /dev/null +++ b/src/config/GroupConfig.ts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * Group configuration of the cluster that this client connects. + * A client will connect to only the cluster with these properties. + */ +export class GroupConfig { + /** + * Cluster group name. + */ + name: string = 'dev'; + /** + * Cluster group password. + */ + password: string = 'dev-pass'; +} diff --git a/src/config/ImportConfig.ts b/src/config/ImportConfig.ts new file mode 100644 index 000000000..c840d1d89 --- /dev/null +++ b/src/config/ImportConfig.ts @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +export interface ImportConfig { + path: string; + exportedName: string; +} diff --git a/src/config/InMemoryFormat.ts b/src/config/InMemoryFormat.ts new file mode 100644 index 000000000..686bd9c13 --- /dev/null +++ b/src/config/InMemoryFormat.ts @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +export enum InMemoryFormat { + /** + * Objects are in native JS objects + */ + OBJECT, + + /** + * Objects are in serialized form + */ + BINARY +} diff --git a/src/config/JsonConfigLocator.ts b/src/config/JsonConfigLocator.ts new file mode 100644 index 000000000..1b7587bf5 --- /dev/null +++ b/src/config/JsonConfigLocator.ts @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ConfigBuilder} from './ConfigBuilder'; +import * as fs from 'fs'; +import * as Promise from 'bluebird'; +import * as Path from 'path'; +import {LoggingService} from '../logging/LoggingService'; + +export class JsonConfigLocator { + static readonly ENV_VARIABLE_NAME = 'HAZELCAST_CLIENT_CONFIG'; + static readonly DEFAULT_FILE_NAME = 'hazelcast-client.json'; + + private buffer: Buffer; + private configLocation: string; + private logger = LoggingService.getLoggingService(); + + load(): Promise { + return this.loadFromEnvironment().then((loaded: boolean) => { + if (loaded) { + return; + } + return this.loadFromWorkingDirectory().then((loaded: boolean) => { + if (loaded) { + return; + } + }); + }); + } + + loadFromEnvironment(): Promise { + let envVariableLocation = process.env[JsonConfigLocator.ENV_VARIABLE_NAME]; + if (envVariableLocation) { + let loadLocation = Path.resolve(envVariableLocation); + this.logger.trace('ConfigBuilder', 'Loading config from ' + envVariableLocation); + return this.loadPath(envVariableLocation).then((buffer: Buffer) => { + this.configLocation = envVariableLocation; + this.buffer = buffer; + return true; + }); + } else { + return Promise.resolve(false); + } + } + + loadFromWorkingDirectory(): Promise { + let cwd = process.cwd(); + let jsonPath = Path.resolve(cwd, JsonConfigLocator.DEFAULT_FILE_NAME); + let deferred = Promise.defer(); + fs.access(jsonPath, (err) => { + if (err) { + deferred.resolve(false); + } else { + this.loadPath(jsonPath).then((buffer: Buffer) => { + this.buffer = buffer; + this.configLocation = jsonPath; + deferred.resolve(true); + }).catch((e) => { + deferred.reject(e); + }); + } + }); + return deferred.promise; + } + + loadImported(path: string): Promise { + return this.loadPath(Path.resolve(Path.dirname(this.configLocation), path)); + } + + loadPath(path: string): Promise { + let deferred = Promise.defer(); + fs.readFile(path, (err, data: Buffer) => { + if (err) { + this.logger.trace('JsonConfigLocator', 'Cannot read from ' + path.toString()); + deferred.reject(err); + } else { + deferred.resolve(data); + } + }); + return deferred.promise; + } + + getBuffer(): Buffer { + return this.buffer; + } +} diff --git a/src/config/ListenerConfig.ts b/src/config/ListenerConfig.ts new file mode 100644 index 000000000..e2949f467 --- /dev/null +++ b/src/config/ListenerConfig.ts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * Configurations for LifecycleListeners. These are registered as soon as client started. + */ +export class ListenerConfig { + lifecycle: Function[] = []; + + addLifecycleListener(listener: Function) { + this.lifecycle.push(listener); + } + + getLifecycleListeners() { + return this.lifecycle; + } +} diff --git a/src/config/NearCacheConfig.ts b/src/config/NearCacheConfig.ts new file mode 100644 index 000000000..50b09f6da --- /dev/null +++ b/src/config/NearCacheConfig.ts @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {InMemoryFormat} from './InMemoryFormat'; +import {EvictionPolicy} from './EvictionPolicy'; + +export class NearCacheConfig { + name: string = 'default'; + /** + * 'true' to invalidate entries when they are changed in cluster, + * 'false' to invalidate entries only when they are accessed. + */ + invalidateOnChange: boolean = true; + /** + * Max number of seconds that an entry can stay in the cache until it is acceessed + */ + maxIdleSeconds: number = 0; + inMemoryFormat: InMemoryFormat = InMemoryFormat.BINARY; + /** + * Maximum number of seconds that an entry can stay in cache. + */ + timeToLiveSeconds: number = 0; + evictionPolicy: EvictionPolicy = EvictionPolicy.NONE; + evictionMaxSize: number = Number.MAX_SAFE_INTEGER; + evictionSamplingCount: number = 8; + evictionSamplingPoolSize: number = 16; + + toString(): string { + return 'NearCacheConfig[' + + 'name: ' + this.name + ', ' + + 'invalidateOnChange:' + this.invalidateOnChange + ', ' + + 'inMemoryFormat: ' + this.inMemoryFormat + ', ' + + 'ttl(sec): ' + this.timeToLiveSeconds + ', ' + + 'evictionPolicy: ' + this.evictionPolicy + ', ' + + 'evictionMaxSize: ' + this.evictionMaxSize + ', ' + + 'maxIdleSeconds: ' + this.maxIdleSeconds + ']'; + } +} diff --git a/src/config/Properties.ts b/src/config/Properties.ts new file mode 100644 index 000000000..0ab8e4ac6 --- /dev/null +++ b/src/config/Properties.ts @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +export interface Properties { + [prop: string]: string | number | boolean; +} diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts new file mode 100644 index 000000000..f0f4f1356 --- /dev/null +++ b/src/config/ReliableTopicConfig.ts @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; + +export class ReliableTopicConfig { + name: string = 'default'; + readBatchSize: number = 25; + overloadPolicy: TopicOverloadPolicy = TopicOverloadPolicy.BLOCK; +} diff --git a/src/config/SSLOptions.ts b/src/config/SSLOptions.ts new file mode 100644 index 000000000..fde7110f6 --- /dev/null +++ b/src/config/SSLOptions.ts @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +export interface SSLOptions { + /** + * A string or Buffer containing the private key, certificate and CA certs of the client in PFX or PKCS12 format. + */ + pfx?: any; //string | Buffer + + /** + * A string or Buffer containing the private key of the client in PEM format. (Could be an array of keys). + */ + key?: any; //string | Buffer + + /** + * A string of passphrase for the private key or pfx. + */ + passphrase?: string; + + /** + * A string or Buffer containing the certificate key of the client in PEM format. (Could be an array of certs). + */ + cert?: any; //string | Buffer + + /** + * An array of strings or Buffers of trusted certificates in PEM format. If this is omitted several well known "root" + * CAs will be used, like VeriSign. These are used to authorize connections. + */ + ca?: any; //Array of string | Buffer + + /** + * If true, the server certificate is verified against the list of supplied CAs. An 'error' event is emitted if verification + * fails; err.code contains the OpenSSL error code. Default: true. + */ + rejectUnauthorized?: boolean; + + /** + * Servername for SNI (Server Name Indication) TLS extension. + */ + servername?: string; +} diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts new file mode 100644 index 000000000..0b4c7dff6 --- /dev/null +++ b/src/config/SerializationConfig.ts @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {IdentifiedDataSerializableFactory, PortableFactory} from '../serialization/Serializable'; +import {ImportConfig} from './ImportConfig'; + +export class SerializationConfig { + defaultNumberType: string = 'double'; + isBigEndian: boolean = true; + dataSerializableFactories: { [id: number]: IdentifiedDataSerializableFactory } = {}; + dataSerializableFactoryConfigs: { [id: number]: ImportConfig} = {}; + portableFactories: { [id: number]: PortableFactory } = {}; + portableFactoryConfigs: { [id: number]: ImportConfig } = {}; + portableVersion: number = 0; + customSerializers: any[] = []; + customSerializerConfigs: {[id: number]: ImportConfig } = {}; + globalSerializer: any = null; + globalSerializerConfig: ImportConfig = null; +} diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts new file mode 100644 index 000000000..a9eb8377f --- /dev/null +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {SSLOptionsFactory} from './SSLOptionsFactory'; +import {Properties} from '../config/Properties'; +import {HazelcastError} from '../HazelcastError'; +import * as Promise from 'bluebird'; +import * as fs from 'fs'; +import {getBooleanOrUndefined, getStringOrUndefined, resolvePath} from '../Util'; + +export class BasicSSLOptionsFactory implements SSLOptionsFactory { + + private servername: string; + private rejectUnauthorized: boolean; + private cert: Buffer; + private ca: Buffer; + private ciphers: string; + + init(properties: Properties): Promise { + if (typeof properties !== 'object') { + throw new HazelcastError('properties is not an object'); + } + + let promises = []; + + let readFile = Promise.promisify(fs.readFile); + + let certPath = getStringOrUndefined(properties['certPath']); + let caPath = getStringOrUndefined(properties['caPath']); + + if (certPath !== undefined) { + promises.push(readFile(resolvePath(certPath)).then((data: Buffer) => { + this.cert = data; + })); + } + + if (caPath !== undefined) { + promises.push(readFile(resolvePath(caPath)).then((data: Buffer) => { + this.ca = data; + })); + } + + this.servername = getStringOrUndefined(properties['servername']); + this.rejectUnauthorized = getBooleanOrUndefined(properties['rejectUnauthorized']); + this.ciphers = getStringOrUndefined(properties['ciphers']); + + return Promise.all(promises).return(); + } + + getSSLOptions(): any { + return { + servername: this.servername, + rejectUnauthorized: this.rejectUnauthorized, + cert: this.cert, + ca: this.ca + }; + } + +} diff --git a/src/connection/SSLOptionsFactory.ts b/src/connection/SSLOptionsFactory.ts new file mode 100644 index 000000000..2571a57f0 --- /dev/null +++ b/src/connection/SSLOptionsFactory.ts @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Properties} from '../config/Properties'; +import * as Promise from 'bluebird'; + +export interface SSLOptionsFactory { + init(properties: Properties): Promise; + + getSSLOptions(): any; +} diff --git a/src/hazelcast-client-full.json b/src/hazelcast-client-full.json deleted file mode 100644 index db8f5cbf3..000000000 --- a/src/hazelcast-client-full.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "group": { - "name": "dev", - "password": "dev-pass" - }, - "properties": { - "hazelcast.client.heartbeat.timeout": 60000, - "hazelcast.client.invocation.retry.pause.millis": 1000, - "hazelcast.client.invocation.timeout.millis": 120000, - "hazelcast.invalidation.reconciliation.interval.seconds": 60, - "hazelcast.invalidation.max.tolerated.miss.count": 10, - "hazelcast.invalidation.min.reconciliation.interval.seconds": 30 - }, - "network": { - "clusterMembers": [ - "127.0.0.1", - "127.0.0.2" - ] - }, - "smartRouting": true, - "connectionTimeout": 5000, - "connectionAttemptPeriod": 3000, - "connectionAttemptLimit": 2, - "ssl": { - "enabled": false, - "factory": { - "path": "path/to/file", - "exportedName": "exportedName" - } - }, - "listeners": [ - { - "type": "lifecycle", - "path": "path/to/file", - "exportedName": "exportedName" - }, - { - "type": "distributedObject", - "path": "path/to/file", - "exportedName": "exportedName" - }, - { - "type": "map", - "path": "path/to/file", - "exportedName": "exportedName" - }, - { - "type": "multiMap", - "path": "path/to/file", - "exportedName": "exportedName" - } - ], - "serialization": { - "defaultNumberType": "double", - "isBigEndian": true, - "dataSerializableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 0 - } - ], - "portableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 0 - } - ], - "portableVersion": 0, - "serializers": { - "globalSerializer": { - "path": "path/to/file", - "exportedName": "exportedName" - } - } - - }, - "nearCaches": [ - { - "name": "default", - "invalidateOnChange": true, - "maxIdleSeconds": 0, - "inMemoryFormat": "binary", - "timeToLiveSeconds": 0, - "evictionPolicy": "none", - "evictionMaxSize": 2000, - "evictionSamplingCount": 8, - "evictionSamplingPoolSize": 16 - } - ], - "reliableTopics": [ - { - "name": "default", - "readBatchSize": 25, - "overloadPolicy": "block" - } - ] -} diff --git a/src/index.ts b/src/index.ts index 091a23352..412f4b4e2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -15,7 +15,7 @@ */ import HazelcastClient from './HazelcastClient'; -import * as Config from './Config'; +import * as Config from './config/Config'; import {ClientInfo} from './ClientInfo'; import {IMap} from './proxy/IMap'; import * as Predicates from './core/Predicate'; @@ -24,6 +24,7 @@ import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); import * as HazelcastErrors from './HazelcastError'; import {IterationType} from './core/Predicate'; import * as Aggregators from './aggregation/Aggregators'; +import {ImportConfig} from './config/ImportConfig'; export { HazelcastClient as Client, @@ -35,5 +36,6 @@ export { TopicOverloadPolicy, HazelcastErrors, IterationType, - Aggregators + Aggregators, + ImportConfig }; diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 621241f58..3cf024c1e 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -146,5 +146,10 @@ export class ClientConnection { callback(message); } }); + this.socket.on('error', (e: any) => { + if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { + this.client.getConnectionManager().destroyConnection(this.address); + } + }); } } diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 9919cc52e..8cc8f2e73 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -24,6 +24,8 @@ import {ConnectionAuthenticator} from './ConnectionAuthenticator'; import Address = require('../Address'); import * as net from 'net'; import * as tls from 'tls'; +import {loadNameFromPath} from '../Util'; +import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; const EMIT_CONNECTION_CLOSED = 'connectionClosed'; const EMIT_CONNECTION_OPENED = 'connectionOpened'; @@ -103,6 +105,18 @@ export class ClientConnectionManager extends EventEmitter { if (this.client.getConfig().networkConfig.sslOptions) { let opts = this.client.getConfig().networkConfig.sslOptions; return this.connectTLSSocket(address, opts); + } else if (this.client.getConfig().networkConfig.sslOptionsFactoryConfig) { + let factoryConfig = this.client.getConfig().networkConfig.sslOptionsFactoryConfig; + let factoryProperties = this.client.getConfig().networkConfig.sslOptionsFactoryProperties; + let factory: any; + if (factoryConfig.path) { + factory = new (loadNameFromPath(factoryConfig.path, factoryConfig.exportedName))(); + } else { + factory = new BasicSSLOptionsFactory(); + } + return factory.init(factoryProperties).then(() => { + return this.connectTLSSocket(address, factory.getSSLOptions()); + }); } else { return this.connectNetSocket(address); } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index c306bc761..b285ef587 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -90,7 +90,9 @@ export class ClusterService extends EventEmitter { } else { this.knownAddresses = this.client.getConfig().networkConfig.addresses; } - + if (this.knownAddresses.length === 0) { + this.knownAddresses.push(new Address('127.0.0.1', 5701)); + } var attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; var attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; return this.tryAddresses(0, attemptLimit, attemptPeriod); diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 402750459..542db9fca 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -113,8 +113,8 @@ export class InvocationService { } else { this.doInvoke = this.invokeNonSmart; } - this.invocationRetryPauseMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS]; - this.invocationTimeoutMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS]; + this.invocationRetryPauseMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS]; + this.invocationTimeoutMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS]; this.isShutdown = false; } diff --git a/src/logging/LoggingService.ts b/src/logging/LoggingService.ts index f973d7024..2f3d24a54 100644 --- a/src/logging/LoggingService.ts +++ b/src/logging/LoggingService.ts @@ -45,11 +45,10 @@ export class LoggingService { } static getLoggingService(): LoggingService { - if (LoggingService.loggingService != null) { - return LoggingService.loggingService; - } else { - throw new IllegalStateError('LoggingService was not initialized'); + if (LoggingService.loggingService == null) { + LoggingService.initialize(null); } + return LoggingService.loggingService; } static initialize(loggerModule: string | ILogger = null) { diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index e3c1eccc3..f552b4546 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -15,7 +15,7 @@ */ import {Data} from '../serialization/Data'; -import {EvictionPolicy, InMemoryFormat, NearCacheConfig} from '../Config'; +import {NearCacheConfig} from '../config/NearCacheConfig'; import {shuffleArray} from '../Util'; import {SerializationService} from '../serialization/SerializationService'; import {DataKeyedHashMap} from '../DataStoreHashMap'; @@ -23,6 +23,8 @@ import {StaleReadDetector} from './StaleReadDetector'; import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; import {DataRecord} from './DataRecord'; import * as Long from 'long'; +import {InMemoryFormat} from '../config/InMemoryFormat'; +import {EvictionPolicy} from '../config/EvictionPolicy'; export interface NearCacheStatistics { evictedCount: number; diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index f9a90c621..7b1a05c28 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -42,12 +42,12 @@ export class RepairingTask { constructor(client: HazelcastClient) { this.client = client; let config = this.client.getConfig(); - this.minAllowedReconciliationSeconds = config.properties[PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS]; - let requestedReconciliationSeconds = config.properties[PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS]; + this.minAllowedReconciliationSeconds = config.properties[PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS]; + let requestedReconciliationSeconds = config.properties[PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS]; this.reconcilliationInterval = this.getReconciliationIntervalMillis(requestedReconciliationSeconds); this.handlers = new Map(); this.localUuid = this.client.getLocalEndpoint().uuid; - this.maxToleratedMissCount = config.properties[PROPERTY_MAX_TOLERATED_MISS_COUNT]; + this.maxToleratedMissCount = config.properties[PROPERTY_MAX_TOLERATED_MISS_COUNT]; this.metadataFetcher = new MetadataFetcher(client); this.partitionCount = this.client.getPartitionService().getPartitionCount(); } diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index e098eebcf..db715524f 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -22,7 +22,7 @@ import {IRingbuffer} from '../IRingbuffer'; import {Address} from '../../index'; import {UuidUtil} from '../../util/UuidUtil'; import {ReliableTopicListenerRunner} from './ReliableTopicListenerRunner'; -import {ReliableTopicConfig} from '../../Config'; +import {ReliableTopicConfig} from '../../config/ReliableTopicConfig'; import {RawTopicMessage} from './RawTopicMessage'; import {SerializationService} from '../../serialization/SerializationService'; import {OverflowPolicy} from '../../core/OverflowPolicy'; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index f473d4807..3f564ade2 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -16,7 +16,7 @@ import {Data, DataOutput, DataInput} from './Data'; import {HeapData, DATA_OFFSET} from './HeapData'; -import {SerializationConfig} from '../Config'; +import {SerializationConfig} from '../config/SerializationConfig'; import {ObjectDataOutput, ObjectDataInput, PositionalObjectDataOutput} from './ObjectData'; import { StringSerializer, BooleanSerializer, DoubleSerializer, NullSerializer, @@ -56,15 +56,15 @@ export class SerializationServiceV1 implements SerializationService { private registry: {[id: number]: Serializer}; private serializerNameToId: {[name: string]: number}; private numberType: string; - private serialiationConfig: SerializationConfig; + private serializationConfig: SerializationConfig; constructor(serializationConfig: SerializationConfig) { - this.serialiationConfig = serializationConfig; + this.serializationConfig = serializationConfig; this.registry = {}; this.serializerNameToId = {}; this.registerDefaultSerializers(); - this.registerCustomSerializers(serializationConfig.customSerializers); - this.registerGlobalSerializer(serializationConfig.globalSerializer); + this.registerCustomSerializers(); + this.registerGlobalSerializer(); } private isData(object: any): boolean { @@ -79,7 +79,7 @@ export class SerializationServiceV1 implements SerializationService { if (this.isData(object)) { return object; } - var dataOutput: DataOutput = new PositionalObjectDataOutput(1, this, this.serialiationConfig.isBigEndian); + var dataOutput: DataOutput = new PositionalObjectDataOutput(1, this, this.serializationConfig.isBigEndian); var serializer = this.findSerializerFor(object); //Check if object is partition aware if (object != null && object.getPartitionKey) { @@ -102,7 +102,7 @@ export class SerializationServiceV1 implements SerializationService { return data; } var serializer = this.findSerializerById(data.getType()); - var dataInput = new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serialiationConfig.isBigEndian); + var dataInput = new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serializationConfig.isBigEndian); return serializer.read(dataInput); } @@ -247,14 +247,21 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('!json', new JsonSerializer()); this.registerSerializer( '!portable', - new PortableSerializer(this, this.serialiationConfig.portableFactories, this.serialiationConfig.portableVersion) + new PortableSerializer(this, this.serializationConfig) ); } protected registerIdentifiedFactories() { var factories: {[id: number]: IdentifiedDataSerializableFactory} = {}; - for (var id in this.serialiationConfig.dataSerializableFactories) { - factories[id] = this.serialiationConfig.dataSerializableFactories[id]; + for (var id in this.serializationConfig.dataSerializableFactories) { + factories[id] = this.serializationConfig.dataSerializableFactories[id]; + } + let factoryConfigs = this.serializationConfig.dataSerializableFactoryConfigs; + for (let id in factoryConfigs) { + let path = factoryConfigs[id].path; + let exportedName = factoryConfigs[id].exportedName; + let factoryConstructor = Util.loadNameFromPath(path, exportedName); + factories[id] = new factoryConstructor(); } factories[PREDICATE_FACTORY_ID] = new PredicateFactory(DefaultPredicates); factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = new ReliableTopicMessageFactory(); @@ -263,15 +270,32 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('identified', new IdentifiedDataSerializableSerializer(factories)); } - protected registerCustomSerializers(cutomSerializersArray: any[]) { + protected registerCustomSerializers() { + let customSerializersArray: any[] = this.serializationConfig.customSerializers; var self = this; - cutomSerializersArray.forEach(function(candidate) { + customSerializersArray.forEach(function(candidate) { self.assertValidCustomSerializer(candidate); self.registerSerializer('!custom' + candidate.getId(), candidate); }); + let customSerializerConfigs = this.serializationConfig.customSerializerConfigs; + for (let typeId in customSerializerConfigs) { + let serializerConfig = customSerializerConfigs[typeId]; + let customSerializer = new (Util.loadNameFromPath(serializerConfig.path, serializerConfig.exportedName))(); + this.registerSerializer('!custom' + typeId, customSerializer); + } } - protected registerGlobalSerializer(candidate: any) { + protected registerGlobalSerializer() { + let candidate: any = null; + if (this.serializationConfig.globalSerializerConfig != null) { + let exportedName = this.serializationConfig.globalSerializerConfig.exportedName; + let path = this.serializationConfig.globalSerializerConfig.path; + let serializerFactory = Util.loadNameFromPath(path, exportedName); + candidate = new serializerFactory(); + } + if (candidate == null) { + candidate = this.serializationConfig.globalSerializer; + } if (candidate == null) { return; } @@ -304,7 +328,7 @@ export class SerializationServiceV1 implements SerializationService { protected findSerializerByName(name: string, isArray: boolean): Serializer { var convertedName: string; if (name === 'number') { - convertedName = this.serialiationConfig.defaultNumberType; + convertedName = this.serializationConfig.defaultNumberType; } else { convertedName = name; } diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 632efa09d..8325c7f44 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -23,6 +23,8 @@ import {MorphingPortableReader} from './MorphingPortableReader'; import {ClassDefinition, FieldType} from './ClassDefinition'; import {DefaultPortableWriter} from './DefaultPortableWriter'; import * as Long from 'long'; +import {SerializationConfig} from '../../config/SerializationConfig'; +import * as Path from 'path'; export class PortableSerializer implements Serializer { @@ -30,10 +32,17 @@ export class PortableSerializer implements Serializer { private factories: {[id: number]: PortableFactory}; private service: SerializationService; - constructor(service: SerializationService, portableFactories: {[id: number]: PortableFactory}, portableVersion: number) { + constructor(service: SerializationService, serializationConfig: SerializationConfig) { this.service = service; - this.portableContext = new PortableContext(this.service, portableVersion); - this.factories = portableFactories; + this.portableContext = new PortableContext(this.service, serializationConfig.portableVersion); + this.factories = serializationConfig.portableFactories; + let factoryConfigs = serializationConfig.portableFactoryConfigs; + for (let id in factoryConfigs) { + let exportedName = factoryConfigs[id].exportedName; + let path = factoryConfigs[id].path; + let factoryConstructor = require(Path.resolve(require.main.filename, path))[exportedName]; + this.factories[id] = new factoryConstructor(); + } } getId(): number { diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 0c6a48c58..ad3a14c9c 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -18,6 +18,7 @@ var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; var Config = require('../.').Config; +var Address = require('../.').Address; var Promise = require('bluebird'); var Address = require('../.').Address; diff --git a/test/LifecycleServiceTest.js b/test/LifecycleServiceTest.js index dc223ace6..a6e2c1d9f 100644 --- a/test/LifecycleServiceTest.js +++ b/test/LifecycleServiceTest.js @@ -57,6 +57,28 @@ describe('LifecycleService', function() { }); }); + it('client should emit starting, started, shuttingDown and shutdown events in order (via import config)', function(done) { + var cfg = new Config.ClientConfig(); + var expectedState = 'starting'; + exports.lifecycleListener = function(state) { + if (state === 'starting' && expectedState === 'starting') { + expectedState = 'started' + } else if (state === 'started' && expectedState === 'started') { + expectedState = 'shuttingDown'; + } else if (state === 'shuttingDown' && expectedState === 'shuttingDown') { + expectedState = 'shutdown'; + } else if (state === 'shutdown' && expectedState === 'shutdown') { + done(); + } else { + done('Got lifecycle event ' + state + ' instead of ' + expectedState); + } + }; + cfg.listenerConfigs.push({path: __filename, exportedName: 'lifecycleListener'}); + HazelcastClient.newHazelcastClient(cfg).then(function(client) { + client.shutdown(); + }); + }); + it('event listener should get shuttingDown and shutdown events when added after startup', function(done) { var expectedState = 'shuttingDown'; HazelcastClient.newHazelcastClient().then(function(client) { diff --git a/test/config/ConfigBuilderSSLTest.js b/test/config/ConfigBuilderSSLTest.js new file mode 100644 index 000000000..620c5af38 --- /dev/null +++ b/test/config/ConfigBuilderSSLTest.js @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +require('chai').use(require('chai-as-promised')); +var expect = require('chai').expect; + +var path = require('path'); +var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +var Config = require('../../lib/index').Config; + +describe('ConfigBuilderSSLTest', function () { + var configFull; + + afterEach(function () { + delete process.env['HAZELCAST_CLIENT_CONFIG']; + }); + + function loadJson(jsonPath) { + var configBuilder = new ConfigBuilder(); + process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, jsonPath); + return configBuilder.loadConfig().then(function () { + configFull = configBuilder.build(); + }); + } + + it('ssl-false', function () { + return loadJson('hazelcast-client-ssl-false.json').then(function () { + var networkConfig = configFull.networkConfig; + expect(networkConfig.sslOptionsFactoryConfig).to.be.null; + expect(networkConfig.sslOptionsFactoryProperties).to.be.null; + }); + }); + + it('when path is undefined, if exportedName should is not BasicSSLOptionsFactory shoul throw', function () { + return expect(loadJson('hazelcast-client-ssl-basicssloptions.json')).to.be.rejected; + }); +}); diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js new file mode 100644 index 000000000..6c39b6ce0 --- /dev/null +++ b/test/config/ConfigBuilderTest.js @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var path = require('path'); +var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +var Config = require('../../lib/index').Config; + +describe('ConfigBuilder Test', function () { + var configFull; + + before(function () { + var configBuilder = new ConfigBuilder(); + process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, 'hazelcast-client-full.json'); + return configBuilder.loadConfig().then(function () { + configFull = configBuilder.build(); + }); + }); + + after(function () { + delete process.env['HAZELCAST_CLIENT_CONFIG']; + }); + + it('networkConfig', function () { + var networkCfg = configFull.networkConfig; + expect(networkCfg.addresses[0].host).to.equal('127.0.0.9'); + expect(networkCfg.addresses[0].port).to.be.undefined; + expect(networkCfg.addresses[1].host).to.equal('127.0.0.2'); + expect(networkCfg.addresses[1].port).to.equal(5702); + expect(networkCfg.smartRouting).to.be.false; + expect(networkCfg.connectionTimeout).to.equal(6000); + expect(networkCfg.connectionAttemptPeriod).to.equal(4000); + expect(networkCfg.connectionAttemptLimit).to.equal(3); + expect(networkCfg.sslOptionsFactoryConfig.path).to.equal('path/to/file'); + expect(networkCfg.sslOptionsFactoryConfig.exportedName).to.equal('exportedName'); + expect(networkCfg.sslOptionsFactoryProperties['userDefinedProperty1']).to.equal('userDefinedValue'); + }); + + it('group', function () { + var groupCfg = configFull.groupConfig; + expect(groupCfg.name).to.equal('hazel'); + expect(groupCfg.password).to.equal('cast'); + }); + + it('properties', function () { + var properties = configFull.properties; + expect(properties['hazelcast.client.heartbeat.timeout']).to.equal(10000); + expect(properties['hazelcast.client.invocation.retry.pause.millis']).to.equal(4000); + expect(properties['hazelcast.client.invocation.timeout.millis']).to.equal(180000); + expect(properties['hazelcast.invalidation.reconciliation.interval.seconds']).equal(50); + expect(properties['hazelcast.invalidation.max.tolerated.miss.count']).to.equal(15); + expect(properties['hazelcast.invalidation.min.reconciliation.interval.seconds']).to.equal(60); + }); + + it('serialization', function () { + var serializationCfg = configFull.serializationConfig; + expect(serializationCfg.defaultNumberType).to.equal('integer'); + expect(serializationCfg.isBigEndian).to.equal(false); + expect(serializationCfg.portableVersion).to.equal(1); + expect(serializationCfg.dataSerializableFactoryConfigs[0].path).to.equal('path/to/file'); + expect(serializationCfg.dataSerializableFactoryConfigs[0].exportedName).to.equal('exportedName'); + + expect(serializationCfg.portableFactoryConfigs[1].path).to.equal('path/to/file'); + expect(serializationCfg.portableFactoryConfigs[1].exportedName).to.equal('exportedName'); + + expect(serializationCfg.globalSerializerConfig.exportedName).to.equal('exportedName'); + expect(serializationCfg.globalSerializerConfig.path).to.equal('path/to/file'); + + expect(serializationCfg.customSerializerConfigs[2].exportedName).to.equal('CustomSerializer1'); + expect(serializationCfg.customSerializerConfigs[2].path).to.equal('path/to/custom'); + + expect(serializationCfg.customSerializerConfigs[3].exportedName).to.equal('CustomSerializer2'); + expect(serializationCfg.customSerializerConfigs[3].path).to.equal('path/to/custom'); + }); + + it('nearCaches', function () { + var nearCacheConfigs = configFull.nearCacheConfigs; + expect(nearCacheConfigs['nc-map'].name).to.equal('nc-map'); + expect(nearCacheConfigs['nc-map'].invalidateOnChange).to.be.false; + expect(nearCacheConfigs['nc-map'].maxIdleSeconds).to.equal(2); + expect(nearCacheConfigs['nc-map'].inMemoryFormat).to.equal(Config.InMemoryFormat.OBJECT); + expect(nearCacheConfigs['nc-map'].timeToLiveSeconds).to.equal(3); + expect(nearCacheConfigs['nc-map'].evictionPolicy).to.equal(Config.EvictionPolicy.LRU); + expect(nearCacheConfigs['nc-map'].evictionMaxSize).to.equal(3000); + expect(nearCacheConfigs['nc-map'].evictionSamplingCount).to.equal(4); + expect(nearCacheConfigs['nc-map'].evictionSamplingPoolSize).to.equal(8); + + expect(nearCacheConfigs['nc-map2'].name).to.equal('nc-map2'); + expect(nearCacheConfigs['nc-map2'].invalidateOnChange).to.be.false; + expect(nearCacheConfigs['nc-map2'].maxIdleSeconds).to.equal(2); + expect(nearCacheConfigs['nc-map2'].inMemoryFormat).to.equal(Config.InMemoryFormat.OBJECT); + expect(nearCacheConfigs['nc-map2'].timeToLiveSeconds).to.equal(3); + expect(nearCacheConfigs['nc-map2'].evictionPolicy).to.equal(Config.EvictionPolicy.LRU); + expect(nearCacheConfigs['nc-map2'].evictionMaxSize).to.equal(3000); + expect(nearCacheConfigs['nc-map2'].evictionSamplingCount).to.equal(4); + expect(nearCacheConfigs['nc-map2'].evictionSamplingPoolSize).to.equal(8); + }); + + it('reliableTopics', function () { + var rtConfigs = configFull.reliableTopicConfigs; + expect(rtConfigs['rt1'].name).to.equal('rt1'); + expect(rtConfigs['rt1'].readBatchSize).to.equal(35); + expect(rtConfigs['rt1'].overloadPolicy).to.equal(Config.TopicOverloadPolicy.DISCARD_NEWEST); + + expect(rtConfigs['rt2'].name).to.equal('rt2'); + expect(rtConfigs['rt2'].readBatchSize).to.equal(15); + expect(rtConfigs['rt2'].overloadPolicy).to.equal(Config.TopicOverloadPolicy.DISCARD_NEWEST); + }); + + it('listenerConfig', function () { + var listenerConfig = configFull.listenerConfigs; + expect(listenerConfig[0].exportedName).to.equal('listener'); + expect(listenerConfig[0].path).to.equal('path/to/file'); + expect(listenerConfig[1].exportedName).to.equal('listener2'); + expect(listenerConfig[1].path).to.equal('path/to/file'); + }); +}); diff --git a/test/config/ConfigLocationTest.js b/test/config/ConfigLocationTest.js new file mode 100644 index 000000000..08a05e7e5 --- /dev/null +++ b/test/config/ConfigLocationTest.js @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var path = require('path'); +var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +var fs = require('fs'); +var path = require('path'); +var RuntimeUtil = require('../../lib/Util'); + +describe('ConfigLocationTest', function () { + var DEFAULT_JSON_LOCATION = path.resolve(process.cwd(), 'hazelcast-client.json'); + var ENV_VARIABLE_NAME = 'HAZELCAST_CLIENT_CONFIG'; + + afterEach(function () { + try { + fs.unlinkSync(DEFAULT_JSON_LOCATION); + } catch (e) { + // + } finally { + delete process.env[ENV_VARIABLE_NAME]; + } + }); + + it('Prefers environment variable location over default location', function () { + //create a hazelcast-client.json at current working directory so we can be sure it is ignored. + fs.writeFileSync(DEFAULT_JSON_LOCATION, '' + + '{' + + ' "group": {' + + ' "name": "wrongName"' + + ' }' + + '}'); + process.env[ENV_VARIABLE_NAME] = path.join(__dirname, 'hazelcast-client-full.json'); + var configBuilder = new ConfigBuilder(); + return configBuilder.loadConfig().then(function () { + return expect(configBuilder.build().groupConfig.name).equals('hazel'); + }); + }); + + it('Prefers default location json file over default config', function () { + fs.writeFileSync(DEFAULT_JSON_LOCATION, '' + + '{' + + ' "group": {' + + ' "name": "newName"' + + ' }' + + '}'); + var configBuilder = new ConfigBuilder(); + return configBuilder.loadConfig().then(function () { + return expect(configBuilder.build().groupConfig.name).equals('newName'); + }); + }); + + it('Starts with default configuration if no config', function () { + var configBuilder = new ConfigBuilder(); + return configBuilder.loadConfig().then(function () { + return expect(configBuilder.build().groupConfig.name).equals('dev'); + }); + }); + + it('Util.resolvePath test', function () { + expect(RuntimeUtil.resolvePath('.')).to.equal(process.cwd()); + expect(RuntimeUtil.resolvePath('filename')).to.equal(path.join(process.cwd(), 'filename')); + expect(RuntimeUtil.resolvePath('..')).to.equal(path.join(process.cwd(), '..')); + process.env[ENV_VARIABLE_NAME] = 'aRelativeBase/config.json'; + expect(RuntimeUtil.resolvePath('.')).to.equal(path.join(process.cwd(), 'aRelativeBase')); + expect(RuntimeUtil.resolvePath('filename')).to.equal(path.join(process.cwd(), 'aRelativeBase', 'filename')); + expect(RuntimeUtil.resolvePath('..')).to.equal(process.cwd()); + process.env[ENV_VARIABLE_NAME] = '/anAbsoluteBase/config.json'; + var root = path.parse(process.cwd()).root; + console.log(root); + expect(RuntimeUtil.resolvePath('.')).to.equal(path.join(root, 'anAbsoluteBase')); + expect(RuntimeUtil.resolvePath('filename')).to.equal(path.join(root, 'anAbsoluteBase', 'filename')); + expect(RuntimeUtil.resolvePath('..')).to.equal(root); + }) +}); diff --git a/test/config/hazelcast-client-full.json b/test/config/hazelcast-client-full.json new file mode 100644 index 000000000..e0e447f06 --- /dev/null +++ b/test/config/hazelcast-client-full.json @@ -0,0 +1,109 @@ +{ + "group": { + "name": "hazel", + "password": "cast" + }, + "properties": { + "hazelcast.client.heartbeat.timeout": 10000, + "hazelcast.client.invocation.retry.pause.millis": 4000, + "hazelcast.client.invocation.timeout.millis": 180000, + "hazelcast.invalidation.reconciliation.interval.seconds": 50, + "hazelcast.invalidation.max.tolerated.miss.count": 15, + "hazelcast.invalidation.min.reconciliation.interval.seconds": 60 + }, + "network": { + "clusterMembers": [ + "127.0.0.9", + "127.0.0.2:5702" + ], + "smartRouting": false, + "connectionTimeout": 6000, + "connectionAttemptPeriod": 4000, + "connectionAttemptLimit": 3, + "ssl": { + "enabled": true, + "factory": { + "path": "path/to/file", + "exportedName": "exportedName", + "properties": { + "userDefinedProperty1": "userDefinedValue" + } + } + } + }, + "listeners": [ + { + "type": "lifecycle", + "path": "path/to/file", + "exportedName": "listener" + }, + { + "type": "lifecycle", + "path": "path/to/file", + "exportedName": "listener2" + } + ], + "serialization": { + "defaultNumberType": "integer", + "isBigEndian": false, + "dataSerializableFactories": [ + { + "path": "path/to/file", + "exportedName": "exportedName", + "factoryId": 0 + } + ], + "portableFactories": [ + { + "path": "path/to/file", + "exportedName": "exportedName", + "factoryId": 1 + } + ], + "portableVersion": 1, + "globalSerializer": { + "path": "path/to/file", + "exportedName": "exportedName" + }, + "serializers": [ + { + "path": "path/to/custom", + "exportedName": "CustomSerializer1", + "typeId": 2 + }, + { + "path": "path/to/custom", + "exportedName": "CustomSerializer2", + "typeId": 3 + } + ] + }, + "nearCaches": [ + { + "name": "nc-map", + "invalidateOnChange": false, + "maxIdleSeconds": 2, + "inMemoryFormat": "object", + "timeToLiveSeconds": 3, + "evictionPolicy": "lru", + "evictionMaxSize": 3000, + "evictionSamplingCount": 4, + "evictionSamplingPoolSize": 8 + } + ], + "reliableTopics": [ + { + "name": "rt1", + "readBatchSize": 35, + "overloadPolicy": "discard_newest" + }, + { + "name": "rt2", + "readBatchSize": 15, + "overloadPolicy": "discard_newest" + } + ], + "import": [ + "hazelcast-client-near-cache.json" + ] +} diff --git a/test/config/hazelcast-client-near-cache.json b/test/config/hazelcast-client-near-cache.json new file mode 100644 index 000000000..4a2c24c46 --- /dev/null +++ b/test/config/hazelcast-client-near-cache.json @@ -0,0 +1,15 @@ +{ + "nearCaches": [ + { + "name": "nc-map2", + "invalidateOnChange": false, + "maxIdleSeconds": 2, + "inMemoryFormat": "object", + "timeToLiveSeconds": 3, + "evictionPolicy": "lru", + "evictionMaxSize": 3000, + "evictionSamplingCount": 4, + "evictionSamplingPoolSize": 8 + } + ] +} diff --git a/test/config/hazelcast-client-ssl-basicssloptions.json b/test/config/hazelcast-client-ssl-basicssloptions.json new file mode 100644 index 000000000..a3b56dd7f --- /dev/null +++ b/test/config/hazelcast-client-ssl-basicssloptions.json @@ -0,0 +1,14 @@ +{ + "network": { + "ssl": { + "enabled": true, + "factory": { + "exportedName": "BsicSSLOponsFary", + "properties": { + "caPath": "ca.pem", + "certPath": "cert.pem" + } + } + } + } +} diff --git a/test/config/hazelcast-client-ssl-false.json b/test/config/hazelcast-client-ssl-false.json new file mode 100644 index 000000000..0956a3e5f --- /dev/null +++ b/test/config/hazelcast-client-ssl-false.json @@ -0,0 +1,14 @@ +{ + "network": { + "ssl": { + "enabled": false, + "factory": { + "path": "should not be parsed", + "exportedName": "should not be parsed", + "properties": { + "userDefinedProperty1": "should not be parsed" + } + } + } + } +} diff --git a/test/serialization/SerializationServiceTest.js b/test/serialization/SerializationServiceTest.js new file mode 100644 index 000000000..212f51faf --- /dev/null +++ b/test/serialization/SerializationServiceTest.js @@ -0,0 +1,208 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; +var Config = require('../../').Config; + +describe('SerializationServiceTest', function () { + + var identifiedDataSerializableFactoryConfig = { + path: __filename, + exportedName: 'IDataSerializableFactory' + }; + + var portableSerializableFactoryConfig = { + path: __filename, + exportedName: 'PortableFactory' + }; + + var globalSerializerConfig = { + path: __filename, + exportedName: 'GlobalSerializer' + }; + + var customSerializerConfig = { + path: __filename, + exportedName: 'CustomSerializer' + }; + + it('adds data serializable factory by its name', function () { + var serializationConfig = new Config.SerializationConfig(); + serializationConfig.dataSerializableFactoryConfigs[1] = identifiedDataSerializableFactoryConfig; + + var serializationService = new SerializationService(serializationConfig); + + var data = serializationService.toData(new IDataSerializable(3)); + var object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + }); + + it('adds portable factory by its name', function () { + var serializationConfig = new Config.SerializationConfig(); + serializationConfig.portableFactoryConfigs[2] = portableSerializableFactoryConfig; + + var serializationService = new SerializationService(serializationConfig); + + var data = serializationService.toData(new Portable(3)); + var object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + }); + + it('adds custom serializer by its name', function () { + var serializationConfig = new Config.SerializationConfig(); + serializationConfig.customSerializerConfigs[44] = customSerializerConfig; + + var serializationService = new SerializationService(serializationConfig); + + var data = serializationService.toData(new CustomObject(3)); + var object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + expect(object.self).to.equal(object); + }); + + it('adds global serializer by its name', function () { + var serializationConfig = new Config.SerializationConfig(); + serializationConfig.globalSerializerConfig = globalSerializerConfig; + + var serializationService = new SerializationService(serializationConfig); + + var data = serializationService.toData(new AnyObject(3)); + var object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + expect(object.self).to.equal(object); + }); +}); + +function IDataSerializable(val) { + this.val = val; +} + +IDataSerializable.prototype.readData = function (input) { + this.val = input.readInt(); +}; + +IDataSerializable.prototype.writeData = function (output) { + output.writeInt(this.val); +}; + +IDataSerializable.prototype.getClassId = function () { + return 11; +}; + +IDataSerializable.prototype.getFactoryId = function () { + return 1; +}; + +function IDataSerializableFactory() { + +} + +IDataSerializableFactory.prototype.create = function (type) { + if (type === 11) { + return new IDataSerializable(); + } +}; + +function Portable(val) { + this.val = val; +} + +Portable.prototype.getClassId = function () { + return 22; +}; + +Portable.prototype.getFactoryId = function () { + return 2; +}; + +Portable.prototype.readPortable = function (reader) { + this.val = reader.readInt('val'); +}; + +Portable.prototype.writePortable = function (writer) { + writer.writeInt('val', this.val); +}; + +function PortableFactory() { + +} + +PortableFactory.prototype.create = function (classId) { + if (classId === 22) { + return new Portable(); + } +}; + +function AnyObject(val) { + this.val = val; + this.self = this;//putting a reference to self so json serializer cannot be used. making sure global serializer is used in test. +} + +function GlobalSerializer() { + +} + +GlobalSerializer.prototype.getId = function () { + return 33; +}; + +GlobalSerializer.prototype.read = function (inp) { + var obj = new AnyObject(); + obj.val = inp.readInt(); + return obj; +}; + +GlobalSerializer.prototype.write = function (outp, obj) { + outp.writeInt(obj.val); +}; + +function CustomObject(val) { + this.val = val; + this.self = this;//putting a reference to self so json serializer cannot be used. making sure global serializer is used in test. +} + +CustomObject.prototype.hzGetCustomId = function () { + return 44; +}; + +function CustomSerializer() { + +} + +CustomSerializer.prototype.getId = function () { + return 44; +}; + +CustomSerializer.prototype.read = function (reader) { + var obj = new CustomObject(); + obj.val = reader.readInt(); + return obj; +}; + +CustomSerializer.prototype.write = function (writer, obj) { + writer.writeInt(obj.val); +}; + + +exports.IDataSerializableFactory = IDataSerializableFactory; +exports.PortableFactory = PortableFactory; +exports.GlobalSerializer = GlobalSerializer; +exports.CustomSerializer = CustomSerializer; diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 0ddcac153..8a07822f6 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -25,6 +25,7 @@ var Config = require('../..').Config; var HzErrors = require('../..').HazelcastErrors; var Promise = require('bluebird'); var markEnterprise = require('../Util').markEnterprise; +var Path = require('path'); describe('SSL Client Authentication Test', function () { var cluster; @@ -37,12 +38,7 @@ describe('SSL Client Authentication Test', function () { markEnterprise(this); }); - afterEach(function () { - this.timeout(4000); - return Controller.shutdownCluster(cluster.id); - }); - - function createMemberWithXML(xmlFile) { + function createMemberWithXML() { return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8')).then(function(cl) { cluster = cl; return Controller.startMember(cluster.id); @@ -52,12 +48,12 @@ describe('SSL Client Authentication Test', function () { }); } - function createClientConfigWithSSLOpts(key, ca) { + function createClientConfigWithSSLOptsUsingProgrammaticConfiguration(key, ca) { var sslOpts = { servername: 'foo.bar.com', rejectUnauthorized: true, - cert: fs.readFileSync(__dirname + key), - ca: fs.readFileSync(__dirname + ca) + cert: fs.readFileSync(Path.join(__dirname, key)), + ca: fs.readFileSync(Path.join(__dirname, ca)) }; var cfg = new Config.ClientConfig(); cfg.networkConfig.sslOptions = sslOpts; @@ -66,61 +62,95 @@ describe('SSL Client Authentication Test', function () { return cfg; } - it('ma:required, they both know each other should connect', function () { - return createMemberWithXML(maRequiredXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server1.pem')); - }).then(function(client) { - client.shutdown(); - }); - }); + function createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory(key, ca) { + var cfg = new Config.ClientConfig(); + cfg.networkConfig.sslOptionsFactoryConfig = { + exportedName: 'BasicSSLOptionsFactory' + }; + cfg.networkConfig.sslOptionsFactoryProperties = { + caPath: Path.resolve(__dirname, ca), + certPath: Path.resolve(__dirname, key), + rejectUnauthorized: true, + servername: 'foo.bar.com' + }; + cfg.networkConfig.connectionAttemptLimit = 1; + return cfg; + } - it('ma:required, server knows client, client does not know server should fail', function () { - this.timeout(5000); - return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))) - .to.be.rejectedWith(HzErrors.IllegalStateError); - }); - }); + [false, true].forEach(function (value) { + if (value) { + var createClientConfigWithSSLOpts = createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory; + var title = 'via BasicSSLOptionsFactory'; + } else { + var createClientConfigWithSSLOpts = createClientConfigWithSSLOptsUsingProgrammaticConfiguration; + var title = 'via programmatic configuration'; + } - it('ma:required, server does not know client, client knows server should fail', function () { - return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server1.pem'))).to.throw; - }); - }); + describe(title, function () { - it('ma:required, neither one knows the other should fail', function () { - return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server2.pem'))).to.throw; - }); - }); + afterEach(function () { + this.timeout(4000); + return Controller.shutdownCluster(cluster.id); + }); - it('ma:optional, they both know each other should connect', function () { - return createMemberWithXML(maOptionalXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server1.pem')); - }).then(function(client) { - client.shutdown(); - }); - }); + it('ma:required, they both know each other should connect', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server1.pem')); + }).then(function(client) { + client.shutdown(); + }); + }); - it('ma:optional, server knows client, client does not know server should fail', function () { - return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client1.pem', '/server2.pem'))) - .to.be.rejectedWith(HzErrors.IllegalStateError); - }); - }); + it('ma:required, server knows client, client does not know server should fail', function () { + this.timeout(5000); + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server2.pem'))) + .to.be.rejectedWith(HzErrors.IllegalStateError); + }); + }); - it('ma:optional, server does not know client, client knows server should connect', function () { - return createMemberWithXML(maOptionalXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server1.pem')); - }).then(function(cl) { - client = cl; - }) - }); + it('ma:required, server does not know client, client knows server should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server1.pem'))).to.throw; + }); + }); + + it('ma:required, neither one knows the other should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server2.pem'))).to.throw; + }); + }); + + it('ma:optional, they both know each other should connect', function () { + return createMemberWithXML(maOptionalXML).then(function () { + return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server1.pem')); + }).then(function(client) { + client.shutdown(); + }); + }); - it('ma:optional, neither knows the otherr should fail', function () { - return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('/client2.pem', '/server2.pem'))) - .to.be.rejectedWith(HzErrors.IllegalStateError); + it('ma:optional, server knows client, client does not know server should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server2.pem'))) + .to.be.rejectedWith(HzErrors.IllegalStateError); + }); + }); + + it('ma:optional, server does not know client, client knows server should connect', function () { + return createMemberWithXML(maOptionalXML).then(function () { + return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server1.pem')); + }).then(function(cl) { + client = cl; + }) + }); + + it('ma:optional, neither knows the otherr should fail', function () { + return createMemberWithXML(maRequiredXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server2.pem'))) + .to.be.rejectedWith(HzErrors.IllegalStateError); + }); + }); }); }); + }); From e43e062365d3e51802e55743f7774bb835ba0bd1 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 28 Feb 2018 14:11:06 -0500 Subject: [PATCH 074/685] fixes removing wrong member from memberlist issue --- src/invocation/ClusterService.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index b285ef587..f2764e1dc 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -251,10 +251,11 @@ export class ClusterService extends EventEmitter { private memberRemoved(member: Member) { let memberIndex = this.members.findIndex(member.equals, member); - let removedMemberList = this.members.splice(memberIndex, 1); - assert(removedMemberList.length === 1); - let removedMember = removedMemberList[0]; - this.client.getConnectionManager().destroyConnection(removedMember.address); - this.emit(EMIT_MEMBER_REMOVED, removedMember); + if (memberIndex !== -1) { + let removedMemberList = this.members.splice(memberIndex, 1); + assert(removedMemberList.length === 1); + } + this.client.getConnectionManager().destroyConnection(member.address); + this.emit(EMIT_MEMBER_REMOVED, member); } } From 4c1aeaf3f67342477806371b31c2c9f92e754fc0 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 20 Feb 2018 11:57:05 -0500 Subject: [PATCH 075/685] fixes cipher support in BasicSSLOptionsFactory --- src/connection/BasicSSLOptionsFactory.ts | 3 +- test/ssl/BasicSSLOptionsFactoryTest.js | 47 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 test/ssl/BasicSSLOptionsFactoryTest.js diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts index a9eb8377f..5b177731e 100644 --- a/src/connection/BasicSSLOptionsFactory.ts +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -65,7 +65,8 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { servername: this.servername, rejectUnauthorized: this.rejectUnauthorized, cert: this.cert, - ca: this.ca + ca: this.ca, + ciphers: this.ciphers }; } diff --git a/test/ssl/BasicSSLOptionsFactoryTest.js b/test/ssl/BasicSSLOptionsFactoryTest.js new file mode 100644 index 000000000..1ff7ff289 --- /dev/null +++ b/test/ssl/BasicSSLOptionsFactoryTest.js @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var chai = require("chai"); +var expect = chai.expect; +var Path = require('path'); +var HazelcastError = require('../..').HazelcastErrors.HazelcastError; +var BasicSSLOptionsFactory = require('../../lib/connection/BasicSSLOptionsFactory').BasicSSLOptionsFactory; + +describe('BasicSSLOptionsFactoryTest', function () { + it('factory creates options object with all supported fields', function () { + var options = { + servername: 'foo.bar.com', + rejectUnauthorized: true, + certPath: Path.join(__dirname, './client1.pem'), + caPath: Path.join(__dirname, './server1.pem'), + ciphers: 'cipherliststring' + }; + var factory = new BasicSSLOptionsFactory(); + return factory.init(options).then(function () { + var optsObject = factory.getSSLOptions(); + expect(optsObject.servername).to.equal('foo.bar.com'); + expect(optsObject.rejectUnauthorized).to.be.true; + expect(optsObject.cert).to.be.instanceOf(Buffer); + expect(optsObject.ca).to.be.instanceOf(Buffer); + expect(optsObject.ciphers).to.equal('cipherliststring'); + }); + }); + + it('BasicSSLOptionsFactory throws when provided with non-object properties', function () { + var factory = new BasicSSLOptionsFactory(); + return expect(factory.init.bind(factory, 3)).to.throw(HazelcastError); + }) +}); From 9f724e547de75c28fcc2c27b89d08a6fbfd547c0 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 28 Feb 2018 14:51:10 -0500 Subject: [PATCH 076/685] fixes #260 --- .../portable/ClassDefinitionWriter.ts | 2 +- .../portable/PortableSerializer.ts | 2 +- .../PortableSerializersLiveTest.js | 52 ++++++++++++++----- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index 422f168c2..88b6fc202 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -86,7 +86,7 @@ export class ClassDefinitionWriter implements PortableWriter { writeNullPortable(fieldName: string, factoryId: number, classId: number): void { var version: number = 0; var nestedCD = this.portableContext.lookupClassDefinition(factoryId, classId, version); - if (nestedCD === null) { + if (nestedCD == null) { throw new RangeError('Cannot write null portable without explicitly registering class definition!'); } this.addFieldByType(fieldName, FieldType.PORTABLE, nestedCD.getFactoryId(), nestedCD.getClassId()); diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 8325c7f44..29912129a 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -65,7 +65,7 @@ export class PortableSerializer implements Serializer { var portable: Portable = factory.create(classId); var classDefinition = this.portableContext.lookupClassDefinition(factoryId, classId, version); - if (classDefinition === null) { + if (classDefinition == null) { var backupPos = input.position(); try { classDefinition = this.portableContext.readClassDefinitionFromInput(input, factoryId, classId, version); diff --git a/test/serialization/PortableSerializersLiveTest.js b/test/serialization/PortableSerializersLiveTest.js index 65f7e8216..8bc385018 100644 --- a/test/serialization/PortableSerializersLiveTest.js +++ b/test/serialization/PortableSerializersLiveTest.js @@ -12,6 +12,22 @@ describe('Default serializers with live instance', function() { var client; var map; + function getClientConfig() { + var cfg = new Config.ClientConfig(); + cfg.serializationConfig.portableFactories[10] = { + create: function(classId) { + if (classId === 222) { + return new InnerPortable(); + } else if (classId === 21) { + return new SimplePortable(); + } else { + return null; + } + } + }; + return cfg; + } + before(function() { return RC.createCluster(null, null).then(function (res) { cluster = res; @@ -19,19 +35,7 @@ describe('Default serializers with live instance', function() { return RC.startMember(cluster.id); }).then(function (m) { member = m; - var cfg = new Config.ClientConfig(); - cfg.serializationConfig.portableFactories[10] = { - create: function(classId) { - if (classId === 222) { - return new InnerPortable(); - } else if (classId === 21) { - return new SimplePortable(); - } else { - return null; - } - } - }; - return Client.newHazelcastClient(cfg); + return Client.newHazelcastClient(getClientConfig()); }).then(function (cl) { client = cl; map = client.getMap('test'); @@ -43,7 +47,7 @@ describe('Default serializers with live instance', function() { return RC.shutdownCluster(cluster.id); }); - it('two portables write and read', function () { + it('client can write and read two different serializable objects of the same factory', function () { var simplePortable = new SimplePortable('atext'); var innerPortable = new InnerPortable('str1', 'str2'); return map.put('simpleportable', simplePortable).then(function () { @@ -59,4 +63,24 @@ describe('Default serializers with live instance', function() { }); }); + it('client can read two different serializable objects of the same factory (written by another client)', function () { + var simplePortable = new SimplePortable('atext'); + var innerPortable = new InnerPortable('str1', 'str2'); + return map.putAll([['simpleportable', simplePortable], ['innerportable', innerPortable]]).then(function () { + client.shutdown(); + }).then(function() { + return Client.newHazelcastClient(getClientConfig()); + }).then(function (cl) { + client = cl; + map = client.getMap('test'); + return map.get('simpleportable'); + }).then(function (sp) { + return map.get('innerportable').then(function (ip) { + expect(sp).to.deep.equal(simplePortable); + expect(ip).to.deep.equal(innerPortable); + return Promise.resolve(); + }); + }); + }); + }); From a4ed6a87273785b03a4e19ce79d747f9fe9f2474 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 20 Feb 2018 13:40:18 -0500 Subject: [PATCH 077/685] adds default export support to import configs --- src/Util.ts | 7 ++++++- test/javaclasses/IdentifiedFactory.js | 2 +- test/serialization/SerializationServiceTest.js | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/Util.ts b/src/Util.ts index c15690a3b..7e3d4eed6 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -176,7 +176,12 @@ export function resolvePath(path: string): string { } export function loadNameFromPath(path: string, exportedName: string): any { - return require(resolvePath(path))[exportedName]; + let requirePath = require(resolvePath(path)); + if (exportedName === undefined) { + return requirePath; + } else { + return require(resolvePath(path))[exportedName]; + } } export function createAddressFromString(address: string, defaultPort?: number): Address { diff --git a/test/javaclasses/IdentifiedFactory.js b/test/javaclasses/IdentifiedFactory.js index 2c68222ed..e3336af25 100644 --- a/test/javaclasses/IdentifiedFactory.js +++ b/test/javaclasses/IdentifiedFactory.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var IdentifiedEntryProcessor = require('./IdentifiedFactory'); +var IdentifiedEntryProcessor = require('./IdentifiedEntryProcessor'); var DistortInvalidationMetadataEntryProcessor = require('./DistortInvalidationMetadataEntryProcessor'); var CustomComparator = require('./CustomComparator'); diff --git a/test/serialization/SerializationServiceTest.js b/test/serialization/SerializationServiceTest.js index 212f51faf..c76c9f758 100644 --- a/test/serialization/SerializationServiceTest.js +++ b/test/serialization/SerializationServiceTest.js @@ -16,7 +16,9 @@ var expect = require('chai').expect; var SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; +var IdentifiedEntryProcessor = require('../javaclasses/IdentifiedEntryProcessor'); var Config = require('../../').Config; +var Path = require('path'); describe('SerializationServiceTest', function () { @@ -40,6 +42,10 @@ describe('SerializationServiceTest', function () { exportedName: 'CustomSerializer' }; + var identifiedDataSerializableFactoryDefaultExportConfig = { + path: Path.resolve(__filename, '../../javaclasses/IdentifiedFactory.js') + } + it('adds data serializable factory by its name', function () { var serializationConfig = new Config.SerializationConfig(); serializationConfig.dataSerializableFactoryConfigs[1] = identifiedDataSerializableFactoryConfig; @@ -89,6 +95,18 @@ describe('SerializationServiceTest', function () { expect(object.val).to.equal(3); expect(object.self).to.equal(object); }); + + it('adds identified factory without named export', function () { + var serializationConfig = new Config.SerializationConfig(); + serializationConfig.dataSerializableFactoryConfigs[66] = identifiedDataSerializableFactoryDefaultExportConfig; + + var serializationService = new SerializationService(serializationConfig); + + var data = serializationService.toData(new IdentifiedEntryProcessor('x')); + var object = serializationService.toObject(data); + + expect(object.value).to.equal('x'); + }) }); function IDataSerializable(val) { From b96a3884e84fb6b5b694423ea2782beaa962fcbd Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 27 Feb 2018 15:21:24 -0500 Subject: [PATCH 078/685] readme html fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef15760a7..1724672a2 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ > **NOTE: This project is currently in active development.** [![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -

+
This document explains Node.js client for Hazelcast which uses Hazelcast's Open Client Protocol 1.6. This client works with Hazelcast 3.6 and higher. From 946fa6af71c9dd7b7e1bc2f2dda99b53ee5c95f1 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 22 Feb 2018 08:32:46 -0500 Subject: [PATCH 079/685] adds declarative configuration doc --- CONFIG.md | 418 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 7 + 2 files changed, 425 insertions(+) create mode 100644 CONFIG.md diff --git a/CONFIG.md b/CONFIG.md new file mode 100644 index 000000000..420b6c739 --- /dev/null +++ b/CONFIG.md @@ -0,0 +1,418 @@ +You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). +* Programmatic configuration +* Declarative configuration (JSON file) + +# Programmatic Configuration +For programmatic configuration of the Hazelcast Java Client, just instantiate a ClientConfig object and configure the +desired aspects. An example is shown below. + +```javascript +var Config = require('hazelcast-client').Config; +var Address = require('hazelcast-client').Address; +var cfg = new Config.ClientConfig(); +cfg.networkConfig.addresses.push(new Address('127.0.0.11', 5701)); +return HazelcastClient.newHazelcastClient(cfg); +``` + +Refer to [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. + +# Declarative Configuration (JSON) +For declarative configuration, the Hazelcast client looks at the following places for the client configuration file. + +1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, +the client looks for the configuration file in the specified location. +2. Current working directory: If there is no environment variable set, the client tries to load `hazelcast-client.json` +from current working directory. +3. Default configuration: If above methods fail, the client starts with default configuration. + +Following is a sample JSON configuration file: +```json +{ + "group": { + "name": "hazel", + "password": "cast" + }, + "properties": { + "hazelcast.client.heartbeat.timeout": 10000, + "hazelcast.client.invocation.retry.pause.millis": 4000, + "hazelcast.client.invocation.timeout.millis": 180000, + "hazelcast.invalidation.reconciliation.interval.seconds": 50, + "hazelcast.invalidation.max.tolerated.miss.count": 15, + "hazelcast.invalidation.min.reconciliation.interval.seconds": 60 + }, + "network": { + "clusterMembers": [ + "127.0.0.1:5701" + ], + "smartRouting": true, + "connectionTimeout": 6000, + "connectionAttemptPeriod": 4000, + "connectionAttemptLimit": 3 + } +} +``` + +## Group Configuration +Clients should provide a group name and password in order to connect to the cluster. +You can configure them as shown below. +```json +{ + "group": { + "name": "hazel", + "password": "cast" + } +} +``` + +## Client Network +All network related configuration of Hazelcast Node.js Client is performed via the `network` element in the declarative +configuration file. Let's first give an example for `network` configuration. Then we will look at its properties. +```json +{ + "network": { + "clusterMembers": [ + "127.0.0.9", + "127.0.0.2:5702" + ], + "smartRouting": false, + "connectionTimeout": 6000, + "connectionAttemptPeriod": 4000, + "connectionAttemptLimit": 3, + "ssl": { + "enabled": true, + "factory": { + "path": "path/to/file", + "exportedName": "exportedName", + "properties": { + "userDefinedProperty1": "userDefinedValue" + } + } + } + } +} +``` + +### Configuring Address List +Address list is the initial list of cluster addresses to which the client will connect. The client uses this +list to find an alive member. Although it may be enough to give only one address of a member in the cluster +(since all members communicate with each other), it is recommended that you give the addresses for all the members. +```json +{ + "network": { + "clusterMembers": [ + "127.0.0.9", + "127.0.0.2:5702" + ] + } +} +``` +If the port part is omitted, then 5701, 5702, and 5703 will be tried in random order. + +Default address is 127.0.0.1. + +### Setting Smart Routing +Smart routing defines whether the client mode is smart or unisocket. The following is an example configuration. +```json +{ + "network": { + "smartRouting": true + } +} +``` +Default is smart routing mode. + +### Setting Connection Timeout +Connection timeout is the timeout value in milliseconds for members to accept client connection requests. +```json +{ + "network": { + "connectionTimeout": 6000 + } +} +``` +Default value is 5000 milliseconds. + +### Setting Connection Attempt Limit +While the client is trying to connect initially to one of the members in the address list, that member +might not be available at that moment. Instead of giving up, throwing an error and stopping the client, +the client will retry as many as connection attempt limit times. This is also the case when the previously +established connection between the client and that member goes down. +```json +{ + "network": { + "connectionAttemptLimit": 3 + } +} +``` +Default value is 2. +### Setting Connection Attempt Period +Connection timeout period is the duration in milliseconds between the connection attempts defined by +connection attempt limit. +```json +{ + "network": { + "connectionAttemptPeriod": 4000 + } +} +``` +Default value is 3000. +### Enabling Client TLS/SSL +You can use TLS/SSL to secure the connection between the client and members. If you want TLS/SSL enabled +for the client-cluster connection, you should set an SSL configuration. Once set, the connection (socket) is +established out of an options object supplied by the user. + +Hazelcast Node.js Client uses a user supplied SSL options object to pass to +[`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). There are two ways +to provide this object to the client; +1. Using builtin `BasicSSLOptionsFactory` bundled with the client. +2. Writing an SSLOptionsFactory. + +#### 1. Using Built-in BasicSSLOptionsFactory +Hazelcast Node.js Client includes a utility factory class that creates the necessary options object out of supplied +properties. All you need to do is specify your factory as `BasicSSLOptionsFactory` and provide the following options. + + certPath + caPath + servername + rejectUnauthorized + ciphers + +Refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) for meaning +of each option. +> `certPath` and `caPath` define file path to respective file that stores such information. + +```json +{ + "network": { + "ssl": { + "enabled": true, + "factory": { + "exportedName": "BasicSSLOptionsFactory", + "properties": { + "caPath": "ca.pem", + "certPath": "cert.pem", + "rejectUnauthorized": false + } + } + } + } +} +``` +If these options are not enough for your application, you may write your own options factory and instruct the client +to get the options from it. + +#### Writing an SSL Options Factory +In order to use the full range of options provided to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback), +you may write your own factory object. +```json +{ + "network": { + "ssl": { + "enabled": true, + "factory": { + "path": "my_factory.js", + "exportedName": "SSLFactory", + "properties": { + "caPath": "ca.pem", + "certPath": "cert.pem", + "keepOrder": true + } + } + } + } +} +``` + + +my_factory.js +```javascript +function SSLFactory() { +} + +SSLFactory.prototype.init = function(props) { + this.keyPath = props.keyPath; + this.caPath = props.caPath; + this.keepOrder = props.userDefinedProperty1; +}; + +SSLFactory.prototype.getSSLOptions = function() { + var sslOpts = { + servername: 'foo.bar.com', + rejectUnauthorized: true, + cert: fs.readFileSync(this.keyPath), + ca: fs.readFileSync(this.caPath) + }; + if (this.keepOrder) { + sslOpts.honorCipherOrder = true; + } + return sslOpts; +}; +exports.SSLFactory = SSLFactory; +``` + +The client loads MyFactory.js at runtime and creates an instance of SSLFactory. It then, calls `init` method with +the properties section in JSON config. Lastly, the client calls `getSSLOptions` method of SSLFactory to create the +options object. + +For information about path resolution, refer to [Path Resolution](#path-resolution-and-object-loading) + +## Serialization Configuration +This section shows how to configure Hazelcast serialization declaratively. Please refer to [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#serialization) +and [Node.js client readme](https://github.com/hazelcast/hazelcast-nodejs-client/#serialization-considerations) for +learning about serialization. + +Serialization configuration is as follows: + +```json +{ +"serialization": { + "defaultNumberType": "integer", + "isBigEndian": false, + "dataSerializableFactories": [ + { + "path": "path/to/file", + "exportedName": "exportedName", + "factoryId": 0 + } + ], + "portableFactories": [ + { + "path": "path/to/file", + "exportedName": "exportedName", + "factoryId": 1 + } + ], + "portableVersion": 1, + "globalSerializer": { + "path": "path/to/file", + "exportedName": "exportedName" + }, + "serializers": [ + { + "path": "path/to/custom", + "exportedName": "CustomSerializer1", + "typeId": 2 + }, + { + "path": "path/to/custom", + "exportedName": "CustomSerializer2", + "typeId": 3 + } + ] + } +} +``` + +One important aspect of Node.js Client's serialization is `defaultNumberType`. Hazelcast servers use 4 different +primitive numeric types; `int`, `long`, `float` and `double`. However, Javascript has only one numeric type which +is `number`. Number is a floating point type. If you do not work with heterogenous clients (multiple languages), +you do not need to worry about this setting. However, if your numeric data is accessed by clients in different +languages, you need to map `number` type to one of the numeric types recognized by Java servers. Hazelcast handles +type conversions automatically. Accepted values for `defaultNumberType` are `integer`, `float` and `double`. You +may use `long` module for working with longs. [long module](https://www.npmjs.com/package/long) is included +in Hazelcast Node.js client. + +Related section: [Path Resolution](#path-resolution-and-object-loading) + +## Configuring Near Cache +You may configure near caches for your maps as the following: + +```json +{ + "nearCaches": [ + { + "name": "nc-map", + "invalidateOnChange": false, + "maxIdleSeconds": 2, + "inMemoryFormat": "object", + "timeToLiveSeconds": 3, + "evictionPolicy": "lru", + "evictionMaxSize": 3000, + "evictionSamplingCount": 4, + "evictionSamplingPoolSize": 8 + } + ] +} +``` +`nearCaches` is an array that includes one configuration object for each near cache in the client. For meanings +of configuration options refer to [NearCacheConfig API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.nearcacheconfig.html) + +## Composing Declarative Configuration +You can compose the declarative configuration of your Hazelcast client from multiple declarative +configuration snippets. In order to compose a declarative configuration, you can use the `import` element to load +different declarative configuration files. + +group-config.json: +```json +{ + "group": { + "name": "hazel", + "password": "cast" + } +} +``` + +network-config.json: +```json +{ + "network": { + "clusterMembers": [ + "127.0.0.10:4001", + "127.0.0.11:4001" + ] + } +} +``` + +To get your example Hazelcast declarative configuration out of the above two, use the `import` element as +shown below. + +```json +{ + "import": [ + "group-config.json", + "network-config.json" + ] +} +``` + +> Note: Use `import` element on top level of json hierarchy. + + +## Path Resolution and Object Loading +For configuration elements that require you to specify a code piece, you will need to specify the path to +code and the name of exported element that you want the client to use. This configuration is set by the following: +```json +{ + "path": "path/to/file", + "exportedName": "MyObject" +} +``` + +In the above configuration, `path` shows the address to the file that you want the client to load. Unless this is an +absolute path, it is relative to the location of `hazelcast-config.json` file. + +In Javascript you can define and export as many objects as you want in a single file. Above configuration element +is designed to load only one specified object from a file. Therefore `exportedName` specifies the name of desired +object. + +Let's say your project directory structure is like the following: + + my_app/ + my_app/index.js + my_app/factory_utils.js + my_app/hazelcast-client.json + my_app/node_modules/ + my_app/node_modules/hazelcast-client + +In `factory_utils.js`, you have multiple exported functions. +```javascript +exports.utilityFunction = function() {...} +exports.MySSLFactory = function() {...} +``` + +In order to load `MySSLFactory` in your SSL configuration, you should set `path` and `exportedName` as `factory_utils.js` +and `MySSLFactory` respectively. + +If you have only one export as the default export from `factory_utils.js`, just skip `exportedName` property and +the client will load the default export from the file. diff --git a/README.md b/README.md index 1724672a2..ed6a663b9 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,13 @@ Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelca You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). +# Configuration + +You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). + +See [CONFIG.md](CONFIG.md) for details. + + # Serialization Considerations Hazelcast needs to serialize objects in order to be able to keep them in the server memory. For primitive types, it uses Hazelcast native serialization. For other complex types (e.g. JS objects), it uses JSON serialization. From 54686a80d7501af5a2f26c448f10c98ed2cb48fb Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 21 Feb 2018 12:02:19 -0500 Subject: [PATCH 080/685] adds json schema --- config-schema.json | 299 ++++++++++++++++++++++ package.json | 1 + test/config/SchemaValidationTest.js | 45 ++++ test/config/hazelcast-client-invalid.json | 5 + 4 files changed, 350 insertions(+) create mode 100644 config-schema.json create mode 100644 test/config/SchemaValidationTest.js create mode 100644 test/config/hazelcast-client-invalid.json diff --git a/config-schema.json b/config-schema.json new file mode 100644 index 000000000..19e37ac99 --- /dev/null +++ b/config-schema.json @@ -0,0 +1,299 @@ +{ + "$schema": "http://json-schema.org/schema#", + "id": "https://github.com/hazelcast/hazelcast-nodejs-client/blob/schema/config-schema.json", + "title": "Hazelcast Node.js Client Configuration", + "type": "object", + "definitions": { + "importPath": { + "type": "object", + "properties": { + "path": { + "type": "string", + "format": "uri-reference" + }, + "exportedName": { + "type": "string" + } + } + }, + "propertiesObject": { + "type": "object", + "propertyNames": { + "pattern": "^[^ ]*$" + }, + "additionalProperties": { + "type": [ + "number", + "string" + ] + } + }, + "positiveInteger": { + "type": "number", + "minimum": 0, + "multipleOf": 1 + }, + "listenerConfig": { + "allOf": [ + { + "$ref": "#/definitions/importPath" + }, + { + "properties": { + "type": { + "enum": [ + "lifecycle", + "map" + ] + } + } + } + ] + }, + "factoryConfig": { + "allOf": [ + { + "$ref": "#/definitions/importPath" + }, + { + "properties": { + "factoryId": { + "$ref": "#/definitions/positiveInteger" + } + } + } + ] + }, + "factoryConfigArray": { + "type": "array", + "items": { + "$ref": "#/definitions/factoryConfig" + } + } + }, + "properties": { + "group": { + "type": "object", + "required": [ + "name", + "password" + ], + "properties": { + "name": { + "type": "string" + }, + "password": { + "type": "string" + } + }, + "additionalProperties": false + }, + "properties": { + "$ref": "#/definitions/propertiesObject" + }, + "network": { + "type": "object", + "properties": { + "clusterMembers": { + "type": "array", + "minItems": 1, + "uniqueItems": true, + "items": { + "type": "string" + } + }, + "smartRouting": { + "type": "boolean", + "default": true + }, + "connectionTimeout": { + "type": "number", + "minimum": 1000, + "default": 5000 + }, + "connectionAttemptPeriod": { + "type": "number", + "minimum": 1, + "default": 3000 + }, + "connectionAttemptLimit": { + "type": "number", + "minimum": 0, + "default": 2 + }, + "ssl": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "default": false + }, + "factory": { + "anyOf": [ + { + "$ref": "#/definitions/importPath" + }, + { + "type": "object", + "properties": { + "properties": { + "$ref": "#/definitions/propertiesObject" + } + } + } + ] + } + } + } + } + }, + "listeners": { + "type": "array", + "items": { + "$ref": "#/definitions/listenerConfig" + } + }, + "serialization": { + "type": "object", + "properties": { + "defaultNumberType": { + "enum": [ + "integer", + "float", + "double" + ], + "default": "double" + }, + "isBigEndian": { + "type": "boolean", + "default": false + }, + "portableVersion": { + "$ref": "#/definitions/positiveInteger" + }, + "dataSerializableFactories": { + "$ref": "#/definitions/factoryConfigArray" + }, + "portableFactories": { + "$ref": "#/definitions/factoryConfigArray" + }, + "globalSerializer": { + "$ref": "#/definitions/importPath" + }, + "serializers": { + "type": "array", + "items": { + "allOf": [ + { + "$ref": "#/definitions/importPath" + }, + { + "required": [ + "typeId" + ], + "properties": { + "typeId": { + "$ref": "#/definitions/positiveInteger" + } + } + } + ] + } + } + } + }, + "nearCaches": { + "type": "array", + "items": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string", + "minLength": 1 + }, + "invalidateOnChange": { + "type": "boolean", + "default": true + }, + "maxIdleSeconds": { + "type": "number", + "default": 0, + "minimum": 0 + }, + "inMemoryFormat": { + "enum": [ + "object", + "binary" + ], + "default": "binary" + }, + "timeToLiveSeconds": { + "type": "number", + "minimum": 0, + "default": 0 + }, + "evictionPolicy": { + "enum": [ + "none", + "lru", + "lfu", + "random" + ], + "default": "none" + }, + "evictionMaxSize": { + "$ref": "#/definitions/positiveInteger", + "default": "maximum safe integer" + }, + "evictionSamplingCount": { + "$ref": "#/definitions/positiveInteger", + "default": 8 + }, + "evictionSamplingPoolSize": { + "$ref": "#/definitions/positiveInteger", + "default": 16 + } + } + } + }, + "reliableTopics": { + "type": "array", + "items": { + "type": "object", + "required": [ + "name" + ], + "additionalProperties": false, + "properties": { + "name": { + "type": "string", + "minLength": 1 + }, + "readBatchSize": { + "$ref": "#/definitions/positiveInteger", + "default": 25 + }, + "overloadPolicy": { + "enum": [ + "discard_oldest", + "discard_newest", + "block", + "error" + ], + "default": "block" + } + } + } + }, + "import": { + "type": "array", + "minItems": 1, + "items": { + "type": "string" + } + } + } +} diff --git a/package.json b/package.json index a6d6ed4e6..6c9ad9965 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "chai-as-promised": "7.1.1", "hazelcast-remote-controller": "^1.0.0", "istanbul": "0.4.5", + "jsonschema": "^1.2.2", "mocha": "3.5.3", "mousse": "0.3.1", "remap-istanbul": "0.9.6", diff --git a/test/config/SchemaValidationTest.js b/test/config/SchemaValidationTest.js new file mode 100644 index 000000000..083c748d3 --- /dev/null +++ b/test/config/SchemaValidationTest.js @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var validate = require('jsonschema').validate; +var fs = require('fs'); +var path = require('path'); + +describe('SchemaValidationTest', function () { + + var schema; + + before(function () { + schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../config-schema.json'), 'utf8')); + }); + + function validateCandidate(candidate) { + var candidateJson = JSON.parse(candidate); + return validate(candidateJson, schema, { nestedErrors: true }); + } + + it('hazelcast-client-full.json passes validation', function () { + var fulljson = fs.readFileSync(path.resolve(__dirname, 'hazelcast-client-full.json'), 'utf8'); + expect(validateCandidate(fulljson).valid).to.be.true; + }); + + it('invalid configuration is caught by the validator', function () { + var invalidJson = fs.readFileSync(path.resolve(__dirname, 'hazelcast-client-invalid.json'), 'utf8'); + expect(validateCandidate(invalidJson).errors[0]).to.exist.with.property('message', 'must have a minimum value of 1000'); + }); +}); + diff --git a/test/config/hazelcast-client-invalid.json b/test/config/hazelcast-client-invalid.json new file mode 100644 index 000000000..67653a4bc --- /dev/null +++ b/test/config/hazelcast-client-invalid.json @@ -0,0 +1,5 @@ +{ + "network": { + "connectionTimeout": 65.6 + } +} From 727c71f779c36648d69a68904a878cdde7aedb27 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 1 Mar 2018 15:08:31 -0500 Subject: [PATCH 081/685] Adds error factories All remote exceptions were wrapped by RemoteException. Client should be able to differentiate between server exceptions so it can determine when to retry. --- src/HazelcastClient.ts | 7 + src/HazelcastError.ts | 201 ++++++++++++++++++ src/exception/Exception.ts | 40 ---- src/invocation/ClientConnection.ts | 7 +- src/invocation/InvocationService.ts | 97 +++++---- src/protocol/ClientProtocolErrorCodes.ts | 107 ++++++++++ .../ErrorCodec.ts} | 36 +--- src/protocol/ErrorFactory.ts | 105 +++++++++ .../StackTraceElementCodec.ts} | 19 +- .../topic/ReliableTopicListenerRunner.ts | 3 +- test/ClientReconnectTest.js | 2 +- 11 files changed, 506 insertions(+), 118 deletions(-) delete mode 100644 src/exception/Exception.ts create mode 100644 src/protocol/ClientProtocolErrorCodes.ts rename src/{codec/ExceptionCodec.ts => protocol/ErrorCodec.ts} (57%) create mode 100644 src/protocol/ErrorFactory.ts rename src/{exception/StackTraceElement.ts => protocol/StackTraceElementCodec.ts} (55%) diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index b8356fe9a..cb2b0e7ae 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -44,6 +44,7 @@ import {IAtomicLong} from './proxy/IAtomicLong'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; import {RepairingTask} from './nearcache/RepairingTask'; import {ConfigBuilder} from './config/ConfigBuilder'; +import {ClientErrorFactory} from './protocol/ErrorFactory'; export default class HazelcastClient { @@ -60,6 +61,7 @@ export default class HazelcastClient { private heartbeat: Heartbeat; private lockReferenceIdGenerator: LockReferenceIdGenerator; private mapRepairingTask: RepairingTask; + private errorFactory: ClientErrorFactory; /** * Creates a new client object and automatically connects to cluster. @@ -96,6 +98,7 @@ export default class HazelcastClient { this.lifecycleService = new LifecycleService(this); this.heartbeat = new Heartbeat(this); this.lockReferenceIdGenerator = new LockReferenceIdGenerator(); + this.errorFactory = new ClientErrorFactory(); } private init(): Promise { @@ -309,6 +312,10 @@ export default class HazelcastClient { return this.lockReferenceIdGenerator; } + getErrorFactory(): ClientErrorFactory { + return this.errorFactory; + } + /** * Shuts down this client instance. */ diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index e0e767a4f..4607211d8 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -14,6 +14,11 @@ * limitations under the License. */ +export interface HazelcastErrorConstructor { + new(message: string, cause?: Error): HazelcastError; + readonly prototype: Error; +} + export class HazelcastError extends Error { cause: Error; @@ -48,9 +53,205 @@ export class IllegalStateError extends HazelcastError { } } +export class StaleSequenceError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, StaleSequenceError.prototype); + } +} + export class TopicOverloadError extends HazelcastError { constructor(msg: string, cause?: Error) { super(msg, cause); Object.setPrototypeOf(this, TopicOverloadError.prototype); } } + +export class IOError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, IOError.prototype); + } +} + +export class UndefinedErrorCodeError extends HazelcastError { + constructor(msg: string, className: string) { + super('Class name: ' + className + ' , Message: ' + msg); + Object.setPrototypeOf(this, UndefinedErrorCodeError.prototype); + } +} + +export class InvocationTimeoutError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, InvocationTimeoutError.prototype); + } +} + +export class RetryableHazelcastError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, RetryableHazelcastError.prototype); + } +} + +export class TargetNotMemberError extends RetryableHazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, TargetNotMemberError.prototype); + } +} + +export class CallerNotMemberError extends RetryableHazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, CallerNotMemberError.prototype); + } +} + +export class CancellationError extends IllegalStateError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, CancellationError.prototype); + } +} + +export class ClassCastError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ClassCastError.prototype); + } +} + +export class ClassNotFoundError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ClassNotFoundError.prototype); + } +} + +export class ConcurrentModificationError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ConcurrentModificationError.prototype); + } +} + +export class ConfigMismatchError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ConfigMismatchError.prototype); + } +} + +export class ConfigurationError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ConfigurationError.prototype); + } +} + +export class DistributedObjectDestroyedError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, DistributedObjectDestroyedError.prototype); + } +} + +export class DuplicateInstanceNameError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, DuplicateInstanceNameError.prototype); + } +} + +export class HazelcastInstanceNotActiveError extends IllegalStateError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, HazelcastInstanceNotActiveError.prototype); + } +} + +export class MemberLeftError extends RetryableHazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, MemberLeftError.prototype); + } +} + +export class PartitionMigratingError extends RetryableHazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, PartitionMigratingError.prototype); + } +} + +export class QueryError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, QueryError.prototype); + } +} + +export class TransactionError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, TransactionError.prototype); + } +} + +export class TransactionNotActiveError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, TransactionNotActiveError.prototype); + } +} + +export class TransactionTimedOutError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, TransactionTimedOutError.prototype); + } +} + +export class QuorumError extends TransactionError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, QuorumError.prototype); + } +} + +export class RetryableIOError extends RetryableHazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, RetryableIOError.prototype); + } +} + +export class TargetDisconnectedError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, TargetDisconnectedError.prototype); + } +} + +export class UnsupportedOperationError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, UnsupportedOperationError.prototype); + } +} + +export class NoDataMemberInClusterError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, NoDataMemberInClusterError.prototype); + } +} + +export class StaleTaskIdError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, StaleTaskIdError.prototype); + } +} diff --git a/src/exception/Exception.ts b/src/exception/Exception.ts deleted file mode 100644 index b484bf95c..000000000 --- a/src/exception/Exception.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import StackTraceElement = require('./StackTraceElement'); - -class RemoteException { - - private static CODE_HAZELCAST_INSTANCE_NOT_ACTIVE = 21; - private static CODE_IO_ERROR = 24; - private static CODE_AUTHENTICATION_ERROR = 3; - - errorCode: number = null; - className: string = null; - message: string = null; - stackTrace: StackTraceElement[] = []; - causeErrorCode: number = null; - causeClassName: string = null; - - isRetryable(): boolean { - return this.errorCode === RemoteException.CODE_AUTHENTICATION_ERROR || - this.errorCode === RemoteException.CODE_IO_ERROR || - this.errorCode === RemoteException.CODE_HAZELCAST_INSTANCE_NOT_ACTIVE; - } - -} - -export = RemoteException; diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 3cf024c1e..9822b644a 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -14,12 +14,13 @@ * limitations under the License. */ -import net = require('net'); +import * as net from 'net'; import Address = require('../Address'); import * as Promise from 'bluebird'; import {BitsUtil} from '../BitsUtil'; import {BuildMetadata} from '../BuildMetadata'; import HazelcastClient from '../HazelcastClient'; +import {IOError} from '../HazelcastError'; export class ClientConnection { private address: Address; @@ -71,13 +72,13 @@ export class ClientConnection { try { this.socket.write(buffer, (err: any) => { if (err) { - deferred.reject(err); + deferred.reject(new IOError(err)); } else { deferred.resolve(); } }); } catch (err) { - deferred.reject(err); + deferred.reject(new IOError(err)); } return deferred.promise; } diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 542db9fca..57d022628 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -17,16 +17,18 @@ import ClientMessage = require('../ClientMessage'); import * as Long from 'long'; import Address = require('../Address'); -import ExceptionCodec = require('../codec/ExceptionCodec'); import * as Promise from 'bluebird'; import {BitsUtil} from '../BitsUtil'; import {LoggingService} from '../logging/LoggingService'; import HazelcastClient from '../HazelcastClient'; import {ClientConnection} from './ClientConnection'; -import {IllegalStateError, ClientNotActiveError} from '../HazelcastError'; +import { + IllegalStateError, ClientNotActiveError, IOError, InvocationTimeoutError, + HazelcastInstanceNotActiveError, RetryableHazelcastError +} from '../HazelcastError'; import * as assert from 'assert'; -var EXCEPTION_MESSAGE_TYPE = 109; +const EXCEPTION_MESSAGE_TYPE = 109; const MAX_FAST_INVOCATION_COUNT = 5; const PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS = 'hazelcast.client.invocation.retry.pause.millis'; const PROPERTY_INVOCATION_TIMEOUT_MILLIS = 'hazelcast.client.invocation.timeout.millis'; @@ -87,6 +89,14 @@ export class Invocation { hasPartitionId(): boolean { return this.hasOwnProperty('partitionId') && this.partitionId >= 0; } + + isAllowedToRetryOnSelection(err: Error): boolean { + return (this.connection == null && this.address == null) || !(err instanceof IOError); + } + + static isRetrySafeError(err: Error): boolean { + return err instanceof IOError || err instanceof HazelcastInstanceNotActiveError || err instanceof RetryableHazelcastError; + } } /** @@ -222,7 +232,7 @@ export class InvocationService { private invokeOnOwner(invocation: Invocation): Promise { let owner = this.client.getClusterService().getOwnerConnection(); if (owner == null) { - return Promise.reject(new IllegalStateError('Unisocket client\'s owner connection is not available.')); + return Promise.reject(new IOError('Unisocket client\'s owner connection is not available.')); } return this.send(invocation, owner); } @@ -237,10 +247,10 @@ export class InvocationService { } private invokeOnPartitionOwner(invocation: Invocation, partitionId: number): Promise { - var ownerAddress = this.client.getPartitionService().getAddressForPartition(partitionId); + let ownerAddress = this.client.getPartitionService().getAddressForPartition(partitionId); return this.client.getConnectionManager().getOrConnect(ownerAddress).then((connection: ClientConnection) => { if (connection == null) { - throw new Error(ownerAddress.toString() + '(partition owner) is not available.'); + throw new IOError(ownerAddress.toString() + '(partition owner) is not available.'); } return this.send(invocation, connection); }); @@ -260,34 +270,45 @@ export class InvocationService { } private notifyError(invocation: Invocation, error: Error): void { - var correlationId = invocation.request.getCorrelationId().toNumber(); - if (!this.client.getLifecycleService().isRunning()) { - invocation.deferred.reject(new ClientNotActiveError('Client is not active.', error)); - } else if (this.isRetryable(invocation)) { - this.logger.debug('InvocationService', - 'Retrying(' + invocation.invokeCount + ') on correlation-id=' + correlationId, error); - if (invocation.invokeCount < MAX_FAST_INVOCATION_COUNT) { - this.doInvoke(invocation); - } else { - setTimeout(this.doInvoke.bind(this, invocation), this.getInvocationRetryPauseMillis()); - } - } else { - this.logger.warn('InvocationService', 'Sending message ' + correlationId + ' failed'); + let correlationId = invocation.request.getCorrelationId().toNumber(); + if (this.rejectIfNotRetryable(invocation, error)) { delete this.pending[invocation.request.getCorrelationId().toNumber()]; - invocation.deferred.reject(error); + return; + } + this.logger.debug('InvocationService', + 'Retrying(' + invocation.invokeCount + ') on correlation-id=' + correlationId, error); + if (invocation.invokeCount < MAX_FAST_INVOCATION_COUNT) { + this.doInvoke(invocation); + } else { + setTimeout(this.doInvoke.bind(this, invocation), this.getInvocationRetryPauseMillis()); } } - private isRetryable(invocation: Invocation) { - if (invocation.connection != null || invocation.address != null) { - return false; + /** + * Determines if an error is retryable. The given invocation is rejected with approprate error if the error is not retryable. + * @param invocation + * @param error + * @returns `true` if invocation is rejected, `false` otherwise + */ + private rejectIfNotRetryable(invocation: Invocation, error: Error): boolean { + if (!this.client.getLifecycleService().isRunning()) { + invocation.deferred.reject(new ClientNotActiveError('Client is not active.', error)); + return true; + } + if (!invocation.isAllowedToRetryOnSelection(error)) { + invocation.deferred.reject(error); + return true; + } + if (!Invocation.isRetrySafeError(error)) { + invocation.deferred.reject(error); + return true; } if (invocation.deadline.getTime() < Date.now()) { - this.logger.debug('InvocationService', 'Invocation ' + invocation.request.getCorrelationId() + ')' + - ' reached its deadline.'); - return false; + this.logger.trace('InvocationService', 'Error will not be retried because invocation timed out'); + invocation.deferred.reject(new InvocationTimeoutError('Invocation ' + invocation.request.getCorrelationId() + ')' + + ' reached its deadline.', error)); + return true; } - return true; } private registerInvocation(invocation: Invocation) { @@ -332,30 +353,14 @@ export class InvocationService { return; } - var invocationFinished = true; var pendingInvocation = this.pending[correlationId]; var deferred = pendingInvocation.deferred; if (messageType === EXCEPTION_MESSAGE_TYPE) { - var remoteException = ExceptionCodec.decodeResponse(clientMessage); - var boundToConnection = pendingInvocation.connection; - var deadlineExceeded = new Date().getTime() > pendingInvocation.deadline.getTime(); - var shouldRetry = !boundToConnection && !deadlineExceeded && remoteException.isRetryable(); - - if (shouldRetry) { - invocationFinished = false; - setTimeout(() => { - this.invoke(pendingInvocation); - }, this.getInvocationRetryPauseMillis()); - } else { - this.logger.trace('InvocationService', 'Received exception as response', remoteException); - deferred.reject(remoteException); - } + let remoteError = this.client.getErrorFactory().createErrorFromClientMessage(clientMessage); + this.notifyError(pendingInvocation, remoteError); } else { - deferred.resolve(clientMessage); - } - - if (invocationFinished) { delete this.pending[correlationId]; + deferred.resolve(clientMessage); } } } diff --git a/src/protocol/ClientProtocolErrorCodes.ts b/src/protocol/ClientProtocolErrorCodes.ts new file mode 100644 index 000000000..c8a1b9dd5 --- /dev/null +++ b/src/protocol/ClientProtocolErrorCodes.ts @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +export class ClientProtocolErrorCodes { + static readonly UNDEFINED = 0; + static readonly ARRAY_INDEX_OUT_OF_BOUNDS = 1; + static readonly ARRAY_STORE = 2; + static readonly AUTHENTICATION = 3; + static readonly CACHE = 4; + static readonly CACHE_LOADER = 5; + static readonly CACHE_NOT_EXISTS = 6; + static readonly CACHE_WRITER = 7; + static readonly CALLER_NOT_MEMBER = 8; + static readonly CANCELLATION = 9; + static readonly CLASS_CAST = 10; + static readonly CLASS_NOT_FOUND = 11; + static readonly CONCURRENT_MODIFICATION = 12; + static readonly CONFIG_MISMATCH = 13; + static readonly CONFIGURATION = 14; + static readonly DISTRIBUTED_OBJECT_DESTROYED = 15; + static readonly DUPLICATE_INSTANCE_NAME = 16; + static readonly EOF = 17; + static readonly ENTRY_PROCESSOR = 18; + static readonly EXECUTION = 19; + static readonly HAZELCAST = 20; + static readonly HAZELCAST_INSTANCE_NOT_ACTIVE = 21; + static readonly HAZELCAST_OVERLOAD = 22; + static readonly HAZELCAST_SERIALIZATION = 23; + static readonly IO = 24; + static readonly ILLEGAL_ARGUMENT = 25; + static readonly ILLEGAL_ACCESS_EXCEPTION = 26; + static readonly ILLEGAL_ACCESS_ERROR = 27; + static readonly ILLEGAL_MONITOR_STATE = 28; + static readonly ILLEGAL_STATE = 29; + static readonly ILLEGAL_THREAD_STATE = 30; + static readonly INDEX_OUT_OF_BOUNDS = 31; + static readonly INTERRUPTED = 32; + static readonly INVALID_ADDRESS = 33; + static readonly INVALID_CONFIGURATION = 34; + static readonly MEMBER_LEFT = 35; + static readonly NEGATIVE_ARRAY_SIZE = 36; + static readonly NO_SUCH_ELEMENT = 37; + static readonly NOT_SERIALIZABLE = 38; + static readonly NULL_POINTER = 39; + static readonly OPERATION_TIMEOUT = 40; + static readonly PARTITION_MIGRATING = 41; + static readonly QUERY = 42; + static readonly QUERY_RESULT_SIZE_EXCEEDED = 43; + static readonly QUORUM = 44; + static readonly REACHED_MAX_SIZE = 45; + static readonly REJECTED_EXECUTION = 46; + static readonly REMOTE_MAP_REDUCE = 47; + static readonly RESPONSE_ALREADY_SENT = 48; + static readonly RETRYABLE_HAZELCAST = 49; + static readonly RETRYABLE_IO = 50; + static readonly RUNTIME = 51; + static readonly SECURITY = 52; + static readonly SOCKET = 53; + static readonly STALE_SEQUENCE = 54; + static readonly TARGET_DISCONNECTED = 55; + static readonly TARGET_NOT_MEMBER = 56; + static readonly TIMEOUT = 57; + static readonly TOPIC_OVERLOAD = 58; + static readonly TOPOLOGY_CHANGED = 59; + static readonly TRANSACTION = 60; + static readonly TRANSACTION_NOT_ACTIVE = 61; + static readonly TRANSACTION_TIMED_OUT = 62; + static readonly URI_SYNTAX = 63; + static readonly UTF_DATA_FORMAT = 64; + static readonly UNSUPPORTED_OPERATION = 65; + static readonly WRONG_TARGET = 66; + static readonly XA = 67; + static readonly ACCESS_CONTROL = 68; + static readonly LOGIN = 69; + static readonly UNSUPPORTED_CALLBACK = 70; + static readonly NO_DATA_MEMBER = 71; + static readonly REPLICATED_MAP_CANT_BE_CREATED = 72; + static readonly MAX_MESSAGE_SIZE_EXCEEDED = 73; + static readonly WAN_REPLICATION_QUEUE_FULL = 74; + static readonly ASSERTION_ERROR = 75; + static readonly OUT_OF_MEMORY_ERROR = 76; + static readonly STACK_OVERFLOW_ERROR = 77; + static readonly NATIVE_OUT_OF_MEMORY_ERROR = 78; + static readonly SERVICE_NOT_FOUND = 79; + static readonly STALE_TASK_ID = 80; + static readonly DUPLICATE_TASK = 81; + static readonly STALE_TASK = 82; + static readonly LOCAL_MEMBER_RESET = 83; + static readonly INDETERMINATE_OPERATION_STATE = 84; + static readonly FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION = 85; + static readonly TARGET_NOT_REPLICA_EXCEPTION = 86; + static readonly MUTATION_DISALLOWED_EXCEPTION = 87; + static readonly CONSISTENCY_LOST_EXCEPTION = 88; +} diff --git a/src/codec/ExceptionCodec.ts b/src/protocol/ErrorCodec.ts similarity index 57% rename from src/codec/ExceptionCodec.ts rename to src/protocol/ErrorCodec.ts index 32722a55b..169a69d3b 100644 --- a/src/codec/ExceptionCodec.ts +++ b/src/protocol/ErrorCodec.ts @@ -14,18 +14,19 @@ * limitations under the License. */ -/* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import ImmutableLazyDataList = require('./ImmutableLazyDataList'); -import Address = require('../Address'); -import RemoteException = require('../exception/Exception'); -import StackTraceElement = require('../exception/StackTraceElement'); +import {StackTraceElementCodec} from './StackTraceElementCodec'; +export class ErrorCodec { + errorCode: number = null; + className: string = null; + message: string = null; + stackTrace: StackTraceElementCodec[] = []; + causeErrorCode: number = null; + causeClassName: string = null; -class ExceptionCodec { - - static decodeResponse(clientMessage: ClientMessage): RemoteException { - var exception = new RemoteException(); + static decode(clientMessage: ClientMessage): ErrorCodec { + let exception = new ErrorCodec(); exception.errorCode = clientMessage.readInt32(); exception.className = clientMessage.readString(); @@ -38,7 +39,7 @@ class ExceptionCodec { var stackTraceDepth = clientMessage.readInt32(); exception.stackTrace = []; for (var i = 0; i < stackTraceDepth; i++) { - exception.stackTrace.push(this.decodeStackTraceElement(clientMessage)) + exception.stackTrace.push(StackTraceElementCodec.decode(clientMessage)); } exception.causeErrorCode = clientMessage.readInt32(); @@ -52,21 +53,6 @@ class ExceptionCodec { return exception; } - private static decodeStackTraceElement(payload: ClientMessage): StackTraceElement { - var stackTraceElement = new StackTraceElement(); - - stackTraceElement.declaringClass = payload.readString(); - stackTraceElement.methodName = payload.readString(); - - var fileNameNull = payload.readBoolean(); - if (!fileNameNull) { - stackTraceElement.fileName = payload.readString(); - } - stackTraceElement.lineNumber = payload.readInt32(); - return stackTraceElement; - } } - -export = ExceptionCodec diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts new file mode 100644 index 000000000..de40db2f2 --- /dev/null +++ b/src/protocol/ErrorFactory.ts @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import { + AuthenticationError, CallerNotMemberError, CancellationError, ClassCastError, ClassNotFoundError, ConcurrentModificationError, + ConfigMismatchError, ConfigurationError, DistributedObjectDestroyedError, DuplicateInstanceNameError, HazelcastError, + HazelcastInstanceNotActiveError, IllegalStateError, InvocationTimeoutError, IOError, MemberLeftError, + NoDataMemberInClusterError, PartitionMigratingError, QueryError, QuorumError, RetryableHazelcastError, RetryableIOError, + StaleSequenceError, StaleTaskIdError, TargetDisconnectedError, TargetNotMemberError, TopicOverloadError, TransactionError, + TransactionNotActiveError, TransactionTimedOutError, UndefinedErrorCodeError, UnsupportedOperationError +} from '../HazelcastError'; +import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; +import {ErrorCodec} from './ErrorCodec'; +import ClientMessage = require('../ClientMessage'); + +interface ErrorFactory { + (msg: string, cause: Error): Error; +} + +export class ClientErrorFactory { + + private codeToErrorConstructor: Map = new Map(); + + constructor() { + this.register(ClientProtocolErrorCodes.ARRAY_INDEX_OUT_OF_BOUNDS, (m, c) => new RangeError(m)); + this.register(ClientProtocolErrorCodes.ARRAY_STORE, (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.AUTHENTICATION, (m, c) => new AuthenticationError(m, c)); + this.register(ClientProtocolErrorCodes.CALLER_NOT_MEMBER, (m, c) => new CallerNotMemberError(m, c)); + this.register(ClientProtocolErrorCodes.CANCELLATION, (m, c) => new CancellationError(m, c)); + this.register(ClientProtocolErrorCodes.CLASS_CAST, (m, c) => new ClassCastError(m, c)); + this.register(ClientProtocolErrorCodes.CLASS_NOT_FOUND, (m, c) => new ClassNotFoundError(m, c)); + this.register(ClientProtocolErrorCodes.CONCURRENT_MODIFICATION, (m, c) => new ConcurrentModificationError(m, c)); + this.register(ClientProtocolErrorCodes.CONFIG_MISMATCH, (m, c) => new ConfigMismatchError(m, c)); + this.register(ClientProtocolErrorCodes.CONFIGURATION, (m, c) => new ConfigurationError(m, c)); + this.register(ClientProtocolErrorCodes.DISTRIBUTED_OBJECT_DESTROYED, (m, c) => new DistributedObjectDestroyedError(m, c)); + this.register(ClientProtocolErrorCodes.DUPLICATE_INSTANCE_NAME, (m, c) => new DuplicateInstanceNameError(m, c)); + this.register(ClientProtocolErrorCodes.EOF, (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST, (m, c) => new HazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST_INSTANCE_NOT_ACTIVE, + (m, c) => new HazelcastInstanceNotActiveError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST_OVERLOAD, (m, c) => new HazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST_SERIALIZATION, (m, c) => new HazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.IO, (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.ILLEGAL_ARGUMENT, (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.ILLEGAL_STATE, (m, c) => new IllegalStateError(m, c)); + this.register(ClientProtocolErrorCodes.INDEX_OUT_OF_BOUNDS, (m, c) => new RangeError(m)); + this.register(ClientProtocolErrorCodes.INTERRUPTED, (m, c) => new Error(m)); + this.register(ClientProtocolErrorCodes.INVALID_ADDRESS, (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.INVALID_CONFIGURATION, (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.MEMBER_LEFT, (m, c) => new MemberLeftError(m, c)); + this.register(ClientProtocolErrorCodes.NEGATIVE_ARRAY_SIZE, (m, c) => new RangeError(m)); + this.register(ClientProtocolErrorCodes.NO_SUCH_ELEMENT, (m, c) => new ReferenceError(m)); + this.register(ClientProtocolErrorCodes.NOT_SERIALIZABLE, (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.NULL_POINTER, (m, c) => new ReferenceError(m)); + this.register(ClientProtocolErrorCodes.OPERATION_TIMEOUT, (m, c) => new InvocationTimeoutError(m, c)); + this.register(ClientProtocolErrorCodes.PARTITION_MIGRATING, (m, c) => new PartitionMigratingError(m, c)); + this.register(ClientProtocolErrorCodes.QUERY, (m, c) => new QueryError(m, c)); + this.register(ClientProtocolErrorCodes.QUERY_RESULT_SIZE_EXCEEDED, (m, c) => new QueryError(m, c)); + this.register(ClientProtocolErrorCodes.QUORUM, (m, c) => new QuorumError(m, c)); + this.register(ClientProtocolErrorCodes.RETRYABLE_HAZELCAST, (m, c) => new RetryableHazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.RETRYABLE_IO, (m, c) => new RetryableIOError(m, c)); + this.register(ClientProtocolErrorCodes.SOCKET, (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.STALE_SEQUENCE, (m, c) => new StaleSequenceError(m, c)); + this.register(ClientProtocolErrorCodes.TARGET_DISCONNECTED, (m, c) => new TargetDisconnectedError(m, c)); + this.register(ClientProtocolErrorCodes.TARGET_NOT_MEMBER, (m, c) => new TargetNotMemberError(m, c)); + this.register(ClientProtocolErrorCodes.TOPIC_OVERLOAD, (m, c) => new TopicOverloadError(m, c)); + this.register(ClientProtocolErrorCodes.TRANSACTION, (m, c) => new TransactionError(m, c)); + this.register(ClientProtocolErrorCodes.TRANSACTION_NOT_ACTIVE, (m, c) => new TransactionNotActiveError(m, c)); + this.register(ClientProtocolErrorCodes.TRANSACTION_TIMED_OUT, (m, c) => new TransactionTimedOutError(m, c)); + this.register(ClientProtocolErrorCodes.UNSUPPORTED_OPERATION, (m, c) => new UnsupportedOperationError(m, c)); + this.register(ClientProtocolErrorCodes.NO_DATA_MEMBER, (m, c) => new NoDataMemberInClusterError(m, c)); + this.register(ClientProtocolErrorCodes.STALE_TASK_ID, (m, c) => new StaleTaskIdError(m, c)); + } + + private register(code: number, errorFactory: ErrorFactory): void { + this.codeToErrorConstructor.set(code, errorFactory); + } + + createErrorFromClientMessage(clientMessage: ClientMessage) : Error { + let errorCodec = ErrorCodec.decode(clientMessage); + return this.createError(errorCodec.errorCode, errorCodec.className, errorCodec.message, null); + } + + createError(errorCode: number, className: string, message: string, cause: Error): Error { + let factoryFunc = this.codeToErrorConstructor.get(errorCode); + if (factoryFunc != null) { + return factoryFunc(message, cause); + } else { + return new UndefinedErrorCodeError(message, className); + } + } +} diff --git a/src/exception/StackTraceElement.ts b/src/protocol/StackTraceElementCodec.ts similarity index 55% rename from src/exception/StackTraceElement.ts rename to src/protocol/StackTraceElementCodec.ts index b296215da..664dff987 100644 --- a/src/exception/StackTraceElement.ts +++ b/src/protocol/StackTraceElementCodec.ts @@ -14,11 +14,26 @@ * limitations under the License. */ -class StackTraceElement { +import ClientMessage = require('../ClientMessage'); + +export class StackTraceElementCodec { declaringClass: string = null; methodName: string = null; fileName: string = null; lineNumber: number = null; + + static decode(payload: ClientMessage): StackTraceElementCodec { + var stackTraceElement = new StackTraceElementCodec(); + + stackTraceElement.declaringClass = payload.readString(); + stackTraceElement.methodName = payload.readString(); + + var fileNameNull = payload.readBoolean(); + if (!fileNameNull) { + stackTraceElement.fileName = payload.readString(); + } + stackTraceElement.lineNumber = payload.readInt32(); + return stackTraceElement; + } } -export = StackTraceElement; diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 184874d44..80fcfb546 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -21,6 +21,7 @@ import {SerializationService} from '../../serialization/SerializationService'; import {ReliableTopicProxy} from './ReliableTopicProxy'; import {LoggingService} from '../../logging/LoggingService'; import {TopicMessage} from './TopicMessage'; +import {StaleSequenceError} from '../../HazelcastError'; export class ReliableTopicListenerRunner { @@ -65,7 +66,7 @@ export class ReliableTopicListenerRunner { setImmediate(this.next.bind(this)); } }).catch((e) => { - if (e.className === 'com.hazelcast.ringbuffer.StaleSequenceException') { + if (e instanceof StaleSequenceError) { this.ringbuffer.headSequence().then((seq: Long) => { var newSequence = seq.toNumber(); diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index 699d999e0..ecd430ed1 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -120,6 +120,6 @@ describe('Client reconnect', function () { return map.get('testkey'); }).then(function (val) { return expect(val).to.equal('testvalue'); - }) + }); }); }); From 4a632aa7368e83bed6b95bf2e659314a5d385856 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Wed, 7 Mar 2018 11:50:08 +0300 Subject: [PATCH 082/685] Full review of the Config.md --- CONFIG.md | 110 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 74 insertions(+), 36 deletions(-) diff --git a/CONFIG.md b/CONFIG.md index 420b6c739..221f083d6 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -1,4 +1,5 @@ You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). + * Programmatic configuration * Declarative configuration (JSON file) @@ -22,10 +23,11 @@ For declarative configuration, the Hazelcast client looks at the following place 1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, the client looks for the configuration file in the specified location. 2. Current working directory: If there is no environment variable set, the client tries to load `hazelcast-client.json` -from current working directory. -3. Default configuration: If above methods fail, the client starts with default configuration. +from the current working directory. +3. Default configuration: If all of the above methods fail, the client starts with the default configuration. Following is a sample JSON configuration file: + ```json { "group": { @@ -53,8 +55,10 @@ Following is a sample JSON configuration file: ``` ## Group Configuration -Clients should provide a group name and password in order to connect to the cluster. + +The clients should provide a group name and password in order to connect to the cluster. You can configure them as shown below. + ```json { "group": { @@ -65,8 +69,10 @@ You can configure them as shown below. ``` ## Client Network + All network related configuration of Hazelcast Node.js Client is performed via the `network` element in the declarative configuration file. Let's first give an example for `network` configuration. Then we will look at its properties. + ```json { "network": { @@ -93,9 +99,11 @@ configuration file. Let's first give an example for `network` configuration. The ``` ### Configuring Address List + Address list is the initial list of cluster addresses to which the client will connect. The client uses this list to find an alive member. Although it may be enough to give only one address of a member in the cluster (since all members communicate with each other), it is recommended that you give the addresses for all the members. + ```json { "network": { @@ -111,7 +119,9 @@ If the port part is omitted, then 5701, 5702, and 5703 will be tried in random o Default address is 127.0.0.1. ### Setting Smart Routing + Smart routing defines whether the client mode is smart or unisocket. The following is an example configuration. + ```json { "network": { @@ -119,10 +129,12 @@ Smart routing defines whether the client mode is smart or unisocket. The followi } } ``` + Default is smart routing mode. ### Setting Connection Timeout -Connection timeout is the timeout value in milliseconds for members to accept client connection requests. + +Connection timeout is the timeout value in milliseconds for the members to accept client connection requests. ```json { "network": { @@ -133,10 +145,12 @@ Connection timeout is the timeout value in milliseconds for members to accept cl Default value is 5000 milliseconds. ### Setting Connection Attempt Limit + While the client is trying to connect initially to one of the members in the address list, that member might not be available at that moment. Instead of giving up, throwing an error and stopping the client, the client will retry as many as connection attempt limit times. This is also the case when the previously established connection between the client and that member goes down. + ```json { "network": { @@ -145,9 +159,12 @@ established connection between the client and that member goes down. } ``` Default value is 2. + ### Setting Connection Attempt Period + Connection timeout period is the duration in milliseconds between the connection attempts defined by connection attempt limit. + ```json { "network": { @@ -155,21 +172,28 @@ connection attempt limit. } } ``` + Default value is 3000. + ### Enabling Client TLS/SSL + You can use TLS/SSL to secure the connection between the client and members. If you want TLS/SSL enabled for the client-cluster connection, you should set an SSL configuration. Once set, the connection (socket) is -established out of an options object supplied by the user. +established out of an `options`" object supplied by the user. -Hazelcast Node.js Client uses a user supplied SSL options object to pass to +Hazelcast Node.js Client uses a user supplied SSL `options` object to pass to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). There are two ways -to provide this object to the client; -1. Using builtin `BasicSSLOptionsFactory` bundled with the client. +to provide this object to the client: + +1. Using the built-in `BasicSSLOptionsFactory` bundled with the client. 2. Writing an SSLOptionsFactory. -#### 1. Using Built-in BasicSSLOptionsFactory -Hazelcast Node.js Client includes a utility factory class that creates the necessary options object out of supplied -properties. All you need to do is specify your factory as `BasicSSLOptionsFactory` and provide the following options. +Below subsections describe each way. + +#### Using Built-in BasicSSLOptionsFactory + +Hazelcast Node.js Client includes a utility factory class that creates the necessary `options` object out of the supplied +properties. All you need to do is specifying your factory as `BasicSSLOptionsFactory` and provide the following options: certPath caPath @@ -177,8 +201,8 @@ properties. All you need to do is specify your factory as `BasicSSLOptionsFactor rejectUnauthorized ciphers -Refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) for meaning -of each option. +Please refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) for the descriptions of each option. + > `certPath` and `caPath` define file path to respective file that stores such information. ```json @@ -198,12 +222,17 @@ of each option. } } ``` + If these options are not enough for your application, you may write your own options factory and instruct the client -to get the options from it. +to get the options from it, as explained below. #### Writing an SSL Options Factory + In order to use the full range of options provided to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback), you may write your own factory object. + +An example configuration: + ```json { "network": { @@ -224,7 +253,9 @@ you may write your own factory object. ``` -my_factory.js +And your own factory, `My_Factory.js`: + + ```javascript function SSLFactory() { } @@ -250,16 +281,15 @@ SSLFactory.prototype.getSSLOptions = function() { exports.SSLFactory = SSLFactory; ``` -The client loads MyFactory.js at runtime and creates an instance of SSLFactory. It then, calls `init` method with -the properties section in JSON config. Lastly, the client calls `getSSLOptions` method of SSLFactory to create the -options object. +The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with +the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. -For information about path resolution, refer to [Path Resolution](#path-resolution-and-object-loading) +For information about the path resolution, please refer to the [Path Resolution](#path-resolution-and-object-loading) section. ## Serialization Configuration + This section shows how to configure Hazelcast serialization declaratively. Please refer to [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#serialization) -and [Node.js client readme](https://github.com/hazelcast/hazelcast-nodejs-client/#serialization-considerations) for -learning about serialization. +and [Node.js client readme](https://github.com/hazelcast/hazelcast-nodejs-client/#serialization-considerations) for more information on serializations. Serialization configuration is as follows: @@ -306,16 +336,17 @@ Serialization configuration is as follows: One important aspect of Node.js Client's serialization is `defaultNumberType`. Hazelcast servers use 4 different primitive numeric types; `int`, `long`, `float` and `double`. However, Javascript has only one numeric type which is `number`. Number is a floating point type. If you do not work with heterogenous clients (multiple languages), -you do not need to worry about this setting. However, if your numeric data is accessed by clients in different -languages, you need to map `number` type to one of the numeric types recognized by Java servers. Hazelcast handles +you do not need to worry about this setting. However, if your numeric data is accessed by the clients in different +languages, you need to map `number` type to one of the numeric types recognized by the Java servers. Hazelcast handles type conversions automatically. Accepted values for `defaultNumberType` are `integer`, `float` and `double`. You may use `long` module for working with longs. [long module](https://www.npmjs.com/package/long) is included -in Hazelcast Node.js client. +in Hazelcast Node.js Client. Related section: [Path Resolution](#path-resolution-and-object-loading) ## Configuring Near Cache -You may configure near caches for your maps as the following: + +You may configure Near Caches for your maps as the following: ```json { @@ -334,15 +365,19 @@ You may configure near caches for your maps as the following: ] } ``` -`nearCaches` is an array that includes one configuration object for each near cache in the client. For meanings -of configuration options refer to [NearCacheConfig API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.nearcacheconfig.html) +`nearCaches` is an array that includes one configuration object for each Near Cache in the client. For meanings +of configuration options, please refer to [NearCacheConfig API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.nearcacheconfig.html). ## Composing Declarative Configuration + You can compose the declarative configuration of your Hazelcast client from multiple declarative configuration snippets. In order to compose a declarative configuration, you can use the `import` element to load different declarative configuration files. -group-config.json: +Let's assume you have the following two configurations: + +`group-config.json`: + ```json { "group": { @@ -352,7 +387,8 @@ group-config.json: } ``` -network-config.json: +`network-config.json`: + ```json { "network": { @@ -376,12 +412,14 @@ shown below. } ``` -> Note: Use `import` element on top level of json hierarchy. +> Note: Use `import` element on top level of JSON hierarchy. ## Path Resolution and Object Loading -For configuration elements that require you to specify a code piece, you will need to specify the path to -code and the name of exported element that you want the client to use. This configuration is set by the following: + +For configuration elements that require you to specify a code piece, you will need to specify the path to the +code and name of the exported element that you want the client to use. This configuration is set as follows: + ```json { "path": "path/to/file", @@ -392,11 +430,10 @@ code and the name of exported element that you want the client to use. This conf In the above configuration, `path` shows the address to the file that you want the client to load. Unless this is an absolute path, it is relative to the location of `hazelcast-config.json` file. -In Javascript you can define and export as many objects as you want in a single file. Above configuration element -is designed to load only one specified object from a file. Therefore `exportedName` specifies the name of desired -object. +In Javascript, you can define and export as many objects as you want in a single file. Above configuration element +is designed to load only one specified object from a file (`MyObject`). Therefore, `exportedName` specifies the name of desired object. -Let's say your project directory structure is like the following: +Let's say your project's directory structure is as follows: my_app/ my_app/index.js @@ -406,6 +443,7 @@ Let's say your project directory structure is like the following: my_app/node_modules/hazelcast-client In `factory_utils.js`, you have multiple exported functions. + ```javascript exports.utilityFunction = function() {...} exports.MySSLFactory = function() {...} From e03969f73d7813b0128256f6322004eed154255b Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Wed, 7 Mar 2018 19:24:25 +0300 Subject: [PATCH 083/685] Update CONFIG.md --- CONFIG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONFIG.md b/CONFIG.md index 221f083d6..bfd9abede 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -179,7 +179,7 @@ Default value is 3000. You can use TLS/SSL to secure the connection between the client and members. If you want TLS/SSL enabled for the client-cluster connection, you should set an SSL configuration. Once set, the connection (socket) is -established out of an `options`" object supplied by the user. +established out of an `options` object supplied by the user. Hazelcast Node.js Client uses a user supplied SSL `options` object to pass to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). There are two ways From b9d819a006b0b33a21e1aa5a546f7885bcccb7a1 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 6 Mar 2018 16:18:20 -0500 Subject: [PATCH 084/685] flake id configuration --- CONFIG.md | 18 ++++++++ src/Util.ts | 12 ++++- src/config/Config.ts | 2 + src/config/ConfigBuilder.ts | 26 ++++++++++- src/config/FlakeIdGeneratorConfig.ts | 51 +++++++++++++++++++++ src/proxy/FlakeIdGenerator.ts | 62 ++++++++++++++++++++++++++ test/config/ConfigBuilderTest.js | 11 +++++ test/config/hazelcast-client-full.json | 12 +++++ 8 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 src/config/FlakeIdGeneratorConfig.ts create mode 100644 src/proxy/FlakeIdGenerator.ts diff --git a/CONFIG.md b/CONFIG.md index bfd9abede..8ae779f19 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -368,6 +368,24 @@ You may configure Near Caches for your maps as the following: `nearCaches` is an array that includes one configuration object for each Near Cache in the client. For meanings of configuration options, please refer to [NearCacheConfig API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.nearcacheconfig.html). +## Configuring Reliable Id Generator +You may configure reliable id generators as the following: + +```json +{ + "flakeIdGeneratorConfigs": [ + { + "name": "flakeidgenerator", + "prefetchCount": 123, + "prefetchValidityMillis": 150000 + } + ] +} +``` +For meanings of configuration options refer to [FlakeIdGenerator API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.flakeidgeneratorconfigs.html) + +> Note: Since Javascript cannot represent numbers greater than 2^53, you need to put long numbers in quotes as a string. + ## Composing Declarative Configuration You can compose the declarative configuration of your Hazelcast client from multiple declarative diff --git a/src/Util.ts b/src/Util.ts index 7e3d4eed6..9259af2bf 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import Long = require('long'); +import * as Long from 'long'; import {PagingPredicate} from './serialization/DefaultPredicates'; import {IterationType} from './core/Predicate'; import * as assert from 'assert'; @@ -113,6 +113,16 @@ export function copyObjectShallow(obj: T): T { assert(false, 'Object should be undefined or type of object.'); } +export function tryGetLong(val: any): Long { + if (typeof val === 'number') { + return Long.fromNumber(val); + } else if (typeof val === 'string') { + return Long.fromString(val); + } else { + throw RangeError(val + ' is not a number or long string.'); + } +} + export function tryGetBoolean(val: any): boolean { if (typeof val === 'boolean') { return val; diff --git a/src/config/Config.ts b/src/config/Config.ts index 89e18252c..a16652819 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -25,6 +25,7 @@ import {NearCacheConfig} from './NearCacheConfig'; import {ListenerConfig} from './ListenerConfig'; import {Properties} from './Properties'; import {ImportConfig} from './ImportConfig'; +import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; /** * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. @@ -53,6 +54,7 @@ export class ClientConfig { 'default': new ReliableTopicConfig() }; nearCacheConfigs: {[name: string]: NearCacheConfig} = {}; + flakeIdGeneratorConfigs: {[name: string]: FlakeIdGeneratorConfig} = {}; } export {ClientNetworkConfig}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index e571c714e..a4d035411 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -18,7 +18,10 @@ import {ClientConfig} from './Config'; import * as Promise from 'bluebird'; import {HazelcastError} from '../HazelcastError'; import * as path from 'path'; -import {createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; +import { + createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetLong, tryGetNumber, + tryGetString +} from '../Util'; import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; import {ReliableTopicConfig} from './ReliableTopicConfig'; import {InMemoryFormat} from './InMemoryFormat'; @@ -29,6 +32,7 @@ import {Properties} from './Properties'; import {JsonConfigLocator} from './JsonConfigLocator'; import Address = require('../Address'); import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; +import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; export class ConfigBuilder { private clientConfig: ClientConfig = new ClientConfig(); @@ -81,6 +85,8 @@ export class ConfigBuilder { this.handleNearCaches(jsonObject[key]); } else if (key === 'reliableTopics') { this.handleReliableTopics(jsonObject[key]); + } else if (key === 'flakeIdGeneratorConfigs') { + this.handleFlakeIds(jsonObject[key]); } } } @@ -252,5 +258,23 @@ export class ConfigBuilder { } } + private handleFlakeIds(jsonObject: any): void { + let flakeIdsArray = tryGetArray(jsonObject); + for (let index in flakeIdsArray) { + let fidConfig = flakeIdsArray[index]; + let flakeIdConfig = new FlakeIdGeneratorConfig(); + for (let name in fidConfig) { + if (name === 'name') { + flakeIdConfig.name = tryGetString(fidConfig[name]); + } else if (name === 'prefetchCount') { + flakeIdConfig.prefetchCount = tryGetNumber(fidConfig[name]); + } else if (name === 'prefetchValidityMillis') { + flakeIdConfig.prefetchValidityMillis = tryGetLong(fidConfig[name]); + } + } + this.clientConfig.flakeIdGeneratorConfigs[flakeIdConfig.name] = flakeIdConfig; + } + } + } diff --git a/src/config/FlakeIdGeneratorConfig.ts b/src/config/FlakeIdGeneratorConfig.ts new file mode 100644 index 000000000..4a6c41c98 --- /dev/null +++ b/src/config/FlakeIdGeneratorConfig.ts @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Long from 'long'; + +export class FlakeIdGeneratorConfig { + /** + * Sets the name for this config. + */ + name: string = 'default'; + + /** + * Sets how many IDs are pre-fetched on the background when a new flake id is requested + * from servers. Default is 100. + * + * prefetch count should be in the range 1..100,000. + */ + prefetchCount: number = 100; + + /** + * Sets for how long the pre-fetched IDs can be used. If this time elapses, a new batch of IDs will be + * fetched. Time unit is milliseconds, default is 600,000 (10 minutes). + *

+ * The IDs contain timestamp component, which ensures rough global ordering of IDs. If an ID + * is assigned to an object that was created much later, it will be much out of order. If you don't care + * about ordering, set this value to 0. + * + * Set to the desired ID validity or 0 for unlimited. + */ + prefetchValidityMillis: Long | number = 600000; + + toString(): string { + return 'FlakeIdGeneratorConfig[' + + 'name: ' + this.name + ', ' + + 'prefetchCount: ' + this.prefetchCount + ', ' + + 'prefetchValidityMillis: ' + this.prefetchValidityMillis + ']'; + } +} diff --git a/src/proxy/FlakeIdGenerator.ts b/src/proxy/FlakeIdGenerator.ts new file mode 100644 index 000000000..29a15b1f6 --- /dev/null +++ b/src/proxy/FlakeIdGenerator.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {DistributedObject} from '../DistributedObject'; +import * as Long from 'long'; + +/** + * A cluster-wide unique ID generator. Generated IDs are `Long` primitive values + * and are k-ordered (roughly ordered). IDs are in the range from `0` to `Long.MAX_VALUE`. + *

+ * The IDs contain timestamp component and a node ID component, which is assigned when the member + * joins the cluster. This allows the IDs to be ordered and unique without any coordination between + * members, which makes the generator safe even in split-brain scenario. + *

+ * Timestamp component is in milliseconds since 1.1.2018, 0:00 UTC and has 41 bits. This caps + * the useful lifespan of the generator to little less than 70 years (until ~2088). The sequence component + * is 6 bits. If more than 64 IDs are requested in single millisecond, IDs will gracefully overflow to the next + * millisecond and uniqueness is guaranteed in this case. The implementation does not allow overflowing + * by more than 15 seconds, if IDs are requested at higher rate, the call will block. Note, however, that + * clients are able to generate even faster because each call goes to a different (random) member and + * the 64 IDs/ms limit is for single member. + * + * Node ID overflow + * It is possible to generate IDs on any member or client as long as there is at least one + * member with join version smaller than 2^16 in the cluster. The remedy is to restart the cluster: + * nodeId will be assigned from zero again. Uniqueness after the restart will be preserved thanks to + * the timestamp component. + * + * @requires Hazelcast 3.10 + */ +export interface FlakeIdGenerator extends DistributedObject { + + /** + * Generates and returns a cluster-wide unique ID. + *

+ * This method goes to a random member and gets a batch of IDs, which will then be returned + * locally for limited time. The pre-fetch size and the validity time can be configured, see + * {@link FlakeIdGeneratorConfig}. + *

+ * Note: Values returned from this method may not be strictly ordered. + * + * @return new cluster-wide unique ID + * + * @throws NodeIdOutOfRangeError if node ID for all members in the cluster is out of valid range. + * See "Node ID overflow" note above + * @throws UnsupportedOperationError if the cluster version is below 3.10 + */ + newId(): Long; +} diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 6c39b6ce0..3463b1418 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -18,6 +18,7 @@ var expect = require('chai').expect; var path = require('path'); var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; var Config = require('../../lib/index').Config; +var Long = require('long'); describe('ConfigBuilder Test', function () { var configFull; @@ -127,4 +128,14 @@ describe('ConfigBuilder Test', function () { expect(listenerConfig[1].exportedName).to.equal('listener2'); expect(listenerConfig[1].path).to.equal('path/to/file'); }); + + it('flakeIdGeneratorConfigs', function () { + var flakeIdConfigs = configFull.flakeIdGeneratorConfigs; + expect(flakeIdConfigs['flakeid'].name).to.equal('flakeid'); + expect(flakeIdConfigs['flakeid'].prefetchCount).to.equal(123); + expect(Long.fromNumber(150000).equals(flakeIdConfigs['flakeid'].prefetchValidityMillis)).to.be.true; + expect(flakeIdConfigs['flakeid2'].name).to.equal('flakeid2'); + expect(flakeIdConfigs['flakeid2'].prefetchCount).to.equal(1234); + expect(Long.fromString("99999999999999999").equals(flakeIdConfigs['flakeid2'].prefetchValidityMillis)).to.be.true; + }) }); diff --git a/test/config/hazelcast-client-full.json b/test/config/hazelcast-client-full.json index e0e447f06..65cf259ef 100644 --- a/test/config/hazelcast-client-full.json +++ b/test/config/hazelcast-client-full.json @@ -103,6 +103,18 @@ "overloadPolicy": "discard_newest" } ], + "flakeIdGeneratorConfigs": [ + { + "name": "flakeid", + "prefetchCount": 123, + "prefetchValidityMillis": 150000 + }, + { + "name": "flakeid2", + "prefetchCount": 1234, + "prefetchValidityMillis": "99999999999999999" + } + ], "import": [ "hazelcast-client-near-cache.json" ] From 04cf3a9a3b465d0e34ad3df32a5571ffd685248f Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 7 Mar 2018 16:19:38 -0500 Subject: [PATCH 085/685] flake ids implementation and code sample --- CONFIG.md | 4 +- code_samples/flakeidgenerator.js | 27 ++++ src/HazelcastClient.ts | 5 + src/HazelcastError.ts | 7 + src/codec/FlakeIdGeneratorMessageType.ts | 4 + src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 73 ++++++++++ src/config/Config.ts | 2 + src/protocol/ErrorFactory.ts | 5 +- src/proxy/FlakeIdGenerator.ts | 6 +- src/proxy/FlakeIdGeneratorProxy.ts | 48 +++++++ src/proxy/ProxyManager.ts | 3 + src/proxy/flakeid/AutoBatcher.ts | 117 ++++++++++++++++ .../flakeid/FlakeIdGeneratorOutOfRangeTest.js | 97 +++++++++++++ test/flakeid/FlakeIdGeneratorProxyTest.js | 128 ++++++++++++++++++ test/mocha.opts | 1 + test/ssl/ClientSSLAuthenticationTest.js | 2 - 16 files changed, 522 insertions(+), 7 deletions(-) create mode 100644 code_samples/flakeidgenerator.js create mode 100644 src/codec/FlakeIdGeneratorMessageType.ts create mode 100644 src/codec/FlakeIdGeneratorNewIdBatchCodec.ts create mode 100644 src/proxy/FlakeIdGeneratorProxy.ts create mode 100644 src/proxy/flakeid/AutoBatcher.ts create mode 100644 test/flakeid/FlakeIdGeneratorOutOfRangeTest.js create mode 100644 test/flakeid/FlakeIdGeneratorProxyTest.js create mode 100644 test/mocha.opts diff --git a/CONFIG.md b/CONFIG.md index 8ae779f19..3ffb2e7c1 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -368,8 +368,8 @@ You may configure Near Caches for your maps as the following: `nearCaches` is an array that includes one configuration object for each Near Cache in the client. For meanings of configuration options, please refer to [NearCacheConfig API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.nearcacheconfig.html). -## Configuring Reliable Id Generator -You may configure reliable id generators as the following: +## Configuring Flake Id Generator +You may configure flake id generators as the following: ```json { diff --git a/code_samples/flakeidgenerator.js b/code_samples/flakeidgenerator.js new file mode 100644 index 000000000..e56611c30 --- /dev/null +++ b/code_samples/flakeidgenerator.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Client = require('hazelcast-client').Client; + +Client.newHazelcastClient().then(function(hazelcastClient){ + var client = hazelcastClient; + var flakeIdGenerator = hazelcastClient.getFlakeIdGenerator('generator'); + + return flakeIdGenerator.newId().then(function (value) { + console.log('New id: ' + value.toString()); + return client.shutdown(); + }); +}); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index cb2b0e7ae..d27e2f984 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -45,6 +45,7 @@ import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; import {RepairingTask} from './nearcache/RepairingTask'; import {ConfigBuilder} from './config/ConfigBuilder'; import {ClientErrorFactory} from './protocol/ErrorFactory'; +import {FlakeIdGenerator} from './proxy/FlakeIdGenerator'; export default class HazelcastClient { @@ -224,6 +225,10 @@ export default class HazelcastClient { return this.proxyManager.getOrCreateProxy(name, ProxyManager.ATOMICLONG_SERVICE); } + getFlakeIdGenerator(name: string): FlakeIdGenerator { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.FLAKEID_SERVICE); + } + /** * Returns the distributed semaphore instance with given name. * @param name diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index 4607211d8..e87bc1cbe 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -255,3 +255,10 @@ export class StaleTaskIdError extends HazelcastError { Object.setPrototypeOf(this, StaleTaskIdError.prototype); } } + +export class NodeIdOutOfRangeError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, NodeIdOutOfRangeError.prototype); + } +} diff --git a/src/codec/FlakeIdGeneratorMessageType.ts b/src/codec/FlakeIdGeneratorMessageType.ts new file mode 100644 index 000000000..89cd27473 --- /dev/null +++ b/src/codec/FlakeIdGeneratorMessageType.ts @@ -0,0 +1,4 @@ +/* tslint:disable */ +export class FlakeIdGeneratorMessageType { +static FLAKEIDGENERATOR_NEWIDBATCH = 0x1f01; +} \ No newline at end of file diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts new file mode 100644 index 000000000..2f2ca1bba --- /dev/null +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* tslint:disable */ +import ClientMessage = require('../ClientMessage'); +import {BitsUtil} from '../BitsUtil'; +import Address = require('../Address'); +import {AddressCodec} from './AddressCodec'; +import {UUIDCodec} from './UUIDCodec'; +import {MemberCodec} from './MemberCodec'; +import {Data} from '../serialization/Data'; +import {EntryViewCodec} from './EntryViewCodec'; +import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); +import {Member} from '../core/Member'; +import {UUID} from '../core/UUID'; +import {FlakeIdGeneratorMessageType} from './FlakeIdGeneratorMessageType'; + +var REQUEST_TYPE = FlakeIdGeneratorMessageType.FLAKEIDGENERATOR_NEWIDBATCH; +var RESPONSE_TYPE = 126; +var RETRYABLE = true; + + +export class FlakeIdGeneratorNewIdBatchCodec { + static calculateSize(name : string , batchSize : number ){ + var dataSize : number = 0; + dataSize += BitsUtil.calculateSizeString(name); + dataSize += BitsUtil.INT_SIZE_IN_BYTES; + return dataSize; + } + + static encodeRequest(name : string, batchSize : number){ + var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, batchSize)); + clientMessage.setMessageType(REQUEST_TYPE); + clientMessage.setRetryable(RETRYABLE); + clientMessage.appendString(name); + clientMessage.appendInt32(batchSize); + clientMessage.updateFrameLength(); + return clientMessage; + } + + static decodeResponse(clientMessage : ClientMessage, toObjectFunction: (data: Data) => any = null){ + var parameters :any = { + 'base' : null , + 'increment' : null , + 'batchSize' : null + }; + + if (clientMessage.isComplete() ) { + return parameters; + } + parameters['base'] = clientMessage.readLong(); + + parameters['increment'] = clientMessage.readLong(); + + parameters['batchSize'] = clientMessage.readInt32(); + + return parameters; + } + +} diff --git a/src/config/Config.ts b/src/config/Config.ts index a16652819..931c802ca 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -74,3 +74,5 @@ export {InMemoryFormat}; export {NearCacheConfig}; export {ImportConfig}; + +export {FlakeIdGeneratorConfig}; diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index de40db2f2..fdb1cfce4 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -18,7 +18,8 @@ import { AuthenticationError, CallerNotMemberError, CancellationError, ClassCastError, ClassNotFoundError, ConcurrentModificationError, ConfigMismatchError, ConfigurationError, DistributedObjectDestroyedError, DuplicateInstanceNameError, HazelcastError, HazelcastInstanceNotActiveError, IllegalStateError, InvocationTimeoutError, IOError, MemberLeftError, - NoDataMemberInClusterError, PartitionMigratingError, QueryError, QuorumError, RetryableHazelcastError, RetryableIOError, + NoDataMemberInClusterError, NodeIdOutOfRangeError, PartitionMigratingError, QueryError, QuorumError, RetryableHazelcastError, + RetryableIOError, StaleSequenceError, StaleTaskIdError, TargetDisconnectedError, TargetNotMemberError, TopicOverloadError, TransactionError, TransactionNotActiveError, TransactionTimedOutError, UndefinedErrorCodeError, UnsupportedOperationError } from '../HazelcastError'; @@ -83,6 +84,8 @@ export class ClientErrorFactory { this.register(ClientProtocolErrorCodes.UNSUPPORTED_OPERATION, (m, c) => new UnsupportedOperationError(m, c)); this.register(ClientProtocolErrorCodes.NO_DATA_MEMBER, (m, c) => new NoDataMemberInClusterError(m, c)); this.register(ClientProtocolErrorCodes.STALE_TASK_ID, (m, c) => new StaleTaskIdError(m, c)); + this.register(ClientProtocolErrorCodes.FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION, + (m, c) => new NodeIdOutOfRangeError(m, c)); } private register(code: number, errorFactory: ErrorFactory): void { diff --git a/src/proxy/FlakeIdGenerator.ts b/src/proxy/FlakeIdGenerator.ts index 29a15b1f6..131872fc3 100644 --- a/src/proxy/FlakeIdGenerator.ts +++ b/src/proxy/FlakeIdGenerator.ts @@ -41,6 +41,8 @@ import * as Long from 'long'; * * @requires Hazelcast 3.10 */ +import * as Promise from 'bluebird'; + export interface FlakeIdGenerator extends DistributedObject { /** @@ -54,9 +56,9 @@ export interface FlakeIdGenerator extends DistributedObject { * * @return new cluster-wide unique ID * - * @throws NodeIdOutOfRangeError if node ID for all members in the cluster is out of valid range. + * @throws HazelcastError if node ID for all members in the cluster is out of valid range. * See "Node ID overflow" note above * @throws UnsupportedOperationError if the cluster version is below 3.10 */ - newId(): Long; + newId(): Promise; } diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/FlakeIdGeneratorProxy.ts new file mode 100644 index 000000000..7f271d53f --- /dev/null +++ b/src/proxy/FlakeIdGeneratorProxy.ts @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BaseProxy} from './BaseProxy'; +import {FlakeIdGenerator} from './FlakeIdGenerator'; +import * as Promise from 'bluebird'; +import * as Long from 'long'; +import HazelcastClient from '../HazelcastClient'; +import {FlakeIdGeneratorNewIdBatchCodec} from '../codec/FlakeIdGeneratorNewIdBatchCodec'; +import {FlakeIdGeneratorConfig} from '../config/FlakeIdGeneratorConfig'; +import {EventEmitter} from 'events'; +import {AutoBatcher, Batch} from './flakeid/AutoBatcher'; + +export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator { + + private autoBatcher: AutoBatcher; + private config: FlakeIdGeneratorConfig; + + constructor(client: HazelcastClient, serviceName: string, name: string) { + super(client, serviceName, name); + this.config = client.getConfig().flakeIdGeneratorConfigs[name]; + if (this.config == null) { + this.config = new FlakeIdGeneratorConfig(); + } + this.autoBatcher = new AutoBatcher(Long.fromValue(this.config.prefetchValidityMillis), () => { + return this.encodeInvokeOnRandomTarget(FlakeIdGeneratorNewIdBatchCodec, this.config.prefetchCount).then((re: any) => { + return new Batch(Long.fromValue(this.config.prefetchValidityMillis), re.base, re.increment, re.batchSize); + }); + }); + } + + newId(): Promise { + return this.autoBatcher.nextId(); + } +} diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 9887a3d59..9494c233d 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -39,6 +39,7 @@ import {Invocation} from '../invocation/InvocationService'; import {Member} from '../core/Member'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; +import {FlakeIdGeneratorProxy} from './FlakeIdGeneratorProxy'; export class ProxyManager { public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; @@ -51,6 +52,7 @@ export class ProxyManager { public static readonly REPLICATEDMAP_SERVICE: string = 'hz:impl:replicatedMapService'; public static readonly SEMAPHORE_SERVICE: string = 'hz:impl:semaphoreService'; public static readonly ATOMICLONG_SERVICE: string = 'hz:impl:atomicLongService'; + public static readonly FLAKEID_SERVICE: string = 'hz:impl:flakeIdGeneratorService'; public readonly service: {[serviceName: string]: any} = {}; private readonly proxies: { [proxyName: string]: DistributedObject; } = {}; @@ -76,6 +78,7 @@ export class ProxyManager { this.service[ProxyManager.REPLICATEDMAP_SERVICE] = ReplicatedMapProxy; this.service[ProxyManager.SEMAPHORE_SERVICE] = SemaphoreProxy; this.service[ProxyManager.ATOMICLONG_SERVICE] = AtomicLongProxy; + this.service[ProxyManager.FLAKEID_SERVICE] = FlakeIdGeneratorProxy; } public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): DistributedObject { diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts new file mode 100644 index 000000000..db1285a04 --- /dev/null +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {EventEmitter} from 'events'; +import * as Long from 'long'; +import * as Promise from 'bluebird'; + +export class Batch { + private base: Long; + private increment: Long; + private batchSize: number; + private invalidSince: Long; + private lastIndex: number = 0; + + constructor(validityMillis: Long, base: Long, increment: Long, batchSize: number) { + this.base = base; + this.increment = increment; + this.batchSize = batchSize; + if (validityMillis.greaterThan(0)) { + this.invalidSince = validityMillis.add(Date.now()); + } else { + this.invalidSince = Long.MAX_VALUE; + } + } + + /** + * @returns next id from the batch, + * undefined if ids are exhausted or not valid anymore + */ + nextId(): Long { + if (this.invalidSince.lessThanOrEqual(Date.now())) { + return undefined; + } + if (this.lastIndex === this.batchSize) { + return undefined; + } + let returnLong = this.base.add(this.increment.multiply(this.lastIndex)); + this.lastIndex++; + return returnLong; + } +} + +export class AutoBatcher { + + private readonly NEW_BATCH_AVAILABLE = 'newBatch'; + + private quee: Array> = []; + private batch: Batch; + private requestInFlight: boolean = false; + private supplier: () => Promise; + private validMilliseconds: Long; + private emitter = new EventEmitter(); + + constructor(validMilliseconds: Long, supplier: () => Promise) { + this.validMilliseconds = validMilliseconds; + this.supplier = supplier; + this.emitter.on(this.NEW_BATCH_AVAILABLE, this.processIdRequests.bind(this)); + this.emitter.on('error', this.rejectAll.bind(this)); + } + + processIdRequests(): void { + let ind = 0; + while (ind < this.quee.length) { + let nextId: Long; + if (this.batch != null && (nextId = this.batch.nextId()) != null) { + this.quee[ind].resolve(nextId); + ind++; + } else { + this.assignNewBatch(); + break; + } + } + this.quee.splice(0, ind); + } + + private assignNewBatch(): void { + if (this.requestInFlight) { + return; + } + this.requestInFlight = true; + this.supplier().then((batch: Batch) => { + this.requestInFlight = false; + this.batch = batch; + this.emitter.emit(this.NEW_BATCH_AVAILABLE); + }).catch((e) => { + this.requestInFlight = false; + this.emitter.emit('error', e); + }); + } + + private rejectAll(e: Error): void { + this.quee.forEach((deferred: Promise.Resolver) => { + deferred.reject(e); + }); + this.quee = []; + } + + nextId(): Promise { + let deferred = Promise.defer(); + this.quee.push(deferred); + this.processIdRequests(); + return deferred.promise; + } +} diff --git a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js new file mode 100644 index 000000000..3702e1b14 --- /dev/null +++ b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + + +var chai = require('chai'); +chai.use(require('chai-as-promised')); +var expect = chai.expect; +var HazelcastClient = require('../../.').Client; +var Config = require('../../.').Config; +var Err = require('../../.').HazelcastErrors; +var Controller = require('./../RC'); +var Util = require('../Util'); + +describe("FlakeIdGeneratorOutOfRangeTest", function () { + + var cluster; + var client; + var flakeIdGenerator; + + afterEach(function () { + return flakeIdGenerator.destroy().then(function () { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + }); + + function assignOverflowedNodeId(clusterId, instanceNum) { + var script = + 'function assignOverflowedNodeId() {' + + ' instance_' + instanceNum + '.getCluster().getLocalMember().setMemberListJoinVersion(100000);' + + ' return instance_' + instanceNum + '.getCluster().getLocalMember().getMemberListJoinVersion();' + + '}' + + 'result=""+assignOverflowedNodeId();'; + return Controller.executeOnController(clusterId, script, 1); + } + + for (var repeat = 0; repeat < 10; repeat++) { + it('newId succeeds as long as there is one suitable member in the cluster (repeat: ' + repeat + '/10)', function () { + this.timeout(30000); + return Controller.createCluster().then(function (response) { + cluster = response; + return Controller.startMember(cluster.id); + }).then(function () { + return Controller.startMember(cluster.id); + }).then(function () { + return assignOverflowedNodeId(cluster.id, Util.getRandomInt(0, 2)); + }).then(function () { + var cfg = new Config.ClientConfig(); + cfg.networkConfig.smartRouting = false; + return HazelcastClient.newHazelcastClient(cfg); + }).then(function (value) { + client = value; + flakeIdGenerator = client.getFlakeIdGenerator('test'); + var promise = Promise.resolve(); + for (var i = 0; i < 100; i++) { + promise = promise.then(function () { + return flakeIdGenerator.newId(); + }); + } + return promise; + }); + }); + } + + it('throws NodeIdOutOfRangeError when there is no server with a join id smaller than 2^16', function () { + this.timeout(20000); + return Controller.createCluster().then(function (response) { + cluster = response; + return Controller.startMember(cluster.id); + }).then(function () { + return Controller.startMember(cluster.id); + }).then(function () { + return assignOverflowedNodeId(cluster.id, 0); + }).then(function () { + return assignOverflowedNodeId(cluster.id, 1); + }).then(function () { + return HazelcastClient.newHazelcastClient(); + }).then(function (cl) { + client = cl; + flakeIdGenerator = client.getFlakeIdGenerator('test'); + return expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(Err.HazelcastError); + }); + }); +}); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js new file mode 100644 index 000000000..c587e15bc --- /dev/null +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + + +var expect = require('chai').expect; +var HazelcastClient = require('../../.').Client; +var Controller = require('./../RC'); +var Config = require('../../.').Config; +var Util = require('./../Util'); +var Promise = require('bluebird'); +var Long = require('long'); + +describe("FlakeIdGeneratorProxyTest", function () { + + var FLAKE_ID_STEP = 1 << 16; + var SHORT_TERM_BATCH_SIZE = 3; + var SHORT_TERM_VALIDITY_MILLIS = 3000; + + var cluster; + var client; + var flakeIdGenerator; + + before(function () { + return Controller.createCluster().then(function (response) { + cluster = response; + return Controller.startMember(cluster.id); + }).then(function () { + var cfg = new Config.ClientConfig(); + var flakeConfig = new Config.FlakeIdGeneratorConfig(); + flakeConfig.prefetchValidityMillis = SHORT_TERM_VALIDITY_MILLIS; + flakeConfig.prefetchCount = SHORT_TERM_BATCH_SIZE; + flakeConfig.name = 'shortterm'; + cfg.flakeIdGeneratorConfigs['shortterm'] = flakeConfig; + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + client = hazelcastClient; + }); + }); + }); + + afterEach(function () { + return flakeIdGenerator.destroy(); + }); + + after(function () { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + function addToListFunction(l) { + return function (val) { + l.push(val); + } + } + + it('newId succeeds', function () { + flakeIdGenerator = client.getFlakeIdGenerator('test'); + return flakeIdGenerator.newId(); + }); + + it('newId returns a unique long', function () { + flakeIdGenerator = client.getFlakeIdGenerator('test'); + var promise = Promise.resolve(); + var idList = []; + for (var i = 0; i < 10; i++) { + promise = promise.then(Promise.all([ + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)) + ])); + } + return promise.then(function () { + idList.sort(); + for (var i = 1; i < idList.length; i++) { + expect(idList[i]).to.be.instanceOf(Long); + expect(idList[i-1].equals(idList[i])).to.be.false; + } + }); + }); + + it('subsequent ids are from the same batch', function () { + flakeIdGenerator = client.getFlakeIdGenerator('test'); + return flakeIdGenerator.newId().then(function (firstId) { + return flakeIdGenerator.newId().then(function (secondId) { + return expect(secondId.equals(firstId.add(FLAKE_ID_STEP))).to.be.true; + }); + }); + }); + + it('ids are from new batch after validity period', function () { + flakeIdGenerator = client.getFlakeIdGenerator('shortterm'); + return flakeIdGenerator.newId().then(function (firstId) { + return Util.promiseWaitMilliseconds(SHORT_TERM_VALIDITY_MILLIS + 1000).then(function () { + return flakeIdGenerator.newId(); + }).then(function (secondId) { + expect(secondId.greaterThan(firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE))).to.be.true; + }); + }); + }); + + it('ids are from new batch after prefetched ones are exhausted', function () { + flakeIdGenerator = client.getFlakeIdGenerator('shortterm'); + return flakeIdGenerator.newId().then(function (firstId) { + return flakeIdGenerator.newId().then(function () { + //after this we exhausted the batch at hand + return flakeIdGenerator.newId(); + }).then(function() { + return flakeIdGenerator.newId(); + }).then(function (secondId) { + return expect(secondId.greaterThan(firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE))).to.be.true; + }); + }); + }); +}); diff --git a/test/mocha.opts b/test/mocha.opts new file mode 100644 index 000000000..001046da1 --- /dev/null +++ b/test/mocha.opts @@ -0,0 +1 @@ +--timeout 8000 diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 8a07822f6..8c86fa32a 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -44,7 +44,6 @@ describe('SSL Client Authentication Test', function () { return Controller.startMember(cluster.id); }).then(function (m) { member = m; - return Promise.resolve(); }); } @@ -102,7 +101,6 @@ describe('SSL Client Authentication Test', function () { }); it('ma:required, server knows client, client does not know server should fail', function () { - this.timeout(5000); return createMemberWithXML(maRequiredXML).then(function () { return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server2.pem'))) .to.be.rejectedWith(HzErrors.IllegalStateError); From 0d0d6614fd98b8f25d4929c4275be37792f9a370 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 12 Mar 2018 14:35:08 -0400 Subject: [PATCH 086/685] change server version to 3.10-BETA-1 --- scripts/dev-test-rc.sh | 2 +- scripts/download-rc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 362a971c6..816ef4ed1 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,5 +1,5 @@ #!/bin/sh -HZ_VERSION="3.9.1" +HZ_VERSION="3.10-BETA-1" HAZELCAST_TEST_VERSION="3.10-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 68641462e..1beeb9110 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,5 +1,5 @@ #!/bin/sh -HZ_VERSION="3.9.1" +HZ_VERSION="3.10-BETA-1" HZ_TEST_VERSION="3.10-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} From 070d75efa26d4dbac912a51c98e441fc1baf566f Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 13 Mar 2018 10:26:44 -0400 Subject: [PATCH 087/685] refactoring in FlakeIdGenerator --- CONFIG.md | 2 +- src/Util.ts | 10 ------ src/config/ConfigBuilder.ts | 5 ++- src/config/FlakeIdGeneratorConfig.ts | 2 +- src/proxy/FlakeIdGeneratorProxy.ts | 4 +-- src/proxy/flakeid/AutoBatcher.ts | 44 ++++++++++++-------------- test/config/ConfigBuilderTest.js | 4 +-- test/config/hazelcast-client-full.json | 2 +- 8 files changed, 30 insertions(+), 43 deletions(-) diff --git a/CONFIG.md b/CONFIG.md index 3ffb2e7c1..cbf929202 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -382,7 +382,7 @@ You may configure flake id generators as the following: ] } ``` -For meanings of configuration options refer to [FlakeIdGenerator API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.flakeidgeneratorconfigs.html) +For meanings of configuration options refer to FlakeIdGenerator's API documantation [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) > Note: Since Javascript cannot represent numbers greater than 2^53, you need to put long numbers in quotes as a string. diff --git a/src/Util.ts b/src/Util.ts index 9259af2bf..4a5d1b21b 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -113,16 +113,6 @@ export function copyObjectShallow(obj: T): T { assert(false, 'Object should be undefined or type of object.'); } -export function tryGetLong(val: any): Long { - if (typeof val === 'number') { - return Long.fromNumber(val); - } else if (typeof val === 'string') { - return Long.fromString(val); - } else { - throw RangeError(val + ' is not a number or long string.'); - } -} - export function tryGetBoolean(val: any): boolean { if (typeof val === 'boolean') { return val; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index a4d035411..425754ec5 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -19,7 +19,7 @@ import * as Promise from 'bluebird'; import {HazelcastError} from '../HazelcastError'; import * as path from 'path'; import { - createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetLong, tryGetNumber, + createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString } from '../Util'; import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; @@ -30,7 +30,6 @@ import {NearCacheConfig} from './NearCacheConfig'; import {ImportConfig} from './ImportConfig'; import {Properties} from './Properties'; import {JsonConfigLocator} from './JsonConfigLocator'; -import Address = require('../Address'); import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; @@ -269,7 +268,7 @@ export class ConfigBuilder { } else if (name === 'prefetchCount') { flakeIdConfig.prefetchCount = tryGetNumber(fidConfig[name]); } else if (name === 'prefetchValidityMillis') { - flakeIdConfig.prefetchValidityMillis = tryGetLong(fidConfig[name]); + flakeIdConfig.prefetchValidityMillis = tryGetNumber(fidConfig[name]); } } this.clientConfig.flakeIdGeneratorConfigs[flakeIdConfig.name] = flakeIdConfig; diff --git a/src/config/FlakeIdGeneratorConfig.ts b/src/config/FlakeIdGeneratorConfig.ts index 4a6c41c98..6db0e066a 100644 --- a/src/config/FlakeIdGeneratorConfig.ts +++ b/src/config/FlakeIdGeneratorConfig.ts @@ -40,7 +40,7 @@ export class FlakeIdGeneratorConfig { * * Set to the desired ID validity or 0 for unlimited. */ - prefetchValidityMillis: Long | number = 600000; + prefetchValidityMillis: number = 600000; toString(): string { return 'FlakeIdGeneratorConfig[' + diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/FlakeIdGeneratorProxy.ts index 7f271d53f..40a324bdb 100644 --- a/src/proxy/FlakeIdGeneratorProxy.ts +++ b/src/proxy/FlakeIdGeneratorProxy.ts @@ -35,9 +35,9 @@ export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator if (this.config == null) { this.config = new FlakeIdGeneratorConfig(); } - this.autoBatcher = new AutoBatcher(Long.fromValue(this.config.prefetchValidityMillis), () => { + this.autoBatcher = new AutoBatcher(() => { return this.encodeInvokeOnRandomTarget(FlakeIdGeneratorNewIdBatchCodec, this.config.prefetchCount).then((re: any) => { - return new Batch(Long.fromValue(this.config.prefetchValidityMillis), re.base, re.increment, re.batchSize); + return new Batch(this.config.prefetchValidityMillis, re.base, re.increment, re.batchSize); }); }); } diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index db1285a04..9b4e5736a 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -19,20 +19,20 @@ import * as Long from 'long'; import * as Promise from 'bluebird'; export class Batch { - private base: Long; + private nextIdLong: Long; private increment: Long; private batchSize: number; - private invalidSince: Long; - private lastIndex: number = 0; + private invalidSince: number; + private firstInvalidId: Long; - constructor(validityMillis: Long, base: Long, increment: Long, batchSize: number) { - this.base = base; + constructor(validityMillis: number, base: Long, increment: Long, batchSize: number) { + this.nextIdLong = base; this.increment = increment; - this.batchSize = batchSize; - if (validityMillis.greaterThan(0)) { - this.invalidSince = validityMillis.add(Date.now()); + this.firstInvalidId = base.add(this.increment.multiply(batchSize)); + if (validityMillis > 0) { + this.invalidSince = validityMillis + Date.now(); } else { - this.invalidSince = Long.MAX_VALUE; + this.invalidSince = Number.MAX_SAFE_INTEGER; } } @@ -41,14 +41,14 @@ export class Batch { * undefined if ids are exhausted or not valid anymore */ nextId(): Long { - if (this.invalidSince.lessThanOrEqual(Date.now())) { + if (this.invalidSince <= Date.now()) { return undefined; } - if (this.lastIndex === this.batchSize) { + if (this.firstInvalidId.equals(this.nextIdLong)) { return undefined; } - let returnLong = this.base.add(this.increment.multiply(this.lastIndex)); - this.lastIndex++; + let returnLong = this.nextIdLong; + this.nextIdLong = this.nextIdLong.add(this.increment); return returnLong; } } @@ -57,15 +57,13 @@ export class AutoBatcher { private readonly NEW_BATCH_AVAILABLE = 'newBatch'; - private quee: Array> = []; + private queue: Array> = []; private batch: Batch; private requestInFlight: boolean = false; private supplier: () => Promise; - private validMilliseconds: Long; private emitter = new EventEmitter(); - constructor(validMilliseconds: Long, supplier: () => Promise) { - this.validMilliseconds = validMilliseconds; + constructor(supplier: () => Promise) { this.supplier = supplier; this.emitter.on(this.NEW_BATCH_AVAILABLE, this.processIdRequests.bind(this)); this.emitter.on('error', this.rejectAll.bind(this)); @@ -73,17 +71,17 @@ export class AutoBatcher { processIdRequests(): void { let ind = 0; - while (ind < this.quee.length) { + while (ind < this.queue.length) { let nextId: Long; if (this.batch != null && (nextId = this.batch.nextId()) != null) { - this.quee[ind].resolve(nextId); + this.queue[ind].resolve(nextId); ind++; } else { this.assignNewBatch(); break; } } - this.quee.splice(0, ind); + this.queue.splice(0, ind); } private assignNewBatch(): void { @@ -102,15 +100,15 @@ export class AutoBatcher { } private rejectAll(e: Error): void { - this.quee.forEach((deferred: Promise.Resolver) => { + this.queue.forEach((deferred: Promise.Resolver) => { deferred.reject(e); }); - this.quee = []; + this.queue = []; } nextId(): Promise { let deferred = Promise.defer(); - this.quee.push(deferred); + this.queue.push(deferred); this.processIdRequests(); return deferred.promise; } diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 3463b1418..77d324bfa 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -133,9 +133,9 @@ describe('ConfigBuilder Test', function () { var flakeIdConfigs = configFull.flakeIdGeneratorConfigs; expect(flakeIdConfigs['flakeid'].name).to.equal('flakeid'); expect(flakeIdConfigs['flakeid'].prefetchCount).to.equal(123); - expect(Long.fromNumber(150000).equals(flakeIdConfigs['flakeid'].prefetchValidityMillis)).to.be.true; + expect(150000).to.be.equal(flakeIdConfigs['flakeid'].prefetchValidityMillis); expect(flakeIdConfigs['flakeid2'].name).to.equal('flakeid2'); expect(flakeIdConfigs['flakeid2'].prefetchCount).to.equal(1234); - expect(Long.fromString("99999999999999999").equals(flakeIdConfigs['flakeid2'].prefetchValidityMillis)).to.be.true; + expect(1900000).to.be.equal(flakeIdConfigs['flakeid2'].prefetchValidityMillis); }) }); diff --git a/test/config/hazelcast-client-full.json b/test/config/hazelcast-client-full.json index 65cf259ef..781d49d43 100644 --- a/test/config/hazelcast-client-full.json +++ b/test/config/hazelcast-client-full.json @@ -112,7 +112,7 @@ { "name": "flakeid2", "prefetchCount": 1234, - "prefetchValidityMillis": "99999999999999999" + "prefetchValidityMillis": 1900000 } ], "import": [ From 72b738a279b6c519c334ec4d1f24e20e3514df75 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 9 Mar 2018 11:38:15 -0500 Subject: [PATCH 088/685] adds filter argument to RingBuffer.ReadMany fixes return value --- src/index.ts | 2 + src/proxy/IRingbuffer.ts | 3 +- src/proxy/ProxyManager.ts | 2 +- src/proxy/ringbuffer/LazyReadResultSet.ts | 65 +++++++++++++++++++ src/proxy/ringbuffer/ReadResultSet.ts | 62 ++++++++++++++++++ src/proxy/{ => ringbuffer}/RingbufferProxy.ts | 40 ++++++------ .../topic/ReliableTopicListenerRunner.ts | 17 ++--- src/serialization/SerializationService.ts | 2 +- test/javaclasses/IdentifiedFactory.js | 3 + test/javaclasses/PrefixFilter.js | 37 +++++++++++ test/ringbuffer/LazyReadResultSetTest.js | 55 ++++++++++++++++ test/ringbuffer/RingbufferTest.js | 24 ++++--- test/ringbuffer/hazelcast_ringbuffer.xml | 8 +++ 13 files changed, 279 insertions(+), 41 deletions(-) create mode 100644 src/proxy/ringbuffer/LazyReadResultSet.ts create mode 100644 src/proxy/ringbuffer/ReadResultSet.ts rename src/proxy/{ => ringbuffer}/RingbufferProxy.ts (65%) create mode 100644 test/javaclasses/PrefixFilter.js create mode 100644 test/ringbuffer/LazyReadResultSetTest.js diff --git a/src/index.ts b/src/index.ts index 412f4b4e2..f76a46763 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,6 +25,7 @@ import * as HazelcastErrors from './HazelcastError'; import {IterationType} from './core/Predicate'; import * as Aggregators from './aggregation/Aggregators'; import {ImportConfig} from './config/ImportConfig'; +import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; export { HazelcastClient as Client, @@ -35,6 +36,7 @@ export { Predicates, TopicOverloadPolicy, HazelcastErrors, + ReadResultSet, IterationType, Aggregators, ImportConfig diff --git a/src/proxy/IRingbuffer.ts b/src/proxy/IRingbuffer.ts index f4592d937..a76ccbba9 100644 --- a/src/proxy/IRingbuffer.ts +++ b/src/proxy/IRingbuffer.ts @@ -18,6 +18,7 @@ import * as Long from 'long'; import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {OverflowPolicy} from '../core/OverflowPolicy'; +import {ReadResultSet} from './ringbuffer/ReadResultSet'; export interface IRingbuffer extends DistributedObject { @@ -137,5 +138,5 @@ export interface IRingbuffer extends DistributedObject { * or if maxCount larger than the capacity of the ringbuffer * or if maxCount larger than 1000 (to prevent overload) */ - readMany(sequence: number | Long, minCount: number, maxCount: number): Promise>; + readMany(sequence: number | Long, minCount: number, maxCount: number): Promise>; } diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 9494c233d..9bb0ee9e1 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -28,7 +28,7 @@ import {QueueProxy} from './QueueProxy'; import {ListProxy} from './ListProxy'; import {LockProxy} from './LockProxy'; import {MultiMapProxy} from './MultiMapProxy'; -import {RingbufferProxy} from './RingbufferProxy'; +import {RingbufferProxy} from './ringbuffer/RingbufferProxy'; import {ReplicatedMapProxy} from './ReplicatedMapProxy'; import {NearCachedMapProxy} from './NearCachedMapProxy'; import {SemaphoreProxy} from './SemaphoreProxy'; diff --git a/src/proxy/ringbuffer/LazyReadResultSet.ts b/src/proxy/ringbuffer/LazyReadResultSet.ts new file mode 100644 index 000000000..96968178e --- /dev/null +++ b/src/proxy/ringbuffer/LazyReadResultSet.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ReadResultSet} from './ReadResultSet'; +import {SerializationService, SerializationServiceV1} from '../../serialization/SerializationService'; +import {Data} from '../../serialization/Data'; +import * as Long from 'long'; +import {UnsupportedOperationError} from '../../HazelcastError'; + +export class LazyReadResultSet implements ReadResultSet { + private readCount: number; + private items: Array; + private itemSeqs: Array; + private serializationService: SerializationService; + + constructor(serializationService: SerializationService, readCount: number, items: Array, itemSeqs: Array) { + this.serializationService = serializationService; + this.readCount = readCount; + this.items = items; + this.itemSeqs = itemSeqs; + } + + getReadCount(): number { + return this.readCount; + } + + get(index: number): T { + let dataOrObject = this.items[index]; + if (dataOrObject == null) { + return undefined; + } + if ((this.serializationService).isData(dataOrObject)) { + let obj = this.serializationService.toObject(dataOrObject); + this.items[index] = obj; + return obj; + } else { + return dataOrObject; + } + } + + getSequence(index: number): Long { + if (this.itemSeqs == null) { + throw new UnsupportedOperationError('Sequence IDs are not available when the cluster version is lower than 3.9'); + } + return this.itemSeqs[index]; + } + + size(): number { + return this.items.length; + } + +} diff --git a/src/proxy/ringbuffer/ReadResultSet.ts b/src/proxy/ringbuffer/ReadResultSet.ts new file mode 100644 index 000000000..ab0d60d5d --- /dev/null +++ b/src/proxy/ringbuffer/ReadResultSet.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * ReadResultSet defines the result of a {@lin RingBuffer#readMany} operation. + */ +import * as Long from 'long'; + +export interface ReadResultSet { + + /** + * Returns the number of items that have been read before filtering. + *

+ * If no filter is set, then the readCount will be equal to {@link #size}. But if a filter is applied, it could be that items + * are read, but are filtered out. So if you are trying to make another read based on the ReadResultSet then you should + * increment the sequence by readCount and not by size. Otherwise you will be re-reading the same filtered messages. + * + * @return the number of items read (including the filtered ones). + */ + getReadCount(): number; + + /** + * Gets the item at the given index. + * + * @param index + * @returns the found item or undefined if the index is out of bounds + */ + get(index: number): T; + + /** + * Return the sequence number for the item at the given index. + * The method throws if there are no sequences available. + * This can happen when the cluster version is lower than 3.9. + * + * @param index + * @throws UnsupportedOperationError if server version is 3.8 or lower. + * @requires Hazelcast 3.9 + * @returns the sequence number for the ringbuffer item + * undefined if the index is out of bounds. + */ + getSequence(index: number): Long; + + /** + * Returns the result set size. + * @returns the result set size + */ + size(): number; + +} diff --git a/src/proxy/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts similarity index 65% rename from src/proxy/RingbufferProxy.ts rename to src/proxy/ringbuffer/RingbufferProxy.ts index e27434b17..7ebfc15b1 100644 --- a/src/proxy/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -15,20 +15,21 @@ */ import * as Promise from 'bluebird'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {IRingbuffer} from './IRingbuffer'; -import {OverflowPolicy} from '../core/OverflowPolicy'; -import {RingbufferAddCodec} from '../codec/RingbufferAddCodec'; -import {RingbufferReadOneCodec} from '../codec/RingbufferReadOneCodec'; -import {RingbufferAddAllCodec} from '../codec/RingbufferAddAllCodec'; -import {RingbufferTailSequenceCodec} from '../codec/RingbufferTailSequenceCodec'; -import {RingbufferHeadSequenceCodec} from '../codec/RingbufferHeadSequenceCodec'; -import {RingbufferRemainingCapacityCodec} from '../codec/RingbufferRemainingCapacityCodec'; -import {RingbufferSizeCodec} from '../codec/RingbufferSizeCodec'; -import {RingbufferCapacityCodec} from '../codec/RingbufferCapacityCodec'; -import {RingbufferReadManyCodec} from '../codec/RingbufferReadManyCodec'; -import {Data} from '../serialization/Data'; +import {PartitionSpecificProxy} from '../PartitionSpecificProxy'; +import {IRingbuffer} from '../IRingbuffer'; +import {OverflowPolicy} from '../../core/OverflowPolicy'; +import {RingbufferAddCodec} from '../../codec/RingbufferAddCodec'; +import {RingbufferReadOneCodec} from '../../codec/RingbufferReadOneCodec'; +import {RingbufferAddAllCodec} from '../../codec/RingbufferAddAllCodec'; +import {RingbufferTailSequenceCodec} from '../../codec/RingbufferTailSequenceCodec'; +import {RingbufferHeadSequenceCodec} from '../../codec/RingbufferHeadSequenceCodec'; +import {RingbufferRemainingCapacityCodec} from '../../codec/RingbufferRemainingCapacityCodec'; +import {RingbufferSizeCodec} from '../../codec/RingbufferSizeCodec'; +import {RingbufferCapacityCodec} from '../../codec/RingbufferCapacityCodec'; +import {RingbufferReadManyCodec} from '../../codec/RingbufferReadManyCodec'; import Long = require('long'); +import {ReadResultSet} from './ReadResultSet'; +import {LazyReadResultSet} from './LazyReadResultSet'; export class RingbufferProxy extends PartitionSpecificProxy implements IRingbuffer { @@ -57,7 +58,7 @@ export class RingbufferProxy extends PartitionSpecificProxy implements IRingb } addAll(items: Array, overflowPolicy: OverflowPolicy = OverflowPolicy.OVERWRITE): Promise { - var dataList = items.map((item) => { + let dataList = items.map((item) => { return this.toData(item); }); @@ -72,7 +73,7 @@ export class RingbufferProxy extends PartitionSpecificProxy implements IRingb return this.encodeInvoke(RingbufferReadOneCodec, sequence); } - readMany(sequence: number|Long, minCount: number, maxCount: number): Promise> { + readMany(sequence: number|Long, minCount: number, maxCount: number, filter: any = null): Promise> { if (Long.fromValue(sequence).lessThan(0)) { throw new RangeError('Sequence number should not be less than zero, was: ' + sequence); @@ -86,12 +87,9 @@ export class RingbufferProxy extends PartitionSpecificProxy implements IRingb throw new RangeError('Min count ' + minCount + 'was larger than max count ' + maxCount); } - return this - .encodeInvoke(RingbufferReadManyCodec, sequence, minCount, maxCount, null) - .then>((raw: any) => { - return raw['items'].map((r: Data) => { - return this.toObject(r); - }, this); + return this.encodeInvoke(RingbufferReadManyCodec, sequence, minCount, maxCount, this.toData(filter)) + .then>((raw: any) => { + return new LazyReadResultSet(this.client.getSerializationService(), raw.readCount, raw.items, raw.itemSeqs); }); } } diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 80fcfb546..b4724f041 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -22,6 +22,7 @@ import {ReliableTopicProxy} from './ReliableTopicProxy'; import {LoggingService} from '../../logging/LoggingService'; import {TopicMessage} from './TopicMessage'; import {StaleSequenceError} from '../../HazelcastError'; +import {ReadResultSet} from '../../'; export class ReliableTopicListenerRunner { @@ -52,17 +53,17 @@ export class ReliableTopicListenerRunner { return; } - this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize).then((result: Array) => { + this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize).then((result: ReadResultSet) => { if (!this.cancelled) { - result.forEach((raw: RawTopicMessage) => { + for (let i = 0; i < result.size(); i++) { let msg = new TopicMessage(); - msg.messageObject = this.serializationService.toObject(raw.payload); - msg.publisher = raw.publisherAddress; - msg.publishingTime = raw.publishTime; + let item = result.get(i); + msg.messageObject = this.serializationService.toObject(item.payload); + msg.publisher = item.publisherAddress; + msg.publishingTime = item.publishTime; setImmediate(this.listener, msg); this.sequenceNumber++; - }); - + } setImmediate(this.next.bind(this)); } }).catch((e) => { @@ -81,7 +82,7 @@ export class ReliableTopicListenerRunner { return; } - var message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; + let message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; this.loggingService.warn('ReliableTopicListenerRunner', message); this.proxy.removeMessageListener(this.listenerId); diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 3f564ade2..7f2f2b1fe 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -67,7 +67,7 @@ export class SerializationServiceV1 implements SerializationService { this.registerGlobalSerializer(); } - private isData(object: any): boolean { + public isData(object: any): boolean { if (object instanceof HeapData ) { return true; } else { diff --git a/test/javaclasses/IdentifiedFactory.js b/test/javaclasses/IdentifiedFactory.js index e3336af25..fb54cd64c 100644 --- a/test/javaclasses/IdentifiedFactory.js +++ b/test/javaclasses/IdentifiedFactory.js @@ -17,6 +17,7 @@ var IdentifiedEntryProcessor = require('./IdentifiedEntryProcessor'); var DistortInvalidationMetadataEntryProcessor = require('./DistortInvalidationMetadataEntryProcessor'); var CustomComparator = require('./CustomComparator'); +var PrefixFilter = require('./PrefixFilter'); function IdentifiedFactory() { } @@ -28,6 +29,8 @@ IdentifiedFactory.prototype.create = function (type) { return new CustomComparator(); } else if (type === 3) { return new DistortInvalidationMetadataEntryProcessor(); + } else if (type === 4) { + return new PrefixFilter(); } }; diff --git a/test/javaclasses/PrefixFilter.js b/test/javaclasses/PrefixFilter.js new file mode 100644 index 000000000..b213a861a --- /dev/null +++ b/test/javaclasses/PrefixFilter.js @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +function PrefixFilter(prefix) { + this.prefix = prefix; +} + +PrefixFilter.prototype.readData = function (inp) { + this.prefix = inp.readUTF(); +}; + +PrefixFilter.prototype.writeData = function(outp) { + outp.writeUTF(this.prefix); +}; + +PrefixFilter.prototype.getFactoryId = function () { + return 66; +}; + +PrefixFilter.prototype.getClassId = function() { + return 4; +}; + +module.exports = PrefixFilter; diff --git a/test/ringbuffer/LazyReadResultSetTest.js b/test/ringbuffer/LazyReadResultSetTest.js new file mode 100644 index 000000000..4e3d5e64a --- /dev/null +++ b/test/ringbuffer/LazyReadResultSetTest.js @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var LazyReadResultSet = require('../../lib/proxy/ringbuffer/LazyReadResultSet').LazyReadResultSet; +var HzErrors = require('../..').HazelcastErrors; + +describe('LazyReadResultSetTest', function () { + + var mockSerializationService = { + 'toObject': function (x) { + return x+100; + }, + + 'isData': function (x) { + return x < 3; + } + }; + + it('get', function () { + var set = new LazyReadResultSet(mockSerializationService, 4, [1,2,3,4], [11,12,13,14]); + expect(set.get(0)).to.equal(101); + expect(set.get(1)).to.equal(102); + expect(set.get(2)).to.equal(3); + expect(set.get(3)).to.equal(4); + expect(set.getSequence(0)).to.equal(11); + expect(set.getSequence(1)).to.equal(12); + expect(set.getSequence(2)).to.equal(13); + expect(set.getSequence(3)).to.equal(14); + expect(set.getReadCount()).to.equal(4); + }); + + it('getSequence throws UnsupportedOperationError when there is no info', function () { + var set = new LazyReadResultSet(mockSerializationService, 4, [1,2,3,4]); + expect(set.getSequence.bind(set, 2)).to.throw(HzErrors.UnsupportedOperationError); + }); + + it('get returns undefined for out of range index', function () { + var set = new LazyReadResultSet(mockSerializationService, 4, [1,2,3,4], [11,12,13,14]); + expect(set.get(4)).to.be.undefined; + }); +}); diff --git a/test/ringbuffer/RingbufferTest.js b/test/ringbuffer/RingbufferTest.js index 9d2cdac43..3343cd6e7 100644 --- a/test/ringbuffer/RingbufferTest.js +++ b/test/ringbuffer/RingbufferTest.js @@ -15,11 +15,11 @@ */ var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; +var HazelcastClient = require('../../').Client; var Controller = require('./../RC'); var Util = require('./../Util'); var fs = require('fs'); - +var PrefixFilter = require('../javaclasses/PrefixFilter'); var Promise = require('bluebird'); describe("Ringbuffer Proxy", function () { @@ -54,7 +54,6 @@ describe("Ringbuffer Proxy", function () { return Controller.shutdownCluster(cluster.id); }); - it("adds one item and reads back", function () { return rb.add(1).then(function (sequence) { return rb.readOne(sequence).then(function (item) { @@ -73,11 +72,22 @@ describe("Ringbuffer Proxy", function () { }) }); - it("reads all items at once", function () { return rb.addAll([1, 2, 3]).then(function () { return rb.readMany(0, 1, 3).then(function (items) { - expect(items).to.deep.equal([1, 2, 3]); + expect(items.get(0)).to.equal(1); + expect(items.get(1)).to.equal(2); + expect(items.get(2)).to.equal(3); + expect(items.getReadCount()).to.equal(3); + }); + }) + }); + + it("readMany with filter filters the results", function () { + return rb.addAll(['item1', 'prefixedItem2', 'prefixedItem3']).then(function () { + return rb.readMany(0, 1, 3, new PrefixFilter('prefixed')).then(function (items) { + expect(items.get(0)).to.equal('prefixedItem2'); + expect(items.get(1)).to.equal('prefixedItem3'); }); }) }); @@ -115,7 +125,6 @@ describe("Ringbuffer Proxy", function () { }); }); - it("correctly reports size", function () { return rb.addAll([1, 2]).then(function () { return rb.size().then(function (size) { @@ -123,7 +132,4 @@ describe("Ringbuffer Proxy", function () { }); }) }); - - - }); diff --git a/test/ringbuffer/hazelcast_ringbuffer.xml b/test/ringbuffer/hazelcast_ringbuffer.xml index 766057eee..1b4186190 100644 --- a/test/ringbuffer/hazelcast_ringbuffer.xml +++ b/test/ringbuffer/hazelcast_ringbuffer.xml @@ -25,4 +25,12 @@ 1 5 + + + + + com.hazelcast.client.test.IdentifiedFactory + + + From e7d2c6420f362ad62c5891ff062e87bdcdc5a61d Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 14 Mar 2018 08:41:58 -0400 Subject: [PATCH 089/685] Fixes FlakeId tests. We add a small wait to `ids are from new batch after prefetched ones are exhausted` test adds context to flakeid test long comparison fail message --- test/flakeid/FlakeIdGeneratorProxyTest.js | 31 +++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index c587e15bc..d809fb526 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -75,19 +75,24 @@ describe("FlakeIdGeneratorProxyTest", function () { var promise = Promise.resolve(); var idList = []; for (var i = 0; i < 10; i++) { - promise = promise.then(Promise.all([ - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)) - ])); + promise = promise.then(function () { + return Promise.all([ + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)) + ]); + }); } return promise.then(function () { - idList.sort(); + expect(idList.length).to.be.equal(50); + idList.sort(function (a, b) { + return (a.greaterThan(b) ? 1 : (a.lessThan(b) ? -1 : 0)); + }); for (var i = 1; i < idList.length; i++) { expect(idList[i]).to.be.instanceOf(Long); - expect(idList[i-1].equals(idList[i])).to.be.false; + expect(idList[i-1].equals(idList[i]), 'Expected ' + idList[i-1] + ' ' + idList[i] + 'to be different.').to.be.false; } }); }); @@ -107,7 +112,8 @@ describe("FlakeIdGeneratorProxyTest", function () { return Util.promiseWaitMilliseconds(SHORT_TERM_VALIDITY_MILLIS + 1000).then(function () { return flakeIdGenerator.newId(); }).then(function (secondId) { - expect(secondId.greaterThan(firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE))).to.be.true; + var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); + expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; }); }); }); @@ -118,10 +124,13 @@ describe("FlakeIdGeneratorProxyTest", function () { return flakeIdGenerator.newId().then(function () { //after this we exhausted the batch at hand return flakeIdGenerator.newId(); + }).then(function () { + return Util.promiseWaitMilliseconds(100); }).then(function() { return flakeIdGenerator.newId(); }).then(function (secondId) { - return expect(secondId.greaterThan(firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE))).to.be.true; + var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); + return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; }); }); }); From b1ad4f683b86ee96e6c19bee606151dc3b589ca8 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 14 Mar 2018 16:01:54 -0400 Subject: [PATCH 090/685] adds ReadOnlyLazyList --- src/core/ReadOnlyLazyList.ts | 86 ++++++++++++++++++++ src/proxy/IList.ts | 4 +- src/proxy/IMap.ts | 8 +- src/proxy/IReplicatedMap.ts | 5 +- src/proxy/ISet.ts | 4 +- src/proxy/ListProxy.ts | 16 ++-- src/proxy/MapProxy.ts | 22 ++--- src/proxy/MultiMap.ts | 13 +-- src/proxy/MultiMapProxy.ts | 23 +++--- src/proxy/ReplicatedMapProxy.ts | 11 +-- src/proxy/SetProxy.ts | 11 ++- test/list/ListProxyTest.js | 2 +- test/map/MapPredicateTest.js | 10 +-- test/map/MapProxyTest.js | 14 ++-- test/multimap/MultiMapProxyTest.js | 12 +-- test/replicatedmap/ReplicatedMapProxyTest.js | 20 ++--- test/set/SetProxyTest.js | 10 +-- 17 files changed, 181 insertions(+), 90 deletions(-) create mode 100644 src/core/ReadOnlyLazyList.ts diff --git a/src/core/ReadOnlyLazyList.ts b/src/core/ReadOnlyLazyList.ts new file mode 100644 index 000000000..e195aaff8 --- /dev/null +++ b/src/core/ReadOnlyLazyList.ts @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {SerializationService, SerializationServiceV1} from '../serialization/SerializationService'; + +class ReadOnlyLazyListIterator implements Iterator { + + private index = 0; + private list: ReadOnlyLazyList; + + constructor(list: ReadOnlyLazyList) { + this.list = list; + } + + next(): IteratorResult { + if (this.index < this.list.size()) { + return { done: false, value: this.list.get(this.index++) }; + } else { + return { done: true, value: undefined}; + } + } + +} + +export class ReadOnlyLazyList implements Iterable { + private internalArray: Array; + private serializationService: SerializationService; + + constructor(array: Array, serializationService: SerializationService) { + this.internalArray = array; + this.serializationService = serializationService; + } + + get(index: number): T { + let dataOrObject = this.internalArray[index]; + if (dataOrObject == null) { + return undefined; + } + if ((this.serializationService).isData(dataOrObject)) { + let obj = this.serializationService.toObject(dataOrObject); + this.internalArray[index] = obj; + return obj; + } else { + return dataOrObject; + } + } + + size(): number { + return this.internalArray.length; + } + + values(): Iterator { + return new ReadOnlyLazyListIterator(this); + } + + slice(start: number, end?: number): ReadOnlyLazyList { + return new ReadOnlyLazyList(this.internalArray.slice(start, end), this.serializationService); + } + + toArray(): Array { + let arr: Array = []; + let iterator = this.values(); + for (let item = iterator.next(); !item.done; item = iterator.next()) { + arr.push(item.value); + } + return arr; + } + + [Symbol.iterator](): Iterator { + return this.values(); + } +} + diff --git a/src/proxy/IList.ts b/src/proxy/IList.ts index 0aae80539..0d75da096 100644 --- a/src/proxy/IList.ts +++ b/src/proxy/IList.ts @@ -17,6 +17,7 @@ import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {ItemListener} from '../core/ItemListener'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export interface IList extends DistributedObject { @@ -157,8 +158,9 @@ export interface IList extends DistributedObject { * Return a view of this list that contains elements between index numbers from `start` (inclusive) to `end` (exclusive) * @param start start of the view * @param end end of the view + * @return a view of this list that contains elements between index numbers from `start` (inclusive) to `end` (exclusive) */ - subList(start: number, end: number): Promise; + subList(start: number, end: number): Promise>; /** * Returns an array that contains all elements of this list in proper sequence. diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index 09e1a692c..b80c256db 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -21,6 +21,7 @@ import {IMapListener} from '../core/MapListener'; import {Predicate} from '../core/Predicate'; import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; import {Aggregator} from '../aggregation/Aggregator'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export interface IMap extends DistributedObject { /** @@ -279,16 +280,17 @@ export interface IMap extends DistributedObject { unlock(key: K): Promise; /** - * Returns an array of values contained in this map. + * Returns a list of values contained in this map. */ - values(): Promise; + values(): Promise>; /** * Queries the map based on the specified predicate and returns the values of matching entries. * Specified predicate runs on all members in parallel. * @param predicate + * @return a list of values that satisfies the given predicate. */ - valuesWithPredicate(predicate: Predicate): Promise; + valuesWithPredicate(predicate: Predicate): Promise>; /** * Returns a key-value pair representing the association of given key diff --git a/src/proxy/IReplicatedMap.ts b/src/proxy/IReplicatedMap.ts index c3972c602..3583f5371 100644 --- a/src/proxy/IReplicatedMap.ts +++ b/src/proxy/IReplicatedMap.ts @@ -20,6 +20,7 @@ import {Predicate} from '../core/Predicate'; import {IMapListener} from '../core/MapListener'; import Long = require('long'); import {ArrayComparator} from '../util/ArrayComparator'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export interface IReplicatedMap extends DistributedObject { /** @@ -119,9 +120,9 @@ export interface IReplicatedMap extends DistributedObject { keySet(): Promise; /** - * @return Returns an array of values contained in this map. + * @return a list of values contained in this map. */ - values(comparator?: ArrayComparator): Promise; + values(comparator?: ArrayComparator): Promise>; /** * @return Returns entries as an array of key-value pairs. diff --git a/src/proxy/ISet.ts b/src/proxy/ISet.ts index 7ca456907..7cb469903 100644 --- a/src/proxy/ISet.ts +++ b/src/proxy/ISet.ts @@ -37,10 +37,10 @@ export interface ISet extends DistributedObject { addAll(items : E[]) : Promise; /** - * Returns all item in this set. + * Returns an array containing all of the elements in the set. * @return An array of items. */ - getAll(): Promise; + toArray(): Promise; /** * Removes all of the elements from this set. diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index f6e28fe43..caac0feb6 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -42,6 +42,7 @@ import {ListLastIndexOfCodec} from '../codec/ListLastIndexOfCodec'; import ClientMessage = require('../ClientMessage'); import * as Promise from 'bluebird'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export class ListProxy extends PartitionSpecificProxy implements IList { @@ -113,21 +114,18 @@ export class ListProxy extends PartitionSpecificProxy implements IList { return this.encodeInvoke(ListSizeCodec); } - subList(start: number, end: number): Promise { + subList(start: number, end: number): Promise> { return this.encodeInvoke(ListSubCodec, start, end).then((encoded: Data[]) => { - return encoded.map((item: Data) => { - return this.toObject(item); - }); + return new ReadOnlyLazyList(encoded, this.client.getSerializationService()); }); } toArray(): Promise { - return this.encodeInvoke(ListGetAllCodec) - .then((elements: Array) => { - return elements.map((element) => { - return this.toObject(element); - }); + return this.encodeInvoke(ListGetAllCodec).then((elements: Array) => { + return elements.map((element) => { + return this.toObject(element); }); + }); } addItemListener(listener: ItemListener, includeValue: boolean): Promise { diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 62730cfd7..4f50eaa33 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -79,6 +79,7 @@ import ClientMessage = require('../ClientMessage'); import {Aggregator} from '../aggregation/Aggregator'; import {MapAggregateCodec} from '../codec/MapAggregateCodec'; import {MapAggregateWithPredicateCodec} from '../codec/MapAggregateWithPredicateCodec'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export class MapProxy extends BaseProxy implements IMap { aggregate(aggregator: Aggregator): Promise { @@ -185,24 +186,24 @@ export class MapProxy extends BaseProxy implements IMap { } } - valuesWithPredicate(predicate: Predicate): Promise { + valuesWithPredicate(predicate: Predicate): Promise> { assertNotNull(predicate); var toObject = this.toObject.bind(this); if (predicate instanceof PagingPredicate) { predicate.setIterationType(IterationType.VALUE); - var predData = this.toData(predicate); + let predData = this.toData(predicate); return this.encodeInvokeOnRandomTarget( MapValuesWithPagingPredicateCodec, predData - ).then(function(rawValues: [Data, Data][]) { - var deserValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { + ).then((rawValues: [Data, Data][]) => { + let desValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { return [toObject(ite[0]), toObject(ite[1])]; }); - return getSortedQueryResultSet(deserValues, predicate); + return new ReadOnlyLazyList(getSortedQueryResultSet(desValues, predicate), this.client.getSerializationService()); }); } else { var predicateData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapValuesWithPredicateCodec, predicateData).then(function (rawValues: Data[]) { - return rawValues.map(toObject); + return this.encodeInvokeOnRandomTarget(MapValuesWithPredicateCodec, predicateData).then( (rawValues: Data[]) => { + return new ReadOnlyLazyList(rawValues, this.client.getSerializationService()); }); } } @@ -490,10 +491,9 @@ export class MapProxy extends BaseProxy implements IMap { return this.encodeInvokeOnKey(MapSetCodec, keyData, keyData, valueData, 0, ttl); } - values(): Promise { - var toObject = this.toObject.bind(this); - return this.encodeInvokeOnRandomTarget(MapValuesCodec).then(function(valuesData) { - return valuesData.map(toObject); + values(): Promise> { + return this.encodeInvokeOnRandomTarget(MapValuesCodec).then((valuesData) => { + return new ReadOnlyLazyList(valuesData, this.client.getSerializationService()); }); } diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index f2e7df3df..e6e3578cc 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -17,6 +17,7 @@ import * as Promise from 'bluebird'; import {DistributedObject} from '../DistributedObject'; import {IMapListener} from '../core/MapListener'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export interface MultiMap extends DistributedObject { @@ -34,9 +35,9 @@ export interface MultiMap extends DistributedObject { /** * Retrieves a list of values associated with the specified key. * @param key key to search for. - * @return array of values associated with the specified key. + * @return a list of values associated with the specified key. */ - get(key: K): Promise>; + get(key: K): Promise>; /** * Removes an association of the specified value with the specified key. Calling this method does not affect @@ -50,9 +51,9 @@ export interface MultiMap extends DistributedObject { /** * Detaches all values from the specified key. * @param key key from which all entries should be removed. - * @return an array of old values that were associated with this key prior to this method call. + * @return a list of old values that were associated with this key prior to this method call. */ - removeAll(key: K): Promise>; + removeAll(key: K): Promise>; /** * @return an array of all keys in this multi-map. @@ -60,9 +61,9 @@ export interface MultiMap extends DistributedObject { keySet(): Promise>; /** - * @return a flat array of all values stored in this multi-map. + * @return a flat list of all values stored in this multi-map. */ - values(): Promise>; + values(): Promise>; /** * Returns all entries in this multi-map. If a certain key has multiple values associated with it, diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index ac8e4d31b..295fd34e6 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -46,6 +46,7 @@ import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; import * as Long from 'long'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import ClientMessage = require('../ClientMessage'); +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export class MultiMapProxy extends BaseProxy implements MultiMap { @@ -62,11 +63,11 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { return this.encodeInvokeOnKey(MultiMapPutCodec, keyData, keyData, valueData, 1); } - get(key: K): Promise> { + get(key: K): Promise> { var keyData = this.toData(key); - - return this.encodeInvokeOnKey>(MultiMapGetCodec, keyData, keyData, 1) - .then>(this.deserializeList); + return this.encodeInvokeOnKey>(MultiMapGetCodec, keyData, keyData, 1).then((data: Data[]) => { + return new ReadOnlyLazyList(data, this.client.getSerializationService()); + }); } remove(key: K, value: V): Promise { @@ -75,10 +76,11 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { return this.encodeInvokeOnKey(MultiMapRemoveEntryCodec, keyData, keyData, valueData, 1); } - removeAll(key: K): Promise> { + removeAll(key: K): Promise> { var keyData = this.toData(key); - return this.encodeInvokeOnKey>(MultiMapRemoveCodec, keyData, keyData, 1) - .then>(this.deserializeList); + return this.encodeInvokeOnKey>(MultiMapRemoveCodec, keyData, keyData, 1).then((data: Data[]) => { + return new ReadOnlyLazyList(data, this.client.getSerializationService()); + }); } keySet(): Promise> { @@ -86,9 +88,10 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { .then>(this.deserializeList); } - values(): Promise> { - return this.encodeInvokeOnRandomTarget>(MultiMapValuesCodec) - .then>(this.deserializeList); + values(): Promise> { + return this.encodeInvokeOnRandomTarget>(MultiMapValuesCodec).then((data: Data[]) => { + return new ReadOnlyLazyList(data, this.client.getSerializationService()); + }); } entrySet(): Promise> { diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index caf82ada1..3d6685bd0 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -45,6 +45,7 @@ import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import Long = require('long'); import {ArrayComparator} from '../util/ArrayComparator'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export class ReplicatedMapProxy extends PartitionSpecificProxy implements IReplicatedMap { @@ -120,14 +121,14 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements }); } - values(comparator?: ArrayComparator): Promise { + values(comparator?: ArrayComparator): Promise> { const toObject = this.toObject.bind(this); - return this.encodeInvoke(ReplicatedMapValuesCodec).then(function (valuesData) { - let results = valuesData.map(toObject); + return this.encodeInvoke(ReplicatedMapValuesCodec).then((valuesData: Data[]) => { if (comparator) { - return results.sort(comparator); + let desValues = valuesData.map(toObject); + return new ReadOnlyLazyList(desValues.sort(comparator), this.client.getSerializationService()); } - return results; + return new ReadOnlyLazyList(valuesData, this.client.getSerializationService()); }); } diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index efd043bf6..0d36c51a3 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -46,13 +46,12 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { return this.encodeInvoke(SetAddAllCodec, this.serializeList(items)); } - getAll(): Promise { - return this.encodeInvoke(SetGetAllCodec) - .then((items: Array) => { - return items.map((item) => { - return this.toObject(item); - }); + toArray(): Promise { + return this.encodeInvoke(SetGetAllCodec).then((items: Array) => { + return items.map((item) => { + return this.toObject(item); }); + }); } clear(): Promise { diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index 6ae96b2f2..e387db868 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -235,7 +235,7 @@ describe("List Proxy", function () { return listInstance.addAll([1, 2, 3, 4, 5, 6]).then(function () { return listInstance.subList(1, 5); }).then(function (subList) { - expect(subList).to.deep.equal([2, 3, 4, 5]); + expect(subList.toArray()).to.deep.equal([2, 3, 4, 5]); }); }); diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 7f879e332..8b81300e2 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -83,9 +83,9 @@ describe("Predicates", function() { function testPredicate(predicate, expecteds, orderMatters) { return map.valuesWithPredicate(predicate).then(function(values) { if (orderMatters) { - return expect(values).to.deep.equal(expecteds); + return expect(values.toArray()).to.deep.equal(expecteds); } else { - return expect(values).to.have.members(expecteds); + return expect(values.toArray()).to.have.members(expecteds); } }); } @@ -119,7 +119,7 @@ describe("Predicates", function() { return localMap.put('temp', 'tempval').then(function() { return localMap.valuesWithPredicate(Predicates.like('this', 'tempv%')); }).then(function (values) { - return expect(values).to.have.members(['tempval']); + return expect(values.toArray()).to.have.members(['tempval']); }).then(function() { return localMap.destroy(); }); @@ -130,7 +130,7 @@ describe("Predicates", function() { return localMap.putAll([['temp', 'tempval'], ['TEMP', 'TEMPVAL']]).then(function() { return localMap.valuesWithPredicate(Predicates.ilike('this', 'tempv%')); }).then(function (values) { - return expect(values).to.have.members(['tempval', 'TEMPVAL']); + return expect(values.toArray()).to.have.members(['tempval', 'TEMPVAL']); }).then(function() { return localMap.destroy(); }); @@ -171,7 +171,7 @@ describe("Predicates", function() { return localMap.putAll([['06', 'ankara'], ['07', 'antalya']]).then(function() { return localMap.valuesWithPredicate(Predicates.regex('this', '^.*ya$')); }).then(function (values) { - return expect(values).to.have.members(['antalya']); + return expect(values.toArray()).to.have.members(['antalya']); }).then(function() { return localMap.destroy(); }); diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index aeeaa3e81..27cb83945 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -436,7 +436,7 @@ describe('MapProxy', function() { it('values', function() { return map.values().then(function(vals) { - return expect(vals).to.deep.have.members([ + return expect(vals.toArray()).to.deep.have.members([ 'val0', 'val1', 'val2', 'val3', 'val4', 'val5', 'val6', 'val7', 'val8', 'val9' ]); @@ -447,7 +447,7 @@ describe('MapProxy', function() { return map.clear().then(function() { return map.values(); }).then(function(vals) { - return expect(vals).to.have.lengthOf(0); + return expect(vals.toArray()).to.have.lengthOf(0); }) }); @@ -794,9 +794,9 @@ describe('MapProxy', function() { }); it('valuesWithPredicate', function() { - return map.valuesWithPredicate(Predicates.sql('this == val3')).then(function(valueSet) { - expect(valueSet.length).to.equal(1); - expect(valueSet[0]).to.equal('val3'); + return map.valuesWithPredicate(Predicates.sql('this == val3')).then(function(valueList) { + expect(valueList.toArray().length).to.equal(1); + expect(valueList.toArray()[0]).to.equal('val3'); }); }); @@ -816,8 +816,8 @@ describe('MapProxy', function() { it('valuesWithPredicate paging', function() { return map.valuesWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function(values) { - expect(values.length).to.equal(1); - expect(values[0]).to.equal('val3'); + expect(values.toArray().length).to.equal(1); + expect(values.toArray()[0]).to.equal('val3'); }); }); diff --git a/test/multimap/MultiMapProxyTest.js b/test/multimap/MultiMapProxyTest.js index d9f03d24a..0fdcdb4be 100644 --- a/test/multimap/MultiMapProxyTest.js +++ b/test/multimap/MultiMapProxyTest.js @@ -56,7 +56,7 @@ describe("MultiMap Proxy", function () { return map.put(1, 1).then(function () { return map.get(1); }).then(function (values) { - expect(values).to.deep.equal([1]); + expect(values.toArray()).to.deep.equal([1]); }); }); @@ -66,7 +66,7 @@ describe("MultiMap Proxy", function () { }).then(function () { return map.get(1); }).then(function (values) { - expect(values.sort()).to.deep.equal([1, 2]); + expect(values.toArray().sort()).to.deep.equal([1, 2]); }); }); @@ -93,7 +93,7 @@ describe("MultiMap Proxy", function () { }).then(function () { return map.get(1) }).then(function (values) { - expect(values.sort()).to.deep.equal([1, 5]) + expect(values.toArray().sort()).to.deep.equal([1, 5]) }); }); @@ -118,10 +118,10 @@ describe("MultiMap Proxy", function () { return Promise.all(puts).then(function () { return map.removeAll(1); }).then(function (oldValues) { - expect(oldValues.sort()).to.deep.equal([1, 3, 5]); + expect(oldValues.toArray().sort()).to.deep.equal([1, 3, 5]); return map.get(1) }).then(function (values) { - expect(values).to.be.empty; + expect(values.toArray()).to.be.empty; }); }); @@ -139,7 +139,7 @@ describe("MultiMap Proxy", function () { return Promise.all(puts).then(function () { return map.values(); }).then(function (values) { - expect(values.sort()).to.deep.equal([1, 3, 5]); + expect(values.toArray().sort()).to.deep.equal([1, 3, 5]); }); }); diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 5b2fbccba..67fca8239 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -237,7 +237,7 @@ describe('ReplicatedMap Proxy', function () { return rm.values(); }) .then(function (values) { - expect(values).to.eql(['value1', 'value2', 'value3']); + expect(values.toArray()).to.eql(['value1', 'value2', 'value3']); }); }); @@ -247,17 +247,15 @@ describe('ReplicatedMap Proxy', function () { ['key2', 'value2'], ['key3', 'value3'], ['key1', 'value1'] - ]) - .then(function () { - return rm.values(function (a, b) { - return b[b.length - 1] - a[a.length - 1]; - }); - }) - .then(function (values) { - values.forEach(function (value, index) { - expect(value).to.equal(expectedArray[index]); - }); + ]).then(function () { + return rm.values(function (a, b) { + return b[b.length - 1] - a[a.length - 1]; }); + }).then(function (values) { + values.toArray().forEach(function (value, index) { + expect(value).to.equal(expectedArray[index]); + }); + }); }); it('returns keySet', function () { diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index 165658d84..0eb62f3c1 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -67,10 +67,10 @@ describe("Set Proxy", function () { }); }); - it("gets all", function () { + it("toArray", function () { var input = [1, 2, 3]; return setInstance.addAll(input).then(function () { - return setInstance.getAll().then(function (all) { + return setInstance.toArray().then(function (all) { expect(all.sort()).to.deep.equal(input); }); }); @@ -117,7 +117,7 @@ describe("Set Proxy", function () { return setInstance.addAll([1, 2, 3]).then(function () { return setInstance.remove(1) }).then(function () { - return setInstance.getAll().then(function (all) { + return setInstance.toArray().then(function (all) { expect(all.sort()).to.deep.equal([2, 3]); }); }); @@ -127,7 +127,7 @@ describe("Set Proxy", function () { return setInstance.addAll([1, 2, 3, 4]).then(function () { return setInstance.removeAll([1, 2]); }).then(function () { - return setInstance.getAll().then(function (all) { + return setInstance.toArray().then(function (all) { expect(all.sort()).to.deep.equal([3, 4]); }); }); @@ -137,7 +137,7 @@ describe("Set Proxy", function () { return setInstance.addAll([1, 2, 3, 4]).then(function () { return setInstance.retainAll([1, 2]); }).then(function () { - return setInstance.getAll().then(function (all) { + return setInstance.toArray().then(function (all) { expect(all.sort()).to.deep.equal([1, 2]); }); }); From ae9e1cdb112ba079197a4fd468b98c01cf070931 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Fri, 23 Feb 2018 10:17:09 -0500 Subject: [PATCH 091/685] pn counter --- src/ClusterDataFactoryHelper.ts | 1 + src/HazelcastClient.ts | 5 + src/HazelcastError.ts | 8 + src/Util.ts | 10 + src/codec/PNCounterAddCodec.ts | 106 ++++++++++ src/codec/PNCounterGetCodec.ts | 102 ++++++++++ ...PNCounterGetConfiguredReplicaCountCodec.ts | 65 ++++++ src/codec/PNCounterMessageType.ts | 6 + src/core/VectorClock.ts | 74 +++++++ src/invocation/ClusterService.ts | 2 +- src/proxy/BaseProxy.ts | 7 + src/proxy/PNCounter.ts | 186 ++++++++++++++++++ src/proxy/PNCounterProxy.ts | 172 ++++++++++++++++ src/proxy/ProxyManager.ts | 3 + test/ListenersOnReconnectTest.js | 2 +- test/pncounter/PNCounterBasicTest.js | 99 ++++++++++ test/pncounter/PNCounterConsistencyTest.js | 72 +++++++ .../pncounter/PNCounterWithLiteMembersTest.js | 91 +++++++++ .../hazelcast_crdtreplication_delayed.xml | 24 +++ test/pncounter/hazelcast_litemember.xml | 21 ++ 20 files changed, 1054 insertions(+), 2 deletions(-) create mode 100644 src/codec/PNCounterAddCodec.ts create mode 100644 src/codec/PNCounterGetCodec.ts create mode 100644 src/codec/PNCounterGetConfiguredReplicaCountCodec.ts create mode 100644 src/codec/PNCounterMessageType.ts create mode 100644 src/core/VectorClock.ts create mode 100644 src/proxy/PNCounter.ts create mode 100644 src/proxy/PNCounterProxy.ts create mode 100644 test/pncounter/PNCounterBasicTest.js create mode 100644 test/pncounter/PNCounterConsistencyTest.js create mode 100644 test/pncounter/PNCounterWithLiteMembersTest.js create mode 100644 test/pncounter/hazelcast_crdtreplication_delayed.xml create mode 100644 test/pncounter/hazelcast_litemember.xml diff --git a/src/ClusterDataFactoryHelper.ts b/src/ClusterDataFactoryHelper.ts index be81b9c33..08070fc64 100644 --- a/src/ClusterDataFactoryHelper.ts +++ b/src/ClusterDataFactoryHelper.ts @@ -17,4 +17,5 @@ export class ClusterDataFactoryHelper { static readonly FACTORY_ID = 0; static readonly ADDRESS_ID = 1; + static readonly VECTOR_CLOCK = 43; } diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index d27e2f984..2d0996327 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -46,6 +46,7 @@ import {RepairingTask} from './nearcache/RepairingTask'; import {ConfigBuilder} from './config/ConfigBuilder'; import {ClientErrorFactory} from './protocol/ErrorFactory'; import {FlakeIdGenerator} from './proxy/FlakeIdGenerator'; +import {PNCounter} from './proxy/PNCounter'; export default class HazelcastClient { @@ -229,6 +230,10 @@ export default class HazelcastClient { return this.proxyManager.getOrCreateProxy(name, ProxyManager.FLAKEID_SERVICE); } + getPNCounter(name: string): PNCounter { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE); + } + /** * Returns the distributed semaphore instance with given name. * @param name diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index e87bc1cbe..90f72bde5 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -235,6 +235,7 @@ export class TargetDisconnectedError extends HazelcastError { } } + export class UnsupportedOperationError extends HazelcastError { constructor(msg: string, cause?: Error) { super(msg, cause); @@ -242,6 +243,13 @@ export class UnsupportedOperationError extends HazelcastError { } } +export class ConsistencyLostError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ConsistencyLostError.prototype); + } +} + export class NoDataMemberInClusterError extends HazelcastError { constructor(msg: string, cause?: Error) { super(msg, cause); diff --git a/src/Util.ts b/src/Util.ts index 4a5d1b21b..af30d192d 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -222,6 +222,16 @@ export function mergeJson(base: any, other: any): void { } } +/** + * Returns a random integer between 0(inclusive) and `upperBound`(exclusive) + * Upper bound should be an integer. + * @param upperBound + * @returns A random integer between [0-upperBound) + */ +export function randomInt(upperBound: number): number { + return Math.floor(Math.random() * upperBound); +} + function createComparator(iterationType: IterationType): Comparator { var object: Comparator = { sort: function(a: [any, any], b: [any, any]): number { diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts new file mode 100644 index 000000000..c7a9153b8 --- /dev/null +++ b/src/codec/PNCounterAddCodec.ts @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* tslint:disable */ +import ClientMessage = require('../ClientMessage'); +import {BitsUtil} from '../BitsUtil'; +import Address = require('../Address'); +import {AddressCodec} from './AddressCodec'; +import {UUIDCodec} from './UUIDCodec'; +import {MemberCodec} from './MemberCodec'; +import {Data} from '../serialization/Data'; +import {EntryViewCodec} from './EntryViewCodec'; +import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); +import {Member} from '../core/Member'; +import {UUID} from '../core/UUID'; +import {PNCounterMessageType} from './PNCounterMessageType'; + +var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_ADD; +var RESPONSE_TYPE = 127; +var RETRYABLE = false; + + +export class PNCounterAddCodec { + static calculateSize(name: string, delta: any, getBeforeUpdate: boolean, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { + var dataSize: number = 0; + dataSize += BitsUtil.calculateSizeString(name); + dataSize += BitsUtil.LONG_SIZE_IN_BYTES; + dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; + dataSize += BitsUtil.INT_SIZE_IN_BYTES; + + replicaTimestamps.forEach((replicaTimestampsItem: [string, any]) => { + var key: string = replicaTimestampsItem[0]; + var val: any = replicaTimestampsItem[1]; + dataSize += BitsUtil.calculateSizeString(key); + dataSize += BitsUtil.LONG_SIZE_IN_BYTES; + }); + dataSize += BitsUtil.calculateSizeAddress(targetReplica); + return dataSize; + } + + static encodeRequest(name: string, delta: any, getBeforeUpdate: boolean, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { + var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, delta, getBeforeUpdate, replicaTimestamps, targetReplica)); + clientMessage.setMessageType(REQUEST_TYPE); + clientMessage.setRetryable(RETRYABLE); + clientMessage.appendString(name); + clientMessage.appendLong(delta); + clientMessage.appendBoolean(getBeforeUpdate); + clientMessage.appendInt32(replicaTimestamps.length); + + replicaTimestamps.forEach((replicaTimestampsItem: any) => { + var key: string = replicaTimestampsItem[0]; + var val: any = replicaTimestampsItem[1]; + clientMessage.appendString(key); + clientMessage.appendLong(val); + }); + + AddressCodec.encode(clientMessage, targetReplica); + clientMessage.updateFrameLength(); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { + var parameters: any = { + 'value': null, + 'replicaTimestamps': null, + 'replicaCount': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } + parameters['value'] = clientMessage.readLong(); + + + var replicaTimestampsSize = clientMessage.readInt32(); + var replicaTimestamps: Array<[string, any]> = []; + for (var replicaTimestampsIndex = 0; replicaTimestampsIndex < replicaTimestampsSize; replicaTimestampsIndex++) { + var replicaTimestampsItem: [string, any]; + var replicaTimestampsItemKey: string; + var replicaTimestampsItemVal: any; + replicaTimestampsItemKey = clientMessage.readString(); + replicaTimestampsItemVal = clientMessage.readLong(); + replicaTimestampsItem = [replicaTimestampsItemKey, replicaTimestampsItemVal]; + replicaTimestamps.push(replicaTimestampsItem) + } + parameters['replicaTimestamps'] = replicaTimestamps; + + parameters['replicaCount'] = clientMessage.readInt32(); + + return parameters; + } + +} diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts new file mode 100644 index 000000000..308459194 --- /dev/null +++ b/src/codec/PNCounterGetCodec.ts @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* tslint:disable */ +import ClientMessage = require('../ClientMessage'); +import {BitsUtil} from '../BitsUtil'; +import Address = require('../Address'); +import {AddressCodec} from './AddressCodec'; +import {UUIDCodec} from './UUIDCodec'; +import {MemberCodec} from './MemberCodec'; +import {Data} from '../serialization/Data'; +import {EntryViewCodec} from './EntryViewCodec'; +import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); +import {Member} from '../core/Member'; +import {UUID} from '../core/UUID'; +import {PNCounterMessageType} from './PNCounterMessageType'; + +var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_GET; +var RESPONSE_TYPE = 127; +var RETRYABLE = true; + + +export class PNCounterGetCodec { + static calculateSize(name: string, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { + var dataSize: number = 0; + dataSize += BitsUtil.calculateSizeString(name); + dataSize += BitsUtil.INT_SIZE_IN_BYTES; + + replicaTimestamps.forEach((replicaTimestampsItem: [string, any]) => { + var key: string = replicaTimestampsItem[0]; + var val: any = replicaTimestampsItem[1]; + dataSize += BitsUtil.calculateSizeString(key); + dataSize += BitsUtil.LONG_SIZE_IN_BYTES; + }); + dataSize += BitsUtil.calculateSizeAddress(targetReplica); + return dataSize; + } + + static encodeRequest(name: string, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { + var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, replicaTimestamps, targetReplica)); + clientMessage.setMessageType(REQUEST_TYPE); + clientMessage.setRetryable(RETRYABLE); + clientMessage.appendString(name); + clientMessage.appendInt32(replicaTimestamps.length); + + replicaTimestamps.forEach((replicaTimestampsItem: any) => { + var key: string = replicaTimestampsItem[0]; + var val: any = replicaTimestampsItem[1]; + clientMessage.appendString(key); + clientMessage.appendLong(val); + }); + + AddressCodec.encode(clientMessage, targetReplica); + clientMessage.updateFrameLength(); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { + var parameters: any = { + 'value': null, + 'replicaTimestamps': null, + 'replicaCount': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } + parameters['value'] = clientMessage.readLong(); + + + var replicaTimestampsSize = clientMessage.readInt32(); + var replicaTimestamps: Array<[string, any]> = []; + for (var replicaTimestampsIndex = 0; replicaTimestampsIndex < replicaTimestampsSize; replicaTimestampsIndex++) { + var replicaTimestampsItem: [string, any]; + var replicaTimestampsItemKey: string; + var replicaTimestampsItemVal: any; + replicaTimestampsItemKey = clientMessage.readString(); + replicaTimestampsItemVal = clientMessage.readLong(); + replicaTimestampsItem = [replicaTimestampsItemKey, replicaTimestampsItemVal]; + replicaTimestamps.push(replicaTimestampsItem) + } + parameters['replicaTimestamps'] = replicaTimestamps; + + parameters['replicaCount'] = clientMessage.readInt32(); + + return parameters; + } + +} diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts new file mode 100644 index 000000000..9ffcd3d34 --- /dev/null +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* tslint:disable */ +import ClientMessage = require('../ClientMessage'); +import {BitsUtil} from '../BitsUtil'; +import Address = require('../Address'); +import {AddressCodec} from './AddressCodec'; +import {UUIDCodec} from './UUIDCodec'; +import {MemberCodec} from './MemberCodec'; +import {Data} from '../serialization/Data'; +import {EntryViewCodec} from './EntryViewCodec'; +import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); +import {Member} from '../core/Member'; +import {UUID} from '../core/UUID'; +import {PNCounterMessageType} from './PNCounterMessageType'; + +var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_GETCONFIGUREDREPLICACOUNT; +var RESPONSE_TYPE = 102; +var RETRYABLE = true; + + +export class PNCounterGetConfiguredReplicaCountCodec { + static calculateSize(name: string) { + var dataSize: number = 0; + dataSize += BitsUtil.calculateSizeString(name); + return dataSize; + } + + static encodeRequest(name: string) { + var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); + clientMessage.setMessageType(REQUEST_TYPE); + clientMessage.setRetryable(RETRYABLE); + clientMessage.appendString(name); + clientMessage.updateFrameLength(); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { + var parameters: any = { + 'response': null + }; + + if (clientMessage.isComplete()) { + return parameters; + } + parameters['response'] = clientMessage.readInt32(); + + return parameters; + } + +} diff --git a/src/codec/PNCounterMessageType.ts b/src/codec/PNCounterMessageType.ts new file mode 100644 index 000000000..d6416aa58 --- /dev/null +++ b/src/codec/PNCounterMessageType.ts @@ -0,0 +1,6 @@ +/* tslint:disable */ +export class PNCounterMessageType { + static PNCOUNTER_GET = 0x2001; + static PNCOUNTER_ADD = 0x2002; + static PNCOUNTER_GETCONFIGUREDREPLICACOUNT = 0x2003; +} diff --git a/src/core/VectorClock.ts b/src/core/VectorClock.ts new file mode 100644 index 000000000..6f85f410c --- /dev/null +++ b/src/core/VectorClock.ts @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {IdentifiedDataSerializable} from '../serialization/Serializable'; +import {DataInput, DataOutput} from '../serialization/Data'; +import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; + +export class VectorClock implements IdentifiedDataSerializable { + + private replicaTimestamps = new Map(); + + isAfter(other: VectorClock): boolean { + let atLeastOneBigger = false; + other.replicaTimestamps.forEach((otherTimestamp: Long, replicaId: string) => { + let thisTimetamp = this.replicaTimestamps.get(replicaId); + if (thisTimetamp == null || otherTimestamp.greaterThan(thisTimetamp)) { + return false; + } else if (otherTimestamp.lessThan(thisTimetamp)) { + atLeastOneBigger = true; + } + }); + return atLeastOneBigger || this.replicaTimestamps.size > other.replicaTimestamps.size; + } + + setReplicaTimestamp(replicaId: string, timestamp: Long): void { + this.replicaTimestamps.set(replicaId, timestamp); + } + + entrySet(): Array<[string, Long]> { + let entrySet: Array<[string, Long]> = []; + this.replicaTimestamps.forEach((timestamp: Long, replicaId: string) => { + entrySet.push([replicaId, timestamp]); + }); + return entrySet; + } + + readData(input: DataInput): any { + let stateSize = input.readInt(); + for (let i = 0; i < stateSize; i++) { + let replicaId = input.readUTF(); + let timestamp = input.readLong(); + this.replicaTimestamps.set(replicaId, timestamp); + } + } + + writeData(output: DataOutput): void { + output.writeInt(this.replicaTimestamps.size); + this.replicaTimestamps.forEach((timestamp: Long, replicaId: string) => { + output.writeUTF(replicaId); + output.writeLong(timestamp); + }); + } + + getFactoryId(): number { + return ClusterDataFactoryHelper.FACTORY_ID; + } + + getClassId(): number { + return ClusterDataFactoryHelper.VECTOR_CLOCK; + } +} diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index f2764e1dc..f6ea8fd59 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -102,7 +102,7 @@ export class ClusterService extends EventEmitter { * Returns the list of members in the cluster. * @returns */ - getMembers(selector?: MemberSelector) { + getMembers(selector?: MemberSelector): Member[] { if (selector === undefined) { return this.members; } else { diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index fa3d1e50a..7e8d538d3 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -19,6 +19,7 @@ import ClientMessage = require('../ClientMessage'); import * as Promise from 'bluebird'; import HazelcastClient from '../HazelcastClient'; import {BuildMetadata} from '../BuildMetadata'; +import Address = require('../Address'); /** * Common super class for any proxy. @@ -75,6 +76,12 @@ export class BaseProxy { return this.createPromise(codec, invocationResponse); } + protected encodeInvokeOnAddress(codec: any, address: Address, ...codecArguments: any[]): Promise { + let clientMessage = codec.encodeRequest(this.name, ...codecArguments); + let invocation: Promise = this.client.getInvocationService().invokeOnTarget(clientMessage, address); + return this.createPromise(codec, invocation); + } + /** * Encodes a request from a codec and invokes it on owner node of given partition. * @param codec diff --git a/src/proxy/PNCounter.ts b/src/proxy/PNCounter.ts new file mode 100644 index 000000000..01cc2a36e --- /dev/null +++ b/src/proxy/PNCounter.ts @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {DistributedObject} from '../DistributedObject'; +import * as Long from 'long'; +import * as Promise from 'bluebird'; + +/** + * PN (Positive-Negative) CRDT counter. + *

+ * The counter supports adding and subtracting values as well as + * retrieving the current counter value. + * The counter guarantees that whenever two nodes have received the + * same set of updates, possibly in a different order, their state is + * identical, and any conflicting updates are merged automatically. + * If no new updates are made to the shared state, all nodes that can + * communicate will eventually have the same data. + *

+ * The invocation is remote. This may lead to indeterminate state - + * the update may be applied but the response has not been received. + * In this case, the caller will be notified with a `TargetDisconnectedError` + *

+ * The read and write methods provide monotonic read and RYW (read-your-write) + * guarantees. These guarantees are session guarantees which means that if + * no replica with the previously observed state is reachable, the session + * guarantees are lost and the method invocation will throw a + * `ConsistencyLostError`. This does not mean + * that an update is lost. All of the updates are part of some replica and + * will be eventually reflected in the state of all other replicas. This + * error just means that you cannot observe your own writes because + * all replicas that contain your updates are currently unreachable. + * After you have received a `ConsistencyLostError`, you can either + * wait for a sufficiently up-to-date replica to become reachable in which + * case the session can be continued or you can reset the session by calling + * the `reset()` method. If you have called the `reset()` method, + * a new session is started with the next invocation to a CRDT replica. + *

+ * NOTE: + * The CRDT state is kept entirely on non-lite (data) members. If there + * aren't any and the methods here are invoked, they will + * fail with a `NoDataMemberInClusterError`. + * + * @requires Hazelcast 3.10 + */ +export interface PNCounter extends DistributedObject { + /** + * Returns the current value of the counter. + * + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + * @returns the current value of the counter + */ + get(): Promise; + + /** + * Adds the given value to the current value. + * + * @param delta the value to add + * @return the previous value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + */ + getAndAdd(delta: Long | number): Promise; + + /** + * Adds the given value to the current value. + * + * @param delta the value to add + * @return the updated value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + */ + addAndGet(delta: Long | number): Promise; + + /** + * Subtracts the given value from the current value. + * + * @param delta the value to add + * @return the previous value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + */ + getAndSubtract(delta: Long | number): Promise; + + /** + * Subtracts the given value from the current value. + * + * @param delta the value to subtract + * @return the updated value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + */ + subtractAndGet(delta: Long | number): Promise; + + /** + * Decrements by one the current value. + * + * @return the updated value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + */ + decrementAndGet(): Promise; + + /** + * Increments by one the current value. + * + * @return the updated value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + */ + incrementAndGet(): Promise; + + /** + * Decrements by one the current value. + * + * @return the previous value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * been lost + */ + getAndDecrement(): Promise; + + /** + * Increments by one the current value. + * + * @return the previous value + * @throws `NoDataMemberInClusterError` if the cluster does not contain + * any data members + * @throws `UnsupportedOperationError` if the cluster version is less + * than 3.10 + * @throws `ConsistencyLostError` if the session guarantees have + * beenlost + */ + getAndIncrement(): Promise; + + /** + * Resets the observed state by this PN counter. This method may be used + * after a method invocation has thrown a `ConsistencyLostError` + * to reset the proxy and to be able to start a new session. + */ + reset(): Promise; +} diff --git a/src/proxy/PNCounterProxy.ts b/src/proxy/PNCounterProxy.ts new file mode 100644 index 000000000..f1b8d2c5b --- /dev/null +++ b/src/proxy/PNCounterProxy.ts @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BaseProxy} from './BaseProxy'; +import {PNCounter} from './PNCounter'; +import * as Promise from 'bluebird'; +import {VectorClock} from '../core/VectorClock'; +import Address = require('../Address'); +import {PNCounterGetConfiguredReplicaCountCodec} from '../codec/PNCounterGetConfiguredReplicaCountCodec'; +import {MemberSelectors} from '../core/MemberSelectors'; +import {randomInt} from '../Util'; +import {PNCounterAddCodec} from '../codec/PNCounterAddCodec'; +import {NoDataMemberInClusterError} from '../HazelcastError'; +import {PNCounterGetCodec} from '../codec/PNCounterGetCodec'; +import * as Long from 'long'; + +export class PNCounterProxy extends BaseProxy implements PNCounter { + private lastObservedVectorClock: VectorClock = new VectorClock(); + private maximumReplicaCount: number = 0; + private currentTargetReplicaAddress: Address; + private static readonly EMPTY_ARRAY: Address[] = []; + + get(): Promise { + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterGetCodec); + } + + getAndAdd(delta: Long | number): Promise { + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, delta, true); + } + + addAndGet(delta: Long | number): Promise { + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, delta, false); + } + + getAndSubtract(delta: Long | number): Promise { + if (!Long.isLong(delta)) { + delta = Long.fromNumber(delta); + } + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, (delta).neg(), true); + } + + subtractAndGet(delta: Long | number): Promise { + if (!Long.isLong(delta)) { + delta = Long.fromNumber(delta); + } + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, (delta).neg(), false); + } + + decrementAndGet(): Promise { + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, Long.fromNumber(-1), false); + } + + incrementAndGet(): Promise { + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, Long.fromNumber(1), false); + } + + getAndDecrement(): Promise { + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, Long.fromNumber(-1), true); + } + + getAndIncrement(): Promise { + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, Long.fromNumber(1), true); + } + + reset(): Promise { + this.lastObservedVectorClock = new VectorClock(); + return Promise.resolve(); + } + + private invokeInternal(excludedAddresses: Address[], lastError: any, codec: any, ...codecArgs: any[]): Promise { + return this.getCRDTOperationTarget(excludedAddresses).then((target: Address) => { + if (target == null) { + if (lastError) { + throw lastError; + } else { + throw new NoDataMemberInClusterError('Cannot invoke operations on a CRDT ' + + 'because the cluster does not contain any data members'); + } + } + return this.encodeInvokeInternal(target, codec, ...codecArgs).then((result) => { + this.updateObservedReplicaTimestamps(result.replicaTimestamps); + return result.value; + }).catch((err) => { + if (excludedAddresses === PNCounterProxy.EMPTY_ARRAY) { + excludedAddresses = []; + } + excludedAddresses.push(target); + return this.invokeInternal(excludedAddresses, err, codec, ...codecArgs); + }); + }); + } + + private encodeInvokeInternal(target: Address, codec: any, ...codecArguments: any[]): Promise { + return this.encodeInvokeOnAddress(codec, target, ...codecArguments, this.lastObservedVectorClock.entrySet(), target); + } + + private getCRDTOperationTarget(excludedAddresses: Address[]): Promise

{ + if (this.currentTargetReplicaAddress != null && + !excludedAddresses.some(this.currentTargetReplicaAddress.equals.bind(this.currentTargetReplicaAddress))) { + return Promise.resolve(this.currentTargetReplicaAddress); + } else { + return this.chooseTargetReplica(excludedAddresses).then((target: Address) => { + this.currentTargetReplicaAddress = target; + return target; + }); + } + } + + private chooseTargetReplica(excludedAddresses: Address[]): Promise
{ + return this.getReplicaAddresses(excludedAddresses).then((replicaAddresses: Address[]) => { + if (replicaAddresses.length === 0) { + return null; + } + return replicaAddresses[randomInt(replicaAddresses.length)]; + }); + } + + private getReplicaAddresses(excludedAddresses: Address[]): Promise { + let dataMembers = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); + return this.getMaxConfiguredReplicaCount().then((replicaCount: number) => { + let currentCount = Math.min(replicaCount, dataMembers.length); + let replicaAddresses: Address[] = []; + for (let i = 0; i < currentCount; i++) { + let memberAddress = dataMembers[i].address; + if (!excludedAddresses.some(memberAddress.equals.bind(memberAddress))) { + replicaAddresses.push(memberAddress); + } + } + return replicaAddresses; + }); + } + + private getMaxConfiguredReplicaCount(): Promise { + if (this.maximumReplicaCount > 0) { + return Promise.resolve(this.maximumReplicaCount); + } else { + return this.encodeInvokeOnRandomTarget(PNCounterGetConfiguredReplicaCountCodec).then((count: number) => { + this.maximumReplicaCount = count; + return this.maximumReplicaCount; + }); + } + } + + private updateObservedReplicaTimestamps(observedTimestamps: Array<[string, Long]>): void { + let observedClock = this.toVectorClock(observedTimestamps); + if (observedClock.isAfter(this.lastObservedVectorClock)) { + this.lastObservedVectorClock = observedClock; + } + } + + private toVectorClock(timestamps: Array<[string, Long]>): VectorClock { + let vectorClock = new VectorClock(); + timestamps.forEach((entry: [string, Long]) => { + vectorClock.setReplicaTimestamp(entry[0], entry[1]); + }); + return vectorClock; + } + +} diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 9bb0ee9e1..50c51dcfd 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -40,6 +40,7 @@ import {Member} from '../core/Member'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; import {FlakeIdGeneratorProxy} from './FlakeIdGeneratorProxy'; +import {PNCounterProxy} from './PNCounterProxy'; export class ProxyManager { public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; @@ -53,6 +54,7 @@ export class ProxyManager { public static readonly SEMAPHORE_SERVICE: string = 'hz:impl:semaphoreService'; public static readonly ATOMICLONG_SERVICE: string = 'hz:impl:atomicLongService'; public static readonly FLAKEID_SERVICE: string = 'hz:impl:flakeIdGeneratorService'; + public static readonly PNCOUNTER_SERVICE: string = 'hz:impl:PNCounterService'; public readonly service: {[serviceName: string]: any} = {}; private readonly proxies: { [proxyName: string]: DistributedObject; } = {}; @@ -79,6 +81,7 @@ export class ProxyManager { this.service[ProxyManager.SEMAPHORE_SERVICE] = SemaphoreProxy; this.service[ProxyManager.ATOMICLONG_SERVICE] = AtomicLongProxy; this.service[ProxyManager.FLAKEID_SERVICE] = FlakeIdGeneratorProxy; + this.service[ProxyManager.PNCOUNTER_SERVICE] = PNCounterProxy; } public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): DistributedObject { diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 528f37524..45987f15f 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -95,7 +95,7 @@ describe('Listeners on reconnect', function () { closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.terminateMember); }); - it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it.skip('kill two members [0,1], listener still receives map.put event [smart=' + isSmart +']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [0, 1], Controller.terminateMember); }); diff --git a/test/pncounter/PNCounterBasicTest.js b/test/pncounter/PNCounterBasicTest.js new file mode 100644 index 000000000..ee5e9ad1f --- /dev/null +++ b/test/pncounter/PNCounterBasicTest.js @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var RC = require('../RC'); +var Client = require('../../').Client; + +describe('PNCounterBasicTest', function () { + + var cluster; + var client; + var pncounter; + + before(function () { + return RC.createCluster(null, null).then(function (cl) { + cluster = cl; + return RC.startMember(cluster.id); + }).then(function (member) { + return Client.newHazelcastClient(); + }).then(function (cl) { + client = cl; + }); + }); + + after(function () { + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + beforeEach(function () { + pncounter = client.getPNCounter('pncounter') + }); + + afterEach(function () { + return pncounter.destroy(); + }); + + function testPNCounterMethod(promise, returnVal, postOperation) { + return promise.then(function (value) { + expect(value.toNumber()).to.equal(returnVal); + return pncounter.get(); + }).then(function (value) { + return expect(value.toNumber()).to.equal(postOperation); + }); + } + + it('get', function () { + return pncounter.getAndAdd(4).then(function (value) { + return pncounter.get(); + }).then(function (value) { + return expect(value.toNumber()).to.equal(4); + }); + }); + + it('getAndAdd', function () { + return testPNCounterMethod(pncounter.getAndAdd(3), 0, 3); + }); + + it('addAndGet', function () { + return testPNCounterMethod(pncounter.addAndGet(3), 3, 3); + }); + + it('getAndSubtract', function () { + return testPNCounterMethod(pncounter.getAndSubtract(3), 0, -3); + }); + + it('subtractAndGet', function () { + return testPNCounterMethod(pncounter.subtractAndGet(3), -3, -3); + }); + + it('decrementAndGet', function () { + return testPNCounterMethod(pncounter.decrementAndGet(3), -1, -1); + }); + + it('incrementAndGet', function () { + return testPNCounterMethod(pncounter.incrementAndGet(), 1, 1); + }); + + it('getAndDecrement', function () { + return testPNCounterMethod(pncounter.getAndDecrement(), 0, -1); + }); + + it('getAndIncrement', function () { + return testPNCounterMethod(pncounter.getAndIncrement(), 0, 1); + }); +}); diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js new file mode 100644 index 000000000..1dc3445f2 --- /dev/null +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var chai = require('chai'); +chai.use(require('chai-as-promised')); +var expect = require('chai').expect; +var RC = require('../RC'); +var Client = require('../../').Client; +var Errors = require('../..').HazelcastErrors; +var fs = require('fs'); +var path = require('path'); + +describe('PNCounterConsistencyTest', function () { + + var cluster; + var member1; + var client; + + beforeEach(function () { + this.timeout(10000); + return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')).then(function (cl) { + cluster = cl; + return RC.startMember(cluster.id); + }).then(function (value) { + member1 = value; + return RC.startMember(cluster.id); + }).then(function (value) { + return Client.newHazelcastClient(); + }).then(function (value) { + client = value; + }); + }); + + afterEach(function () { + this.timeout(10000); + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () { + var pncounter = client.getPNCounter('pncounter'); + return pncounter.getAndAdd(3).then(function () { + return RC.terminateMember(cluster.id, member1.uuid); + }).then(function () { + return expect(pncounter.addAndGet(10)).to.be.rejectedWith(Errors.ConsistencyLostError); + }); + }); + + it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () { + var pncounter = client.getPNCounter('pncounter'); + return pncounter.getAndAdd(3).then(function () { + return RC.terminateMember(cluster.id, member1.uuid); + }).then(function () { + return pncounter.reset(); + }).then(function () { + return pncounter.addAndGet(10); + }); + }) +}); diff --git a/test/pncounter/PNCounterWithLiteMembersTest.js b/test/pncounter/PNCounterWithLiteMembersTest.js new file mode 100644 index 000000000..d455f4936 --- /dev/null +++ b/test/pncounter/PNCounterWithLiteMembersTest.js @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var chai = require('chai'); +chai.use(require('chai-as-promised')); +var expect = chai.expect; +var Controller = require('../RC'); +var Client = require('../..').Client; +var Errors = require('../..').HazelcastErrors; +var fs = require('fs'); +var path = require('path'); + +describe('PNCounterWithLiteMembersTest', function () { + + var cluster; + var client; + var pncounter; + + before(function () { + return Controller.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_litemember.xml'), 'utf8')).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }).then(function () { + return Client.newHazelcastClient(); + }).then(function (cl) { + client = cl; + }); + }); + + after(function () { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + beforeEach(function () { + pncounter = client.getPNCounter('pncounter'); + }); + + afterEach(function () { + return pncounter.destroy(); + }); + + it('get throws NoDataMemberInClusterError', function () { + return expect(pncounter.get()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('getAndAdd throws NoDataMemberInClusterError', function () { + return expect(pncounter.getAndAdd(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('addAndGet throws NoDataMemberInClusterError', function () { + return expect(pncounter.addAndGet(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('getAndSubtract throws NoDataMemberInClusterError', function () { + return expect(pncounter.getAndSubtract(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('subtractAndGet throws NoDataMemberInClusterError', function () { + return expect(pncounter.subtractAndGet(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('getAndDecrement throws NoDataMemberInClusterError', function () { + return expect(pncounter.getAndDecrement()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('decrementAndGet throws NoDataMemberInClusterError', function () { + return expect(pncounter.decrementAndGet()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('incrementAndGet throws NoDataMemberInClusterError', function () { + return expect(pncounter.incrementAndGet()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); + + it('getAndIncrement throws NoDataMemberInClusterError', function () { + return expect(pncounter.getAndIncrement()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + }); +}); diff --git a/test/pncounter/hazelcast_crdtreplication_delayed.xml b/test/pncounter/hazelcast_crdtreplication_delayed.xml new file mode 100644 index 000000000..937698dbd --- /dev/null +++ b/test/pncounter/hazelcast_crdtreplication_delayed.xml @@ -0,0 +1,24 @@ + + + + + 1000000 + 100000 + + diff --git a/test/pncounter/hazelcast_litemember.xml b/test/pncounter/hazelcast_litemember.xml new file mode 100644 index 000000000..6c7a0c8b1 --- /dev/null +++ b/test/pncounter/hazelcast_litemember.xml @@ -0,0 +1,21 @@ + + + + + From 1c9eda1409b90dccbbf0d82436dd42357b2d35d1 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 5 Mar 2018 15:36:42 -0500 Subject: [PATCH 092/685] adds ConsistencyLostError for PNCounter --- src/protocol/ErrorFactory.ts | 4 +++- test/Util.js | 6 ++++++ test/pncounter/PNCounterConsistencyTest.js | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index fdb1cfce4..f79d84c2b 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -16,7 +16,8 @@ import { AuthenticationError, CallerNotMemberError, CancellationError, ClassCastError, ClassNotFoundError, ConcurrentModificationError, - ConfigMismatchError, ConfigurationError, DistributedObjectDestroyedError, DuplicateInstanceNameError, HazelcastError, + ConfigMismatchError, ConfigurationError, ConsistencyLostError, DistributedObjectDestroyedError, DuplicateInstanceNameError, + HazelcastError, HazelcastInstanceNotActiveError, IllegalStateError, InvocationTimeoutError, IOError, MemberLeftError, NoDataMemberInClusterError, NodeIdOutOfRangeError, PartitionMigratingError, QueryError, QuorumError, RetryableHazelcastError, RetryableIOError, @@ -86,6 +87,7 @@ export class ClientErrorFactory { this.register(ClientProtocolErrorCodes.STALE_TASK_ID, (m, c) => new StaleTaskIdError(m, c)); this.register(ClientProtocolErrorCodes.FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION, (m, c) => new NodeIdOutOfRangeError(m, c)); + this.register(ClientProtocolErrorCodes.CONSISTENCY_LOST_EXCEPTION, (m, c) => new ConsistencyLostError(m, c)); } private register(code: number, errorFactory: ErrorFactory): void { diff --git a/test/Util.js b/test/Util.js index 79b770114..5873267c5 100644 --- a/test/Util.js +++ b/test/Util.js @@ -96,5 +96,11 @@ exports.getRandomInt = function(lowerLim, upperLim) { return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; }; +exports.findMemberByAddress = function (client, address) { + return client.getClusterService().getMembers().find(function (m) { + return m.address.equals(address); + }); +}; + exports.promiseLater = promiseLater; exports.expectAlmostEqual = expectAlmostEqual; diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index 1dc3445f2..f09ff9c32 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -22,6 +22,7 @@ var Client = require('../../').Client; var Errors = require('../..').HazelcastErrors; var fs = require('fs'); var path = require('path'); +var Util = require('../Util'); describe('PNCounterConsistencyTest', function () { @@ -53,7 +54,10 @@ describe('PNCounterConsistencyTest', function () { it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () { var pncounter = client.getPNCounter('pncounter'); return pncounter.getAndAdd(3).then(function () { - return RC.terminateMember(cluster.id, member1.uuid); + var currentReplicaAddress = pncounter.currentTargetReplicaAddress; + var currentReplicaMember = Util.findMemberByAddress(client, currentReplicaAddress); + console.log(currentReplicaMember); + return RC.terminateMember(cluster.id, currentReplicaMember.uuid); }).then(function () { return expect(pncounter.addAndGet(10)).to.be.rejectedWith(Errors.ConsistencyLostError); }); From 9bddba7651ee9499c09c5b56de06ab41a3c2abc8 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 5 Mar 2018 15:45:12 -0500 Subject: [PATCH 093/685] PNCounter code sample --- code_samples/pncounter.js | 30 ++++++++++++++++++++++ test/ListenersOnReconnectTest.js | 2 +- test/pncounter/PNCounterConsistencyTest.js | 5 ++-- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 code_samples/pncounter.js diff --git a/code_samples/pncounter.js b/code_samples/pncounter.js new file mode 100644 index 000000000..07922a35c --- /dev/null +++ b/code_samples/pncounter.js @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Client = require('hazelcast-client').Client; + +Client.newHazelcastClient().then(function (hazelcastClient) { + var client = hazelcastClient; + var pnCounter = hazelcastClient.getPNCounter('counter'); + + pnCounter.addAndGet(5).then(function (val) { + console.log('Added 5 to `counter`. Current value is ' + val); + return pnCounter.decrementAndGet(); + }).then(function (val) { + console.log('Decremented `counter`. Current value is ' + val); + return client.shutdown(); + }); +}); diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 45987f15f..528f37524 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -95,7 +95,7 @@ describe('Listeners on reconnect', function () { closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.terminateMember); }); - it.skip('kill two members [0,1], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart +']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [0, 1], Controller.terminateMember); }); diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index f09ff9c32..b9d0edd71 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -56,7 +56,6 @@ describe('PNCounterConsistencyTest', function () { return pncounter.getAndAdd(3).then(function () { var currentReplicaAddress = pncounter.currentTargetReplicaAddress; var currentReplicaMember = Util.findMemberByAddress(client, currentReplicaAddress); - console.log(currentReplicaMember); return RC.terminateMember(cluster.id, currentReplicaMember.uuid); }).then(function () { return expect(pncounter.addAndGet(10)).to.be.rejectedWith(Errors.ConsistencyLostError); @@ -66,7 +65,9 @@ describe('PNCounterConsistencyTest', function () { it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () { var pncounter = client.getPNCounter('pncounter'); return pncounter.getAndAdd(3).then(function () { - return RC.terminateMember(cluster.id, member1.uuid); + var currentReplicaAddress = pncounter.currentTargetReplicaAddress; + var currentReplicaMember = Util.findMemberByAddress(client, currentReplicaAddress); + return RC.terminateMember(cluster.id, currentReplicaMember.uuid); }).then(function () { return pncounter.reset(); }).then(function () { From 9d87b43e3b493fb13255b277213a20842e0ddb6a Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 13 Mar 2018 15:09:23 -0400 Subject: [PATCH 094/685] adds config pattern matching fixes reliable topic proxy being independent from proxy manager --- src/HazelcastClient.ts | 2 +- src/config/Config.ts | 55 +++++++++++++++++- src/config/ConfigPatternMatcher.ts | 66 +++++++++++++++++++++ src/config/FlakeIdGeneratorConfig.ts | 6 ++ src/config/NearCacheConfig.ts | 6 ++ src/config/ReliableTopicConfig.ts | 13 +++++ src/proxy/FlakeIdGeneratorProxy.ts | 5 +- src/proxy/NearCachedMapProxy.ts | 3 +- src/proxy/ProxyManager.ts | 5 +- src/proxy/topic/ITopic.ts | 3 +- src/proxy/topic/ReliableTopicProxy.ts | 14 ++--- test/config/ConfigPatternMatcherTest.js | 77 +++++++++++++++++++++++++ test/ssl/ClientSSLAuthenticationTest.js | 1 - 13 files changed, 235 insertions(+), 21 deletions(-) create mode 100644 src/config/ConfigPatternMatcher.ts create mode 100644 test/config/ConfigPatternMatcherTest.js diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 2d0996327..45f30ba5b 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -215,7 +215,7 @@ export default class HazelcastClient { * @returns {ITopic} */ getReliableTopic(name: string): ITopic { - return new ReliableTopicProxy(name, this); + return >this.proxyManager.getOrCreateProxy(name, ProxyManager.RELIABLETOPIC_SERVICE); } getReplicatedMap(name: string): IReplicatedMap { diff --git a/src/config/Config.ts b/src/config/Config.ts index 931c802ca..d87eb10a3 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -26,11 +26,14 @@ import {ListenerConfig} from './ListenerConfig'; import {Properties} from './Properties'; import {ImportConfig} from './ImportConfig'; import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; +import {ConfigPatternMatcher} from './ConfigPatternMatcher'; /** * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. */ export class ClientConfig { + + private configPatternMatcher = new ConfigPatternMatcher(); /** * Name of this client instance. */ @@ -50,11 +53,57 @@ export class ClientConfig { listeners: ListenerConfig = new ListenerConfig(); listenerConfigs: ImportConfig[] = []; serializationConfig: SerializationConfig = new SerializationConfig(); - reliableTopicConfigs: any = { - 'default': new ReliableTopicConfig() - }; + reliableTopicConfigs: {[name: string]: ReliableTopicConfig} = {}; nearCacheConfigs: {[name: string]: NearCacheConfig} = {}; flakeIdGeneratorConfigs: {[name: string]: FlakeIdGeneratorConfig} = {}; + + getReliableTopicConfig(name: string): ReliableTopicConfig { + let matching = this.lookupByPattern(this.reliableTopicConfigs, name); + let config: ReliableTopicConfig; + if (matching != null) { + config = matching.clone(); + } else { + config = new ReliableTopicConfig(); + } + config.name = name; + return config; + } + + getNearCacheConfig(name: string): NearCacheConfig { + let matching = this.lookupByPattern(this.nearCacheConfigs, name); + if (matching == null) { + return null; + } + let config = matching.clone(); + config.name = name; + return config; + } + + getFlakeIdGeneratorConfig(name: string): FlakeIdGeneratorConfig { + let matching: FlakeIdGeneratorConfig = this.lookupByPattern(this.flakeIdGeneratorConfigs, name); + let config: FlakeIdGeneratorConfig; + if (matching != null) { + config = matching.clone(); + } else { + config = new FlakeIdGeneratorConfig(); + } + config.name = name; + return config; + } + + private lookupByPattern(config: {[pattern: string]: any}, name: string): T { + if (config[name] != null) { + return config[name]; + } + let matchingPattern = this.configPatternMatcher.matches(Object.keys(config), name); + if (matchingPattern != null) { + return config[matchingPattern]; + } + if (config['default'] != null) { + return config['default']; + } + return null; + } } export {ClientNetworkConfig}; diff --git a/src/config/ConfigPatternMatcher.ts b/src/config/ConfigPatternMatcher.ts new file mode 100644 index 000000000..c7bf844a6 --- /dev/null +++ b/src/config/ConfigPatternMatcher.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ConfigurationError} from '../HazelcastError'; + +export class ConfigPatternMatcher { + + /** + * + * @param configPatterns + * @param itemName + * @throws + * @returns `null` if there is no matching pattern + * the best matching pattern otherwis + */ + matches(configPatterns: string[], itemName: string): string { + let bestMatchingPoint = -1; + let matchingPattern: string = null; + let duplicatePattern: string = null; + configPatterns.forEach((pattern: string) => { + let currentPoint = this.getMatchingPoint(pattern, itemName); + if (currentPoint > bestMatchingPoint) { + bestMatchingPoint = currentPoint; + matchingPattern = pattern; + duplicatePattern = null; + } else if (currentPoint === bestMatchingPoint && matchingPattern != null) { + duplicatePattern = matchingPattern; + matchingPattern = pattern; + } + }); + if (duplicatePattern != null) { + throw new ConfigurationError('Found ambiguous configurations for item ' + itemName + ': "' + matchingPattern + + '" vs "' + duplicatePattern + '". Please specify your configuration.'); + } + return matchingPattern; + } + + getMatchingPoint(pattern: string, itemName: string): number { + let index = pattern.indexOf('*'); + if (index === -1) { + return -1; + } + let firstPart = pattern.substring(0, index); + if (!itemName.startsWith(firstPart)) { + return -1; + } + let secondPart = pattern.substring(index + 1); + if (!itemName.endsWith(secondPart)) { + return -1; + } + return firstPart.length + secondPart.length; + } +} diff --git a/src/config/FlakeIdGeneratorConfig.ts b/src/config/FlakeIdGeneratorConfig.ts index 6db0e066a..dba520a67 100644 --- a/src/config/FlakeIdGeneratorConfig.ts +++ b/src/config/FlakeIdGeneratorConfig.ts @@ -48,4 +48,10 @@ export class FlakeIdGeneratorConfig { 'prefetchCount: ' + this.prefetchCount + ', ' + 'prefetchValidityMillis: ' + this.prefetchValidityMillis + ']'; } + + clone(): FlakeIdGeneratorConfig { + let other = new FlakeIdGeneratorConfig(); + Object.assign(other, this); + return other; + } } diff --git a/src/config/NearCacheConfig.ts b/src/config/NearCacheConfig.ts index 50b09f6da..2bb12b0a3 100644 --- a/src/config/NearCacheConfig.ts +++ b/src/config/NearCacheConfig.ts @@ -48,4 +48,10 @@ export class NearCacheConfig { 'evictionMaxSize: ' + this.evictionMaxSize + ', ' + 'maxIdleSeconds: ' + this.maxIdleSeconds + ']'; } + + clone(): NearCacheConfig { + let other = new NearCacheConfig(); + Object.assign(other, this); + return other; + } } diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts index f0f4f1356..82c0db3da 100644 --- a/src/config/ReliableTopicConfig.ts +++ b/src/config/ReliableTopicConfig.ts @@ -20,4 +20,17 @@ export class ReliableTopicConfig { name: string = 'default'; readBatchSize: number = 25; overloadPolicy: TopicOverloadPolicy = TopicOverloadPolicy.BLOCK; + + toString(): string { + return 'ReliableTopicConfig[' + + 'name: ' + this.name + ', ' + + 'readBatchSize: ' + this.readBatchSize + ', ' + + 'overloadPolicy: ' + this.overloadPolicy + ']'; + } + + clone(): ReliableTopicConfig { + let other = new ReliableTopicConfig(); + Object.assign(other, this); + return other; + } } diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/FlakeIdGeneratorProxy.ts index 40a324bdb..fb3fb33b3 100644 --- a/src/proxy/FlakeIdGeneratorProxy.ts +++ b/src/proxy/FlakeIdGeneratorProxy.ts @@ -31,10 +31,7 @@ export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator constructor(client: HazelcastClient, serviceName: string, name: string) { super(client, serviceName, name); - this.config = client.getConfig().flakeIdGeneratorConfigs[name]; - if (this.config == null) { - this.config = new FlakeIdGeneratorConfig(); - } + this.config = client.getConfig().getFlakeIdGeneratorConfig(name); this.autoBatcher = new AutoBatcher(() => { return this.encodeInvokeOnRandomTarget(FlakeIdGeneratorNewIdBatchCodec, this.config.prefetchCount).then((re: any) => { return new Batch(this.config.prefetchValidityMillis, re.base, re.increment, re.batchSize); diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 1cb81e4ad..b5b1c91c5 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -39,7 +39,8 @@ export class NearCachedMapProxy extends MapProxy { constructor(client: HazelcastClient, servicename: string, name: string) { super(client, servicename, name); - this.nearCache = new NearCacheImpl(this.client.getConfig().nearCacheConfigs[name], this.client.getSerializationService()); + this.nearCache = new NearCacheImpl(this.client.getConfig().getNearCacheConfig(name), + this.client.getSerializationService()); if (this.nearCache.isInvalidatedOnChange()) { this.addNearCacheInvalidationListener().then((id: string) => { this.invalidationListenerId = id; diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 50c51dcfd..7d7a63f63 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -41,6 +41,7 @@ import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; import {FlakeIdGeneratorProxy} from './FlakeIdGeneratorProxy'; import {PNCounterProxy} from './PNCounterProxy'; +import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; export class ProxyManager { public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; @@ -55,6 +56,7 @@ export class ProxyManager { public static readonly ATOMICLONG_SERVICE: string = 'hz:impl:atomicLongService'; public static readonly FLAKEID_SERVICE: string = 'hz:impl:flakeIdGeneratorService'; public static readonly PNCOUNTER_SERVICE: string = 'hz:impl:PNCounterService'; + public static readonly RELIABLETOPIC_SERVICE: string = 'hz:impl:reliableTopicService'; public readonly service: {[serviceName: string]: any} = {}; private readonly proxies: { [proxyName: string]: DistributedObject; } = {}; @@ -82,6 +84,7 @@ export class ProxyManager { this.service[ProxyManager.ATOMICLONG_SERVICE] = AtomicLongProxy; this.service[ProxyManager.FLAKEID_SERVICE] = FlakeIdGeneratorProxy; this.service[ProxyManager.PNCOUNTER_SERVICE] = PNCounterProxy; + this.service[ProxyManager.RELIABLETOPIC_SERVICE] = ReliableTopicProxy; } public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): DistributedObject { @@ -89,7 +92,7 @@ export class ProxyManager { return this.proxies[name]; } else { let newProxy: DistributedObject; - if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().nearCacheConfigs[name]) { + if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().getNearCacheConfig(name)) { newProxy = new NearCachedMapProxy(this.client, serviceName, name); } else { newProxy = new this.service[serviceName](this.client, serviceName, name); diff --git a/src/proxy/topic/ITopic.ts b/src/proxy/topic/ITopic.ts index 070b3fa93..17d93bf32 100644 --- a/src/proxy/topic/ITopic.ts +++ b/src/proxy/topic/ITopic.ts @@ -16,8 +16,9 @@ import {TopicMessageListener} from './TopicMessageListener'; import * as Promise from 'bluebird'; +import {DistributedObject} from '../../DistributedObject'; -export interface ITopic { +export interface ITopic extends DistributedObject { addMessageListener(listener: TopicMessageListener): string; removeMessageListener(id: string): boolean; publish(message: E): Promise; diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index db715524f..5e187356a 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -29,25 +29,25 @@ import {OverflowPolicy} from '../../core/OverflowPolicy'; import {TopicOverloadPolicy} from './TopicOverloadPolicy'; import {TopicOverloadError} from '../../HazelcastError'; import Long = require('long'); +import {BaseProxy} from '../BaseProxy'; export const RINGBUFFER_PREFIX = '_hz_rb_'; export const TOPIC_INITIAL_BACKOFF = 100; export const TOPIC_MAX_BACKOFF = 2000; -export class ReliableTopicProxy implements ITopic { +export class ReliableTopicProxy extends BaseProxy implements ITopic { private ringbuffer: IRingbuffer; private localAddress: Address; private batchSize: number; private runners: {[key: string]: ReliableTopicListenerRunner} = {}; private serializationService: SerializationService; private overloadPolicy: TopicOverloadPolicy; - private name: string; - constructor(name: string, client: HazelcastClient) { + constructor(client: HazelcastClient, serviceName: string, name: string) { + super(client, serviceName, name); this.ringbuffer = client.getRingbuffer(RINGBUFFER_PREFIX + name); this.localAddress = client.getClusterService().getClientInfo().localAddress; - var configs = client.getConfig().reliableTopicConfigs; - var config: ReliableTopicConfig = configs[name] || configs['default']; + let config = client.getConfig().getReliableTopicConfig(name); this.batchSize = config.readBatchSize; this.overloadPolicy = config.overloadPolicy; this.serializationService = client.getSerializationService(); @@ -162,10 +162,6 @@ export class ReliableTopicProxy implements ITopic { return this.ringbuffer; } - public getName(): String { - return this.name; - } - destroy(): Promise { for (var k in this.runners) { var runner = this.runners[k]; diff --git a/test/config/ConfigPatternMatcherTest.js b/test/config/ConfigPatternMatcherTest.js new file mode 100644 index 000000000..8d368d9b0 --- /dev/null +++ b/test/config/ConfigPatternMatcherTest.js @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +var expect = require('chai').expect; +var Config = require('../..').Config; +var HzError = require('../..').HazelcastErrors; + +describe('ConfigPatternMatcherTest', function () { + + var cfg = new Config.ClientConfig(); + var f1 = new Config.FlakeIdGeneratorConfig(); + f1.prefetchValidityMillis = 111; + f1.prefetchCount = 44; + + var f2 = new Config.FlakeIdGeneratorConfig(); + f2.prefetchValidityMillis = 1176451; + f2.prefetchCount = 534; + + var f3 = new Config.FlakeIdGeneratorConfig(); + f2.prefetchValidityMillis = 114; + f2.prefetchCount = 14; + + var f4 = new Config.FlakeIdGeneratorConfig(); + f4.prefetchValidityMillis = 114; + f4.prefetchCount = 14; + + beforeEach(function () { + cfg.flakeIdGeneratorConfigs['pref*'] = f2; + cfg.flakeIdGeneratorConfigs['*postf'] = f3; + cfg.flakeIdGeneratorConfigs['pref*postf'] = f4; + }); + + function assertConfig(actual, expected, name) { + for (var prop in actual) { + if (typeof actual[prop] !== 'function') { + if (prop === 'name') { + expect(actual[prop]).to.be.equal(name); + } else { + expect(actual[prop]).to.be.equal(expected[prop]); + } + } + } + + } + + it('lookupByPattern', function () { + assertConfig(cfg.getFlakeIdGeneratorConfig('pref123postf'), f4, 'pref123postf'); + assertConfig(cfg.getFlakeIdGeneratorConfig('123postf'), f3, '123postf'); + assertConfig(cfg.getFlakeIdGeneratorConfig('pref123'), f2, 'pref123'); + assertConfig(cfg.getFlakeIdGeneratorConfig('unconfigured'), new Config.FlakeIdGeneratorConfig(), 'unconfigured'); + }); + + it('lookupByPattern with explicit default', function () { + cfg.flakeIdGeneratorConfigs['default'] = f1; + assertConfig(cfg.getFlakeIdGeneratorConfig('pref123postf'), f4, 'pref123postf'); + assertConfig(cfg.getFlakeIdGeneratorConfig('123postf'), f3, '123postf'); + assertConfig(cfg.getFlakeIdGeneratorConfig('pref123'), f2, 'pref123'); + assertConfig(cfg.getFlakeIdGeneratorConfig('unconfigured'), f1, 'unconfigured'); + }); + + it('duplicate pattern throws', function () { + cfg.flakeIdGeneratorConfigs['abcde*'] = f2; + expect(cfg.getFlakeIdGeneratorConfig.bind(cfg, 'abcde.somemore.postf')).to.throw(HzError.ConfigurationError); + }); +}); diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 8c86fa32a..f3f2940a8 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -88,7 +88,6 @@ describe('SSL Client Authentication Test', function () { describe(title, function () { afterEach(function () { - this.timeout(4000); return Controller.shutdownCluster(cluster.id); }); From 8eb71cb7517bf082bd79ab6fa83bbed21cfbf4f8 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 15 Mar 2018 15:20:18 -0400 Subject: [PATCH 095/685] adds test for inner/outer portables having different version numbers --- test/serialization/PortableObjects.js | 26 ++++++++++++++++++++++++-- test/serialization/PortableTest.js | 20 ++++++++++++++++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index 445a2cdc5..706af440f 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -221,11 +221,33 @@ SimplePortable.prototype.writePortable = function (writer) { writer.writeUTF('aString', this.aString); }; -function SimplePortable2(str) { - this.aString = str; +function SimplePortableV3(innerObject) { + this.innerObject = innerObject; } +SimplePortableV3.prototype.getFactoryId = function () { + return 10; +}; + +SimplePortableV3.prototype.getClassId = function () { + return 21; +}; + +SimplePortableV3.prototype.readPortable = function (reader) { + this.innerObject = reader.readPortable('innerObject'); +}; + +SimplePortableV3.prototype.writePortable = function (writer) { + writer.writePortable('innerObject', this.innerObject); +}; + +SimplePortableV3.prototype.getVersion = function () { + return 3; +}; + + exports.PortableObject = PortableObject; exports.PortableObjectV2 = PortableObjectV2; exports.InnerPortableObject = InnerPortableObject; exports.SimplePortable = SimplePortable; +exports.SimplePortableV3 = SimplePortableV3; diff --git a/test/serialization/PortableTest.js b/test/serialization/PortableTest.js index 7274c8860..e2210a4dc 100644 --- a/test/serialization/PortableTest.js +++ b/test/serialization/PortableTest.js @@ -22,6 +22,7 @@ var Util = require('../Util'); var PortableObject = require('./PortableObjects').PortableObject; var PortableObjectV2 = require('./PortableObjects').PortableObjectV2; var InnerPortableObject = require('./PortableObjects').InnerPortableObject; +var SimplePortableV3 = require('./PortableObjects').SimplePortableV3; describe('Portable Serialization', function() { function createSerializationService(constructorFunction) { @@ -32,8 +33,8 @@ describe('Portable Serialization', function() { return new constructorFunction(); } else if (classId === 222) { return new InnerPortableObject(); - } else { - return null; + } else if (classId === 21) { + return new SimplePortableV3(); } } }; @@ -88,4 +89,19 @@ describe('Portable Serialization', function() { var deserialized = newService.toObject(serialized); Util.expectAlmostEqual(deserialized, empv2); }); + + it('v3 portable containing a v2 inner portable', function () { + var service = createSerializationService(PortableObjectV2); + + var innerPortableV2 = new PortableObjectV2('propstring', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, + new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], + [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], + [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')]); + + var portableV3 = new SimplePortableV3(innerPortableV2); + var serialized = service.toData(portableV3); + var deserialized = service.toObject(serialized); + Util.expectAlmostEqual(deserialized, portableV3); + }) }); From 13aad2751496eb94f5fdd40a417771ea792088d4 Mon Sep 17 00:00:00 2001 From: Mehmet Dogan Date: Mon, 19 Mar 2018 15:09:06 +0300 Subject: [PATCH 096/685] Add missing EVENT_PARTITIONS constant Also fixed a typo `data_size` -> `dataSize`. --- src/BitsUtil.ts | 3 ++- src/codec/ClientDeployClassesCodec.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index 636c64756..8f7756633 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -32,10 +32,11 @@ export class BitsUtil { static EVENT_CACHEBATCHINVALIDATION = 211; static EVENT_QUERYCACHESINGLE = 212; static EVENT_QUERYCACHEBATCH = 213; - static EVENT_CACHEPARTITIONLOST = 214; static EVENT_IMAPINVALIDATION = 215; static EVENT_IMAPBATCHINVALIDATION = 216; + static EVENT_PARTITIONS = 217; + static BYTE_SIZE_IN_BYTES: number = 1; static BOOLEAN_SIZE_IN_BYTES: number = 1; static SHORT_SIZE_IN_BYTES: number = 2; diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index 34aff22d7..54016a1a1 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -43,7 +43,7 @@ export class ClientDeployClassesCodec { var key: string = classDefinitionsItem[0]; var val: any = classDefinitionsItem[1]; dataSize += BitsUtil.calculateSizeString(key); - data_size += BitsUtil.INT_SIZE_IN_BYTES + dataSize += BitsUtil.INT_SIZE_IN_BYTES val.forEach((valItem: any) => { dataSize += BitsUtil.BYTE_SIZE_IN_BYTES; }); From d61b79de11af1828ce4630dac6829f642838ab2b Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 21 Mar 2018 08:51:08 -0400 Subject: [PATCH 097/685] adds new features to readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ed6a663b9..a6fb21369 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,9 @@ Hazelcast Node.js client supports the following data structures and features: * Lock * Semaphore * Atomic Long +* Flake Id Generator +* Fast Aggregations +* CRDT Counter * Event Listeners * Entry Processors * Predicates From a4ba8392df9b79fcf0b1d4dda134f00f9a6774cd Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 21 Mar 2018 10:29:42 -0400 Subject: [PATCH 098/685] adds server version check to new tests --- src/BuildMetadata.ts | 2 +- test/Util.js | 8 +++++++- test/flakeid/FlakeIdGeneratorOutOfRangeTest.js | 4 ++++ test/flakeid/FlakeIdGeneratorProxyTest.js | 4 ++++ test/map/MapAggregatorsDoubleTest.js | 2 ++ test/map/MapAggregatorsIntTest.js | 2 ++ test/map/MapAggregatorsLongTest.js | 2 ++ test/pncounter/PNCounterBasicTest.js | 2 ++ test/pncounter/PNCounterConsistencyTest.js | 6 ++++++ test/pncounter/PNCounterWithLiteMembersTest.js | 2 ++ 10 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/BuildMetadata.ts b/src/BuildMetadata.ts index e7b12b447..85368ea2f 100644 --- a/src/BuildMetadata.ts +++ b/src/BuildMetadata.ts @@ -20,7 +20,7 @@ export class BuildMetadata { private static readonly MAJOR_VERSION_MULTIPLIER = 10000; private static readonly MINOR_VERSION_MULTIPLIER = 100; - private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?$/; + private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?(-BETA-.)?$/; public static calculateVersion(versionString: string): number { if (versionString == null) { diff --git a/test/Util.js b/test/Util.js index 5873267c5..9dcce1924 100644 --- a/test/Util.js +++ b/test/Util.js @@ -77,7 +77,13 @@ exports.markEnterprise = function (_this) { }; exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { - var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion(); + if (process.env['SERVER_VERSION']) { + var actNumber = BuildMetadata.calculateVersion(process.env['SERVER_VERSION']); + } else if (client != null) { + var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion(); + } else { + return; + } var expNumber = BuildMetadata.calculateVersion(expectedVersion); if (actNumber === BuildMetadata.UNKNOWN_VERSION_ID || actNumber < expNumber) { _this.skip(); diff --git a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js index 3702e1b14..cc80b3be3 100644 --- a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js +++ b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js @@ -30,6 +30,10 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { var client; var flakeIdGenerator; + before(function () { + Util.markServerVersionAtLeast(this, null, '3.10'); + }); + afterEach(function () { return flakeIdGenerator.destroy().then(function () { client.shutdown(); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index d809fb526..de4e21e33 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -50,6 +50,10 @@ describe("FlakeIdGeneratorProxyTest", function () { }); }); + beforeEach(function () { + Util.markServerVersionAtLeast(this, client, '3.10'); + }); + afterEach(function () { return flakeIdGenerator.destroy(); }); diff --git a/test/map/MapAggregatorsDoubleTest.js b/test/map/MapAggregatorsDoubleTest.js index eae2ca1f8..aec3fbd71 100644 --- a/test/map/MapAggregatorsDoubleTest.js +++ b/test/map/MapAggregatorsDoubleTest.js @@ -20,6 +20,7 @@ var Aggregators = require('../../').Aggregators; var Predicates = require('../../').Predicates; var _fillMap = require('../Util').fillMap; var expect = require('chai').expect; +var Util = require('../Util'); describe('MapAggregatorsDoubleTest', function () { var cluster; @@ -44,6 +45,7 @@ describe('MapAggregatorsDoubleTest', function () { }); beforeEach(function () { + Util.markServerVersionAtLeast(this, client, '3.8'); return _fillMap(map, 50, 'key', 0); }); diff --git a/test/map/MapAggregatorsIntTest.js b/test/map/MapAggregatorsIntTest.js index e25894575..f830b5bc1 100644 --- a/test/map/MapAggregatorsIntTest.js +++ b/test/map/MapAggregatorsIntTest.js @@ -21,6 +21,7 @@ var Aggregators = require('../../').Aggregators; var Predicates = require('../../').Predicates; var _fillMap = require('../Util').fillMap; var expect = require('chai').expect; +var Util = require('../Util'); describe('MapAggregatorsIntTest', function () { var cluster; @@ -47,6 +48,7 @@ describe('MapAggregatorsIntTest', function () { }); beforeEach(function () { + Util.markServerVersionAtLeast(this, client, '3.8'); return _fillMap(map, 50, 'key', 0); }); diff --git a/test/map/MapAggregatorsLongTest.js b/test/map/MapAggregatorsLongTest.js index 4a30c99f5..4e351631f 100644 --- a/test/map/MapAggregatorsLongTest.js +++ b/test/map/MapAggregatorsLongTest.js @@ -21,6 +21,7 @@ var Aggregators = require('../../').Aggregators; var Predicates = require('../../').Predicates; var Long = require('long'); var expect = require('chai').expect; +var Util = require('../Util'); describe('MapAggregatorsLongTest', function () { var cluster; @@ -48,6 +49,7 @@ describe('MapAggregatorsLongTest', function () { }); beforeEach(function () { + Util.markServerVersionAtLeast(this, client, '3.8'); var entries = []; for (var i = 0; i < entryCount; i++) { entries.push(['key' + i, Long.fromNumber(i)]); diff --git a/test/pncounter/PNCounterBasicTest.js b/test/pncounter/PNCounterBasicTest.js index ee5e9ad1f..e637764f4 100644 --- a/test/pncounter/PNCounterBasicTest.js +++ b/test/pncounter/PNCounterBasicTest.js @@ -17,6 +17,7 @@ var expect = require('chai').expect; var RC = require('../RC'); var Client = require('../../').Client; +var Util = require('../Util'); describe('PNCounterBasicTest', function () { @@ -41,6 +42,7 @@ describe('PNCounterBasicTest', function () { }); beforeEach(function () { + Util.markServerVersionAtLeast(this, client, '3.10'); pncounter = client.getPNCounter('pncounter') }); diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index b9d0edd71..0e2722765 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -30,6 +30,10 @@ describe('PNCounterConsistencyTest', function () { var member1; var client; + before(function () { + Util.markServerVersionAtLeast(this, null, '3.10'); + }); + beforeEach(function () { this.timeout(10000); return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')).then(function (cl) { @@ -52,6 +56,7 @@ describe('PNCounterConsistencyTest', function () { }); it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () { + Util.markServerVersionAtLeast(this, client, '3.10'); var pncounter = client.getPNCounter('pncounter'); return pncounter.getAndAdd(3).then(function () { var currentReplicaAddress = pncounter.currentTargetReplicaAddress; @@ -63,6 +68,7 @@ describe('PNCounterConsistencyTest', function () { }); it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () { + Util.markServerVersionAtLeast(this, client, '3.10'); var pncounter = client.getPNCounter('pncounter'); return pncounter.getAndAdd(3).then(function () { var currentReplicaAddress = pncounter.currentTargetReplicaAddress; diff --git a/test/pncounter/PNCounterWithLiteMembersTest.js b/test/pncounter/PNCounterWithLiteMembersTest.js index d455f4936..d0a6ac040 100644 --- a/test/pncounter/PNCounterWithLiteMembersTest.js +++ b/test/pncounter/PNCounterWithLiteMembersTest.js @@ -22,6 +22,7 @@ var Client = require('../..').Client; var Errors = require('../..').HazelcastErrors; var fs = require('fs'); var path = require('path'); +var Util = require('../Util'); describe('PNCounterWithLiteMembersTest', function () { @@ -46,6 +47,7 @@ describe('PNCounterWithLiteMembersTest', function () { }); beforeEach(function () { + Util.markServerVersionAtLeast(this, client, '3.10'); pncounter = client.getPNCounter('pncounter'); }); From 13b1aac16208a73e667806bdd42bf147bc8766bc Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 22 Mar 2018 19:25:38 +0000 Subject: [PATCH 099/685] 0.8.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c9ad9965..4edaaf411 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hazelcast-client", - "version": "0.7.0", + "version": "0.8.0", "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", "main": "lib/index.js", "dependencies": { From 94958395d99c25b7c4ff7eaca2a7e6b6e2aca9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C4=B0man?= Date: Wed, 28 Mar 2018 07:45:36 -0400 Subject: [PATCH 100/685] Org website samples (#287) * org samples * updates to samples * adds set and list samples * review * fix unkown class returning null instead of throwing * adds print to QueueSample --- code_samples/org-website/AtomicLongSample.js | 15 ++++ .../org-website/CustomSerializerSample.js | 44 ++++++++++++ .../org-website/EntryProcessorSample.js | 52 ++++++++++++++ .../org-website/GlobalSerializerSample.js | 29 ++++++++ .../IdentifiedDataSerializableSample.js | 45 ++++++++++++ code_samples/org-website/ListSample.js | 24 +++++++ code_samples/org-website/LockSample.js | 15 ++++ code_samples/org-website/MapSample.js | 18 +++++ code_samples/org-website/MultiMapSample.js | 24 +++++++ .../org-website/PortableSerializableSample.js | 49 +++++++++++++ code_samples/org-website/QuerySample.js | 71 +++++++++++++++++++ code_samples/org-website/QueueSample.js | 25 +++++++ .../org-website/ReliableTopicSample.js | 14 ++++ .../org-website/ReplicatedMapSample.js | 17 +++++ code_samples/org-website/RingBufferSample.js | 21 ++++++ code_samples/org-website/SetSample.js | 26 +++++++ 16 files changed, 489 insertions(+) create mode 100644 code_samples/org-website/AtomicLongSample.js create mode 100644 code_samples/org-website/CustomSerializerSample.js create mode 100644 code_samples/org-website/EntryProcessorSample.js create mode 100644 code_samples/org-website/GlobalSerializerSample.js create mode 100644 code_samples/org-website/IdentifiedDataSerializableSample.js create mode 100644 code_samples/org-website/ListSample.js create mode 100644 code_samples/org-website/LockSample.js create mode 100644 code_samples/org-website/MapSample.js create mode 100644 code_samples/org-website/MultiMapSample.js create mode 100644 code_samples/org-website/PortableSerializableSample.js create mode 100644 code_samples/org-website/QuerySample.js create mode 100644 code_samples/org-website/QueueSample.js create mode 100644 code_samples/org-website/ReliableTopicSample.js create mode 100644 code_samples/org-website/ReplicatedMapSample.js create mode 100644 code_samples/org-website/RingBufferSample.js create mode 100644 code_samples/org-website/SetSample.js diff --git a/code_samples/org-website/AtomicLongSample.js b/code_samples/org-website/AtomicLongSample.js new file mode 100644 index 000000000..a2b1c1023 --- /dev/null +++ b/code_samples/org-website/AtomicLongSample.js @@ -0,0 +1,15 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get an Atomic Counter, we'll call it "counter" + var counter = hz.getAtomicLong("counter"); + // Add and Get the "counter" + return counter.addAndGet(3).then(function (value) { + return counter.get(); + }).then(function (value) { + // Display the "counter" value + console.log("counter: " + value); + // Shutdown this Hazelcast Client + hz.shutdown(); + }); +}); diff --git a/code_samples/org-website/CustomSerializerSample.js b/code_samples/org-website/CustomSerializerSample.js new file mode 100644 index 000000000..3a46b34bd --- /dev/null +++ b/code_samples/org-website/CustomSerializerSample.js @@ -0,0 +1,44 @@ +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; + +function CustomSerializable(value) { + this.value = value; +} + +CustomSerializable.prototype.hzGetCustomId = function () { + return 10; +}; + +function CustomSerializer() { + //Constructor function +} + +CustomSerializer.prototype.getId = function () { + return 10; +}; + +CustomSerializer.prototype.write = function (output, t) { + output.writeInt(t.value.length); + for (var i = 0; i < t.value.length; i++) { + output.writeInt(t.value.charCodeAt(i)); + } +}; + +CustomSerializer.prototype.read = function(reader) { + var len = reader.readInt(); + var str = ''; + for (var i = 0; i < len; i++) { + str = str + String.fromCharCode(reader.readInt()); + } + return new CustomSerializable(str); +}; + +var cfg = new Config.ClientConfig(); +cfg.serializationConfig.customSerializers.push(new CustomSerializer()); + +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient(cfg).then(function (hz) { + //CustomSerializer will serialize/deserialize CustomSerializable objects + hz.shutdown(); +}); + diff --git a/code_samples/org-website/EntryProcessorSample.js b/code_samples/org-website/EntryProcessorSample.js new file mode 100644 index 000000000..0db09313f --- /dev/null +++ b/code_samples/org-website/EntryProcessorSample.js @@ -0,0 +1,52 @@ +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; + +function IdentifiedEntryProcessor(value) { + // Constructor function +} + +IdentifiedEntryProcessor.prototype.readData = function (inp) { +}; + +IdentifiedEntryProcessor.prototype.writeData = function(outp) { +}; + +IdentifiedEntryProcessor.prototype.getFactoryId = function () { + return 1; +}; + +IdentifiedEntryProcessor.prototype.getClassId = function() { + return 9; +}; + +function EntryProcessorDataSerializableFactory() { + +} + +EntryProcessorDataSerializableFactory.prototype.create = function (type) { + if (type === 1) { + return new IdentifiedEntryProcessor(); + } + return null; +}; + +var cfg = new Config.ClientConfig(); +cfg.serializationConfig.dataSerializableFactories[1] = new EntryProcessorDataSerializableFactory(); +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient(cfg).then(function (hz) { + // Get the Distributed Map from Cluster. + var map = hz.getMap('my-distributed-map'); + // Put the double value of 0 into the Distributed Map + return map.put('key', 0).then(function () { + // Run the IdentifiedEntryProcessor class on the Hazelcast Cluster Member holding the key called "key" + return map.executeOnKey('key', new IdentifiedEntryProcessor()); + }).then(function () { + // Show that the IdentifiedEntryProcessor updated the value. + return map.get('key'); + }).then(function (value) { + console.log(value); + // Shutdown the Hazelcast Cluster Member + hz.shutdown(); + }) +}); + diff --git a/code_samples/org-website/GlobalSerializerSample.js b/code_samples/org-website/GlobalSerializerSample.js new file mode 100644 index 000000000..56c8a34da --- /dev/null +++ b/code_samples/org-website/GlobalSerializerSample.js @@ -0,0 +1,29 @@ +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; +var cfg = new Config.ClientConfig(); + +function GlobalSerializer() { + // Constructor function +} + +GlobalSerializer.prototype.getId = function () { + return 20; +}; + +GlobalSerializer.prototype.read = function (input) { + // return MyFavoriteSerializer.deserialize(input); +}; + +GlobalSerializer.prototype.write = function (output, obj) { + // output.write(MyFavoriteSerializer.serialize(obj)) +}; + +cfg.serializationConfig.globalSerializer = new GlobalSerializer(); +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient(cfg).then(function (hz) { + // GlobalSerializer will serialize/deserialize all non-builtin types + hz.shutdown(); +}); + + + diff --git a/code_samples/org-website/IdentifiedDataSerializableSample.js b/code_samples/org-website/IdentifiedDataSerializableSample.js new file mode 100644 index 000000000..0941c5984 --- /dev/null +++ b/code_samples/org-website/IdentifiedDataSerializableSample.js @@ -0,0 +1,45 @@ +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; + +function Employee(id, name) { + this.id = id; + this.name = name; +} + +Employee.prototype.readData = function (input) { + this.id = input.readInt(); + this.name = input.readUTF(); +}; + +Employee.prototype.writeData = function(output) { + output.writeInt(this.id); + output.writeUTF(this.name); +}; + +Employee.prototype.getFactoryId = function () { + return 1000; +}; + +Employee.prototype.getClassId = function() { + return 100; +}; + +function SampleDataSerializableFactory() { + // Constructor function +} + +SampleDataSerializableFactory.prototype.create = function (type) { + if (type === 100) { + return new Employee(); + } + return null; +}; + +var cfg = new Config.ClientConfig(); +cfg.serializationConfig.dataSerializableFactories[1000] = new SampleDataSerializableFactory(); +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient(cfg).then(function (hz) { + // Employee can be used here + hz.shutdown(); +}); + diff --git a/code_samples/org-website/ListSample.js b/code_samples/org-website/ListSample.js new file mode 100644 index 000000000..1030846e5 --- /dev/null +++ b/code_samples/org-website/ListSample.js @@ -0,0 +1,24 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get the Distributed List from Cluster. + var list = hz.getList('my-distributed-list'); + // Add elements to the list + return list.add('item1').then(function () { + return list.add('item2'); + }).then(function () { + //Remove the first element + return list.removeAt(0); + }).then(function (value) { + console.log(value); + // There is only one element left + return list.size(); + }).then(function (len) { + console.log(len); + // Clear the list + return list.clear(); + }).then(function () { + // Shutdown this Hazelcast client + hz.shutdown(); + }); +}); diff --git a/code_samples/org-website/LockSample.js b/code_samples/org-website/LockSample.js new file mode 100644 index 000000000..946dbd8ca --- /dev/null +++ b/code_samples/org-website/LockSample.js @@ -0,0 +1,15 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get a distributed lock called "my-distributed-lock" + var lock = hz.getLock("my-distributed-lock"); + // Now create a lock and execute some guarded code. + return lock.lock().then(function () { + //do something here + }).finally(function () { + return lock.unlock(); + }).then(function () { + // Shutdown this Hazelcast Client + hz.shutdown(); + }); +}); diff --git a/code_samples/org-website/MapSample.js b/code_samples/org-website/MapSample.js new file mode 100644 index 000000000..431f7f37a --- /dev/null +++ b/code_samples/org-website/MapSample.js @@ -0,0 +1,18 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get the Distributed Map from Cluster. + var map = hz.getMap('my-distributed-map'); + //Standard Put and Get. + return map.put('key', 'value').then(function () { + return map.get('key'); + }).then(function (val) { + //Concurrent Map methods, optimistic updating + return map.putIfAbsent('somekey', 'somevalue'); + }).then(function () { + return map.replace('key', 'value', 'newvalue'); + }).then(function (value) { + // Shutdown this Hazelcast client + hz.shutdown(); + }); +}); diff --git a/code_samples/org-website/MultiMapSample.js b/code_samples/org-website/MultiMapSample.js new file mode 100644 index 000000000..7bc670dbb --- /dev/null +++ b/code_samples/org-website/MultiMapSample.js @@ -0,0 +1,24 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get the Distributed MultiMap from Cluster. + var multiMap = hz.getMultiMap('my-distributed-multimap'); + // Put values in the map against the same key + return multiMap.put('my-key', 'value1').then(function () { + return multiMap.put('my-key', 'value2'); + }).then(function () { + return multiMap.put('my-key', 'value3'); + }).then(function () { + // Print out all the values for associated with key called "my-key" + return multiMap.get('my-key') + }).then(function (values) { + for (value of values) { + console.log(value); + } + // remove specific key/value pair + return multiMap.remove('my-key', 'value2'); + }).then(function () { + // Shutdown this Hazelcast client + hz.shutdown(); + }); +}); diff --git a/code_samples/org-website/PortableSerializableSample.js b/code_samples/org-website/PortableSerializableSample.js new file mode 100644 index 000000000..1b275a46b --- /dev/null +++ b/code_samples/org-website/PortableSerializableSample.js @@ -0,0 +1,49 @@ +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; +var Long = require('long'); + +function Customer(name, id, lastOrder) { + this.name = name; + this.id = id; + this.lastOrder = lastOrder; +} + +Customer.prototype.readPortable = function (reader) { + this.name = reader.readUTF('name'); + this.id = reader.readInt('id'); + this.lastOrder = reader.readLong('lastOrder').toNumber(); +}; + +Customer.prototype.writePortable = function(writer) { + writer.writeUTF('name', this.name); + writer.writeInt('id', this.id); + writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); +}; + +Customer.prototype.getFactoryId = function () { + return 1; +}; + +Customer.prototype.getClassId = function() { + return 1; +}; + +function PortableFactory() { + // Constructor function +} + +PortableFactory.prototype.create = function (classId) { + if (classId === 1) { + return new Customer(); + } + return null; +}; + +var cfg = new Config.ClientConfig(); +cfg.serializationConfig.portableFactories[1] = new PortableFactory(); +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient(cfg).then(function (hz) { + //Customer can be used here + hz.shutdown(); +}); + diff --git a/code_samples/org-website/QuerySample.js b/code_samples/org-website/QuerySample.js new file mode 100644 index 000000000..ac7b1f6b9 --- /dev/null +++ b/code_samples/org-website/QuerySample.js @@ -0,0 +1,71 @@ +var Client = require('hazelcast-client').Client; +var Predicates = require('hazelcast-client').Predicates; +var Config = require('hazelcast-client').Config; + +function User(username, age, active) { + this.username = username; + this.age = age; + this.active = active; +} + +User.prototype.readPortable = function (reader) { + this.username = reader.readUTF('username'); + this.age = reader.readInt('age'); + this.active = reader.readBoolean('active'); +}; + +User.prototype.writePortable = function (writer) { + writer.writeUTF('username', this.username); + writer.writeInt('age', this.age); + writer.writeBoolean('active', this.active); +}; + +User.prototype.getFactoryId = function () { + return 1; +}; + +User.prototype.getClassId = function () { + return 1; +}; + +function PortableFactory() { + // Constructor sample +} + +PortableFactory.prototype.create = function (classId) { + if (classId === 1) { + return new User(); + } + return null; +}; + +function generateUsers(users) { + return users.put('Rod', new User('Rod', 19, true)).then(function () { + return users.put('Jane', new User('Jane', 20, true)); + }).then(function () { + return users.put('Freddy', new User('Freddy', 23, true)); + }); +} + +var cfg = new Config.ClientConfig(); +cfg.serializationConfig.portableFactories[1] = new PortableFactory(); +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient(cfg).then(function (hz) { + // Get a Distributed Map called "users" + var users = hz.getMap('users'); + // Add some users to the Distributed Map + return generateUsers(users).then(function () { + // Create a Predicate + var criteriaQuery = Predicates.and( + Predicates.truePredicate('active', true), + Predicates.isBetween('age', 18, 21) + ); + // Get result collections using the the Predicate + return users.valuesWithPredicate(criteriaQuery); + }).then(function (values) { + // Print out the results + console.log(values.toArray()); + // Shutdown this Hazelcast Client + hz.shutdown(); + }) +}); diff --git a/code_samples/org-website/QueueSample.js b/code_samples/org-website/QueueSample.js new file mode 100644 index 000000000..bba5984d7 --- /dev/null +++ b/code_samples/org-website/QueueSample.js @@ -0,0 +1,25 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get a Blocking Queue called "my-distributed-queue" + var queue = hz.getQueue('my-distributed-queue'); + // Offer a String into the Distributed Queue + return queue.offer('item').then(function () { + // Poll the Distributed Queue and return the String + return queue.poll(); + }).then(function () { + //Timed blocking Operations + return queue.offer('anotheritem', 500); + }).then(function () { + return queue.poll(5000); + }).then(function () { + //Indefinitely blocking Operations + return queue.put('yetanotheritem'); + }).then(function () { + return queue.take(); + }).then(function (value) { + console.log(value); + // Shutdown this Hazelcast Client + hz.shutdown(); + }) +}); diff --git a/code_samples/org-website/ReliableTopicSample.js b/code_samples/org-website/ReliableTopicSample.js new file mode 100644 index 000000000..ba5bcd11e --- /dev/null +++ b/code_samples/org-website/ReliableTopicSample.js @@ -0,0 +1,14 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get a Topic called "my-distributed-topic" + var topic = hz.getReliableTopic("my-distributed-topic"); + // Add a Listener to the Topic + topic.addMessageListener(function (message) { + console.log(message); + // Shutdown this Hazelcast Client + hz.shutdown(); + }); + // Publish a message to the Topic + topic.publish('Hello to distributed world'); +}); diff --git a/code_samples/org-website/ReplicatedMapSample.js b/code_samples/org-website/ReplicatedMapSample.js new file mode 100644 index 000000000..0f196f4b2 --- /dev/null +++ b/code_samples/org-website/ReplicatedMapSample.js @@ -0,0 +1,17 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get a Replicated Map called "my-replicated-map" + var map = hz.getReplicatedMap('my-replicated-map'); + // Put and Get a value from the Replicated Map + // key/value replicated to all members + return map.put('key', 'value').then(function (replacedValue) { + console.log('replaced value = ' + replacedValue); // Will be null as its first update + return map.get('key'); + }).then(function (value) { + // the value is retrieved from a random member in the cluster + console.log('value for key = ' + value); + // Shutdown this Hazelcast Client + hz.shutdown(); + }); +}); diff --git a/code_samples/org-website/RingBufferSample.js b/code_samples/org-website/RingBufferSample.js new file mode 100644 index 000000000..7e0c15a5c --- /dev/null +++ b/code_samples/org-website/RingBufferSample.js @@ -0,0 +1,21 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + var rb = hz.getRingbuffer('rb'); + return rb.add(100).then(function () { + return rb.add(200); + }).then(function (value) { + // we start from the oldest item. + // if you want to start from the next item, call rb.tailSequence()+1 + return rb.headSequence(); + }).then(function (sequence) { + return rb.readOne(sequence).then(function (value) { + console.log(value); + return rb.readOne(sequence.add(1)); + }).then(function (value) { + console.log(value); + // Shutdown this Hazelcast Client + hz.shutdown(); + }); + }); +}); diff --git a/code_samples/org-website/SetSample.js b/code_samples/org-website/SetSample.js new file mode 100644 index 000000000..0c37df369 --- /dev/null +++ b/code_samples/org-website/SetSample.js @@ -0,0 +1,26 @@ +var Client = require('hazelcast-client').Client; +// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 +Client.newHazelcastClient().then(function (hz) { + // Get the Distributed Set from Cluster. + var set = hz.getSet('my-distributed-set'); + // Add items to the set with duplicates + return set.add('item1').then(function () { + return set.add('item1'); + }).then(function () { + return set.add('item2'); + }).then(function () { + return set.add('item2'); + }).then(function () { + return set.add('item2'); + }).then(function () { + return set.add('item3'); + }).then(function () { + // Get the items. Note that there are no duplicates + return set.toArray(); + }).then(function (values) { + console.log(values); + }).then(function () { + // Shutdown this Hazelcast client + hz.shutdown(); + }); +}); From d459c21a79ad9190e4d1af7322d16f9f467c9a63 Mon Sep 17 00:00:00 2001 From: saitTalhaNisanci Date: Fri, 4 May 2018 15:42:27 +0300 Subject: [PATCH 101/685] add more logging while connection to cluster --- src/invocation/ClientConnection.ts | 2 +- src/invocation/ClientConnectionManager.ts | 2 +- src/invocation/ClusterService.ts | 26 +++++++------- src/invocation/ConnectionAuthenticator.ts | 42 +++++++++++++++++------ src/invocation/InvocationService.ts | 12 +++---- 5 files changed, 54 insertions(+), 30 deletions(-) diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 9822b644a..b6bde1f56 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -116,7 +116,7 @@ export class ClientConnection { return this.authenticatedAsOwner; } - setAuthneticatedAsOwner(asOwner: boolean): void { + setAuthenticatedAsOwner(asOwner: boolean): void { this.authenticatedAsOwner = asOwner; } diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 8cc8f2e73..50be6d39f 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -89,7 +89,7 @@ export class ClientConnectionManager extends EventEmitter { connectionResolver.resolve(clientConnection); }); }).catch((e: any) => { - connectionResolver.resolve(null); + connectionResolver.reject(e); }).finally(() => { delete this.pendingConnections[addressIndex]; }); diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index f6ea8fd59..ca4aa81f6 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -95,7 +95,7 @@ export class ClusterService extends EventEmitter { } var attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; var attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; - return this.tryAddresses(0, attemptLimit, attemptPeriod); + return this.tryConnectingToAddresses(0, attemptLimit, attemptPeriod); } /** @@ -160,20 +160,25 @@ export class ClusterService extends EventEmitter { } } - private tryAddresses(index: number, attemptLimit: number, attemptPeriod: number): Promise { + private tryConnectingToAddresses(index: number, remainingAttemptLimit: number, + attemptPeriod: number, cause?: Error): Promise { + this.logger.debug('ClusterService', 'Trying to connect to addresses, remaining attempt limit: ' + remainingAttemptLimit + + 'attempt period: ' + attemptPeriod); if (this.knownAddresses.length <= index) { - attemptLimit = attemptLimit - 1; - if (attemptLimit === 0) { - let error = new IllegalStateError('Unable to connect to any of the following addresses: ' + + remainingAttemptLimit = remainingAttemptLimit - 1; + if (remainingAttemptLimit === 0) { + let errorMessage = 'Unable to connect to any of the following addresses: ' + this.knownAddresses.map((element: Address) => { return element.toString(); - }).join(', ')); + }).join(', '); + this.logger.debug('ClusterService', errorMessage); + let error = new IllegalStateError(errorMessage, cause); return Promise.reject(error); } else { let deferred = Promise.defer(); setTimeout( () => { - this.tryAddresses(0, attemptLimit, attemptPeriod).then(() => { + this.tryConnectingToAddresses(0, remainingAttemptLimit, attemptPeriod).then(() => { deferred.resolve(); }).catch((e) => { deferred.reject(e); @@ -186,15 +191,12 @@ export class ClusterService extends EventEmitter { } else { var currentAddress = this.knownAddresses[index]; return this.client.getConnectionManager().getOrConnect(currentAddress, true).then((connection: ClientConnection) => { - if (connection == null) { - throw new Error('Could not connect to ' + currentAddress.toString()); - } - connection.setAuthneticatedAsOwner(true); + connection.setAuthenticatedAsOwner(true); this.ownerConnection = connection; return this.initMemberShipListener(); }).catch((e) => { this.logger.warn('ClusterService', e); - return this.tryAddresses(index + 1, attemptLimit, attemptPeriod); + return this.tryConnectingToAddresses(index + 1, remainingAttemptLimit, attemptPeriod, e); }); } } diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index 538b838ff..b2ea33946 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -22,12 +22,20 @@ import {ClientConnection} from './ClientConnection'; import {ClusterService} from './ClusterService'; import {BuildInfoLoader} from '../BuildInfoLoader'; import ClientMessage = require('../ClientMessage'); +import {LoggingService} from '../logging/LoggingService'; + +const enum AuthenticationStatus { + AUTHENTICATED = 0, + CREDENTIALS_FAILED = 1, + SERIALIZATION_VERSION_MISMATCH = 2 +} export class ConnectionAuthenticator { private connection: ClientConnection; private client: HazelcastClient; private clusterService: ClusterService; + private logger = LoggingService.getLoggingService(); constructor(connection: ClientConnection, client: HazelcastClient) { this.connection = connection; @@ -42,17 +50,31 @@ export class ConnectionAuthenticator { .invokeOnConnection(this.connection, credentials) .then((msg: ClientMessage) => { var authResponse = ClientAuthenticationCodec.decodeResponse(msg); - if (authResponse.status === 0) { - this.connection.setAddress(authResponse.address); - this.connection.setConnectedServerVersion(authResponse.serverHazelcastVersion); - if (ownerConnection) { - this.clusterService.uuid = authResponse.uuid; - this.clusterService.ownerUuid = authResponse.ownerUuid; - - } - } else { - throw new Error('Could not authenticate connection to ' + this.connection.getAddress().toString()); + switch (authResponse.status) { + case AuthenticationStatus.AUTHENTICATED: + this.connection.setAddress(authResponse.address); + this.connection.setConnectedServerVersion(authResponse.serverHazelcastVersion); + if (ownerConnection) { + this.clusterService.uuid = authResponse.uuid; + this.clusterService.ownerUuid = authResponse.ownerUuid; + + } + this.logger.debug('ConnectionAuthenticator', + 'Connection to ' + + this.connection.getAddress().toString() + ' authenticated'); + break; + case AuthenticationStatus.CREDENTIALS_FAILED: + this.logger.error('ConnectionAuthenticator', 'Invalid Credentials' ); + throw new Error('Invalid Credentials, could not authenticate connection to ' + + this.connection.getAddress().toString()); + case AuthenticationStatus.SERIALIZATION_VERSION_MISMATCH: + this.logger.error('ConnectionAuthenticator', 'Serialization version mismatch' ); + throw new Error('Serialization version mismatch, could not authenticate connection to ' + + this.connection.getAddress().toString()); } + }).catch((e) => { + this.logger.error('ConnectionAuthenticator', e); + throw(e); }); } diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 57d022628..6a196e2f2 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -239,20 +239,20 @@ export class InvocationService { private invokeOnAddress(invocation: Invocation, address: Address): Promise { return this.client.getConnectionManager().getOrConnect(address).then((connection: ClientConnection) => { - if (connection == null) { - throw new Error(address.toString() + ' is not available.'); - } return this.send(invocation, connection); + }).catch((e) => { + this.logger.error('InvocationService', e); + throw new Error(address.toString() + ' is not available.'); }); } private invokeOnPartitionOwner(invocation: Invocation, partitionId: number): Promise { let ownerAddress = this.client.getPartitionService().getAddressForPartition(partitionId); return this.client.getConnectionManager().getOrConnect(ownerAddress).then((connection: ClientConnection) => { - if (connection == null) { - throw new IOError(ownerAddress.toString() + '(partition owner) is not available.'); - } return this.send(invocation, connection); + }).catch((e) => { + this.logger.error('InvocationService', e); + throw new IOError(ownerAddress.toString() + '(partition owner) is not available.'); }); } From 0022c33727d8e9bd6f4de6c91e5d100f8d2dc2f6 Mon Sep 17 00:00:00 2001 From: saitTalhaNisanci Date: Sun, 13 May 2018 12:04:08 +0300 Subject: [PATCH 102/685] check if owner connection is active before opening a connection --- src/invocation/ClientConnectionManager.ts | 19 +++++++++++------ src/invocation/ConnectionAuthenticator.ts | 25 +++++++++++++---------- src/invocation/InvocationService.ts | 8 ++++---- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 50be6d39f..d07852577 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -18,7 +18,7 @@ import * as Promise from 'bluebird'; import {LoggingService} from '../logging/LoggingService'; import {EventEmitter} from 'events'; import HazelcastClient from '../HazelcastClient'; -import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; +import {ClientNotActiveError, HazelcastError, IllegalStateError} from '../HazelcastError'; import {ClientConnection} from './ClientConnection'; import {ConnectionAuthenticator} from './ConnectionAuthenticator'; import Address = require('../Address'); @@ -52,10 +52,10 @@ export class ClientConnectionManager extends EventEmitter { * Returns the {@link ClientConnection} with given {@link Address}. If there is no such connection established, * it first connects to the address and then return the {@link ClientConnection}. * @param address - * @param ownerConnection Sets the connected node as owner of this client if true. + * @param asOwner Sets the connected node as owner of this client if true. * @returns {Promise|Promise} */ - getOrConnect(address: Address, ownerConnection: boolean = false): Promise { + getOrConnect(address: Address, asOwner: boolean = false): Promise { let addressIndex = address.toString(); let connectionResolver: Promise.Resolver = Promise.defer(); @@ -76,13 +76,13 @@ export class ClientConnectionManager extends EventEmitter { this.client.getInvocationService().processResponse(data); }; - this.triggerConnect(address).then((socket: net.Socket) => { + this.triggerConnect(address, asOwner).then((socket: net.Socket) => { let clientConnection = new ClientConnection(this.client, address, socket); return this.initiateCommunication(clientConnection).then(() => { return clientConnection.registerResponseCallback(processResponseCallback); }).then(() => { - return this.authenticate(clientConnection, ownerConnection); + return this.authenticate(clientConnection, asOwner); }).then(() => { this.establishedConnections[clientConnection.getAddress().toString()] = clientConnection; this.onConnectionOpened(clientConnection); @@ -94,6 +94,7 @@ export class ClientConnectionManager extends EventEmitter { delete this.pendingConnections[addressIndex]; }); + let connectionTimeout = this.client.getConfig().networkConfig.connectionTimeout; if (connectionTimeout !== 0) { return connectionResolver.promise.timeout(connectionTimeout, new HazelcastError('Connection timed-out')); @@ -101,7 +102,13 @@ export class ClientConnectionManager extends EventEmitter { return connectionResolver.promise; } - private triggerConnect(address: Address): Promise { + private triggerConnect(address: Address, asOwner: boolean): Promise { + if (!asOwner) { + if (this.client.getClusterService().getOwnerConnection() == null) { + let error = new IllegalStateError('Owner connection is not available!'); + return Promise.reject(error); + } + } if (this.client.getConfig().networkConfig.sslOptions) { let opts = this.client.getConfig().networkConfig.sslOptions; return this.connectTLSSocket(address, opts); diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index b2ea33946..72faeca85 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -23,6 +23,7 @@ import {ClusterService} from './ClusterService'; import {BuildInfoLoader} from '../BuildInfoLoader'; import ClientMessage = require('../ClientMessage'); import {LoggingService} from '../logging/LoggingService'; +import {AuthenticationError} from '../HazelcastError'; const enum AuthenticationStatus { @@ -43,9 +44,8 @@ export class ConnectionAuthenticator { this.clusterService = this.client.getClusterService(); } - authenticate(ownerConnection: boolean): Promise { - var credentials: ClientMessage = this.createCredentials(ownerConnection); - + authenticate(asOwner: boolean): Promise { + var credentials: ClientMessage = this.createCredentials(asOwner); return this.client.getInvocationService() .invokeOnConnection(this.connection, credentials) .then((msg: ClientMessage) => { @@ -54,12 +54,12 @@ export class ConnectionAuthenticator { case AuthenticationStatus.AUTHENTICATED: this.connection.setAddress(authResponse.address); this.connection.setConnectedServerVersion(authResponse.serverHazelcastVersion); - if (ownerConnection) { + if (asOwner) { this.clusterService.uuid = authResponse.uuid; this.clusterService.ownerUuid = authResponse.ownerUuid; } - this.logger.debug('ConnectionAuthenticator', + this.logger.info('ConnectionAuthenticator', 'Connection to ' + this.connection.getAddress().toString() + ' authenticated'); break; @@ -71,15 +71,18 @@ export class ConnectionAuthenticator { this.logger.error('ConnectionAuthenticator', 'Serialization version mismatch' ); throw new Error('Serialization version mismatch, could not authenticate connection to ' + this.connection.getAddress().toString()); + default: + this.logger.error('ConnectionAuthenticator', 'Unknown authentication status: ' + + authResponse.status ); + throw new AuthenticationError('Unknown authentication status: ' + authResponse.status + + ' , could not authenticate connection to ' + + this.connection.getAddress().toString()); } - }).catch((e) => { - this.logger.error('ConnectionAuthenticator', e); - throw(e); }); } - createCredentials(ownerConnection: boolean): ClientMessage { + createCredentials(asOwner: boolean): ClientMessage { var groupConfig = this.client.getConfig().groupConfig; var uuid: string = this.clusterService.uuid; var ownerUuid: string = this.clusterService.ownerUuid; @@ -94,10 +97,10 @@ export class ConnectionAuthenticator { var credentialsPayload = this.client.getSerializationService().toData(customCredentials); clientMessage = ClientAuthenticationCustomCodec.encodeRequest( - credentialsPayload, uuid, ownerUuid, ownerConnection, 'NJS', 1, clientVersion); + credentialsPayload, uuid, ownerUuid, asOwner, 'NJS', 1, clientVersion); } else { clientMessage = ClientAuthenticationCodec.encodeRequest( - groupConfig.name, groupConfig.password, uuid, ownerUuid, ownerConnection, 'NJS', 1, clientVersion); + groupConfig.name, groupConfig.password, uuid, ownerUuid, asOwner, 'NJS', 1, clientVersion); } diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 6a196e2f2..8d8be5fe0 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -241,8 +241,8 @@ export class InvocationService { return this.client.getConnectionManager().getOrConnect(address).then((connection: ClientConnection) => { return this.send(invocation, connection); }).catch((e) => { - this.logger.error('InvocationService', e); - throw new Error(address.toString() + ' is not available.'); + this.logger.debug('InvocationService', e); + throw new IOError(address.toString() + ' is not available.', e); }); } @@ -251,8 +251,8 @@ export class InvocationService { return this.client.getConnectionManager().getOrConnect(ownerAddress).then((connection: ClientConnection) => { return this.send(invocation, connection); }).catch((e) => { - this.logger.error('InvocationService', e); - throw new IOError(ownerAddress.toString() + '(partition owner) is not available.'); + this.logger.debug('InvocationService', e); + throw new IOError(ownerAddress.toString() + '(partition owner) is not available.', e); }); } From 059b52a974cb6fc87d18df34c36c5cfb57985d30 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Fri, 8 Jun 2018 07:30:27 +0300 Subject: [PATCH 103/685] add more rules to tslint (#296) --- benchmark/SimpleMapBenchmark.js | 21 +- code_samples/aggregation.js | 2 +- code_samples/custom_serializer.js | 16 +- code_samples/distributedobject_listener.js | 10 +- code_samples/flakeidgenerator.js | 2 +- code_samples/global_serializer.js | 8 +- code_samples/lifecycle_listener.js | 4 +- code_samples/list.js | 2 +- code_samples/logging.js | 6 +- code_samples/map_entry_listener.js | 10 +- code_samples/near_cache.js | 2 +- .../org-website/CustomSerializerSample.js | 2 +- .../org-website/EntryProcessorSample.js | 4 +- .../IdentifiedDataSerializableSample.js | 4 +- .../org-website/PortableSerializableSample.js | 4 +- code_samples/paging_predicate.js | 14 +- code_samples/queue.js | 2 +- code_samples/ssl_authentication.js | 2 +- package-lock.json | 4896 ++++++++--------- package.json | 116 +- src/Address.ts | 4 +- src/BitsUtil.ts | 11 +- src/BuildMetadata.ts | 4 +- src/ClientInfo.ts | 2 +- src/ClientMessage.ts | 73 +- src/ClusterDataFactory.ts | 2 +- src/DataStoreHashMap.ts | 34 +- src/DistributedObject.ts | 9 +- src/HazelcastClient.ts | 155 +- src/HazelcastError.ts | 4 +- src/HeartbeatService.ts | 22 +- src/LifecycleService.ts | 20 +- src/ListenerService.ts | 168 +- src/PartitionService.ts | 18 +- src/Util.ts | 103 +- src/aggregation/Aggregator.ts | 9 +- src/aggregation/AggregatorFactory.ts | 26 +- src/aggregation/Aggregators.ts | 4 +- src/codec/AtomicLongAddAndGetCodec.ts | 6 - src/codec/AtomicLongAlterAndGetCodec.ts | 6 - src/codec/AtomicLongAlterCodec.ts | 6 - src/codec/AtomicLongApplyCodec.ts | 6 - src/codec/AtomicLongCompareAndSetCodec.ts | 6 - src/codec/AtomicLongDecrementAndGetCodec.ts | 6 - src/codec/AtomicLongGetAndAddCodec.ts | 6 - src/codec/AtomicLongGetAndAlterCodec.ts | 6 - src/codec/AtomicLongGetAndIncrementCodec.ts | 6 - src/codec/AtomicLongGetAndSetCodec.ts | 6 - src/codec/AtomicLongGetCodec.ts | 6 - src/codec/AtomicLongIncrementAndGetCodec.ts | 6 - src/codec/AtomicLongSetCodec.ts | 7 - ...ClientAddDistributedObjectListenerCodec.ts | 6 - src/codec/ClientAddMembershipListenerCodec.ts | 7 +- src/codec/ClientAddPartitionListenerCodec.ts | 10 +- .../ClientAddPartitionLostListenerCodec.ts | 6 +- src/codec/ClientAuthenticationCodec.ts | 6 +- src/codec/ClientAuthenticationCustomCodec.ts | 6 +- src/codec/ClientCreateProxyCodec.ts | 7 +- src/codec/ClientDeployClassesCodec.ts | 9 +- src/codec/ClientDestroyProxyCodec.ts | 7 - src/codec/ClientGetDistributedObjectsCodec.ts | 10 +- src/codec/ClientGetPartitionsCodec.ts | 9 +- src/codec/ClientPingCodec.ts | 8 - src/codec/ClientRemoveAllListenersCodec.ts | 8 - ...entRemoveDistributedObjectListenerCodec.ts | 6 - .../ClientRemovePartitionLostListenerCodec.ts | 6 - src/codec/DistributedObjectInfoCodec.ts | 1 - src/codec/FlakeIdGeneratorMessageType.ts | 4 +- src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 44 +- src/codec/ImmutableLazyDataList.ts | 6 +- src/codec/ListAddAllCodec.ts | 6 - src/codec/ListAddAllWithIndexCodec.ts | 6 - src/codec/ListAddCodec.ts | 6 - src/codec/ListAddListenerCodec.ts | 6 - src/codec/ListAddWithIndexCodec.ts | 6 - src/codec/ListClearCodec.ts | 7 - src/codec/ListCompareAndRemoveAllCodec.ts | 6 - src/codec/ListCompareAndRetainAllCodec.ts | 6 - src/codec/ListContainsAllCodec.ts | 6 - src/codec/ListContainsCodec.ts | 6 - src/codec/ListGetAllCodec.ts | 8 +- src/codec/ListGetCodec.ts | 6 - src/codec/ListIndexOfCodec.ts | 6 - src/codec/ListIsEmptyCodec.ts | 6 - src/codec/ListIteratorCodec.ts | 8 +- src/codec/ListLastIndexOfCodec.ts | 6 - src/codec/ListListIteratorCodec.ts | 8 +- src/codec/ListRemoveCodec.ts | 6 - src/codec/ListRemoveListenerCodec.ts | 6 - src/codec/ListRemoveWithIndexCodec.ts | 6 - src/codec/ListSetCodec.ts | 6 - src/codec/ListSizeCodec.ts | 6 - src/codec/ListSubCodec.ts | 8 +- src/codec/LockForceUnlockCodec.ts | 7 - src/codec/LockGetLockCountCodec.ts | 6 - src/codec/LockGetRemainingLeaseTimeCodec.ts | 6 - src/codec/LockIsLockedByCurrentThreadCodec.ts | 6 - src/codec/LockIsLockedCodec.ts | 6 - src/codec/LockLockCodec.ts | 7 - src/codec/LockTryLockCodec.ts | 6 - src/codec/LockUnlockCodec.ts | 7 - src/codec/MapAddEntryListenerCodec.ts | 6 - src/codec/MapAddEntryListenerToKeyCodec.ts | 6 - ...AddEntryListenerToKeyWithPredicateCodec.ts | 6 - .../MapAddEntryListenerWithPredicateCodec.ts | 6 - src/codec/MapAddIndexCodec.ts | 7 - src/codec/MapAddInterceptorCodec.ts | 6 - .../MapAddNearCacheEntryListenerCodec.ts | 13 +- ...apAddNearCacheInvalidationListenerCodec.ts | 13 +- src/codec/MapAddPartitionLostListenerCodec.ts | 6 - src/codec/MapAggregateCodec.ts | 6 - src/codec/MapAggregateWithPredicateCodec.ts | 6 - src/codec/MapAssignAndGetUuidsCodec.ts | 8 +- src/codec/MapClearCodec.ts | 7 - src/codec/MapClearNearCacheCodec.ts | 7 +- src/codec/MapContainsKeyCodec.ts | 6 - src/codec/MapContainsValueCodec.ts | 6 - src/codec/MapDeleteCodec.ts | 6 - .../MapEntriesWithPagingPredicateCodec.ts | 8 +- src/codec/MapEntriesWithPredicateCodec.ts | 8 +- src/codec/MapEntrySetCodec.ts | 8 +- src/codec/MapEventJournalReadCodec.ts | 10 +- src/codec/MapEventJournalSubscribeCodec.ts | 6 - src/codec/MapEvictAllCodec.ts | 7 - src/codec/MapEvictCodec.ts | 6 - src/codec/MapExecuteOnAllKeysCodec.ts | 8 +- src/codec/MapExecuteOnKeyCodec.ts | 6 - src/codec/MapExecuteOnKeysCodec.ts | 8 +- src/codec/MapExecuteWithPredicateCodec.ts | 8 +- src/codec/MapFetchEntriesCodec.ts | 8 +- src/codec/MapFetchKeysCodec.ts | 8 +- ...FetchNearCacheInvalidationMetadataCodec.ts | 11 +- src/codec/MapFetchWithQueryCodec.ts | 8 +- src/codec/MapFlushCodec.ts | 7 - src/codec/MapForceUnlockCodec.ts | 6 - src/codec/MapGetAllCodec.ts | 8 +- src/codec/MapGetCodec.ts | 6 - src/codec/MapGetEntryViewCodec.ts | 5 - src/codec/MapIsEmptyCodec.ts | 6 - src/codec/MapIsLockedCodec.ts | 6 - src/codec/MapKeySetCodec.ts | 8 +- .../MapKeySetWithPagingPredicateCodec.ts | 8 +- src/codec/MapKeySetWithPredicateCodec.ts | 8 +- src/codec/MapLoadAllCodec.ts | 7 - src/codec/MapLoadGivenKeysCodec.ts | 7 - src/codec/MapLockCodec.ts | 6 - src/codec/MapProjectCodec.ts | 8 +- src/codec/MapProjectWithPredicateCodec.ts | 8 +- src/codec/MapPutAllCodec.ts | 6 - src/codec/MapPutCodec.ts | 6 - src/codec/MapPutIfAbsentCodec.ts | 6 - src/codec/MapPutTransientCodec.ts | 6 - src/codec/MapRemoveAllCodec.ts | 6 - src/codec/MapRemoveCodec.ts | 6 - src/codec/MapRemoveEntryListenerCodec.ts | 6 - src/codec/MapRemoveIfSameCodec.ts | 6 - src/codec/MapRemoveInterceptorCodec.ts | 6 - .../MapRemovePartitionLostListenerCodec.ts | 6 - src/codec/MapReplaceCodec.ts | 6 - src/codec/MapReplaceIfSameCodec.ts | 6 - src/codec/MapSetCodec.ts | 6 - src/codec/MapSizeCodec.ts | 6 - src/codec/MapSubmitToKeyCodec.ts | 6 - src/codec/MapTryLockCodec.ts | 6 - src/codec/MapTryPutCodec.ts | 6 - src/codec/MapTryRemoveCodec.ts | 6 - src/codec/MapUnlockCodec.ts | 6 - src/codec/MapValuesCodec.ts | 8 +- .../MapValuesWithPagingPredicateCodec.ts | 8 +- src/codec/MapValuesWithPredicateCodec.ts | 8 +- src/codec/MemberCodec.ts | 2 +- src/codec/MultiMapAddEntryListenerCodec.ts | 6 - .../MultiMapAddEntryListenerToKeyCodec.ts | 6 - src/codec/MultiMapClearCodec.ts | 7 - src/codec/MultiMapContainsEntryCodec.ts | 6 - src/codec/MultiMapContainsKeyCodec.ts | 6 - src/codec/MultiMapContainsValueCodec.ts | 6 - src/codec/MultiMapEntrySetCodec.ts | 8 +- src/codec/MultiMapForceUnlockCodec.ts | 6 - src/codec/MultiMapGetCodec.ts | 8 +- src/codec/MultiMapIsLockedCodec.ts | 6 - src/codec/MultiMapKeySetCodec.ts | 8 +- src/codec/MultiMapLockCodec.ts | 6 - src/codec/MultiMapPutCodec.ts | 6 - src/codec/MultiMapRemoveCodec.ts | 8 +- src/codec/MultiMapRemoveEntryCodec.ts | 6 - src/codec/MultiMapRemoveEntryListenerCodec.ts | 6 - src/codec/MultiMapSizeCodec.ts | 6 - src/codec/MultiMapTryLockCodec.ts | 6 - src/codec/MultiMapUnlockCodec.ts | 6 - src/codec/MultiMapValueCountCodec.ts | 6 - src/codec/MultiMapValuesCodec.ts | 8 +- src/codec/PNCounterAddCodec.ts | 10 +- src/codec/PNCounterGetCodec.ts | 10 +- ...PNCounterGetConfiguredReplicaCountCodec.ts | 8 - src/codec/QueueAddAllCodec.ts | 6 - src/codec/QueueAddListenerCodec.ts | 6 - src/codec/QueueClearCodec.ts | 7 - src/codec/QueueCompareAndRemoveAllCodec.ts | 6 - src/codec/QueueCompareAndRetainAllCodec.ts | 6 - src/codec/QueueContainsAllCodec.ts | 6 - src/codec/QueueContainsCodec.ts | 6 - src/codec/QueueDrainToCodec.ts | 8 +- src/codec/QueueDrainToMaxSizeCodec.ts | 8 +- src/codec/QueueIsEmptyCodec.ts | 6 - src/codec/QueueIteratorCodec.ts | 8 +- src/codec/QueueOfferCodec.ts | 6 - src/codec/QueuePeekCodec.ts | 6 - src/codec/QueuePollCodec.ts | 6 - src/codec/QueuePutCodec.ts | 6 - src/codec/QueueRemainingCapacityCodec.ts | 6 - src/codec/QueueRemoveCodec.ts | 6 - src/codec/QueueRemoveListenerCodec.ts | 6 - src/codec/QueueSizeCodec.ts | 6 - src/codec/QueueTakeCodec.ts | 6 - .../ReplicatedMapAddEntryListenerCodec.ts | 6 - ...ReplicatedMapAddEntryListenerToKeyCodec.ts | 6 - ...AddEntryListenerToKeyWithPredicateCodec.ts | 6 - ...edMapAddEntryListenerWithPredicateCodec.ts | 6 - ...icatedMapAddNearCacheEntryListenerCodec.ts | 6 - src/codec/ReplicatedMapClearCodec.ts | 7 - src/codec/ReplicatedMapContainsKeyCodec.ts | 6 - src/codec/ReplicatedMapContainsValueCodec.ts | 6 - src/codec/ReplicatedMapEntrySetCodec.ts | 8 +- src/codec/ReplicatedMapGetCodec.ts | 6 - src/codec/ReplicatedMapIsEmptyCodec.ts | 6 - src/codec/ReplicatedMapKeySetCodec.ts | 8 +- src/codec/ReplicatedMapPutAllCodec.ts | 6 - src/codec/ReplicatedMapPutCodec.ts | 6 - src/codec/ReplicatedMapRemoveCodec.ts | 6 - .../ReplicatedMapRemoveEntryListenerCodec.ts | 6 - src/codec/ReplicatedMapSizeCodec.ts | 6 - src/codec/ReplicatedMapValuesCodec.ts | 8 +- src/codec/RingbufferAddAllCodec.ts | 6 - src/codec/RingbufferAddCodec.ts | 6 - src/codec/RingbufferCapacityCodec.ts | 6 - src/codec/RingbufferHeadSequenceCodec.ts | 6 - src/codec/RingbufferReadManyCodec.ts | 10 +- src/codec/RingbufferReadOneCodec.ts | 6 - src/codec/RingbufferRemainingCapacityCodec.ts | 6 - src/codec/RingbufferSizeCodec.ts | 6 - src/codec/RingbufferTailSequenceCodec.ts | 6 - src/codec/SemaphoreAcquireCodec.ts | 7 - src/codec/SemaphoreAvailablePermitsCodec.ts | 6 - src/codec/SemaphoreDrainPermitsCodec.ts | 6 - src/codec/SemaphoreInitCodec.ts | 6 - src/codec/SemaphoreReducePermitsCodec.ts | 7 - src/codec/SemaphoreReleaseCodec.ts | 7 - src/codec/SemaphoreTryAcquireCodec.ts | 6 - src/codec/SetAddAllCodec.ts | 6 - src/codec/SetAddCodec.ts | 6 - src/codec/SetAddListenerCodec.ts | 6 - src/codec/SetClearCodec.ts | 7 - src/codec/SetCompareAndRemoveAllCodec.ts | 6 - src/codec/SetCompareAndRetainAllCodec.ts | 6 - src/codec/SetContainsAllCodec.ts | 6 - src/codec/SetContainsCodec.ts | 6 - src/codec/SetGetAllCodec.ts | 8 +- src/codec/SetIsEmptyCodec.ts | 6 - src/codec/SetRemoveCodec.ts | 6 - src/codec/SetRemoveListenerCodec.ts | 6 - src/codec/SetSizeCodec.ts | 6 - src/codec/TopicAddMessageListenerCodec.ts | 6 - src/codec/TopicPublishCodec.ts | 6 - src/codec/TopicRemoveMessageListenerCodec.ts | 6 - src/codec/UUIDCodec.ts | 4 +- src/codec/Utils.ts | 4 +- src/config/ClientNetworkConfig.ts | 2 +- src/config/Config.ts | 41 +- src/config/ConfigBuilder.ts | 117 +- src/config/ConfigPatternMatcher.ts | 8 +- src/config/EvictionPolicy.ts | 2 +- src/config/FlakeIdGeneratorConfig.ts | 4 +- src/config/InMemoryFormat.ts | 2 +- src/config/JsonConfigLocator.ts | 17 +- src/config/NearCacheConfig.ts | 4 +- src/config/ReliableTopicConfig.ts | 2 +- src/config/SSLOptions.ts | 8 +- src/config/SerializationConfig.ts | 4 +- src/connection/BasicSSLOptionsFactory.ts | 22 +- src/connection/SSLOptionsFactory.ts | 2 +- src/core/EntryEventType.ts | 2 +- src/core/EntryView.ts | 2 +- src/core/ItemListener.ts | 7 +- src/core/MapListener.ts | 5 +- src/core/Member.ts | 6 +- src/core/MemberSelectors.ts | 2 +- src/core/OverflowPolicy.ts | 2 +- src/core/Predicate.ts | 24 +- src/core/ReadOnlyLazyList.ts | 21 +- src/core/UUID.ts | 19 +- src/core/VectorClock.ts | 14 +- src/index.ts | 16 +- src/invocation/ClientConnection.ts | 14 +- src/invocation/ClientConnectionManager.ts | 95 +- src/invocation/ClusterService.ts | 80 +- src/invocation/ConnectionAuthenticator.ts | 29 +- src/invocation/InvocationService.ts | 153 +- src/logging/DefaultLogger.ts | 3 +- src/logging/LoggingService.ts | 7 +- src/logging/NoLogger.ts | 3 +- .../AlwaysFreshStaleReadDetectorImpl.ts | 4 +- src/nearcache/DataRecord.ts | 7 +- src/nearcache/MetadataFetcher.ts | 57 +- src/nearcache/NearCache.ts | 99 +- src/nearcache/RepairingHandler.ts | 44 +- src/nearcache/RepairingTask.ts | 24 +- src/nearcache/StaleReadDetectorImpl.ts | 6 +- src/protocol/ErrorCodec.ts | 13 +- src/protocol/ErrorFactory.ts | 58 +- src/protocol/StackTraceElementCodec.ts | 5 +- src/proxy/AtomicLongProxy.ts | 24 +- src/proxy/BaseProxy.ts | 110 +- src/proxy/FlakeIdGenerator.ts | 5 +- src/proxy/FlakeIdGeneratorProxy.ts | 7 +- src/proxy/IAtomicLong.ts | 3 +- src/proxy/IList.ts | 2 +- src/proxy/IMap.ts | 37 +- src/proxy/IQueue.ts | 2 +- src/proxy/IReplicatedMap.ts | 15 +- src/proxy/IRingbuffer.ts | 8 +- src/proxy/ISemaphore.ts | 2 +- src/proxy/ISet.ts | 22 +- src/proxy/ListProxy.ts | 58 +- src/proxy/LockProxy.ts | 25 +- src/proxy/MapProxy.ts | 557 +- src/proxy/MultiMap.ts | 4 +- src/proxy/MultiMapProxy.ts | 140 +- src/proxy/NearCachedMapProxy.ts | 133 +- src/proxy/PNCounter.ts | 4 +- src/proxy/PNCounterProxy.ts | 38 +- src/proxy/PartitionSpecificProxy.ts | 5 +- src/proxy/ProxyManager.ts | 131 +- src/proxy/QueueProxy.ts | 94 +- src/proxy/ReplicatedMapProxy.ts | 117 +- src/proxy/SemaphoreProxy.ts | 8 +- src/proxy/SetProxy.ts | 45 +- src/proxy/flakeid/AutoBatcher.ts | 18 +- src/proxy/ringbuffer/LazyReadResultSet.ts | 18 +- src/proxy/ringbuffer/RingbufferProxy.ts | 28 +- src/proxy/topic/ITopic.ts | 4 +- src/proxy/topic/RawTopicMessage.ts | 4 +- .../topic/ReliableTopicListenerRunner.ts | 26 +- src/proxy/topic/ReliableTopicProxy.ts | 62 +- src/proxy/topic/TopicMessage.ts | 2 +- src/proxy/topic/TopicMessageListener.ts | 4 +- src/proxy/topic/TopicOverloadPolicy.ts | 2 +- src/serialization/Data.ts | 80 +- src/serialization/DefaultPredicates.ts | 54 +- src/serialization/DefaultSerializer.ts | 31 +- src/serialization/HeapData.ts | 14 +- src/serialization/ObjectData.ts | 168 +- src/serialization/PredicateFactory.ts | 16 +- src/serialization/Serializable.ts | 9 +- src/serialization/SerializationService.ts | 168 +- src/serialization/SerializationUtil.ts | 10 +- src/serialization/portable/ClassDefinition.ts | 14 +- .../portable/ClassDefinitionContext.ts | 17 +- .../portable/ClassDefinitionWriter.ts | 24 +- .../portable/DefaultPortableReader.ts | 106 +- .../portable/DefaultPortableWriter.ts | 34 +- .../portable/MorphingPortableReader.ts | 132 +- src/serialization/portable/PortableContext.ts | 68 +- .../portable/PortableSerializer.ts | 95 +- src/util/ArrayComparator.ts | 4 +- src/util/UuidUtil.ts | 6 +- test/BuildMetadataTest.js | 4 +- test/ClientProxyTest.js | 8 +- test/ClientReconnectTest.js | 40 +- test/ClusterServiceTest.js | 38 +- test/HazelcastClientTest.js | 24 +- test/HeartbeatTest.js | 60 +- test/LifecycleServiceTest.js | 36 +- test/ListenerServiceTest.js | 32 +- test/ListenersOnReconnectTest.js | 21 +- test/LoggingTest.js | 34 +- test/LostConnectionTest.js | 26 +- test/MembershipListenerTest.js | 42 +- test/RC.js | 12 +- test/Util.js | 17 +- test/config/SchemaValidationTest.js | 2 +- .../hazelcast-client-ssl-basicssloptions.json | 4 +- test/flakeid/FlakeIdGeneratorProxyTest.js | 4 +- ...stortInvalidationMetadataEntryProcessor.js | 2 +- test/javaclasses/IdentifiedEntryProcessor.js | 4 +- test/javaclasses/PrefixFilter.js | 4 +- test/list/ListProxyTest.js | 8 +- test/lock/LockProxyTest.js | 2 +- test/map/ComparatorFactory.js | 8 +- test/map/MapAggregatorsDoubleTest.js | 2 +- test/map/MapAggregatorsIntTest.js | 2 +- test/map/MapAggregatorsLongTest.js | 2 +- test/map/MapEntryProcessorTest.js | 36 +- test/map/MapPartitionAwareTest.js | 36 +- test/map/MapPredicateTest.js | 84 +- test/map/MapProxyTest.js | 398 +- test/map/MapStoreTest.js | 60 +- test/map/NearCachedMapStressTest.js | 4 +- test/map/NearCachedMapTest.js | 4 +- test/map/hazelcast_identifiedfactory.xml | 6 +- test/map/hazelcast_mapstore.xml | 6 +- ...cast_nearcache_batchinvalidation_false.xml | 6 +- test/multimap/MultiMapProxyListenersTest.js | 1 - test/multimap/MultiMapProxyLockTest.js | 2 +- .../InvalidationMetadataDistortionTest.js | 6 +- test/nearcache/LostInvalidationsTest.js | 32 +- test/nearcache/MigratedDataTest.js | 16 +- .../NearCacheSimpleInvalidationTest.js | 10 +- test/nearcache/NearCacheTest.js | 34 +- .../hazelcast_eventual_nearcache.xml | 6 +- ...cast_nearcache_batchinvalidation_false.xml | 6 +- test/nearcache/impl/RepairingTaskTest.js | 16 +- .../hazelcast_crdtreplication_delayed.xml | 6 +- test/pncounter/hazelcast_litemember.xml | 8 +- test/queue/QueueProxyTest.js | 172 +- test/queue/hazelcast_queue.xml | 6 +- .../replicatedmap/hazelcast_replicatedmap.xml | 6 +- test/ringbuffer/LazyReadResultSetTest.js | 8 +- test/ringbuffer/hazelcast_ringbuffer.xml | 6 +- test/serialization/APortable.js | 13 +- .../AnIdentifiedDataSerializable.js | 10 +- test/serialization/AnInnerPortable.js | 10 +- test/serialization/BinaryCompatibilityTest.js | 26 +- test/serialization/CustomSerializable.js | 2 + test/serialization/CustomSerializerTest.js | 15 +- .../DefaultSerializersLiveTest.js | 22 +- test/serialization/DefaultSerializersTest.js | 16 +- test/serialization/GlobalSerializerTest.js | 13 +- .../IdentifiedDataSerializableTest.js | 16 +- test/serialization/ObjectDataTest.js | 16 +- test/serialization/PortableObjects.js | 27 +- .../PortableSerializersLiveTest.js | 14 +- test/serialization/PortableTest.js | 10 +- test/serialization/ReferenceObjects.js | 4 +- .../portable/ClassDefinitionTest.js | 44 +- test/set/SetProxyTest.js | 14 +- test/ssl/ClientSSLAuthenticationTest.js | 8 +- test/ssl/ClientSslTest.js | 7 +- test/ssl/hazelcast-ma-optional.xml | 9 +- test/ssl/hazelcast-ma-required.xml | 9 +- test/ssl/hazelcast-ssl.xml | 6 +- test/topic/hazelcast_topic.xml | 6 +- tsconfig.json | 5 +- tslint.json | 119 +- 444 files changed, 5953 insertions(+), 7115 deletions(-) diff --git a/benchmark/SimpleMapBenchmark.js b/benchmark/SimpleMapBenchmark.js index becca54d8..ddebf4033 100644 --- a/benchmark/SimpleMapBenchmark.js +++ b/benchmark/SimpleMapBenchmark.js @@ -11,23 +11,22 @@ var Test = { map: undefined, finishCallback: undefined, ops: 0, - increment: function() { + increment: function () { this.ops = this.ops + 1; if (this.ops === REQ_COUNT) { var date = new Date(); - this.run = function() {}; + this.run = function () { + }; this.finishCallback(date); } }, - run: function() { + run: function () { var key = Math.random() * ENTRY_COUNT; var opType = Math.floor(Math.random() * 100); - if (opType < GET_PERCENTAGE ) { - this.map.get(key). - then(this.increment.bind(this)); + if (opType < GET_PERCENTAGE) { + this.map.get(key).then(this.increment.bind(this)); } else if (opType < GET_PERCENTAGE + PUT_PERCENTAGE) { - this.map.put(key, value_string). - then(this.increment.bind(this)); + this.map.put(key, value_string).then(this.increment.bind(this)); } else { this.map.remove(key) .then(this.increment.bind(this)); @@ -36,11 +35,11 @@ var Test = { } }; var Client = require('../.').Client; -Client.newHazelcastClient().then(function(hazelcastClient) { +Client.newHazelcastClient().then(function (hazelcastClient) { Test.map = hazelcastClient.getMap('default'); var start; - Test.finishCallback = function(finish) { - console.log('Took ' + (finish - start)/1000 + ' seconds for ' + REQ_COUNT + ' requests'); + Test.finishCallback = function (finish) { + console.log('Took ' + (finish - start) / 1000 + ' seconds for ' + REQ_COUNT + ' requests'); console.log('Ops/s: ' + REQ_COUNT / ((finish - start) / 1000)); hazelcastClient.shutdown(); }; diff --git a/code_samples/aggregation.js b/code_samples/aggregation.js index b3a263a27..36f328547 100644 --- a/code_samples/aggregation.js +++ b/code_samples/aggregation.js @@ -36,7 +36,7 @@ Client.newHazelcastClient().then(function (hazelcastClient) { console.log('There are ' + count + ' children.'); return map.aggregate(Aggregators.numberAvg()); }).then(function (avgAge) { - console.log('Average age is '+ avgAge); + console.log('Average age is ' + avgAge); return client.shutdown(); }); }); diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index adf3a5308..5a6595250 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -24,19 +24,19 @@ function TimeOfDay(hour, minute, second) { this.second = second; } -TimeOfDay.prototype.hzGetCustomId = function() { +TimeOfDay.prototype.hzGetCustomId = function () { return 42; }; var CustomSerializer = { - getId: function() { + getId: function () { return 42; }, - write: function(out, timeofday) { + write: function (out, timeofday) { var secondPoint = (timeofday.hour * 60 + timeofday.minute) * 60 + timeofday.second; out.writeInt(secondPoint); }, - read: function(inp) { + read: function (inp) { var obj = new TimeOfDay(); var unit = inp.readInt(); obj.second = unit % 60; @@ -49,9 +49,9 @@ var CustomSerializer = { } }; -var giveInformation = function(timeofday) { +var giveInformation = function (timeofday) { console.log('-------------------'); - console.log('Custom deserialized: ' + !!(timeofday.customDeserialized) ); + console.log('Custom deserialized: ' + !!(timeofday.customDeserialized)); console.log('Hour: ' + timeofday.hour); console.log('Minute: ' + timeofday.minute); console.log('Second: ' + timeofday.second); @@ -63,9 +63,9 @@ Client.newHazelcastClient(cfg).then(function (client) { var map = client.getMap('time'); var t = new TimeOfDay(5, 32, 59); giveInformation(t); - map.put(1, t).then(function() { + map.put(1, t).then(function () { return map.get(1); - }).then(function(deserialized) { + }).then(function (deserialized) { giveInformation(deserialized); client.shutdown(); }); diff --git a/code_samples/distributedobject_listener.js b/code_samples/distributedobject_listener.js index bee668544..a64212fd5 100644 --- a/code_samples/distributedobject_listener.js +++ b/code_samples/distributedobject_listener.js @@ -15,9 +15,13 @@ */ var Client = require('hazelcast-client').Client; -Client.newHazelcastClient().then(function(hazelcastClient) { - hazelcastClient.addDistributedObjectListener(function(serviceName, name, event) { - console.log('Distributed object event >>> ' + JSON.stringify({serviceName: serviceName, name: name, event: event})); +Client.newHazelcastClient().then(function (hazelcastClient) { + hazelcastClient.addDistributedObjectListener(function (serviceName, name, event) { + console.log('Distributed object event >>> ' + JSON.stringify({ + serviceName: serviceName, + name: name, + event: event + })); }); var mapname = 'test' + new Date(); //this causes a created event diff --git a/code_samples/flakeidgenerator.js b/code_samples/flakeidgenerator.js index e56611c30..bd8353c09 100644 --- a/code_samples/flakeidgenerator.js +++ b/code_samples/flakeidgenerator.js @@ -16,7 +16,7 @@ var Client = require('hazelcast-client').Client; -Client.newHazelcastClient().then(function(hazelcastClient){ +Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; var flakeIdGenerator = hazelcastClient.getFlakeIdGenerator('generator'); diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index fb6808620..312951f07 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -25,15 +25,15 @@ var cfg = new Config.ClientConfig(); cfg.serializationConfig.globalSerializer = { mousseSerialize: mousse.serialize, mousseDeserialize: mousse.deserialize, - getId: function() { + getId: function () { return 10; }, - write: function(out, obj) { + write: function (out, obj) { out.writeUTF(this.mousseSerialize(obj)) }, - read: function(inp) { + read: function (inp) { var representation = inp.readUTF(); - return this.mousseDeserialize(representation).then(function(obj) { + return this.mousseDeserialize(representation).then(function (obj) { return obj; }); } diff --git a/code_samples/lifecycle_listener.js b/code_samples/lifecycle_listener.js index 4fd91a960..61bc13bd4 100644 --- a/code_samples/lifecycle_listener.js +++ b/code_samples/lifecycle_listener.js @@ -17,9 +17,9 @@ var HazelcastClient = require('hazelcast-client').Client; var Config = require('hazelcast-client').Config; var cfg = new Config.ClientConfig(); -cfg.listeners.addLifecycleListener(function(state) { +cfg.listeners.addLifecycleListener(function (state) { console.log('Lifecycle Event >>> ' + state); }); -HazelcastClient.newHazelcastClient(cfg).then(function(hazelcastClient) { +HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { hazelcastClient.shutdown(); }); diff --git a/code_samples/list.js b/code_samples/list.js index b75026dff..ce2949bb7 100644 --- a/code_samples/list.js +++ b/code_samples/list.js @@ -16,7 +16,7 @@ var Client = require('hazelcast-client').Client; -Client.newHazelcastClient().then(function(hazelcastClient){ +Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; var list = hazelcastClient.getList('people'); diff --git a/code_samples/logging.js b/code_samples/logging.js index 7d7321e71..892aa6c53 100644 --- a/code_samples/logging.js +++ b/code_samples/logging.js @@ -18,7 +18,7 @@ var winston = require('winston'); var Config = require('hazelcast-client').Config; var HazelcastClient = require('hazelcast-client').Client; -if(process.argv.length != 3){ +if (process.argv.length != 3) { console.log('Run as node logging.js [logger]'); console.log('[logger]: winston/default/off'); } else { @@ -40,7 +40,7 @@ if(process.argv.length != 3){ 'silly' ], - log: function(level, className, message, furtherInfo) { + log: function (level, className, message, furtherInfo) { this.logger.log(this.levels[level], className + ' ' + message); } }; @@ -49,7 +49,7 @@ if(process.argv.length != 3){ cfg.properties['hazelcast.logging'] = process.argv[2]; } - HazelcastClient.newHazelcastClient(cfg).then(function(client){ + HazelcastClient.newHazelcastClient(cfg).then(function (client) { client.shutdown(); }); } diff --git a/code_samples/map_entry_listener.js b/code_samples/map_entry_listener.js index 03f909033..d7844f4a9 100644 --- a/code_samples/map_entry_listener.js +++ b/code_samples/map_entry_listener.js @@ -16,23 +16,23 @@ var Client = require('hazelcast-client').Client; var listener = { - added: function(key, oldVal, newVal) { + added: function (key, oldVal, newVal) { console.log('added key: ' + key + ', old value: ' + oldVal + ', new value: ' + newVal); }, - removed: function(key, oldVal, newVal) { + removed: function (key, oldVal, newVal) { console.log('removed key: ' + key + ', old value: ' + oldVal + ', new value: ' + newVal); } }; -var pushNotification = function(map, key, value) { +var pushNotification = function (map, key, value) { return map.put(key, value); }; -var removeNotification = function(map, key) { +var removeNotification = function (map, key) { return map.remove(key); }; -Client.newHazelcastClient().then(function(client) { +Client.newHazelcastClient().then(function (client) { var map = client.getMap('notifications'); map.addEntryListener(listener, undefined, true).then(function () { return pushNotification(map, 1, 'new-value'); diff --git a/code_samples/near_cache.js b/code_samples/near_cache.js index 94bd55199..1e365f341 100644 --- a/code_samples/near_cache.js +++ b/code_samples/near_cache.js @@ -21,7 +21,7 @@ function do50000Gets(client, mapName) { }).then(function () { timerStart = Date.now(); var requests = []; - for(var i = 0; i < 50000; i++) { + for (var i = 0; i < 50000; i++) { requests.push(client.getMap(mapName).get('item')); } return Promise.all(requests); diff --git a/code_samples/org-website/CustomSerializerSample.js b/code_samples/org-website/CustomSerializerSample.js index 3a46b34bd..b6d7b7148 100644 --- a/code_samples/org-website/CustomSerializerSample.js +++ b/code_samples/org-website/CustomSerializerSample.js @@ -24,7 +24,7 @@ CustomSerializer.prototype.write = function (output, t) { } }; -CustomSerializer.prototype.read = function(reader) { +CustomSerializer.prototype.read = function (reader) { var len = reader.readInt(); var str = ''; for (var i = 0; i < len; i++) { diff --git a/code_samples/org-website/EntryProcessorSample.js b/code_samples/org-website/EntryProcessorSample.js index 0db09313f..e6589a62c 100644 --- a/code_samples/org-website/EntryProcessorSample.js +++ b/code_samples/org-website/EntryProcessorSample.js @@ -8,14 +8,14 @@ function IdentifiedEntryProcessor(value) { IdentifiedEntryProcessor.prototype.readData = function (inp) { }; -IdentifiedEntryProcessor.prototype.writeData = function(outp) { +IdentifiedEntryProcessor.prototype.writeData = function (outp) { }; IdentifiedEntryProcessor.prototype.getFactoryId = function () { return 1; }; -IdentifiedEntryProcessor.prototype.getClassId = function() { +IdentifiedEntryProcessor.prototype.getClassId = function () { return 9; }; diff --git a/code_samples/org-website/IdentifiedDataSerializableSample.js b/code_samples/org-website/IdentifiedDataSerializableSample.js index 0941c5984..2ddad931c 100644 --- a/code_samples/org-website/IdentifiedDataSerializableSample.js +++ b/code_samples/org-website/IdentifiedDataSerializableSample.js @@ -11,7 +11,7 @@ Employee.prototype.readData = function (input) { this.name = input.readUTF(); }; -Employee.prototype.writeData = function(output) { +Employee.prototype.writeData = function (output) { output.writeInt(this.id); output.writeUTF(this.name); }; @@ -20,7 +20,7 @@ Employee.prototype.getFactoryId = function () { return 1000; }; -Employee.prototype.getClassId = function() { +Employee.prototype.getClassId = function () { return 100; }; diff --git a/code_samples/org-website/PortableSerializableSample.js b/code_samples/org-website/PortableSerializableSample.js index 1b275a46b..7ea76893d 100644 --- a/code_samples/org-website/PortableSerializableSample.js +++ b/code_samples/org-website/PortableSerializableSample.js @@ -14,7 +14,7 @@ Customer.prototype.readPortable = function (reader) { this.lastOrder = reader.readLong('lastOrder').toNumber(); }; -Customer.prototype.writePortable = function(writer) { +Customer.prototype.writePortable = function (writer) { writer.writeUTF('name', this.name); writer.writeInt('id', this.id); writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); @@ -24,7 +24,7 @@ Customer.prototype.getFactoryId = function () { return 1; }; -Customer.prototype.getClassId = function() { +Customer.prototype.getClassId = function () { return 1; }; diff --git a/code_samples/paging_predicate.js b/code_samples/paging_predicate.js index 4bc53b5ef..5971a3764 100644 --- a/code_samples/paging_predicate.js +++ b/code_samples/paging_predicate.js @@ -24,33 +24,33 @@ var cfg = new Config.ClientConfig(); //because Hazelcast server should be able to deserialize the comparator in order to sort entries. //So the same class should be registered to Hazelcast server instance. var comparator = { - getFactoryId: function() { + getFactoryId: function () { return 1; }, - getClassId: function() { + getClassId: function () { return 10; }, //This comparator sorts entries according to their keys in reverse alphabetical order. - sort: function(a, b) { + sort: function (a, b) { if (a[0] > b[0]) return -1; if (a[0] < b[0]) return 1; return 0; }, - readData: function() { + readData: function () { }, - writeData: function() { + writeData: function () { } }; //We register our comparator object as IdentifiedDataSerializable. cfg.serializationConfig.dataSerializableFactories[1] = { - create: function() { + create: function () { return comparator; } }; @@ -60,7 +60,7 @@ Client.newHazelcastClient(cfg).then(function (client) { var map = client.getMap('test'); map.putAll([['a', 1], ['b', 2], ['c', 3], ['d', 4], ['e', 5], ['f', 6], ['g', 7]]).then(function () { return map.size(); - }).then(function(mapSize) { + }).then(function (mapSize) { console.log('Added ' + mapSize + ' elements.'); predicate.setPage(0); diff --git a/code_samples/queue.js b/code_samples/queue.js index 08ceefc3a..a691c68e6 100644 --- a/code_samples/queue.js +++ b/code_samples/queue.js @@ -16,7 +16,7 @@ var Client = require('hazelcast-client').Client; -Client.newHazelcastClient().then(function(hazelcastClient){ +Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; var queue = hazelcastClient.getQueue('people'); diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js index 9b6f913fb..760e2138f 100644 --- a/code_samples/ssl_authentication.js +++ b/code_samples/ssl_authentication.js @@ -17,7 +17,7 @@ var Config = require('hazelcast-client').Config; var HazelcastClient = require('hazelcast-client').Client; -if (process.argv.length < 5 ) { +if (process.argv.length < 5) { console.log('Usage: \n' + 'node ssl_authentication.js [servername] [certificate-file] [trusted-ca]'); return diff --git a/package-lock.json b/package-lock.json index 97736ef4b..e991b1929 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,2542 +1,2542 @@ { - "name": "hazelcast-client", - "version": "0.7.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@types/bluebird": { - "version": "3.5.12", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.12.tgz", - "integrity": "sha1-GAiBhH/2ZOnilKXc3NTI6aFQ5ac=", - "dev": true - }, - "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha1-9OWvMenpsZbY5fyopeLiCqPWC2k=", - "dev": true - }, - "@types/node": { - "version": "6.0.87", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.87.tgz", - "integrity": "sha1-WrV3T4NRozqTUJn6a+hQqgsK1WQ=", - "dev": true - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", - "dev": true, - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", - "dev": true - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true - }, - "bluebird": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", - "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=" - }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" - } - }, - "chai": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", - "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", - "dev": true, - "requires": { - "assertion-error": "1.1.0", - "check-error": "1.0.2", - "deep-eql": "3.0.1", - "get-func-name": "2.0.0", - "pathval": "1.1.0", - "type-detect": "4.0.7" - }, - "dependencies": { - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", - "dev": true - }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha1-38lARACtHI/gI+faHfHBR8S0RN8=", - "dev": true, - "requires": { - "type-detect": "4.0.7" - } - }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true - }, - "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", - "dev": true - }, - "type-detect": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", - "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", - "dev": true - } - } - }, - "chai-as-promised": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", - "integrity": "sha1-CGRdgl3rhpbuYXJdv1kMAS6wDKA=", - "dev": true, - "requires": { - "check-error": "1.0.2" - }, - "dependencies": { - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - } - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", - "dev": true - }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "1.0.2" - } - }, - "dateformat": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", - "dev": true, - "requires": { - "get-stdin": "4.0.1", - "meow": "3.7.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "requires": { - "readable-stream": "1.1.14" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "0.2.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "fancy-log": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", - "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", - "dev": true, - "requires": { - "ansi-gray": "0.1.1", - "color-support": "1.1.3", - "time-stamp": "1.1.0" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "glogg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", - "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "gulp-util": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz", - "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=", - "dev": true, - "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "1.0.12", - "fancy-log": "1.3.2", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", - "replace-ext": "0.0.1", - "through2": "2.0.1", - "vinyl": "0.5.3" - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "1.0.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "1.0.0" - } - }, - "hazelcast-remote-controller": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hazelcast-remote-controller/-/hazelcast-remote-controller-1.0.0.tgz", - "integrity": "sha1-PxFIxrf6taLqm9pkA7iebf3eoZo=", - "dev": true, - "requires": { - "thrift": "0.9.3" - }, - "dependencies": { - "thrift": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/thrift/-/thrift-0.9.3.tgz", - "integrity": "sha1-mQITNkA9QuCLjvrbHDegbXmYsqY=", - "dev": true, - "requires": { - "node-int64": "0.3.3", - "q": "1.0.1", - "ws": "0.4.32" - }, - "dependencies": { - "node-int64": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz", - "integrity": "sha1-LW5rLs5d6FiLQ9iNG8QbJs0fqE0=", - "dev": true - }, - "q": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz", - "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ=", - "dev": true - }, - "ws": { - "version": "0.4.32", - "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", - "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", - "dev": true, - "requires": { - "commander": "2.1.0", - "nan": "1.0.0", - "options": "0.0.6", - "tinycolor": "0.0.1" - }, - "dependencies": { - "commander": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", - "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=", - "dev": true - }, - "nan": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", - "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=", - "dev": true - }, - "options": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", - "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", - "dev": true - }, - "tinycolor": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", - "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=", - "dev": true - } - } + "name": "hazelcast-client", + "version": "0.7.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@types/bluebird": { + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.12.tgz", + "integrity": "sha1-GAiBhH/2ZOnilKXc3NTI6aFQ5ac=", + "dev": true + }, + "@types/long": { + "version": "3.0.32", + "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", + "integrity": "sha1-9OWvMenpsZbY5fyopeLiCqPWC2k=", + "dev": true + }, + "@types/node": { + "version": "6.0.87", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.87.tgz", + "integrity": "sha1-WrV3T4NRozqTUJn6a+hQqgsK1WQ=", + "dev": true + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" } - } - } - } - }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", - "dev": true - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "1.1.1" - } - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "istanbul": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "dev": true, - "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "glob": "5.0.15", - "handlebars": "4.0.11", - "js-yaml": "3.10.0", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.3.0", - "wordwrap": "1.0.0" - }, - "dependencies": { - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "dev": true, - "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" - }, - "dependencies": { - "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", + "dev": true + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", + "dev": true + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", + "dev": true + }, + "bluebird": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", + "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=" + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "chai": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", + "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", + "dev": true, + "requires": { + "assertion-error": "1.1.0", + "check-error": "1.0.2", + "deep-eql": "3.0.1", + "get-func-name": "2.0.0", + "pathval": "1.1.0", + "type-detect": "4.0.7" }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" - }, - "dependencies": { - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true + "dependencies": { + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", + "dev": true + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha1-38lARACtHI/gI+faHfHBR8S0RN8=", + "dev": true, + "requires": { + "type-detect": "4.0.7" + } }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" - } + "get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true + "pathval": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", + "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", + "dev": true }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "1.1.2" - } + "type-detect": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", + "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", + "dev": true } - } + } + }, + "chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha1-CGRdgl3rhpbuYXJdv1kMAS6wDKA=", + "dev": true, + "requires": { + "check-error": "1.0.2" }, - "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, - "requires": { - "amdefine": "1.0.1" - }, - "dependencies": { - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true, - "optional": true + "dependencies": { + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true } - } } - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - }, - "dependencies": { - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "dev": true + }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "dev": true + }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } + }, + "dateformat": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", + "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "meow": "3.7.0" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true + }, + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + } + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, + "glogg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", + "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "gulp-util": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz", + "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "1.0.12", + "fancy-log": "1.3.2", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.1", + "vinyl": "0.5.3" + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "dev": true, + "requires": { + "glogg": "1.0.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "hazelcast-remote-controller": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hazelcast-remote-controller/-/hazelcast-remote-controller-1.0.0.tgz", + "integrity": "sha1-PxFIxrf6taLqm9pkA7iebf3eoZo=", + "dev": true, + "requires": { + "thrift": "0.9.3" }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dependencies": { + "thrift": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/thrift/-/thrift-0.9.3.tgz", + "integrity": "sha1-mQITNkA9QuCLjvrbHDegbXmYsqY=", + "dev": true, + "requires": { + "node-int64": "0.3.3", + "q": "1.0.1", + "ws": "0.4.32" }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dependencies": { + "node-int64": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz", + "integrity": "sha1-LW5rLs5d6FiLQ9iNG8QbJs0fqE0=", + "dev": true + }, + "q": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz", + "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ=", + "dev": true + }, + "ws": { + "version": "0.4.32", + "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", + "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", + "dev": true, + "requires": { + "commander": "2.1.0", + "nan": "1.0.0", + "options": "0.0.6", + "tinycolor": "0.0.1" + }, + "dependencies": { + "commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=", + "dev": true + }, + "nan": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", + "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=", + "dev": true + }, + "options": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", + "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", + "dev": true + }, + "tinycolor": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", + "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=", + "dev": true + } + } + } } - } } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true } - } - }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, - "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" - }, - "dependencies": { - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - }, - "dependencies": { - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - } - } + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "dev": true + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "istanbul": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", + "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", + "dev": true, + "requires": { + "abbrev": "1.0.9", + "async": "1.5.2", + "escodegen": "1.8.1", + "esprima": "2.7.3", + "glob": "5.0.15", + "handlebars": "4.0.11", + "js-yaml": "3.10.0", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "once": "1.4.0", + "resolve": "1.1.7", + "supports-color": "3.2.3", + "which": "1.3.0", + "wordwrap": "1.0.0" }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "optional": true + "dependencies": { + "abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "dev": true, + "requires": { + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "optional": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - }, - "dependencies": { - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "optional": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "optional": true, - "requires": { - "is-buffer": "1.1.6" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", - "dev": true, - "optional": true + "dependencies": { + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } - } }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true, - "optional": true + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } } - } + } + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true + "dependencies": { + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true, + "optional": true + } } - } + } + } + }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + }, + "dependencies": { + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "0.1.4" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "optional": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "optional": true, - "requires": { - "is-buffer": "1.1.6" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", - "dev": true, - "optional": true + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } } - } + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } + } + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + }, + "dependencies": { + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true + } + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + }, + "dependencies": { + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + } + } + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true, + "optional": true + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "dev": true, + "optional": true }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true, - "optional": true + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + }, + "dependencies": { + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "optional": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "optional": true, + "requires": { + "is-buffer": "1.1.6" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", + "dev": true, + "optional": true + } + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true, + "optional": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true, + "optional": true + } + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true, + "optional": true + } + } + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "dev": true, + "optional": true, + "requires": { + "align-text": "0.1.4" + }, + "dependencies": { + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "dev": true, + "optional": true, + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "optional": true, + "requires": { + "is-buffer": "1.1.6" + }, + "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", + "dev": true, + "optional": true + } + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true, + "optional": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true, + "optional": true + } + } + } + } + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, + "optional": true + } + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true, + "optional": true + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, + "optional": true + } + } + } + } + } + } + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + }, + "dependencies": { + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true } - } } - } }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=", + "dev": true } - } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "optional": true + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1.0.9" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } } - } - } - } - } - } - }, - "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=", - "dev": true, - "requires": { - "argparse": "1.0.9", - "esprima": "4.0.0" - }, - "dependencies": { - "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, - "requires": { - "sprintf-js": "1.0.3" - }, - "dependencies": { - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + } + } + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", + "dev": true, + "requires": { + "isexe": "2.0.0" + }, + "dependencies": { + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + } + } + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true } - } - }, - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=", - "dev": true } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1.0.9" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", + "dev": true + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", + "dev": true + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", + "dev": true + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", + "dev": true + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", + "dev": true + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", + "dev": true + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "dev": true, + "requires": { + "lodash._root": "3.0.1" } - } }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", + "dev": true + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" } - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", - "dev": true, - "requires": { - "isexe": "2.0.0" - }, - "dependencies": { - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", + "dev": true + }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" } - } }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "requires": { - "lodash._root": "3.0.1" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - } - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "dev": true, - "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" - } - }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" - } - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "mocha": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", - "integrity": "sha1-HgSA/jbS2lhY0etqzDhBiybqog0=", - "dev": true, - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.9.0", - "debug": "2.6.8", - "diff": "3.2.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.1", - "growl": "1.9.2", - "he": "1.1.1", - "json3": "3.3.2", - "lodash.create": "3.1.1", - "mkdirp": "0.5.1", - "supports-color": "3.1.2" - }, - "dependencies": { - "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", - "dev": true - }, - "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "dev": true, - "requires": { - "graceful-readlink": "1.0.1" - }, - "dependencies": { - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" } - } - }, - "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + }, + "long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } - } }, - "diff": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", - "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=", - "dev": true + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", - "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - }, - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { "brace-expansion": "1.1.8" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "mocha": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", + "integrity": "sha1-HgSA/jbS2lhY0etqzDhBiybqog0=", + "dev": true, + "requires": { + "browser-stdout": "1.3.0", + "commander": "2.9.0", + "debug": "2.6.8", + "diff": "3.2.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.1", + "growl": "1.9.2", + "he": "1.1.1", + "json3": "3.3.2", + "lodash.create": "3.1.1", + "mkdirp": "0.5.1", + "supports-color": "3.1.2" + }, + "dependencies": { + "browser-stdout": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", + "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", + "dev": true + }, + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dependencies": { + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + } } - } - } - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - } - } - }, - "growl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", - "dev": true - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, - "lodash.create": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", - "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", - "dev": true, - "requires": { - "lodash._baseassign": "3.2.0", - "lodash._basecreate": "3.0.3", - "lodash._isiterateecall": "3.0.9" - }, - "dependencies": { - "lodash._baseassign": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", - "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", - "dev": true, - "requires": { - "lodash._basecopy": "3.0.1", - "lodash.keys": "3.1.2" - }, - "dependencies": { - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" - }, - "dependencies": { - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "diff": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", + "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", + "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true + "dependencies": { + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } + } + } + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } + } + }, + "growl": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", + "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "dev": true + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, + "lodash.create": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", + "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", + "dev": true, + "requires": { + "lodash._baseassign": "3.2.0", + "lodash._basecreate": "3.0.3", + "lodash._isiterateecall": "3.0.9" + }, + "dependencies": { + "lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash.keys": "3.1.2" + }, + "dependencies": { + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + }, + "dependencies": { + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", + "dev": true + } + } + } + } + }, + "lodash._basecreate": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", + "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", + "dev": true + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true + } + } + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } + } + }, + "supports-color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", + "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + } } - } } - } - }, - "lodash._basecreate": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", - "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", - "dev": true + } + }, + "mousse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/mousse/-/mousse-0.3.1.tgz", + "integrity": "sha1-0Hq3MFiaBWSsJpa2wvVLZXgY+7Q=", + "dev": true, + "requires": { + "collections": "1.2.4", + "q": "1.0.0" }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true + "dependencies": { + "collections": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/collections/-/collections-1.2.4.tgz", + "integrity": "sha1-Pi8WRe1D188f4khAYAH6q0Ln5GM=", + "dev": true, + "requires": { + "weak-map": "1.0.5" + }, + "dependencies": { + "weak-map": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", + "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=", + "dev": true + } + } + }, + "q": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.0.0.tgz", + "integrity": "sha1-3B+SxFh75U94U7Kdwo5tJDqISY0=", + "dev": true + } } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "dev": true, + "requires": { + "duplexer2": "0.0.2" } - } }, - "supports-color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "dev": true, + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.1" } - } - } - } - }, - "mousse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/mousse/-/mousse-0.3.1.tgz", - "integrity": "sha1-0Hq3MFiaBWSsJpa2wvVLZXgY+7Q=", - "dev": true, - "requires": { - "collections": "1.2.4", - "q": "1.0.0" - }, - "dependencies": { - "collections": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/collections/-/collections-1.2.4.tgz", - "integrity": "sha1-Pi8WRe1D188f4khAYAH6q0Ln5GM=", - "dev": true, - "requires": { - "weak-map": "1.0.5" - }, - "dependencies": { - "weak-map": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", - "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=", - "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "dev": true + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "1.3.1" } - } }, - "q": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.0.0.tgz", - "integrity": "sha1-3B+SxFh75U94U7Kdwo5tJDqISY0=", - "dev": true - } - } - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "requires": { - "duplexer2": "0.0.2" - } - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "1.3.1" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "2.0.1" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "2.0.4" - } - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - } - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" - } - }, - "remap-istanbul": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.9.6.tgz", - "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==", - "dev": true, - "requires": { - "amdefine": "1.0.1", - "gulp-util": "3.0.7", - "istanbul": "0.4.5", - "minimatch": "3.0.4", - "source-map": "0.6.1", - "through2": "2.0.1" - } - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", - "dev": true, - "requires": { - "glob": "7.1.2" - }, - "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - }, - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "dev": true, + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, + "remap-istanbul": { + "version": "0.9.6", + "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.9.6.tgz", + "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==", + "dev": true, + "requires": { + "amdefine": "1.0.1", + "gulp-util": "3.0.7", + "istanbul": "0.4.5", + "minimatch": "3.0.4", + "source-map": "0.6.1", + "through2": "2.0.1" + } + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.0.2" + } + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "dev": true + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", + "dev": true, + "requires": { + "glob": "7.1.2" }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dependencies": { + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } + } + } + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } } - } - } - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - } - } - } - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "sinon": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.0.0.tgz", - "integrity": "sha1-pUpfAjeqHdIhXl6ByJtCtQxP22s=", - "dev": true, - "requires": { - "diff": "3.4.0", - "formatio": "1.2.0", - "lodash.get": "4.4.2", - "lolex": "2.3.1", - "native-promise-only": "0.8.1", - "nise": "1.2.0", - "path-to-regexp": "1.7.0", - "samsam": "1.3.0", - "text-encoding": "0.6.4", - "type-detect": "4.0.7" - }, - "dependencies": { - "diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", - "dev": true - }, - "formatio": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", - "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", - "dev": true, - "requires": { - "samsam": "1.3.0" - } - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "lolex": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz", - "integrity": "sha1-PSMZiURx6glQ72RpLq0qUxjP82I=", - "dev": true - }, - "native-promise-only": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", - "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=", - "dev": true - }, - "nise": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz", - "integrity": "sha1-B51srbvLErow448cmZ82rU1rqlM=", - "dev": true, - "requires": { - "formatio": "1.2.0", - "just-extend": "1.1.27", - "lolex": "1.6.0", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" - }, - "dependencies": { - "just-extend": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", - "integrity": "sha1-7G55QQ/5FORyZSq/oOYDwD1g6QU=", - "dev": true - }, - "lolex": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", - "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=", - "dev": true } - } - }, - "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } - }, - "samsam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", - "integrity": "sha1-jR2TUOJWItow3j5EumkrUiGrfFA=", - "dev": true - }, - "text-encoding": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", - "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", - "dev": true - }, - "type-detect": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", - "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", - "dev": true - } - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "sparkles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", - "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", - "dev": true - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "dev": true, - "requires": { - "spdx-license-ids": "1.2.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "4.0.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "through2": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz", - "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=", - "dev": true, - "requires": { - "readable-stream": "2.0.6", - "xtend": "4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true }, - "readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" - } - } - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "tslint": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz", - "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "colors": "1.1.2", - "commander": "2.13.0", - "diff": "3.4.0", - "glob": "7.1.2", - "minimatch": "3.0.4", - "resolve": "1.5.0", - "semver": "5.5.0", - "tslib": "1.9.0", - "tsutils": "2.19.1" - }, - "dependencies": { - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true + }, + "sinon": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.0.0.tgz", + "integrity": "sha1-pUpfAjeqHdIhXl6ByJtCtQxP22s=", + "dev": true, + "requires": { + "diff": "3.4.0", + "formatio": "1.2.0", + "lodash.get": "4.4.2", + "lolex": "2.3.1", + "native-promise-only": "0.8.1", + "nise": "1.2.0", + "path-to-regexp": "1.7.0", + "samsam": "1.3.0", + "text-encoding": "0.6.4", + "type-detect": "4.0.7" + }, + "dependencies": { + "diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", + "dev": true }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "formatio": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", + "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", + "dev": true, + "requires": { + "samsam": "1.3.0" + } + }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, + "lolex": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz", + "integrity": "sha1-PSMZiURx6glQ72RpLq0qUxjP82I=", + "dev": true }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "native-promise-only": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", + "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=", + "dev": true + }, + "nise": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz", + "integrity": "sha1-B51srbvLErow448cmZ82rU1rqlM=", + "dev": true, + "requires": { + "formatio": "1.2.0", + "just-extend": "1.1.27", + "lolex": "1.6.0", + "path-to-regexp": "1.7.0", + "text-encoding": "0.6.4" + }, + "dependencies": { + "just-extend": { + "version": "1.1.27", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", + "integrity": "sha1-7G55QQ/5FORyZSq/oOYDwD1g6QU=", + "dev": true + }, + "lolex": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", + "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=", + "dev": true + } } - } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "dev": true, + "requires": { + "isarray": "0.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } } - } }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true + "samsam": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", + "integrity": "sha1-jR2TUOJWItow3j5EumkrUiGrfFA=", + "dev": true + }, + "text-encoding": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", + "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", + "dev": true + }, + "type-detect": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", + "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", + "dev": true } - } - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true } - } - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", - "dev": true - }, - "diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", - "dev": true - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - }, - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "sparkles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", + "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", + "dev": true + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "dev": true, + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { + "get-stdin": "4.0.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "through2": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz", + "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=", + "dev": true, + "requires": { + "readable-stream": "2.0.6", + "xtend": "4.0.1" }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" + } } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", + "dev": true + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, + "tslint": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz", + "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "colors": "1.1.2", + "commander": "2.13.0", + "diff": "3.4.0", + "glob": "7.1.2", + "minimatch": "3.0.4", + "resolve": "1.5.0", + "semver": "5.5.0", + "tslib": "1.9.0", + "tsutils": "2.19.1" }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + }, + "dependencies": { + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + } + } + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", + "dev": true + }, + "diff": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", + "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", + "dev": true + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + }, + "dependencies": { + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + }, + "dependencies": { + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + } + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + } + } + } + } + }, + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=", + "dev": true, + "requires": { + "path-parse": "1.0.5" + }, + "dependencies": { + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + } + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", + "dev": true + }, + "tslib": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha1-43qG/ajLuvI6BX9HPJ9Nxk5fwug=", + "dev": true + }, + "tsutils": { + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.19.1.tgz", + "integrity": "sha1-dtfr3qnXp79KBfUOrTcBsBaHCNc=", + "dev": true, + "requires": { + "tslib": "1.9.0" + } } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true } - } }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "typescript": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz", + "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=", + "dev": true + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "dev": true, + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "dev": true, + "requires": { + "clone": "1.0.3", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "winston": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz", + "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=", + "dev": true, + "requires": { + "async": "1.0.0", + "colors": "1.0.3", + "cycle": "1.0.3", + "eyes": "0.1.8", + "isstream": "0.1.2", + "stack-trace": "0.0.10" + }, + "dependencies": { + "async": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", + "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=", + "dev": true }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "colors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", + "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", + "dev": true + }, + "cycle": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", + "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", + "dev": true + }, + "eyes": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", + "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", + "dev": true + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", + "dev": true } - } } - } - }, - "resolve": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", - "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=", - "dev": true, - "requires": { - "path-parse": "1.0.5" - }, - "dependencies": { - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true - } - } }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", - "dev": true - }, - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha1-43qG/ajLuvI6BX9HPJ9Nxk5fwug=", - "dev": true - }, - "tsutils": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.19.1.tgz", - "integrity": "sha1-dtfr3qnXp79KBfUOrTcBsBaHCNc=", - "dev": true, - "requires": { - "tslib": "1.9.0" - } - } - } - }, - "typescript": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz", - "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "dev": true, - "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" - } - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "dev": true, - "requires": { - "clone": "1.0.3", - "clone-stats": "0.0.1", - "replace-ext": "0.0.1" - } - }, - "winston": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz", - "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=", - "dev": true, - "requires": { - "async": "1.0.0", - "colors": "1.0.3", - "cycle": "1.0.3", - "eyes": "0.1.8", - "isstream": "0.1.2", - "stack-trace": "0.0.10" - }, - "dependencies": { - "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=", - "dev": true - }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true - }, - "cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", - "dev": true - }, - "eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", - "dev": true - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", - "dev": true + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true } - } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true } - } } diff --git a/package.json b/package.json index 4edaaf411..b6b723fd9 100644 --- a/package.json +++ b/package.json @@ -1,60 +1,60 @@ { - "name": "hazelcast-client", - "version": "0.8.0", - "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", - "main": "lib/index.js", - "dependencies": { - "bluebird": "3.5.0", - "long": "3.2.0" - }, - "devDependencies": { - "@types/bluebird": "3.5.12", - "@types/long": "3.0.32", - "@types/node": "6.0.87", - "chai": "4.1.2", - "chai-as-promised": "7.1.1", - "hazelcast-remote-controller": "^1.0.0", - "istanbul": "0.4.5", - "jsonschema": "^1.2.2", - "mocha": "3.5.3", - "mousse": "0.3.1", - "remap-istanbul": "0.9.6", - "rimraf": "2.6.2", - "sinon": "4.0.0", - "tslint": "5.7.0", - "typescript": "2.5.2", - "winston": "2.3.1" - }, - "scripts": { - "clean": "rimraf lib typings *.jar *.log", - "precompile": "node create-build-info.js", - "compile": "tsc", - "pretest": "./scripts/download-rc.sh", - "test": "mocha --recursive", - "precoverage": "./scripts/download-rc.sh", - "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", - "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", - "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", - "pregenerate-docs": "rimraf docs", - "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", - "lint": "tslint --project tsconfig.json -t stylish" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/hazelcast/hazelcast-nodejs-client.git" - }, - "keywords": [ - "hazelcast", - "nodejs", - "node", - "client", - "data", - "grid" - ], - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues" - }, - "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme", - "typings": "./lib/index" + "name": "hazelcast-client", + "version": "0.8.0", + "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", + "main": "lib/index.js", + "dependencies": { + "bluebird": "3.5.0", + "long": "3.2.0" + }, + "devDependencies": { + "@types/bluebird": "3.5.12", + "@types/long": "3.0.32", + "@types/node": "6.0.87", + "chai": "4.1.2", + "chai-as-promised": "7.1.1", + "hazelcast-remote-controller": "^1.0.0", + "istanbul": "0.4.5", + "jsonschema": "^1.2.2", + "mocha": "3.5.3", + "mousse": "0.3.1", + "remap-istanbul": "0.9.6", + "rimraf": "2.6.2", + "sinon": "4.0.0", + "tslint": "5.7.0", + "typescript": "2.5.2", + "winston": "2.3.1" + }, + "scripts": { + "clean": "rimraf lib typings *.jar *.log", + "precompile": "node create-build-info.js", + "compile": "tsc", + "pretest": "./scripts/download-rc.sh", + "test": "mocha --recursive", + "precoverage": "./scripts/download-rc.sh", + "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", + "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", + "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", + "pregenerate-docs": "rimraf docs", + "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", + "lint": "tslint --project tsconfig.json -t stylish" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/hazelcast/hazelcast-nodejs-client.git" + }, + "keywords": [ + "hazelcast", + "nodejs", + "node", + "client", + "data", + "grid" + ], + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues" + }, + "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme", + "typings": "./lib/index" } diff --git a/src/Address.ts b/src/Address.ts index 3e52de880..37fdae41b 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import {IdentifiedDataSerializable} from './serialization/Serializable'; -import {DataInput, DataOutput} from './serialization/Data'; import * as net from 'net'; import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; +import {DataInput, DataOutput} from './serialization/Data'; +import {IdentifiedDataSerializable} from './serialization/Serializable'; class Address implements IdentifiedDataSerializable { diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index 8f7756633..57b45ad4e 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -15,8 +15,9 @@ */ /* tslint:disable:no-bitwise */ -import {Data} from './serialization/Data'; import Address = require('./Address'); +import {Data} from './serialization/Data'; + export class BitsUtil { static EVENT_MEMBER = 200; static EVENT_MEMBERLIST = 201; @@ -72,9 +73,10 @@ export class BitsUtil { static calculateSizeData(data: Data) { return BitsUtil.INT_SIZE_IN_BYTES + data.totalSize(); } + public static getStringSize(value: string, nullable: boolean = false): number { // int32 for string length - var size = 4; + let size = 4; if (nullable) { size += 1; @@ -90,12 +92,13 @@ export class BitsUtil { } public static calculateSizeBuffer(value: Buffer) { - var size = 4; + let size = 4; size += value.length; return size; } + public static calculateSizeAddress(value: Address) { - var size = 4; + let size = 4; size += this.calculateSizeString(value.host); return size; } diff --git a/src/BuildMetadata.ts b/src/BuildMetadata.ts index 85368ea2f..dccd10e8f 100644 --- a/src/BuildMetadata.ts +++ b/src/BuildMetadata.ts @@ -15,11 +15,10 @@ */ export class BuildMetadata { - public static readonly UNKNOWN_VERSION_ID = -1; + public static readonly UNKNOWN_VERSION_ID = -1; private static readonly MAJOR_VERSION_MULTIPLIER = 10000; private static readonly MINOR_VERSION_MULTIPLIER = 100; - private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?(-BETA-.)?$/; public static calculateVersion(versionString: string): number { @@ -42,4 +41,3 @@ export class BuildMetadata { } } - diff --git a/src/ClientInfo.ts b/src/ClientInfo.ts index 191bfed3d..57c192d51 100644 --- a/src/ClientInfo.ts +++ b/src/ClientInfo.ts @@ -15,7 +15,7 @@ */ import Address = require('./Address'); -import {UUID} from './core/UUID'; + export class ClientInfo { /** * Unique id of this client instance. It is provided by owner server instance. diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 09af0d8e8..98e28a47c 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -45,13 +45,17 @@ class ClientMessage { private buffer: Buffer; private cursor: number = BitsUtil.HEADER_SIZE; - private isRetryable : boolean; + private isRetryable: boolean; + + constructor(buffer: Buffer) { + this.buffer = buffer; + } public static newClientMessage(payloadSize: number): ClientMessage { - var totalSize = BitsUtil.HEADER_SIZE + payloadSize; - var buffer = new Buffer(totalSize); + const totalSize = BitsUtil.HEADER_SIZE + payloadSize; + const buffer = new Buffer(totalSize); buffer.fill(0, 0, totalSize); - var message = new ClientMessage(buffer); + const message = new ClientMessage(buffer); message.setDataOffset(BitsUtil.HEADER_SIZE); message.setVersion(BitsUtil.VERSION); message.setFrameLength(totalSize); @@ -60,16 +64,12 @@ class ClientMessage { return message; } - constructor(buffer: Buffer) { - this.buffer = buffer; - } - getBuffer(): Buffer { return this.buffer; } getCorrelationId(): Long { - var offset = BitsUtil.CORRELATION_ID_FIELD_OFFSET; + const offset = BitsUtil.CORRELATION_ID_FIELD_OFFSET; return this.readLongInternal(offset); } @@ -148,24 +148,13 @@ class ClientMessage { this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; } - - private writeLongInternal(value: any, offset: number) { - if (!Long.isLong(value)) { - value = Long.fromValue(value); - } - - this.buffer.writeInt32LE(value.low, offset); - this.buffer.writeInt32LE(value.high, offset + 4); - } - - appendLong(value: any) { this.writeLongInternal(value, this.cursor); this.cursor += BitsUtil.LONG_SIZE_IN_BYTES; } appendString(value: string) { - var length = value.length; + const length = value.length; this.buffer.writeInt32LE(length, this.cursor); this.cursor += 4; this.buffer.write(value, this.cursor); @@ -173,7 +162,7 @@ class ClientMessage { } appendBuffer(buffer: Buffer) { - var length = buffer.length; + const length = buffer.length; this.appendInt32(length); buffer.copy(this.buffer, this.cursor); this.cursor += length; @@ -192,12 +181,12 @@ class ClientMessage { } readData(): Data { - var dataPayload: Buffer = this.readBuffer(); + const dataPayload: Buffer = this.readBuffer(); return new HeapData(dataPayload); } readByte(): number { - var value = this.buffer.readUInt8(this.cursor); + const value = this.buffer.readUInt8(this.cursor); this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; return value; } @@ -207,41 +196,35 @@ class ClientMessage { } readUInt8(): number { - var value = this.buffer.readUInt8(this.cursor); + const value = this.buffer.readUInt8(this.cursor); this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; return value; } readInt32(): number { - var value = this.buffer.readInt32LE(this.cursor); + const value = this.buffer.readInt32LE(this.cursor); this.cursor += BitsUtil.INT_SIZE_IN_BYTES; return value; } readLong(): Long { - var value = this.readLongInternal(this.cursor); + const value = this.readLongInternal(this.cursor); this.cursor += BitsUtil.LONG_SIZE_IN_BYTES; return value; } - private readLongInternal(offset: number) { - var low = this.buffer.readInt32LE(offset); - var high = this.buffer.readInt32LE(offset + 4); - return new Long(low, high); - } - readString(): string { - var length = this.buffer.readInt32LE(this.cursor); + const length = this.buffer.readInt32LE(this.cursor); this.cursor += BitsUtil.INT_SIZE_IN_BYTES; - var value = this.buffer.toString('utf8', this.cursor, this.cursor + length); + const value = this.buffer.toString('utf8', this.cursor, this.cursor + length); this.cursor += length; return value; } readBuffer(): Buffer { - var size = this.buffer.readUInt32LE(this.cursor); + const size = this.buffer.readUInt32LE(this.cursor); this.cursor += BitsUtil.INT_SIZE_IN_BYTES; - var result = new Buffer(size); + const result = new Buffer(size); this.buffer.copy(result, 0, this.cursor, this.cursor + size); this.cursor += size; return result; @@ -254,5 +237,21 @@ class ClientMessage { readMapEntry(): any { // TODO } + + private writeLongInternal(value: any, offset: number) { + if (!Long.isLong(value)) { + value = Long.fromValue(value); + } + + this.buffer.writeInt32LE(value.low, offset); + this.buffer.writeInt32LE(value.high, offset + 4); + } + + private readLongInternal(offset: number) { + const low = this.buffer.readInt32LE(offset); + const high = this.buffer.readInt32LE(offset + 4); + return new Long(low, high); + } } + export = ClientMessage; diff --git a/src/ClusterDataFactory.ts b/src/ClusterDataFactory.ts index cf5e74e30..8fc68fb75 100644 --- a/src/ClusterDataFactory.ts +++ b/src/ClusterDataFactory.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {IdentifiedDataSerializableFactory, IdentifiedDataSerializable} from './serialization/Serializable'; import Address = require('./Address'); import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; +import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './serialization/Serializable'; export class ClusterDataFactory implements IdentifiedDataSerializableFactory { diff --git a/src/DataStoreHashMap.ts b/src/DataStoreHashMap.ts index a2333b3a3..a3d6dad68 100644 --- a/src/DataStoreHashMap.ts +++ b/src/DataStoreHashMap.ts @@ -15,11 +15,11 @@ */ import {Data} from './serialization/Data'; -export class DataKeyedHashMap { - private internalStore: Map>>; +export class DataKeyedHashMap { size: number; + private internalStore: Map>>; constructor() { this.internalStore = new Map(); @@ -32,7 +32,7 @@ export class DataKeyedHashMap { } delete(key: Data): boolean { - var existingIndex = this.findIndexInBucket(key); + const existingIndex = this.findIndexInBucket(key); if (existingIndex === -1) { return false; } else { @@ -47,8 +47,8 @@ export class DataKeyedHashMap { } get(key: Data): T { - var keyHash = key.hashCode(); - var existingIndex = this.findIndexInBucket(key); + const keyHash = key.hashCode(); + const existingIndex = this.findIndexInBucket(key); if (existingIndex !== -1) { return this.getOrCreateBucket(keyHash)[existingIndex].value; } else { @@ -57,30 +57,30 @@ export class DataKeyedHashMap { } set(key: Data, value: any): this { - var keyHash = key.hashCode(); - var existingIndex = this.findIndexInBucket(key); + const keyHash = key.hashCode(); + const existingIndex = this.findIndexInBucket(key); if (existingIndex !== -1) { this.getOrCreateBucket(keyHash)[existingIndex].value = value; } else { - this.getOrCreateBucket(keyHash).push({key: key, value: value}); + this.getOrCreateBucket(keyHash).push({key, value}); this.size++; } return this; } - values(): Array { - var snapshot: Array = []; + values(): T[] { + const snapshot: T[] = []; this.internalStore.forEach((bucket: Array>) => { - snapshot.push(...(bucket.map((item: InternalRecord) => { return item.value; }))); + snapshot.push(...(bucket.map((item: InternalRecord) => item.value))); }); return snapshot; } entries(): Array<[Data, T]> { - var snapshot: Array<[Data, T]> = []; + const snapshot: Array<[Data, T]> = []; this.internalStore.forEach((bucket: Array>) => { snapshot.push(...(bucket.map((item: InternalRecord) => { - return <[Data, T]>[item.key, item.value]; + return [item.key, item.value] as [Data, T]; }))); }); return snapshot; @@ -92,19 +92,19 @@ export class DataKeyedHashMap { * @returns index of the key if it exists, -1 if either bucket or item does not exist */ private findIndexInBucket(key: Data): number { - var keyHash = key.hashCode(); - var bucket = this.internalStore.get(keyHash); + const keyHash = key.hashCode(); + const bucket = this.internalStore.get(keyHash); if (bucket === undefined) { return -1; } else { - return bucket.findIndex((item: InternalRecord ) => { + return bucket.findIndex((item: InternalRecord) => { return item.key.equals(key); }); } } private getOrCreateBucket(key: number): Array> { - var bucket: Array>; + let bucket: Array>; bucket = this.internalStore.get(key); if (bucket === undefined) { bucket = []; diff --git a/src/DistributedObject.ts b/src/DistributedObject.ts index a88e8de93..7c9d4e5ee 100644 --- a/src/DistributedObject.ts +++ b/src/DistributedObject.ts @@ -15,26 +15,27 @@ */ import * as Promise from 'bluebird'; + export interface DistributedObject { /** * Returns the key of the partition that this DistributedObject is assigned to. * For a partitioned data structure, the returned value will not be null, but otherwise undefined. */ - getPartitionKey() : string; + getPartitionKey(): string; /** * Returns the unique name of this object. */ - getName() : string; + getName(): string; /** * Returns the service name for this object. */ - getServiceName() : string; + getServiceName(): string; /** * Destroys this object cluster-wide. * Clears all resources taken for this object. */ - destroy() : Promise; + destroy(): Promise; } diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 45f30ba5b..b3055217b 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -14,39 +14,38 @@ * limitations under the License. */ -import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; -import {InvocationService} from './invocation/InvocationService'; -import {ListenerService} from './ListenerService'; -import {ClientConfig} from './config/Config'; import * as Promise from 'bluebird'; -import {IMap} from './proxy/IMap'; -import {ISet} from './proxy/ISet'; -import {LoggingService} from './logging/LoggingService'; -import {LifecycleService, LifecycleEvent} from './LifecycleService'; +import {ClientInfo} from './ClientInfo'; import {ClientGetDistributedObjectsCodec} from './codec/ClientGetDistributedObjectsCodec'; +import {ClientConfig} from './config/Config'; +import {ConfigBuilder} from './config/ConfigBuilder'; import {DistributedObject} from './DistributedObject'; -import {ClientInfo} from './ClientInfo'; +import {Heartbeat} from './HeartbeatService'; import {ClientConnectionManager} from './invocation/ClientConnectionManager'; -import {ProxyManager} from './proxy/ProxyManager'; -import {PartitionService} from './PartitionService'; import {ClusterService} from './invocation/ClusterService'; -import {Heartbeat} from './HeartbeatService'; -import {IQueue} from './proxy/IQueue'; -import {IList} from './proxy/IList'; -import {ILock} from './proxy/ILock'; -import {MultiMap} from './proxy/MultiMap'; -import {IRingbuffer} from './proxy/IRingbuffer'; -import {ITopic} from './proxy/topic/ITopic'; -import {ReliableTopicProxy} from './proxy/topic/ReliableTopicProxy'; -import {IReplicatedMap} from './proxy/IReplicatedMap'; -import {ISemaphore} from './proxy/ISemaphore'; -import {IAtomicLong} from './proxy/IAtomicLong'; +import {InvocationService} from './invocation/InvocationService'; +import {LifecycleEvent, LifecycleService} from './LifecycleService'; +import {ListenerService} from './ListenerService'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; +import {LoggingService} from './logging/LoggingService'; import {RepairingTask} from './nearcache/RepairingTask'; -import {ConfigBuilder} from './config/ConfigBuilder'; +import {PartitionService} from './PartitionService'; import {ClientErrorFactory} from './protocol/ErrorFactory'; import {FlakeIdGenerator} from './proxy/FlakeIdGenerator'; +import {IAtomicLong} from './proxy/IAtomicLong'; +import {IList} from './proxy/IList'; +import {ILock} from './proxy/ILock'; +import {IMap} from './proxy/IMap'; +import {IQueue} from './proxy/IQueue'; +import {IReplicatedMap} from './proxy/IReplicatedMap'; +import {IRingbuffer} from './proxy/IRingbuffer'; +import {ISemaphore} from './proxy/ISemaphore'; +import {ISet} from './proxy/ISet'; +import {MultiMap} from './proxy/MultiMap'; import {PNCounter} from './proxy/PNCounter'; +import {ProxyManager} from './proxy/ProxyManager'; +import {ITopic} from './proxy/topic/ITopic'; +import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; export default class HazelcastClient { @@ -65,30 +64,12 @@ export default class HazelcastClient { private mapRepairingTask: RepairingTask; private errorFactory: ClientErrorFactory; - /** - * Creates a new client object and automatically connects to cluster. - * @param config Default {@link ClientConfig} is used when this parameter is absent. - * @returns a new client instance - */ - public static newHazelcastClient(config?: ClientConfig): Promise { - if (config == null) { - let configBuilder = new ConfigBuilder(); - return configBuilder.loadConfig().then(() => { - let client = new HazelcastClient(configBuilder.build()); - return client.init(); - }); - } else { - let client = new HazelcastClient(config); - return client.init(); - } - } - constructor(config?: ClientConfig) { if (config) { this.config = config; } - LoggingService.initialize(this.config.properties['hazelcast.logging']); + LoggingService.initialize(this.config.properties['hazelcast.logging'] as string); this.loggingService = LoggingService.getLoggingService(); this.invocationService = new InvocationService(this); this.listenerService = new ListenerService(this); @@ -103,22 +84,22 @@ export default class HazelcastClient { this.errorFactory = new ClientErrorFactory(); } - private init(): Promise { - return this.clusterService.start().then(() => { - return this.partitionService.initialize(); - }).then(() => { - return this.heartbeat.start(); - }).then(() => { - this.lifecycleService.emitLifecycleEvent(LifecycleEvent.started); - }).then(() => { - this.proxyManager.init(); - this.listenerService.start(); - this.loggingService.info('HazelcastClient', 'Client started'); - return this; - }).catch((e) => { - this.loggingService.error('HazelcastClient', 'Client failed to start', e); - throw e; - }); + /** + * Creates a new client object and automatically connects to cluster. + * @param config Default {@link ClientConfig} is used when this parameter is absent. + * @returns a new client instance + */ + public static newHazelcastClient(config?: ClientConfig): Promise { + if (config == null) { + const configBuilder = new ConfigBuilder(); + return configBuilder.loadConfig().then(() => { + const client = new HazelcastClient(configBuilder.build()); + return client.init(); + }); + } else { + const client = new HazelcastClient(config); + return client.init(); + } } /** @@ -134,13 +115,13 @@ export default class HazelcastClient { * @returns {Promise|Promise} */ getDistributedObjects(): Promise { - var clientMessage = ClientGetDistributedObjectsCodec.encodeRequest(); - var toObjectFunc = this.serializationService.toObject.bind(this); - var proxyManager = this.proxyManager; + const clientMessage = ClientGetDistributedObjectsCodec.encodeRequest(); + const toObjectFunc = this.serializationService.toObject.bind(this); + const proxyManager = this.proxyManager; return this.invocationService.invokeOnRandomTarget(clientMessage).then(function (resp) { - var response = ClientGetDistributedObjectsCodec.decodeResponse(resp, toObjectFunc).response; - return response.map((objectInfo: {[key: string]: any}) => { - return proxyManager.getOrCreateProxy(objectInfo['value'], objectInfo['key'], false); + const response = ClientGetDistributedObjectsCodec.decodeResponse(resp, toObjectFunc).response; + return response.map((objectInfo: { [key: string]: any }) => { + return proxyManager.getOrCreateProxy(objectInfo.value, objectInfo.key, false); }); }); } @@ -151,7 +132,7 @@ export default class HazelcastClient { * @returns {IMap} */ getMap(name: string): IMap { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.MAP_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.MAP_SERVICE) as IMap; } /** @@ -160,7 +141,7 @@ export default class HazelcastClient { * @returns {ISet} */ getSet(name: string): ISet { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.SET_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.SET_SERVICE) as ISet; } /** @@ -169,17 +150,16 @@ export default class HazelcastClient { * @returns {ILock} */ getLock(name: string): ILock { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.LOCK_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.LOCK_SERVICE) as ILock; } - /** * Returns the distributed queue instance with given name. * @param name * @returns {IQueue} */ getQueue(name: string): IQueue { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.QUEUE_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.QUEUE_SERVICE) as IQueue; } /** @@ -188,7 +168,7 @@ export default class HazelcastClient { * @returns {IQueue} */ getList(name: string): IList { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.LIST_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.LIST_SERVICE) as IList; } /** @@ -197,7 +177,7 @@ export default class HazelcastClient { * @returns {MultiMap} */ getMultiMap(name: string): MultiMap { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.MULTIMAP_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.MULTIMAP_SERVICE) as MultiMap; } /** @@ -206,7 +186,7 @@ export default class HazelcastClient { * @returns {IRingbuffer} */ getRingbuffer(name: string): IRingbuffer { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE) as IRingbuffer; } /** @@ -215,23 +195,23 @@ export default class HazelcastClient { * @returns {ITopic} */ getReliableTopic(name: string): ITopic { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.RELIABLETOPIC_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.RELIABLETOPIC_SERVICE) as ITopic; } getReplicatedMap(name: string): IReplicatedMap { - return >this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE) as IReplicatedMap; } getAtomicLong(name: string): IAtomicLong { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.ATOMICLONG_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.ATOMICLONG_SERVICE) as IAtomicLong; } getFlakeIdGenerator(name: string): FlakeIdGenerator { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.FLAKEID_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.FLAKEID_SERVICE) as FlakeIdGenerator; } getPNCounter(name: string): PNCounter { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE) as PNCounter; } /** @@ -240,7 +220,7 @@ export default class HazelcastClient { * @returns {ISemaphore} */ getSemaphore(name: string): ISemaphore { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.SEMAPHORE_SERVICE); + return this.proxyManager.getOrCreateProxy(name, ProxyManager.SEMAPHORE_SERVICE) as ISemaphore; } /** @@ -341,5 +321,22 @@ export default class HazelcastClient { this.invocationService.shutdown(); this.lifecycleService.emitLifecycleEvent(LifecycleEvent.shutdown); } -} + private init(): Promise { + return this.clusterService.start().then(() => { + return this.partitionService.initialize(); + }).then(() => { + return this.heartbeat.start(); + }).then(() => { + this.lifecycleService.emitLifecycleEvent(LifecycleEvent.started); + }).then(() => { + this.proxyManager.init(); + this.listenerService.start(); + this.loggingService.info('HazelcastClient', 'Client started'); + return this; + }).catch((e) => { + this.loggingService.error('HazelcastClient', 'Client failed to start', e); + throw e; + }); + } +} diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index 90f72bde5..4f58e9d90 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -15,8 +15,9 @@ */ export interface HazelcastErrorConstructor { - new(message: string, cause?: Error): HazelcastError; readonly prototype: Error; + + new(message: string, cause?: Error): HazelcastError; } export class HazelcastError extends Error { @@ -235,7 +236,6 @@ export class TargetDisconnectedError extends HazelcastError { } } - export class UnsupportedOperationError extends HazelcastError { constructor(msg: string, cause?: Error) { super(msg, cause); diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts index 09d484959..326fdb517 100644 --- a/src/HeartbeatService.ts +++ b/src/HeartbeatService.ts @@ -15,9 +15,9 @@ */ import {ClientPingCodec} from './codec/ClientPingCodec'; +import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; import HazelcastClient from './HazelcastClient'; import {ClientConnection} from './invocation/ClientConnection'; -import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; import {LoggingService} from './logging/LoggingService'; const PROPERTY_HEARTBEAT_INTERVAL: string = 'hazelcast.client.heartbeat.interval'; @@ -33,14 +33,14 @@ export class Heartbeat { private listeners: ConnectionHeartbeatListener[] = []; private logger = LoggingService.getLoggingService(); - //Actually it is a NodeJS.Timer. Another typing file that comes with a module we use causes TSD to see - //return type of setTimeout as number. Because of this we defined timer property as `any` type. + // Actually it is a NodeJS.Timer. Another typing file that comes with a module we use causes TSD to see + // return type of setTimeout as number. Because of this we defined timer property as `any` type. private timer: any; constructor(client: HazelcastClient) { this.client = client; - this.heartbeatInterval = this.client.getConfig().properties[PROPERTY_HEARTBEAT_INTERVAL]; - this.heartbeatTimeout = this.client.getConfig().properties[PROPERTY_HEARTBEAT_TIMEOUT]; + this.heartbeatInterval = this.client.getConfig().properties[PROPERTY_HEARTBEAT_INTERVAL] as number; + this.heartbeatTimeout = this.client.getConfig().properties[PROPERTY_HEARTBEAT_TIMEOUT] as number; } /** @@ -66,11 +66,11 @@ export class Heartbeat { } private heartbeatFunction() { - let estConnections = this.client.getConnectionManager().establishedConnections; - for (let address in estConnections) { - if ( estConnections[address]) { - let conn = estConnections[address]; - let timeSinceLastRead = new Date().getTime() - conn.getLastRead(); + const estConnections = this.client.getConnectionManager().establishedConnections; + for (const address in estConnections) { + if (estConnections[address]) { + const conn = estConnections[address]; + const timeSinceLastRead = new Date().getTime() - conn.getLastRead(); if (timeSinceLastRead > this.heartbeatTimeout) { if (conn.isHeartbeating()) { conn.setHeartbeating(false); @@ -78,7 +78,7 @@ export class Heartbeat { } } if (timeSinceLastRead > this.heartbeatInterval) { - let req = ClientPingCodec.encodeRequest(); + const req = ClientPingCodec.encodeRequest(); this.client.getInvocationService().invokeOnConnection(conn, req) .catch((error) => { if (conn.isAlive()) { diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index 53372205d..2fd754eff 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -15,14 +15,14 @@ */ import {EventEmitter} from 'events'; -import HazelcastClient from './HazelcastClient'; import {ImportConfig} from './config/ImportConfig'; +import HazelcastClient from './HazelcastClient'; import * as Util from './Util'; /** * Lifecycle events. */ -export var LifecycleEvent = { +export let LifecycleEvent = { /** * events are emitted with this name. */ @@ -42,7 +42,7 @@ export var LifecycleEvent = { /** * Disconnect completed gracefully. */ - shutdown: 'shutdown' + shutdown: 'shutdown', }; /** @@ -56,15 +56,15 @@ export class LifecycleService extends EventEmitter { super(); this.setMaxListeners(0); this.client = client; - let listeners = client.getConfig().listeners.lifecycle; + const listeners = client.getConfig().listeners.lifecycle; listeners.forEach((listener) => { this.on(LifecycleEvent.name, listener); }); - let listenerConfgs = client.getConfig().listenerConfigs; - listenerConfgs.forEach((importConfig : ImportConfig) => { - let path = importConfig.path; - let exportedName = importConfig.exportedName; - let listener = Util.loadNameFromPath(path, exportedName); + const listenerConfgs = client.getConfig().listenerConfigs; + listenerConfgs.forEach((importConfig: ImportConfig) => { + const path = importConfig.path; + const exportedName = importConfig.exportedName; + const listener = Util.loadNameFromPath(path, exportedName); this.on(LifecycleEvent.name, listener); }); this.emit(LifecycleEvent.name, LifecycleEvent.starting); @@ -75,7 +75,7 @@ export class LifecycleService extends EventEmitter { * @param state */ emitLifecycleEvent(state: string): void { - if ( !LifecycleEvent.hasOwnProperty(state)) { + if (!LifecycleEvent.hasOwnProperty(state)) { throw new Error(state + ' is not a valid lifecycle event'); } if (state === LifecycleEvent.started) { diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 51f9ac30b..5ac0ca9de 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -14,21 +14,21 @@ * limitations under the License. */ +import * as assert from 'assert'; +import * as Promise from 'bluebird'; +import {EventEmitter} from 'events'; import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; +import {Member} from './core/Member'; import HazelcastClient from './HazelcastClient'; -import {EventEmitter} from 'events'; -import {LoggingService} from './logging/LoggingService'; +import {HazelcastError} from './HazelcastError'; +import {ClientConnection} from './invocation/ClientConnection'; import {ClientEventRegistration} from './invocation/ClientEventRegistration'; +import {Invocation} from './invocation/InvocationService'; import {RegistrationKey} from './invocation/RegistrationKey'; -import {HazelcastError} from './HazelcastError'; +import {ListenerMessageCodec} from './ListenerMessageCodec'; +import {LoggingService} from './logging/LoggingService'; import {copyObjectShallow} from './Util'; import {UuidUtil} from './util/UuidUtil'; -import * as Promise from 'bluebird'; -import {Invocation} from './invocation/InvocationService'; -import {Member} from './core/Member'; -import * as assert from 'assert'; -import {ListenerMessageCodec} from './ListenerMessageCodec'; -import {ClientConnection} from './invocation/ClientConnection'; export class ListenerService implements ConnectionHeartbeatListener { private client: HazelcastClient; @@ -58,21 +58,11 @@ export class ListenerService implements ConnectionHeartbeatListener { start() { this.client.getConnectionManager().on('connectionOpened', this.onConnectionAdded.bind(this)); this.client.getConnectionManager().on('connectionClosed', this.onConnectionRemoved.bind(this)); - if (this.isSmart() ) { + if (this.isSmart()) { this.connectionRefreshTask = this.connectionRefreshHandler(); } } - protected connectionRefreshHandler(): void { - if (this.isShutdown) { - return; - } - this.trySyncConnectToAllConnections().catch((e) => {/*no-op*/}).finally(() => { - this.connectionRefreshTask = - setTimeout(this.connectionRefreshHandler.bind(this), this.connectionRefreshTaskInterval); - }); - } - onConnectionAdded(connection: ClientConnection) { this.reregisterListenersOnConnection(connection); @@ -83,15 +73,15 @@ export class ListenerService implements ConnectionHeartbeatListener { } onHeartbeatRestored(connection: ClientConnection): void { - var failedRegistrationsOnConn: Set = this.failedRegistrations.get(connection); + const failedRegistrationsOnConn: Set = this.failedRegistrations.get(connection); failedRegistrationsOnConn.forEach((userKey: string, ignored: string) => { this.invokeRegistrationFromRecord(userKey, connection); }); } reregisterListeners() { - var connections = this.client.getConnectionManager().getActiveConnections(); - for (var connAddress in connections) { + const connections = this.client.getConnectionManager().getActiveConnections(); + for (const connAddress in connections) { this.reregisterListenersOnConnection(connections[connAddress]); } } @@ -113,7 +103,7 @@ export class ListenerService implements ConnectionHeartbeatListener { this.failedRegistrations.delete(connection); this.activeRegistrations.forEach((registrationsOnUserKey: Map, userKey: string) => { - var eventRegistration: ClientEventRegistration = registrationsOnUserKey.get(connection); + const eventRegistration: ClientEventRegistration = registrationsOnUserKey.get(connection); if (eventRegistration !== undefined) { this.client.getInvocationService().removeEventHandler(eventRegistration.correlationId.toNumber()); } @@ -121,28 +111,28 @@ export class ListenerService implements ConnectionHeartbeatListener { } invokeRegistrationFromRecord(userRegistrationKey: string, connection: ClientConnection): Promise { - let deferred = Promise.defer(); - let activeRegsOnUserKey = this.activeRegistrations.get(userRegistrationKey); + const deferred = Promise.defer(); + const activeRegsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (activeRegsOnUserKey !== undefined && activeRegsOnUserKey.has(connection)) { deferred.resolve(activeRegsOnUserKey.get(connection)); return deferred.promise; } - let registrationKey = this.userRegistrationKeyInformation.get(userRegistrationKey); - let registerRequest = registrationKey.getRegisterRequest(); - let codec = registrationKey.getCodec(); - let invocation = new Invocation(this.client, registerRequest); - invocation.handler = registrationKey.getHandler(); + const registrationKey = this.userRegistrationKeyInformation.get(userRegistrationKey); + const registerRequest = registrationKey.getRegisterRequest(); + const codec = registrationKey.getCodec(); + const invocation = new Invocation(this.client, registerRequest); + invocation.handler = registrationKey.getHandler() as any; invocation.connection = connection; this.client.getInvocationService().invoke(invocation).then((responseMessage) => { - var correlationId = responseMessage.getCorrelationId(); - var response = codec.decodeAddResponse(responseMessage); - var eventRegistration = new ClientEventRegistration(response, correlationId, invocation.connection, codec); + const correlationId = responseMessage.getCorrelationId(); + const response = codec.decodeAddResponse(responseMessage); + const eventRegistration = new ClientEventRegistration(response, correlationId, invocation.connection, codec); this.logger.debug('ListenerService', 'Listener ' + userRegistrationKey + ' re-registered on ' + connection.toString()); deferred.resolve(eventRegistration); - }).catch((e => { - var failedRegsOnConnection = this.failedRegistrations.get(connection); + }).catch(((e) => { + let failedRegsOnConnection = this.failedRegistrations.get(connection); if (failedRegsOnConnection === undefined) { failedRegsOnConnection = new Set(); failedRegsOnConnection.add(userRegistrationKey); @@ -161,7 +151,7 @@ export class ListenerService implements ConnectionHeartbeatListener { if (this.isSmart()) { readyToRegisterPromise = this.trySyncConnectToAllConnections(); } else { - //No need for preparation, just return a resolved promise + // No need for preparation, just return a resolved promise readyToRegisterPromise = Promise.resolve(); } return readyToRegisterPromise.then(() => { @@ -169,12 +159,57 @@ export class ListenerService implements ConnectionHeartbeatListener { }); } + deregisterListener(userRegistrationKey: string): Promise { + const deferred = Promise.defer(); + const registrationsOnUserKey = this.activeRegistrations.get(userRegistrationKey); + if (registrationsOnUserKey === undefined) { + deferred.resolve(false); + return deferred.promise; + } + registrationsOnUserKey.forEach((eventRegistration: ClientEventRegistration, connection: ClientConnection) => { + const clientMessage = eventRegistration.codec.encodeRemoveRequest(eventRegistration.serverRegistrationId); + const invocation = new Invocation(this.client, clientMessage); + invocation.connection = eventRegistration.subscriber; + this.client.getInvocationService().invoke(invocation).then((responseMessage) => { + registrationsOnUserKey.delete(connection); + this.client.getInvocationService().removeEventHandler(eventRegistration.correlationId.low); + this.logger.debug('ListenerService', + 'Listener ' + userRegistrationKey + ' unregistered from ' + invocation.connection.toString()); + this.activeRegistrations.delete(userRegistrationKey); + this.userRegistrationKeyInformation.delete(userRegistrationKey); + deferred.resolve(true); + }); + }); + + return deferred.promise; + } + + isSmart(): boolean { + return this.isSmartService; + } + + shutdown(): void { + this.isShutdown = true; + clearTimeout(this.connectionRefreshTask); + } + + protected connectionRefreshHandler(): void { + if (this.isShutdown) { + return; + } + this.trySyncConnectToAllConnections().catch((e) => {/*no-op*/ + }).finally(() => { + this.connectionRefreshTask = + setTimeout(this.connectionRefreshHandler.bind(this), this.connectionRefreshTaskInterval); + }); + } + protected registerListenerInternal(codec: ListenerMessageCodec, listenerHandlerFunc: Function): Promise { - let activeConnections = copyObjectShallow(this.client.getConnectionManager().getActiveConnections()); - let userRegistrationKey: string = UuidUtil.generate().toString(); + const activeConnections = copyObjectShallow(this.client.getConnectionManager().getActiveConnections()); + const userRegistrationKey: string = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; - let deferred = Promise.defer(); - let registerRequest = codec.encodeAddRequest(this.isSmart()); + const deferred = Promise.defer(); + const registerRequest = codec.encodeAddRequest(this.isSmart()); connectionsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (connectionsOnUserKey === undefined) { connectionsOnUserKey = new Map(); @@ -182,17 +217,18 @@ export class ListenerService implements ConnectionHeartbeatListener { this.userRegistrationKeyInformation.set(userRegistrationKey, new RegistrationKey(userRegistrationKey, codec, registerRequest, listenerHandlerFunc)); } - for (let address in activeConnections) { + for (const address in activeConnections) { if (connectionsOnUserKey.has(activeConnections[address])) { continue; } - let invocation = new Invocation(this.client, registerRequest); - invocation.handler = listenerHandlerFunc; + const invocation = new Invocation(this.client, registerRequest); + invocation.handler = listenerHandlerFunc as any; invocation.connection = activeConnections[address]; this.client.getInvocationService().invoke(invocation).then((responseMessage) => { - let correlationId = responseMessage.getCorrelationId(); - let response = codec.decodeAddResponse(responseMessage); - let clientEventRegistration = new ClientEventRegistration(response, correlationId, invocation.connection, codec); + const correlationId = responseMessage.getCorrelationId(); + const response = codec.decodeAddResponse(responseMessage); + const clientEventRegistration = new ClientEventRegistration( + response, correlationId, invocation.connection, codec); this.logger.debug('ListenerService', 'Listener ' + userRegistrationKey + ' registered on ' + invocation.connection.toString()); connectionsOnUserKey.set(activeConnections[address], clientEventRegistration); @@ -208,47 +244,13 @@ export class ListenerService implements ConnectionHeartbeatListener { return deferred.promise; } - deregisterListener(userRegistrationKey: string): Promise { - let deferred = Promise.defer(); - let registrationsOnUserKey = this.activeRegistrations.get(userRegistrationKey); - if (registrationsOnUserKey === undefined) { - deferred.resolve(false); - return deferred.promise; - } - registrationsOnUserKey.forEach((eventRegistration: ClientEventRegistration, connection: ClientConnection) => { - let clientMessage = eventRegistration.codec.encodeRemoveRequest(eventRegistration.serverRegistrationId); - let invocation = new Invocation(this.client, clientMessage); - invocation.connection = eventRegistration.subscriber; - this.client.getInvocationService().invoke(invocation).then((responseMessage) => { - registrationsOnUserKey.delete(connection); - this.client.getInvocationService().removeEventHandler(eventRegistration.correlationId.low); - this.logger.debug('ListenerService', - 'Listener ' + userRegistrationKey + ' unregistered from ' + invocation.connection.toString()); - this.activeRegistrations.delete(userRegistrationKey); - this.userRegistrationKeyInformation.delete(userRegistrationKey); - deferred.resolve(true); - }); - }); - - return deferred.promise; - } - private trySyncConnectToAllConnections(): Promise { assert(this.isSmart()); - var members = this.client.getClusterService().getMembers(); - var promises: Promise[] = []; + const members = this.client.getClusterService().getMembers(); + const promises: Array> = []; members.forEach((member: Member) => { promises.push(this.client.getConnectionManager().getOrConnect(member.address)); }); return Promise.all(promises).thenReturn(); } - - isSmart(): boolean { - return this.isSmartService; - } - - shutdown(): void { - this.isShutdown = true; - clearTimeout(this.connectionRefreshTask); - } } diff --git a/src/PartitionService.ts b/src/PartitionService.ts index 71980acf4..c551f2fe0 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -16,17 +16,17 @@ import * as Promise from 'bluebird'; import HazelcastClient from './HazelcastClient'; -import GetPartitionsCodec = require('./codec/GetPartitionsCodec'); +import {LoggingService} from './logging/LoggingService'; import Address = require('./Address'); import ClientMessage = require('./ClientMessage'); -import {LoggingService} from './logging/LoggingService'; +import GetPartitionsCodec = require('./codec/GetPartitionsCodec'); const PARTITION_REFRESH_INTERVAL = 10000; export class PartitionService { private client: HazelcastClient; - private partitionMap: {[partitionId: number]: Address} = {}; + private partitionMap: { [partitionId: number]: Address } = {}; private partitionCount: number; private partitionRefreshTask: any; private isShutdown: boolean; @@ -54,17 +54,17 @@ export class PartitionService { if (this.isShutdown) { return Promise.resolve(); } - let ownerConnection = this.client.getClusterService().getOwnerConnection(); + const ownerConnection = this.client.getClusterService().getOwnerConnection(); if (ownerConnection == null) { return Promise.resolve(); } - let clientMessage: ClientMessage = GetPartitionsCodec.encodeRequest(); + const clientMessage: ClientMessage = GetPartitionsCodec.encodeRequest(); return this.client.getInvocationService() .invokeOnConnection(ownerConnection, clientMessage) - .then((clientMessage: ClientMessage) => { - var receivedPartitionMap = GetPartitionsCodec.decodeResponse(clientMessage); - for (var partitionId in receivedPartitionMap) { + .then((response: ClientMessage) => { + const receivedPartitionMap = GetPartitionsCodec.decodeResponse(response); + for (const partitionId in receivedPartitionMap) { this.partitionMap[partitionId] = receivedPartitionMap[partitionId]; } this.partitionCount = Object.keys(this.partitionMap).length; @@ -90,7 +90,7 @@ export class PartitionService { * @returns the partition id. */ getPartitionId(key: any) { - var partitionHash: number; + let partitionHash: number; if (typeof key === 'object' && 'getPartitionHash' in key) { partitionHash = key.getPartitionHash(); } else { diff --git a/src/Util.ts b/src/Util.ts index af30d192d..4128a4c83 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -14,14 +14,15 @@ * limitations under the License. */ -import * as Long from 'long'; -import {PagingPredicate} from './serialization/DefaultPredicates'; -import {IterationType} from './core/Predicate'; import * as assert from 'assert'; -import {Comparator} from './core/Comparator'; +import * as Long from 'long'; import * as Path from 'path'; import {JsonConfigLocator} from './config/JsonConfigLocator'; +import {Comparator} from './core/Comparator'; +import {IterationType} from './core/Predicate'; +import {PagingPredicate} from './serialization/DefaultPredicates'; import Address = require('./Address'); + export function assertNotNull(v: any) { assert.notEqual(v, null, 'Non null value expected.'); } @@ -30,10 +31,10 @@ export function assertArray(x: any) { assert(Array.isArray(x), 'Should be array.'); } -export function shuffleArray(array: Array): void { - var randomIndex: number; - var temp: T; - for (var i = array.length; i > 1; i--) { +export function shuffleArray(array: T[]): void { + let randomIndex: number; + let temp: T; + for (let i = array.length; i > 1; i--) { randomIndex = Math.floor(Math.random() * i); temp = array[i - 1]; array[i - 1] = array[randomIndex]; @@ -50,7 +51,7 @@ export function getType(obj: any): string { if (Long.isLong(obj)) { return 'long'; } else { - var t = typeof obj; + const t = typeof obj; if (t !== 'object') { return t; } else { @@ -63,36 +64,39 @@ export function enumFromString(enumType: any, value: string): T { return enumType[value]; } -export function getSortedQueryResultSet(list: Array, predicate: PagingPredicate) { +export function getSortedQueryResultSet(list: any[], predicate: PagingPredicate) { if (list.length === 0) { return list; } - var comparatorObject = predicate.getComparator(); + let comparatorObject = predicate.getComparator(); if (comparatorObject == null) { comparatorObject = createComparator(predicate.getIterationType()); } list.sort(comparatorObject.sort.bind(comparatorObject)); - var nearestAnchorEntry = (predicate == null) ? null : predicate.getNearestAnchorEntry(); - var nearestPage = nearestAnchorEntry[0]; - var page = predicate.getPage(); - var pageSize = predicate.getPageSize(); - var begin = pageSize * (page - nearestPage - 1); - var size = list.length; - if (begin > size ) { + const nearestAnchorEntry = (predicate == null) ? null : predicate.getNearestAnchorEntry(); + const nearestPage = nearestAnchorEntry[0]; + const page = predicate.getPage(); + const pageSize = predicate.getPageSize(); + const begin = pageSize * (page - nearestPage - 1); + const size = list.length; + if (begin > size) { return []; } - var end = begin + pageSize; + let end = begin + pageSize; if (end > size) { end = size; } setAnchor(list, predicate, nearestPage); - var iterationType = predicate.getIterationType(); - return list.slice(begin, end).map(function(item) { + const iterationType = predicate.getIterationType(); + return list.slice(begin, end).map(function (item) { switch (iterationType) { - case IterationType.ENTRY: return item; - case IterationType.KEY: return item[0]; - case IterationType.VALUE: return item[1]; + case IterationType.ENTRY: + return item; + case IterationType.KEY: + return item[0]; + case IterationType.VALUE: + return item[1]; } }); } @@ -102,8 +106,8 @@ export function copyObjectShallow(obj: T): T { return obj; } if (typeof obj === 'object') { - var newObj: any = {}; - for (var prop in obj) { + const newObj: any = {}; + for (const prop in obj) { if (obj.hasOwnProperty(prop)) { newObj[prop] = obj[prop]; } @@ -129,7 +133,7 @@ export function tryGetNumber(val: any): number { } } -export function tryGetArray(val: any): Array { +export function tryGetArray(val: any): any[] { if (Array.isArray(val)) { return val; } else { @@ -161,8 +165,8 @@ export function getBooleanOrUndefined(val: any) { } } -export function tryGetEnum(enumClass: any | {[index: string]: number}, str: string): T { - return enumClass[str.toUpperCase()]; +export function tryGetEnum(enumClass: any | { [index: string]: number }, str: string): T { + return enumClass[str.toUpperCase()] as any; } export function resolvePath(path: string): string { @@ -176,7 +180,7 @@ export function resolvePath(path: string): string { } export function loadNameFromPath(path: string, exportedName: string): any { - let requirePath = require(resolvePath(path)); + const requirePath = require(resolvePath(path)); if (exportedName === undefined) { return requirePath; } else { @@ -185,10 +189,10 @@ export function loadNameFromPath(path: string, exportedName: string): any { } export function createAddressFromString(address: string, defaultPort?: number): Address { - let indexBracketStart = address.indexOf('['); - let indexBracketEnd = address.indexOf(']', indexBracketStart); - let indexColon = address.indexOf(':'); - let lastIndexColon = address.lastIndexOf(':'); + const indexBracketStart = address.indexOf('['); + const indexBracketEnd = address.indexOf(']', indexBracketStart); + const indexColon = address.indexOf(':'); + const lastIndexColon = address.lastIndexOf(':'); let host: string; let port = defaultPort; if (indexColon > -1 && lastIndexColon > indexColon) { @@ -211,7 +215,7 @@ export function createAddressFromString(address: string, defaultPort?: number): } export function mergeJson(base: any, other: any): void { - for (let key in other) { + for (const key in other) { if (Array.isArray(base[key]) && Array.isArray(other[key])) { base[key] = base[key].concat(other[key]); } else if (typeof base[key] === 'object' && typeof other[key] === 'object') { @@ -232,30 +236,33 @@ export function randomInt(upperBound: number): number { return Math.floor(Math.random() * upperBound); } -function createComparator(iterationType: IterationType): Comparator { - var object: Comparator = { - sort: function(a: [any, any], b: [any, any]): number { +function createComparator(iterationType: IterationType): Comparator { + const object: Comparator = { + sort(a: [any, any], b: [any, any]): number { return 0; - } + }, }; switch (iterationType) { case IterationType.KEY: - object.sort = (e1: [any, any], e2: [any, any]) => {return e1[0] < e2[0] ? -1 : +(e1[0] > e2[0]); }; break; + object.sort = (e1: [any, any], e2: [any, any]) => e1[0] < e2[0] ? -1 : +(e1[0] > e2[0]); + break; case IterationType.ENTRY: - object.sort = (e1: [any, any], e2: [any, any]) => {return e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); }; break; + object.sort = (e1: [any, any], e2: [any, any]) => e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); + break; case IterationType.VALUE: - object.sort = (e1: [any, any], e2: [any, any]) => {return e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); }; break; + object.sort = (e1: [any, any], e2: [any, any]) => e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); + break; } return object; } -function setAnchor(list: Array, predicate: PagingPredicate, nearestPage: number) { +function setAnchor(list: any[], predicate: PagingPredicate, nearestPage: number) { assert(list.length > 0); - var size = list.length; - var pageSize = predicate.getPageSize(); - var page = predicate.getPage(); - for (var i = pageSize; i <= size && nearestPage < page; i += pageSize ) { - var anchor = list[i - 1]; + const size = list.length; + const pageSize = predicate.getPageSize(); + const page = predicate.getPage(); + for (let i = pageSize; i <= size && nearestPage < page; i += pageSize) { + const anchor = list[i - 1]; nearestPage++; predicate.setAnchor(nearestPage, anchor); } diff --git a/src/aggregation/Aggregator.ts b/src/aggregation/Aggregator.ts index 7df6eb30a..049de2256 100644 --- a/src/aggregation/Aggregator.ts +++ b/src/aggregation/Aggregator.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {IdentifiedDataSerializable} from '../serialization/Serializable'; -import {DataInput, DataOutput} from '../serialization/Data'; import * as Long from 'long'; +import {DataInput, DataOutput} from '../serialization/Data'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; import {AggregatorFactory} from './AggregatorFactory'; export interface Aggregator { @@ -41,17 +41,16 @@ export abstract class AbstractAggregator implements IdentifiedDataSerializabl abstract writeData(output: DataOutput): void; } - export class CountAggregator extends AbstractAggregator { readData(input: DataInput) { this.attributePath = input.readUTF(); - //member side field, not used in client + // member side field, not used in client input.readLong(); } writeData(output: DataOutput): void { output.writeUTF(this.attributePath); - //member side field, not used in client + // member side field, not used in client output.writeLong(Long.ZERO); } diff --git a/src/aggregation/AggregatorFactory.ts b/src/aggregation/AggregatorFactory.ts index 2728b5e2b..27cdb7d0f 100644 --- a/src/aggregation/AggregatorFactory.ts +++ b/src/aggregation/AggregatorFactory.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {LoggingService} from '../logging/LoggingService'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../serialization/Serializable'; import { Aggregator, @@ -28,21 +29,19 @@ import { LongSumAggregator, MaxAggregator, MinAggregator, - NumberAverageAggregator + NumberAverageAggregator, } from './Aggregator'; -import {LoggingService} from '../logging/LoggingService'; export class AggregatorFactory implements IdentifiedDataSerializableFactory { - private logger = LoggingService.getLoggingService(); static readonly FACTORY_ID = -41; - static readonly BIG_DECIMAL_AVG = 0; //not implemented in node.js - static readonly BIG_DECIMAL_SUM = 1; //not implemented in node.js - static readonly BIG_INT_AVG = 2; //not implemented in node.js - static readonly BIG_INT_SUM = 3; //not implemented in node.js + static readonly BIG_DECIMAL_AVG = 0; // not implemented in node.js + static readonly BIG_DECIMAL_SUM = 1; // not implemented in node.js + static readonly BIG_INT_AVG = 2; // not implemented in node.js + static readonly BIG_INT_SUM = 3; // not implemented in node.js static readonly COUNT = 4; - static readonly DISTINCT = 5; //returns java serializable, not usable in node.js + static readonly DISTINCT = 5; // returns java serializable, not usable in node.js static readonly DOUBLE_AVG = 6; static readonly DOUBLE_SUM = 7; static readonly FIXED_SUM = 8; @@ -54,10 +53,11 @@ export class AggregatorFactory implements IdentifiedDataSerializableFactory { static readonly MAX = 14; static readonly MIN = 15; static readonly NUMBER_AVG = 16; - static readonly MAX_BY = 17; //needs object to implement Java's Comparable interface - static readonly MIN_BY = 18; //needs object to implement Java's Comparable interface + static readonly MAX_BY = 17; // needs object to implement Java's Comparable interface + static readonly MIN_BY = 18; // needs object to implement Java's Comparable interface - private idToConstructor: {[id: number]: Aggregator} = {}; + private logger = LoggingService.getLoggingService(); + private idToConstructor: { [id: number]: Aggregator } = {}; constructor() { this.idToConstructor[AggregatorFactory.COUNT] = CountAggregator; @@ -74,14 +74,14 @@ export class AggregatorFactory implements IdentifiedDataSerializableFactory { this.idToConstructor[AggregatorFactory.NUMBER_AVG] = NumberAverageAggregator; } + create(type: number): IdentifiedDataSerializable { try { - return (new (this.idToConstructor[type])()); + return (new (this.idToConstructor[type] as FunctionConstructor)()) as any; } catch (e) { this.logger.error('Aggregatorfactory', 'There is no known aggregator with type id ' + type, e); return null; } } - } diff --git a/src/aggregation/Aggregators.ts b/src/aggregation/Aggregators.ts index 9560c2f92..0063bf494 100644 --- a/src/aggregation/Aggregators.ts +++ b/src/aggregation/Aggregators.ts @@ -26,9 +26,8 @@ import { LongSumAggregator, MaxAggregator, MinAggregator, - NumberAverageAggregator + NumberAverageAggregator, } from './Aggregator'; -import * as Long from 'long'; /** * @param attributePath extracts values from this path if given @@ -117,7 +116,6 @@ export function min(attributePath?: string): MinAggregator { return new MinAggregator(attributePath); } - /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the average of the input values. diff --git a/src/codec/AtomicLongAddAndGetCodec.ts b/src/codec/AtomicLongAddAndGetCodec.ts index 8ecbdb543..98835a1c0 100644 --- a/src/codec/AtomicLongAddAndGetCodec.ts +++ b/src/codec/AtomicLongAddAndGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_ADDANDGET; diff --git a/src/codec/AtomicLongAlterAndGetCodec.ts b/src/codec/AtomicLongAlterAndGetCodec.ts index 69320cbcb..1d7ff1bc3 100644 --- a/src/codec/AtomicLongAlterAndGetCodec.ts +++ b/src/codec/AtomicLongAlterAndGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_ALTERANDGET; diff --git a/src/codec/AtomicLongAlterCodec.ts b/src/codec/AtomicLongAlterCodec.ts index 020327209..a546415fd 100644 --- a/src/codec/AtomicLongAlterCodec.ts +++ b/src/codec/AtomicLongAlterCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_ALTER; diff --git a/src/codec/AtomicLongApplyCodec.ts b/src/codec/AtomicLongApplyCodec.ts index ee687540f..0906d48a5 100644 --- a/src/codec/AtomicLongApplyCodec.ts +++ b/src/codec/AtomicLongApplyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_APPLY; diff --git a/src/codec/AtomicLongCompareAndSetCodec.ts b/src/codec/AtomicLongCompareAndSetCodec.ts index e427272cb..a86cf4f74 100644 --- a/src/codec/AtomicLongCompareAndSetCodec.ts +++ b/src/codec/AtomicLongCompareAndSetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_COMPAREANDSET; diff --git a/src/codec/AtomicLongDecrementAndGetCodec.ts b/src/codec/AtomicLongDecrementAndGetCodec.ts index 25b2edd60..9b52520fd 100644 --- a/src/codec/AtomicLongDecrementAndGetCodec.ts +++ b/src/codec/AtomicLongDecrementAndGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_DECREMENTANDGET; diff --git a/src/codec/AtomicLongGetAndAddCodec.ts b/src/codec/AtomicLongGetAndAddCodec.ts index 45b70b647..97e6dff36 100644 --- a/src/codec/AtomicLongGetAndAddCodec.ts +++ b/src/codec/AtomicLongGetAndAddCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDADD; diff --git a/src/codec/AtomicLongGetAndAlterCodec.ts b/src/codec/AtomicLongGetAndAlterCodec.ts index 324571085..003a108a0 100644 --- a/src/codec/AtomicLongGetAndAlterCodec.ts +++ b/src/codec/AtomicLongGetAndAlterCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDALTER; diff --git a/src/codec/AtomicLongGetAndIncrementCodec.ts b/src/codec/AtomicLongGetAndIncrementCodec.ts index 796ac64df..265028ded 100644 --- a/src/codec/AtomicLongGetAndIncrementCodec.ts +++ b/src/codec/AtomicLongGetAndIncrementCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDINCREMENT; diff --git a/src/codec/AtomicLongGetAndSetCodec.ts b/src/codec/AtomicLongGetAndSetCodec.ts index c804d5409..0ea096b34 100644 --- a/src/codec/AtomicLongGetAndSetCodec.ts +++ b/src/codec/AtomicLongGetAndSetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDSET; diff --git a/src/codec/AtomicLongGetCodec.ts b/src/codec/AtomicLongGetCodec.ts index b3da3898f..95b732ad0 100644 --- a/src/codec/AtomicLongGetCodec.ts +++ b/src/codec/AtomicLongGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GET; diff --git a/src/codec/AtomicLongIncrementAndGetCodec.ts b/src/codec/AtomicLongIncrementAndGetCodec.ts index a999f3f95..21d97c2d7 100644 --- a/src/codec/AtomicLongIncrementAndGetCodec.ts +++ b/src/codec/AtomicLongIncrementAndGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_INCREMENTANDGET; diff --git a/src/codec/AtomicLongSetCodec.ts b/src/codec/AtomicLongSetCodec.ts index 6b6f82e88..7f64c9207 100644 --- a/src/codec/AtomicLongSetCodec.ts +++ b/src/codec/AtomicLongSetCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {AtomicLongMessageType} from './AtomicLongMessageType'; var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_SET; diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index 19001ab68..fe44bceba 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_ADDDISTRIBUTEDOBJECTLISTENER; diff --git a/src/codec/ClientAddMembershipListenerCodec.ts b/src/codec/ClientAddMembershipListenerCodec.ts index 2755caf9a..16b07569d 100644 --- a/src/codec/ClientAddMembershipListenerCodec.ts +++ b/src/codec/ClientAddMembershipListenerCodec.ts @@ -17,13 +17,8 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_ADDMEMBERSHIPLISTENER; @@ -87,7 +82,7 @@ export class ClientAddMembershipListenerCodec { for (var membersIndex = 0; membersIndex < membersSize; membersIndex++) { var membersItem: any; membersItem = MemberCodec.decode(clientMessage, toObjectFunction); - members.push(membersItem) + members.push(membersItem); } } handleEventMemberlist(members); diff --git a/src/codec/ClientAddPartitionListenerCodec.ts b/src/codec/ClientAddPartitionListenerCodec.ts index 4922c2b3d..8d9187048 100644 --- a/src/codec/ClientAddPartitionListenerCodec.ts +++ b/src/codec/ClientAddPartitionListenerCodec.ts @@ -16,14 +16,10 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); +import {BitsUtil} from '../BitsUtil'; import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_ADDPARTITIONLISTENER; @@ -75,10 +71,10 @@ export class ClientAddPartitionListenerCodec { for (var partitionsItemValIndex = 0; partitionsItemValIndex < partitionsItemValSize; partitionsItemValIndex++) { var partitionsItemValItem: number; partitionsItemValItem = clientMessage.readInt32(); - partitionsItemVal.push(partitionsItemValItem) + partitionsItemVal.push(partitionsItemValItem); } partitionsItem = [partitionsItemKey, partitionsItemVal]; - partitions.push(partitionsItem) + partitions.push(partitionsItem); } } var partitionStateVersion: number = undefined; diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 5ff9a8c7e..aebd4c207 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -16,14 +16,10 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); +import {BitsUtil} from '../BitsUtil'; import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_ADDPARTITIONLOSTLISTENER; diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index 5dbf16211..4967d8738 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -17,13 +17,9 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_AUTHENTICATION; @@ -121,7 +117,7 @@ export class ClientAuthenticationCodec { for (var clientUnregisteredMembersIndex = 0; clientUnregisteredMembersIndex < clientUnregisteredMembersSize; clientUnregisteredMembersIndex++) { var clientUnregisteredMembersItem: any; clientUnregisteredMembersItem = MemberCodec.decode(clientMessage, toObjectFunction); - clientUnregisteredMembers.push(clientUnregisteredMembersItem) + clientUnregisteredMembers.push(clientUnregisteredMembersItem); } parameters['clientUnregisteredMembers'] = clientUnregisteredMembers; } diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 10c0d0931..5447a500a 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -17,13 +17,9 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_AUTHENTICATIONCUSTOM; @@ -119,7 +115,7 @@ export class ClientAuthenticationCustomCodec { for (var clientUnregisteredMembersIndex = 0; clientUnregisteredMembersIndex < clientUnregisteredMembersSize; clientUnregisteredMembersIndex++) { var clientUnregisteredMembersItem: any; clientUnregisteredMembersItem = MemberCodec.decode(clientMessage, toObjectFunction); - clientUnregisteredMembers.push(clientUnregisteredMembersItem) + clientUnregisteredMembers.push(clientUnregisteredMembersItem); } parameters['clientUnregisteredMembers'] = clientUnregisteredMembers; } diff --git a/src/codec/ClientCreateProxyCodec.ts b/src/codec/ClientCreateProxyCodec.ts index 4bde0a4f5..2a251c2fc 100644 --- a/src/codec/ClientCreateProxyCodec.ts +++ b/src/codec/ClientCreateProxyCodec.ts @@ -16,14 +16,9 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); +import {BitsUtil} from '../BitsUtil'; import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_CREATEPROXY; diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index 54016a1a1..f84c64dc0 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_DEPLOYCLASSES; @@ -43,7 +36,7 @@ export class ClientDeployClassesCodec { var key: string = classDefinitionsItem[0]; var val: any = classDefinitionsItem[1]; dataSize += BitsUtil.calculateSizeString(key); - dataSize += BitsUtil.INT_SIZE_IN_BYTES + dataSize += BitsUtil.INT_SIZE_IN_BYTES; val.forEach((valItem: any) => { dataSize += BitsUtil.BYTE_SIZE_IN_BYTES; }); diff --git a/src/codec/ClientDestroyProxyCodec.ts b/src/codec/ClientDestroyProxyCodec.ts index 48cda8e90..28d726fb9 100644 --- a/src/codec/ClientDestroyProxyCodec.ts +++ b/src/codec/ClientDestroyProxyCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_DESTROYPROXY; diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index 589f57373..125308926 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -16,14 +16,8 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); +import {Data} from '../serialization/Data'; import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_GETDISTRIBUTEDOBJECTS; @@ -61,7 +55,7 @@ export class ClientGetDistributedObjectsCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: any; responseItem = DistributedObjectInfoCodec.decode(clientMessage, toObjectFunction); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/ClientGetPartitionsCodec.ts b/src/codec/ClientGetPartitionsCodec.ts index de1859da5..9363fe055 100644 --- a/src/codec/ClientGetPartitionsCodec.ts +++ b/src/codec/ClientGetPartitionsCodec.ts @@ -16,14 +16,9 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_GETPARTITIONS; @@ -70,10 +65,10 @@ export class ClientGetPartitionsCodec { for (var partitionsItemValIndex = 0; partitionsItemValIndex < partitionsItemValSize; partitionsItemValIndex++) { var partitionsItemValItem: number; partitionsItemValItem = clientMessage.readInt32(); - partitionsItemVal.push(partitionsItemValItem) + partitionsItemVal.push(partitionsItemValItem); } partitionsItem = [partitionsItemKey, partitionsItemVal]; - partitions.push(partitionsItem) + partitions.push(partitionsItem); } parameters['partitions'] = partitions; diff --git a/src/codec/ClientPingCodec.ts b/src/codec/ClientPingCodec.ts index 982897752..7fb8a7648 100644 --- a/src/codec/ClientPingCodec.ts +++ b/src/codec/ClientPingCodec.ts @@ -16,14 +16,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_PING; diff --git a/src/codec/ClientRemoveAllListenersCodec.ts b/src/codec/ClientRemoveAllListenersCodec.ts index e5ade15a9..a427080cb 100644 --- a/src/codec/ClientRemoveAllListenersCodec.ts +++ b/src/codec/ClientRemoveAllListenersCodec.ts @@ -16,14 +16,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_REMOVEALLLISTENERS; diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index 54d712866..814cd4732 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_REMOVEDISTRIBUTEDOBJECTLISTENER; diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index e084087e4..13a5d993a 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ClientMessageType} from './ClientMessageType'; var REQUEST_TYPE = ClientMessageType.CLIENT_REMOVEPARTITIONLOSTLISTENER; diff --git a/src/codec/DistributedObjectInfoCodec.ts b/src/codec/DistributedObjectInfoCodec.ts index b2eb4bb04..2f20d44b2 100644 --- a/src/codec/DistributedObjectInfoCodec.ts +++ b/src/codec/DistributedObjectInfoCodec.ts @@ -16,7 +16,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); class DistributedObjectInfoCodec { static decode(clientMessage: ClientMessage, toObjectFunction: Function): any { diff --git a/src/codec/FlakeIdGeneratorMessageType.ts b/src/codec/FlakeIdGeneratorMessageType.ts index 89cd27473..c79a50252 100644 --- a/src/codec/FlakeIdGeneratorMessageType.ts +++ b/src/codec/FlakeIdGeneratorMessageType.ts @@ -1,4 +1,4 @@ /* tslint:disable */ export class FlakeIdGeneratorMessageType { -static FLAKEIDGENERATOR_NEWIDBATCH = 0x1f01; -} \ No newline at end of file + static FLAKEIDGENERATOR_NEWIDBATCH = 0x1f01; +} diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts index 2f2ca1bba..dcf836068 100644 --- a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -17,15 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {Member} from '../core/Member'; -import {UUID} from '../core/UUID'; import {FlakeIdGeneratorMessageType} from './FlakeIdGeneratorMessageType'; var REQUEST_TYPE = FlakeIdGeneratorMessageType.FLAKEIDGENERATOR_NEWIDBATCH; @@ -34,40 +26,40 @@ var RETRYABLE = true; export class FlakeIdGeneratorNewIdBatchCodec { - static calculateSize(name : string , batchSize : number ){ - var dataSize : number = 0; + static calculateSize(name: string, batchSize: number) { + var dataSize: number = 0; dataSize += BitsUtil.calculateSizeString(name); dataSize += BitsUtil.INT_SIZE_IN_BYTES; return dataSize; } - static encodeRequest(name : string, batchSize : number){ + static encodeRequest(name: string, batchSize: number) { var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, batchSize)); clientMessage.setMessageType(REQUEST_TYPE); clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(batchSize); + clientMessage.appendString(name); + clientMessage.appendInt32(batchSize); clientMessage.updateFrameLength(); return clientMessage; } - static decodeResponse(clientMessage : ClientMessage, toObjectFunction: (data: Data) => any = null){ - var parameters :any = { - 'base' : null , - 'increment' : null , - 'batchSize' : null + static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { + var parameters: any = { + 'base': null, + 'increment': null, + 'batchSize': null }; - if (clientMessage.isComplete() ) { + if (clientMessage.isComplete()) { return parameters; } - parameters['base'] = clientMessage.readLong(); - - parameters['increment'] = clientMessage.readLong(); - - parameters['batchSize'] = clientMessage.readInt32(); - - return parameters; + parameters['base'] = clientMessage.readLong(); + + parameters['increment'] = clientMessage.readLong(); + + parameters['batchSize'] = clientMessage.readInt32(); + + return parameters; } } diff --git a/src/codec/ImmutableLazyDataList.ts b/src/codec/ImmutableLazyDataList.ts index 19ecb4f0d..d93e4a0d3 100644 --- a/src/codec/ImmutableLazyDataList.ts +++ b/src/codec/ImmutableLazyDataList.ts @@ -37,16 +37,16 @@ class ImmutableLazyDataList { } public get(index: number): any { - var element = this.response[index]; + const element = this.response[index]; return [element.key, element.value]; } public populate(): any { - //TODO + // TODO } public equal(): boolean { - //TODO + // TODO return false; } diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index f0e856f0c..e5cb77a78 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_ADDALL; diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index 464be0d3e..f6eecb639 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_ADDALLWITHINDEX; diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index 6966f3c16..bf46d954b 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_ADD; diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index 23db30e52..0b6223771 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_ADDLISTENER; diff --git a/src/codec/ListAddWithIndexCodec.ts b/src/codec/ListAddWithIndexCodec.ts index 4424c2e98..04c47e626 100644 --- a/src/codec/ListAddWithIndexCodec.ts +++ b/src/codec/ListAddWithIndexCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_ADDWITHINDEX; diff --git a/src/codec/ListClearCodec.ts b/src/codec/ListClearCodec.ts index df8d7be18..7e72f0633 100644 --- a/src/codec/ListClearCodec.ts +++ b/src/codec/ListClearCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_CLEAR; diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index 1d22f20c3..8633b7f6a 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_COMPAREANDREMOVEALL; diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 4e43879a6..98e836a4c 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_COMPAREANDRETAINALL; diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index be1427814..40a19bea9 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_CONTAINSALL; diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index 7526635d7..40ec1ae77 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_CONTAINS; diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index e6ef137a2..1a35a1988 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_GETALL; @@ -63,7 +57,7 @@ export class ListGetAllCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index 7f6fea80f..9cd56b450 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_GET; diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index 533134bb0..d13f6ea84 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_INDEXOF; diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index 486e7f09b..aaaca9315 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_ISEMPTY; diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 424ba4634..e2de38e61 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_ITERATOR; @@ -63,7 +57,7 @@ export class ListIteratorCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index 13a48e08e..d2b6befc7 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_LASTINDEXOF; diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index b18e6a3c3..c0b645192 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_LISTITERATOR; @@ -65,7 +59,7 @@ export class ListListIteratorCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index 3f42674e8..6b41aa4db 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_REMOVE; diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index 5d7325138..1eb840cc4 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_REMOVELISTENER; diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index 2dd6d677b..c1f27d8e1 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_REMOVEWITHINDEX; diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index be8509a53..d624eabde 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_SET; diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index a42e904af..98ef3e0b9 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_SIZE; diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index 85fb47b2e..781561f05 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ListMessageType} from './ListMessageType'; var REQUEST_TYPE = ListMessageType.LIST_SUB; @@ -67,7 +61,7 @@ export class ListSubCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/LockForceUnlockCodec.ts b/src/codec/LockForceUnlockCodec.ts index 0c9db38b8..c1b08b41c 100644 --- a/src/codec/LockForceUnlockCodec.ts +++ b/src/codec/LockForceUnlockCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_FORCEUNLOCK; diff --git a/src/codec/LockGetLockCountCodec.ts b/src/codec/LockGetLockCountCodec.ts index b33498d99..25db6f2a5 100644 --- a/src/codec/LockGetLockCountCodec.ts +++ b/src/codec/LockGetLockCountCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_GETLOCKCOUNT; diff --git a/src/codec/LockGetRemainingLeaseTimeCodec.ts b/src/codec/LockGetRemainingLeaseTimeCodec.ts index 95ea58bee..77edac2e2 100644 --- a/src/codec/LockGetRemainingLeaseTimeCodec.ts +++ b/src/codec/LockGetRemainingLeaseTimeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_GETREMAININGLEASETIME; diff --git a/src/codec/LockIsLockedByCurrentThreadCodec.ts b/src/codec/LockIsLockedByCurrentThreadCodec.ts index cc3cc9e26..9b46793b4 100644 --- a/src/codec/LockIsLockedByCurrentThreadCodec.ts +++ b/src/codec/LockIsLockedByCurrentThreadCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_ISLOCKEDBYCURRENTTHREAD; diff --git a/src/codec/LockIsLockedCodec.ts b/src/codec/LockIsLockedCodec.ts index 184667f39..112aa46ff 100644 --- a/src/codec/LockIsLockedCodec.ts +++ b/src/codec/LockIsLockedCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_ISLOCKED; diff --git a/src/codec/LockLockCodec.ts b/src/codec/LockLockCodec.ts index 230b2a501..ba54ecaf5 100644 --- a/src/codec/LockLockCodec.ts +++ b/src/codec/LockLockCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_LOCK; diff --git a/src/codec/LockTryLockCodec.ts b/src/codec/LockTryLockCodec.ts index e1f38f5a1..cfe6ad33b 100644 --- a/src/codec/LockTryLockCodec.ts +++ b/src/codec/LockTryLockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_TRYLOCK; diff --git a/src/codec/LockUnlockCodec.ts b/src/codec/LockUnlockCodec.ts index a025b23e9..887d8db0d 100644 --- a/src/codec/LockUnlockCodec.ts +++ b/src/codec/LockUnlockCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {LockMessageType} from './LockMessageType'; var REQUEST_TYPE = LockMessageType.LOCK_UNLOCK; diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index d227132cc..193413222 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENER; diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index 5cc45755f..f6a0996d4 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENERTOKEY; diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index f3ee847b3..a155a9c41 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENERTOKEYWITHPREDICATE; diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index d0312fbcb..4a6e825b9 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENERWITHPREDICATE; diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index 1cf73f5c3..9ec3bdc1f 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDINDEX; diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index 66df2990c..346697390 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDINTERCEPTOR; diff --git a/src/codec/MapAddNearCacheEntryListenerCodec.ts b/src/codec/MapAddNearCacheEntryListenerCodec.ts index 7eb5c603a..c86ac8071 100644 --- a/src/codec/MapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/MapAddNearCacheEntryListenerCodec.ts @@ -17,13 +17,8 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDNEARCACHEENTRYLISTENER; @@ -105,7 +100,7 @@ export class MapAddNearCacheEntryListenerCodec { for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { var keysItem: Data; keysItem = clientMessage.readData(); - keys.push(keysItem) + keys.push(keysItem); } } var sourceUuids: any = undefined; @@ -119,7 +114,7 @@ export class MapAddNearCacheEntryListenerCodec { for (var sourceUuidsIndex = 0; sourceUuidsIndex < sourceUuidsSize; sourceUuidsIndex++) { var sourceUuidsItem: string; sourceUuidsItem = clientMessage.readString(); - sourceUuids.push(sourceUuidsItem) + sourceUuids.push(sourceUuidsItem); } } var partitionUuids: any = undefined; @@ -130,7 +125,7 @@ export class MapAddNearCacheEntryListenerCodec { for (var partitionUuidsIndex = 0; partitionUuidsIndex < partitionUuidsSize; partitionUuidsIndex++) { var partitionUuidsItem: any; partitionUuidsItem = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuids.push(partitionUuidsItem) + partitionUuids.push(partitionUuidsItem); } } var sequences: any = undefined; @@ -141,7 +136,7 @@ export class MapAddNearCacheEntryListenerCodec { for (var sequencesIndex = 0; sequencesIndex < sequencesSize; sequencesIndex++) { var sequencesItem: any; sequencesItem = clientMessage.readLong(); - sequences.push(sequencesItem) + sequences.push(sequencesItem); } } handleEventImapbatchinvalidation(keys, sourceUuids, partitionUuids, sequences); diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index 9c8551f5c..d4340da93 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -17,13 +17,8 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDNEARCACHEINVALIDATIONLISTENER; @@ -111,7 +106,7 @@ export class MapAddNearCacheInvalidationListenerCodec { for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { var keysItem: Data; keysItem = clientMessage.readData(); - keys.push(keysItem) + keys.push(keysItem); } } var sourceUuids: any = undefined; @@ -122,7 +117,7 @@ export class MapAddNearCacheInvalidationListenerCodec { for (var sourceUuidsIndex = 0; sourceUuidsIndex < sourceUuidsSize; sourceUuidsIndex++) { var sourceUuidsItem: string; sourceUuidsItem = clientMessage.readString(); - sourceUuids.push(sourceUuidsItem) + sourceUuids.push(sourceUuidsItem); } } var partitionUuids: any = undefined; @@ -133,7 +128,7 @@ export class MapAddNearCacheInvalidationListenerCodec { for (var partitionUuidsIndex = 0; partitionUuidsIndex < partitionUuidsSize; partitionUuidsIndex++) { var partitionUuidsItem: any; partitionUuidsItem = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuids.push(partitionUuidsItem) + partitionUuids.push(partitionUuidsItem); } } var sequences: any = undefined; @@ -144,7 +139,7 @@ export class MapAddNearCacheInvalidationListenerCodec { for (var sequencesIndex = 0; sequencesIndex < sequencesSize; sequencesIndex++) { var sequencesItem: any; sequencesItem = clientMessage.readLong(); - sequences.push(sequencesItem) + sequences.push(sequencesItem); } } handleEventImapbatchinvalidation(keys, sourceUuids, partitionUuids, sequences); diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index 24dfdf7ae..11b0efe1e 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ADDPARTITIONLOSTLISTENER; diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index 8a9ce696e..f7f672062 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_AGGREGATE; diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index e70a38285..4aa3d6cd0 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_AGGREGATEWITHPREDICATE; diff --git a/src/codec/MapAssignAndGetUuidsCodec.ts b/src/codec/MapAssignAndGetUuidsCodec.ts index 73c00ef64..ff3e150f1 100644 --- a/src/codec/MapAssignAndGetUuidsCodec.ts +++ b/src/codec/MapAssignAndGetUuidsCodec.ts @@ -16,14 +16,8 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ASSIGNANDGETUUIDS; @@ -68,7 +62,7 @@ export class MapAssignAndGetUuidsCodec { partitionUuidListItemKey = clientMessage.readInt32(); partitionUuidListItemVal = UUIDCodec.decode(clientMessage, toObjectFunction); partitionUuidListItem = [partitionUuidListItemKey, partitionUuidListItemVal]; - partitionUuidList.push(partitionUuidListItem) + partitionUuidList.push(partitionUuidListItem); } parameters['partitionUuidList'] = partitionUuidList; diff --git a/src/codec/MapClearCodec.ts b/src/codec/MapClearCodec.ts index 110b39313..6e17a9d5f 100644 --- a/src/codec/MapClearCodec.ts +++ b/src/codec/MapClearCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_CLEAR; diff --git a/src/codec/MapClearNearCacheCodec.ts b/src/codec/MapClearNearCacheCodec.ts index 9c95099f7..6e535c4ba 100644 --- a/src/codec/MapClearNearCacheCodec.ts +++ b/src/codec/MapClearNearCacheCodec.ts @@ -16,14 +16,9 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); +import {BitsUtil} from '../BitsUtil'; import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_CLEARNEARCACHE; diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 10f0c4313..f6e691a82 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_CONTAINSKEY; diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 285cce769..7834cc40a 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_CONTAINSVALUE; diff --git a/src/codec/MapDeleteCodec.ts b/src/codec/MapDeleteCodec.ts index e3d7a92ff..ac563eb53 100644 --- a/src/codec/MapDeleteCodec.ts +++ b/src/codec/MapDeleteCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_DELETE; diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index 36aaaa759..afae4b2a8 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ENTRIESWITHPAGINGPREDICATE; @@ -69,7 +63,7 @@ export class MapEntriesWithPagingPredicateCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index 67aeb0254..7d4fd9a9d 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ENTRIESWITHPREDICATE; @@ -69,7 +63,7 @@ export class MapEntriesWithPredicateCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index bf4bdd192..6df7d647e 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ENTRYSET; @@ -67,7 +61,7 @@ export class MapEntrySetCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index 0c100dee3..d10fa8518 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EVENTJOURNALREAD; @@ -92,7 +86,7 @@ export class MapEventJournalReadCodec { for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { var itemsItem: Data; itemsItem = clientMessage.readData(); - items.push(itemsItem) + items.push(itemsItem); } parameters['items'] = items; @@ -104,7 +98,7 @@ export class MapEventJournalReadCodec { for (var itemSeqsIndex = 0; itemSeqsIndex < itemSeqsSize; itemSeqsIndex++) { var itemSeqsItem: any; itemSeqsItem = clientMessage.readLong(); - itemSeqs.push(itemSeqsItem) + itemSeqs.push(itemSeqsItem); } parameters['itemSeqs'] = itemSeqs; } diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index aeaddae75..2b92fde9c 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EVENTJOURNALSUBSCRIBE; diff --git a/src/codec/MapEvictAllCodec.ts b/src/codec/MapEvictAllCodec.ts index aab0a9d14..d49c67fb2 100644 --- a/src/codec/MapEvictAllCodec.ts +++ b/src/codec/MapEvictAllCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EVICTALL; diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index 67c813b0a..b420a18df 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EVICT; diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index 85b150d95..c4cbae026 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EXECUTEONALLKEYS; @@ -69,7 +63,7 @@ export class MapExecuteOnAllKeysCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index 455ee74d4..41111066a 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EXECUTEONKEY; diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index 886fa3fbe..a498fa617 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EXECUTEONKEYS; @@ -80,7 +74,7 @@ export class MapExecuteOnKeysCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 701dd9784..4c4b22231 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_EXECUTEWITHPREDICATE; @@ -71,7 +65,7 @@ export class MapExecuteWithPredicateCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index 5c0c28707..5b240a775 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_FETCHENTRIES; @@ -79,7 +73,7 @@ export class MapFetchEntriesCodec { entriesItemKey = clientMessage.readData(); entriesItemVal = clientMessage.readData(); entriesItem = [entriesItemKey, entriesItemVal]; - entries.push(entriesItem) + entries.push(entriesItem); } parameters['entries'] = entries; diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index 06db399d8..f6aa46ff7 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_FETCHKEYS; @@ -75,7 +69,7 @@ export class MapFetchKeysCodec { for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { var keysItem: Data; keysItem = clientMessage.readData(); - keys.push(keysItem) + keys.push(keysItem); } parameters['keys'] = keys; diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index dcb95ebc6..dad978f97 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -16,14 +16,11 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); +import {BitsUtil} from '../BitsUtil'; import {AddressCodec} from './AddressCodec'; import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_FETCHNEARCACHEINVALIDATIONMETADATA; @@ -90,10 +87,10 @@ export class MapFetchNearCacheInvalidationMetadataCodec { namePartitionSequenceListItemValItemKey = clientMessage.readInt32(); namePartitionSequenceListItemValItemVal = clientMessage.readLong(); namePartitionSequenceListItemValItem = [namePartitionSequenceListItemValItemKey, namePartitionSequenceListItemValItemVal]; - namePartitionSequenceListItemVal.push(namePartitionSequenceListItemValItem) + namePartitionSequenceListItemVal.push(namePartitionSequenceListItemValItem); } namePartitionSequenceListItem = [namePartitionSequenceListItemKey, namePartitionSequenceListItemVal]; - namePartitionSequenceList.push(namePartitionSequenceListItem) + namePartitionSequenceList.push(namePartitionSequenceListItem); } parameters['namePartitionSequenceList'] = namePartitionSequenceList; @@ -107,7 +104,7 @@ export class MapFetchNearCacheInvalidationMetadataCodec { partitionUuidListItemKey = clientMessage.readInt32(); partitionUuidListItemVal = UUIDCodec.decode(clientMessage, toObjectFunction); partitionUuidListItem = [partitionUuidListItemKey, partitionUuidListItemVal]; - partitionUuidList.push(partitionUuidListItem) + partitionUuidList.push(partitionUuidListItem); } parameters['partitionUuidList'] = partitionUuidList; diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index c4bf784be..a7264a3d0 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_FETCHWITHQUERY; @@ -75,7 +69,7 @@ export class MapFetchWithQueryCodec { for (var resultsIndex = 0; resultsIndex < resultsSize; resultsIndex++) { var resultsItem: Data; resultsItem = clientMessage.readData(); - results.push(resultsItem) + results.push(resultsItem); } parameters['results'] = results; diff --git a/src/codec/MapFlushCodec.ts b/src/codec/MapFlushCodec.ts index 98ca84369..eeb124aef 100644 --- a/src/codec/MapFlushCodec.ts +++ b/src/codec/MapFlushCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_FLUSH; diff --git a/src/codec/MapForceUnlockCodec.ts b/src/codec/MapForceUnlockCodec.ts index 54029d8de..3d4efafe8 100644 --- a/src/codec/MapForceUnlockCodec.ts +++ b/src/codec/MapForceUnlockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_FORCEUNLOCK; diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index 66047cb52..d365c0fc8 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_GETALL; @@ -78,7 +72,7 @@ export class MapGetAllCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index cfb327807..86938491e 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_GET; diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index ec50014a2..0389e331f 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -17,13 +17,8 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_GETENTRYVIEW; diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index d6c58d597..37f753c6d 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ISEMPTY; diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index 3129dd6bc..9c32a92c1 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_ISLOCKED; diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index 435c1f700..1e3a20f09 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_KEYSET; @@ -63,7 +57,7 @@ export class MapKeySetCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index 9ba27eb43..e1a4b76d1 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_KEYSETWITHPAGINGPREDICATE; @@ -65,7 +59,7 @@ export class MapKeySetWithPagingPredicateCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index 38809be10..57828a207 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_KEYSETWITHPREDICATE; @@ -65,7 +59,7 @@ export class MapKeySetWithPredicateCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapLoadAllCodec.ts b/src/codec/MapLoadAllCodec.ts index 78f773b51..d4fc19369 100644 --- a/src/codec/MapLoadAllCodec.ts +++ b/src/codec/MapLoadAllCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_LOADALL; diff --git a/src/codec/MapLoadGivenKeysCodec.ts b/src/codec/MapLoadGivenKeysCodec.ts index 18325c713..9a79fec56 100644 --- a/src/codec/MapLoadGivenKeysCodec.ts +++ b/src/codec/MapLoadGivenKeysCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_LOADGIVENKEYS; diff --git a/src/codec/MapLockCodec.ts b/src/codec/MapLockCodec.ts index eb4ef1e2d..25203140c 100644 --- a/src/codec/MapLockCodec.ts +++ b/src/codec/MapLockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_LOCK; diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 11a73118d..fa70eb713 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_PROJECT; @@ -68,7 +62,7 @@ export class MapProjectCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index d74dd1d8a..7609b4959 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_PROJECTWITHPREDICATE; @@ -70,7 +64,7 @@ export class MapProjectWithPredicateCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapPutAllCodec.ts b/src/codec/MapPutAllCodec.ts index 5d7f5e51d..faff81f80 100644 --- a/src/codec/MapPutAllCodec.ts +++ b/src/codec/MapPutAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_PUTALL; diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index bb74d8165..ee719b43e 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_PUT; diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index 3e7f27c43..33b6eefd8 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_PUTIFABSENT; diff --git a/src/codec/MapPutTransientCodec.ts b/src/codec/MapPutTransientCodec.ts index 35459fc31..e4458f86c 100644 --- a/src/codec/MapPutTransientCodec.ts +++ b/src/codec/MapPutTransientCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_PUTTRANSIENT; diff --git a/src/codec/MapRemoveAllCodec.ts b/src/codec/MapRemoveAllCodec.ts index f9c7d9824..91ee04a97 100644 --- a/src/codec/MapRemoveAllCodec.ts +++ b/src/codec/MapRemoveAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REMOVEALL; diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index b369c1897..e36edba14 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REMOVE; diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index 47ad45f03..30e0c2051 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REMOVEENTRYLISTENER; diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index 0fb2bd28e..11772c995 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REMOVEIFSAME; diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index a38de4852..b384f1450 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REMOVEINTERCEPTOR; diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index 429dc4e88..4d79dd8d4 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REMOVEPARTITIONLOSTLISTENER; diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index db01e9d52..3dbd42d18 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REPLACE; diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index 4bb035a54..725460d92 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_REPLACEIFSAME; diff --git a/src/codec/MapSetCodec.ts b/src/codec/MapSetCodec.ts index d05089e2b..b2d8ae605 100644 --- a/src/codec/MapSetCodec.ts +++ b/src/codec/MapSetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_SET; diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index 26e9f2279..31894aa44 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_SIZE; diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 2d919cc72..37492e507 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_SUBMITTOKEY; diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index 5a40fde9a..7c08583ff 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_TRYLOCK; diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index 5b42cbb2b..d13809a68 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_TRYPUT; diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index fddeefeb5..023b1eedc 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_TRYREMOVE; diff --git a/src/codec/MapUnlockCodec.ts b/src/codec/MapUnlockCodec.ts index f0c600f6d..8c4cce105 100644 --- a/src/codec/MapUnlockCodec.ts +++ b/src/codec/MapUnlockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_UNLOCK; diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index b2ee02f08..bfadeee6e 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_VALUES; @@ -63,7 +57,7 @@ export class MapValuesCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index 03c40fd18..5ad86a940 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_VALUESWITHPAGINGPREDICATE; @@ -69,7 +63,7 @@ export class MapValuesWithPagingPredicateCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 5b628e2ad..35548ad4d 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MapMessageType} from './MapMessageType'; var REQUEST_TYPE = MapMessageType.MAP_VALUESWITHPREDICATE; @@ -65,7 +59,7 @@ export class MapValuesWithPredicateCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MemberCodec.ts b/src/codec/MemberCodec.ts index d7c7378b5..8b84348a8 100644 --- a/src/codec/MemberCodec.ts +++ b/src/codec/MemberCodec.ts @@ -16,9 +16,9 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); +import Address = require('../Address'); import {Member} from '../core/Member'; import {AddressCodec} from './AddressCodec'; -import Address = require('../Address'); export class MemberCodec { diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index dba307730..c931d1d9c 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ADDENTRYLISTENER; diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index 489343116..1248d68da 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ADDENTRYLISTENERTOKEY; diff --git a/src/codec/MultiMapClearCodec.ts b/src/codec/MultiMapClearCodec.ts index 708a752d1..eaec001fb 100644 --- a/src/codec/MultiMapClearCodec.ts +++ b/src/codec/MultiMapClearCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CLEAR; diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 224abe101..6dceeb9f0 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CONTAINSENTRY; diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index f05b8a06e..cfb60f7fe 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CONTAINSKEY; diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index 6247c0b25..4bcd3a780 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CONTAINSVALUE; diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index 99fe57a71..c6cbb20b9 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ENTRYSET; @@ -67,7 +61,7 @@ export class MultiMapEntrySetCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MultiMapForceUnlockCodec.ts b/src/codec/MultiMapForceUnlockCodec.ts index fa23e3968..e15f6b236 100644 --- a/src/codec/MultiMapForceUnlockCodec.ts +++ b/src/codec/MultiMapForceUnlockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_FORCEUNLOCK; diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index 7080bfb17..cb363e16a 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_GET; @@ -67,7 +61,7 @@ export class MultiMapGetCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index 34118a77c..adbcb1c1f 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ISLOCKED; diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 92ddca63e..4e033eb9b 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_KEYSET; @@ -63,7 +57,7 @@ export class MultiMapKeySetCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MultiMapLockCodec.ts b/src/codec/MultiMapLockCodec.ts index 8adb39d33..65ac42dce 100644 --- a/src/codec/MultiMapLockCodec.ts +++ b/src/codec/MultiMapLockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_LOCK; diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index 36d00a846..f45b64431 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_PUT; diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index d2880948f..8a9e0f1cd 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_REMOVE; @@ -67,7 +61,7 @@ export class MultiMapRemoveCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index 51e5e4f6c..bdbdf19de 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_REMOVEENTRY; diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 29812b94f..b446178ea 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_REMOVEENTRYLISTENER; diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index 0ea16cc74..71217a41d 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_SIZE; diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index 8a3709a7c..8b075a6fb 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_TRYLOCK; diff --git a/src/codec/MultiMapUnlockCodec.ts b/src/codec/MultiMapUnlockCodec.ts index 6697ee4a5..f78b5090b 100644 --- a/src/codec/MultiMapUnlockCodec.ts +++ b/src/codec/MultiMapUnlockCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_UNLOCK; diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index 9efce77ef..d926b1f61 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_VALUECOUNT; diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index de0eb5849..0e6686240 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {MultiMapMessageType} from './MultiMapMessageType'; var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_VALUES; @@ -63,7 +57,7 @@ export class MultiMapValuesCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts index c7a9153b8..40e2540de 100644 --- a/src/codec/PNCounterAddCodec.ts +++ b/src/codec/PNCounterAddCodec.ts @@ -16,16 +16,10 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); +import {BitsUtil} from '../BitsUtil'; import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {Member} from '../core/Member'; -import {UUID} from '../core/UUID'; import {PNCounterMessageType} from './PNCounterMessageType'; var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_ADD; @@ -94,7 +88,7 @@ export class PNCounterAddCodec { replicaTimestampsItemKey = clientMessage.readString(); replicaTimestampsItemVal = clientMessage.readLong(); replicaTimestampsItem = [replicaTimestampsItemKey, replicaTimestampsItemVal]; - replicaTimestamps.push(replicaTimestampsItem) + replicaTimestamps.push(replicaTimestampsItem); } parameters['replicaTimestamps'] = replicaTimestamps; diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts index 308459194..a1e5d22b7 100644 --- a/src/codec/PNCounterGetCodec.ts +++ b/src/codec/PNCounterGetCodec.ts @@ -16,16 +16,10 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; import Address = require('../Address'); +import {BitsUtil} from '../BitsUtil'; import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {Member} from '../core/Member'; -import {UUID} from '../core/UUID'; import {PNCounterMessageType} from './PNCounterMessageType'; var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_GET; @@ -90,7 +84,7 @@ export class PNCounterGetCodec { replicaTimestampsItemKey = clientMessage.readString(); replicaTimestampsItemVal = clientMessage.readLong(); replicaTimestampsItem = [replicaTimestampsItemKey, replicaTimestampsItemVal]; - replicaTimestamps.push(replicaTimestampsItem) + replicaTimestamps.push(replicaTimestampsItem); } parameters['replicaTimestamps'] = replicaTimestamps; diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts index 9ffcd3d34..bdefe0147 100644 --- a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -17,15 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {Member} from '../core/Member'; -import {UUID} from '../core/UUID'; import {PNCounterMessageType} from './PNCounterMessageType'; var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_GETCONFIGUREDREPLICACOUNT; diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index 12708f3f5..a032a95f4 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_ADDALL; diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index 895e4a37b..80533acba 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_ADDLISTENER; diff --git a/src/codec/QueueClearCodec.ts b/src/codec/QueueClearCodec.ts index 2bb94bdcc..004e0d4e1 100644 --- a/src/codec/QueueClearCodec.ts +++ b/src/codec/QueueClearCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_CLEAR; diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index b03e6016a..094018b8b 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_COMPAREANDREMOVEALL; diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index 84a4d9039..d765cc944 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_COMPAREANDRETAINALL; diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index 99db17f93..1aacc4fca 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_CONTAINSALL; diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index a812e2fd2..7489a8792 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_CONTAINS; diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index b2cd93310..ffb814c6f 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_DRAINTO; @@ -63,7 +57,7 @@ export class QueueDrainToCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index e8cb56d70..94b574161 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_DRAINTOMAXSIZE; @@ -65,7 +59,7 @@ export class QueueDrainToMaxSizeCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index 96eadb91e..facf2ecaa 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_ISEMPTY; diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index c939f4514..955ff875a 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_ITERATOR; @@ -63,7 +57,7 @@ export class QueueIteratorCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index 1b33c88a6..4a5097877 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_OFFER; diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index dc2404591..93ea63477 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_PEEK; diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index 2bdde119f..4746b1010 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_POLL; diff --git a/src/codec/QueuePutCodec.ts b/src/codec/QueuePutCodec.ts index cf6b41d05..969d8ae56 100644 --- a/src/codec/QueuePutCodec.ts +++ b/src/codec/QueuePutCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_PUT; diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index 3451369d1..f87b1da05 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_REMAININGCAPACITY; diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index e47033b44..f693368df 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_REMOVE; diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index 12fb1cc77..5838e324e 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_REMOVELISTENER; diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index 4285a313f..07f74c1fa 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_SIZE; diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index 5040ae321..cac3966c9 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {QueueMessageType} from './QueueMessageType'; var REQUEST_TYPE = QueueMessageType.QUEUE_TAKE; diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index dcc1f1e95..7479b2f23 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENER; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index 86f204a6e..485303361 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENERTOKEY; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index 74ceda41f..c39cd4e32 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENERTOKEYWITHPREDICATE; diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 9b72b9bb4..d2591146c 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENERWITHPREDICATE; diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index aa0793560..6321abf00 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDNEARCACHEENTRYLISTENER; diff --git a/src/codec/ReplicatedMapClearCodec.ts b/src/codec/ReplicatedMapClearCodec.ts index c0e6965a8..eb0923ecc 100644 --- a/src/codec/ReplicatedMapClearCodec.ts +++ b/src/codec/ReplicatedMapClearCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_CLEAR; diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index ab5d488a7..bbdda347b 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_CONTAINSKEY; diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 13a4b68a1..d415b19b6 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_CONTAINSVALUE; diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index 34170a343..b786d1e7e 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ENTRYSET; @@ -67,7 +61,7 @@ export class ReplicatedMapEntrySetCodec { responseItemKey = clientMessage.readData(); responseItemVal = clientMessage.readData(); responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index d0f5e4532..a5c33f7c7 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_GET; diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index 10b02b8ce..bbe923481 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ISEMPTY; diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index ebc3b024e..535b8a94f 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_KEYSET; @@ -63,7 +57,7 @@ export class ReplicatedMapKeySetCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/ReplicatedMapPutAllCodec.ts b/src/codec/ReplicatedMapPutAllCodec.ts index d7784668c..17c3a2bec 100644 --- a/src/codec/ReplicatedMapPutAllCodec.ts +++ b/src/codec/ReplicatedMapPutAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_PUTALL; diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index 041002fcb..895f37969 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_PUT; diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index 040a0b302..084c3a139 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_REMOVE; diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index 027254f50..217600585 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_REMOVEENTRYLISTENER; diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index 4513da536..992e4435a 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_SIZE; diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index 3ebf6ed37..f0fa79055 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_VALUES; @@ -63,7 +57,7 @@ export class ReplicatedMapValuesCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index ac6ba7d81..2ec12f490 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_ADDALL; diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 0e8186ebd..90a802fc7 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_ADD; diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index 328fa397b..1f7b7ea61 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_CAPACITY; diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index e83983eba..cb106a36a 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_HEADSEQUENCE; diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index d49a09323..727ca0419 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_READMANY; @@ -81,7 +75,7 @@ export class RingbufferReadManyCodec { for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { var itemsItem: Data; itemsItem = clientMessage.readData(); - items.push(itemsItem) + items.push(itemsItem); } parameters['items'] = items; @@ -96,7 +90,7 @@ export class RingbufferReadManyCodec { for (var itemSeqsIndex = 0; itemSeqsIndex < itemSeqsSize; itemSeqsIndex++) { var itemSeqsItem: any; itemSeqsItem = clientMessage.readLong(); - itemSeqs.push(itemSeqsItem) + itemSeqs.push(itemSeqsItem); } parameters['itemSeqs'] = itemSeqs; } diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index 477ad98d0..fbf39389a 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_READONE; diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index 0aea415f4..a6d20b1b1 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_REMAININGCAPACITY; diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index 3e678adc5..b85d3f3a4 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_SIZE; diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index 1dbd767c2..872879cb6 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {RingbufferMessageType} from './RingbufferMessageType'; var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_TAILSEQUENCE; diff --git a/src/codec/SemaphoreAcquireCodec.ts b/src/codec/SemaphoreAcquireCodec.ts index ab9a5b1e8..818ce2ffd 100644 --- a/src/codec/SemaphoreAcquireCodec.ts +++ b/src/codec/SemaphoreAcquireCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SemaphoreMessageType} from './SemaphoreMessageType'; var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_ACQUIRE; diff --git a/src/codec/SemaphoreAvailablePermitsCodec.ts b/src/codec/SemaphoreAvailablePermitsCodec.ts index e2a6f9818..09c906966 100644 --- a/src/codec/SemaphoreAvailablePermitsCodec.ts +++ b/src/codec/SemaphoreAvailablePermitsCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SemaphoreMessageType} from './SemaphoreMessageType'; var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_AVAILABLEPERMITS; diff --git a/src/codec/SemaphoreDrainPermitsCodec.ts b/src/codec/SemaphoreDrainPermitsCodec.ts index d3504d139..5cae2eb98 100644 --- a/src/codec/SemaphoreDrainPermitsCodec.ts +++ b/src/codec/SemaphoreDrainPermitsCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SemaphoreMessageType} from './SemaphoreMessageType'; var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_DRAINPERMITS; diff --git a/src/codec/SemaphoreInitCodec.ts b/src/codec/SemaphoreInitCodec.ts index c1128ad6a..d095d6935 100644 --- a/src/codec/SemaphoreInitCodec.ts +++ b/src/codec/SemaphoreInitCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SemaphoreMessageType} from './SemaphoreMessageType'; var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_INIT; diff --git a/src/codec/SemaphoreReducePermitsCodec.ts b/src/codec/SemaphoreReducePermitsCodec.ts index 9fda89c29..9f133ab7e 100644 --- a/src/codec/SemaphoreReducePermitsCodec.ts +++ b/src/codec/SemaphoreReducePermitsCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SemaphoreMessageType} from './SemaphoreMessageType'; var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_REDUCEPERMITS; diff --git a/src/codec/SemaphoreReleaseCodec.ts b/src/codec/SemaphoreReleaseCodec.ts index cf6755b2c..34b98b280 100644 --- a/src/codec/SemaphoreReleaseCodec.ts +++ b/src/codec/SemaphoreReleaseCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SemaphoreMessageType} from './SemaphoreMessageType'; var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_RELEASE; diff --git a/src/codec/SemaphoreTryAcquireCodec.ts b/src/codec/SemaphoreTryAcquireCodec.ts index 50ab74c76..78d882bd0 100644 --- a/src/codec/SemaphoreTryAcquireCodec.ts +++ b/src/codec/SemaphoreTryAcquireCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SemaphoreMessageType} from './SemaphoreMessageType'; var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_TRYACQUIRE; diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index f464b1c60..a2bbf302d 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_ADDALL; diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index 30473c700..d97b9e197 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_ADD; diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index 29af30d9b..3dbb12e1f 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_ADDLISTENER; diff --git a/src/codec/SetClearCodec.ts b/src/codec/SetClearCodec.ts index 3abb26ed9..1994bdf4b 100644 --- a/src/codec/SetClearCodec.ts +++ b/src/codec/SetClearCodec.ts @@ -17,13 +17,6 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_CLEAR; diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index 4eb56fea1..44183c6b7 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_COMPAREANDREMOVEALL; diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index cc82da523..599b0baa6 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_COMPAREANDRETAINALL; diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index f6f91ce32..802f8ef26 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_CONTAINSALL; diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index 6a6414c52..002da2f70 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_CONTAINS; diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index 2b1d65c03..46341bce1 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_GETALL; @@ -63,7 +57,7 @@ export class SetGetAllCodec { for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { var responseItem: Data; responseItem = clientMessage.readData(); - response.push(responseItem) + response.push(responseItem); } parameters['response'] = response; diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index 2e6a2b0fd..2c8bb956c 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_ISEMPTY; diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index 0d4cbc8e1..1da00bf9e 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_REMOVE; diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index 427295be4..92613bbc2 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_REMOVELISTENER; diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index 2a1711739..c40ca6d60 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {SetMessageType} from './SetMessageType'; var REQUEST_TYPE = SetMessageType.SET_SIZE; diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index f6dab79dc..56002b272 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {TopicMessageType} from './TopicMessageType'; var REQUEST_TYPE = TopicMessageType.TOPIC_ADDMESSAGELISTENER; diff --git a/src/codec/TopicPublishCodec.ts b/src/codec/TopicPublishCodec.ts index ba98f8720..59ee4ef17 100644 --- a/src/codec/TopicPublishCodec.ts +++ b/src/codec/TopicPublishCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {TopicMessageType} from './TopicMessageType'; var REQUEST_TYPE = TopicMessageType.TOPIC_PUBLISH; diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index 97afbc789..c25fd1f17 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -17,13 +17,7 @@ /* tslint:disable */ import ClientMessage = require('../ClientMessage'); import {BitsUtil} from '../BitsUtil'; -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {MemberCodec} from './MemberCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); import {TopicMessageType} from './TopicMessageType'; var REQUEST_TYPE = TopicMessageType.TOPIC_REMOVEMESSAGELISTENER; diff --git a/src/codec/UUIDCodec.ts b/src/codec/UUIDCodec.ts index 8b9e756bf..ebd17ca4a 100644 --- a/src/codec/UUIDCodec.ts +++ b/src/codec/UUIDCodec.ts @@ -19,8 +19,8 @@ import {UUID} from '../core/UUID'; export class UUIDCodec { static decode(clientMessage: ClientMessage, toObject: Function): UUID { - let most = clientMessage.readLong(); - let least = clientMessage.readLong(); + const most = clientMessage.readLong(); + const least = clientMessage.readLong(); return new UUID(most, least); } } diff --git a/src/codec/Utils.ts b/src/codec/Utils.ts index 82c4190b9..0d5aa2746 100644 --- a/src/codec/Utils.ts +++ b/src/codec/Utils.ts @@ -17,7 +17,7 @@ export class Utils { public static getStringSize(value: string, nullable: boolean = false): number { // int32 for string length - var size = 4; + let size = 4; if (nullable) { size += 1; @@ -33,7 +33,7 @@ export class Utils { } public static calculateSizeBuffer(value: Buffer) { - var size = 4; + let size = 4; size += value.length; return size; } diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index 7c116ce05..9a37d5fe8 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -15,9 +15,9 @@ */ import Address = require('../Address'); -import {SSLOptions} from './SSLOptions'; import {ImportConfig} from './ImportConfig'; import {Properties} from './Properties'; +import {SSLOptions} from './SSLOptions'; /** * Network configuration diff --git a/src/config/Config.ts b/src/config/Config.ts index d87eb10a3..ec865a918 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -16,24 +16,23 @@ import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; import {ClientNetworkConfig} from './ClientNetworkConfig'; -import {SerializationConfig} from './SerializationConfig'; +import {ConfigPatternMatcher} from './ConfigPatternMatcher'; +import {EvictionPolicy} from './EvictionPolicy'; +import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; import {GroupConfig} from './GroupConfig'; -import {ReliableTopicConfig} from './ReliableTopicConfig'; +import {ImportConfig} from './ImportConfig'; import {InMemoryFormat} from './InMemoryFormat'; -import {EvictionPolicy} from './EvictionPolicy'; -import {NearCacheConfig} from './NearCacheConfig'; import {ListenerConfig} from './ListenerConfig'; +import {NearCacheConfig} from './NearCacheConfig'; import {Properties} from './Properties'; -import {ImportConfig} from './ImportConfig'; -import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; -import {ConfigPatternMatcher} from './ConfigPatternMatcher'; +import {ReliableTopicConfig} from './ReliableTopicConfig'; +import {SerializationConfig} from './SerializationConfig'; /** * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. */ export class ClientConfig { - private configPatternMatcher = new ConfigPatternMatcher(); /** * Name of this client instance. */ @@ -45,7 +44,7 @@ export class ClientConfig { 'hazelcast.client.invocation.timeout.millis': 120000, 'hazelcast.invalidation.reconciliation.interval.seconds': 60, 'hazelcast.invalidation.max.tolerated.miss.count': 10, - 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30 + 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30, }; groupConfig: GroupConfig = new GroupConfig(); networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); @@ -53,12 +52,14 @@ export class ClientConfig { listeners: ListenerConfig = new ListenerConfig(); listenerConfigs: ImportConfig[] = []; serializationConfig: SerializationConfig = new SerializationConfig(); - reliableTopicConfigs: {[name: string]: ReliableTopicConfig} = {}; - nearCacheConfigs: {[name: string]: NearCacheConfig} = {}; - flakeIdGeneratorConfigs: {[name: string]: FlakeIdGeneratorConfig} = {}; + reliableTopicConfigs: { [name: string]: ReliableTopicConfig } = {}; + nearCacheConfigs: { [name: string]: NearCacheConfig } = {}; + flakeIdGeneratorConfigs: { [name: string]: FlakeIdGeneratorConfig } = {}; + + private configPatternMatcher = new ConfigPatternMatcher(); getReliableTopicConfig(name: string): ReliableTopicConfig { - let matching = this.lookupByPattern(this.reliableTopicConfigs, name); + const matching = this.lookupByPattern(this.reliableTopicConfigs, name); let config: ReliableTopicConfig; if (matching != null) { config = matching.clone(); @@ -70,17 +71,17 @@ export class ClientConfig { } getNearCacheConfig(name: string): NearCacheConfig { - let matching = this.lookupByPattern(this.nearCacheConfigs, name); + const matching = this.lookupByPattern(this.nearCacheConfigs, name); if (matching == null) { return null; } - let config = matching.clone(); + const config = matching.clone(); config.name = name; return config; } getFlakeIdGeneratorConfig(name: string): FlakeIdGeneratorConfig { - let matching: FlakeIdGeneratorConfig = this.lookupByPattern(this.flakeIdGeneratorConfigs, name); + const matching: FlakeIdGeneratorConfig = this.lookupByPattern(this.flakeIdGeneratorConfigs, name); let config: FlakeIdGeneratorConfig; if (matching != null) { config = matching.clone(); @@ -91,16 +92,16 @@ export class ClientConfig { return config; } - private lookupByPattern(config: {[pattern: string]: any}, name: string): T { + private lookupByPattern(config: { [pattern: string]: any }, name: string): T { if (config[name] != null) { return config[name]; } - let matchingPattern = this.configPatternMatcher.matches(Object.keys(config), name); + const matchingPattern = this.configPatternMatcher.matches(Object.keys(config), name); if (matchingPattern != null) { return config[matchingPattern]; } - if (config['default'] != null) { - return config['default']; + if (config.default != null) { + return config.default; } return null; } diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 425754ec5..01fd60c71 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -14,24 +14,20 @@ * limitations under the License. */ -import {ClientConfig} from './Config'; import * as Promise from 'bluebird'; +import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {HazelcastError} from '../HazelcastError'; -import * as path from 'path'; -import { - createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, - tryGetString -} from '../Util'; import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; -import {ReliableTopicConfig} from './ReliableTopicConfig'; -import {InMemoryFormat} from './InMemoryFormat'; +import {createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; +import {ClientConfig} from './Config'; import {EvictionPolicy} from './EvictionPolicy'; -import {NearCacheConfig} from './NearCacheConfig'; +import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; import {ImportConfig} from './ImportConfig'; -import {Properties} from './Properties'; +import {InMemoryFormat} from './InMemoryFormat'; import {JsonConfigLocator} from './JsonConfigLocator'; -import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; -import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; +import {NearCacheConfig} from './NearCacheConfig'; +import {Properties} from './Properties'; +import {ReliableTopicConfig} from './ReliableTopicConfig'; export class ConfigBuilder { private clientConfig: ClientConfig = new ClientConfig(); @@ -40,7 +36,7 @@ export class ConfigBuilder { loadConfig(): Promise { return this.configLocator.load().then(() => { - let loadedBuffer = this.configLocator.getBuffer(); + const loadedBuffer = this.configLocator.getBuffer(); if (loadedBuffer) { this.loadedJson = JSON.parse(loadedBuffer.toString()); return this.replaceImportsWithContent(this.loadedJson); @@ -58,8 +54,8 @@ export class ConfigBuilder { } private replaceImportsWithContent(jsonObject: any): Promise { - if (jsonObject['import']) { - let includes = tryGetArray(jsonObject['import']); + if (jsonObject.import) { + const includes = tryGetArray(jsonObject.import); return Promise.map(includes, (path: string) => { return this.configLocator.loadImported(path); }).map((buffer: Buffer) => { @@ -69,7 +65,7 @@ export class ConfigBuilder { } private handleConfig(jsonObject: any): void { - for (let key in jsonObject) { + for (const key in jsonObject) { if (key === 'network') { this.handleNetwork(jsonObject[key]); } else if (key === 'group') { @@ -91,7 +87,7 @@ export class ConfigBuilder { } private handleNetwork(jsonObject: any): void { - for (let key in jsonObject) { + for (const key in jsonObject) { if (key === 'clusterMembers') { this.handleClusterMembers(jsonObject[key]); } else if (key === 'smartRouting') { @@ -100,7 +96,7 @@ export class ConfigBuilder { this.clientConfig.networkConfig.connectionTimeout = tryGetNumber(jsonObject[key]); } else if (key === 'connectionAttemptPeriod') { this.clientConfig.networkConfig.connectionAttemptPeriod = tryGetNumber(jsonObject[key]); - } else if (key === 'connectionAttemptLimit') { + } else if (key === 'connectionAttemptLimit') { this.clientConfig.networkConfig.connectionAttemptLimit = tryGetNumber(jsonObject[key]); } else if (key === 'ssl') { this.handleSsl(jsonObject[key]); @@ -109,47 +105,47 @@ export class ConfigBuilder { } private parseProperties(jsonObject: any): Properties { - let props: Properties = {}; - for (let key in jsonObject) { + const props: Properties = {} as Properties; + for (const key in jsonObject) { props[key] = jsonObject[key]; } return props; } private parseImportConfig(jsonObject: any): ImportConfig { - let importConfig: ImportConfig = {}; - importConfig.path = jsonObject['path']; - importConfig.exportedName = jsonObject['exportedName']; + const importConfig: ImportConfig = {} as ImportConfig; + importConfig.path = jsonObject.path; + importConfig.exportedName = jsonObject.exportedName; return importConfig; } private handleSsl(jsonObject: any) { - let sslEnabled = tryGetBoolean(jsonObject['enabled']); + const sslEnabled = tryGetBoolean(jsonObject.enabled); if (sslEnabled) { - if (jsonObject['factory']) { - let factory = jsonObject['factory']; - let importConfig = this.parseImportConfig(factory); + if (jsonObject.factory) { + const factory = jsonObject.factory; + const importConfig = this.parseImportConfig(factory); if (importConfig.path == null && importConfig.exportedName !== BasicSSLOptionsFactory.name) { throw new RangeError('Invalid configuration. Either ssl factory path should be set or exportedName ' + ' should be ' + BasicSSLOptionsFactory.name); } else { this.clientConfig.networkConfig.sslOptionsFactoryConfig = this.parseImportConfig(factory); - this.clientConfig.networkConfig.sslOptionsFactoryProperties = this.parseProperties(factory['properties']); + this.clientConfig.networkConfig.sslOptionsFactoryProperties = this.parseProperties(factory.properties); } } } } private handleClusterMembers(jsonObject: any) { - var addressArray = tryGetArray(jsonObject); - for (let index in addressArray) { - let address = addressArray[index]; + const addressArray = tryGetArray(jsonObject); + for (const index in addressArray) { + const address = addressArray[index]; this.clientConfig.networkConfig.addresses.push(createAddressFromString(tryGetString(address))); } } private handleGroup(jsonObject: any): void { - for (let key in jsonObject) { + for (const key in jsonObject) { if (key === 'name') { this.clientConfig.groupConfig.name = tryGetString(jsonObject[key]); } else if (key === 'password') { @@ -159,21 +155,21 @@ export class ConfigBuilder { } private handleProperties(jsonObject: any): void { - for (let key in jsonObject) { + for (const key in jsonObject) { this.clientConfig.properties[key] = jsonObject[key]; } } private handleListeners(jsonObject: any): void { - let listenersArray = tryGetArray(jsonObject); - for (let index in listenersArray) { - let listenerConfig = listenersArray[index]; + const listenersArray = tryGetArray(jsonObject); + for (const index in listenersArray) { + const listenerConfig = listenersArray[index]; this.clientConfig.listenerConfigs.push(this.parseImportConfig(listenerConfig)); } } private handleSerialization(jsonObject: any): void { - for (let key in jsonObject) { + for (const key in jsonObject) { if (key === 'defaultNumberType') { this.clientConfig.serializationConfig.defaultNumberType = tryGetString(jsonObject[key]); } else if (key === 'isBigEndian') { @@ -181,19 +177,19 @@ export class ConfigBuilder { } else if (key === 'portableVersion') { this.clientConfig.serializationConfig.portableVersion = tryGetNumber(jsonObject[key]); } else if (key === 'dataSerializableFactories') { - for (let index in jsonObject[key]) { - let factory = jsonObject[key][index]; + for (const index in jsonObject[key]) { + const factory = jsonObject[key][index]; this.clientConfig.serializationConfig .dataSerializableFactoryConfigs[factory.factoryId] = this.parseImportConfig(factory); } } else if (key === 'portableFactories') { - for (let index in jsonObject[key]) { - let factory = jsonObject[key][index]; + for (const index in jsonObject[key]) { + const factory = jsonObject[key][index]; this.clientConfig.serializationConfig .portableFactoryConfigs[factory.factoryId] = this.parseImportConfig(factory); } } else if (key === 'globalSerializer') { - let globalSerializer = jsonObject[key]; + const globalSerializer = jsonObject[key]; this.clientConfig.serializationConfig.globalSerializerConfig = this.parseImportConfig(globalSerializer); } else if (key === 'serializers') { this.handleSerializers(jsonObject[key]); @@ -202,19 +198,19 @@ export class ConfigBuilder { } private handleSerializers(jsonObject: any): void { - let serializersArray = tryGetArray(jsonObject); - for (let index in serializersArray) { - let serializer = serializersArray[index]; + const serializersArray = tryGetArray(jsonObject); + for (const index in serializersArray) { + const serializer = serializersArray[index]; this.clientConfig.serializationConfig.customSerializerConfigs[serializer.typeId] = this.parseImportConfig(serializer); } } private handleNearCaches(jsonObject: any): void { - let nearCachesArray = tryGetArray(jsonObject); - for (let index in nearCachesArray) { - let ncConfig = nearCachesArray[index]; - let nearCacheConfig = new NearCacheConfig(); - for (let name in ncConfig) { + const nearCachesArray = tryGetArray(jsonObject); + for (const index in nearCachesArray) { + const ncConfig = nearCachesArray[index]; + const nearCacheConfig = new NearCacheConfig(); + for (const name in ncConfig) { if (name === 'name') { nearCacheConfig.name = tryGetString(ncConfig[name]); } else if (name === 'invalidateOnChange') { @@ -240,11 +236,11 @@ export class ConfigBuilder { } private handleReliableTopics(jsonObject: any): void { - let rtConfigsArray = tryGetArray(jsonObject); - for (let index in rtConfigsArray) { - let jsonRtCfg = rtConfigsArray[index]; - let reliableTopicConfig = new ReliableTopicConfig(); - for (let name in jsonRtCfg) { + const rtConfigsArray = tryGetArray(jsonObject); + for (const index in rtConfigsArray) { + const jsonRtCfg = rtConfigsArray[index]; + const reliableTopicConfig = new ReliableTopicConfig(); + for (const name in jsonRtCfg) { if (name === 'name') { reliableTopicConfig.name = jsonRtCfg[name]; } else if (name === 'readBatchSize') { @@ -258,11 +254,11 @@ export class ConfigBuilder { } private handleFlakeIds(jsonObject: any): void { - let flakeIdsArray = tryGetArray(jsonObject); - for (let index in flakeIdsArray) { - let fidConfig = flakeIdsArray[index]; - let flakeIdConfig = new FlakeIdGeneratorConfig(); - for (let name in fidConfig) { + const flakeIdsArray = tryGetArray(jsonObject); + for (const index in flakeIdsArray) { + const fidConfig = flakeIdsArray[index]; + const flakeIdConfig = new FlakeIdGeneratorConfig(); + for (const name in fidConfig) { if (name === 'name') { flakeIdConfig.name = tryGetString(fidConfig[name]); } else if (name === 'prefetchCount') { @@ -275,5 +271,4 @@ export class ConfigBuilder { } } - } diff --git a/src/config/ConfigPatternMatcher.ts b/src/config/ConfigPatternMatcher.ts index c7bf844a6..ce6efd0f1 100644 --- a/src/config/ConfigPatternMatcher.ts +++ b/src/config/ConfigPatternMatcher.ts @@ -31,7 +31,7 @@ export class ConfigPatternMatcher { let matchingPattern: string = null; let duplicatePattern: string = null; configPatterns.forEach((pattern: string) => { - let currentPoint = this.getMatchingPoint(pattern, itemName); + const currentPoint = this.getMatchingPoint(pattern, itemName); if (currentPoint > bestMatchingPoint) { bestMatchingPoint = currentPoint; matchingPattern = pattern; @@ -49,15 +49,15 @@ export class ConfigPatternMatcher { } getMatchingPoint(pattern: string, itemName: string): number { - let index = pattern.indexOf('*'); + const index = pattern.indexOf('*'); if (index === -1) { return -1; } - let firstPart = pattern.substring(0, index); + const firstPart = pattern.substring(0, index); if (!itemName.startsWith(firstPart)) { return -1; } - let secondPart = pattern.substring(index + 1); + const secondPart = pattern.substring(index + 1); if (!itemName.endsWith(secondPart)) { return -1; } diff --git a/src/config/EvictionPolicy.ts b/src/config/EvictionPolicy.ts index e0f279035..ed9effc6f 100644 --- a/src/config/EvictionPolicy.ts +++ b/src/config/EvictionPolicy.ts @@ -21,5 +21,5 @@ export enum EvictionPolicy { NONE, LRU, LFU, - RANDOM + RANDOM, } diff --git a/src/config/FlakeIdGeneratorConfig.ts b/src/config/FlakeIdGeneratorConfig.ts index dba520a67..02301ac1c 100644 --- a/src/config/FlakeIdGeneratorConfig.ts +++ b/src/config/FlakeIdGeneratorConfig.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -import * as Long from 'long'; - export class FlakeIdGeneratorConfig { /** * Sets the name for this config. @@ -50,7 +48,7 @@ export class FlakeIdGeneratorConfig { } clone(): FlakeIdGeneratorConfig { - let other = new FlakeIdGeneratorConfig(); + const other = new FlakeIdGeneratorConfig(); Object.assign(other, this); return other; } diff --git a/src/config/InMemoryFormat.ts b/src/config/InMemoryFormat.ts index 686bd9c13..19f913599 100644 --- a/src/config/InMemoryFormat.ts +++ b/src/config/InMemoryFormat.ts @@ -23,5 +23,5 @@ export enum InMemoryFormat { /** * Objects are in serialized form */ - BINARY + BINARY, } diff --git a/src/config/JsonConfigLocator.ts b/src/config/JsonConfigLocator.ts index 1b7587bf5..9b2c8cf9a 100644 --- a/src/config/JsonConfigLocator.ts +++ b/src/config/JsonConfigLocator.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {ConfigBuilder} from './ConfigBuilder'; -import * as fs from 'fs'; import * as Promise from 'bluebird'; +import * as fs from 'fs'; import * as Path from 'path'; import {LoggingService} from '../logging/LoggingService'; +import {ConfigBuilder} from './ConfigBuilder'; export class JsonConfigLocator { static readonly ENV_VARIABLE_NAME = 'HAZELCAST_CLIENT_CONFIG'; @@ -33,6 +33,7 @@ export class JsonConfigLocator { if (loaded) { return; } + // tslint:disable-next-line return this.loadFromWorkingDirectory().then((loaded: boolean) => { if (loaded) { return; @@ -42,9 +43,9 @@ export class JsonConfigLocator { } loadFromEnvironment(): Promise { - let envVariableLocation = process.env[JsonConfigLocator.ENV_VARIABLE_NAME]; + const envVariableLocation = process.env[JsonConfigLocator.ENV_VARIABLE_NAME]; if (envVariableLocation) { - let loadLocation = Path.resolve(envVariableLocation); + const loadLocation = Path.resolve(envVariableLocation); this.logger.trace('ConfigBuilder', 'Loading config from ' + envVariableLocation); return this.loadPath(envVariableLocation).then((buffer: Buffer) => { this.configLocation = envVariableLocation; @@ -57,9 +58,9 @@ export class JsonConfigLocator { } loadFromWorkingDirectory(): Promise { - let cwd = process.cwd(); - let jsonPath = Path.resolve(cwd, JsonConfigLocator.DEFAULT_FILE_NAME); - let deferred = Promise.defer(); + const cwd = process.cwd(); + const jsonPath = Path.resolve(cwd, JsonConfigLocator.DEFAULT_FILE_NAME); + const deferred = Promise.defer(); fs.access(jsonPath, (err) => { if (err) { deferred.resolve(false); @@ -81,7 +82,7 @@ export class JsonConfigLocator { } loadPath(path: string): Promise { - let deferred = Promise.defer(); + const deferred = Promise.defer(); fs.readFile(path, (err, data: Buffer) => { if (err) { this.logger.trace('JsonConfigLocator', 'Cannot read from ' + path.toString()); diff --git a/src/config/NearCacheConfig.ts b/src/config/NearCacheConfig.ts index 2bb12b0a3..457102745 100644 --- a/src/config/NearCacheConfig.ts +++ b/src/config/NearCacheConfig.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {InMemoryFormat} from './InMemoryFormat'; import {EvictionPolicy} from './EvictionPolicy'; +import {InMemoryFormat} from './InMemoryFormat'; export class NearCacheConfig { name: string = 'default'; @@ -50,7 +50,7 @@ export class NearCacheConfig { } clone(): NearCacheConfig { - let other = new NearCacheConfig(); + const other = new NearCacheConfig(); Object.assign(other, this); return other; } diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts index 82c0db3da..767d02ef3 100644 --- a/src/config/ReliableTopicConfig.ts +++ b/src/config/ReliableTopicConfig.ts @@ -29,7 +29,7 @@ export class ReliableTopicConfig { } clone(): ReliableTopicConfig { - let other = new ReliableTopicConfig(); + const other = new ReliableTopicConfig(); Object.assign(other, this); return other; } diff --git a/src/config/SSLOptions.ts b/src/config/SSLOptions.ts index fde7110f6..86b2131a9 100644 --- a/src/config/SSLOptions.ts +++ b/src/config/SSLOptions.ts @@ -18,12 +18,12 @@ export interface SSLOptions { /** * A string or Buffer containing the private key, certificate and CA certs of the client in PFX or PKCS12 format. */ - pfx?: any; //string | Buffer + pfx?: any; // string | Buffer /** * A string or Buffer containing the private key of the client in PEM format. (Could be an array of keys). */ - key?: any; //string | Buffer + key?: any; // string | Buffer /** * A string of passphrase for the private key or pfx. @@ -33,13 +33,13 @@ export interface SSLOptions { /** * A string or Buffer containing the certificate key of the client in PEM format. (Could be an array of certs). */ - cert?: any; //string | Buffer + cert?: any; // string | Buffer /** * An array of strings or Buffers of trusted certificates in PEM format. If this is omitted several well known "root" * CAs will be used, like VeriSign. These are used to authorize connections. */ - ca?: any; //Array of string | Buffer + ca?: any; // Array of string | Buffer /** * If true, the server certificate is verified against the list of supplied CAs. An 'error' event is emitted if verification diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index 0b4c7dff6..3162149a3 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -21,12 +21,12 @@ export class SerializationConfig { defaultNumberType: string = 'double'; isBigEndian: boolean = true; dataSerializableFactories: { [id: number]: IdentifiedDataSerializableFactory } = {}; - dataSerializableFactoryConfigs: { [id: number]: ImportConfig} = {}; + dataSerializableFactoryConfigs: { [id: number]: ImportConfig } = {}; portableFactories: { [id: number]: PortableFactory } = {}; portableFactoryConfigs: { [id: number]: ImportConfig } = {}; portableVersion: number = 0; customSerializers: any[] = []; - customSerializerConfigs: {[id: number]: ImportConfig } = {}; + customSerializerConfigs: { [id: number]: ImportConfig } = {}; globalSerializer: any = null; globalSerializerConfig: ImportConfig = null; } diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts index 5b177731e..c994f37a6 100644 --- a/src/connection/BasicSSLOptionsFactory.ts +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {SSLOptionsFactory} from './SSLOptionsFactory'; -import {Properties} from '../config/Properties'; -import {HazelcastError} from '../HazelcastError'; import * as Promise from 'bluebird'; import * as fs from 'fs'; +import {Properties} from '../config/Properties'; +import {HazelcastError} from '../HazelcastError'; import {getBooleanOrUndefined, getStringOrUndefined, resolvePath} from '../Util'; +import {SSLOptionsFactory} from './SSLOptionsFactory'; export class BasicSSLOptionsFactory implements SSLOptionsFactory { @@ -34,12 +34,12 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { throw new HazelcastError('properties is not an object'); } - let promises = []; + const promises = []; - let readFile = Promise.promisify(fs.readFile); + const readFile = Promise.promisify(fs.readFile); - let certPath = getStringOrUndefined(properties['certPath']); - let caPath = getStringOrUndefined(properties['caPath']); + const certPath = getStringOrUndefined(properties.certPath); + const caPath = getStringOrUndefined(properties.caPath); if (certPath !== undefined) { promises.push(readFile(resolvePath(certPath)).then((data: Buffer) => { @@ -53,9 +53,9 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { })); } - this.servername = getStringOrUndefined(properties['servername']); - this.rejectUnauthorized = getBooleanOrUndefined(properties['rejectUnauthorized']); - this.ciphers = getStringOrUndefined(properties['ciphers']); + this.servername = getStringOrUndefined(properties.servername); + this.rejectUnauthorized = getBooleanOrUndefined(properties.rejectUnauthorized); + this.ciphers = getStringOrUndefined(properties.ciphers); return Promise.all(promises).return(); } @@ -66,7 +66,7 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { rejectUnauthorized: this.rejectUnauthorized, cert: this.cert, ca: this.ca, - ciphers: this.ciphers + ciphers: this.ciphers, }; } diff --git a/src/connection/SSLOptionsFactory.ts b/src/connection/SSLOptionsFactory.ts index 2571a57f0..9a3ac04db 100644 --- a/src/connection/SSLOptionsFactory.ts +++ b/src/connection/SSLOptionsFactory.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {Properties} from '../config/Properties'; import * as Promise from 'bluebird'; +import {Properties} from '../config/Properties'; export interface SSLOptionsFactory { init(properties: Properties): Promise; diff --git a/src/core/EntryEventType.ts b/src/core/EntryEventType.ts index 4f77751ad..d5cf49b5d 100644 --- a/src/core/EntryEventType.ts +++ b/src/core/EntryEventType.ts @@ -24,5 +24,5 @@ export enum EntryEventType { CLEAR_ALL = 1 << 5, MERGED = 1 << 6, EXPIRED = 1 << 7, - INVALIDATION = 1 << 8 + INVALIDATION = 1 << 8, } diff --git a/src/core/EntryView.ts b/src/core/EntryView.ts index a1a08a167..af47e2dcc 100644 --- a/src/core/EntryView.ts +++ b/src/core/EntryView.ts @@ -15,6 +15,7 @@ */ import * as Long from 'long'; + export class EntryView { key: K; value: V; @@ -29,4 +30,3 @@ export class EntryView { evictionCriteriaNumber: Long; ttl: Long; } - diff --git a/src/core/ItemListener.ts b/src/core/ItemListener.ts index 4fbaf4db9..cd609ffa3 100644 --- a/src/core/ItemListener.ts +++ b/src/core/ItemListener.ts @@ -15,16 +15,15 @@ */ import {Member} from './Member'; + export interface ItemListener { itemAdded?: ItemEventListener; itemRemoved?: ItemEventListener; } -export interface ItemEventListener { - (item: E, member: Member, eventType: ItemEventType): void; -} +export type ItemEventListener = (item: E, member: Member, eventType: ItemEventType) => void; export enum ItemEventType { ADDED = 1, - REMOVED = 2 + REMOVED = 2, } diff --git a/src/core/MapListener.ts b/src/core/MapListener.ts index f430a07e4..a2deabbc6 100644 --- a/src/core/MapListener.ts +++ b/src/core/MapListener.ts @@ -22,9 +22,8 @@ export interface IMapListener { evicted?: EntryEventListener; evictedAll?: EntryEventListener; clearedAll?: EntryEventListener; + [event: string]: EntryEventListener; } -export interface EntryEventListener { - (key: K, oldValue: V, value: V, mergingValue: V): void; -} +export type EntryEventListener = (key: K, oldValue: V, value: V, mergingValue: V) => void; diff --git a/src/core/Member.ts b/src/core/Member.ts index af815ddff..79bedde73 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -15,7 +15,7 @@ */ import Address = require('../Address'); -import {UUID} from './UUID'; + export class Member { /** * Network address of member. @@ -29,9 +29,9 @@ export class Member { * true if member is a lite member. */ isLiteMember: boolean; - attributes: {[id: string]: string}; + attributes: { [id: string]: string }; - constructor(address: Address, uuid: string, isLiteMember = false, attributes: {[id: string]: string} = {}) { + constructor(address: Address, uuid: string, isLiteMember = false, attributes: { [id: string]: string } = {}) { this.address = address; this.uuid = uuid; this.isLiteMember = isLiteMember; diff --git a/src/core/MemberSelectors.ts b/src/core/MemberSelectors.ts index c5353a500..4575188ef 100644 --- a/src/core/MemberSelectors.ts +++ b/src/core/MemberSelectors.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {MemberSelector} from './MemberSelector'; import {Member} from './Member'; +import {MemberSelector} from './MemberSelector'; export class DataMemberSelector implements MemberSelector { select(member: Member): boolean { diff --git a/src/core/OverflowPolicy.ts b/src/core/OverflowPolicy.ts index d809b514b..b22a0c899 100644 --- a/src/core/OverflowPolicy.ts +++ b/src/core/OverflowPolicy.ts @@ -16,5 +16,5 @@ export enum OverflowPolicy { OVERWRITE = 0, - FAIL = 1 + FAIL = 1, } diff --git a/src/core/Predicate.ts b/src/core/Predicate.ts index 91ddcd152..add8d97a8 100644 --- a/src/core/Predicate.ts +++ b/src/core/Predicate.ts @@ -14,13 +14,27 @@ * limitations under the License. */ -import {IdentifiedDataSerializable} from '../serialization/Serializable'; import { - SqlPredicate, AndPredicate, FalsePredicate, BetweenPredicate, EqualPredicate, - GreaterLessPredicate, LikePredicate, ILikePredicate, InPredicate, InstanceOfPredicate, NotEqualPredicate, NotPredicate, - OrPredicate, RegexPredicate, TruePredicate, PagingPredicate + AndPredicate, + BetweenPredicate, + EqualPredicate, + FalsePredicate, + GreaterLessPredicate, + ILikePredicate, + InPredicate, + InstanceOfPredicate, + LikePredicate, + NotEqualPredicate, + NotPredicate, + OrPredicate, + PagingPredicate, + RegexPredicate, + SqlPredicate, + TruePredicate, } from '../serialization/DefaultPredicates'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; import {Comparator} from './Comparator'; + export interface Predicate extends IdentifiedDataSerializable { } @@ -107,5 +121,5 @@ export function paging(predicate: Predicate, pageSize: number, comparator: Compa export enum IterationType { KEY, VALUE, - ENTRY + ENTRY, } diff --git a/src/core/ReadOnlyLazyList.ts b/src/core/ReadOnlyLazyList.ts index e195aaff8..ef4dd0d85 100644 --- a/src/core/ReadOnlyLazyList.ts +++ b/src/core/ReadOnlyLazyList.ts @@ -27,30 +27,30 @@ class ReadOnlyLazyListIterator implements Iterator { next(): IteratorResult { if (this.index < this.list.size()) { - return { done: false, value: this.list.get(this.index++) }; + return {done: false, value: this.list.get(this.index++)}; } else { - return { done: true, value: undefined}; + return {done: true, value: undefined}; } } } export class ReadOnlyLazyList implements Iterable { - private internalArray: Array; + private internalArray: any[]; private serializationService: SerializationService; - constructor(array: Array, serializationService: SerializationService) { + constructor(array: any[], serializationService: SerializationService) { this.internalArray = array; this.serializationService = serializationService; } get(index: number): T { - let dataOrObject = this.internalArray[index]; + const dataOrObject = this.internalArray[index]; if (dataOrObject == null) { return undefined; } - if ((this.serializationService).isData(dataOrObject)) { - let obj = this.serializationService.toObject(dataOrObject); + if ((this.serializationService as SerializationServiceV1).isData(dataOrObject)) { + const obj = this.serializationService.toObject(dataOrObject); this.internalArray[index] = obj; return obj; } else { @@ -70,9 +70,9 @@ export class ReadOnlyLazyList implements Iterable { return new ReadOnlyLazyList(this.internalArray.slice(start, end), this.serializationService); } - toArray(): Array { - let arr: Array = []; - let iterator = this.values(); + toArray(): T[] { + const arr: T[] = []; + const iterator = this.values(); for (let item = iterator.next(); !item.done; item = iterator.next()) { arr.push(item.value); } @@ -83,4 +83,3 @@ export class ReadOnlyLazyList implements Iterable { return this.values(); } } - diff --git a/src/core/UUID.ts b/src/core/UUID.ts index 709af3856..4f892cd21 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -15,6 +15,7 @@ */ import * as Long from 'long'; + export class UUID { readonly leastSignificant: Long; readonly mostSignificant: Long; @@ -33,16 +34,16 @@ export class UUID { /* tslint:disable:no-bitwise */ toString(): string { - let mostHigh = this.mostSignificant.getHighBitsUnsigned(); // (32) 32 32 32 - let mostLow = this.mostSignificant.getLowBitsUnsigned(); // 32 (32) 32 32 - let leastHigh = this.leastSignificant.getHighBitsUnsigned(); // 32 32 (32) 32 - let leastLow = this.leastSignificant.getLowBitsUnsigned(); // 32 32 32 (32) + const mostHigh = this.mostSignificant.getHighBitsUnsigned(); // (32) 32 32 32 + const mostLow = this.mostSignificant.getLowBitsUnsigned(); // 32 (32) 32 32 + const leastHigh = this.leastSignificant.getHighBitsUnsigned(); // 32 32 (32) 32 + const leastLow = this.leastSignificant.getLowBitsUnsigned(); // 32 32 32 (32) - let div1 = mostHigh.toString(16); - let div2 = (mostLow >>> 16).toString(16); - let div3 = (mostLow & ((1 << 16) - 1)).toString(16); - let div4 = (leastHigh >>> 16).toString(16); - let div5 = (leastHigh & ((1 << 16) - 1)).toString(16) + leastLow.toString(16); + const div1 = mostHigh.toString(16); + const div2 = (mostLow >>> 16).toString(16); + const div3 = (mostLow & ((1 << 16) - 1)).toString(16); + const div4 = (leastHigh >>> 16).toString(16); + const div5 = (leastHigh & ((1 << 16) - 1)).toString(16) + leastLow.toString(16); return div1 + '-' + div2 + '-' + div3 + '-' + div4 + '-' + div5; } } diff --git a/src/core/VectorClock.ts b/src/core/VectorClock.ts index 6f85f410c..add352704 100644 --- a/src/core/VectorClock.ts +++ b/src/core/VectorClock.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {IdentifiedDataSerializable} from '../serialization/Serializable'; -import {DataInput, DataOutput} from '../serialization/Data'; import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; +import {DataInput, DataOutput} from '../serialization/Data'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; export class VectorClock implements IdentifiedDataSerializable { @@ -25,7 +25,7 @@ export class VectorClock implements IdentifiedDataSerializable { isAfter(other: VectorClock): boolean { let atLeastOneBigger = false; other.replicaTimestamps.forEach((otherTimestamp: Long, replicaId: string) => { - let thisTimetamp = this.replicaTimestamps.get(replicaId); + const thisTimetamp = this.replicaTimestamps.get(replicaId); if (thisTimetamp == null || otherTimestamp.greaterThan(thisTimetamp)) { return false; } else if (otherTimestamp.lessThan(thisTimetamp)) { @@ -40,7 +40,7 @@ export class VectorClock implements IdentifiedDataSerializable { } entrySet(): Array<[string, Long]> { - let entrySet: Array<[string, Long]> = []; + const entrySet: Array<[string, Long]> = []; this.replicaTimestamps.forEach((timestamp: Long, replicaId: string) => { entrySet.push([replicaId, timestamp]); }); @@ -48,10 +48,10 @@ export class VectorClock implements IdentifiedDataSerializable { } readData(input: DataInput): any { - let stateSize = input.readInt(); + const stateSize = input.readInt(); for (let i = 0; i < stateSize; i++) { - let replicaId = input.readUTF(); - let timestamp = input.readLong(); + const replicaId = input.readUTF(); + const timestamp = input.readLong(); this.replicaTimestamps.set(replicaId, timestamp); } } diff --git a/src/index.ts b/src/index.ts index f76a46763..327119f45 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,17 +14,17 @@ * limitations under the License. */ -import HazelcastClient from './HazelcastClient'; -import * as Config from './config/Config'; -import {ClientInfo} from './ClientInfo'; -import {IMap} from './proxy/IMap'; -import * as Predicates from './core/Predicate'; import Address = require('./Address'); import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); -import * as HazelcastErrors from './HazelcastError'; -import {IterationType} from './core/Predicate'; import * as Aggregators from './aggregation/Aggregators'; +import {ClientInfo} from './ClientInfo'; +import * as Config from './config/Config'; import {ImportConfig} from './config/ImportConfig'; +import * as Predicates from './core/Predicate'; +import {IterationType} from './core/Predicate'; +import HazelcastClient from './HazelcastClient'; +import * as HazelcastErrors from './HazelcastError'; +import {IMap} from './proxy/IMap'; import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; export { @@ -39,5 +39,5 @@ export { ReadResultSet, IterationType, Aggregators, - ImportConfig + ImportConfig, }; diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index b6bde1f56..55d3f1eb0 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import * as net from 'net'; -import Address = require('../Address'); import * as Promise from 'bluebird'; +import * as net from 'net'; import {BitsUtil} from '../BitsUtil'; import {BuildMetadata} from '../BuildMetadata'; import HazelcastClient from '../HazelcastClient'; import {IOError} from '../HazelcastError'; +import Address = require('../Address'); export class ClientConnection { private address: Address; @@ -68,7 +68,7 @@ export class ClientConnection { } write(buffer: Buffer): Promise { - let deferred = Promise.defer(); + const deferred = Promise.defer(); try { this.socket.write(buffer, (err: any) => { if (err) { @@ -85,7 +85,7 @@ export class ClientConnection { setConnectedServerVersion(versionString: string): void { this.connectedServerVersionString = versionString; - this.connectedServerVersion = BuildMetadata.calculateVersion(versionString); + this.connectedServerVersion = BuildMetadata.calculateVersion(versionString); } getConnectedServerVersion(): number { @@ -136,12 +136,12 @@ export class ClientConnection { this.socket.on('data', (buffer: Buffer) => { this.lastRead = new Date().getTime(); this.readBuffer = Buffer.concat([this.readBuffer, buffer], this.readBuffer.length + buffer.length); - while (this.readBuffer.length >= BitsUtil.INT_SIZE_IN_BYTES ) { - var frameSize = this.readBuffer.readInt32LE(0); + while (this.readBuffer.length >= BitsUtil.INT_SIZE_IN_BYTES) { + const frameSize = this.readBuffer.readInt32LE(0); if (frameSize > this.readBuffer.length) { return; } - var message: Buffer = new Buffer(frameSize); + const message: Buffer = new Buffer(frameSize); this.readBuffer.copy(message, 0, 0, frameSize); this.readBuffer = this.readBuffer.slice(frameSize); callback(message); diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index d07852577..7b5d03345 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -21,11 +21,11 @@ import HazelcastClient from '../HazelcastClient'; import {ClientNotActiveError, HazelcastError, IllegalStateError} from '../HazelcastError'; import {ClientConnection} from './ClientConnection'; import {ConnectionAuthenticator} from './ConnectionAuthenticator'; -import Address = require('../Address'); import * as net from 'net'; import * as tls from 'tls'; import {loadNameFromPath} from '../Util'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; +import Address = require('../Address'); const EMIT_CONNECTION_CLOSED = 'connectionClosed'; const EMIT_CONNECTION_OPENED = 'connectionOpened'; @@ -34,17 +34,17 @@ const EMIT_CONNECTION_OPENED = 'connectionOpened'; * Maintains connections between the client and members of the cluster. */ export class ClientConnectionManager extends EventEmitter { + establishedConnections: { [address: string]: ClientConnection } = {}; private client: HazelcastClient; - private pendingConnections: {[address: string]: Promise.Resolver} = {}; + private pendingConnections: { [address: string]: Promise.Resolver } = {}; private logger = LoggingService.getLoggingService(); - establishedConnections: {[address: string]: ClientConnection} = {}; constructor(client: HazelcastClient) { super(); this.client = client; } - getActiveConnections(): {[address: string]: ClientConnection} { + getActiveConnections(): { [address: string]: ClientConnection } { return this.establishedConnections; } @@ -56,28 +56,28 @@ export class ClientConnectionManager extends EventEmitter { * @returns {Promise|Promise} */ getOrConnect(address: Address, asOwner: boolean = false): Promise { - let addressIndex = address.toString(); - let connectionResolver: Promise.Resolver = Promise.defer(); + const addressIndex = address.toString(); + const connectionResolver: Promise.Resolver = Promise.defer(); - let establishedConnection = this.establishedConnections[addressIndex]; + const establishedConnection = this.establishedConnections[addressIndex]; if (establishedConnection) { connectionResolver.resolve(establishedConnection); return connectionResolver.promise; } - let pendingConnection = this.pendingConnections[addressIndex]; + const pendingConnection = this.pendingConnections[addressIndex]; if (pendingConnection) { return pendingConnection.promise; } this.pendingConnections[addressIndex] = connectionResolver; - let processResponseCallback = (data: Buffer) => { + const processResponseCallback = (data: Buffer) => { this.client.getInvocationService().processResponse(data); }; this.triggerConnect(address, asOwner).then((socket: net.Socket) => { - let clientConnection = new ClientConnection(this.client, address, socket); + const clientConnection = new ClientConnection(this.client, address, socket); return this.initiateCommunication(clientConnection).then(() => { return clientConnection.registerResponseCallback(processResponseCallback); @@ -94,27 +94,52 @@ export class ClientConnectionManager extends EventEmitter { delete this.pendingConnections[addressIndex]; }); - - let connectionTimeout = this.client.getConfig().networkConfig.connectionTimeout; + const connectionTimeout = this.client.getConfig().networkConfig.connectionTimeout; if (connectionTimeout !== 0) { return connectionResolver.promise.timeout(connectionTimeout, new HazelcastError('Connection timed-out')); } return connectionResolver.promise; } + /** + * Destroys the connection with given node address. + * @param address + */ + destroyConnection(address: Address): void { + const addressStr = address.toString(); + if (this.pendingConnections.hasOwnProperty(addressStr)) { + this.pendingConnections[addressStr].reject(null); + } + if (this.establishedConnections.hasOwnProperty(addressStr)) { + const conn = this.establishedConnections[addressStr]; + delete this.establishedConnections[addressStr]; + conn.close(); + this.onConnectionClosed(conn); + } + } + + shutdown() { + for (const pending in this.pendingConnections) { + this.pendingConnections[pending].reject(new ClientNotActiveError('Client is shutting down!')); + } + for (const conn in this.establishedConnections) { + this.establishedConnections[conn].close(); + } + } + private triggerConnect(address: Address, asOwner: boolean): Promise { if (!asOwner) { if (this.client.getClusterService().getOwnerConnection() == null) { - let error = new IllegalStateError('Owner connection is not available!'); + const error = new IllegalStateError('Owner connection is not available!'); return Promise.reject(error); } } if (this.client.getConfig().networkConfig.sslOptions) { - let opts = this.client.getConfig().networkConfig.sslOptions; + const opts = this.client.getConfig().networkConfig.sslOptions; return this.connectTLSSocket(address, opts); } else if (this.client.getConfig().networkConfig.sslOptionsFactoryConfig) { - let factoryConfig = this.client.getConfig().networkConfig.sslOptionsFactoryConfig; - let factoryProperties = this.client.getConfig().networkConfig.sslOptionsFactoryProperties; + const factoryConfig = this.client.getConfig().networkConfig.sslOptionsFactoryConfig; + const factoryProperties = this.client.getConfig().networkConfig.sslOptionsFactoryProperties; let factory: any; if (factoryConfig.path) { factory = new (loadNameFromPath(factoryConfig.path, factoryConfig.exportedName))(); @@ -130,8 +155,8 @@ export class ClientConnectionManager extends EventEmitter { } private connectTLSSocket(address: Address, configOpts: any): Promise { - let connectionResolver = Promise.defer(); - let socket = tls.connect(address.port, address.host, configOpts); + const connectionResolver = Promise.defer(); + const socket = tls.connect(address.port, address.host, configOpts); socket.once('secureConnect', () => { connectionResolver.resolve(socket); }); @@ -146,8 +171,8 @@ export class ClientConnectionManager extends EventEmitter { } private connectNetSocket(address: Address): Promise { - let connectionResolver = Promise.defer(); - let socket = net.connect(address.port, address.host); + const connectionResolver = Promise.defer(); + const socket = net.connect(address.port, address.host); socket.once('connect', () => { connectionResolver.resolve(socket); }); @@ -163,37 +188,11 @@ export class ClientConnectionManager extends EventEmitter { private initiateCommunication(connection: ClientConnection): Promise { // Send the protocol version - let buffer = new Buffer(3); + const buffer = new Buffer(3); buffer.write('CB2'); return connection.write(buffer); } - /** - * Destroys the connection with given node address. - * @param address - */ - destroyConnection(address: Address): void { - var addressStr = address.toString(); - if (this.pendingConnections.hasOwnProperty(addressStr)) { - this.pendingConnections[addressStr].reject(null); - } - if (this.establishedConnections.hasOwnProperty(addressStr)) { - var conn = this.establishedConnections[addressStr]; - delete this.establishedConnections[addressStr]; - conn.close(); - this.onConnectionClosed(conn); - } - } - - shutdown() { - for (var pending in this.pendingConnections) { - this.pendingConnections[pending].reject(new ClientNotActiveError('Client is shutting down!')); - } - for (var conn in this.establishedConnections) { - this.establishedConnections[conn].close(); - } - } - private onConnectionClosed(connection: ClientConnection) { this.emit(EMIT_CONNECTION_CLOSED, connection); } @@ -203,7 +202,7 @@ export class ClientConnectionManager extends EventEmitter { } private authenticate(connection: ClientConnection, ownerConnection: boolean): Promise { - var authenticator = new ConnectionAuthenticator(connection, this.client); + const authenticator = new ConnectionAuthenticator(connection, this.client); return authenticator.authenticate(ownerConnection); } } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index ca4aa81f6..544c670a2 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -22,11 +22,11 @@ import {LoggingService} from '../logging/LoggingService'; import {EventEmitter} from 'events'; import {ClientInfo} from '../ClientInfo'; import HazelcastClient from '../HazelcastClient'; -import Address = require('../Address'); -import ClientMessage = require('../ClientMessage'); import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; +import Address = require('../Address'); +import ClientMessage = require('../ClientMessage'); const MEMBER_ADDED = 1; const MEMBER_REMOVED = 2; @@ -34,9 +34,9 @@ const MEMBER_REMOVED = 2; const EMIT_MEMBER_ADDED = 'memberAdded'; const EMIT_MEMBER_REMOVED = 'memberRemoved'; const EMIT_ATTRIBUTE_CHANGE = 'memberAttributeChange'; -const ATTRIBUTE_CHANGE: {[key: string]: string} = { +const ATTRIBUTE_CHANGE: { [key: string]: string } = { 1: 'put', - 2: 'remove' + 2: 'remove', }; /** @@ -93,8 +93,8 @@ export class ClusterService extends EventEmitter { if (this.knownAddresses.length === 0) { this.knownAddresses.push(new Address('127.0.0.1', 5701)); } - var attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; - var attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; + const attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; + const attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; return this.tryConnectingToAddresses(0, attemptLimit, attemptPeriod); } @@ -106,7 +106,7 @@ export class ClusterService extends EventEmitter { if (selector === undefined) { return this.members; } else { - let members: Member[] = []; + const members: Member[] = []; this.members.forEach(function (member) { if (selector.select(member)) { members.push(member); @@ -129,15 +129,39 @@ export class ClusterService extends EventEmitter { * @returns {ClientInfo} */ getClientInfo(): ClientInfo { - var info = new ClientInfo(); + const info = new ClientInfo(); info.uuid = this.uuid; info.localAddress = this.getOwnerConnection().getLocalAddress(); return info; } + /** + * Returns the connection associated with owner node of this client. + * @returns {ClientConnection} + */ + getOwnerConnection(): ClientConnection { + return this.ownerConnection; + } + + initMemberShipListener(): Promise { + const request = ClientAddMembershipListenerCodec.encodeRequest(false); + + const handler = (m: ClientMessage) => { + const handleMember = this.handleMember.bind(this); + const handleMemberList = this.handleMemberList.bind(this); + const handleAttributeChange = this.handleMemberAttributeChange.bind(this); + ClientAddMembershipListenerCodec.handle(m, handleMember, handleMemberList, handleAttributeChange, null); + }; + return this.client.getInvocationService().invokeOnConnection(this.getOwnerConnection(), request, handler) + .then((resp: ClientMessage) => { + this.logger.trace('ClusterService', 'Registered listener with id ' + + ClientAddMembershipListenerCodec.decodeResponse(resp).response); + }); + } + private initHeartbeatListener() { this.client.getHeartbeat().addListener({ - onHeartbeatStopped: this.onHeartbeatStopped.bind(this) + onHeartbeatStopped: this.onHeartbeatStopped.bind(this), }); } @@ -167,15 +191,15 @@ export class ClusterService extends EventEmitter { if (this.knownAddresses.length <= index) { remainingAttemptLimit = remainingAttemptLimit - 1; if (remainingAttemptLimit === 0) { - let errorMessage = 'Unable to connect to any of the following addresses: ' + + const errorMessage = 'Unable to connect to any of the following addresses: ' + this.knownAddresses.map((element: Address) => { return element.toString(); }).join(', '); this.logger.debug('ClusterService', errorMessage); - let error = new IllegalStateError(errorMessage, cause); + const error = new IllegalStateError(errorMessage, cause); return Promise.reject(error); } else { - let deferred = Promise.defer(); + const deferred = Promise.defer(); setTimeout( () => { this.tryConnectingToAddresses(0, remainingAttemptLimit, attemptPeriod).then(() => { @@ -184,12 +208,12 @@ export class ClusterService extends EventEmitter { deferred.reject(e); }); }, - attemptPeriod + attemptPeriod, ); return deferred.promise; } } else { - var currentAddress = this.knownAddresses[index]; + const currentAddress = this.knownAddresses[index]; return this.client.getConnectionManager().getOrConnect(currentAddress, true).then((connection: ClientConnection) => { connection.setAuthenticatedAsOwner(true); this.ownerConnection = connection; @@ -201,30 +225,6 @@ export class ClusterService extends EventEmitter { } } - /** - * Returns the connection associated with owner node of this client. - * @returns {ClientConnection} - */ - getOwnerConnection(): ClientConnection { - return this.ownerConnection; - } - - initMemberShipListener(): Promise { - var request = ClientAddMembershipListenerCodec.encodeRequest(false); - - var handler = (m: ClientMessage) => { - var handleMember = this.handleMember.bind(this); - var handleMemberList = this.handleMemberList.bind(this); - var handleAttributeChange = this.handleMemberAttributeChange.bind(this); - ClientAddMembershipListenerCodec.handle(m, handleMember, handleMemberList, handleAttributeChange, null); - }; - return this.client.getInvocationService().invokeOnConnection(this.getOwnerConnection(), request, handler) - .then((resp: ClientMessage) => { - this.logger.trace('ClusterService', 'Registered listener with id ' - + ClientAddMembershipListenerCodec.decodeResponse(resp).response); - }); - } - private handleMember(member: Member, eventType: number) { if (eventType === MEMBER_ADDED) { this.logger.info('ClusterService', member.toString() + ' added to cluster'); @@ -252,9 +252,9 @@ export class ClusterService extends EventEmitter { } private memberRemoved(member: Member) { - let memberIndex = this.members.findIndex(member.equals, member); + const memberIndex = this.members.findIndex(member.equals, member); if (memberIndex !== -1) { - let removedMemberList = this.members.splice(memberIndex, 1); + const removedMemberList = this.members.splice(memberIndex, 1); assert(removedMemberList.length === 1); } this.client.getConnectionManager().destroyConnection(member.address); diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index 72faeca85..a3453fe3e 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -21,16 +21,16 @@ import {ClientAuthenticationCustomCodec} from '../codec/ClientAuthenticationCust import {ClientConnection} from './ClientConnection'; import {ClusterService} from './ClusterService'; import {BuildInfoLoader} from '../BuildInfoLoader'; -import ClientMessage = require('../ClientMessage'); import {LoggingService} from '../logging/LoggingService'; import {AuthenticationError} from '../HazelcastError'; - +import ClientMessage = require('../ClientMessage'); const enum AuthenticationStatus { AUTHENTICATED = 0, CREDENTIALS_FAILED = 1, - SERIALIZATION_VERSION_MISMATCH = 2 + SERIALIZATION_VERSION_MISMATCH = 2, } + export class ConnectionAuthenticator { private connection: ClientConnection; @@ -45,11 +45,11 @@ export class ConnectionAuthenticator { } authenticate(asOwner: boolean): Promise { - var credentials: ClientMessage = this.createCredentials(asOwner); + const credentials: ClientMessage = this.createCredentials(asOwner); return this.client.getInvocationService() .invokeOnConnection(this.connection, credentials) .then((msg: ClientMessage) => { - var authResponse = ClientAuthenticationCodec.decodeResponse(msg); + const authResponse = ClientAuthenticationCodec.decodeResponse(msg); switch (authResponse.status) { case AuthenticationStatus.AUTHENTICATED: this.connection.setAddress(authResponse.address); @@ -64,16 +64,16 @@ export class ConnectionAuthenticator { this.connection.getAddress().toString() + ' authenticated'); break; case AuthenticationStatus.CREDENTIALS_FAILED: - this.logger.error('ConnectionAuthenticator', 'Invalid Credentials' ); + this.logger.error('ConnectionAuthenticator', 'Invalid Credentials'); throw new Error('Invalid Credentials, could not authenticate connection to ' + this.connection.getAddress().toString()); case AuthenticationStatus.SERIALIZATION_VERSION_MISMATCH: - this.logger.error('ConnectionAuthenticator', 'Serialization version mismatch' ); + this.logger.error('ConnectionAuthenticator', 'Serialization version mismatch'); throw new Error('Serialization version mismatch, could not authenticate connection to ' + this.connection.getAddress().toString()); default: this.logger.error('ConnectionAuthenticator', 'Unknown authentication status: ' - + authResponse.status ); + + authResponse.status); throw new AuthenticationError('Unknown authentication status: ' + authResponse.status + ' , could not authenticate connection to ' + this.connection.getAddress().toString()); @@ -81,20 +81,19 @@ export class ConnectionAuthenticator { }); } - createCredentials(asOwner: boolean): ClientMessage { - var groupConfig = this.client.getConfig().groupConfig; - var uuid: string = this.clusterService.uuid; - var ownerUuid: string = this.clusterService.ownerUuid; + const groupConfig = this.client.getConfig().groupConfig; + const uuid: string = this.clusterService.uuid; + const ownerUuid: string = this.clusterService.ownerUuid; - var customCredentials = this.client.getConfig().customCredentials; + const customCredentials = this.client.getConfig().customCredentials; - var clientMessage: ClientMessage; + let clientMessage: ClientMessage; const clientVersion = BuildInfoLoader.getClientVersion(); if (customCredentials != null) { - var credentialsPayload = this.client.getSerializationService().toData(customCredentials); + const credentialsPayload = this.client.getSerializationService().toData(customCredentials); clientMessage = ClientAuthenticationCustomCodec.encodeRequest( credentialsPayload, uuid, ownerUuid, asOwner, 'NJS', 1, clientVersion); diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 8d8be5fe0..2cf3b44db 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -14,19 +14,22 @@ * limitations under the License. */ -import ClientMessage = require('../ClientMessage'); -import * as Long from 'long'; -import Address = require('../Address'); +import * as assert from 'assert'; import * as Promise from 'bluebird'; +import * as Long from 'long'; import {BitsUtil} from '../BitsUtil'; -import {LoggingService} from '../logging/LoggingService'; import HazelcastClient from '../HazelcastClient'; -import {ClientConnection} from './ClientConnection'; import { - IllegalStateError, ClientNotActiveError, IOError, InvocationTimeoutError, - HazelcastInstanceNotActiveError, RetryableHazelcastError + ClientNotActiveError, + HazelcastInstanceNotActiveError, + InvocationTimeoutError, + IOError, + RetryableHazelcastError, } from '../HazelcastError'; -import * as assert from 'assert'; +import {LoggingService} from '../logging/LoggingService'; +import {ClientConnection} from './ClientConnection'; +import Address = require('../Address'); +import ClientMessage = require('../ClientMessage'); const EXCEPTION_MESSAGE_TYPE = 109; const MAX_FAST_INVOCATION_COUNT = 5; @@ -38,17 +41,8 @@ const PROPERTY_INVOCATION_TIMEOUT_MILLIS = 'hazelcast.client.invocation.timeout. */ export class Invocation { - constructor(client: HazelcastClient, request: ClientMessage) { - this.client = client; - this.invocationService = client.getInvocationService(); - this.deadline = new Date(new Date().getTime() + this.invocationService.getInvocationTimeoutMillis()); - this.request = request; - } - client: HazelcastClient; - invocationService: InvocationService; - /** * Representatiton of the request in binary form. */ @@ -69,20 +63,28 @@ export class Invocation { * Connection of the request. If request is not bound to any specific address, should be set to null. */ connection: ClientConnection; - /** * Promise managing object. */ deferred: Promise.Resolver; - invokeCount: number = 0; - /** * If this is an event listener registration, handler should be set to the function to be called on events. * Otherwise, should be set to null. */ handler: (...args: any[]) => any; + constructor(client: HazelcastClient, request: ClientMessage) { + this.client = client; + this.invocationService = client.getInvocationService(); + this.deadline = new Date(new Date().getTime() + this.invocationService.getInvocationTimeoutMillis()); + this.request = request; + } + + static isRetrySafeError(err: Error): boolean { + return err instanceof IOError || err instanceof HazelcastInstanceNotActiveError || err instanceof RetryableHazelcastError; + } + /** * @returns {boolean} */ @@ -93,19 +95,16 @@ export class Invocation { isAllowedToRetryOnSelection(err: Error): boolean { return (this.connection == null && this.address == null) || !(err instanceof IOError); } - - static isRetrySafeError(err: Error): boolean { - return err instanceof IOError || err instanceof HazelcastInstanceNotActiveError || err instanceof RetryableHazelcastError; - } } /** * Sends requests to appropriate nodes. Resolves waiting promises with responses. */ export class InvocationService { + doInvoke: (invocation: Invocation) => void; private correlationCounter = 1; - private eventHandlers: {[id: number]: Invocation} = {}; - private pending: {[id: number]: Invocation} = {}; + private eventHandlers: { [id: number]: Invocation } = {}; + private pending: { [id: number]: Invocation } = {}; private client: HazelcastClient; private smartRoutingEnabled: boolean; private readonly invocationRetryPauseMillis: number; @@ -113,8 +112,6 @@ export class InvocationService { private logger = LoggingService.getLoggingService(); private isShutdown: boolean; - doInvoke: (invocation: Invocation) => void; - constructor(hazelcastClient: HazelcastClient) { this.client = hazelcastClient; this.smartRoutingEnabled = hazelcastClient.getConfig().networkConfig.smartRouting; @@ -123,8 +120,8 @@ export class InvocationService { } else { this.doInvoke = this.invokeNonSmart; } - this.invocationRetryPauseMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS]; - this.invocationTimeoutMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS]; + this.invocationRetryPauseMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS] as number; + this.invocationTimeoutMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS] as number; this.isShutdown = false; } @@ -133,7 +130,7 @@ export class InvocationService { } invoke(invocation: Invocation): Promise { - var newCorrelationId = Long.fromNumber(this.correlationCounter++); + const newCorrelationId = Long.fromNumber(this.correlationCounter++); invocation.deferred = Promise.defer(); invocation.request.setCorrelationId(newCorrelationId); this.doInvoke(invocation); @@ -149,7 +146,7 @@ export class InvocationService { */ invokeOnConnection(connection: ClientConnection, request: ClientMessage, handler?: (...args: any[]) => any): Promise { - var invocation = new Invocation(this.client, request); + const invocation = new Invocation(this.client, request); invocation.connection = connection; if (handler) { invocation.handler = handler; @@ -164,7 +161,7 @@ export class InvocationService { * @returns */ invokeOnPartition(request: ClientMessage, partitionId: number): Promise { - var invocation = new Invocation(this.client, request); + const invocation = new Invocation(this.client, request); invocation.partitionId = partitionId; return this.invoke(invocation); } @@ -176,7 +173,7 @@ export class InvocationService { * @returns */ invokeOnTarget(request: ClientMessage, target: Address): Promise { - var invocation = new Invocation(this.client, request); + const invocation = new Invocation(this.client, request); invocation.address = target; return this.invoke(invocation); } @@ -199,6 +196,45 @@ export class InvocationService { return this.invocationRetryPauseMillis; } + /** + * Removes the handler for all event handlers with a specific correlation id. + * @param id correlation id + */ + removeEventHandler(id: number): void { + if (this.eventHandlers.hasOwnProperty('' + id)) { + delete this.eventHandlers[id]; + } + } + + /** + * Extract codec specific properties in a protocol message and resolves waiting promise. + * @param buffer + */ + processResponse(buffer: Buffer): void { + const clientMessage = new ClientMessage(buffer); + const correlationId = clientMessage.getCorrelationId().toNumber(); + const messageType = clientMessage.getMessageType(); + + if (clientMessage.hasFlags(BitsUtil.LISTENER_FLAG)) { + setImmediate(() => { + if (this.eventHandlers[correlationId] !== undefined) { + this.eventHandlers[correlationId].handler(clientMessage); + } + }); + return; + } + + const pendingInvocation = this.pending[correlationId]; + const deferred = pendingInvocation.deferred; + if (messageType === EXCEPTION_MESSAGE_TYPE) { + const remoteError = this.client.getErrorFactory().createErrorFromClientMessage(clientMessage); + this.notifyError(pendingInvocation, remoteError); + } else { + delete this.pending[correlationId]; + deferred.resolve(clientMessage); + } + } + private invokeSmart(invocation: Invocation): void { let invocationPromise: Promise; invocation.invokeCount++; @@ -230,7 +266,7 @@ export class InvocationService { } private invokeOnOwner(invocation: Invocation): Promise { - let owner = this.client.getClusterService().getOwnerConnection(); + const owner = this.client.getClusterService().getOwnerConnection(); if (owner == null) { return Promise.reject(new IOError('Unisocket client\'s owner connection is not available.')); } @@ -247,7 +283,7 @@ export class InvocationService { } private invokeOnPartitionOwner(invocation: Invocation, partitionId: number): Promise { - let ownerAddress = this.client.getPartitionService().getAddressForPartition(partitionId); + const ownerAddress = this.client.getPartitionService().getAddressForPartition(partitionId); return this.client.getConnectionManager().getOrConnect(ownerAddress).then((connection: ClientConnection) => { return this.send(invocation, connection); }).catch((e) => { @@ -270,7 +306,7 @@ export class InvocationService { } private notifyError(invocation: Invocation, error: Error): void { - let correlationId = invocation.request.getCorrelationId().toNumber(); + const correlationId = invocation.request.getCorrelationId().toNumber(); if (this.rejectIfNotRetryable(invocation, error)) { delete this.pending[invocation.request.getCorrelationId().toNumber()]; return; @@ -312,8 +348,8 @@ export class InvocationService { } private registerInvocation(invocation: Invocation) { - var message = invocation.request; - var correlationId = message.getCorrelationId().toNumber(); + const message = invocation.request; + const correlationId = message.getCorrelationId().toNumber(); if (invocation.hasPartitionId()) { message.setPartitionId(invocation.partitionId); } else { @@ -324,43 +360,4 @@ export class InvocationService { } this.pending[correlationId] = invocation; } - - /** - * Removes the handler for all event handlers with a specific correlation id. - * @param id correlation id - */ - removeEventHandler(id: number): void { - if (this.eventHandlers.hasOwnProperty('' + id)) { - delete this.eventHandlers[id]; - } - } - - /** - * Extract codec specific properties in a protocol message and resolves waiting promise. - * @param buffer - */ - processResponse(buffer: Buffer): void { - var clientMessage = new ClientMessage(buffer); - var correlationId = clientMessage.getCorrelationId().toNumber(); - var messageType = clientMessage.getMessageType(); - - if (clientMessage.hasFlags(BitsUtil.LISTENER_FLAG)) { - setImmediate(() => { - if (this.eventHandlers[correlationId] !== undefined) { - this.eventHandlers[correlationId].handler(clientMessage); - } - }); - return; - } - - var pendingInvocation = this.pending[correlationId]; - var deferred = pendingInvocation.deferred; - if (messageType === EXCEPTION_MESSAGE_TYPE) { - let remoteError = this.client.getErrorFactory().createErrorFromClientMessage(clientMessage); - this.notifyError(pendingInvocation, remoteError); - } else { - delete this.pending[correlationId]; - deferred.resolve(clientMessage); - } - } } diff --git a/src/logging/DefaultLogger.ts b/src/logging/DefaultLogger.ts index ea18b9f62..519a4621f 100644 --- a/src/logging/DefaultLogger.ts +++ b/src/logging/DefaultLogger.ts @@ -14,7 +14,8 @@ * limitations under the License. */ -import {LogLevel, ILogger} from './LoggingService'; +import {ILogger, LogLevel} from './LoggingService'; + export class DefaultLogger implements ILogger { level = LogLevel.INFO; diff --git a/src/logging/LoggingService.ts b/src/logging/LoggingService.ts index 2f3d24a54..3de51f176 100644 --- a/src/logging/LoggingService.ts +++ b/src/logging/LoggingService.ts @@ -14,16 +14,15 @@ * limitations under the License. */ -import {NoLogger} from './NoLogger'; import {DefaultLogger} from './DefaultLogger'; -import {IllegalStateError} from '../HazelcastError'; +import {NoLogger} from './NoLogger'; export enum LogLevel { ERROR = 0, WARN = 1, INFO = 2, DEBUG = 3, - TRACE = 4 + TRACE = 4, } export interface ILogger { @@ -61,7 +60,7 @@ export class LoggingService { throw new RangeError('Logging type unknown: ' + loggerModule); } } else { - LoggingService.loggingService = new LoggingService(loggerModule); + LoggingService.loggingService = new LoggingService(loggerModule as ILogger); } } diff --git a/src/logging/NoLogger.ts b/src/logging/NoLogger.ts index ac1343969..4cd6fc89c 100644 --- a/src/logging/NoLogger.ts +++ b/src/logging/NoLogger.ts @@ -14,7 +14,8 @@ * limitations under the License. */ -import {LogLevel, ILogger} from './LoggingService'; +import {ILogger, LogLevel} from './LoggingService'; + export class NoLogger implements ILogger { log(level: LogLevel, className: string, message: string, furtherInfo: any) { /* tslint:disable */ diff --git a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts index 5147df703..70d99ec4b 100644 --- a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts +++ b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {StaleReadDetector} from './StaleReadDetector'; -import {MetadataContainer} from './MetadataContainer'; import {DataRecord} from './DataRecord'; +import {MetadataContainer} from './MetadataContainer'; +import {StaleReadDetector} from './StaleReadDetector'; export class AlwaysFreshStaleReadDetector implements StaleReadDetector { isStaleRead(key: any, record: DataRecord): boolean { diff --git a/src/nearcache/DataRecord.ts b/src/nearcache/DataRecord.ts index c5f201c55..53b802f53 100644 --- a/src/nearcache/DataRecord.ts +++ b/src/nearcache/DataRecord.ts @@ -14,15 +14,15 @@ * limitations under the License. */ -import {Data} from '../serialization/Data'; import * as Long from 'long'; import {UUID} from '../core/UUID'; +import {Data} from '../serialization/Data'; export class DataRecord { + static readonly NOT_RESERVED = Long.NEG_ONE; static readonly RESERVED = Long.fromNumber(-2); static readonly READ_PERMITTED = Long.fromNumber(-3); - key: Data; value: Data | any; private creationTime: number; @@ -55,6 +55,7 @@ export class DataRecord { this.status = DataRecord.READ_PERMITTED; } + /*tslint:disable:member-ordering*/ public static lruComp(x: DataRecord, y: DataRecord) { return x.lastAccessTime - y.lastAccessTime; } @@ -68,7 +69,7 @@ export class DataRecord { } isExpired(maxIdleSeconds: number) { - var now = new Date().getTime(); + const now = new Date().getTime(); if ((this.expirationTime > 0 && this.expirationTime < now) || (maxIdleSeconds > 0 && this.lastAccessTime + maxIdleSeconds * 1000 < now)) { return true; diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index 9776b4198..e269e862b 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -14,16 +14,16 @@ * limitations under the License. */ -import {RepairingHandler} from './RepairingHandler'; -import HazelcastClient from '../HazelcastClient'; -import {PartitionService} from '../PartitionService'; +import * as Promise from 'bluebird'; import {MapFetchNearCacheInvalidationMetadataCodec} from '../codec/MapFetchNearCacheInvalidationMetadataCodec'; +import {MemberSelectors} from '../core/MemberSelectors'; +import {UUID} from '../core/UUID'; +import HazelcastClient from '../HazelcastClient'; import {Invocation} from '../invocation/InvocationService'; -import * as Promise from 'bluebird'; -import ClientMessage = require('../ClientMessage'); import {LoggingService} from '../logging/LoggingService'; -import {UUID} from '../core/UUID'; -import {MemberSelectors} from '../core/MemberSelectors'; +import {PartitionService} from '../PartitionService'; +import {RepairingHandler} from './RepairingHandler'; +import ClientMessage = require('../ClientMessage'); export class MetadataFetcher { @@ -37,32 +37,24 @@ export class MetadataFetcher { } initHandler(handler: RepairingHandler): Promise { - let scanPromise = this.scanMembers([handler.getName()])[0]; + const scanPromise = this.scanMembers([handler.getName()])[0]; return scanPromise.then((response: ClientMessage) => { - let metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(response); + const metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(response); handler.initUuid(metadata.partitionUuidList); handler.initSequence(metadata.namePartitionSequenceList[0]); }); } fetchMetadata(handlers: Map): Promise { - let objectNames = this.getObjectNames(handlers); - let promises = this.scanMembers(objectNames); + const objectNames = this.getObjectNames(handlers); + const promises = this.scanMembers(objectNames); return Promise.each(promises, (clientMessage: ClientMessage) => { this.processResponse(clientMessage, handlers); }).return(); } - private getObjectNames(handlers: Map): string[] { - let names: string[] = []; - handlers.forEach((handler: RepairingHandler) => { - names.push(handler.getName()); - }); - return names; - } - protected processResponse(responseMessage: ClientMessage, handlers: Map): void { - let metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(responseMessage); + const metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(responseMessage); handlers.forEach((handler: RepairingHandler) => { try { this.repairUuids(handler, metadata.partitionUuidList); @@ -73,30 +65,37 @@ export class MetadataFetcher { }); } - protected repairUuids(handler: RepairingHandler, partitionIdUuidList: [number, UUID][]): void { + protected repairUuids(handler: RepairingHandler, partitionIdUuidList: Array<[number, UUID]>): void { partitionIdUuidList.forEach((entry: [number, UUID]) => { handler.checkOrRepairUuid(entry[0], entry[1]); }); } - protected repairSequences(handler: RepairingHandler, partitionIdSequenceList: [string, [number, Long][]][]): void { - partitionIdSequenceList.forEach((partitionIdSeq: [string, [number, Long][]]) => { - let pairs = partitionIdSeq[1]; + protected repairSequences(handler: RepairingHandler, partitionIdSequenceList: Array<[string, Array<[number, Long]>]>): void { + partitionIdSequenceList.forEach((partitionIdSeq: [string, Array<[number, Long]>]) => { + const pairs = partitionIdSeq[1]; pairs.forEach((pair: [number, Long]) => { handler.checkOrRepairSequence(pair[0], pair[1], true); }); }); } - protected scanMembers(objectNames: string[]): Promise[] { - let members = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); - let promises: Promise[] = []; + protected scanMembers(objectNames: string[]): Array> { + const members = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); + const promises: Array> = []; members.forEach((member) => { - let request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.address); - let promise = this.client.getInvocationService().invoke(new Invocation(this.client, request)); + const request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.address); + const promise = this.client.getInvocationService().invoke(new Invocation(this.client, request)); promises.push(promise); }); return promises; } + private getObjectNames(handlers: Map): string[] { + const names: string[] = []; + handlers.forEach((handler: RepairingHandler) => { + names.push(handler.getName()); + }); + return names; + } } diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index f552b4546..e9ae0ff6e 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -14,17 +14,17 @@ * limitations under the License. */ -import {Data} from '../serialization/Data'; +import * as Long from 'long'; +import {EvictionPolicy} from '../config/EvictionPolicy'; +import {InMemoryFormat} from '../config/InMemoryFormat'; import {NearCacheConfig} from '../config/NearCacheConfig'; -import {shuffleArray} from '../Util'; -import {SerializationService} from '../serialization/SerializationService'; import {DataKeyedHashMap} from '../DataStoreHashMap'; -import {StaleReadDetector} from './StaleReadDetector'; +import {Data} from '../serialization/Data'; +import {SerializationService} from '../serialization/SerializationService'; +import {shuffleArray} from '../Util'; import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; import {DataRecord} from './DataRecord'; -import * as Long from 'long'; -import {InMemoryFormat} from '../config/InMemoryFormat'; -import {EvictionPolicy} from '../config/EvictionPolicy'; +import {StaleReadDetector} from './StaleReadDetector'; export interface NearCacheStatistics { evictedCount: number; @@ -36,18 +36,27 @@ export interface NearCacheStatistics { export interface NearCache { put(key: Data, value: any): void; + get(key: Data): Data | any; + invalidate(key: Data): void; + clear(): void; + getStatistics(): NearCacheStatistics; + isInvalidatedOnChange(): boolean; + setStaleReadDetector(detector: StaleReadDetector): void; + tryReserveForUpdate(key: Data): Long; + tryPublishReserved(key: Data, value: any, reservationId: Long): any; } export class NearCacheImpl implements NearCache { + internalStore: DataKeyedHashMap; private serializationService: SerializationService; private name: string; private invalidateOnChange: boolean; @@ -58,12 +67,10 @@ export class NearCacheImpl implements NearCache { private evictionMaxSize: number; private evictionSamplingCount: number; private evictionSamplingPoolSize: number; - private evictionCandidatePool: Array; + private evictionCandidatePool: DataRecord[]; private staleReadDetector: StaleReadDetector = AlwaysFreshStaleReadDetectorImpl.INSTANCE; private reservationCounter: Long = Long.ZERO; - internalStore: DataKeyedHashMap; - private evictedCount: number = 0; private expiredCount: number = 0; private missCount: number = 0; @@ -96,17 +103,17 @@ export class NearCacheImpl implements NearCache { } nextReservationId(): Long { - let res = this.reservationCounter; + const res = this.reservationCounter; this.reservationCounter = this.reservationCounter.add(1); return res; } tryReserveForUpdate(key: Data): Long { - let internalRecord = this.internalStore.get(key); - let resId = this.nextReservationId(); + const internalRecord = this.internalStore.get(key); + const resId = this.nextReservationId(); if (internalRecord === undefined) { this.doEvictionIfRequired(); - let dr = new DataRecord(key, undefined, undefined, this.timeToLiveSeconds); + const dr = new DataRecord(key, undefined, undefined, this.timeToLiveSeconds); dr.casStatus(DataRecord.READ_PERMITTED, resId); this.internalStore.set(key, dr); return resId; @@ -118,7 +125,7 @@ export class NearCacheImpl implements NearCache { } tryPublishReserved(key: Data, value: any, reservationId: Long): any { - let internalRecord = this.internalStore.get(key); + const internalRecord = this.internalStore.get(key); if (internalRecord && internalRecord.casStatus(reservationId, DataRecord.READ_PERMITTED)) { if (this.inMemoryFormat === InMemoryFormat.OBJECT) { internalRecord.value = this.serializationService.toObject(value); @@ -156,28 +163,18 @@ export class NearCacheImpl implements NearCache { } else { value = this.serializationService.toData(value); } - var dr = new DataRecord(key, value, undefined, this.timeToLiveSeconds); + const dr = new DataRecord(key, value, undefined, this.timeToLiveSeconds); this.initInvalidationMetadata(dr); this.internalStore.set(key, dr); } - private initInvalidationMetadata(dr: DataRecord): void { - if (this.staleReadDetector === AlwaysFreshStaleReadDetectorImpl.INSTANCE) { - return; - } - let partitionId = this.staleReadDetector.getPartitionId(dr.key); - let metadataContainer = this.staleReadDetector.getMetadataContainer(partitionId); - dr.setInvalidationSequence(metadataContainer.getSequence()); - dr.setUuid(metadataContainer.getUuid()); - } - /** * * @param key * @returns the value if present in near cache, 'undefined' if not */ get(key: Data): Data | any { - var dr = this.internalStore.get(key); + const dr = this.internalStore.get(key); if (dr === undefined) { this.missCount++; return undefined; @@ -210,6 +207,21 @@ export class NearCacheImpl implements NearCache { this.internalStore.clear(); } + isInvalidatedOnChange(): boolean { + return this.invalidateOnChange; + } + + getStatistics(): NearCacheStatistics { + const stats: NearCacheStatistics = { + evictedCount: this.evictedCount, + expiredCount: this.expiredCount, + missCount: this.missCount, + hitCount: this.hitCount, + entryCount: this.internalStore.size, + }; + return stats; + } + protected isEvictionRequired() { return this.evictionPolicy !== EvictionPolicy.NONE && this.evictionMaxSize <= this.internalStore.size; } @@ -218,7 +230,7 @@ export class NearCacheImpl implements NearCache { if (!this.isEvictionRequired()) { return; } - var internalSize = this.internalStore.size; + const internalSize = this.internalStore.size; if (this.recomputeEvictionPool() > 0) { return; } else { @@ -231,12 +243,12 @@ export class NearCacheImpl implements NearCache { * @returns number of expired elements. */ protected recomputeEvictionPool(): number { - var arr: Array = Array.from(this.internalStore.values() ); + const arr: DataRecord[] = Array.from(this.internalStore.values()); shuffleArray(arr); - var newCandidates = arr.slice(0, this.evictionSamplingCount); - var cleanedNewCandidates = newCandidates.filter(this.filterExpiredRecord, this); - var expiredCount = newCandidates.length - cleanedNewCandidates.length; + const newCandidates = arr.slice(0, this.evictionSamplingCount); + const cleanedNewCandidates = newCandidates.filter(this.filterExpiredRecord, this); + const expiredCount = newCandidates.length - cleanedNewCandidates.length; if (expiredCount > 0) { return expiredCount; } @@ -259,7 +271,7 @@ export class NearCacheImpl implements NearCache { } protected expireRecord(key: any | Data): void { - if (this.internalStore.delete(key) ) { + if (this.internalStore.delete(key)) { this.expiredCount++; } } @@ -270,18 +282,13 @@ export class NearCacheImpl implements NearCache { } } - isInvalidatedOnChange(): boolean { - return this.invalidateOnChange; - } - - getStatistics(): NearCacheStatistics { - var stats: NearCacheStatistics = { - evictedCount: this.evictedCount, - expiredCount: this.expiredCount, - missCount: this.missCount, - hitCount: this.hitCount, - entryCount: this.internalStore.size - }; - return stats; + private initInvalidationMetadata(dr: DataRecord): void { + if (this.staleReadDetector === AlwaysFreshStaleReadDetectorImpl.INSTANCE) { + return; + } + const partitionId = this.staleReadDetector.getPartitionId(dr.key); + const metadataContainer = this.staleReadDetector.getMetadataContainer(partitionId); + dr.setInvalidationSequence(metadataContainer.getSequence()); + dr.setUuid(metadataContainer.getUuid()); } } diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index 032cd5d8e..a5474a729 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {NearCache} from './NearCache'; -import {MetadataContainer} from './MetadataContainer'; -import {PartitionService} from '../PartitionService'; -import {Data} from '../serialization/Data'; import * as Long from 'long'; import {UUID} from '../core/UUID'; +import {PartitionService} from '../PartitionService'; +import {Data} from '../serialization/Data'; +import {MetadataContainer} from './MetadataContainer'; +import {NearCache} from './NearCache'; export class RepairingHandler { @@ -42,22 +42,20 @@ export class RepairingHandler { } } - initUuid(partitionIdUuidPairsList: [number, UUID][]): void { - for (let i = 0; i < partitionIdUuidPairsList.length; i++) { - let item = partitionIdUuidPairsList[i]; - let partitionId = item[0]; - let partitionUuid = item[1]; + initUuid(partitionIdUuidPairsList: Array<[number, UUID]>): void { + for (const item of partitionIdUuidPairsList) { + const partitionId = item[0]; + const partitionUuid = item[1]; this.getMetadataContainer(partitionId).setUuid(partitionUuid); } } - initSequence(partitionIdSequencePairsList: [string, [number, Long][]]): void { - let list = partitionIdSequencePairsList[1]; - for (let i = 0; i < list.length; i++) { - let item = list[i]; - let partitionId = item[0]; - let partitionSequence = item[1]; + initSequence(partitionIdSequencePairsList: [string, Array<[number, Long]>]): void { + const list = partitionIdSequencePairsList[1]; + for (const item of list) { + const partitionId = item[0]; + const partitionSequence = item[1]; this.getMetadataContainer(partitionId).setSequence(partitionSequence); } } @@ -70,20 +68,20 @@ export class RepairingHandler { this.nearCache.invalidate(key); } } - let partitionId = this.getPartitionIdOrDefault(key); + const partitionId = this.getPartitionIdOrDefault(key); this.checkOrRepairSequence(partitionId, sequence); this.checkOrRepairUuid(partitionId, partitionUuid); } handleBatch(keys: any[], sourceUuids: string[], partitionUuids: UUID[], sequences: Long[]): void { - for (var i = 0; i < keys.length; i++) { + for (let i = 0; i < keys.length; i++) { this.handle(keys[i], sourceUuids[i], partitionUuids[i], sequences[i]); } } checkOrRepairSequence(partitionId: number, nextSequence: Long, viaAntiEntropy: boolean = false): void { - let metadata = this.getMetadataContainer(partitionId); - let current = metadata.getSequence(); + const metadata = this.getMetadataContainer(partitionId); + const current = metadata.getSequence(); if (current.greaterThanOrEqual(nextSequence)) { return; } @@ -98,8 +96,8 @@ export class RepairingHandler { } checkOrRepairUuid(partitionId: number, newuuid: UUID): void { - let metadata = this.getMetadataContainer(partitionId); - let currentUuid = metadata.getUuid(); + const metadata = this.getMetadataContainer(partitionId); + const currentUuid = metadata.getUuid(); if (currentUuid != null && currentUuid.equals(newuuid)) { return; } @@ -108,8 +106,8 @@ export class RepairingHandler { } updateLastKnownStaleSequence(metadataContainer: MetadataContainer): void { - let lastStaleSequence = metadataContainer.getStaleSequence(); - let lastSequence = metadataContainer.getSequence(); + const lastStaleSequence = metadataContainer.getStaleSequence(); + const lastSequence = metadataContainer.getSequence(); if (lastStaleSequence.lessThan(lastSequence)) { metadataContainer.setStaleSequence(lastSequence); } diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index 7b1a05c28..78aebd5c1 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import {RepairingHandler} from './RepairingHandler'; -import {NearCache} from './NearCache'; -import HazelcastClient from '../HazelcastClient'; -import {MetadataFetcher} from './MetadataFetcher'; import * as assert from 'assert'; import * as Long from 'long'; +import HazelcastClient from '../HazelcastClient'; import {LoggingService} from '../logging/LoggingService'; +import {MetadataFetcher} from './MetadataFetcher'; +import {NearCache} from './NearCache'; +import {RepairingHandler} from './RepairingHandler'; const PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.reconciliation.interval.seconds'; const PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.min.reconciliation.interval.seconds'; @@ -41,13 +41,13 @@ export class RepairingTask { constructor(client: HazelcastClient) { this.client = client; - let config = this.client.getConfig(); - this.minAllowedReconciliationSeconds = config.properties[PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS]; - let requestedReconciliationSeconds = config.properties[PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS]; + const config = this.client.getConfig(); + this.minAllowedReconciliationSeconds = config.properties[PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS] as number; + const requestedReconciliationSeconds = config.properties[PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS] as number; this.reconcilliationInterval = this.getReconciliationIntervalMillis(requestedReconciliationSeconds); this.handlers = new Map(); this.localUuid = this.client.getLocalEndpoint().uuid; - this.maxToleratedMissCount = config.properties[PROPERTY_MAX_TOLERATED_MISS_COUNT]; + this.maxToleratedMissCount = config.properties[PROPERTY_MAX_TOLERATED_MISS_COUNT] as number; this.metadataFetcher = new MetadataFetcher(client); this.partitionCount = this.client.getPartitionService().getPartitionCount(); } @@ -99,7 +99,7 @@ export class RepairingTask { private isAboveMaxToleratedMissCount(handler: RepairingHandler): boolean { let totalMissCount = Long.fromNumber(0); for (let i = 0; i < this.partitionCount; i++) { - let added = handler.getMetadataContainer(i).getMissedSequenceCount(); + const added = handler.getMetadataContainer(i).getMissedSequenceCount(); totalMissCount = totalMissCount.add(added); if (totalMissCount.greaterThanOrEqual(this.maxToleratedMissCount)) { return true; @@ -110,8 +110,8 @@ export class RepairingTask { private updateLastKnownStaleSequences(handler: RepairingHandler): void { for (let i = 0; i < this.partitionCount; i++) { - let container = handler.getMetadataContainer(i); - let missedCount = container.getMissedSequenceCount(); + const container = handler.getMetadataContainer(i); + const missedCount = container.getMissedSequenceCount(); if (missedCount.notEquals(0)) { container.increaseMissedSequenceCount(missedCount.negate()); handler.updateLastKnownStaleSequence(container); @@ -123,7 +123,7 @@ export class RepairingTask { if (seconds === 0 || seconds >= this.minAllowedReconciliationSeconds) { return seconds * 1000; } else { - let message = 'Reconciliation interval can be at least ' + this.minAllowedReconciliationSeconds + ' seconds ' + + const message = 'Reconciliation interval can be at least ' + this.minAllowedReconciliationSeconds + ' seconds ' + 'if not 0. Configured interval is ' + seconds + ' seconds. ' + 'Note: configuring a value of 0 seconds disables the reconciliation task.'; throw new RangeError(message); diff --git a/src/nearcache/StaleReadDetectorImpl.ts b/src/nearcache/StaleReadDetectorImpl.ts index 7e0cb06b7..7f9b22f72 100644 --- a/src/nearcache/StaleReadDetectorImpl.ts +++ b/src/nearcache/StaleReadDetectorImpl.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {StaleReadDetector} from './StaleReadDetector'; +import {PartitionService} from '../PartitionService'; import {DataRecord} from './DataRecord'; import {MetadataContainer} from './MetadataContainer'; import {RepairingHandler} from './RepairingHandler'; -import {PartitionService} from '../PartitionService'; +import {StaleReadDetector} from './StaleReadDetector'; export class StaleReadDetectorImpl implements StaleReadDetector { @@ -31,7 +31,7 @@ export class StaleReadDetectorImpl implements StaleReadDetector { } isStaleRead(key: any, record: DataRecord): boolean { - let metadata = this.getMetadataContainer(this.getPartitionId(record.key)); + const metadata = this.getMetadataContainer(this.getPartitionId(record.key)); return !record.hasSameUuid(metadata.getUuid()) || record.getInvalidationSequence().lessThan(metadata.getStaleSequence()); } diff --git a/src/protocol/ErrorCodec.ts b/src/protocol/ErrorCodec.ts index 169a69d3b..a7415273b 100644 --- a/src/protocol/ErrorCodec.ts +++ b/src/protocol/ErrorCodec.ts @@ -18,6 +18,7 @@ import ClientMessage = require('../ClientMessage'); import {StackTraceElementCodec} from './StackTraceElementCodec'; export class ErrorCodec { + errorCode: number = null; className: string = null; message: string = null; @@ -26,25 +27,25 @@ export class ErrorCodec { causeClassName: string = null; static decode(clientMessage: ClientMessage): ErrorCodec { - let exception = new ErrorCodec(); + const exception = new ErrorCodec(); exception.errorCode = clientMessage.readInt32(); exception.className = clientMessage.readString(); - var isMessageNull = clientMessage.readBoolean(); + const isMessageNull = clientMessage.readBoolean(); if (!isMessageNull) { exception.message = clientMessage.readString(); } - var stackTraceDepth = clientMessage.readInt32(); + const stackTraceDepth = clientMessage.readInt32(); exception.stackTrace = []; - for (var i = 0; i < stackTraceDepth; i++) { + for (let i = 0; i < stackTraceDepth; i++) { exception.stackTrace.push(StackTraceElementCodec.decode(clientMessage)); } exception.causeErrorCode = clientMessage.readInt32(); - var causeClassNameNull = clientMessage.readBoolean(); + const causeClassNameNull = clientMessage.readBoolean(); if (!causeClassNameNull) { exception.causeClassName = clientMessage.readString(); @@ -53,6 +54,4 @@ export class ErrorCodec { return exception; } - - } diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index f79d84c2b..9410cc0be 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -14,23 +14,47 @@ * limitations under the License. */ +import ClientMessage = require('../ClientMessage'); import { - AuthenticationError, CallerNotMemberError, CancellationError, ClassCastError, ClassNotFoundError, ConcurrentModificationError, - ConfigMismatchError, ConfigurationError, ConsistencyLostError, DistributedObjectDestroyedError, DuplicateInstanceNameError, + AuthenticationError, + CallerNotMemberError, + CancellationError, + ClassCastError, + ClassNotFoundError, + ConcurrentModificationError, + ConfigMismatchError, + ConfigurationError, + ConsistencyLostError, + DistributedObjectDestroyedError, + DuplicateInstanceNameError, HazelcastError, - HazelcastInstanceNotActiveError, IllegalStateError, InvocationTimeoutError, IOError, MemberLeftError, - NoDataMemberInClusterError, NodeIdOutOfRangeError, PartitionMigratingError, QueryError, QuorumError, RetryableHazelcastError, + HazelcastInstanceNotActiveError, + IllegalStateError, + InvocationTimeoutError, + IOError, + MemberLeftError, + NoDataMemberInClusterError, + NodeIdOutOfRangeError, + PartitionMigratingError, + QueryError, + QuorumError, + RetryableHazelcastError, RetryableIOError, - StaleSequenceError, StaleTaskIdError, TargetDisconnectedError, TargetNotMemberError, TopicOverloadError, TransactionError, - TransactionNotActiveError, TransactionTimedOutError, UndefinedErrorCodeError, UnsupportedOperationError + StaleSequenceError, + StaleTaskIdError, + TargetDisconnectedError, + TargetNotMemberError, + TopicOverloadError, + TransactionError, + TransactionNotActiveError, + TransactionTimedOutError, + UndefinedErrorCodeError, + UnsupportedOperationError, } from '../HazelcastError'; import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; import {ErrorCodec} from './ErrorCodec'; -import ClientMessage = require('../ClientMessage'); -interface ErrorFactory { - (msg: string, cause: Error): Error; -} +type ErrorFactory = (msg: string, cause: Error) => Error; export class ClientErrorFactory { @@ -90,21 +114,21 @@ export class ClientErrorFactory { this.register(ClientProtocolErrorCodes.CONSISTENCY_LOST_EXCEPTION, (m, c) => new ConsistencyLostError(m, c)); } - private register(code: number, errorFactory: ErrorFactory): void { - this.codeToErrorConstructor.set(code, errorFactory); - } - - createErrorFromClientMessage(clientMessage: ClientMessage) : Error { - let errorCodec = ErrorCodec.decode(clientMessage); + createErrorFromClientMessage(clientMessage: ClientMessage): Error { + const errorCodec = ErrorCodec.decode(clientMessage); return this.createError(errorCodec.errorCode, errorCodec.className, errorCodec.message, null); } createError(errorCode: number, className: string, message: string, cause: Error): Error { - let factoryFunc = this.codeToErrorConstructor.get(errorCode); + const factoryFunc = this.codeToErrorConstructor.get(errorCode); if (factoryFunc != null) { return factoryFunc(message, cause); } else { return new UndefinedErrorCodeError(message, className); } } + + private register(code: number, errorFactory: ErrorFactory): void { + this.codeToErrorConstructor.set(code, errorFactory); + } } diff --git a/src/protocol/StackTraceElementCodec.ts b/src/protocol/StackTraceElementCodec.ts index 664dff987..d11a4ea22 100644 --- a/src/protocol/StackTraceElementCodec.ts +++ b/src/protocol/StackTraceElementCodec.ts @@ -23,12 +23,12 @@ export class StackTraceElementCodec { lineNumber: number = null; static decode(payload: ClientMessage): StackTraceElementCodec { - var stackTraceElement = new StackTraceElementCodec(); + const stackTraceElement = new StackTraceElementCodec(); stackTraceElement.declaringClass = payload.readString(); stackTraceElement.methodName = payload.readString(); - var fileNameNull = payload.readBoolean(); + const fileNameNull = payload.readBoolean(); if (!fileNameNull) { stackTraceElement.fileName = payload.readString(); } @@ -36,4 +36,3 @@ export class StackTraceElementCodec { return stackTraceElement; } } - diff --git a/src/proxy/AtomicLongProxy.ts b/src/proxy/AtomicLongProxy.ts index 984a3eb4e..9c8f9b2f7 100644 --- a/src/proxy/AtomicLongProxy.ts +++ b/src/proxy/AtomicLongProxy.ts @@ -16,24 +16,24 @@ import * as Promise from 'bluebird'; import * as Long from 'long'; -import {IAtomicLong} from './IAtomicLong'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {AtomicLongAddAndGetCodec} from '../codec/AtomicLongAddAndGetCodec'; -import {AtomicLongGetCodec} from '../codec/AtomicLongGetCodec'; -import {AtomicLongGetAndAddCodec} from '../codec/AtomicLongGetAndAddCodec'; -import {AtomicLongDecrementAndGetCodec} from '../codec/AtomicLongDecrementAndGetCodec'; -import {AtomicLongSetCodec} from '../codec/AtomicLongSetCodec'; import {AtomicLongCompareAndSetCodec} from '../codec/AtomicLongCompareAndSetCodec'; +import {AtomicLongDecrementAndGetCodec} from '../codec/AtomicLongDecrementAndGetCodec'; +import {AtomicLongGetAndAddCodec} from '../codec/AtomicLongGetAndAddCodec'; +import {AtomicLongGetAndIncrementCodec} from '../codec/AtomicLongGetAndIncrementCodec'; import {AtomicLongGetAndSetCodec} from '../codec/AtomicLongGetAndSetCodec'; +import {AtomicLongGetCodec} from '../codec/AtomicLongGetCodec'; import {AtomicLongIncrementAndGetCodec} from '../codec/AtomicLongIncrementAndGetCodec'; -import {AtomicLongGetAndIncrementCodec} from '../codec/AtomicLongGetAndIncrementCodec'; +import {AtomicLongSetCodec} from '../codec/AtomicLongSetCodec'; +import {IAtomicLong} from './IAtomicLong'; +import {PartitionSpecificProxy} from './PartitionSpecificProxy'; export class AtomicLongProxy extends PartitionSpecificProxy implements IAtomicLong { - addAndGet(delta: Long|number): Promise { + addAndGet(delta: Long | number): Promise { return this.encodeInvoke(AtomicLongAddAndGetCodec, delta); } - compareAndSet(expect: Long|number, update: Long|number): Promise { + compareAndSet(expect: Long | number, update: Long | number): Promise { return this.encodeInvoke(AtomicLongCompareAndSetCodec, expect, update); } @@ -45,11 +45,11 @@ export class AtomicLongProxy extends PartitionSpecificProxy implements IAtomicLo return this.encodeInvoke(AtomicLongGetCodec); } - getAndAdd(delta: Long|number): Promise { + getAndAdd(delta: Long | number): Promise { return this.encodeInvoke(AtomicLongGetAndAddCodec, delta); } - getAndSet(newValue: Long|number): Promise { + getAndSet(newValue: Long | number): Promise { return this.encodeInvoke(AtomicLongGetAndSetCodec, newValue); } @@ -61,7 +61,7 @@ export class AtomicLongProxy extends PartitionSpecificProxy implements IAtomicLo return this.encodeInvoke(AtomicLongGetAndIncrementCodec); } - set(newValue: Long|number): Promise { + set(newValue: Long | number): Promise { return this.encodeInvoke(AtomicLongSetCodec, newValue); } diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 7e8d538d3..ca7b15e49 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {Data} from '../serialization/Data'; -import ClientMessage = require('../ClientMessage'); import * as Promise from 'bluebird'; -import HazelcastClient from '../HazelcastClient'; import {BuildMetadata} from '../BuildMetadata'; +import HazelcastClient from '../HazelcastClient'; +import {Data} from '../serialization/Data'; import Address = require('../Address'); +import ClientMessage = require('../ClientMessage'); /** * Common super class for any proxy. @@ -36,22 +36,41 @@ export class BaseProxy { this.serviceName = serviceName; } - private createPromise(codec: any, promise: Promise): Promise { - var toObject = this.toObject.bind(this); - return promise.then(function(clientMessage: ClientMessage) { - if (codec.decodeResponse) { - var raw = codec.decodeResponse(clientMessage, toObject); + getPartitionKey(): string { + return this.name; + } - var response = raw.response; - if (typeof response === 'undefined') { - return raw; - } else { - return response; - } - } + /** + * Returns name of the proxy. + * @returns + */ + getName(): string { + return this.name; + } + + /** + * Returns name of the service which this proxy belongs to. + * Refer to service field of {@link ProxyManager} for service names. + * @returns + */ + getServiceName(): string { + return this.serviceName; + } + + /** + * Deletes the proxy object and frees allocated resources on cluster. + * @returns + */ + destroy(): Promise { + return this.client.getProxyManager().destroyProxy(this.name, this.serviceName).then(() => { + return this.postDestroy(); }); } + protected postDestroy(): Promise { + return Promise.resolve(); + } + /** * Encodes a request from a codec and invokes it on owner node of given key. * @param codec @@ -60,7 +79,7 @@ export class BaseProxy { * @returns */ protected encodeInvokeOnKey(codec: any, partitionKey: any, ...codecArguments: any[]): Promise { - var partitionId: number = this.client.getPartitionService().getPartitionId(partitionKey); + const partitionId: number = this.client.getPartitionService().getPartitionId(partitionKey); return this.encodeInvokeOnPartition(codec, partitionId, ...codecArguments); } @@ -71,14 +90,14 @@ export class BaseProxy { * @returns */ protected encodeInvokeOnRandomTarget(codec: any, ...codecArguments: any[]): Promise { - var clientMessage = codec.encodeRequest(this.name, ...codecArguments); - var invocationResponse = this.client.getInvocationService().invokeOnRandomTarget(clientMessage); + const clientMessage = codec.encodeRequest(this.name, ...codecArguments); + const invocationResponse = this.client.getInvocationService().invokeOnRandomTarget(clientMessage); return this.createPromise(codec, invocationResponse); } protected encodeInvokeOnAddress(codec: any, address: Address, ...codecArguments: any[]): Promise { - let clientMessage = codec.encodeRequest(this.name, ...codecArguments); - let invocation: Promise = this.client.getInvocationService().invokeOnTarget(clientMessage, address); + const clientMessage = codec.encodeRequest(this.name, ...codecArguments); + const invocation: Promise = this.client.getInvocationService().invokeOnTarget(clientMessage, address); return this.createPromise(codec, invocation); } @@ -90,8 +109,8 @@ export class BaseProxy { * @returns */ protected encodeInvokeOnPartition(codec: any, partitionId: number, ...codecArguments: any[]): Promise { - var clientMessage = codec.encodeRequest(this.name, ...codecArguments); - var invocationResponse: Promise = this.client.getInvocationService() + const clientMessage = codec.encodeRequest(this.name, ...codecArguments); + const invocationResponse: Promise = this.client.getInvocationService() .invokeOnPartition(clientMessage, partitionId); return this.createPromise(codec, invocationResponse); @@ -116,45 +135,26 @@ export class BaseProxy { } protected getConnectedServerVersion(): number { - let activeConnections = this.client.getConnectionManager().getActiveConnections(); - for (let address in activeConnections) { + const activeConnections = this.client.getConnectionManager().getActiveConnections(); + for (const address in activeConnections) { return activeConnections[address].getConnectedServerVersion(); } return BuildMetadata.UNKNOWN_VERSION_ID; } - getPartitionKey() : string { - return this.name; - } - - /** - * Returns name of the proxy. - * @returns - */ - getName() : string { - return this.name; - } - - /** - * Returns name of the service which this proxy belongs to. - * Refer to service field of {@link ProxyManager} for service names. - * @returns - */ - getServiceName() : string { - return this.serviceName; - } + private createPromise(codec: any, promise: Promise): Promise { + const toObject = this.toObject.bind(this); + return promise.then(function (clientMessage: ClientMessage) { + if (codec.decodeResponse) { + const raw = codec.decodeResponse(clientMessage, toObject); - /** - * Deletes the proxy object and frees allocated resources on cluster. - * @returns - */ - destroy() : Promise { - return this.client.getProxyManager().destroyProxy(this.name, this.serviceName).then(() => { - return this.postDestroy(); + const response = raw.response; + if (typeof response === 'undefined') { + return raw; + } else { + return response; + } + } }); } - - protected postDestroy(): Promise { - return Promise.resolve(); - } } diff --git a/src/proxy/FlakeIdGenerator.ts b/src/proxy/FlakeIdGenerator.ts index 131872fc3..12cc867ed 100644 --- a/src/proxy/FlakeIdGenerator.ts +++ b/src/proxy/FlakeIdGenerator.ts @@ -14,9 +14,6 @@ * limitations under the License. */ -import {DistributedObject} from '../DistributedObject'; -import * as Long from 'long'; - /** * A cluster-wide unique ID generator. Generated IDs are `Long` primitive values * and are k-ordered (roughly ordered). IDs are in the range from `0` to `Long.MAX_VALUE`. @@ -42,6 +39,8 @@ import * as Long from 'long'; * @requires Hazelcast 3.10 */ import * as Promise from 'bluebird'; +import * as Long from 'long'; +import {DistributedObject} from '../DistributedObject'; export interface FlakeIdGenerator extends DistributedObject { diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/FlakeIdGeneratorProxy.ts index fb3fb33b3..26a8a2812 100644 --- a/src/proxy/FlakeIdGeneratorProxy.ts +++ b/src/proxy/FlakeIdGeneratorProxy.ts @@ -14,15 +14,14 @@ * limitations under the License. */ -import {BaseProxy} from './BaseProxy'; -import {FlakeIdGenerator} from './FlakeIdGenerator'; import * as Promise from 'bluebird'; import * as Long from 'long'; -import HazelcastClient from '../HazelcastClient'; import {FlakeIdGeneratorNewIdBatchCodec} from '../codec/FlakeIdGeneratorNewIdBatchCodec'; import {FlakeIdGeneratorConfig} from '../config/FlakeIdGeneratorConfig'; -import {EventEmitter} from 'events'; +import HazelcastClient from '../HazelcastClient'; +import {BaseProxy} from './BaseProxy'; import {AutoBatcher, Batch} from './flakeid/AutoBatcher'; +import {FlakeIdGenerator} from './FlakeIdGenerator'; export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator { diff --git a/src/proxy/IAtomicLong.ts b/src/proxy/IAtomicLong.ts index 3634594da..6c0620d49 100644 --- a/src/proxy/IAtomicLong.ts +++ b/src/proxy/IAtomicLong.ts @@ -14,10 +14,9 @@ * limitations under the License. */ -import {DistributedObject} from '../DistributedObject'; import * as Promise from 'bluebird'; import * as Long from 'long'; - +import {DistributedObject} from '../DistributedObject'; export interface IAtomicLong extends DistributedObject { addAndGet(delta: Long | number): Promise; diff --git a/src/proxy/IList.ts b/src/proxy/IList.ts index 0d75da096..2f3434dc2 100644 --- a/src/proxy/IList.ts +++ b/src/proxy/IList.ts @@ -15,9 +15,9 @@ */ import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; import {ItemListener} from '../core/ItemListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {DistributedObject} from '../DistributedObject'; export interface IList extends DistributedObject { diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index b80c256db..a6f75476f 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -15,13 +15,14 @@ */ import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; +import {Aggregator} from '../aggregation/Aggregator'; import {EntryView} from '../core/EntryView'; import {IMapListener} from '../core/MapListener'; import {Predicate} from '../core/Predicate'; -import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; -import {Aggregator} from '../aggregation/Aggregator'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {DistributedObject} from '../DistributedObject'; +import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; + export interface IMap extends DistributedObject { /** @@ -68,7 +69,7 @@ export interface IMap extends DistributedObject { * @throws {RangeError} if key is undefined or null * @return `true` if the map contains the key, `false` otherwise. */ - containsKey(key: K) : Promise; + containsKey(key: K): Promise; /** * This method return true if this map has key(s) associated with given value @@ -76,7 +77,7 @@ export interface IMap extends DistributedObject { * @throws {RangeError} if value is undefined or null * @return `true` if the map has key or keys associated with given value. */ - containsValue(value: V) : Promise; + containsValue(value: V): Promise; /** * Associates the specified value with the specified key. @@ -89,13 +90,13 @@ export interface IMap extends DistributedObject { * @throws {RangeError} if specified key or value is undefined or null or ttl is negative. * @return old value if there was any, `undefined` otherwise. */ - put(key: K, value: V, ttl?: number) : Promise; + put(key: K, value: V, ttl?: number): Promise; /** * Puts all key value pairs from this array to the map as key -> value mappings. * @param pairs */ - putAll(pairs: [K, V][]): Promise; + putAll(pairs: Array<[K, V]>): Promise; /** * Retrieves the value associated with given key. @@ -103,13 +104,13 @@ export interface IMap extends DistributedObject { * @throws {RangeError} if key is undefined or null * @return value associated with key, undefined if the key does not exist. */ - get(key: K) : Promise; + get(key: K): Promise; /** * Retrieves key value pairs of given keys. * @param keys the array of keys */ - getAll(keys: K[]): Promise<[K, V][]>; + getAll(keys: K[]): Promise>; /** * Removes specified key from map. If optional value is specified, the key is removed only if currently mapped to @@ -120,7 +121,7 @@ export interface IMap extends DistributedObject { * @throws {RangeError} if key is undefined or null * @return value associated with key, `undefined` if the key did not exist before. */ - remove(key: K, value?: V) : Promise; + remove(key: K, value?: V): Promise; /** * Removes specified key from map. Unlike {@link remove} this method does not return deleted value. @@ -134,23 +135,23 @@ export interface IMap extends DistributedObject { * Retrieves the number of elements in map * @return number of elements in map */ - size() : Promise; + size(): Promise; /** * Removes all of the mappings * @return */ - clear() : Promise; + clear(): Promise; /** * Returns whether this map is empty or not */ - isEmpty() : Promise; + isEmpty(): Promise; /** * Returns entries as an array of key-value pairs. */ - entrySet(): Promise<[K, V][]>; + entrySet(): Promise>; /** * Queries the map based on the specified predicate and returns matching entries. @@ -158,7 +159,7 @@ export interface IMap extends DistributedObject { * @param predicate specified query criteria. * @return result entry set of the query. */ - entrySetWithPredicate(predicate: Predicate): Promise<[K, V][]>; + entrySetWithPredicate(predicate: Predicate): Promise>; /** * Evicts the specified key from this map. @@ -250,7 +251,7 @@ export interface IMap extends DistributedObject { * @throws {RangeError} if key, oldValue or newValue is null or undefined. * @return `true` if the value was replaced. */ - replaceIfSame(key: K, oldValue: V, newValue: V): Promise; + replaceIfSame(key: K, oldValue: V, newValue: V): Promise; /** * Replaces value of given key with `newValue`. @@ -366,7 +367,7 @@ export interface IMap extends DistributedObject { * @param predicate if specified, entry processor is applied to the entries that satisfis this predicate. * @return entries after entryprocessor is applied. */ - executeOnEntries(entryProcessor: IdentifiedDataSerializable | Portable, predicate?: Predicate): Promise<[K, V][]>; + executeOnEntries(entryProcessor: IdentifiedDataSerializable | Portable, predicate?: Predicate): Promise>; /** * Applies the user defined EntryProcessor to the entry mapped by the key. @@ -383,5 +384,5 @@ export interface IMap extends DistributedObject { * @param entryProcessor * @return result of entry process */ - executeOnKeys(keys: K[], entryProcessor: IdentifiedDataSerializable | Portable): Promise<[K, V][]>; + executeOnKeys(keys: K[], entryProcessor: IdentifiedDataSerializable | Portable): Promise>; } diff --git a/src/proxy/IQueue.ts b/src/proxy/IQueue.ts index ca222410f..d507f53b4 100644 --- a/src/proxy/IQueue.ts +++ b/src/proxy/IQueue.ts @@ -15,8 +15,8 @@ */ import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; import {ItemListener} from '../core/ItemListener'; +import {DistributedObject} from '../DistributedObject'; export interface IQueue extends DistributedObject { /** diff --git a/src/proxy/IReplicatedMap.ts b/src/proxy/IReplicatedMap.ts index 3583f5371..b8bcbc203 100644 --- a/src/proxy/IReplicatedMap.ts +++ b/src/proxy/IReplicatedMap.ts @@ -15,12 +15,12 @@ */ import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; -import {Predicate} from '../core/Predicate'; import {IMapListener} from '../core/MapListener'; -import Long = require('long'); -import {ArrayComparator} from '../util/ArrayComparator'; +import {Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {DistributedObject} from '../DistributedObject'; +import {ArrayComparator} from '../util/ArrayComparator'; +import Long = require('long'); export interface IReplicatedMap extends DistributedObject { /** @@ -33,7 +33,7 @@ export interface IReplicatedMap extends DistributedObject { * @param ttl milliseconds to be associated with the specified key-value pair. * @return old value if there was any, `null` otherwise. */ - put(key: K, value: V, ttl?: Long|number): Promise; + put(key: K, value: V, ttl?: Long | number): Promise; /** * The clear operation wipes data out of the replicated maps. @@ -58,7 +58,6 @@ export interface IReplicatedMap extends DistributedObject { */ get(key: K): Promise; - /** * Returns true if this map contains a mapping for the specified key. This message is idempotent. * @@ -110,7 +109,7 @@ export interface IReplicatedMap extends DistributedObject { * @param pairs * @return */ - putAll(pairs: [K, V][]): Promise; + putAll(pairs: Array<[K, V]>): Promise; /** * Returns a view of the key contained in this map. @@ -127,7 +126,7 @@ export interface IReplicatedMap extends DistributedObject { /** * @return Returns entries as an array of key-value pairs. */ - entrySet(): Promise<[K, V][]>; + entrySet(): Promise>; /** * Adds an continuous entry listener for this map. The listener will be notified for diff --git a/src/proxy/IRingbuffer.ts b/src/proxy/IRingbuffer.ts index a76ccbba9..f843ff524 100644 --- a/src/proxy/IRingbuffer.ts +++ b/src/proxy/IRingbuffer.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import * as Long from 'long'; import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; +import * as Long from 'long'; import {OverflowPolicy} from '../core/OverflowPolicy'; +import {DistributedObject} from '../DistributedObject'; import {ReadResultSet} from './ringbuffer/ReadResultSet'; export interface IRingbuffer extends DistributedObject { @@ -68,7 +68,6 @@ export interface IRingbuffer extends DistributedObject { */ remainingCapacity(): Promise; - /** * Adds an item to the tail of this ringbuffer. Overflow policy determines what will happen * if there is no space left in this ringbuffer. If `OVERWRITE` was passed, @@ -95,8 +94,7 @@ export interface IRingbuffer extends DistributedObject { * @param overflowPolicy overflow policy to be used * @return the sequence number of the last written item from the specified array */ - addAll(items: Array, overflowPolicy?: OverflowPolicy): Promise; - + addAll(items: E[], overflowPolicy?: OverflowPolicy): Promise; /** * Reads a single item from this ringbuffer. diff --git a/src/proxy/ISemaphore.ts b/src/proxy/ISemaphore.ts index a003f5a14..b2db2551e 100644 --- a/src/proxy/ISemaphore.ts +++ b/src/proxy/ISemaphore.ts @@ -15,8 +15,8 @@ */ import * as Promise from 'bluebird'; -import Long = require('long'); import {DistributedObject} from '../DistributedObject'; +import Long = require('long'); export interface ISemaphore extends DistributedObject { /** diff --git a/src/proxy/ISet.ts b/src/proxy/ISet.ts index 7cb469903..44bc6e27e 100644 --- a/src/proxy/ISet.ts +++ b/src/proxy/ISet.ts @@ -15,8 +15,8 @@ */ import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; import {ItemListener} from '../core/ItemListener'; +import {DistributedObject} from '../DistributedObject'; export interface ISet extends DistributedObject { /** @@ -25,7 +25,7 @@ export interface ISet extends DistributedObject { * @throws {Error} if entry is null or undefined. * @return a promise to be resolved to true if this set did not contain the element. */ - add(entry : E) : Promise; + add(entry: E): Promise; /** * Adds the elements contained in array to this set if not already present. @@ -34,7 +34,7 @@ export interface ISet extends DistributedObject { * @throws {Error} if collection or one of its elements is null or undefined. * @return true if this set changed, false otherwise. */ - addAll(items : E[]) : Promise; + addAll(items: E[]): Promise; /** * Returns an array containing all of the elements in the set. @@ -45,7 +45,7 @@ export interface ISet extends DistributedObject { /** * Removes all of the elements from this set. */ - clear() : Promise; + clear(): Promise; /** * Checks whether this set contains given element. @@ -53,7 +53,7 @@ export interface ISet extends DistributedObject { * @throws {Error} if entry is null. * @return true if this set contains given element, false otherwise. */ - contains(entry : E) : Promise; + contains(entry: E): Promise; /** * Checks whether this set contains all elements of given array. @@ -61,13 +61,13 @@ export interface ISet extends DistributedObject { * @throws {Error} if collection or one of its elements is null or undefined. * @return `tru`e if this set contains all elments of given collection, `false` otherwise. */ - containsAll(items : E[]) : Promise; + containsAll(items: E[]): Promise; /** * @return true if this set does n * Checks if this set has any elements.ot have any elements, false otherwise. */ - isEmpty() : Promise; + isEmpty(): Promise; /** * Removes given entry from this set. @@ -75,7 +75,7 @@ export interface ISet extends DistributedObject { * @throws {Error} if entry is null or undefined. * @return true if this set actually had given element, false otherwise. */ - remove(entry : E) : Promise; + remove(entry: E): Promise; /** * Removes all elements of given array from this set. @@ -83,7 +83,7 @@ export interface ISet extends DistributedObject { * @throws {Error} if collection or one of its elements is null or undefined. * @return `true` if this set changed. */ - removeAll(items : E[]) : Promise; + removeAll(items: E[]): Promise; /** * Removes all elements from this set except the elements of given array. @@ -91,13 +91,13 @@ export interface ISet extends DistributedObject { * @throws {Error} if collection or one of its elements is null or undefined. * @return `true` if this set changed. */ - retainAll(items : E[]) : Promise; + retainAll(items: E[]): Promise; /** * Returns the size of this set. * @return number of elements in this set. */ - size() : Promise; + size(): Promise; /** * Adds an item listener for this set. diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index caac0feb6..2d1c73159 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -14,35 +14,35 @@ * limitations under the License. */ -import {IList} from './IList'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {ListAddCodec} from '../codec/ListAddCodec'; -import {ListSizeCodec} from '../codec/ListSizeCodec'; +import * as Promise from 'bluebird'; import {ListAddAllCodec} from '../codec/ListAddAllCodec'; -import {ListGetAllCodec} from '../codec/ListGetAllCodec'; +import {ListAddAllWithIndexCodec} from '../codec/ListAddAllWithIndexCodec'; +import {ListAddCodec} from '../codec/ListAddCodec'; +import {ListAddListenerCodec} from '../codec/ListAddListenerCodec'; +import {ListAddWithIndexCodec} from '../codec/ListAddWithIndexCodec'; import {ListClearCodec} from '../codec/ListClearCodec'; -import {Data} from '../serialization/Data'; +import {ListCompareAndRemoveAllCodec} from '../codec/ListCompareAndRemoveAllCodec'; +import {ListCompareAndRetainAllCodec} from '../codec/ListCompareAndRetainAllCodec'; import {ListContainsAllCodec} from '../codec/ListContainsAllCodec'; import {ListContainsCodec} from '../codec/ListContainsCodec'; +import {ListGetAllCodec} from '../codec/ListGetAllCodec'; +import {ListGetCodec} from '../codec/ListGetCodec'; +import {ListIndexOfCodec} from '../codec/ListIndexOfCodec'; import {ListIsEmptyCodec} from '../codec/ListIsEmptyCodec'; +import {ListLastIndexOfCodec} from '../codec/ListLastIndexOfCodec'; import {ListRemoveCodec} from '../codec/ListRemoveCodec'; -import {ListCompareAndRemoveAllCodec} from '../codec/ListCompareAndRemoveAllCodec'; -import {ListCompareAndRetainAllCodec} from '../codec/ListCompareAndRetainAllCodec'; -import {ListAddListenerCodec} from '../codec/ListAddListenerCodec'; -import {ListAddWithIndexCodec} from '../codec/ListAddWithIndexCodec'; import {ListRemoveListenerCodec} from '../codec/ListRemoveListenerCodec'; -import {ItemListener} from '../core/ItemListener'; import {ListRemoveWithIndexCodec} from '../codec/ListRemoveWithIndexCodec'; -import {ListGetCodec} from '../codec/ListGetCodec'; -import {ListIndexOfCodec} from '../codec/ListIndexOfCodec'; -import {ListSubCodec} from '../codec/ListSubCodec'; -import {ListAddAllWithIndexCodec} from '../codec/ListAddAllWithIndexCodec'; import {ListSetCodec} from '../codec/ListSetCodec'; -import {ListLastIndexOfCodec} from '../codec/ListLastIndexOfCodec'; -import ClientMessage = require('../ClientMessage'); -import * as Promise from 'bluebird'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ListSizeCodec} from '../codec/ListSizeCodec'; +import {ListSubCodec} from '../codec/ListSubCodec'; +import {ItemListener} from '../core/ItemListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {Data} from '../serialization/Data'; +import {IList} from './IList'; +import {PartitionSpecificProxy} from './PartitionSpecificProxy'; +import ClientMessage = require('../ClientMessage'); export class ListProxy extends PartitionSpecificProxy implements IList { @@ -121,7 +121,7 @@ export class ListProxy extends PartitionSpecificProxy implements IList { } toArray(): Promise { - return this.encodeInvoke(ListGetAllCodec).then((elements: Array) => { + return this.encodeInvoke(ListGetAllCodec).then((elements: Data[]) => { return elements.map((element) => { return this.toObject(element); }); @@ -129,10 +129,10 @@ export class ListProxy extends PartitionSpecificProxy implements IList { } addItemListener(listener: ItemListener, includeValue: boolean): Promise { - var listenerHandler = (message: ClientMessage) => { + const listenerHandler = (message: ClientMessage) => { ListAddListenerCodec.handle(message, (element: Data, uuid: string, eventType: number) => { - var responseObject = element ? this.toObject(element) : null; - var listenerFunction: Function; + const responseObject = element ? this.toObject(element) : null; + let listenerFunction: Function; if (eventType === 1) { listenerFunction = listener.itemAdded; } else if (eventType === 2) { @@ -144,7 +144,7 @@ export class ListProxy extends PartitionSpecificProxy implements IList { } }); }; - let codec = this.createItemListener(this.name, includeValue); + const codec = this.createItemListener(this.name, includeValue); return this.client.getListenerService().registerListener(codec, listenerHandler); } @@ -152,7 +152,7 @@ export class ListProxy extends PartitionSpecificProxy implements IList { return this.client.getListenerService().deregisterListener(registrationId); } - private serializeList(input: Array): Array { + private serializeList(input: E[]): Data[] { return input.map((each) => { return this.toData(each); }); @@ -160,15 +160,15 @@ export class ListProxy extends PartitionSpecificProxy implements IList { private createItemListener(name: string, includeValue: boolean): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return ListAddListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return ListAddListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return ListRemoveListenerCodec.encodeRequest(name, listenerId); - } + }, }; } } diff --git a/src/proxy/LockProxy.ts b/src/proxy/LockProxy.ts index 1c3692c98..b91c846f2 100644 --- a/src/proxy/LockProxy.ts +++ b/src/proxy/LockProxy.ts @@ -15,29 +15,24 @@ */ import * as Promise from 'bluebird'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {ILock} from './ILock'; +import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {LockLockCodec} from '../codec/LockLockCodec'; +import * as Long from 'long'; +import {LockForceUnlockCodec} from '../codec/LockForceUnlockCodec'; +import {LockGetLockCountCodec} from '../codec/LockGetLockCountCodec'; import {LockGetRemainingLeaseTimeCodec} from '../codec/LockGetRemainingLeaseTimeCodec'; +import {LockIsLockedByCurrentThreadCodec} from '../codec/LockIsLockedByCurrentThreadCodec'; +import {LockIsLockedCodec} from '../codec/LockIsLockedCodec'; +import {LockLockCodec} from '../codec/LockLockCodec'; import {LockTryLockCodec} from '../codec/LockTryLockCodec'; import {LockUnlockCodec} from '../codec/LockUnlockCodec'; -import {LockForceUnlockCodec} from '../codec/LockForceUnlockCodec'; -import {LockIsLockedCodec} from '../codec/LockIsLockedCodec'; -import {LockIsLockedByCurrentThreadCodec} from '../codec/LockIsLockedByCurrentThreadCodec'; -import {LockGetLockCountCodec} from '../codec/LockGetLockCountCodec'; -import * as Long from 'long'; import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; export class LockProxy extends PartitionSpecificProxy implements ILock { - private lockReferenceIdGenerator: LockReferenceIdGenerator = this.client.getLockReferenceIdGenerator(); - private nextSequence(): Long { - return this.lockReferenceIdGenerator.getNextReferenceId(); - } - lock(leaseMillis: number = -1): Promise { return this.encodeInvoke(LockLockCodec, leaseMillis, 1, this.nextSequence()); } @@ -68,8 +63,12 @@ export class LockProxy extends PartitionSpecificProxy implements ILock { } getRemainingLeaseTime(): Promise { - return this.encodeInvoke(LockGetRemainingLeaseTimeCodec).then(function(long) { + return this.encodeInvoke(LockGetRemainingLeaseTimeCodec).then(function (long) { return long.toNumber(); }); } + + private nextSequence(): Long { + return this.lockReferenceIdGenerator.getNextReferenceId(); + } } diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 4f50eaa33..0ffb02d6b 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -14,77 +14,77 @@ * limitations under the License. */ -import {BaseProxy} from './BaseProxy'; -import {IMap} from './IMap'; import * as Promise from 'bluebird'; -import {Data} from '../serialization/Data'; -import {MapPutCodec} from '../codec/MapPutCodec'; -import {MapGetCodec} from '../codec/MapGetCodec'; +import {Aggregator} from '../aggregation/Aggregator'; +import {MapAddEntryListenerCodec} from '../codec/MapAddEntryListenerCodec'; +import {MapAddEntryListenerToKeyCodec} from '../codec/MapAddEntryListenerToKeyCodec'; +import {MapAddEntryListenerToKeyWithPredicateCodec} from '../codec/MapAddEntryListenerToKeyWithPredicateCodec'; +import {MapAddEntryListenerWithPredicateCodec} from '../codec/MapAddEntryListenerWithPredicateCodec'; +import {MapAddIndexCodec} from '../codec/MapAddIndexCodec'; +import {MapAggregateCodec} from '../codec/MapAggregateCodec'; +import {MapAggregateWithPredicateCodec} from '../codec/MapAggregateWithPredicateCodec'; import {MapClearCodec} from '../codec/MapClearCodec'; -import {MapSizeCodec} from '../codec/MapSizeCodec'; -import {MapRemoveCodec} from '../codec/MapRemoveCodec'; -import {MapRemoveIfSameCodec} from '../codec/MapRemoveIfSameCodec'; import {MapContainsKeyCodec} from '../codec/MapContainsKeyCodec'; import {MapContainsValueCodec} from '../codec/MapContainsValueCodec'; -import {MapIsEmptyCodec} from '../codec/MapIsEmptyCodec'; -import {MapPutAllCodec} from '../codec/MapPutAllCodec'; import {MapDeleteCodec} from '../codec/MapDeleteCodec'; +import {MapEntriesWithPredicateCodec} from '../codec/MapEntriesWithPredicateCodec'; import {MapEntrySetCodec} from '../codec/MapEntrySetCodec'; -import {MapEvictCodec} from '../codec/MapEvictCodec'; import {MapEvictAllCodec} from '../codec/MapEvictAllCodec'; +import {MapEvictCodec} from '../codec/MapEvictCodec'; +import {MapExecuteOnAllKeysCodec} from '../codec/MapExecuteOnAllKeysCodec'; +import {MapExecuteOnKeyCodec} from '../codec/MapExecuteOnKeyCodec'; +import {MapExecuteOnKeysCodec} from '../codec/MapExecuteOnKeysCodec'; +import {MapExecuteWithPredicateCodec} from '../codec/MapExecuteWithPredicateCodec'; import {MapFlushCodec} from '../codec/MapFlushCodec'; -import {MapLockCodec} from '../codec/MapLockCodec'; -import {MapIsLockedCodec} from '../codec/MapIsLockedCodec'; -import {MapUnlockCodec} from '../codec/MapUnlockCodec'; import {MapForceUnlockCodec} from '../codec/MapForceUnlockCodec'; +import {MapGetAllCodec} from '../codec/MapGetAllCodec'; +import {MapGetCodec} from '../codec/MapGetCodec'; +import {MapGetEntryViewCodec} from '../codec/MapGetEntryViewCodec'; +import {MapIsEmptyCodec} from '../codec/MapIsEmptyCodec'; +import {MapIsLockedCodec} from '../codec/MapIsLockedCodec'; import {MapKeySetCodec} from '../codec/MapKeySetCodec'; +import {MapKeySetWithPagingPredicateCodec} from '../codec/MapKeySetWithPagingPredicateCodec'; +import {MapKeySetWithPredicateCodec} from '../codec/MapKeySetWithPredicateCodec'; import {MapLoadAllCodec} from '../codec/MapLoadAllCodec'; +import {MapLoadGivenKeysCodec} from '../codec/MapLoadGivenKeysCodec'; +import {MapLockCodec} from '../codec/MapLockCodec'; +import {MapPutAllCodec} from '../codec/MapPutAllCodec'; +import {MapPutCodec} from '../codec/MapPutCodec'; import {MapPutIfAbsentCodec} from '../codec/MapPutIfAbsentCodec'; import {MapPutTransientCodec} from '../codec/MapPutTransientCodec'; +import {MapRemoveCodec} from '../codec/MapRemoveCodec'; +import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; +import {MapRemoveIfSameCodec} from '../codec/MapRemoveIfSameCodec'; import {MapReplaceCodec} from '../codec/MapReplaceCodec'; import {MapReplaceIfSameCodec} from '../codec/MapReplaceIfSameCodec'; import {MapSetCodec} from '../codec/MapSetCodec'; -import {MapValuesCodec} from '../codec/MapValuesCodec'; -import {MapLoadGivenKeysCodec} from '../codec/MapLoadGivenKeysCodec'; -import {MapGetAllCodec} from '../codec/MapGetAllCodec'; -import {MapGetEntryViewCodec} from '../codec/MapGetEntryViewCodec'; -import {EntryView} from '../core/EntryView'; -import {MapAddIndexCodec} from '../codec/MapAddIndexCodec'; +import {MapSizeCodec} from '../codec/MapSizeCodec'; import {MapTryLockCodec} from '../codec/MapTryLockCodec'; import {MapTryPutCodec} from '../codec/MapTryPutCodec'; import {MapTryRemoveCodec} from '../codec/MapTryRemoveCodec'; -import {IMapListener} from '../core/MapListener'; -import {MapAddEntryListenerCodec} from '../codec/MapAddEntryListenerCodec'; +import {MapUnlockCodec} from '../codec/MapUnlockCodec'; +import {MapValuesCodec} from '../codec/MapValuesCodec'; +import {MapValuesWithPagingPredicateCodec} from '../codec/MapValuesWithPagingPredicateCodec'; +import {MapValuesWithPredicateCodec} from '../codec/MapValuesWithPredicateCodec'; import {EntryEventType} from '../core/EntryEventType'; -import {MapAddEntryListenerToKeyCodec} from '../codec/MapAddEntryListenerToKeyCodec'; -import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; -import {assertArray, assertNotNull, getSortedQueryResultSet} from '../Util'; +import {EntryView} from '../core/EntryView'; +import {IMapListener} from '../core/MapListener'; import {IterationType, Predicate} from '../core/Predicate'; -import {MapEntriesWithPredicateCodec} from '../codec/MapEntriesWithPredicateCodec'; -import {MapKeySetWithPredicateCodec} from '../codec/MapKeySetWithPredicateCodec'; -import {MapValuesWithPredicateCodec} from '../codec/MapValuesWithPredicateCodec'; -import {MapAddEntryListenerToKeyWithPredicateCodec} from '../codec/MapAddEntryListenerToKeyWithPredicateCodec'; -import {MapAddEntryListenerWithPredicateCodec} from '../codec/MapAddEntryListenerWithPredicateCodec'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {Data} from '../serialization/Data'; import {PagingPredicate} from '../serialization/DefaultPredicates'; -import {MapValuesWithPagingPredicateCodec} from '../codec/MapValuesWithPagingPredicateCodec'; -import {MapKeySetWithPagingPredicateCodec} from '../codec/MapKeySetWithPagingPredicateCodec'; import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; -import {MapExecuteOnAllKeysCodec} from '../codec/MapExecuteOnAllKeysCodec'; -import {MapExecuteWithPredicateCodec} from '../codec/MapExecuteWithPredicateCodec'; -import {MapExecuteOnKeyCodec} from '../codec/MapExecuteOnKeyCodec'; -import {MapExecuteOnKeysCodec} from '../codec/MapExecuteOnKeysCodec'; import * as SerializationUtil from '../serialization/SerializationUtil'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {assertArray, assertNotNull, getSortedQueryResultSet} from '../Util'; +import {BaseProxy} from './BaseProxy'; +import {IMap} from './IMap'; import ClientMessage = require('../ClientMessage'); -import {Aggregator} from '../aggregation/Aggregator'; -import {MapAggregateCodec} from '../codec/MapAggregateCodec'; -import {MapAggregateWithPredicateCodec} from '../codec/MapAggregateWithPredicateCodec'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export class MapProxy extends BaseProxy implements IMap { aggregate(aggregator: Aggregator): Promise { assertNotNull(aggregator); - let aggregatorData = this.toData(aggregator); + const aggregatorData = this.toData(aggregator); return this.encodeInvokeOnRandomTarget(MapAggregateCodec, aggregatorData); } @@ -92,94 +92,92 @@ export class MapProxy extends BaseProxy implements IMap { assertNotNull(aggregator); assertNotNull(predicate); this.checkNotPagingPredicate(predicate); - let aggregatorData = this.toData(aggregator); - let predicateData = this.toData(predicate); + const aggregatorData = this.toData(aggregator); + const predicateData = this.toData(predicate); return this.encodeInvokeOnRandomTarget(MapAggregateWithPredicateCodec, aggregatorData, predicateData); } - executeOnKeys(keys: K[], entryProcessor: IdentifiedDataSerializable|Portable): Promise { + executeOnKeys(keys: K[], entryProcessor: IdentifiedDataSerializable | Portable): Promise { assertNotNull(keys); assertArray(keys); if (keys.length === 0) { return Promise.resolve([]); } else { - var toObject = this.toObject.bind(this); - var keysData = SerializationUtil.serializeList(this.toData.bind(this), keys); - var proData = this.toData(entryProcessor); + const toObject = this.toObject.bind(this); + const keysData = SerializationUtil.serializeList(this.toData.bind(this), keys); + const proData = this.toData(entryProcessor); return this.encodeInvokeOnRandomTarget(MapExecuteOnKeysCodec, proData, keysData) - .then<[K, V][]>(SerializationUtil.deserializeEntryList.bind(this, toObject)); + .then>(SerializationUtil.deserializeEntryList.bind(this, toObject)); } } executeOnKey(key: K, entryProcessor: IdentifiedDataSerializable | Portable): Promise { assertNotNull(key); assertNotNull(entryProcessor); - var keyData = this.toData(key); - var proData = this.toData(entryProcessor); + const keyData = this.toData(key); + const proData = this.toData(entryProcessor); return this.executeOnKeyInternal(keyData, proData); } - protected executeOnKeyInternal(keyData: Data, proData: Data): Promise { - return this.encodeInvokeOnKey(MapExecuteOnKeyCodec, keyData, proData, keyData, 1); - } - - executeOnEntries(entryProcessor: IdentifiedDataSerializable | Portable, predicate: Predicate = null): Promise<[K, V][]> { + executeOnEntries(entryProcessor: IdentifiedDataSerializable | Portable, predicate: Predicate = null): Promise> { assertNotNull(entryProcessor); - var proData = this.toData(entryProcessor); - var toObject = this.toObject.bind(this); + const proData = this.toData(entryProcessor); + const toObject = this.toObject.bind(this); if (predicate == null) { - return this.encodeInvokeOnRandomTarget<[Data, Data][]>(MapExecuteOnAllKeysCodec, proData) - .then<[K, V][]>(SerializationUtil.deserializeEntryList.bind(this, toObject)); + return this.encodeInvokeOnRandomTarget>(MapExecuteOnAllKeysCodec, proData) + .then>(SerializationUtil.deserializeEntryList.bind(this, toObject)); } else { - var predData = this.toData(predicate); + const predData = this.toData(predicate); return this.encodeInvokeOnRandomTarget(MapExecuteWithPredicateCodec, proData, predData) - .then<[K, V][]>(SerializationUtil.deserializeEntryList.bind(this, toObject)); + .then>(SerializationUtil.deserializeEntryList.bind(this, toObject)); } } entrySetWithPredicate(predicate: Predicate): Promise { assertNotNull(predicate); - var toObject = this.toObject.bind(this); + const toObject = this.toObject.bind(this); if (predicate instanceof PagingPredicate) { predicate.setIterationType(IterationType.ENTRY); - var pData = this.toData(predicate); + const pData = this.toData(predicate); return this.encodeInvokeOnRandomTarget( - MapValuesWithPagingPredicateCodec, pData - ).then(function(rawValues: [Data, Data][]) { - var deserValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { + MapValuesWithPagingPredicateCodec, pData, + ).then(function (rawValues: Array<[Data, Data]>) { + const deserValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { return [toObject(ite[0]), toObject(ite[1])]; }); return getSortedQueryResultSet(deserValues, predicate); }); } else { - var pData = this.toData(predicate); - var deserializedSet: [K, V][] = []; - return this.encodeInvokeOnRandomTarget(MapEntriesWithPredicateCodec, pData).then(function(entrySet: [Data, Data][]) { - entrySet.forEach(function(entry) { - deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); + const pData = this.toData(predicate); + const deserializedSet: Array<[K, V]> = []; + return this.encodeInvokeOnRandomTarget(MapEntriesWithPredicateCodec, pData).then( + function (entrySet: Array<[Data, Data]>) { + entrySet.forEach(function (entry) { + deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); + }); + return deserializedSet; }); - return deserializedSet; - }); } } keySetWithPredicate(predicate: Predicate): Promise { assertNotNull(predicate); - var toObject = this.toObject.bind(this); + const toObject = this.toObject.bind(this); if (predicate instanceof PagingPredicate) { predicate.setIterationType(IterationType.KEY); - var predData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapKeySetWithPagingPredicateCodec, predData).then(function(rawValues: Data[]) { - var deserValues = rawValues.map<[K, V]>(function (ite: Data) { - return [toObject(ite), null]; + const predData = this.toData(predicate); + return this.encodeInvokeOnRandomTarget(MapKeySetWithPagingPredicateCodec, predData).then( + function (rawValues: Data[]) { + const deserValues = rawValues.map<[K, V]>(function (ite: Data) { + return [toObject(ite), null]; + }); + return getSortedQueryResultSet(deserValues, predicate); }); - return getSortedQueryResultSet(deserValues, predicate); - }); } else { - var predicateData = this.toData(predicate); + const predicateData = this.toData(predicate); return this.encodeInvokeOnRandomTarget(MapKeySetWithPredicateCodec, predicateData).then(function (entrySet: Data[]) { return entrySet.map(toObject); }); @@ -188,69 +186,60 @@ export class MapProxy extends BaseProxy implements IMap { valuesWithPredicate(predicate: Predicate): Promise> { assertNotNull(predicate); - var toObject = this.toObject.bind(this); + const toObject = this.toObject.bind(this); if (predicate instanceof PagingPredicate) { predicate.setIterationType(IterationType.VALUE); - let predData = this.toData(predicate); + const predData = this.toData(predicate); return this.encodeInvokeOnRandomTarget( - MapValuesWithPagingPredicateCodec, predData - ).then((rawValues: [Data, Data][]) => { - let desValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { + MapValuesWithPagingPredicateCodec, predData, + ).then((rawValues: Array<[Data, Data]>) => { + const desValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { return [toObject(ite[0]), toObject(ite[1])]; }); return new ReadOnlyLazyList(getSortedQueryResultSet(desValues, predicate), this.client.getSerializationService()); }); } else { - var predicateData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapValuesWithPredicateCodec, predicateData).then( (rawValues: Data[]) => { + const predicateData = this.toData(predicate); + return this.encodeInvokeOnRandomTarget(MapValuesWithPredicateCodec, predicateData).then((rawValues: Data[]) => { return new ReadOnlyLazyList(rawValues, this.client.getSerializationService()); }); } } - addEntryListenerWithPredicate(listener: IMapListener, predicate: Predicate, - key: K = undefined, includeValue: boolean = undefined - ): Promise { + addEntryListenerWithPredicate(listener: IMapListener, predicate: Predicate, key: K, + includeValue: boolean): Promise { return this.addEntryListenerInternal(listener, predicate, key, includeValue); } containsKey(key: K): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.containsKeyInternal(keyData); } - protected containsKeyInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapContainsKeyCodec, keyData, keyData, 0); - } - containsValue(value: V): Promise { assertNotNull(value); - var valueData = this.toData(value); + const valueData = this.toData(value); return this.encodeInvokeOnRandomTarget(MapContainsValueCodec, valueData); } put(key: K, value: V, ttl: number = -1): Promise { assertNotNull(key); assertNotNull(value); - var keyData: Data = this.toData(key); - var valueData: Data = this.toData(value); + const keyData: Data = this.toData(key); + const valueData: Data = this.toData(value); return this.putInternal(keyData, valueData, ttl); } - protected putInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapPutCodec, keyData, keyData, valueData, 0, ttl); - } - - putAll(pairs: [K, V][]): Promise { - var partitionService = this.client.getPartitionService(); - var partitionsToKeys: {[id: string]: any} = {}; - var pair: [K, V]; - var pairId: string; + putAll(pairs: Array<[K, V]>): Promise { + const partitionService = this.client.getPartitionService(); + const partitionsToKeys: { [id: string]: any } = {}; + let pair: [K, V]; + let pairId: string; for (pairId in pairs) { pair = pairs[pairId]; - var keyData = this.toData(pair[0]); - var pId: number = partitionService.getPartitionId(keyData); + const keyData = this.toData(pair[0]); + const pId: number = partitionService.getPartitionId(keyData); if (!partitionsToKeys[pId]) { partitionsToKeys[pId] = []; } @@ -259,43 +248,18 @@ export class MapProxy extends BaseProxy implements IMap { return this.putAllInternal(partitionsToKeys); } - protected putAllInternal(partitionsToKeysData: {[id: string]: [Data, Data][]}): Promise { - var partitionPromises: Promise[] = []; - for (var partition in partitionsToKeysData) { - partitionPromises.push( - this.encodeInvokeOnPartition(MapPutAllCodec, Number(partition), partitionsToKeysData[partition]) - ); - } - return Promise.all(partitionPromises).then(function () { - return; - }); - } - get(key: K): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.getInternal(keyData); } - protected getInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapGetCodec, keyData, keyData, 0); - } - remove(key: K, value: V = null): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.removeInternal(keyData, value); } - protected removeInternal(keyData: Data, value: V = null): Promise { - if (value == null) { - return this.encodeInvokeOnKey(MapRemoveCodec, keyData, keyData, 0); - } else { - var valueData = this.toData(value); - return this.encodeInvokeOnKey(MapRemoveIfSameCodec, keyData, keyData, valueData, 0); - } - } - size(): Promise { return this.encodeInvokeOnRandomTarget(MapSizeCodec); } @@ -311,75 +275,48 @@ export class MapProxy extends BaseProxy implements IMap { getAll(keys: K[]): Promise { assertNotNull(keys); assertArray(keys); - var partitionService = this.client.getPartitionService(); - var partitionsToKeys: {[id: string]: any} = {}; - var key: K; - for (var i in keys) { + const partitionService = this.client.getPartitionService(); + const partitionsToKeys: { [id: string]: any } = {}; + let key: K; + for (const i in keys) { key = keys[i]; - var keyData = this.toData(key); - var pId: number = partitionService.getPartitionId(keyData); + const keyData = this.toData(key); + const pId: number = partitionService.getPartitionId(keyData); if (!partitionsToKeys[pId]) { partitionsToKeys[pId] = []; } partitionsToKeys[pId].push(keyData); } - var result: [any, any][] = []; + const result: Array<[any, any]> = []; return this.getAllInternal(partitionsToKeys, result).then(function () { - return result; - }); - } - protected getAllInternal(partitionsToKeys: {[id: string]: any}, result: any[] = []): Promise<[Data, Data][]> { - var partitionPromises: Promise<[Data, Data][]>[] = []; - for (var partition in partitionsToKeys) { - partitionPromises.push(this.encodeInvokeOnPartition<[Data, Data][]>( - MapGetAllCodec, - Number(partition), - partitionsToKeys[partition]) - ); - } - var toObject = this.toObject.bind(this); - var deserializeEntry = function(entry: [Data, Data]) { - return [toObject(entry[0]), toObject(entry[1])]; - }; - return Promise.all(partitionPromises).then(function(serializedEntryArrayArray: [Data, Data][][]) { - var serializedEntryArray = Array.prototype.concat.apply([], serializedEntryArrayArray); - result.push(...(serializedEntryArray.map(deserializeEntry))); - return serializedEntryArray; + return result; }); } delete(key: K): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.deleteInternal(keyData); } - protected deleteInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapDeleteCodec, keyData, keyData, 0); - } - entrySet(): Promise { - var deserializedSet: [K, V][] = []; - var toObject = this.toObject.bind(this); - return this.encodeInvokeOnRandomTarget(MapEntrySetCodec).then(function(entrySet: [Data, Data][]) { - entrySet.forEach(function(entry) { + const deserializedSet: Array<[K, V]> = []; + const toObject = this.toObject.bind(this); + return this.encodeInvokeOnRandomTarget(MapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>) { + entrySet.forEach(function (entry) { deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); }); return deserializedSet; }); } - evict(key: K) : Promise { + evict(key: K): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.evictInternal(keyData); } - protected evictInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapEvictCodec, keyData, keyData, 0); - } - evictAll(): Promise { return this.encodeInvokeOnRandomTarget(MapEvictAllCodec); } @@ -390,31 +327,31 @@ export class MapProxy extends BaseProxy implements IMap { lock(key: K, ttl: number = -1): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MapLockCodec, keyData, keyData, 0, ttl, 0); } isLocked(key: K): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MapIsLockedCodec, keyData, keyData); } unlock(key: K): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MapUnlockCodec, keyData, keyData, 0, 0); } forceUnlock(key: K): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MapForceUnlockCodec, keyData, keyData, 0); } keySet(): Promise { - var toObject = this.toObject.bind(this); - return this.encodeInvokeOnRandomTarget(MapKeySetCodec).then(function(entrySet) { + const toObject = this.toObject.bind(this); + return this.encodeInvokeOnRandomTarget(MapKeySetCodec).then(function (entrySet) { return entrySet.map(toObject); }); } @@ -423,8 +360,8 @@ export class MapProxy extends BaseProxy implements IMap { if (keys == null) { return this.encodeInvokeOnRandomTarget(MapLoadAllCodec, replaceExistingValues); } else { - var toData = this.toData.bind(this); - var keysData: Data[] = keys.map(toData); + const toData = this.toData.bind(this); + const keysData: Data[] = keys.map(toData); return this.encodeInvokeOnRandomTarget(MapLoadGivenKeysCodec, keysData, replaceExistingValues); } } @@ -432,65 +369,45 @@ export class MapProxy extends BaseProxy implements IMap { putIfAbsent(key: K, value: V, ttl: number = -1): Promise { assertNotNull(key); assertNotNull(value); - var keyData = this.toData(key); - var valueData = this.toData(value); + const keyData = this.toData(key); + const valueData = this.toData(value); return this.putIfAbsentInternal(keyData, valueData, ttl); } - protected putIfAbsentInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapPutIfAbsentCodec, keyData, keyData, valueData, 0, ttl); - } - putTransient(key: K, value: V, ttl: number = -1): Promise { assertNotNull(key); assertNotNull(value); - var keyData = this.toData(key); - var valueData = this.toData(value); + const keyData = this.toData(key); + const valueData = this.toData(value); return this.putTransientInternal(keyData, valueData, ttl); } - protected putTransientInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapPutTransientCodec, keyData, keyData, valueData, 0, ttl); - } - replace(key: K, newValue: V): Promise { assertNotNull(key); assertNotNull(newValue); - var keyData = this.toData(key); - var newValueData = this.toData(newValue); + const keyData = this.toData(key); + const newValueData = this.toData(newValue); return this.replaceInternal(keyData, newValueData); } - protected replaceInternal(keyData: Data, newValueData: Data): Promise { - return this.encodeInvokeOnKey(MapReplaceCodec, keyData, keyData, newValueData, 0); - } - replaceIfSame(key: K, oldValue: V, newValue: V): Promise { assertNotNull(key); assertNotNull(oldValue); assertNotNull(newValue); - var keyData = this.toData(key); - var newValueData = this.toData(newValue); - var oldValueData = this.toData(oldValue); + const keyData = this.toData(key); + const newValueData = this.toData(newValue); + const oldValueData = this.toData(oldValue); return this.replaceIfSameInternal(keyData, oldValueData, newValueData); } - protected replaceIfSameInternal(keyData: Data, oldValueData: Data, newValueData: Data): Promise { - return this.encodeInvokeOnKey(MapReplaceIfSameCodec, keyData, keyData, oldValueData, newValueData, 0); - } - set(key: K, value: V, ttl: number = -1): Promise { assertNotNull(key); assertNotNull(value); - var keyData = this.toData(key); - var valueData = this.toData(value); + const keyData = this.toData(key); + const valueData = this.toData(value); return this.setInternal(keyData, valueData, ttl); } - protected setInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapSetCodec, keyData, keyData, valueData, 0, ttl); - } - values(): Promise> { return this.encodeInvokeOnRandomTarget(MapValuesCodec).then((valuesData) => { return new ReadOnlyLazyList(valuesData, this.client.getSerializationService()); @@ -499,7 +416,7 @@ export class MapProxy extends BaseProxy implements IMap { getEntryView(key: K): Promise> { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey>(MapGetEntryViewCodec, keyData, keyData, 0); } @@ -509,56 +426,150 @@ export class MapProxy extends BaseProxy implements IMap { tryLock(key: K, timeout: number = 0, lease: number = -1): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MapTryLockCodec, keyData, keyData, 0, lease, timeout, 0); } tryPut(key: K, value: V, timeout: number): Promise { assertNotNull(key); assertNotNull(value); - var keyData = this.toData(key); - var valueData = this.toData(value); + const keyData = this.toData(key); + const valueData = this.toData(value); return this.tryPutInternal(keyData, valueData, timeout); } - protected tryPutInternal(keyData: Data, valueData: Data, timeout: number): Promise { - return this.encodeInvokeOnKey(MapTryPutCodec, keyData, keyData, valueData, 0, timeout); - } - tryRemove(key: K, timeout: number): Promise { assertNotNull(key); - var keyData = this.toData(key); + const keyData = this.toData(key); return this.tryRemoveInternal(keyData, timeout); } + addEntryListener(listener: IMapListener, key: K, includeValue: boolean = false): Promise { + return this.addEntryListenerInternal(listener, undefined, key, includeValue); + } + + removeEntryListener(listenerId: string): Promise { + return this.client.getListenerService().deregisterListener(listenerId); + } + + protected executeOnKeyInternal(keyData: Data, proData: Data): Promise { + return this.encodeInvokeOnKey(MapExecuteOnKeyCodec, keyData, proData, keyData, 1); + } + + protected containsKeyInternal(keyData: Data): Promise { + return this.encodeInvokeOnKey(MapContainsKeyCodec, keyData, keyData, 0); + } + + protected putInternal(keyData: Data, valueData: Data, ttl: number): Promise { + return this.encodeInvokeOnKey(MapPutCodec, keyData, keyData, valueData, 0, ttl); + } + + protected putAllInternal(partitionsToKeysData: { [id: string]: Array<[Data, Data]> }): Promise { + const partitionPromises: Array> = []; + for (const partition in partitionsToKeysData) { + partitionPromises.push( + this.encodeInvokeOnPartition(MapPutAllCodec, Number(partition), partitionsToKeysData[partition]), + ); + } + return Promise.all(partitionPromises).then(function () { + return; + }); + } + + protected getInternal(keyData: Data): Promise { + return this.encodeInvokeOnKey(MapGetCodec, keyData, keyData, 0); + } + + protected removeInternal(keyData: Data, value: V = null): Promise { + if (value == null) { + return this.encodeInvokeOnKey(MapRemoveCodec, keyData, keyData, 0); + } else { + const valueData = this.toData(value); + return this.encodeInvokeOnKey(MapRemoveIfSameCodec, keyData, keyData, valueData, 0); + } + } + + protected getAllInternal(partitionsToKeys: { [id: string]: any }, result: any[] = []): Promise> { + const partitionPromises: Array>> = []; + for (const partition in partitionsToKeys) { + partitionPromises.push(this.encodeInvokeOnPartition>( + MapGetAllCodec, + Number(partition), + partitionsToKeys[partition]), + ); + } + const toObject = this.toObject.bind(this); + const deserializeEntry = function (entry: [Data, Data]) { + return [toObject(entry[0]), toObject(entry[1])]; + }; + return Promise.all(partitionPromises).then(function (serializedEntryArrayArray: Array>) { + const serializedEntryArray = Array.prototype.concat.apply([], serializedEntryArrayArray); + result.push(...(serializedEntryArray.map(deserializeEntry))); + return serializedEntryArray; + }); + } + + protected deleteInternal(keyData: Data): Promise { + return this.encodeInvokeOnKey(MapDeleteCodec, keyData, keyData, 0); + } + + protected evictInternal(keyData: Data): Promise { + return this.encodeInvokeOnKey(MapEvictCodec, keyData, keyData, 0); + } + + protected putIfAbsentInternal(keyData: Data, valueData: Data, ttl: number): Promise { + return this.encodeInvokeOnKey(MapPutIfAbsentCodec, keyData, keyData, valueData, 0, ttl); + } + + protected putTransientInternal(keyData: Data, valueData: Data, ttl: number): Promise { + return this.encodeInvokeOnKey(MapPutTransientCodec, keyData, keyData, valueData, 0, ttl); + } + + protected replaceInternal(keyData: Data, newValueData: Data): Promise { + return this.encodeInvokeOnKey(MapReplaceCodec, keyData, keyData, newValueData, 0); + } + + protected replaceIfSameInternal(keyData: Data, oldValueData: Data, newValueData: Data): Promise { + return this.encodeInvokeOnKey(MapReplaceIfSameCodec, keyData, keyData, oldValueData, newValueData, 0); + } + + protected setInternal(keyData: Data, valueData: Data, ttl: number): Promise { + return this.encodeInvokeOnKey(MapSetCodec, keyData, keyData, valueData, 0, ttl); + } + + protected tryPutInternal(keyData: Data, valueData: Data, timeout: number): Promise { + return this.encodeInvokeOnKey(MapTryPutCodec, keyData, keyData, valueData, 0, timeout); + } + protected tryRemoveInternal(keyData: Data, timeout: number): Promise { return this.encodeInvokeOnKey(MapTryRemoveCodec, keyData, keyData, 0, timeout); } private addEntryListenerInternal( - listener: IMapListener, predicate: Predicate, key: K, includeValue: boolean + listener: IMapListener, predicate: Predicate, key: K, includeValue: boolean, ): Promise { - var flags: any = null; - var conversionTable: {[funcName: string]: EntryEventType} = { - 'added': EntryEventType.ADDED, - 'removed': EntryEventType.REMOVED, - 'updated': EntryEventType.UPDATED, - 'merged': EntryEventType.MERGED, - 'evicted': EntryEventType.EVICTED, - 'evictedAll': EntryEventType.EVICT_ALL, - 'clearedAll': EntryEventType.CLEAR_ALL + let flags: any = null; + const conversionTable: { [funcName: string]: EntryEventType } = { + added: EntryEventType.ADDED, + clearedAll: EntryEventType.CLEAR_ALL, + evicted: EntryEventType.EVICTED, + evictedAll: EntryEventType.EVICT_ALL, + merged: EntryEventType.MERGED, + removed: EntryEventType.REMOVED, + updated: EntryEventType.UPDATED, }; - for (var funcName in conversionTable) { + for (const funcName in conversionTable) { if (listener[funcName]) { /* tslint:disable:no-bitwise */ flags = flags | conversionTable[funcName]; } } - var toObject = this.toObject.bind(this); - var entryEventHandler = function( - key: K, val: V, oldVal: V, mergingVal: V, event: number, uuid: string, numberOfAffectedEntries: number + const toObject = this.toObject.bind(this); + const entryEventHandler = function ( + /* tslint:disable-next-line:no-shadowed-variable */ + key: K, val: V, oldVal: V, mergingVal: V, event: number, uuid: string, numberOfAffectedEntries: number, ) { - var eventParams: any[] = [key, oldVal, val, mergingVal, numberOfAffectedEntries, uuid]; + let eventParams: any[] = [key, oldVal, val, mergingVal, numberOfAffectedEntries, uuid]; eventParams = eventParams.map(toObject); switch (event) { case EntryEventType.ADDED: @@ -587,16 +598,16 @@ export class MapProxy extends BaseProxy implements IMap { let codec: ListenerMessageCodec; let listenerHandler: Function; if (key && predicate) { - var keyData = this.toData(key); - var predicateData = this.toData(predicate); + const keyData = this.toData(key); + const predicateData = this.toData(predicate); codec = this.createEntryListenerToKeyWithPredicate(this.name, keyData, predicateData, includeValue, flags); listenerHandler = MapAddEntryListenerToKeyWithPredicateCodec.handle; } else if (key && !predicate) { - var keyData = this.toData(key); + const keyData = this.toData(key); codec = this.createEntryListenerToKey(this.name, keyData, includeValue, flags); listenerHandler = MapAddEntryListenerToKeyCodec.handle; } else if (!key && predicate) { - var predicateData = this.toData(predicate); + const predicateData = this.toData(predicate); codec = this.createEntryListenerWithPredicate(this.name, predicateData, includeValue, flags); listenerHandler = MapAddEntryListenerWithPredicateCodec.handle; } else { @@ -604,74 +615,67 @@ export class MapProxy extends BaseProxy implements IMap { listenerHandler = MapAddEntryListenerCodec.handle; } return this.client.getListenerService() - .registerListener(codec, (m: ClientMessage) => { listenerHandler(m, entryEventHandler, toObject); }); - } - - addEntryListener(listener: IMapListener, key: K = undefined, includeValue: boolean = false): Promise { - return this.addEntryListenerInternal(listener, undefined, key, includeValue); - } - - removeEntryListener(listenerId: string): Promise { - return this.client.getListenerService().deregisterListener(listenerId); + .registerListener(codec, (m: ClientMessage) => { + listenerHandler(m, entryEventHandler, toObject); + }); } - private createEntryListenerToKey(name: string, keyData: Data, includeValue: boolean, flags: any): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddEntryListenerToKeyCodec.encodeRequest(name, keyData, includeValue, flags, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MapAddEntryListenerToKeyCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } private createEntryListenerToKeyWithPredicate(name: string, keyData: Data, predicateData: Data, includeValue: boolean, - flags: any): ListenerMessageCodec { + flags: any): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddEntryListenerToKeyWithPredicateCodec.encodeRequest(name, keyData, predicateData, includeValue, flags, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MapAddEntryListenerToKeyWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } private createEntryListenerWithPredicate(name: string, predicateData: Data, includeValue: boolean, - flags: any): ListenerMessageCodec { + flags: any): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddEntryListenerWithPredicateCodec.encodeRequest(name, predicateData, includeValue, flags, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MapAddEntryListenerWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } private createEntryListener(name: string, includeValue: boolean, flags: any): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddEntryListenerCodec.encodeRequest(name, includeValue, flags, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MapAddEntryListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } @@ -681,7 +685,4 @@ export class MapProxy extends BaseProxy implements IMap { } } - } - - diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index e6e3578cc..d6936bbe6 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -15,9 +15,9 @@ */ import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; import {IMapListener} from '../core/MapListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {DistributedObject} from '../DistributedObject'; export interface MultiMap extends DistributedObject { @@ -58,7 +58,7 @@ export interface MultiMap extends DistributedObject { /** * @return an array of all keys in this multi-map. */ - keySet(): Promise>; + keySet(): Promise; /** * @return a flat list of all values stored in this multi-map. diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 295fd34e6..48a6c9f5b 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -16,106 +16,106 @@ import * as Promise from 'bluebird'; -import {MultiMap} from './MultiMap'; -import {BaseProxy} from './BaseProxy'; +import * as Long from 'long'; +import {MultiMapForceUnlockCodec} from '../codec/MultiMapForceUnlockCodec'; +import {MultiMapIsLockedCodec} from '../codec/MultiMapIsLockedCodec'; +import {MultiMapLockCodec} from '../codec/MultiMapLockCodec'; +import {MultiMapTryLockCodec} from '../codec/MultiMapTryLockCodec'; +import {MultiMapUnlockCodec} from '../codec/MultiMapUnlockCodec'; +import {EntryEventType} from '../core/EntryEventType'; import {IMapListener} from '../core/MapListener'; -import {MultiMapPutCodec} from './../codec/MultiMapPutCodec'; -import {MultiMapGetCodec} from './../codec/MultiMapGetCodec'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; import {Data} from '../serialization/Data'; -import {MultiMapRemoveCodec} from './../codec/MultiMapRemoveCodec'; -import {MultiMapRemoveEntryCodec} from './../codec/MultiMapRemoveEntryCodec'; -import {MultiMapKeySetCodec} from './../codec/MultiMapKeySetCodec'; -import {MultiMapValuesCodec} from './../codec/MultiMapValuesCodec'; -import {MultiMapEntrySetCodec} from './../codec/MultiMapEntrySetCodec'; +import {MultiMapAddEntryListenerCodec} from './../codec/MultiMapAddEntryListenerCodec'; +import {MultiMapAddEntryListenerToKeyCodec} from './../codec/MultiMapAddEntryListenerToKeyCodec'; +import {MultiMapClearCodec} from './../codec/MultiMapClearCodec'; +import {MultiMapContainsEntryCodec} from './../codec/MultiMapContainsEntryCodec'; import {MultiMapContainsKeyCodec} from './../codec/MultiMapContainsKeyCodec'; import {MultiMapContainsValueCodec} from './../codec/MultiMapContainsValueCodec'; -import {MultiMapContainsEntryCodec} from './../codec/MultiMapContainsEntryCodec'; +import {MultiMapEntrySetCodec} from './../codec/MultiMapEntrySetCodec'; +import {MultiMapGetCodec} from './../codec/MultiMapGetCodec'; +import {MultiMapKeySetCodec} from './../codec/MultiMapKeySetCodec'; +import {MultiMapPutCodec} from './../codec/MultiMapPutCodec'; +import {MultiMapRemoveCodec} from './../codec/MultiMapRemoveCodec'; +import {MultiMapRemoveEntryCodec} from './../codec/MultiMapRemoveEntryCodec'; +import {MultiMapRemoveEntryListenerCodec} from './../codec/MultiMapRemoveEntryListenerCodec'; import {MultiMapSizeCodec} from './../codec/MultiMapSizeCodec'; -import {MultiMapClearCodec} from './../codec/MultiMapClearCodec'; import {MultiMapValueCountCodec} from './../codec/MultiMapValueCountCodec'; -import {EntryEventType} from '../core/EntryEventType'; -import {MultiMapAddEntryListenerToKeyCodec} from './../codec/MultiMapAddEntryListenerToKeyCodec'; -import {MultiMapAddEntryListenerCodec} from './../codec/MultiMapAddEntryListenerCodec'; -import {MultiMapRemoveEntryListenerCodec} from './../codec/MultiMapRemoveEntryListenerCodec'; -import {MultiMapLockCodec} from '../codec/MultiMapLockCodec'; -import {MultiMapIsLockedCodec} from '../codec/MultiMapIsLockedCodec'; -import {MultiMapTryLockCodec} from '../codec/MultiMapTryLockCodec'; -import {MultiMapUnlockCodec} from '../codec/MultiMapUnlockCodec'; -import {MultiMapForceUnlockCodec} from '../codec/MultiMapForceUnlockCodec'; -import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; -import * as Long from 'long'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {MultiMapValuesCodec} from './../codec/MultiMapValuesCodec'; +import {BaseProxy} from './BaseProxy'; +import {MultiMap} from './MultiMap'; import ClientMessage = require('../ClientMessage'); -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; export class MultiMapProxy extends BaseProxy implements MultiMap { private lockReferenceIdGenerator: LockReferenceIdGenerator = this.client.getLockReferenceIdGenerator(); - - private deserializeList = (items: Array): Array => { + private deserializeList = (items: Data[]): X[] => { return items.map(this.toObject.bind(this)); // tslint:disable-next-line:semicolon }; + /*tslint:disable:member-ordering*/ put(key: K, value: V): Promise { - var keyData = this.toData(key); - var valueData = this.toData(value); + const keyData = this.toData(key); + const valueData = this.toData(value); return this.encodeInvokeOnKey(MultiMapPutCodec, keyData, keyData, valueData, 1); } get(key: K): Promise> { - var keyData = this.toData(key); - return this.encodeInvokeOnKey>(MultiMapGetCodec, keyData, keyData, 1).then((data: Data[]) => { + const keyData = this.toData(key); + return this.encodeInvokeOnKey(MultiMapGetCodec, keyData, keyData, 1).then((data: Data[]) => { return new ReadOnlyLazyList(data, this.client.getSerializationService()); }); } remove(key: K, value: V): Promise { - var keyData = this.toData(key); - var valueData = this.toData(value); + const keyData = this.toData(key); + const valueData = this.toData(value); return this.encodeInvokeOnKey(MultiMapRemoveEntryCodec, keyData, keyData, valueData, 1); } removeAll(key: K): Promise> { - var keyData = this.toData(key); - return this.encodeInvokeOnKey>(MultiMapRemoveCodec, keyData, keyData, 1).then((data: Data[]) => { + const keyData = this.toData(key); + return this.encodeInvokeOnKey(MultiMapRemoveCodec, keyData, keyData, 1).then((data: Data[]) => { return new ReadOnlyLazyList(data, this.client.getSerializationService()); }); } - keySet(): Promise> { - return this.encodeInvokeOnRandomTarget>(MultiMapKeySetCodec) - .then>(this.deserializeList); + keySet(): Promise { + return this.encodeInvokeOnRandomTarget(MultiMapKeySetCodec) + .then(this.deserializeList); } values(): Promise> { - return this.encodeInvokeOnRandomTarget>(MultiMapValuesCodec).then((data: Data[]) => { + return this.encodeInvokeOnRandomTarget(MultiMapValuesCodec).then((data: Data[]) => { return new ReadOnlyLazyList(data, this.client.getSerializationService()); }); } entrySet(): Promise> { return this.encodeInvokeOnRandomTarget>(MultiMapEntrySetCodec) - .then>((entrySet: [Data, Data][]) => { - return entrySet.map((entry: Array) => { - return <[K, V]>[this.toObject(entry[0]), this.toObject(entry[1])]; + .then>((entrySet: Array<[Data, Data]>) => { + return entrySet.map((entry: any[]) => { + return [this.toObject(entry[0]), this.toObject(entry[1])] as [K, V]; }); }); } containsKey(key: K): Promise { - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapContainsKeyCodec, keyData, keyData, 1); } containsValue(value: V): Promise { - var valueData = this.toData(value); + const valueData = this.toData(value); return this.encodeInvokeOnRandomTarget(MultiMapContainsValueCodec, valueData); } containsEntry(key: K, value: V): Promise { - var keyData = this.toData(key); - var valueData = this.toData(value); + const keyData = this.toData(key); + const valueData = this.toData(value); return this.encodeInvokeOnKey(MultiMapContainsEntryCodec, keyData, keyData, valueData, 1); } @@ -128,17 +128,18 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { } valueCount(key: K): Promise { - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapValueCountCodec, keyData, keyData, 1); } addEntryListener(listener: IMapListener, key?: K, includeValue: boolean = true): Promise { - var toObject = this.toObject.bind(this); + const toObject = this.toObject.bind(this); - var entryEventHandler = function (key: K, value: V, oldValue: V, mergingValue: V, event: number) { - var parameters: any[] = [key, oldValue, value]; + /* tslint:disable: no-shadowed-variable */ + const entryEventHandler = function (key: K, value: V, oldValue: V, mergingValue: V, event: number) { + let parameters: any[] = [key, oldValue, value]; parameters = parameters.map(toObject); - var name: string; + let name: string; // Multi map only supports these three event types switch (event) { @@ -153,26 +154,25 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { break; } - var handlerFunction = listener[name]; + const handlerFunction = listener[name]; if (handlerFunction) { handlerFunction.apply(undefined, parameters); } }; - let listenerRequest: ClientMessage; if (key) { - let keyData = this.toData(key); - let handler = (m: ClientMessage) => { + const keyData = this.toData(key); + const handler = (m: ClientMessage) => { MultiMapAddEntryListenerToKeyCodec.handle(m, entryEventHandler, toObject); }; - let codec = this.createEntryListenerToKey(this.name, keyData, includeValue); + const codec = this.createEntryListenerToKey(this.name, keyData, includeValue); return this.client.getListenerService().registerListener(codec, handler); } else { - var listenerHandler = (m: ClientMessage) => { + const listenerHandler = (m: ClientMessage) => { MultiMapAddEntryListenerCodec.handle(m, entryEventHandler, toObject); }; - let codec = this.createEntryListener(this.name, includeValue); + const codec = this.createEntryListener(this.name, includeValue); return this.client.getListenerService().registerListener(codec, listenerHandler); } @@ -183,28 +183,28 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { } lock(key: K, leaseMillis: number = -1): Promise { - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapLockCodec, keyData, keyData, 1, leaseMillis, this.nextSequence()); } isLocked(key: K): Promise { - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapIsLockedCodec, keyData, keyData); } tryLock(key: K, timeoutMillis: number = 0, leaseMillis: number = -1): Promise { - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapTryLockCodec, keyData, keyData, 1, leaseMillis, timeoutMillis, this.nextSequence()); } unlock(key: K): Promise { - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapUnlockCodec, keyData, keyData, 1, this.nextSequence()); } forceUnlock(key: K): Promise { - var keyData = this.toData(key); + const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapForceUnlockCodec, keyData, keyData, this.nextSequence()); } @@ -214,29 +214,29 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { private createEntryListenerToKey(name: string, keyData: Data, includeValue: boolean): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MultiMapAddEntryListenerToKeyCodec.encodeRequest(name, keyData, includeValue, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MultiMapAddEntryListenerToKeyCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MultiMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } private createEntryListener(name: string, includeValue: boolean): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MultiMapAddEntryListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MultiMapAddEntryListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MultiMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } } diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index b5b1c91c5..2b5d4a616 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -14,21 +14,20 @@ * limitations under the License. */ -import {MapProxy} from './MapProxy'; -import HazelcastClient from '../HazelcastClient'; -import {NearCacheImpl, NearCache} from '../nearcache/NearCache'; -import {Data} from '../serialization/Data'; import * as Promise from 'bluebird'; +import {BuildMetadata} from '../BuildMetadata'; import {MapAddNearCacheEntryListenerCodec} from '../codec/MapAddNearCacheEntryListenerCodec'; +import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; +import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; import {EntryEventType} from '../core/EntryEventType'; -import ClientMessage = require('../ClientMessage'); -import {DataKeyedHashMap} from '../DataStoreHashMap'; +import {UUID} from '../core/UUID'; +import HazelcastClient from '../HazelcastClient'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; -import {BuildMetadata} from '../BuildMetadata'; -import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; +import {NearCache, NearCacheImpl} from '../nearcache/NearCache'; import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetectorImpl'; -import {UUID} from '../core/UUID'; +import {Data} from '../serialization/Data'; +import {MapProxy} from './MapProxy'; +import ClientMessage = require('../ClientMessage'); const MIN_EVENTUALLY_CONSISTENT_NEARCACHE_VERSION = BuildMetadata.calculateVersion('3.8'); @@ -48,22 +47,17 @@ export class NearCachedMapProxy extends MapProxy { } } - private invalidatCacheEntryAndReturn(keyData: Data, retVal: T): T { - this.nearCache.invalidate(keyData); - return retVal; + clear(): Promise { + return super.clear().then(this.invalidateCacheAndReturn.bind(this)); } - private invalidateCacheAndReturn(retVal: T): T { + evictAll(): Promise { this.nearCache.clear(); - return retVal; - } - - clear(): Promise { - return super.clear().then(this.invalidateCacheAndReturn.bind(this)); + return super.evictAll().then(this.invalidateCacheAndReturn.bind(this)); } protected containsKeyInternal(keyData: Data): Promise { - var cachedValue = this.nearCache.get(keyData); + const cachedValue = this.nearCache.get(keyData); if (cachedValue !== undefined) { return Promise.resolve(cachedValue != null); } else { @@ -76,18 +70,13 @@ export class NearCachedMapProxy extends MapProxy { return super.deleteInternal(keyData).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); } - evictAll(): Promise { - this.nearCache.clear(); - return super.evictAll().then(this.invalidateCacheAndReturn.bind(this)); - } - protected evictInternal(key: Data): Promise { return super.evictInternal(key).then(this.invalidatCacheEntryAndReturn.bind(this, key)); } - protected putAllInternal(partitionsToKeysData: {[id: string]: [Data, Data][]}): Promise { + protected putAllInternal(partitionsToKeysData: { [id: string]: Array<[Data, Data]> }): Promise { return super.putAllInternal(partitionsToKeysData).then(() => { - for (var partition in partitionsToKeysData) { + for (const partition in partitionsToKeysData) { partitionsToKeysData[partition].forEach((entry: [Data, Data]) => { this.nearCache.invalidate(entry[0]); }); @@ -95,12 +84,8 @@ export class NearCachedMapProxy extends MapProxy { }); } - private removeNearCacheInvalidationListener() { - return this.client.getListenerService().deregisterListener(this.invalidationListenerId); - } - protected postDestroy(): Promise { - return this.removeNearCacheInvalidationListener().then( () => { + return this.removeNearCacheInvalidationListener().then(() => { this.client.getRepairingTask().deregisterHandler(this.name); }).then(() => { return super.postDestroy(); @@ -125,11 +110,11 @@ export class NearCachedMapProxy extends MapProxy { } protected getInternal(keyData: Data): Promise { - var cachedValue = this.nearCache.get(keyData); + const cachedValue = this.nearCache.get(keyData); if (cachedValue !== undefined) { return Promise.resolve(cachedValue); } else { - let reservation = this.nearCache.tryReserveForUpdate(keyData); + const reservation = this.nearCache.tryReserveForUpdate(keyData); return super.getInternal(keyData).then((val: V) => { this.nearCache.tryPublishReserved(keyData, val, reservation); return val; @@ -147,13 +132,13 @@ export class NearCachedMapProxy extends MapProxy { return super.removeInternal(keyData, value).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); } - protected getAllInternal(partitionsToKeys: {[id: string]: any}, result: any[] = []): Promise { + protected getAllInternal(partitionsToKeys: { [id: string]: any }, result: any[] = []): Promise { try { - for (var partition in partitionsToKeys) { - var partitionArray = partitionsToKeys[partition]; - for (var i = partitionArray.length - 1; i >= 0; i--) { - let key = partitionArray[i]; - var cachedResult = this.nearCache.get(key); + for (const partition in partitionsToKeys) { + let partitionArray = partitionsToKeys[partition]; + for (let i = partitionArray.length - 1; i >= 0; i--) { + const key = partitionArray[i]; + const cachedResult = this.nearCache.get(key); if (cachedResult !== undefined) { result.push([this.toObject(partitionArray[i]), cachedResult]); partitionArray = partitionArray.splice(i, 1); @@ -163,18 +148,17 @@ export class NearCachedMapProxy extends MapProxy { } catch (err) { return Promise.resolve([]); } - let reservations: Long[] = []; - for (var partition in partitionsToKeys) { - var partitionArray = partitionsToKeys[partition]; - for (var i = 0; i < partitionArray.length; i++) { - let key = partitionArray[i]; + const reservations: Long[] = []; + for (const partition in partitionsToKeys) { + const partitionArray = partitionsToKeys[partition]; + for (const key of partitionArray) { reservations.push(this.nearCache.tryReserveForUpdate(key)); } } - return super.getAllInternal(partitionsToKeys, result).then((serializedEntryArray: [Data, Data][]) => { + return super.getAllInternal(partitionsToKeys, result).then((serializedEntryArray: Array<[Data, Data]>) => { serializedEntryArray.forEach((serializedEntry: [Data, Data], index: number) => { - let key = serializedEntry[0]; - let value = serializedEntry[1]; + const key = serializedEntry[0]; + const value = serializedEntry[1]; this.nearCache.tryPublishReserved(key, value, reservations[index]); }); return result; @@ -194,14 +178,27 @@ export class NearCachedMapProxy extends MapProxy { return super.setInternal(keyData, valueData, ttl).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); } - protected tryPutInternal(keyData: Data, valueData: Data, timeout: number): Promise { return super.tryPutInternal(keyData, valueData, timeout) .then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); } + private removeNearCacheInvalidationListener() { + return this.client.getListenerService().deregisterListener(this.invalidationListenerId); + } + + private invalidatCacheEntryAndReturn(keyData: Data, retVal: T): T { + this.nearCache.invalidate(keyData); + return retVal; + } + + private invalidateCacheAndReturn(retVal: T): T { + this.nearCache.clear(); + return retVal; + } + private addNearCacheInvalidationListener(): Promise { - let codec = this.createInvalidationListenerCodec(this.name, EntryEventType.INVALIDATION); + const codec = this.createInvalidationListenerCodec(this.name, EntryEventType.INVALIDATION); if (this.supportsRepairableNearCache()) { return this.client.getListenerService().registerListener(codec, this.createNearCacheEventHandler()); } else { @@ -212,28 +209,28 @@ export class NearCachedMapProxy extends MapProxy { private createInvalidationListenerCodec(name: string, flags: number): ListenerMessageCodec { if (this.supportsRepairableNearCache()) { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddNearCacheInvalidationListenerCodec.encodeRequest(name, flags, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MapAddNearCacheInvalidationListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } else { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddNearCacheEntryListenerCodec.encodeRequest(name, flags, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return MapAddNearCacheEntryListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } } @@ -243,38 +240,38 @@ export class NearCachedMapProxy extends MapProxy { } private createPre38NearCacheEventHandler() { - let nearCache = this.nearCache; - let handle = function(keyData: Data) { + const nearCache = this.nearCache; + const handle = function (keyData: Data) { if (keyData == null) { nearCache.clear(); } else { nearCache.invalidate(keyData); } }; - let handleBatch = function (keys: Array) { + const handleBatch = function (keys: Data[]) { keys.forEach((key: Data) => { nearCache.invalidate(key); }); }; - return function(m: ClientMessage) { + return function (m: ClientMessage) { MapAddNearCacheEntryListenerCodec.handle(m, handle, handleBatch); }; } private createNearCacheEventHandler() { - let repairingTask = this.client.getRepairingTask(); - let repairingHandler = repairingTask.registerAndGetHandler(this.getName(), this.nearCache); - let staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); + const repairingTask = this.client.getRepairingTask(); + const repairingHandler = repairingTask.registerAndGetHandler(this.getName(), this.nearCache); + const staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); this.nearCache.setStaleReadDetector(staleReadDetector); - let handle = function(key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long) { + const handle = function (key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long) { repairingHandler.handle(key, sourceUuid, partitionUuid, sequence); }; - let handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]) { + const handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]) { repairingHandler.handleBatch(keys, sourceUuids, partititonUuids, sequences); }; - return function(m: ClientMessage) { + return function (m: ClientMessage) { MapAddNearCacheInvalidationListenerCodec.handle(m, handle, handleBatch); }; } diff --git a/src/proxy/PNCounter.ts b/src/proxy/PNCounter.ts index 01cc2a36e..33deea2ff 100644 --- a/src/proxy/PNCounter.ts +++ b/src/proxy/PNCounter.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {DistributedObject} from '../DistributedObject'; -import * as Long from 'long'; import * as Promise from 'bluebird'; +import * as Long from 'long'; +import {DistributedObject} from '../DistributedObject'; /** * PN (Positive-Negative) CRDT counter. diff --git a/src/proxy/PNCounterProxy.ts b/src/proxy/PNCounterProxy.ts index f1b8d2c5b..3bd620fee 100644 --- a/src/proxy/PNCounterProxy.ts +++ b/src/proxy/PNCounterProxy.ts @@ -14,24 +14,24 @@ * limitations under the License. */ -import {BaseProxy} from './BaseProxy'; -import {PNCounter} from './PNCounter'; import * as Promise from 'bluebird'; -import {VectorClock} from '../core/VectorClock'; -import Address = require('../Address'); +import * as Long from 'long'; +import {PNCounterAddCodec} from '../codec/PNCounterAddCodec'; +import {PNCounterGetCodec} from '../codec/PNCounterGetCodec'; import {PNCounterGetConfiguredReplicaCountCodec} from '../codec/PNCounterGetConfiguredReplicaCountCodec'; import {MemberSelectors} from '../core/MemberSelectors'; -import {randomInt} from '../Util'; -import {PNCounterAddCodec} from '../codec/PNCounterAddCodec'; +import {VectorClock} from '../core/VectorClock'; import {NoDataMemberInClusterError} from '../HazelcastError'; -import {PNCounterGetCodec} from '../codec/PNCounterGetCodec'; -import * as Long from 'long'; +import {randomInt} from '../Util'; +import {BaseProxy} from './BaseProxy'; +import {PNCounter} from './PNCounter'; +import Address = require('../Address'); export class PNCounterProxy extends BaseProxy implements PNCounter { + private static readonly EMPTY_ARRAY: Address[] = []; private lastObservedVectorClock: VectorClock = new VectorClock(); private maximumReplicaCount: number = 0; private currentTargetReplicaAddress: Address; - private static readonly EMPTY_ARRAY: Address[] = []; get(): Promise { return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterGetCodec); @@ -47,16 +47,16 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { getAndSubtract(delta: Long | number): Promise { if (!Long.isLong(delta)) { - delta = Long.fromNumber(delta); + delta = Long.fromNumber(delta as number); } - return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, (delta).neg(), true); + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, (delta as Long).neg(), true); } subtractAndGet(delta: Long | number): Promise { if (!Long.isLong(delta)) { - delta = Long.fromNumber(delta); + delta = Long.fromNumber(delta as number); } - return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, (delta).neg(), false); + return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterAddCodec, (delta as Long).neg(), false); } decrementAndGet(): Promise { @@ -129,12 +129,12 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { } private getReplicaAddresses(excludedAddresses: Address[]): Promise { - let dataMembers = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); + const dataMembers = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); return this.getMaxConfiguredReplicaCount().then((replicaCount: number) => { - let currentCount = Math.min(replicaCount, dataMembers.length); - let replicaAddresses: Address[] = []; + const currentCount = Math.min(replicaCount, dataMembers.length); + const replicaAddresses: Address[] = []; for (let i = 0; i < currentCount; i++) { - let memberAddress = dataMembers[i].address; + const memberAddress = dataMembers[i].address; if (!excludedAddresses.some(memberAddress.equals.bind(memberAddress))) { replicaAddresses.push(memberAddress); } @@ -155,14 +155,14 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { } private updateObservedReplicaTimestamps(observedTimestamps: Array<[string, Long]>): void { - let observedClock = this.toVectorClock(observedTimestamps); + const observedClock = this.toVectorClock(observedTimestamps); if (observedClock.isAfter(this.lastObservedVectorClock)) { this.lastObservedVectorClock = observedClock; } } private toVectorClock(timestamps: Array<[string, Long]>): VectorClock { - let vectorClock = new VectorClock(); + const vectorClock = new VectorClock(); timestamps.forEach((entry: [string, Long]) => { vectorClock.setReplicaTimestamp(entry[0], entry[1]); }); diff --git a/src/proxy/PartitionSpecificProxy.ts b/src/proxy/PartitionSpecificProxy.ts index 52f792849..51985cf32 100644 --- a/src/proxy/PartitionSpecificProxy.ts +++ b/src/proxy/PartitionSpecificProxy.ts @@ -14,9 +14,10 @@ * limitations under the License. */ -import {BaseProxy} from './BaseProxy'; -import HazelcastClient from '../HazelcastClient'; import * as Promise from 'bluebird'; +import HazelcastClient from '../HazelcastClient'; +import {BaseProxy} from './BaseProxy'; + export class PartitionSpecificProxy extends BaseProxy { private partitionId: number; diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 7d7a63f63..f144d7a32 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -15,33 +15,33 @@ */ import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; -import {MapProxy} from './MapProxy'; -import {SetProxy} from './SetProxy'; +import {ClientAddDistributedObjectListenerCodec} from '../codec/ClientAddDistributedObjectListenerCodec'; import {ClientCreateProxyCodec} from '../codec/ClientCreateProxyCodec'; -import ClientMessage = require('../ClientMessage'); import {ClientDestroyProxyCodec} from '../codec/ClientDestroyProxyCodec'; -import {ClientAddDistributedObjectListenerCodec} from '../codec/ClientAddDistributedObjectListenerCodec'; import {ClientRemoveDistributedObjectListenerCodec} from '../codec/ClientRemoveDistributedObjectListenerCodec'; +import {Member} from '../core/Member'; +import {DistributedObject} from '../DistributedObject'; import HazelcastClient from '../HazelcastClient'; -import {QueueProxy} from './QueueProxy'; +import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; +import {Invocation} from '../invocation/InvocationService'; +import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {LoggingService} from '../logging/LoggingService'; +import {AtomicLongProxy} from './AtomicLongProxy'; +import {FlakeIdGeneratorProxy} from './FlakeIdGeneratorProxy'; import {ListProxy} from './ListProxy'; import {LockProxy} from './LockProxy'; +import {MapProxy} from './MapProxy'; import {MultiMapProxy} from './MultiMapProxy'; -import {RingbufferProxy} from './ringbuffer/RingbufferProxy'; -import {ReplicatedMapProxy} from './ReplicatedMapProxy'; import {NearCachedMapProxy} from './NearCachedMapProxy'; -import {SemaphoreProxy} from './SemaphoreProxy'; -import {AtomicLongProxy} from './AtomicLongProxy'; -import {LoggingService} from '../logging/LoggingService'; -import Address = require('../Address'); -import {Invocation} from '../invocation/InvocationService'; -import {Member} from '../core/Member'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; -import {FlakeIdGeneratorProxy} from './FlakeIdGeneratorProxy'; import {PNCounterProxy} from './PNCounterProxy'; +import {QueueProxy} from './QueueProxy'; +import {ReplicatedMapProxy} from './ReplicatedMapProxy'; +import {RingbufferProxy} from './ringbuffer/RingbufferProxy'; +import {SemaphoreProxy} from './SemaphoreProxy'; +import {SetProxy} from './SetProxy'; import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; +import Address = require('../Address'); +import ClientMessage = require('../ClientMessage'); export class ProxyManager { public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; @@ -58,7 +58,7 @@ export class ProxyManager { public static readonly PNCOUNTER_SERVICE: string = 'hz:impl:PNCounterService'; public static readonly RELIABLETOPIC_SERVICE: string = 'hz:impl:reliableTopicService'; - public readonly service: {[serviceName: string]: any} = {}; + public readonly service: { [serviceName: string]: any } = {}; private readonly proxies: { [proxyName: string]: DistributedObject; } = {}; private readonly client: HazelcastClient; private readonly logger = LoggingService.getLoggingService(); @@ -105,21 +105,53 @@ export class ProxyManager { } } + destroyProxy(name: string, serviceName: string): Promise { + delete this.proxies[name]; + const clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); + clientMessage.setPartitionId(-1); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).return(); + } + + addDistributedObjectListener(listenerFunc: Function): Promise { + const handler = function (clientMessage: ClientMessage) { + const converterFunc = function (name: string, serviceName: string, eventType: string) { + if (eventType === 'CREATED') { + listenerFunc(name, serviceName, 'created'); + } else if (eventType === 'DESTROYED') { + listenerFunc(name, serviceName, 'destroyed'); + } + }; + ClientAddDistributedObjectListenerCodec.handle(clientMessage, converterFunc, null); + }; + const codec = this.createDistributedObjectListener(); + return this.client.getListenerService().registerListener(codec, handler); + } + + removeDistributedObjectListener(listenerId: string) { + return this.client.getListenerService().deregisterListener(listenerId); + } + + protected isRetryable(error: HazelcastError): boolean { + if (error instanceof ClientNotActiveError) { + return false; + } + return true; + } + private createProxy(proxyObject: DistributedObject): Promise { - let promise = Promise.defer(); + const promise = Promise.defer(); this.initializeProxy(proxyObject, promise, Date.now() + this.invocationTimeoutMillis); return promise.promise; } private findNextAddress(): Address { - let members = this.client.getClusterService().getMembers(); + const members = this.client.getClusterService().getMembers(); let liteMember: Member = null; - for (let i = 0; i < members.length; i++) { - let currentMember = members[i]; - if (currentMember != null && currentMember.isLiteMember === false) { - return currentMember.address; - } else if (currentMember != null && currentMember.isLiteMember) { - liteMember = currentMember; + for (const member of members) { + if (member != null && member.isLiteMember === false) { + return member.address; + } else if (member != null && member.isLiteMember) { + liteMember = member; } } @@ -132,9 +164,9 @@ export class ProxyManager { private initializeProxy(proxyObject: DistributedObject, promise: Promise.Resolver, deadline: number): void { if (Date.now() <= deadline) { - let address: Address = this.findNextAddress(); - let request = ClientCreateProxyCodec.encodeRequest(proxyObject.getName(), proxyObject.getServiceName(), address); - let invocation = new Invocation(this.client, request); + const address: Address = this.findNextAddress(); + const request = ClientCreateProxyCodec.encodeRequest(proxyObject.getName(), proxyObject.getServiceName(), address); + const invocation = new Invocation(this.client, request); invocation.address = address; this.client.getInvocationService().invoke(invocation).then((response) => { promise.resolve(response); @@ -152,50 +184,17 @@ export class ProxyManager { } } - protected isRetryable(error: HazelcastError): boolean { - if (error instanceof ClientNotActiveError) { - return false; - } - return true; - } - - destroyProxy(name: string, serviceName: string): Promise { - delete this.proxies[name]; - let clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); - clientMessage.setPartitionId(-1); - return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).return(); - } - - addDistributedObjectListener(listenerFunc: Function): Promise { - let handler = function (clientMessage: ClientMessage) { - let converterFunc = function (name: string, serviceName: string, eventType: string) { - if (eventType === 'CREATED') { - listenerFunc(name, serviceName, 'created'); - } else if (eventType === 'DESTROYED') { - listenerFunc(name, serviceName, 'destroyed'); - } - }; - ClientAddDistributedObjectListenerCodec.handle(clientMessage, converterFunc, null); - }; - let codec = this.createDistributedObjectListener(); - return this.client.getListenerService().registerListener(codec, handler); - } - - removeDistributedObjectListener(listenerId: string) { - return this.client.getListenerService().deregisterListener(listenerId); - } - private createDistributedObjectListener(): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return ClientAddDistributedObjectListenerCodec.encodeRequest(localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return ClientAddDistributedObjectListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return ClientRemoveDistributedObjectListenerCodec.encodeRequest(listenerId); - } + }, }; } } diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index 63669f9de..cd6b8788f 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -14,39 +14,39 @@ * limitations under the License. */ -import {IQueue} from './IQueue'; -import {ItemEventType, ItemListener} from '../core/ItemListener'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {QueueSizeCodec} from '../codec/QueueSizeCodec'; -import {QueueOfferCodec} from '../codec/QueueOfferCodec'; -import {QueuePeekCodec} from '../codec/QueuePeekCodec'; import * as Promise from 'bluebird'; -import {QueuePollCodec} from '../codec/QueuePollCodec'; -import {QueueRemainingCapacityCodec} from '../codec/QueueRemainingCapacityCodec'; -import {QueueRemoveCodec} from '../codec/QueueRemoveCodec'; -import {QueueContainsCodec} from '../codec/QueueContainsCodec'; -import {QueueIteratorCodec} from '../codec/QueueIteratorCodec'; -import {Data} from '../serialization/Data'; +import {QueueAddAllCodec} from '../codec/QueueAddAllCodec'; +import {QueueAddListenerCodec} from '../codec/QueueAddListenerCodec'; import {QueueClearCodec} from '../codec/QueueClearCodec'; +import {QueueCompareAndRemoveAllCodec} from '../codec/QueueCompareAndRemoveAllCodec'; +import {QueueCompareAndRetainAllCodec} from '../codec/QueueCompareAndRetainAllCodec'; +import {QueueContainsAllCodec} from '../codec/QueueContainsAllCodec'; +import {QueueContainsCodec} from '../codec/QueueContainsCodec'; import {QueueDrainToCodec} from '../codec/QueueDrainToCodec'; import {QueueDrainToMaxSizeCodec} from '../codec/QueueDrainToMaxSizeCodec'; import {QueueIsEmptyCodec} from '../codec/QueueIsEmptyCodec'; -import {QueueTakeCodec} from '../codec/QueueTakeCodec'; -import {QueueAddAllCodec} from '../codec/QueueAddAllCodec'; -import {QueueContainsAllCodec} from '../codec/QueueContainsAllCodec'; +import {QueueIteratorCodec} from '../codec/QueueIteratorCodec'; +import {QueueOfferCodec} from '../codec/QueueOfferCodec'; +import {QueuePeekCodec} from '../codec/QueuePeekCodec'; +import {QueuePollCodec} from '../codec/QueuePollCodec'; import {QueuePutCodec} from '../codec/QueuePutCodec'; -import {QueueCompareAndRemoveAllCodec} from '../codec/QueueCompareAndRemoveAllCodec'; -import {QueueCompareAndRetainAllCodec} from '../codec/QueueCompareAndRetainAllCodec'; -import {QueueAddListenerCodec} from '../codec/QueueAddListenerCodec'; +import {QueueRemainingCapacityCodec} from '../codec/QueueRemainingCapacityCodec'; +import {QueueRemoveCodec} from '../codec/QueueRemoveCodec'; import {QueueRemoveListenerCodec} from '../codec/QueueRemoveListenerCodec'; +import {QueueSizeCodec} from '../codec/QueueSizeCodec'; +import {QueueTakeCodec} from '../codec/QueueTakeCodec'; +import {ItemEventType, ItemListener} from '../core/ItemListener'; import {IllegalStateError} from '../HazelcastError'; -import ClientMessage = require('../ClientMessage'); import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {Data} from '../serialization/Data'; +import {IQueue} from './IQueue'; +import {PartitionSpecificProxy} from './PartitionSpecificProxy'; +import ClientMessage = require('../ClientMessage'); export class QueueProxy extends PartitionSpecificProxy implements IQueue { add(item: E): Promise { - return this.offer(item).then(function(ret) { + return this.offer(item).then(function (ret) { if (ret) { return true; } else { @@ -56,18 +56,18 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } addAll(items: E[]): Promise { - var rawList: Data[] = []; - var toData = this.toData.bind(this); - items.forEach(function(item) { + const rawList: Data[] = []; + const toData = this.toData.bind(this); + items.forEach(function (item) { rawList.push(toData(item)); }); return this.encodeInvoke(QueueAddAllCodec, rawList); } addItemListener(listener: ItemListener, includeValue: boolean): Promise { - var handler = (message: ClientMessage) => { + const handler = (message: ClientMessage) => { QueueAddListenerCodec.handle(message, (item: Data, uuid: string, eventType: number) => { - var responseObject: E; + let responseObject: E; if (item == null) { responseObject = null; } else { @@ -80,7 +80,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } }); }; - let codec = this.createEntryListener(this.name, includeValue); + const codec = this.createEntryListener(this.name, includeValue); return this.client.getListenerService().registerListener(codec, handler); } @@ -89,25 +89,25 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } contains(item: E): Promise { - var itemData = this.toData(item); + const itemData = this.toData(item); return this.encodeInvoke(QueueContainsCodec, itemData); } containsAll(items: E[]): Promise { - var toData = this.toData.bind(this); - var rawItems: Data[] = items.map(toData); + const toData = this.toData.bind(this); + const rawItems: Data[] = items.map(toData); return this.encodeInvoke(QueueContainsAllCodec, rawItems); } drainTo(arr: E[], maxElements: number = null): Promise { - var toObject = this.toObject.bind(this); - var promise: Promise; + const toObject = this.toObject.bind(this); + let promise: Promise; if (maxElements === null) { promise = this.encodeInvoke(QueueDrainToCodec); } else { promise = this.encodeInvoke(QueueDrainToMaxSizeCodec, maxElements); } - return promise.then(function(rawArr: Data[]) { + return promise.then(function (rawArr: Data[]) { rawArr.forEach(function (rawItem) { arr.push(toObject(rawItem)); }); @@ -120,7 +120,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } offer(item: E, time: number = 0): Promise { - var itemData = this.toData(item); + const itemData = this.toData(item); return this.encodeInvoke(QueueOfferCodec, itemData, time); } @@ -133,7 +133,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } put(item: E): Promise { - var itemData = this.toData(item); + const itemData = this.toData(item); return this.encodeInvoke(QueuePutCodec, itemData); } @@ -142,13 +142,13 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } remove(item: E): Promise { - var itemData = this.toData(item); + const itemData = this.toData(item); return this.encodeInvoke(QueueRemoveCodec, itemData); } removeAll(items: E[]): Promise { - var toData = this.toData.bind(this); - var rawItems = items.map(toData); + const toData = this.toData.bind(this); + const rawItems = items.map(toData); return this.encodeInvoke(QueueCompareAndRemoveAllCodec, rawItems); } @@ -157,8 +157,8 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } retainAll(items: E[]): Promise { - var toData = this.toData.bind(this); - var rawItems = items.map(toData); + const toData = this.toData.bind(this); + const rawItems = items.map(toData); return this.encodeInvoke(QueueCompareAndRetainAllCodec, rawItems); } @@ -171,10 +171,10 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } toArray(): Promise { - var arr: E[] = []; - var toObject = this.toObject.bind(this); - return this.encodeInvoke(QueueIteratorCodec).then(function(dataArray) { - dataArray.forEach(function(data) { + const arr: E[] = []; + const toObject = this.toObject.bind(this); + return this.encodeInvoke(QueueIteratorCodec).then(function (dataArray) { + dataArray.forEach(function (data) { arr.push(toObject(data)); }); return arr; @@ -183,15 +183,15 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { private createEntryListener(name: string, includeValue: boolean): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return QueueAddListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return QueueAddListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return QueueRemoveListenerCodec.encodeRequest(name, listenerId); - } + }, }; } } diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index 3d6685bd0..516dff9ed 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -15,46 +15,46 @@ */ import * as Promise from 'bluebird'; -import {IReplicatedMap} from './IReplicatedMap'; -import {assertNotNull} from '../Util'; -import {Data} from '../serialization/Data'; -import {ReplicatedMapPutCodec} from '../codec/ReplicatedMapPutCodec'; +import {ReplicatedMapAddEntryListenerCodec} from '../codec/ReplicatedMapAddEntryListenerCodec'; +import {ReplicatedMapAddEntryListenerToKeyCodec} from '../codec/ReplicatedMapAddEntryListenerToKeyCodec'; +/* tslint:disable:max-line-length */ +import {ReplicatedMapAddEntryListenerToKeyWithPredicateCodec} from '../codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec'; +import {ReplicatedMapAddEntryListenerWithPredicateCodec} from '../codec/ReplicatedMapAddEntryListenerWithPredicateCodec'; import {ReplicatedMapClearCodec} from '../codec/ReplicatedMapClearCodec'; -import {ReplicatedMapGetCodec} from '../codec/ReplicatedMapGetCodec'; import {ReplicatedMapContainsKeyCodec} from '../codec/ReplicatedMapContainsKeyCodec'; import {ReplicatedMapContainsValueCodec} from '../codec/ReplicatedMapContainsValueCodec'; -import {ReplicatedMapSizeCodec} from '../codec/ReplicatedMapSizeCodec'; +import {ReplicatedMapEntrySetCodec} from '../codec/ReplicatedMapEntrySetCodec'; +import {ReplicatedMapGetCodec} from '../codec/ReplicatedMapGetCodec'; import {ReplicatedMapIsEmptyCodec} from '../codec/ReplicatedMapIsEmptyCodec'; -import {ReplicatedMapRemoveCodec} from '../codec/ReplicatedMapRemoveCodec'; -import {ReplicatedMapPutAllCodec} from '../codec/ReplicatedMapPutAllCodec'; import {ReplicatedMapKeySetCodec} from '../codec/ReplicatedMapKeySetCodec'; -import {ReplicatedMapValuesCodec} from '../codec/ReplicatedMapValuesCodec'; -import {ReplicatedMapEntrySetCodec} from '../codec/ReplicatedMapEntrySetCodec'; -import {Predicate} from '../core/Predicate'; -import {IMapListener} from '../core/MapListener'; +import {ReplicatedMapPutAllCodec} from '../codec/ReplicatedMapPutAllCodec'; +import {ReplicatedMapPutCodec} from '../codec/ReplicatedMapPutCodec'; +import {ReplicatedMapRemoveCodec} from '../codec/ReplicatedMapRemoveCodec'; import {ReplicatedMapRemoveEntryListenerCodec} from '../codec/ReplicatedMapRemoveEntryListenerCodec'; +import {ReplicatedMapSizeCodec} from '../codec/ReplicatedMapSizeCodec'; +import {ReplicatedMapValuesCodec} from '../codec/ReplicatedMapValuesCodec'; import {EntryEventType} from '../core/EntryEventType'; -import ClientMessage = require('../ClientMessage'); -/* tslint:disable:max-line-length */ -import {ReplicatedMapAddEntryListenerToKeyWithPredicateCodec} from '../codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec'; -import {ReplicatedMapAddEntryListenerToKeyCodec} from '../codec/ReplicatedMapAddEntryListenerToKeyCodec'; -import {ReplicatedMapAddEntryListenerWithPredicateCodec} from '../codec/ReplicatedMapAddEntryListenerWithPredicateCodec'; -import {ReplicatedMapAddEntryListenerCodec} from '../codec/ReplicatedMapAddEntryListenerCodec'; +import {IMapListener} from '../core/MapListener'; +import {Predicate} from '../core/Predicate'; +import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {Data} from '../serialization/Data'; +import {assertNotNull} from '../Util'; +import {ArrayComparator} from '../util/ArrayComparator'; +import {IReplicatedMap} from './IReplicatedMap'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; /* tslint:enable:max-line-length */ import Long = require('long'); -import {ArrayComparator} from '../util/ArrayComparator'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; +import ClientMessage = require('../ClientMessage'); export class ReplicatedMapProxy extends PartitionSpecificProxy implements IReplicatedMap { - put(key: K, value: V, ttl: Long|number = 0): Promise { + put(key: K, value: V, ttl: Long | number = 0): Promise { assertNotNull(key); assertNotNull(value); - let valueData: Data = this.toData(value); - let keyData: Data = this.toData(key); + const valueData: Data = this.toData(value); + const keyData: Data = this.toData(key); return this.encodeInvokeOnKey(ReplicatedMapPutCodec, keyData, keyData, valueData, ttl); } @@ -88,7 +88,6 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements return this.encodeInvoke(ReplicatedMapSizeCodec); } - isEmpty(): Promise { return this.encodeInvoke(ReplicatedMapIsEmptyCodec); } @@ -100,14 +99,14 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements return this.encodeInvokeOnKey(ReplicatedMapRemoveCodec, keyData, keyData); } - putAll(pairs: [K, V][]): Promise { + putAll(pairs: Array<[K, V]>): Promise { let pair: [K, V]; let pairId: string; - const entries: [Data, Data][] = []; + const entries: Array<[Data, Data]> = []; for (pairId in pairs) { pair = pairs[pairId]; - let keyData = this.toData(pair[0]); - let valueData = this.toData(pair[1]); + const keyData = this.toData(pair[0]); + const valueData = this.toData(pair[1]); entries.push([keyData, valueData]); } @@ -125,17 +124,17 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements const toObject = this.toObject.bind(this); return this.encodeInvoke(ReplicatedMapValuesCodec).then((valuesData: Data[]) => { if (comparator) { - let desValues = valuesData.map(toObject); + const desValues = valuesData.map(toObject); return new ReadOnlyLazyList(desValues.sort(comparator), this.client.getSerializationService()); } return new ReadOnlyLazyList(valuesData, this.client.getSerializationService()); }); } - entrySet(): Promise<[K, V][]> { + entrySet(): Promise> { const toObject = this.toObject.bind(this); - return this.encodeInvoke(ReplicatedMapEntrySetCodec).then(function (entrySet: [Data, Data][]) { - return entrySet.map<[K, V]>(entry => [toObject(entry[0]), toObject(entry[1])]); + return this.encodeInvoke(ReplicatedMapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>) { + return entrySet.map<[K, V]>((entry) => [toObject(entry[0]), toObject(entry[1])]); }); } @@ -162,19 +161,20 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements private addEntryListenerInternal(listener: IMapListener, predicate: Predicate, key: K): Promise { const toObject = this.toObject.bind(this); + /* tslint:disable-next-line:no-shadowed-variable */ const entryEventHandler = function (key: K, val: V, oldVal: V, mergingVal: V, event: number, uuid: string, numberOfAffectedEntries: number) { let eventParams: any[] = [key, oldVal, val, mergingVal, numberOfAffectedEntries, uuid]; eventParams = eventParams.map(toObject); - let eventToListenerMap: {[key: number]: string} = { + const eventToListenerMap: { [key: number]: string } = { [EntryEventType.ADDED]: 'added', [EntryEventType.REMOVED]: 'removed', [EntryEventType.UPDATED]: 'updated', [EntryEventType.EVICTED]: 'evicted', - [EntryEventType.CLEAR_ALL]: 'clearedAll' + [EntryEventType.CLEAR_ALL]: 'clearedAll', }; - let eventMethod = eventToListenerMap[event]; + const eventMethod = eventToListenerMap[event]; if (listener.hasOwnProperty(eventMethod)) { listener[eventMethod].apply(null, eventParams); } @@ -182,16 +182,16 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements let listenerHandler: Function; let codec: ListenerMessageCodec; if (key && predicate) { - let keyData = this.toData(key); - let predicateData = this.toData(predicate); + const keyData = this.toData(key); + const predicateData = this.toData(predicate); codec = this.createEntryListenerToKeyWithPredicate(this.name, keyData, predicateData); listenerHandler = ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.handle; } else if (key && !predicate) { - let keyData = this.toData(key); + const keyData = this.toData(key); codec = this.createEntryListenerToKey(this.name, keyData); listenerHandler = ReplicatedMapAddEntryListenerToKeyCodec.handle; } else if (!key && predicate) { - let predicateData = this.toData(predicate); + const predicateData = this.toData(predicate); codec = this.createEntryListenerWithPredicate(this.name, predicateData); listenerHandler = ReplicatedMapAddEntryListenerWithPredicateCodec.handle; } else { @@ -199,64 +199,65 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements listenerHandler = ReplicatedMapAddEntryListenerCodec.handle; } return this.client.getListenerService().registerListener(codec, - (m: ClientMessage) => {listenerHandler(m, entryEventHandler, toObject); }); + (m: ClientMessage) => { + listenerHandler(m, entryEventHandler, toObject); + }); } private createEntryListener(name: string): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return ReplicatedMapAddEntryListenerCodec.encodeRequest(name, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return ReplicatedMapAddEntryListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } private createEntryListenerToKey(name: string, keyData: Data): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return ReplicatedMapAddEntryListenerToKeyCodec.encodeRequest(name, keyData, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return ReplicatedMapAddEntryListenerToKeyCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } private createEntryListenerWithPredicate(name: string, predicateData: Data): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return ReplicatedMapAddEntryListenerWithPredicateCodec.encodeRequest(name, predicateData, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return ReplicatedMapAddEntryListenerWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } - private createEntryListenerToKeyWithPredicate(name: string, keyData: Data, predicateData: Data): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.encodeRequest(name, keyData, predicateData, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - } + }, }; } } diff --git a/src/proxy/SemaphoreProxy.ts b/src/proxy/SemaphoreProxy.ts index 78b4bad2c..a36312adb 100644 --- a/src/proxy/SemaphoreProxy.ts +++ b/src/proxy/SemaphoreProxy.ts @@ -14,17 +14,17 @@ * limitations under the License. */ -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {ISemaphore} from './ISemaphore'; import * as Promise from 'bluebird'; -import {assertNotNegative} from '../Util'; -import {SemaphoreInitCodec} from '../codec/SemaphoreInitCodec'; import {SemaphoreAcquireCodec} from '../codec/SemaphoreAcquireCodec'; import {SemaphoreAvailablePermitsCodec} from '../codec/SemaphoreAvailablePermitsCodec'; import {SemaphoreDrainPermitsCodec} from '../codec/SemaphoreDrainPermitsCodec'; +import {SemaphoreInitCodec} from '../codec/SemaphoreInitCodec'; import {SemaphoreReducePermitsCodec} from '../codec/SemaphoreReducePermitsCodec'; import {SemaphoreReleaseCodec} from '../codec/SemaphoreReleaseCodec'; import {SemaphoreTryAcquireCodec} from '../codec/SemaphoreTryAcquireCodec'; +import {assertNotNegative} from '../Util'; +import {ISemaphore} from './ISemaphore'; +import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import Long = require('long'); export class SemaphoreProxy extends PartitionSpecificProxy implements ISemaphore { diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index 0d36c51a3..bb199685a 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -14,27 +14,26 @@ * limitations under the License. */ -import {ISet} from './ISet'; import * as Promise from 'bluebird'; -import {ItemListener} from '../core/ItemListener'; -import {Data} from '../serialization/Data'; - -import {SetAddCodec} from '../codec/SetAddCodec'; import {SetAddAllCodec} from '../codec/SetAddAllCodec'; -import {SetGetAllCodec} from '../codec/SetGetAllCodec'; +import {SetAddCodec} from '../codec/SetAddCodec'; +import {SetAddListenerCodec} from '../codec/SetAddListenerCodec'; import {SetClearCodec} from '../codec/SetClearCodec'; -import {SetContainsCodec} from '../codec/SetContainsCodec'; +import {SetCompareAndRemoveAllCodec} from '../codec/SetCompareAndRemoveAllCodec'; +import {SetCompareAndRetainAllCodec} from '../codec/SetCompareAndRetainAllCodec'; import {SetContainsAllCodec} from '../codec/SetContainsAllCodec'; +import {SetContainsCodec} from '../codec/SetContainsCodec'; +import {SetGetAllCodec} from '../codec/SetGetAllCodec'; import {SetIsEmptyCodec} from '../codec/SetIsEmptyCodec'; import {SetRemoveCodec} from '../codec/SetRemoveCodec'; -import {SetCompareAndRemoveAllCodec} from '../codec/SetCompareAndRemoveAllCodec'; -import {SetCompareAndRetainAllCodec} from '../codec/SetCompareAndRetainAllCodec'; -import {SetSizeCodec} from '../codec/SetSizeCodec'; -import {SetAddListenerCodec} from '../codec/SetAddListenerCodec'; import {SetRemoveListenerCodec} from '../codec/SetRemoveListenerCodec'; -import ClientMessage = require('../ClientMessage'); -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; +import {SetSizeCodec} from '../codec/SetSizeCodec'; +import {ItemListener} from '../core/ItemListener'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {Data} from '../serialization/Data'; +import {ISet} from './ISet'; +import {PartitionSpecificProxy} from './PartitionSpecificProxy'; +import ClientMessage = require('../ClientMessage'); export class SetProxy extends PartitionSpecificProxy implements ISet { @@ -47,7 +46,7 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { } toArray(): Promise { - return this.encodeInvoke(SetGetAllCodec).then((items: Array) => { + return this.encodeInvoke(SetGetAllCodec).then((items: Data[]) => { return items.map((item) => { return this.toObject(item); }); @@ -87,10 +86,10 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { } addItemListener(listener: ItemListener, includeValue: boolean = true): Promise { - var handler = (message: ClientMessage) => { + const handler = (message: ClientMessage) => { SetAddListenerCodec.handle(message, (item: Data, uuid: string, eventType: number) => { - var responseObject = this.toObject(item); - var listenerFunction: Function; + const responseObject = this.toObject(item); + let listenerFunction: Function; if (eventType === 1) { listenerFunction = listener.itemAdded; } else if (eventType === 2) { @@ -102,7 +101,7 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { } }); }; - let codec = this.createEntryListener(this.name, includeValue); + const codec = this.createEntryListener(this.name, includeValue); return this.client.getListenerService().registerListener(codec, handler); } @@ -110,7 +109,7 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { return this.client.getListenerService().deregisterListener(registrationId); } - private serializeList(input: Array): Array { + private serializeList(input: any[]): Data[] { return input.map((each) => { return this.toData(each); }); @@ -118,15 +117,15 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { private createEntryListener(name: string, includeValue: boolean): ListenerMessageCodec { return { - encodeAddRequest: function(localOnly: boolean): ClientMessage { + encodeAddRequest(localOnly: boolean): ClientMessage { return SetAddListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse: function(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): string { return SetAddListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest: function(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: string): ClientMessage { return SetRemoveListenerCodec.encodeRequest(name, listenerId); - } + }, }; } } diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index 9b4e5736a..32875294c 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -14,9 +14,9 @@ * limitations under the License. */ +import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import * as Long from 'long'; -import * as Promise from 'bluebird'; export class Batch { private nextIdLong: Long; @@ -47,7 +47,7 @@ export class Batch { if (this.firstInvalidId.equals(this.nextIdLong)) { return undefined; } - let returnLong = this.nextIdLong; + const returnLong = this.nextIdLong; this.nextIdLong = this.nextIdLong.add(this.increment); return returnLong; } @@ -84,6 +84,13 @@ export class AutoBatcher { this.queue.splice(0, ind); } + nextId(): Promise { + const deferred = Promise.defer(); + this.queue.push(deferred); + this.processIdRequests(); + return deferred.promise; + } + private assignNewBatch(): void { if (this.requestInFlight) { return; @@ -105,11 +112,4 @@ export class AutoBatcher { }); this.queue = []; } - - nextId(): Promise { - let deferred = Promise.defer(); - this.queue.push(deferred); - this.processIdRequests(); - return deferred.promise; - } } diff --git a/src/proxy/ringbuffer/LazyReadResultSet.ts b/src/proxy/ringbuffer/LazyReadResultSet.ts index 96968178e..b6586a4b8 100644 --- a/src/proxy/ringbuffer/LazyReadResultSet.ts +++ b/src/proxy/ringbuffer/LazyReadResultSet.ts @@ -14,19 +14,19 @@ * limitations under the License. */ -import {ReadResultSet} from './ReadResultSet'; -import {SerializationService, SerializationServiceV1} from '../../serialization/SerializationService'; -import {Data} from '../../serialization/Data'; import * as Long from 'long'; import {UnsupportedOperationError} from '../../HazelcastError'; +import {Data} from '../../serialization/Data'; +import {SerializationService, SerializationServiceV1} from '../../serialization/SerializationService'; +import {ReadResultSet} from './ReadResultSet'; export class LazyReadResultSet implements ReadResultSet { private readCount: number; - private items: Array; - private itemSeqs: Array; + private items: any[]; + private itemSeqs: Long[]; private serializationService: SerializationService; - constructor(serializationService: SerializationService, readCount: number, items: Array, itemSeqs: Array) { + constructor(serializationService: SerializationService, readCount: number, items: Data[], itemSeqs: Long[]) { this.serializationService = serializationService; this.readCount = readCount; this.items = items; @@ -38,12 +38,12 @@ export class LazyReadResultSet implements ReadResultSet { } get(index: number): T { - let dataOrObject = this.items[index]; + const dataOrObject = this.items[index]; if (dataOrObject == null) { return undefined; } - if ((this.serializationService).isData(dataOrObject)) { - let obj = this.serializationService.toObject(dataOrObject); + if ((this.serializationService as SerializationServiceV1).isData(dataOrObject)) { + const obj = this.serializationService.toObject(dataOrObject); this.items[index] = obj; return obj; } else { diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index 7ebfc15b1..71484131e 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -15,21 +15,21 @@ */ import * as Promise from 'bluebird'; -import {PartitionSpecificProxy} from '../PartitionSpecificProxy'; -import {IRingbuffer} from '../IRingbuffer'; -import {OverflowPolicy} from '../../core/OverflowPolicy'; -import {RingbufferAddCodec} from '../../codec/RingbufferAddCodec'; -import {RingbufferReadOneCodec} from '../../codec/RingbufferReadOneCodec'; import {RingbufferAddAllCodec} from '../../codec/RingbufferAddAllCodec'; -import {RingbufferTailSequenceCodec} from '../../codec/RingbufferTailSequenceCodec'; +import {RingbufferAddCodec} from '../../codec/RingbufferAddCodec'; +import {RingbufferCapacityCodec} from '../../codec/RingbufferCapacityCodec'; import {RingbufferHeadSequenceCodec} from '../../codec/RingbufferHeadSequenceCodec'; +import {RingbufferReadManyCodec} from '../../codec/RingbufferReadManyCodec'; +import {RingbufferReadOneCodec} from '../../codec/RingbufferReadOneCodec'; import {RingbufferRemainingCapacityCodec} from '../../codec/RingbufferRemainingCapacityCodec'; import {RingbufferSizeCodec} from '../../codec/RingbufferSizeCodec'; -import {RingbufferCapacityCodec} from '../../codec/RingbufferCapacityCodec'; -import {RingbufferReadManyCodec} from '../../codec/RingbufferReadManyCodec'; -import Long = require('long'); -import {ReadResultSet} from './ReadResultSet'; +import {RingbufferTailSequenceCodec} from '../../codec/RingbufferTailSequenceCodec'; +import {OverflowPolicy} from '../../core/OverflowPolicy'; +import {IRingbuffer} from '../IRingbuffer'; +import {PartitionSpecificProxy} from '../PartitionSpecificProxy'; import {LazyReadResultSet} from './LazyReadResultSet'; +import {ReadResultSet} from './ReadResultSet'; +import Long = require('long'); export class RingbufferProxy extends PartitionSpecificProxy implements IRingbuffer { @@ -57,15 +57,15 @@ export class RingbufferProxy extends PartitionSpecificProxy implements IRingb return this.encodeInvoke(RingbufferAddCodec, overflowPolicy, this.toData(item)); } - addAll(items: Array, overflowPolicy: OverflowPolicy = OverflowPolicy.OVERWRITE): Promise { - let dataList = items.map((item) => { + addAll(items: E[], overflowPolicy: OverflowPolicy = OverflowPolicy.OVERWRITE): Promise { + const dataList = items.map((item) => { return this.toData(item); }); return this.encodeInvoke(RingbufferAddAllCodec, dataList, overflowPolicy); } - readOne(sequence: number|Long): Promise { + readOne(sequence: number | Long): Promise { if (Long.fromValue(sequence).lessThan(0)) { throw new RangeError('Sequence number should not be less than zero, was: ' + sequence); } @@ -73,7 +73,7 @@ export class RingbufferProxy extends PartitionSpecificProxy implements IRingb return this.encodeInvoke(RingbufferReadOneCodec, sequence); } - readMany(sequence: number|Long, minCount: number, maxCount: number, filter: any = null): Promise> { + readMany(sequence: number | Long, minCount: number, maxCount: number, filter: any = null): Promise> { if (Long.fromValue(sequence).lessThan(0)) { throw new RangeError('Sequence number should not be less than zero, was: ' + sequence); diff --git a/src/proxy/topic/ITopic.ts b/src/proxy/topic/ITopic.ts index 17d93bf32..0f93fe692 100644 --- a/src/proxy/topic/ITopic.ts +++ b/src/proxy/topic/ITopic.ts @@ -14,12 +14,14 @@ * limitations under the License. */ -import {TopicMessageListener} from './TopicMessageListener'; import * as Promise from 'bluebird'; import {DistributedObject} from '../../DistributedObject'; +import {TopicMessageListener} from './TopicMessageListener'; export interface ITopic extends DistributedObject { addMessageListener(listener: TopicMessageListener): string; + removeMessageListener(id: string): boolean; + publish(message: E): Promise; } diff --git a/src/proxy/topic/RawTopicMessage.ts b/src/proxy/topic/RawTopicMessage.ts index e41732cb1..ef32cfee7 100644 --- a/src/proxy/topic/RawTopicMessage.ts +++ b/src/proxy/topic/RawTopicMessage.ts @@ -14,10 +14,10 @@ * limitations under the License. */ +import * as Long from 'long'; +import {Data, DataInput, DataOutput} from '../../serialization/Data'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../../serialization/Serializable'; -import {DataInput, DataOutput, Data} from '../../serialization/Data'; import Address = require('../../Address'); -import * as Long from 'long'; export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -18; export const RELIABLE_TOPIC_CLASS_ID = 2; diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index b4724f041..a27dce38c 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -14,29 +14,28 @@ * limitations under the License. */ -import {TopicMessageListener} from './TopicMessageListener'; +import {ReadResultSet} from '../../'; +import {StaleSequenceError} from '../../HazelcastError'; +import {LoggingService} from '../../logging/LoggingService'; +import {SerializationService} from '../../serialization/SerializationService'; import {IRingbuffer} from '../IRingbuffer'; import {RawTopicMessage} from './RawTopicMessage'; -import {SerializationService} from '../../serialization/SerializationService'; import {ReliableTopicProxy} from './ReliableTopicProxy'; -import {LoggingService} from '../../logging/LoggingService'; import {TopicMessage} from './TopicMessage'; -import {StaleSequenceError} from '../../HazelcastError'; -import {ReadResultSet} from '../../'; +import {TopicMessageListener} from './TopicMessageListener'; export class ReliableTopicListenerRunner { + public sequenceNumber: number = 0; private listener: TopicMessageListener; private ringbuffer: IRingbuffer; private batchSize: number; - public sequenceNumber: number = 0; private serializationService: SerializationService; private cancelled: boolean = false; private loggingService = LoggingService.getLoggingService(); private proxy: ReliableTopicProxy; private listenerId: string; - constructor(listenerId: string, listener: TopicMessageListener, ringbuffer: IRingbuffer, batchSize: number, serializationService: SerializationService, proxy: ReliableTopicProxy) { this.listenerId = listenerId; @@ -56,8 +55,8 @@ export class ReliableTopicListenerRunner { this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize).then((result: ReadResultSet) => { if (!this.cancelled) { for (let i = 0; i < result.size(); i++) { - let msg = new TopicMessage(); - let item = result.get(i); + const msg = new TopicMessage(); + const item = result.get(i); msg.messageObject = this.serializationService.toObject(item.payload); msg.publisher = item.publisherAddress; msg.publishingTime = item.publishTime; @@ -67,12 +66,13 @@ export class ReliableTopicListenerRunner { setImmediate(this.next.bind(this)); } }).catch((e) => { + let message: string; if (e instanceof StaleSequenceError) { this.ringbuffer.headSequence().then((seq: Long) => { - var newSequence = seq.toNumber(); + const newSequence = seq.toNumber(); - var message = 'Topic "' + this.proxy.getName() + '" ran into a stale sequence. ' + - ' Jumping from old sequence ' + this.sequenceNumber + ' to new sequence ' + newSequence; + message = 'Topic "' + this.proxy.getName() + '" ran into a stale sequence. ' + + ' Jumping from old sequence ' + this.sequenceNumber + ' to new sequence ' + newSequence; this.loggingService.warn('ReliableTopicListenerRunner', message); this.sequenceNumber = newSequence; @@ -82,7 +82,7 @@ export class ReliableTopicListenerRunner { return; } - let message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; + message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; this.loggingService.warn('ReliableTopicListenerRunner', message); this.proxy.removeMessageListener(this.listenerId); diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 5e187356a..e8a260c6f 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -15,21 +15,20 @@ */ import * as Promise from 'bluebird'; -import {ITopic} from './ITopic'; -import {TopicMessageListener} from './TopicMessageListener'; +import {OverflowPolicy} from '../../core/OverflowPolicy'; import HazelcastClient from '../../HazelcastClient'; -import {IRingbuffer} from '../IRingbuffer'; +import {TopicOverloadError} from '../../HazelcastError'; import {Address} from '../../index'; +import {SerializationService} from '../../serialization/SerializationService'; import {UuidUtil} from '../../util/UuidUtil'; -import {ReliableTopicListenerRunner} from './ReliableTopicListenerRunner'; -import {ReliableTopicConfig} from '../../config/ReliableTopicConfig'; +import {BaseProxy} from '../BaseProxy'; +import {IRingbuffer} from '../IRingbuffer'; +import {ITopic} from './ITopic'; import {RawTopicMessage} from './RawTopicMessage'; -import {SerializationService} from '../../serialization/SerializationService'; -import {OverflowPolicy} from '../../core/OverflowPolicy'; +import {ReliableTopicListenerRunner} from './ReliableTopicListenerRunner'; +import {TopicMessageListener} from './TopicMessageListener'; import {TopicOverloadPolicy} from './TopicOverloadPolicy'; -import {TopicOverloadError} from '../../HazelcastError'; import Long = require('long'); -import {BaseProxy} from '../BaseProxy'; export const RINGBUFFER_PREFIX = '_hz_rb_'; export const TOPIC_INITIAL_BACKOFF = 100; @@ -39,7 +38,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { private ringbuffer: IRingbuffer; private localAddress: Address; private batchSize: number; - private runners: {[key: string]: ReliableTopicListenerRunner} = {}; + private runners: { [key: string]: ReliableTopicListenerRunner } = {}; private serializationService: SerializationService; private overloadPolicy: TopicOverloadPolicy; @@ -47,7 +46,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { super(client, serviceName, name); this.ringbuffer = client.getRingbuffer(RINGBUFFER_PREFIX + name); this.localAddress = client.getClusterService().getClientInfo().localAddress; - let config = client.getConfig().getReliableTopicConfig(name); + const config = client.getConfig().getReliableTopicConfig(name); this.batchSize = config.readBatchSize; this.overloadPolicy = config.overloadPolicy; this.serializationService = client.getSerializationService(); @@ -55,9 +54,9 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } addMessageListener(listener: TopicMessageListener): string { - var listenerId = UuidUtil.generate().toString(); + const listenerId = UuidUtil.generate().toString(); - var runner = new ReliableTopicListenerRunner(listenerId, listener, this.ringbuffer, + const runner = new ReliableTopicListenerRunner(listenerId, listener, this.ringbuffer, this.batchSize, this.serializationService, this); this.runners[listenerId] = runner; @@ -70,9 +69,8 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { return listenerId; } - removeMessageListener(id: string): boolean { - var runner = this.runners[id]; + const runner = this.runners[id]; if (!runner) { return false; @@ -86,7 +84,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } publish(message: E): Promise { - var reliableTopicMessage = new RawTopicMessage(); + const reliableTopicMessage = new RawTopicMessage(); reliableTopicMessage.payload = this.serializationService.toData(message); reliableTopicMessage.publishTime = Long.fromNumber(new Date().getTime()); reliableTopicMessage.publisherAddress = this.localAddress; @@ -105,6 +103,19 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } } + public getRingbuffer(): IRingbuffer { + return this.ringbuffer; + } + + destroy(): Promise { + for (const k in this.runners) { + const runner = this.runners[k]; + runner.cancel(); + } + + return this.ringbuffer.destroy(); + } + private addOrDiscard(reliableTopicMessage: RawTopicMessage): Promise { return this.ringbuffer.add(reliableTopicMessage, OverflowPolicy.FAIL).then(() => { return null; @@ -130,9 +141,9 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { private addWithBackoff(reliableTopicMessage: RawTopicMessage): Promise { - var resolve: Function; + let resolve: Function; - var promise = new Promise(function () { + const promise = new Promise(function () { resolve = arguments[0]; }); @@ -144,7 +155,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { private trySendMessage(message: RawTopicMessage, delay: number, resolve: Function) { this.ringbuffer.add(message, OverflowPolicy.FAIL).then((seq: Long) => { if (seq.toNumber() === -1) { - var newDelay = delay *= 2; + let newDelay = delay *= 2; if (newDelay > TOPIC_MAX_BACKOFF) { newDelay = TOPIC_MAX_BACKOFF; @@ -158,17 +169,4 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { }); } - public getRingbuffer(): IRingbuffer { - return this.ringbuffer; - } - - destroy(): Promise { - for (var k in this.runners) { - var runner = this.runners[k]; - runner.cancel(); - } - - return this.ringbuffer.destroy(); - } - } diff --git a/src/proxy/topic/TopicMessage.ts b/src/proxy/topic/TopicMessage.ts index 35f4ef1b6..2168ae1dd 100644 --- a/src/proxy/topic/TopicMessage.ts +++ b/src/proxy/topic/TopicMessage.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import Address = require('../../Address'); import Long = require('long'); +import Address = require('../../Address'); export class TopicMessage { messageObject: T; diff --git a/src/proxy/topic/TopicMessageListener.ts b/src/proxy/topic/TopicMessageListener.ts index edd56d31a..994f19cd9 100644 --- a/src/proxy/topic/TopicMessageListener.ts +++ b/src/proxy/topic/TopicMessageListener.ts @@ -15,6 +15,4 @@ */ import {TopicMessage} from './TopicMessage'; -export interface TopicMessageListener { - (message: TopicMessage): void; -} +export type TopicMessageListener = (message: TopicMessage) => void; diff --git a/src/proxy/topic/TopicOverloadPolicy.ts b/src/proxy/topic/TopicOverloadPolicy.ts index 3e885bcc0..e6f163459 100644 --- a/src/proxy/topic/TopicOverloadPolicy.ts +++ b/src/proxy/topic/TopicOverloadPolicy.ts @@ -38,6 +38,6 @@ export enum TopicOverloadPolicy { /** * The publish call immediately fails. */ - ERROR + ERROR, } diff --git a/src/serialization/Data.ts b/src/serialization/Data.ts index 4b72e8136..11d9dca2a 100644 --- a/src/serialization/Data.ts +++ b/src/serialization/Data.ts @@ -15,41 +15,42 @@ */ import * as Long from 'long'; + export interface Data { /** * Returns serialized representation in a buffer */ - toBuffer() : Buffer; + toBuffer(): Buffer; /** * Returns serialization type */ - getType() : number; + getType(): number; /** * Returns the total size of data in bytes */ - totalSize() : number; + totalSize(): number; /** * Returns size of internal binary data in bytes */ - dataSize() : number; + dataSize(): number; /** * Returns approximate heap cost of this Data object in bytes */ - getHeapCost() : number; + getHeapCost(): number; /** * Returns partition hash of serialized object */ - getPartitionHash() : number; + getPartitionHash(): number; /** * Returns true if data has partition hash */ - hasPartitionHash() : boolean; + hasPartitionHash(): boolean; /** * Returns hashcode for this data @@ -61,81 +62,144 @@ export interface Data { /** * Returns true if the object is a portable object */ - isPortable() : boolean; + isPortable(): boolean; } export interface DataOutput { clear(): void; + isBigEndian(): boolean; + position(newPosition?: number): number; + toBuffer(): Buffer; + write(byte: number | Buffer): void; + writeBoolean(val: boolean): void; + writeBooleanArray(val: boolean[]): void; + writeByte(byte: number): void; + writeByteArray(bytes: number[]): void; + writeBytes(bytes: string): void; + writeChar(char: string): void; + writeCharArray(chars: string[]): void; + writeChars(chars: string): void; + writeData(data: Data): void; + writeDouble(double: number): void; + writeDoubleArray(doubles: number[]): void; + writeFloat(float: number): void; + writeFloatArray(floats: number[]): void; + writeInt(int: number): void; + writeIntBE(int: number): void; + writeIntArray(ints: number[]): void; + writeLong(long: Long): void; + writeLongArray(longs: Long[]): void; + writeObject(object: any): void; + writeShort(short: number): void; + writeShortArray(shorts: number[]): void; + writeUTF(val: string): void; + writeUTFArray(val: string[]): void; + writeZeroBytes(count: number): void; } export interface PositionalDataOutput extends DataOutput { pwrite(position: number, byte: number | Buffer): void; + pwriteBoolean(position: number, val: boolean): void; + pwriteByte(position: number, byte: number): void; + pwriteChar(position: number, char: string): void; + pwriteDouble(position: number, double: number): void; + pwriteFloat(position: number, float: number): void; + pwriteInt(position: number, int: number): void; + pwriteIntBE(position: number, int: number): void; + pwriteLong(position: number, long: Long): void; + pwriteShort(position: number, short: number): void; } export interface DataInput { isBigEndian(): boolean; + position(newPosition?: number): number; + read(pos?: number): number; + readBoolean(pos?: number): boolean; + readBooleanArray(pos?: number): boolean[]; + readByte(pos?: number): number; + readByteArray(pos?: number): number[]; + readChar(pos?: number): string; + readCharArray(pos?: number): string[]; + readData(pos?: number): Data; + readDouble(pos?: number): number; + readDoubleArray(pos?: number): number[]; + readFloat(pos?: number): number; + readFloatArray(pos?: number): number[]; + readInt(pos?: number): number; + readIntArray(pos?: number): number[]; + readLong(pos?: number): Long; + readLongArray(pos?: number): Long[]; + readObject(): any; + readShort(pos?: number): number; + readShortArray(pos?: number): number[]; + readUnsignedByte(pos?: number): number; + readUnsignedShort(pos?: number): number; + readUTF(pos?: number): string; + readUTFArray(pos?: number): string[]; + reset(): void; + skipBytes(count: number): void; } diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index 778b77924..927a1c1fd 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {DataInput, DataOutput} from './Data'; -import {AbstractPredicate} from './PredicateFactory'; +import {Comparator} from '../core/Comparator'; import {IterationType, Predicate} from '../core/Predicate'; import {enumFromString} from '../Util'; -import {Comparator} from '../core/Comparator'; +import {DataInput, DataOutput} from './Data'; +import {AbstractPredicate} from './PredicateFactory'; export class SqlPredicate extends AbstractPredicate { @@ -52,9 +52,9 @@ export class AndPredicate extends AbstractPredicate { } readData(input: DataInput): any { - var s = input.readInt(); + const s = input.readInt(); this.predicates = []; - for (var i = 0; i < s; i++) { + for (let i = 0; i < s; i++) { this.predicates[i] = input.readObject(); } } @@ -134,7 +134,7 @@ export class GreaterLessPredicate extends AbstractPredicate { private equal: boolean; private less: boolean; - constructor (field: string, value: any, equal: boolean, less: boolean) { + constructor(field: string, value: any, equal: boolean, less: boolean) { super(); this.field = field; this.value = value; @@ -207,9 +207,9 @@ export class InPredicate extends AbstractPredicate { readData(input: DataInput): any { this.field = input.readUTF(); - var s = input.readInt(); + const s = input.readInt(); this.values = []; - for (var i = 0; i < s; i++) { + for (let i = 0; i < s; i++) { this.values.push(input.readObject()); } return this; @@ -218,7 +218,7 @@ export class InPredicate extends AbstractPredicate { writeData(output: DataOutput): void { output.writeUTF(this.field); output.writeInt(this.values.length); - this.values.forEach(function(val) { + this.values.forEach(function (val) { output.writeObject(val); }); } @@ -289,9 +289,9 @@ export class OrPredicate extends AbstractPredicate { } readData(input: DataInput): any { - var s = input.readInt(); + const s = input.readInt(); this.preds = []; - for (var i = 0; i < s; i++) { + for (let i = 0; i < s; i++) { this.preds.push(input.readObject()); } return this; @@ -340,11 +340,11 @@ export class FalsePredicate extends AbstractPredicate { static INSTANCE: FalsePredicate = new FalsePredicate(); readData(input: DataInput): any { - //Empty method + // Empty method } writeData(output: DataOutput): any { - //Empty method + // Empty method } getClassId(): number { @@ -352,17 +352,16 @@ export class FalsePredicate extends AbstractPredicate { } } - export class TruePredicate extends AbstractPredicate { static INSTANCE: TruePredicate = new TruePredicate(); readData(input: DataInput): any { - //Empty method + // Empty method } writeData(output: DataOutput): any { - //Empty method + // Empty method } getClassId(): number { @@ -379,7 +378,7 @@ export class PagingPredicate extends AbstractPredicate { private comparatorObject: Comparator; private page: number = 0; private iterationType: IterationType = IterationType.ENTRY; - private anchorList: [number, [any, any]][] = []; + private anchorList: Array<[number, [any, any]]> = []; constructor(internalPredicate: Predicate, pageSize: number, comparator: Comparator) { super(); @@ -395,11 +394,11 @@ export class PagingPredicate extends AbstractPredicate { this.pageSize = input.readInt(); this.iterationType = enumFromString(IterationType, input.readUTF()); this.anchorList = []; - var size = input.readInt(); - for (var i = 0; i < size; i++) { - var p = input.readInt(); - var k = input.readObject(); - var v = input.readObject(); + const size = input.readInt(); + for (let i = 0; i < size; i++) { + const p = input.readInt(); + const k = input.readObject(); + const v = input.readObject(); this.anchorList.push([p, [k, v]]); } } @@ -411,7 +410,7 @@ export class PagingPredicate extends AbstractPredicate { output.writeInt(this.pageSize); output.writeUTF(IterationType[this.iterationType]); output.writeInt(this.anchorList.length); - this.anchorList.forEach(function(anchorEntry: [number, [any, any]]) { + this.anchorList.forEach(function (anchorEntry: [number, [any, any]]) { output.writeInt(anchorEntry[0]); output.writeObject(anchorEntry[1][0]); output.writeObject(anchorEntry[1][1]); @@ -442,8 +441,8 @@ export class PagingPredicate extends AbstractPredicate { } setAnchor(page: number, anchor: [any, any]) { - var anchorEntry: [number, [any, any]] = [page, anchor]; - var anchorCount = this.anchorList.length; + const anchorEntry: [number, [any, any]] = [page, anchor]; + const anchorCount = this.anchorList.length; if (page < anchorCount) { this.anchorList[page] = anchorEntry; } else if (page === anchorCount) { @@ -462,11 +461,11 @@ export class PagingPredicate extends AbstractPredicate { } getNearestAnchorEntry(): [number, [any, any]] { - var anchorCount = this.anchorList.length; + const anchorCount = this.anchorList.length; if (this.page === 0 || anchorCount === 0) { return PagingPredicate.NULL_ANCHOR; } - var anchoredEntry: [number, [any, any]]; + let anchoredEntry: [number, [any, any]]; if (this.page < anchorCount) { anchoredEntry = this.anchorList[this.page - 1]; } else { @@ -483,4 +482,3 @@ export class PagingPredicate extends AbstractPredicate { return this.comparatorObject; } } - diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index dd780b85b..d24c9ab0b 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import {Serializer} from './SerializationService'; +import Long = require('long'); +import {BitsUtil} from '../BitsUtil'; import {DataInput, DataOutput} from './Data'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; -import {BitsUtil} from '../BitsUtil'; -import Long = require('long'); +import {Serializer} from './SerializationService'; export class StringSerializer implements Serializer { @@ -76,7 +76,7 @@ export class NullSerializer implements Serializer { } write(output: DataOutput, object: any): void { - //Empty method + // Empty method } } @@ -341,11 +341,11 @@ export class LinkedListSerializer implements Serializer { } read(input: DataInput): any { - var size = input.readInt(); - var result: any = null; + const size = input.readInt(); + let result: any = null; if (size > BitsUtil.NULL_ARRAY_LENGTH) { result = []; - for (var i = 0; i < size; i++) { + for (let i = 0; i < size; i++) { result.push(input.readObject()); } } @@ -353,7 +353,7 @@ export class LinkedListSerializer implements Serializer { } write(output: DataOutput, object: any): void { - //NULL method + // NULL method } } @@ -364,8 +364,9 @@ export class ArrayListSerializer extends LinkedListSerializer { } export class IdentifiedDataSerializableSerializer implements Serializer { - private factories: {[id: number]: IdentifiedDataSerializableFactory}; - constructor(factories: {[id: number]: IdentifiedDataSerializableFactory}) { + private factories: { [id: number]: IdentifiedDataSerializableFactory }; + + constructor(factories: { [id: number]: IdentifiedDataSerializableFactory }) { this.factories = factories; } @@ -374,18 +375,18 @@ export class IdentifiedDataSerializableSerializer implements Serializer { } read(input: DataInput): any { - var isIdentified = input.readBoolean(); + const isIdentified = input.readBoolean(); if (!isIdentified) { throw new RangeError('Native clients does not support Data Serializable. Please use Identified Data Serializable'); } - var factoryId = input.readInt(); - var classId = input.readInt(); - var factory: IdentifiedDataSerializableFactory; + const factoryId = input.readInt(); + const classId = input.readInt(); + let factory: IdentifiedDataSerializableFactory; factory = this.factories[factoryId]; if (!factory) { throw new RangeError('There is no Identified Data Serializer factory with id ' + factoryId + '.'); } - var object = factory.create(classId); + const object = factory.create(classId); object.readData(input); return object; } diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index f6f2dc8e7..09cb8a8f9 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {Data} from './Data'; import murmur = require('../invocation/Murmur'); +import {Data} from './Data'; export const PARTITION_HASH_OFFSET: number = 0; export const TYPE_OFFSET: number = 4; @@ -38,16 +38,16 @@ export class HeapData implements Data { /** * Returns serialized representation in a buffer */ - public toBuffer() : Buffer { + public toBuffer(): Buffer { return this.payload; } /** * Returns serialization type */ - public getType() : number { + public getType(): number { if (this.totalSize() === 0) { - //TODO serialization null type + // TODO serialization null type return 0; } return this.payload.readIntBE(TYPE_OFFSET, 4); @@ -67,7 +67,7 @@ export class HeapData implements Data { /** * Returns size of internal binary data in bytes */ - public dataSize() : number { + public dataSize(): number { return Math.max(this.totalSize() - HEAP_DATA_OVERHEAD, 0); } @@ -81,7 +81,7 @@ export class HeapData implements Data { /** * Returns partition hash of serialized object */ - getPartitionHash() : number { + getPartitionHash(): number { if (this.hasPartitionHash()) { return this.payload.readIntBE(PARTITION_HASH_OFFSET, 4); } else { @@ -100,7 +100,7 @@ export class HeapData implements Data { /** * Returns true if data has partition hash */ - hasPartitionHash() : boolean { + hasPartitionHash(): boolean { return this.payload !== null && this.payload.length >= HEAP_DATA_OVERHEAD && this.payload.readIntBE(PARTITION_HASH_OFFSET, 4) !== 0; diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 40b0414cc..95c796104 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -15,12 +15,12 @@ */ /* tslint:disable:no-bitwise */ +import * as assert from 'assert'; import * as Long from 'long'; -import {DataOutput, Data, DataInput, PositionalDataOutput} from './Data'; -import {SerializationService} from './SerializationService'; import {BitsUtil} from '../BitsUtil'; -import * as assert from 'assert'; +import {Data, DataInput, DataOutput, PositionalDataOutput} from './Data'; import {HeapData} from './HeapData'; +import {SerializationService} from './SerializationService'; const MASK_1BYTE = (1 << 8) - 1; const MASK_2BYTE = (1 << 16) - 1; @@ -28,8 +28,8 @@ const MASK_4BYTE = (1 << 32) - 1; export class ObjectDataOutput implements DataOutput { protected buffer: Buffer; - private service: SerializationService; protected bigEndian: boolean; + private service: SerializationService; private pos: number; constructor(length: number, service: SerializationService, isBigEndian: boolean) { @@ -39,27 +39,6 @@ export class ObjectDataOutput implements DataOutput { this.pos = 0; } - private available(): number { - return this.buffer == null ? 0 : this.buffer.length - this.pos; - } - - private ensureAvailable(size: number): void { - if (this.available() < size ) { - var newBuffer = new Buffer(this.pos + size); - this.buffer.copy(newBuffer, 0, 0, this.pos); - this.buffer = newBuffer; - } - } - - private writeArray(func: Function, arr: Array) { - var len = (arr != null) ? arr.length : BitsUtil.NULL_ARRAY_LENGTH; - this.writeInt(len); - if (len > 0) { - var boundFunc = func.bind(this); - arr.forEach(boundFunc); - } - } - clear(): void { this.buffer = new Buffer(this.buffer.length); this.pos = 0; @@ -70,7 +49,7 @@ export class ObjectDataOutput implements DataOutput { } position(newPosition?: number): number { - var oldPos = this.pos; + const oldPos = this.pos; if (Number.isInteger(newPosition)) { this.pos = newPosition; } @@ -81,13 +60,13 @@ export class ObjectDataOutput implements DataOutput { if (this.buffer == null || this.pos === 0) { return new Buffer(0); } else { - var snapBuffer = new Buffer(this.pos); + const snapBuffer = new Buffer(this.pos); this.buffer.copy(snapBuffer, 0, 0, this.pos); return snapBuffer; } } - write(byte: number|Buffer): void { + write(byte: number | Buffer): void { if (Buffer.isBuffer(byte)) { this.ensureAvailable(byte.length); byte.copy(this.buffer, this.pos); @@ -116,8 +95,8 @@ export class ObjectDataOutput implements DataOutput { } writeBytes(bytes: string): void { - var len = (bytes != null) ? bytes.length : 0; - for (var i = 0; i < len; i++) { + const len = (bytes != null) ? bytes.length : 0; + for (let i = 0; i < len; i++) { this.write(bytes.charCodeAt(i)); } } @@ -133,18 +112,18 @@ export class ObjectDataOutput implements DataOutput { } writeChars(chars: string): void { - var len = (chars != null) ? chars.length : BitsUtil.NULL_ARRAY_LENGTH; + const len = (chars != null) ? chars.length : BitsUtil.NULL_ARRAY_LENGTH; this.writeInt(len); - for (var i = 0; i < len; i++) { + for (let i = 0; i < len; i++) { this.writeChar(chars.charAt(i)); } } writeData(data: Data): void { - var buf = (data != null) ? data.toBuffer() : null; - var len = (buf != null) ? buf.length : BitsUtil.NULL_ARRAY_LENGTH; + const buf = (data != null) ? data.toBuffer() : null; + const len = (buf != null) ? buf.length : BitsUtil.NULL_ARRAY_LENGTH; this.writeInt(len); - for (var i = 0; i < len; i++) { + for (let i = 0; i < len; i++) { this.write(buf[i]); } } @@ -219,11 +198,11 @@ export class ObjectDataOutput implements DataOutput { } writeUTF(val: string): void { - var len = (val != null) ? val.length : BitsUtil.NULL_ARRAY_LENGTH; + const len = (val != null) ? val.length : BitsUtil.NULL_ARRAY_LENGTH; this.writeInt(len); this.ensureAvailable(len * 3); for (let i = 0; i < len; i++) { - let ch = val.charCodeAt(i); + const ch = val.charCodeAt(i); if (ch <= 0x007F) { this.writeByte(ch); } else if (ch <= 0x07FF) { @@ -242,10 +221,31 @@ export class ObjectDataOutput implements DataOutput { } writeZeroBytes(count: number): void { - for (var i = 0; i < count; i++) { + for (let i = 0; i < count; i++) { this.write(0); } } + + private available(): number { + return this.buffer == null ? 0 : this.buffer.length - this.pos; + } + + private ensureAvailable(size: number): void { + if (this.available() < size) { + const newBuffer = new Buffer(this.pos + size); + this.buffer.copy(newBuffer, 0, 0, this.pos); + this.buffer = newBuffer; + } + } + + private writeArray(func: Function, arr: any[]) { + const len = (arr != null) ? arr.length : BitsUtil.NULL_ARRAY_LENGTH; + this.writeInt(len); + if (len > 0) { + const boundFunc = func.bind(this); + arr.forEach(boundFunc); + } + } } export class PositionalObjectDataOutput extends ObjectDataOutput implements PositionalDataOutput { @@ -316,33 +316,12 @@ export class ObjectDataInput implements DataInput { this.pos = this.offset; } - private readArray(func: Function, pos?: number) { - var backupPos = this.pos; - if (pos !== undefined) { - this.pos = pos; - } - var len = this.readInt(); - var arr: T[] = []; - for (var i = 0; i < len; i++) { - arr.push(func.call(this)); - } - if (pos !== undefined) { - this.pos = backupPos; - } - return arr; - } - - private assertAvailable(numOfBytes: number, pos: number = this.pos): void { - assert(pos >= 0); - assert(pos + numOfBytes <= this.buffer.length); - } - isBigEndian(): boolean { return this.bigEndian; } position(newPosition?: number): number { - var oldPos = this.pos; + const oldPos = this.pos; if (Number.isInteger(newPosition)) { this.pos = newPosition; } @@ -376,7 +355,7 @@ export class ObjectDataInput implements DataInput { readChar(pos?: number): string { this.assertAvailable(BitsUtil.CHAR_SIZE_IN_BYTES); - var readBytes: any; + let readBytes: any; if (pos === undefined) { readBytes = BitsUtil.readUInt16(this.buffer, this.pos, this.isBigEndian()); this.pos += BitsUtil.CHAR_SIZE_IN_BYTES; @@ -391,14 +370,14 @@ export class ObjectDataInput implements DataInput { } readData(): Data { - var bytes: number[] = this.readByteArray(); - var data: Data = bytes === null ? null : new HeapData(new Buffer(bytes)); + const bytes: number[] = this.readByteArray(); + const data: Data = bytes === null ? null : new HeapData(new Buffer(bytes)); return data; } readDouble(pos?: number): number { this.assertAvailable(BitsUtil.DOUBLE_SIZE_IN_BYTES, pos); - var ret: number; + let ret: number; if (pos === undefined) { ret = BitsUtil.readDouble(this.buffer, this.pos, this.isBigEndian()); this.pos += BitsUtil.DOUBLE_SIZE_IN_BYTES; @@ -414,7 +393,7 @@ export class ObjectDataInput implements DataInput { readFloat(pos?: number): number { this.assertAvailable(BitsUtil.FLOAT_SIZE_IN_BYTES, pos); - var ret: number; + let ret: number; if (pos === undefined) { ret = BitsUtil.readFloat(this.buffer, this.pos, this.isBigEndian()); this.pos += BitsUtil.FLOAT_SIZE_IN_BYTES; @@ -430,7 +409,7 @@ export class ObjectDataInput implements DataInput { readInt(pos?: number): number { this.assertAvailable(BitsUtil.INT_SIZE_IN_BYTES, pos); - var ret: number; + let ret: number; if (pos === undefined) { ret = BitsUtil.readInt32(this.buffer, this.pos, this.isBigEndian()); this.pos += BitsUtil.INT_SIZE_IN_BYTES; @@ -446,8 +425,8 @@ export class ObjectDataInput implements DataInput { readLong(pos?: number): Long { this.assertAvailable(BitsUtil.LONG_SIZE_IN_BYTES, pos); - var first: number; - var second: number; + let first: number; + let second: number; if (pos === undefined) { first = BitsUtil.readInt32(this.buffer, this.pos, this.isBigEndian()); this.pos += BitsUtil.INT_SIZE_IN_BYTES; @@ -474,7 +453,7 @@ export class ObjectDataInput implements DataInput { readShort(pos?: number): number { this.assertAvailable(BitsUtil.SHORT_SIZE_IN_BYTES, pos); - var ret: number; + let ret: number; if (pos === undefined) { ret = BitsUtil.readInt16(this.buffer, this.pos, this.isBigEndian()); this.pos += BitsUtil.SHORT_SIZE_IN_BYTES; @@ -496,16 +475,8 @@ export class ObjectDataInput implements DataInput { return this.readChar(pos).charCodeAt(0); } - private addOrUndefined(base: number, adder: number): number { - if (base === undefined) { - return undefined; - } else { - return base + adder; - } - } - readUTF(pos?: number): string { - let len = this.readInt(pos); + const len = this.readInt(pos); let readingIndex = this.addOrUndefined(pos, 4); if (len === BitsUtil.NULL_ARRAY_LENGTH) { return null; @@ -517,7 +488,7 @@ export class ObjectDataInput implements DataInput { leadingByte = this.readByte(readingIndex) & MASK_1BYTE; readingIndex = this.addOrUndefined(readingIndex, 1); - let b = leadingByte & 0xFF; + const b = leadingByte & 0xFF; switch (b >> 4) { /* tslint:disable:no-switch-case-fall-through */ case 0: @@ -532,16 +503,16 @@ export class ObjectDataInput implements DataInput { break; case 12: case 13: - let first = (b & 0x1F) << 6; - let second = this.readByte(readingIndex) & 0x3F; + const first = (b & 0x1F) << 6; + const second = this.readByte(readingIndex) & 0x3F; readingIndex = this.addOrUndefined(readingIndex, 1); charCode = first | second; break; case 14: - let first2 = (b & 0x0F) << 12; - let second2 = (this.readByte(readingIndex) & 0x3F) << 6; + const first2 = (b & 0x0F) << 12; + const second2 = (this.readByte(readingIndex) & 0x3F) << 6; readingIndex = this.addOrUndefined(readingIndex, 1); - let third2 = this.readByte(readingIndex) & 0x3F; + const third2 = this.readByte(readingIndex) & 0x3F; readingIndex = this.addOrUndefined(readingIndex, 1); charCode = (first2 | second2 | third2); break; @@ -574,4 +545,33 @@ export class ObjectDataInput implements DataInput { available(): number { return this.buffer.length - this.pos; } + + private readArray(func: Function, pos?: number) { + const backupPos = this.pos; + if (pos !== undefined) { + this.pos = pos; + } + const len = this.readInt(); + const arr: T[] = []; + for (let i = 0; i < len; i++) { + arr.push(func.call(this)); + } + if (pos !== undefined) { + this.pos = backupPos; + } + return arr; + } + + private assertAvailable(numOfBytes: number, pos: number = this.pos): void { + assert(pos >= 0); + assert(pos + numOfBytes <= this.buffer.length); + } + + private addOrUndefined(base: number, adder: number): number { + if (base === undefined) { + return undefined; + } else { + return base + adder; + } + } } diff --git a/src/serialization/PredicateFactory.ts b/src/serialization/PredicateFactory.ts index bbbe07463..82f90ad65 100644 --- a/src/serialization/PredicateFactory.ts +++ b/src/serialization/PredicateFactory.ts @@ -14,10 +14,12 @@ * limitations under the License. */ -import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; -import {DataInput, DataOutput} from './Data'; import {Predicate} from '../core/Predicate'; +import {DataInput, DataOutput} from './Data'; +import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; + export const PREDICATE_FACTORY_ID = -32; + export abstract class AbstractPredicate implements Predicate { abstract readData(input: DataInput): any; @@ -33,18 +35,18 @@ export abstract class AbstractPredicate implements Predicate { export class PredicateFactory implements IdentifiedDataSerializableFactory { - private idToConstructorMap: {[id: number]: FunctionConstructor } = {}; + private idToConstructorMap: { [id: number]: FunctionConstructor } = {}; constructor(allPredicates: any) { - for (var pred in allPredicates) { - //TODO accessing getClassId from prototype of uninitialized member function is not elegant. - this.idToConstructorMap[(allPredicates[pred].prototype).getClassId()] = allPredicates[pred]; + for (const pred in allPredicates) { + // TODO accessing getClassId from prototype of uninitialized member function is not elegant. + this.idToConstructorMap[(allPredicates[pred].prototype as any).getClassId()] = allPredicates[pred]; } } create(type: number): IdentifiedDataSerializable { if (this.idToConstructorMap[type]) { - return (new this.idToConstructorMap[type]()); + return (new this.idToConstructorMap[type]()) as any; } else { throw new RangeError(`There is no default predicate with id ${type}.`); } diff --git a/src/serialization/Serializable.ts b/src/serialization/Serializable.ts index 75bba09e1..2f5b94066 100644 --- a/src/serialization/Serializable.ts +++ b/src/serialization/Serializable.ts @@ -15,11 +15,15 @@ */ import {DataInput, DataOutput} from './Data'; -import {PortableWriter, PortableReader} from './portable/PortableSerializer'; +import {PortableReader, PortableWriter} from './portable/PortableSerializer'; + export interface IdentifiedDataSerializable { readData(input: DataInput): any; + writeData(output: DataOutput): void; + getFactoryId(): number; + getClassId(): number; } @@ -29,8 +33,11 @@ export interface IdentifiedDataSerializableFactory { export interface Portable { getFactoryId(): number; + getClassId(): number; + writePortable(writer: PortableWriter): void; + readPortable(reader: PortableReader): void; } diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 7f2f2b1fe..d63c0293e 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -14,31 +14,49 @@ * limitations under the License. */ -import {Data, DataOutput, DataInput} from './Data'; -import {HeapData, DATA_OFFSET} from './HeapData'; +import {AggregatorFactory} from '../aggregation/AggregatorFactory'; +import {ClusterDataFactory} from '../ClusterDataFactory'; +import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; import {SerializationConfig} from '../config/SerializationConfig'; -import {ObjectDataOutput, ObjectDataInput, PositionalObjectDataOutput} from './ObjectData'; +import {RELIABLE_TOPIC_MESSAGE_FACTORY_ID, ReliableTopicMessageFactory} from '../proxy/topic/RawTopicMessage'; +import * as Util from '../Util'; +import {Data, DataInput, DataOutput} from './Data'; +import * as DefaultPredicates from './DefaultPredicates'; import { - StringSerializer, BooleanSerializer, DoubleSerializer, NullSerializer, - ShortSerializer, IntegerSerializer, LongSerializer, FloatSerializer, BooleanArraySerializer, ShortArraySerializer, - IntegerArraySerializer, LongArraySerializer, DoubleArraySerializer, StringArraySerializer, - IdentifiedDataSerializableSerializer, FloatArraySerializer, JsonSerializer, ByteSerializer, CharSerializer, - ByteArraySerializer, CharArraySerializer, DateSerializer, JavaClassSerializer + BooleanArraySerializer, + BooleanSerializer, + ByteArraySerializer, + ByteSerializer, + CharArraySerializer, + CharSerializer, + DateSerializer, + DoubleArraySerializer, + DoubleSerializer, + FloatArraySerializer, + FloatSerializer, + IdentifiedDataSerializableSerializer, + IntegerArraySerializer, + IntegerSerializer, + JavaClassSerializer, + JsonSerializer, + LongArraySerializer, + LongSerializer, + NullSerializer, + ShortArraySerializer, + ShortSerializer, + StringArraySerializer, + StringSerializer, } from './DefaultSerializer'; -import * as Util from '../Util'; +import {DATA_OFFSET, HeapData} from './HeapData'; +import {ObjectDataInput, PositionalObjectDataOutput} from './ObjectData'; import {PortableSerializer} from './portable/PortableSerializer'; +import {PREDICATE_FACTORY_ID, PredicateFactory} from './PredicateFactory'; import {IdentifiedDataSerializableFactory} from './Serializable'; -import * as DefaultPredicates from './DefaultPredicates'; -import {PredicateFactory, PREDICATE_FACTORY_ID} from './PredicateFactory'; -import {RELIABLE_TOPIC_MESSAGE_FACTORY_ID, ReliableTopicMessageFactory} from '../proxy/topic/RawTopicMessage'; -import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; -import {ClusterDataFactory} from '../ClusterDataFactory'; -import {AggregatorFactory} from '../aggregation/AggregatorFactory'; export interface SerializationService { - toData(object: any, paritioningStrategy?: any) : Data; + toData(object: any, paritioningStrategy?: any): Data; - toObject(data: Data) : any; + toObject(data: Data): any; writeObject(out: DataOutput, object: any): void; @@ -47,14 +65,16 @@ export interface SerializationService { export interface Serializer { getId(): number; + read(input: DataInput): any; + write(output: DataOutput, object: any): void; } export class SerializationServiceV1 implements SerializationService { - private registry: {[id: number]: Serializer}; - private serializerNameToId: {[name: string]: number}; + private registry: { [id: number]: Serializer }; + private serializerNameToId: { [name: string]: number }; private numberType: string; private serializationConfig: SerializationConfig; @@ -68,7 +88,7 @@ export class SerializationServiceV1 implements SerializationService { } public isData(object: any): boolean { - if (object instanceof HeapData ) { + if (object instanceof HeapData) { return true; } else { return false; @@ -77,14 +97,14 @@ export class SerializationServiceV1 implements SerializationService { toData(object: any, partitioningStrategy: any = this.defaultPartitionStrategy): Data { if (this.isData(object)) { - return object; + return object as Data; } - var dataOutput: DataOutput = new PositionalObjectDataOutput(1, this, this.serializationConfig.isBigEndian); - var serializer = this.findSerializerFor(object); - //Check if object is partition aware + const dataOutput: DataOutput = new PositionalObjectDataOutput(1, this, this.serializationConfig.isBigEndian); + const serializer = this.findSerializerFor(object); + // Check if object is partition aware if (object != null && object.getPartitionKey) { - var partitionKey = object.getPartitionKey(); - var serializedPartitionKey = this.toData(partitionKey); + const partitionKey = object.getPartitionKey(); + const serializedPartitionKey = this.toData(partitionKey); dataOutput.writeIntBE(this.calculatePartitionHash(serializedPartitionKey, partitioningStrategy)); } else { dataOutput.writeIntBE(this.calculatePartitionHash(object, partitioningStrategy)); @@ -101,25 +121,25 @@ export class SerializationServiceV1 implements SerializationService { if (!data.getType) { return data; } - var serializer = this.findSerializerById(data.getType()); - var dataInput = new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serializationConfig.isBigEndian); + const serializer = this.findSerializerById(data.getType()); + const dataInput = new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serializationConfig.isBigEndian); return serializer.read(dataInput); } writeObject(out: DataOutput, object: any): void { - var serializer = this.findSerializerFor(object); + const serializer = this.findSerializerFor(object); out.writeInt(serializer.getId()); serializer.write(out, object); } readObject(inp: DataInput): any { - var serializerId = inp.readInt(); - var serializer = this.findSerializerById(serializerId); + const serializerId = inp.readInt(); + const serializer = this.findSerializerById(serializerId); return serializer.read(inp); } registerSerializer(name: string, serializer: Serializer): void { - if (this.serializerNameToId[name] ) { + if (this.serializerNameToId[name]) { throw new RangeError('Given serializer name is already in the registry.'); } if (this.registry[serializer.getId()]) { @@ -148,7 +168,7 @@ export class SerializationServiceV1 implements SerializationService { if (obj === undefined) { throw new RangeError('undefined cannot be serialized.'); } - var serializer: Serializer = null; + let serializer: Serializer = null; if (obj === null) { serializer = this.findSerializerByName('null', false); } @@ -171,25 +191,15 @@ export class SerializationServiceV1 implements SerializationService { } - private defaultPartitionStrategy(obj: any): number { - /* tslint:disable:no-string-literal */ - if (obj == null || !obj['getPartitionHash']) { - /* tslint:enable:no-string-literal */ - return 0; - } else { - return obj.getPartitionHash(); - } - } - protected lookupDefaultSerializer(obj: any): Serializer { - var serializer: Serializer = null; + let serializer: Serializer = null; if (this.isIdentifiedDataSerializable(obj)) { return this.findSerializerByName('identified', false); } if (this.isPortableSerializable(obj)) { return this.findSerializerByName('!portable', false); } - var objectType = Util.getType(obj); + const objectType = Util.getType(obj); if (objectType === 'array') { if (obj.length === 0) { serializer = this.findSerializerByName('number', true); @@ -214,11 +224,11 @@ export class SerializationServiceV1 implements SerializationService { } protected isIdentifiedDataSerializable(obj: any): boolean { - return ( obj.readData && obj.writeData && obj.getClassId && obj.getFactoryId); + return (obj.readData && obj.writeData && obj.getClassId && obj.getFactoryId); } protected isPortableSerializable(obj: any): boolean { - return ( obj.readPortable && obj.writePortable && obj.getFactoryId && obj.getClassId); + return (obj.readPortable && obj.writePortable && obj.getFactoryId && obj.getClassId); } protected registerDefaultSerializers() { @@ -247,20 +257,20 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('!json', new JsonSerializer()); this.registerSerializer( '!portable', - new PortableSerializer(this, this.serializationConfig) + new PortableSerializer(this, this.serializationConfig), ); } protected registerIdentifiedFactories() { - var factories: {[id: number]: IdentifiedDataSerializableFactory} = {}; - for (var id in this.serializationConfig.dataSerializableFactories) { + const factories: { [id: number]: IdentifiedDataSerializableFactory } = {}; + for (const id in this.serializationConfig.dataSerializableFactories) { factories[id] = this.serializationConfig.dataSerializableFactories[id]; } - let factoryConfigs = this.serializationConfig.dataSerializableFactoryConfigs; - for (let id in factoryConfigs) { - let path = factoryConfigs[id].path; - let exportedName = factoryConfigs[id].exportedName; - let factoryConstructor = Util.loadNameFromPath(path, exportedName); + const factoryConfigs = this.serializationConfig.dataSerializableFactoryConfigs; + for (const id in factoryConfigs) { + const path = factoryConfigs[id].path; + const exportedName = factoryConfigs[id].exportedName; + const factoryConstructor = Util.loadNameFromPath(path, exportedName); factories[id] = new factoryConstructor(); } factories[PREDICATE_FACTORY_ID] = new PredicateFactory(DefaultPredicates); @@ -271,16 +281,16 @@ export class SerializationServiceV1 implements SerializationService { } protected registerCustomSerializers() { - let customSerializersArray: any[] = this.serializationConfig.customSerializers; - var self = this; - customSerializersArray.forEach(function(candidate) { + const customSerializersArray: any[] = this.serializationConfig.customSerializers; + const self = this; + customSerializersArray.forEach(function (candidate) { self.assertValidCustomSerializer(candidate); self.registerSerializer('!custom' + candidate.getId(), candidate); }); - let customSerializerConfigs = this.serializationConfig.customSerializerConfigs; - for (let typeId in customSerializerConfigs) { - let serializerConfig = customSerializerConfigs[typeId]; - let customSerializer = new (Util.loadNameFromPath(serializerConfig.path, serializerConfig.exportedName))(); + const customSerializerConfigs = this.serializationConfig.customSerializerConfigs; + for (const typeId in customSerializerConfigs) { + const serializerConfig = customSerializerConfigs[typeId]; + const customSerializer = new (Util.loadNameFromPath(serializerConfig.path, serializerConfig.exportedName))(); this.registerSerializer('!custom' + typeId, customSerializer); } } @@ -288,9 +298,9 @@ export class SerializationServiceV1 implements SerializationService { protected registerGlobalSerializer() { let candidate: any = null; if (this.serializationConfig.globalSerializerConfig != null) { - let exportedName = this.serializationConfig.globalSerializerConfig.exportedName; - let path = this.serializationConfig.globalSerializerConfig.path; - let serializerFactory = Util.loadNameFromPath(path, exportedName); + const exportedName = this.serializationConfig.globalSerializerConfig.exportedName; + const path = this.serializationConfig.globalSerializerConfig.path; + const serializerFactory = Util.loadNameFromPath(path, exportedName); candidate = new serializerFactory(); } if (candidate == null) { @@ -304,9 +314,9 @@ export class SerializationServiceV1 implements SerializationService { } protected assertValidCustomSerializer(candidate: any) { - var fGetId = 'getId'; - var fRead = 'read'; - var fWrite = 'write'; + const fGetId = 'getId'; + const fRead = 'read'; + const fWrite = 'write'; if ( typeof candidate[fGetId] !== 'function' || typeof candidate[fRead] !== 'function' || @@ -314,26 +324,26 @@ export class SerializationServiceV1 implements SerializationService { ) { throw new TypeError('Custom serializer should have ' + fGetId + ', ' + fRead + ' and ' + fWrite + ' methods.'); } - var typeId = candidate[fGetId](); + const typeId = candidate[fGetId](); if (!Number.isInteger(typeId) || typeId < 1) { throw new TypeError('Custom serializer should have its typeId greater than or equal to 1.'); } } protected isCustomSerializable(object: any) { - var prop = 'hzGetCustomId'; + const prop = 'hzGetCustomId'; return (object[prop] && typeof object[prop] === 'function' && object[prop]() >= 1); } protected findSerializerByName(name: string, isArray: boolean): Serializer { - var convertedName: string; + let convertedName: string; if (name === 'number') { convertedName = this.serializationConfig.defaultNumberType; } else { convertedName = name; } - var serializerName = convertedName + (isArray ? 'Array' : ''); - var serializerId = this.serializerNameToId[serializerName]; + const serializerName = convertedName + (isArray ? 'Array' : ''); + const serializerId = this.serializerNameToId[serializerName]; if (serializerId == null) { return null; } @@ -341,11 +351,21 @@ export class SerializationServiceV1 implements SerializationService { } protected findSerializerById(id: number): Serializer { - var serializer = this.registry[id]; + const serializer = this.registry[id]; return serializer; } protected calculatePartitionHash(object: any, strategy: Function): number { return strategy(object); } + + private defaultPartitionStrategy(obj: any): number { + /* tslint:disable:no-string-literal */ + if (obj == null || !obj['getPartitionHash']) { + /* tslint:enable:no-string-literal */ + return 0; + } else { + return obj.getPartitionHash(); + } + } } diff --git a/src/serialization/SerializationUtil.ts b/src/serialization/SerializationUtil.ts index 57102e953..8e1ad6bae 100644 --- a/src/serialization/SerializationUtil.ts +++ b/src/serialization/SerializationUtil.ts @@ -15,16 +15,16 @@ */ import {Data} from './Data'; -export function deserializeEntryList(toObject: Function, entrySet: [Data, Data][]): [K, V][] { - var deserializedSet: [K, V][] = []; - entrySet.forEach(function(entry) { + +export function deserializeEntryList(toObject: Function, entrySet: Array<[Data, Data]>): Array<[K, V]> { + const deserializedSet: Array<[K, V]> = []; + entrySet.forEach(function (entry) { deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); }); return deserializedSet; } - -export function serializeList(toData: Function, input: Array): Array { +export function serializeList(toData: Function, input: any[]): Data[] { return input.map((each) => { return toData(each); }); diff --git a/src/serialization/portable/ClassDefinition.ts b/src/serialization/portable/ClassDefinition.ts index 06f73c0c3..81b71e929 100644 --- a/src/serialization/portable/ClassDefinition.ts +++ b/src/serialization/portable/ClassDefinition.ts @@ -18,7 +18,7 @@ export class ClassDefinition { private factoryId: number; private classId: number; private version: number; - private fields: {[name: string]: FieldDefinition} = {}; + private fields: { [name: string]: FieldDefinition } = {}; constructor(factoryId: number, classId: number, version: number) { this.factoryId = factoryId; @@ -47,8 +47,8 @@ export class ClassDefinition { } getFieldType(name: string): FieldType { - var field = this.fields[name]; - if ( field != null) { + const field = this.fields[name]; + if (field != null) { return field.getType(); } else { throw new RangeError(`Field ${field} does not exist.`); @@ -60,7 +60,7 @@ export class ClassDefinition { } getField(name: string): FieldDefinition { - var field = this.fields[name]; + const field = this.fields[name]; return field || null; } @@ -68,7 +68,7 @@ export class ClassDefinition { if (!Number.isInteger(index) || index < 0 || index >= this.getFieldCount()) { throw new RangeError(`Index: ${index}, fields count: ${this.getFieldCount()}.`); } - for (var fieldName in this.fields) { + for (const fieldName in this.fields) { if (this.fields[fieldName].getIndex() === index) { return this.fields[fieldName]; } @@ -76,7 +76,6 @@ export class ClassDefinition { throw new RangeError(`There is no field with index ${index}`); } - equals(o: ClassDefinition): boolean { if (!(o instanceof ClassDefinition)) { return false; @@ -94,6 +93,7 @@ export class FieldDefinition { private type: FieldType; private factoryId: number; private classId: number; + constructor(index: number, fieldName: string, type: FieldType, factoryId: number, classId: number) { this.index = index; this.fieldName = fieldName; @@ -143,5 +143,5 @@ export enum FieldType { LONG_ARRAY = 16, FLOAT_ARRAY = 17, DOUBLE_ARRAY = 18, - UTF_ARRAY = 19 + UTF_ARRAY = 19, } diff --git a/src/serialization/portable/ClassDefinitionContext.ts b/src/serialization/portable/ClassDefinitionContext.ts index 24c80af65..5ebbb1713 100644 --- a/src/serialization/portable/ClassDefinitionContext.ts +++ b/src/serialization/portable/ClassDefinitionContext.ts @@ -18,8 +18,7 @@ import {ClassDefinition} from './ClassDefinition'; export class ClassDefinitionContext { private factoryId: number; - - private classDefs: {[classId: string]: ClassDefinition}; + private classDefs: { [classId: string]: ClassDefinition }; constructor(factoryId: number, portableVersion: number) { this.factoryId = factoryId; @@ -30,14 +29,8 @@ export class ClassDefinitionContext { return classId + 'v' + version; } - private static decodeVersionedClassId(encoded: string): [number, number] { - var re = /(\d+)v(\d+)/; - var extracted = re.exec(encoded); - return [Number.parseInt(extracted[1]), Number.parseInt(extracted[2])]; - } - lookup(classId: number, version: number) { - var encoded = ClassDefinitionContext.encodeVersionedClassId(classId, version); + const encoded = ClassDefinitionContext.encodeVersionedClassId(classId, version); return this.classDefs[encoded]; } @@ -46,11 +39,11 @@ export class ClassDefinitionContext { return null; } if (classDefinition.getFactoryId() !== this.factoryId) { - throw new RangeError(`This factory's number is ${this.factoryId}. + throw new RangeError(`This factory's number is ${this.factoryId}. Intended factory id is ${classDefinition.getFactoryId()}`); } - var cdKey = ClassDefinitionContext.encodeVersionedClassId(classDefinition.getClassId(), classDefinition.getVersion()); - var current = this.classDefs[cdKey]; + const cdKey = ClassDefinitionContext.encodeVersionedClassId(classDefinition.getClassId(), classDefinition.getVersion()); + const current = this.classDefs[cdKey]; if (current == null) { this.classDefs[cdKey] = classDefinition; return classDefinition; diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index 88b6fc202..327448098 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {PortableWriter} from './PortableSerializer'; -import {FieldDefinition, FieldType, ClassDefinition} from './ClassDefinition'; -import {PortableContext} from './PortableContext'; -import {Portable} from '../Serializable'; -import * as Util from '../../Util'; import * as Long from 'long'; +import * as Util from '../../Util'; +import {Portable} from '../Serializable'; +import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; +import {PortableContext} from './PortableContext'; +import {PortableWriter} from './PortableSerializer'; export class ClassDefinitionWriter implements PortableWriter { private portableContext: PortableContext; @@ -29,7 +29,7 @@ export class ClassDefinitionWriter implements PortableWriter { private factoryId: number; private classId: number; private version: number; - private fieldDefinitions: {[fieldName: string]: FieldDefinition} = {}; + private fieldDefinitions: { [fieldName: string]: FieldDefinition } = {}; constructor(portableContext: PortableContext, factoryId: number, classId: number, version: number) { this.portableContext = portableContext; @@ -79,13 +79,13 @@ export class ClassDefinitionWriter implements PortableWriter { writePortable(fieldName: string, portable: Portable): void { Util.assertNotNull(portable); - var nestedCD = this.portableContext.lookupOrRegisterClassDefinition(portable); + const nestedCD = this.portableContext.lookupOrRegisterClassDefinition(portable); this.addFieldByType(fieldName, FieldType.PORTABLE, nestedCD.getFactoryId(), nestedCD.getClassId()); } writeNullPortable(fieldName: string, factoryId: number, classId: number): void { - var version: number = 0; - var nestedCD = this.portableContext.lookupClassDefinition(factoryId, classId, version); + const version: number = 0; + const nestedCD = this.portableContext.lookupClassDefinition(factoryId, classId, version); if (nestedCD == null) { throw new RangeError('Cannot write null portable without explicitly registering class definition!'); } @@ -133,13 +133,13 @@ export class ClassDefinitionWriter implements PortableWriter { if (portables.length === 0) { throw new RangeError('Cannot write empty array!'); } - var sample = portables[0]; - var nestedCD = this.portableContext.lookupOrRegisterClassDefinition(sample); + const sample = portables[0]; + const nestedCD = this.portableContext.lookupOrRegisterClassDefinition(sample); this.addFieldByType(fieldName, FieldType.PORTABLE_ARRAY, nestedCD.getFactoryId(), nestedCD.getClassId()); } end(): void { - for (var field in this.fieldDefinitions) { + for (const field in this.fieldDefinitions) { this.buildingDefinition.addFieldDefinition(this.fieldDefinitions[field]); } } diff --git a/src/serialization/portable/DefaultPortableReader.ts b/src/serialization/portable/DefaultPortableReader.ts index 3017755bb..f27ceaadc 100644 --- a/src/serialization/portable/DefaultPortableReader.ts +++ b/src/serialization/portable/DefaultPortableReader.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import {PortableReader, PortableSerializer} from './PortableSerializer'; -import {DataInput} from '../Data'; -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; -import {BitsUtil} from '../../BitsUtil'; -import {Portable} from '../Serializable'; import * as Long from 'long'; +import {BitsUtil} from '../../BitsUtil'; import {IllegalStateError} from '../../HazelcastError'; +import {DataInput} from '../Data'; +import {Portable} from '../Serializable'; +import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; +import {PortableReader, PortableSerializer} from './PortableSerializer'; export class DefaultPortableReader implements PortableReader { @@ -38,24 +38,10 @@ export class DefaultPortableReader implements PortableReader { this.classDefinition = classDefinition; this.finalPos = this.input.readInt(); - var fieldCount = this.input.readInt(); + const fieldCount = this.input.readInt(); this.offset = this.input.position(); } - private positionByFieldDefinition(field: FieldDefinition): number { - if (this.raw) { - throw new IllegalStateError('Cannot read portable fields after getRawDataInput called!'); - } - var pos = this.input.readInt(this.offset + field.getIndex() * BitsUtil.INT_SIZE_IN_BYTES); - var len = this.input.readShort(pos); - return pos + BitsUtil.SHORT_SIZE_IN_BYTES + len + 1; - } - - private positionByField(fieldName: string, fieldType: FieldType): number { - var definition = this.classDefinition.getField(fieldName); - return this.positionByFieldDefinition(definition); - } - getVersion(): number { return this.classDefinition.getVersion(); } @@ -73,58 +59,58 @@ export class DefaultPortableReader implements PortableReader { } readInt(fieldName: string): number { - var pos = this.positionByField(fieldName, FieldType.INT); + const pos = this.positionByField(fieldName, FieldType.INT); return this.input.readInt(pos); } readLong(fieldName: string): Long { - var pos = this.positionByField(fieldName, FieldType.LONG); + const pos = this.positionByField(fieldName, FieldType.LONG); return this.input.readLong(pos); } readUTF(fieldName: string): string { - var pos = this.positionByField(fieldName, FieldType.UTF); + const pos = this.positionByField(fieldName, FieldType.UTF); return this.input.readUTF(pos); } readBoolean(fieldName: string): boolean { - var pos = this.positionByField(fieldName, FieldType.BOOLEAN); + const pos = this.positionByField(fieldName, FieldType.BOOLEAN); return this.input.readBoolean(pos); } readByte(fieldName: string): number { - var pos = this.positionByField(fieldName, FieldType.BYTE); + const pos = this.positionByField(fieldName, FieldType.BYTE); return this.input.readByte(pos); } readChar(fieldName: string): string { - var pos = this.positionByField(fieldName, FieldType.CHAR); + const pos = this.positionByField(fieldName, FieldType.CHAR); return this.input.readChar(pos); } readDouble(fieldName: string): number { - var pos = this.positionByField(fieldName, FieldType.DOUBLE); + const pos = this.positionByField(fieldName, FieldType.DOUBLE); return this.input.readDouble(pos); } readFloat(fieldName: string): number { - var pos = this.positionByField(fieldName, FieldType.FLOAT); + const pos = this.positionByField(fieldName, FieldType.FLOAT); return this.input.readFloat(pos); } readShort(fieldName: string): number { - var pos = this.positionByField(fieldName, FieldType.SHORT); + const pos = this.positionByField(fieldName, FieldType.SHORT); return this.input.readShort(pos); } readPortable(fieldName: string): Portable { - var backupPos = this.input.position(); + const backupPos = this.input.position(); try { - var pos = this.positionByField(fieldName, FieldType.PORTABLE); + const pos = this.positionByField(fieldName, FieldType.PORTABLE); this.input.position(pos); - var isNull = this.input.readBoolean(); - var factoryId = this.input.readInt(); - var classId = this.input.readInt(); + const isNull = this.input.readBoolean(); + const factoryId = this.input.readInt(); + const classId = this.input.readInt(); if (isNull) { return null; } else { @@ -136,66 +122,66 @@ export class DefaultPortableReader implements PortableReader { } readByteArray(fieldName: string): number[] { - var pos = this.positionByField(fieldName, FieldType.BYTE_ARRAY); + const pos = this.positionByField(fieldName, FieldType.BYTE_ARRAY); return this.input.readByteArray(pos); } readBooleanArray(fieldName: string): boolean[] { - var pos = this.positionByField(fieldName, FieldType.BOOLEAN_ARRAY); + const pos = this.positionByField(fieldName, FieldType.BOOLEAN_ARRAY); return this.input.readBooleanArray(pos); } readCharArray(fieldName: string): string[] { - var pos = this.positionByField(fieldName, FieldType.CHAR_ARRAY); + const pos = this.positionByField(fieldName, FieldType.CHAR_ARRAY); return this.input.readCharArray(pos); } readIntArray(fieldName: string): number[] { - var pos = this.positionByField(fieldName, FieldType.INT_ARRAY); + const pos = this.positionByField(fieldName, FieldType.INT_ARRAY); return this.input.readIntArray(pos); } readLongArray(fieldName: string): Long[] { - var pos = this.positionByField(fieldName, FieldType.LONG_ARRAY); + const pos = this.positionByField(fieldName, FieldType.LONG_ARRAY); return this.input.readLongArray(pos); } readDoubleArray(fieldName: string): number[] { - var pos = this.positionByField(fieldName, FieldType.DOUBLE_ARRAY); + const pos = this.positionByField(fieldName, FieldType.DOUBLE_ARRAY); return this.input.readDoubleArray(pos); } readFloatArray(fieldName: string): number[] { - var pos = this.positionByField(fieldName, FieldType.FLOAT_ARRAY); + const pos = this.positionByField(fieldName, FieldType.FLOAT_ARRAY); return this.input.readFloatArray(pos); } readShortArray(fieldName: string): number[] { - var pos = this.positionByField(fieldName, FieldType.SHORT_ARRAY); + const pos = this.positionByField(fieldName, FieldType.SHORT_ARRAY); return this.input.readShortArray(pos); } readUTFArray(fieldName: string): string[] { - var pos = this.positionByField(fieldName, FieldType.UTF_ARRAY); + const pos = this.positionByField(fieldName, FieldType.UTF_ARRAY); return this.input.readUTFArray(pos); } readPortableArray(fieldName: string): Portable[] { - var backupPos = this.input.position(); + const backupPos = this.input.position(); try { - var pos = this.positionByField(fieldName, FieldType.PORTABLE_ARRAY); + const pos = this.positionByField(fieldName, FieldType.PORTABLE_ARRAY); this.input.position(pos); - var len = this.input.readInt(); - var factoryId = this.input.readInt(); - var classId = this.input.readInt(); + const len = this.input.readInt(); + const factoryId = this.input.readInt(); + const classId = this.input.readInt(); if (len === BitsUtil.NULL_ARRAY_LENGTH) { return null; } else { - var portables: Portable[] = []; + const portables: Portable[] = []; if (len > 0) { - var offset = this.input.position(); - for (var i = 0; i < len; i++) { - var start = this.input.readInt(offset + i * BitsUtil.INT_SIZE_IN_BYTES); + const offset = this.input.position(); + for (let i = 0; i < len; i++) { + const start = this.input.readInt(offset + i * BitsUtil.INT_SIZE_IN_BYTES); this.input.position(start); portables[i] = this.serializer.readObject(this.input, factoryId, classId); } @@ -208,7 +194,7 @@ export class DefaultPortableReader implements PortableReader { } getRawDataInput(): DataInput { - var pos: number; + let pos: number; if (!this.raw) { pos = this.input.readInt(this.offset + this.classDefinition.getFieldCount() * BitsUtil.INT_SIZE_IN_BYTES); this.input.position(pos); @@ -220,4 +206,18 @@ export class DefaultPortableReader implements PortableReader { end() { this.input.position(this.finalPos); } + + private positionByFieldDefinition(field: FieldDefinition): number { + if (this.raw) { + throw new IllegalStateError('Cannot read portable fields after getRawDataInput called!'); + } + const pos = this.input.readInt(this.offset + field.getIndex() * BitsUtil.INT_SIZE_IN_BYTES); + const len = this.input.readShort(pos); + return pos + BitsUtil.SHORT_SIZE_IN_BYTES + len + 1; + } + + private positionByField(fieldName: string, fieldType: FieldType): number { + const definition = this.classDefinition.getField(fieldName); + return this.positionByFieldDefinition(definition); + } } diff --git a/src/serialization/portable/DefaultPortableWriter.ts b/src/serialization/portable/DefaultPortableWriter.ts index 3f134f004..a98d7157c 100644 --- a/src/serialization/portable/DefaultPortableWriter.ts +++ b/src/serialization/portable/DefaultPortableWriter.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import {PortableSerializer} from './PortableSerializer'; -import {PositionalDataOutput} from '../Data'; -import {ClassDefinition, FieldType, FieldDefinition} from './ClassDefinition'; +import * as Long from 'long'; import {BitsUtil} from '../../BitsUtil'; +import {PositionalDataOutput} from '../Data'; import {Portable} from '../Serializable'; -import * as Long from 'long'; +import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; +import {PortableSerializer} from './PortableSerializer'; export class DefaultPortableWriter { private serializer: PortableSerializer; @@ -39,7 +39,7 @@ export class DefaultPortableWriter { this.output.writeInt(this.classDefinition.getFieldCount()); this.offset = this.output.position(); - var fieldIndexesLength: number = (this.classDefinition.getFieldCount() + 1) * BitsUtil.INT_SIZE_IN_BYTES; + const fieldIndexesLength: number = (this.classDefinition.getFieldCount() + 1) * BitsUtil.INT_SIZE_IN_BYTES; this.output.writeZeroBytes(fieldIndexesLength); } @@ -89,8 +89,8 @@ export class DefaultPortableWriter { } writePortable(fieldName: string, portable: Portable): void { - var fieldDefinition = this.setPosition(fieldName, FieldType.PORTABLE); - var isNullPortable = (portable == null); + const fieldDefinition = this.setPosition(fieldName, FieldType.PORTABLE); + const isNullPortable = (portable == null); this.output.writeBoolean(isNullPortable); this.output.writeInt(fieldDefinition.getFactoryId()); this.output.writeInt(fieldDefinition.getClassId()); @@ -152,11 +152,11 @@ export class DefaultPortableWriter { } writePortableArray(fieldName: string, portables: Portable[]): void { - var innerOffset: number; - var sample: Portable; - var i: number; - var fieldDefinition = this.setPosition(fieldName, FieldType.PORTABLE_ARRAY); - var len = (portables == null ) ? BitsUtil.NULL_ARRAY_LENGTH : portables.length; + let innerOffset: number; + let sample: Portable; + let i: number; + const fieldDefinition = this.setPosition(fieldName, FieldType.PORTABLE_ARRAY); + const len = (portables == null) ? BitsUtil.NULL_ARRAY_LENGTH : portables.length; this.output.writeInt(len); this.output.writeInt(fieldDefinition.getFactoryId()); this.output.writeInt(fieldDefinition.getClassId()); @@ -165,7 +165,7 @@ export class DefaultPortableWriter { this.output.writeZeroBytes(len * 4); for (i = 0; i < len; i++) { sample = portables[i]; - var posVal = this.output.position(); + const posVal = this.output.position(); this.output.pwriteInt(innerOffset + i * BitsUtil.INT_SIZE_IN_BYTES, posVal); this.serializer.writeObject(this.output, sample); } @@ -173,14 +173,14 @@ export class DefaultPortableWriter { } end(): void { - var position = this.output.position(); + const position = this.output.position(); this.output.pwriteInt(this.begin, position); } private setPosition(fieldName: string, fieldType: FieldType): FieldDefinition { - var field: FieldDefinition = this.classDefinition.getField(fieldName); - var pos: number = this.output.position(); - var index: number = field.getIndex(); + const field: FieldDefinition = this.classDefinition.getField(fieldName); + const pos: number = this.output.position(); + const index: number = field.getIndex(); this.output.pwriteInt(this.offset + index * BitsUtil.INT_SIZE_IN_BYTES, pos); this.output.writeShort(fieldName.length); this.output.writeBytes(fieldName); diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index 12efd9520..bdb2155bc 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -14,103 +14,116 @@ * limitations under the License. */ -import {DefaultPortableReader} from './DefaultPortableReader'; -import {PortableSerializer} from './PortableSerializer'; +import * as Long from 'long'; import {DataInput} from '../Data'; -import {ClassDefinition, FieldType, FieldDefinition} from './ClassDefinition'; import {Portable} from '../Serializable'; -import * as Long from 'long'; +import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; +import {DefaultPortableReader} from './DefaultPortableReader'; +import {PortableSerializer} from './PortableSerializer'; export class MorphingPortableReader extends DefaultPortableReader { constructor(portableSerializer: PortableSerializer, input: DataInput, classDefinition: ClassDefinition) { super(portableSerializer, input, classDefinition); } - private validateCompatibleAndCall(fieldName: string, expectedType: FieldType, superFunc: Function) { - var fd = this.classDefinition.getField(fieldName); - if (fd === null) { - return undefined; - } - if (fd.getType() !== expectedType) { - throw this.createIncompatibleClassChangeError(fd, expectedType); - } - return superFunc.call(this, fieldName); - } - - private createIncompatibleClassChangeError(fd: FieldDefinition, expectedType: FieldType) { - return new TypeError(`Incompatible to read ${expectedType} from ${fd.getType()} while reading field : ${fd.getName()}`); - } - readInt(fieldName: string): number { - var fieldDef = this.classDefinition.getField(fieldName); + const fieldDef = this.classDefinition.getField(fieldName); if (fieldDef == null) { return undefined; } switch (fieldDef.getType()) { - case FieldType.INT: return super.readInt(fieldName); - case FieldType.BYTE: return super.readByte(fieldName); - case FieldType.CHAR: return super.readChar(fieldName).charCodeAt(0); - case FieldType.SHORT: return super.readShort(fieldName); - default: throw this.createIncompatibleClassChangeError(fieldDef, FieldType.INT); + case FieldType.INT: + return super.readInt(fieldName); + case FieldType.BYTE: + return super.readByte(fieldName); + case FieldType.CHAR: + return super.readChar(fieldName).charCodeAt(0); + case FieldType.SHORT: + return super.readShort(fieldName); + default: + throw this.createIncompatibleClassChangeError(fieldDef, FieldType.INT); } } readLong(fieldName: string): Long { - var fieldDef = this.classDefinition.getField(fieldName); + const fieldDef = this.classDefinition.getField(fieldName); if (fieldDef == null) { return undefined; } switch (fieldDef.getType()) { - case FieldType.LONG: return super.readLong(fieldName); - case FieldType.INT: return Long.fromNumber(super.readInt(fieldName)); - case FieldType.BYTE: return Long.fromNumber(super.readByte(fieldName)); - case FieldType.CHAR: return Long.fromNumber(super.readChar(fieldName).charCodeAt(0)); - case FieldType.SHORT: return Long.fromNumber(super.readShort(fieldName)); - default: throw this.createIncompatibleClassChangeError(fieldDef, FieldType.LONG); + case FieldType.LONG: + return super.readLong(fieldName); + case FieldType.INT: + return Long.fromNumber(super.readInt(fieldName)); + case FieldType.BYTE: + return Long.fromNumber(super.readByte(fieldName)); + case FieldType.CHAR: + return Long.fromNumber(super.readChar(fieldName).charCodeAt(0)); + case FieldType.SHORT: + return Long.fromNumber(super.readShort(fieldName)); + default: + throw this.createIncompatibleClassChangeError(fieldDef, FieldType.LONG); } } readDouble(fieldName: string): number { - var fieldDef = this.classDefinition.getField(fieldName); + const fieldDef = this.classDefinition.getField(fieldName); if (fieldDef == null) { return undefined; } switch (fieldDef.getType()) { - case FieldType.DOUBLE: return super.readDouble(fieldName); - case FieldType.LONG: return super.readLong(fieldName).toNumber(); - case FieldType.FLOAT: return super.readFloat(fieldName); - case FieldType.INT: return super.readInt(fieldName); - case FieldType.BYTE: return super.readByte(fieldName); - case FieldType.CHAR: return super.readChar(fieldName).charCodeAt(0); - case FieldType.SHORT: return super.readShort(fieldName); - default: throw this.createIncompatibleClassChangeError(fieldDef, FieldType.DOUBLE); + case FieldType.DOUBLE: + return super.readDouble(fieldName); + case FieldType.LONG: + return super.readLong(fieldName).toNumber(); + case FieldType.FLOAT: + return super.readFloat(fieldName); + case FieldType.INT: + return super.readInt(fieldName); + case FieldType.BYTE: + return super.readByte(fieldName); + case FieldType.CHAR: + return super.readChar(fieldName).charCodeAt(0); + case FieldType.SHORT: + return super.readShort(fieldName); + default: + throw this.createIncompatibleClassChangeError(fieldDef, FieldType.DOUBLE); } } readFloat(fieldName: string): number { - var fieldDef = this.classDefinition.getField(fieldName); + const fieldDef = this.classDefinition.getField(fieldName); if (fieldDef == null) { return undefined; } switch (fieldDef.getType()) { - case FieldType.FLOAT: return super.readFloat(fieldName); - case FieldType.INT: return super.readInt(fieldName); - case FieldType.BYTE: return super.readByte(fieldName); - case FieldType.CHAR: return super.readChar(fieldName).charCodeAt(0); - case FieldType.SHORT: return super.readShort(fieldName); - default: throw this.createIncompatibleClassChangeError(fieldDef, FieldType.FLOAT); + case FieldType.FLOAT: + return super.readFloat(fieldName); + case FieldType.INT: + return super.readInt(fieldName); + case FieldType.BYTE: + return super.readByte(fieldName); + case FieldType.CHAR: + return super.readChar(fieldName).charCodeAt(0); + case FieldType.SHORT: + return super.readShort(fieldName); + default: + throw this.createIncompatibleClassChangeError(fieldDef, FieldType.FLOAT); } } readShort(fieldName: string): number { - var fieldDef = this.classDefinition.getField(fieldName); + const fieldDef = this.classDefinition.getField(fieldName); if (fieldDef == null) { return undefined; } switch (fieldDef.getType()) { - case FieldType.BYTE: return super.readByte(fieldName); - case FieldType.SHORT: return super.readShort(fieldName); - default: throw this.createIncompatibleClassChangeError(fieldDef, FieldType.SHORT); + case FieldType.BYTE: + return super.readByte(fieldName); + case FieldType.SHORT: + return super.readShort(fieldName); + default: + throw this.createIncompatibleClassChangeError(fieldDef, FieldType.SHORT); } } @@ -169,4 +182,19 @@ export class MorphingPortableReader extends DefaultPortableReader { readUTF(fieldName: string): string { return this.validateCompatibleAndCall(fieldName, FieldType.UTF, super.readUTF); } + + private validateCompatibleAndCall(fieldName: string, expectedType: FieldType, superFunc: Function) { + const fd = this.classDefinition.getField(fieldName); + if (fd === null) { + return undefined; + } + if (fd.getType() !== expectedType) { + throw this.createIncompatibleClassChangeError(fd, expectedType); + } + return superFunc.call(this, fieldName); + } + + private createIncompatibleClassChangeError(fd: FieldDefinition, expectedType: FieldType) { + return new TypeError(`Incompatible to read ${expectedType} from ${fd.getType()} while reading field : ${fd.getName()}`); + } } diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index 426125ce9..a2b5052f3 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -14,18 +14,18 @@ * limitations under the License. */ -import {SerializationService} from '../SerializationService'; -import {ClassDefinitionContext} from './ClassDefinitionContext'; +import {BitsUtil} from '../../BitsUtil'; import {DataInput} from '../Data'; +import {Portable, VersionedPortable} from '../Serializable'; +import {SerializationService} from '../SerializationService'; import {ClassDefinition, FieldType} from './ClassDefinition'; +import {ClassDefinitionContext} from './ClassDefinitionContext'; import {ClassDefinitionWriter} from './ClassDefinitionWriter'; -import {BitsUtil} from '../../BitsUtil'; -import {Portable, VersionedPortable} from '../Serializable'; export class PortableContext { private service: SerializationService; private portableVersion: number = 0; - private classDefContext: {[factoyId: number]: ClassDefinitionContext}; + private classDefContext: { [factoyId: number]: ClassDefinitionContext }; constructor(service: SerializationService, portableVersion: number) { this.service = service; @@ -38,28 +38,28 @@ export class PortableContext { } readClassDefinitionFromInput(input: DataInput, factoryId: number, classId: number, version: number): ClassDefinition { - var register = true; - var cdWriter = new ClassDefinitionWriter(this, factoryId, classId, version); + let register = true; + const cdWriter = new ClassDefinitionWriter(this, factoryId, classId, version); input.readInt(); - var fieldCount = input.readInt(); - var offset = input.position(); - for (var i = 0; i < fieldCount; i++) { - var pos = input.readInt(offset + i * BitsUtil.INT_SIZE_IN_BYTES); + const fieldCount = input.readInt(); + const offset = input.position(); + for (let i = 0; i < fieldCount; i++) { + const pos = input.readInt(offset + i * BitsUtil.INT_SIZE_IN_BYTES); input.position(pos); - var len = input.readShort(); - var chars = ''; - for (var j = 0; j < len; j++) { + const len = input.readShort(); + let chars = ''; + for (let j = 0; j < len; j++) { chars += String.fromCharCode(input.readUnsignedByte()); } - var type: FieldType = input.readByte(); - var name = chars; - var fieldFactoryId = 0; - var fieldClassId = 0; + const type: FieldType = input.readByte(); + const name = chars; + let fieldFactoryId = 0; + let fieldClassId = 0; if (type === FieldType.PORTABLE) { - //is null + // is null if (input.readBoolean()) { register = false; } @@ -68,19 +68,19 @@ export class PortableContext { // TODO: what there's a null inner Portable field if (register) { - var fieldVersion = input.readInt(); + const fieldVersion = input.readInt(); this.readClassDefinitionFromInput(input, fieldFactoryId, fieldClassId, fieldVersion); } } else if (type === FieldType.PORTABLE_ARRAY) { - var k = input.readInt(); + const k = input.readInt(); fieldFactoryId = input.readInt(); fieldClassId = input.readInt(); // TODO: what there's a null inner Portable field if (k > 0) { - var p = input.readInt(); + const p = input.readInt(); input.position(p); - var fieldVersion = input.readInt(); + const fieldVersion = input.readInt(); this.readClassDefinitionFromInput(input, fieldFactoryId, fieldClassId, fieldVersion); } else { register = false; @@ -89,7 +89,7 @@ export class PortableContext { cdWriter.addFieldByType(name, type, fieldFactoryId, fieldClassId); } cdWriter.end(); - var classDefinition = cdWriter.getDefinition(); + let classDefinition = cdWriter.getDefinition(); if (register) { classDefinition = cdWriter.registerAndGet(); } @@ -97,8 +97,8 @@ export class PortableContext { } lookupOrRegisterClassDefinition(portable: Portable): ClassDefinition { - var version = this.getClassVersion(portable); - var definition = this.lookupClassDefinition(portable.getFactoryId(), portable.getClassId(), version); + const version = this.getClassVersion(portable); + let definition = this.lookupClassDefinition(portable.getFactoryId(), portable.getClassId(), version); if (definition == null) { definition = this.generateClassDefinitionForPortable(portable); this.registerClassDefinition(definition); @@ -107,7 +107,7 @@ export class PortableContext { } lookupClassDefinition(factoryId: number, classId: number, version: number): ClassDefinition { - var factory = this.classDefContext[factoryId]; + const factory = this.classDefContext[factoryId]; if (factory == null) { return null; } else { @@ -116,17 +116,17 @@ export class PortableContext { } generateClassDefinitionForPortable(portable: Portable): ClassDefinition { - var version: number = this.getClassVersion(portable); - var classDefinitionWriter = new ClassDefinitionWriter(this, portable.getFactoryId(), portable.getClassId(), version); + const version: number = this.getClassVersion(portable); + const classDefinitionWriter = new ClassDefinitionWriter(this, portable.getFactoryId(), portable.getClassId(), version); portable.writePortable(classDefinitionWriter); classDefinitionWriter.end(); return classDefinitionWriter.registerAndGet(); } registerClassDefinition(classDefinition: ClassDefinition): ClassDefinition { - var factoryId = classDefinition.getFactoryId(); - var classId = classDefinition.getClassId(); - var version = classDefinition.getVersion(); + const factoryId = classDefinition.getFactoryId(); + const classId = classDefinition.getClassId(); + const version = classDefinition.getVersion(); if (!this.classDefContext[factoryId]) { this.classDefContext[factoryId] = new ClassDefinitionContext(factoryId, this.portableVersion); } @@ -134,8 +134,8 @@ export class PortableContext { } getClassVersion(portable: VersionedPortable | Portable): number { - if ((portable).getVersion) { - return (portable).getVersion(); + if ((portable as VersionedPortable).getVersion) { + return (portable as VersionedPortable).getVersion(); } else { return this.portableVersion; } diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 29912129a..f4c436e12 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -14,33 +14,33 @@ * limitations under the License. */ -import {Serializer, SerializationService} from '../SerializationService'; -import {PortableContext} from './PortableContext'; -import {PortableFactory, Portable} from '../Serializable'; +import * as Long from 'long'; +import * as Path from 'path'; +import {SerializationConfig} from '../../config/SerializationConfig'; import {DataInput, PositionalDataOutput} from '../Data'; -import {DefaultPortableReader} from './DefaultPortableReader'; -import {MorphingPortableReader} from './MorphingPortableReader'; +import {Portable, PortableFactory} from '../Serializable'; +import {SerializationService, Serializer} from '../SerializationService'; import {ClassDefinition, FieldType} from './ClassDefinition'; +import {DefaultPortableReader} from './DefaultPortableReader'; import {DefaultPortableWriter} from './DefaultPortableWriter'; -import * as Long from 'long'; -import {SerializationConfig} from '../../config/SerializationConfig'; -import * as Path from 'path'; +import {MorphingPortableReader} from './MorphingPortableReader'; +import {PortableContext} from './PortableContext'; export class PortableSerializer implements Serializer { private portableContext: PortableContext; - private factories: {[id: number]: PortableFactory}; + private factories: { [id: number]: PortableFactory }; private service: SerializationService; constructor(service: SerializationService, serializationConfig: SerializationConfig) { this.service = service; this.portableContext = new PortableContext(this.service, serializationConfig.portableVersion); this.factories = serializationConfig.portableFactories; - let factoryConfigs = serializationConfig.portableFactoryConfigs; - for (let id in factoryConfigs) { - let exportedName = factoryConfigs[id].exportedName; - let path = factoryConfigs[id].path; - let factoryConstructor = require(Path.resolve(require.main.filename, path))[exportedName]; + const factoryConfigs = serializationConfig.portableFactoryConfigs; + for (const id in factoryConfigs) { + const exportedName = factoryConfigs[id].exportedName; + const path = factoryConfigs[id].path; + const factoryConstructor = require(Path.resolve(require.main.filename, path))[exportedName]; this.factories[id] = new factoryConstructor(); } } @@ -50,30 +50,30 @@ export class PortableSerializer implements Serializer { } read(input: DataInput): any { - var factoryId = input.readInt(); - var classId = input.readInt(); + const factoryId = input.readInt(); + const classId = input.readInt(); return this.readObject(input, factoryId, classId); } readObject(input: DataInput, factoryId: number, classId: number): Portable { - var version = input.readInt(); + const version = input.readInt(); - var factory = this.factories[factoryId]; + const factory = this.factories[factoryId]; if (factory == null) { throw new RangeError(`There is no suitable portable factory for ${factoryId}.`); } - var portable: Portable = factory.create(classId); - var classDefinition = this.portableContext.lookupClassDefinition(factoryId, classId, version); + const portable: Portable = factory.create(classId); + let classDefinition = this.portableContext.lookupClassDefinition(factoryId, classId, version); if (classDefinition == null) { - var backupPos = input.position(); + const backupPos = input.position(); try { classDefinition = this.portableContext.readClassDefinitionFromInput(input, factoryId, classId, version); } finally { input.position(backupPos); } } - var reader: PortableReader; + let reader: PortableReader; if (classDefinition.getVersion() === this.portableContext.getClassVersion(portable)) { reader = new DefaultPortableReader(this, input, classDefinition); } else { @@ -92,66 +92,109 @@ export class PortableSerializer implements Serializer { } writeObject(output: PositionalDataOutput, object: Portable): void { - var cd: ClassDefinition = this.portableContext.lookupOrRegisterClassDefinition(object); + const cd: ClassDefinition = this.portableContext.lookupOrRegisterClassDefinition(object); output.writeInt(cd.getVersion()); - var writer = new DefaultPortableWriter(this, output, cd); + const writer = new DefaultPortableWriter(this, output, cd); object.writePortable(writer); writer.end(); } } - - export interface PortableWriter { writeInt(fieldName: string, value: number): void; + writeLong(fieldName: string, long: Long): void; + writeUTF(fieldName: string, str: string): void; + writeBoolean(fieldName: string, value: boolean): void; + writeByte(fieldName: string, value: number): void; + writeChar(fieldName: string, char: string): void; + writeDouble(fieldName: string, double: number): void; + writeFloat(fieldName: string, float: number): void; + writeShort(fieldName: string, value: number): void; + writePortable(fieldName: string, portable: Portable): void; + writeNullPortable(fieldName: string, factoryId: number, classId: number): void; + writeByteArray(fieldName: string, bytes: number[]): void; + writeBooleanArray(fieldName: string, booleans: boolean[]): void; + writeCharArray(fieldName: string, chars: string[]): void; + writeIntArray(fieldName: string, ints: number[]): void; + writeLongArray(fieldName: string, longs: Long[]): void; + writeDoubleArray(fieldName: string, doubles: number[]): void; + writeFloatArray(fieldName: string, floats: number[]): void; + writeShortArray(fieldName: string, shorts: number[]): void; + writeUTFArray(fieldName: string, val: string[]): void; + writePortableArray(fieldName: string, portables: Portable[]): void; + end(): void; } export interface PortableReader { getVersion(): number; + hasField(fieldName: string): boolean; + getFieldNames(): string[]; + getFieldType(fieldName: string): FieldType; + readInt(fieldName: string): number; + readLong(fieldName: string): Long; + readUTF(fieldName: string): string; + readBoolean(fieldName: string): boolean; + readByte(fieldName: string): number; + readChar(fieldName: string): string; + readDouble(fieldName: string): number; + readFloat(fieldName: string): number; + readShort(fieldName: string): number; + readPortable(fieldName: string): Portable; + readByteArray(fieldName: string): number[]; + readBooleanArray(fieldName: string): boolean[]; + readCharArray(fieldName: string): string[]; + readIntArray(fieldName: string): number[]; + readLongArray(fieldName: string): Long[]; + readDoubleArray(fieldName: string): number[]; + readFloatArray(fieldName: string): number[]; + readShortArray(fieldName: string): number[]; + readUTFArray(fieldName: string): string[]; + readPortableArray(fieldName: string): Portable[]; + end(): void; } diff --git a/src/util/ArrayComparator.ts b/src/util/ArrayComparator.ts index 0cd477a46..89abcfdc7 100644 --- a/src/util/ArrayComparator.ts +++ b/src/util/ArrayComparator.ts @@ -14,6 +14,4 @@ * limitations under the License. */ -export interface ArrayComparator { - (a: T, b: T): number; -} +export type ArrayComparator = (a: T, b: T) => number; diff --git a/src/util/UuidUtil.ts b/src/util/UuidUtil.ts index fc87094ce..bcb049689 100644 --- a/src/util/UuidUtil.ts +++ b/src/util/UuidUtil.ts @@ -15,8 +15,8 @@ */ /* tslint:disable:no-bitwise */ -import {UUID} from '../core/UUID'; import * as Long from 'long'; +import {UUID} from '../core/UUID'; const INT_BOUND = 0xFFFFFFFF; @@ -26,8 +26,8 @@ function randomUInt(): number { export class UuidUtil { static generate(): UUID { - let mostS = new Long(randomUInt(), randomUInt(), true); - let leastS = new Long(randomUInt(), randomUInt(), true); + const mostS = new Long(randomUInt(), randomUInt(), true); + const leastS = new Long(randomUInt(), randomUInt(), true); return new UUID(mostS, leastS); } } diff --git a/test/BuildMetadataTest.js b/test/BuildMetadataTest.js index 22c0788f4..18874b54b 100644 --- a/test/BuildMetadataTest.js +++ b/test/BuildMetadataTest.js @@ -17,8 +17,8 @@ var BuildMetadata = require('../lib/BuildMetadata').BuildMetadata; var assert = require('chai').assert; -describe('BuildMetadata', function() { - it('version calculation test', function() { +describe('BuildMetadata', function () { + it('version calculation test', function () { assert.equal(-1, BuildMetadata.calculateVersion(null)); assert.equal(-1, BuildMetadata.calculateVersion("")); assert.equal(-1, BuildMetadata.calculateVersion("a.3.7.5")); diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index a5f6e1e1d..c967f32ed 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -22,13 +22,13 @@ var sinon = require('sinon'); var assert = require('chai').assert; var sandbox = sinon.createSandbox(); -describe('Generic proxy test', function() { +describe('Generic proxy test', function () { - afterEach(function() { + afterEach(function () { sandbox.restore(); }); - it('Client without active connection should return unknown version', function() { + it('Client without active connection should return unknown version', function () { var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); connectionManagerStub.getActiveConnections.returns({}); var clientStub = sandbox.stub(HazelcastClient.prototype); @@ -38,7 +38,7 @@ describe('Generic proxy test', function() { assert.equal(mapProxy.getConnectedServerVersion(), -1); }); - it('Client with a 3.7 server connection should return the version', function() { + it('Client with a 3.7 server connection should return the version', function () { var connectionStub = sandbox.stub(ClientConnection.prototype); connectionStub.getConnectedServerVersion.returns('30700'); var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index ecd430ed1..0457f90d5 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -34,25 +34,25 @@ describe('Client reconnect', function () { this.timeout(9000); var member; var map; - return Controller.createCluster(null, null).then(function(cl) { + return Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); - }).then(function(m) { + }).then(function (m) { member = m; var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(cl) { + }).then(function (cl) { client = cl; map = client.getMap('test'); - }).then(function() { + }).then(function () { return Controller.terminateMember(cluster.id, member.uuid); - }).then(function() { + }).then(function () { return Controller.startMember(cluster.id); - }).then(function() { + }).then(function () { return map.put('testkey', 'testvalue'); - }).then(function() { + }).then(function () { return map.get('testkey'); }).then(function (val) { return expect(val).to.equal('testvalue'); @@ -63,22 +63,22 @@ describe('Client reconnect', function () { this.timeout(5000); var member; var map; - Controller.createCluster(null, null).then(function(cl) { + Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); - }).then(function(m) { + }).then(function (m) { member = m; var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; cfg.networkConfig.connectionTimeout = 10000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(cl) { + }).then(function (cl) { client = cl; map = client.getMap('test'); - }).then(function() { + }).then(function () { return Controller.terminateMember(cluster.id, member.uuid); - }).then(function() { + }).then(function () { map.put('testkey', 'testvalue').then(function () { return map.get('testkey'); }).then(function (val) { @@ -89,7 +89,7 @@ describe('Client reconnect', function () { done(e); } }); - }).then(function() { + }).then(function () { return Controller.startMember(cluster.id); }); }); @@ -98,25 +98,25 @@ describe('Client reconnect', function () { this.timeout(5000); var member; var map; - return Controller.createCluster(null, null).then(function(cl) { + return Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); - }).then(function(m) { + }).then(function (m) { member = m; var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(cl) { + }).then(function (cl) { client = cl; return Controller.terminateMember(cluster.id, member.uuid); - }).then(function() { + }).then(function () { map = client.getMap('test'); - }).then(function() { + }).then(function () { return Controller.startMember(cluster.id); - }).then(function() { + }).then(function () { return map.put('testkey', 'testvalue'); - }).then(function() { + }).then(function () { return map.get('testkey'); }).then(function (val) { return expect(val).to.equal('testvalue'); diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index ad3a14c9c..e77daaa8e 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -22,38 +22,38 @@ var Address = require('../.').Address; var Promise = require('bluebird'); var Address = require('../.').Address; -describe('ClusterService', function() { +describe('ClusterService', function () { this.timeout(25000); var cluster; var ownerMember; var client; - beforeEach(function(done) { - Controller.createCluster(null, null).then(function(res) { + beforeEach(function (done) { + Controller.createCluster(null, null).then(function (res) { cluster = res; - Controller.startMember(cluster.id).then(function(res) { + Controller.startMember(cluster.id).then(function (res) { ownerMember = res; var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 5000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(res) { + }).then(function (res) { client = res; done(); - }).catch(function(err) { + }).catch(function (err) { done(err); }); - }).catch(function(err) { + }).catch(function (err) { done(err); }); }); - afterEach(function() { + afterEach(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - it('should know when a new member joins to cluster', function(done) { + it('should know when a new member joins to cluster', function (done) { var member2; client.getClusterService().once('memberAdded', function () { @@ -61,12 +61,12 @@ describe('ClusterService', function() { done(); }); - Controller.startMember(cluster.id).then(function(res) { + Controller.startMember(cluster.id).then(function (res) { member2 = res; }); }); - it('should know when a member leaves cluster', function(done) { + it('should know when a member leaves cluster', function (done) { var member2; client.getClusterService().once('memberRemoved', function () { @@ -74,7 +74,7 @@ describe('ClusterService', function() { done(); }); - Controller.startMember(cluster.id).then(function(res) { + Controller.startMember(cluster.id).then(function (res) { member2 = res; Controller.shutdownMember(cluster.id, member2.uuid); }); @@ -104,7 +104,7 @@ describe('ClusterService', function() { }); }); - it('should throw with message containing wrong host addresses in config', function() { + it('should throw with message containing wrong host addresses in config', function () { var cfg = new Config.ClientConfig(); cfg.networkConfig.addresses = [ new Address('0.0.0.0', 5709), @@ -113,10 +113,10 @@ describe('ClusterService', function() { var falseStart = false; return HazelcastClient.newHazelcastClient(cfg).catch(function (err) { - Promise.all(cfg.networkConfig.addresses.map(function(address) { + Promise.all(cfg.networkConfig.addresses.map(function (address) { return expect(err.message).to.include(address.toString()); })); - }).then(function(client) { + }).then(function (client) { if (client) { falseStart = true; return client.shutdown(); @@ -130,10 +130,10 @@ describe('ClusterService', function() { }); }); - it('should throw with wrong group name', function(done) { + it('should throw with wrong group name', function (done) { var cfg = new Config.ClientConfig(); cfg.groupConfig.name = 'wrong'; - HazelcastClient.newHazelcastClient(cfg).then(function(newClient) { + HazelcastClient.newHazelcastClient(cfg).then(function (newClient) { newClient.shutdown(); done(new Error('Client falsely started with wrong group name')); }).catch(function (err) { @@ -141,10 +141,10 @@ describe('ClusterService', function() { }); }); - it('should throw with wrong group password', function(done) { + it('should throw with wrong group password', function (done) { var cfg = new Config.ClientConfig(); cfg.groupConfig.password = 'wrong'; - HazelcastClient.newHazelcastClient(cfg).then(function(newClient) { + HazelcastClient.newHazelcastClient(cfg).then(function (newClient) { newClient.shutdown(); done(new Error('Client falsely started with wrong group password')); }).catch(function (err) { diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index a59c104c3..9c241673c 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -41,13 +41,13 @@ ManagedObjects.prototype.getObject = function (func, name) { return obj; }; -ManagedObjects.prototype.destroyAll = function() { +ManagedObjects.prototype.destroyAll = function () { this.managedObjects.forEach(function (obj) { obj.destroy(); }); }; -ManagedObjects.prototype.destroy = function(name) { +ManagedObjects.prototype.destroy = function (name) { this.managedObjects.filter((el) => { if (el.getName() == name) { el.destroy(); @@ -59,19 +59,19 @@ ManagedObjects.prototype.destroy = function(name) { configParams.forEach(function (cfg) { - describe('HazelcastClient', function() { + describe('HazelcastClient', function () { this.timeout(4000); var cluster; var client; var managed; - before(function() { - return Controller.createCluster(null, null).then(function(res) { + before(function () { + return Controller.createCluster(null, null).then(function (res) { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { return HazelcastClient.newHazelcastClient(cfg); - }).then(function(res) { + }).then(function (res) { client = res; }); }); @@ -84,13 +84,13 @@ configParams.forEach(function (cfg) { managed.destroyAll(); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - it('getDistributedObject returns empty array when there is no distributed object', function() { - return client.getDistributedObjects().then(function(distributedObjects) { + it('getDistributedObject returns empty array when there is no distributed object', function () { + return client.getDistributedObjects().then(function (distributedObjects) { return Promise.all([ expect(distributedObjects).to.be.an('array'), expect(distributedObjects).to.be.empty @@ -98,7 +98,7 @@ configParams.forEach(function (cfg) { }); }); - it('getLocalEndpoint returns correct info', function() { + it('getLocalEndpoint returns correct info', function () { var info = client.getLocalEndpoint(); expect(info.localAddress.host).to.equal(client.clusterService.getOwnerConnection().localAddress.host); expect(info.localAddress.port).to.equal(client.clusterService.getOwnerConnection().localAddress.port); @@ -124,7 +124,7 @@ configParams.forEach(function (cfg) { }, 300); }); - it('getDistributedObjects does not return removed object', function(done) { + it('getDistributedObjects does not return removed object', function (done) { managed.getObject(client.getMap.bind(client, 'map1')); managed.getObject(client.getMap.bind(client, 'map2')); managed.getObject(client.getMap.bind(client, 'map3')); @@ -133,7 +133,7 @@ configParams.forEach(function (cfg) { managed.destroy('map1'); client.getDistributedObjects().then(function (distObjects) { try { - names = distObjects.map(function(o) { + names = distObjects.map(function (o) { return o.getName(); }); expect(names).to.have.members(['map2', 'map3']); diff --git a/test/HeartbeatTest.js b/test/HeartbeatTest.js index c06458798..ef047fd67 100644 --- a/test/HeartbeatTest.js +++ b/test/HeartbeatTest.js @@ -21,84 +21,88 @@ var Config = require('../.').Config; var Util = require('./Util'); var Address = require('../.').Address; -describe('Heartbeat', function() { +describe('Heartbeat', function () { this.timeout(30000); var cluster; - beforeEach(function() { - return RC.createCluster(null, null).then(function(resp) { + beforeEach(function () { + return RC.createCluster(null, null).then(function (resp) { cluster = resp; }); }); - afterEach(function() { + afterEach(function () { return RC.shutdownCluster(cluster.id); }); - it('Heartbeat stopped fired when second member stops heartbeating', function(done) { + it('Heartbeat stopped fired when second member stops heartbeating', function (done) { var client; - RC.startMember(cluster.id).then(function() { + RC.startMember(cluster.id).then(function () { var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 500; cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(resp) { + }).then(function (resp) { client = resp; - }).then(function() { - client.clusterService.on('memberAdded', function(member) { + }).then(function () { + client.clusterService.on('memberAdded', function (member) { var address = new Address(member.address.host, member.address.port); warmUpConnectionToAddressWithRetry(client, address); }); - client.heartbeat.addListener({onHeartbeatStopped: function(connection) { - client.shutdown(); - done(); - }}) - }).then(function() { + client.heartbeat.addListener({ + onHeartbeatStopped: function (connection) { + client.shutdown(); + done(); + } + }) + }).then(function () { return RC.startMember(cluster.id); - }).then(function(member2) { + }).then(function (member2) { simulateHeartbeatLost(client, member2.host + ':' + member2.port, 2000); }).catch(done); }); - it('Heartbeat restored fired when second member comes back', function(done) { + it('Heartbeat restored fired when second member comes back', function (done) { var client; var member1; var member2; - RC.startMember(cluster.id).then(function(m) { + RC.startMember(cluster.id).then(function (m) { member1 = m; var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 500; cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(resp) { + }).then(function (resp) { client = resp; - client.clusterService.on('memberAdded', function(member) { - warmUpConnectionToAddressWithRetry(client, member.address, 3).then(function() { + client.clusterService.on('memberAdded', function (member) { + warmUpConnectionToAddressWithRetry(client, member.address, 3).then(function () { simulateHeartbeatLost(client, member.address, 2000); }).catch(done); }); - client.heartbeat.addListener({onHeartbeatRestored: function(connection) { - client.shutdown(); - done(); - }}); + client.heartbeat.addListener({ + onHeartbeatRestored: function (connection) { + client.shutdown(); + done(); + } + }); return RC.startMember(cluster.id); - }).then(function(resp) { + }).then(function (resp) { member2 = resp; }).catch(done); }); it('emits shutdown when lost connection to cluster', function (done) { var member; - RC.startMember(cluster.id).then(function(m) { + RC.startMember(cluster.id).then(function (m) { member = m; var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 500; cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(client) { + }).then(function (client) { var expected = 'shuttingDown'; - client.lifecycleService.on('lifecycleEvent', function(state) { + client.lifecycleService.on('lifecycleEvent', function (state) { if (state === 'shuttingDown' && expected === 'shuttingDown') { expected = 'shutdown'; } else if (state === 'shutdown' && expected === 'shutdown') { diff --git a/test/LifecycleServiceTest.js b/test/LifecycleServiceTest.js index a6e2c1d9f..d39c72d1b 100644 --- a/test/LifecycleServiceTest.js +++ b/test/LifecycleServiceTest.js @@ -19,26 +19,26 @@ var HazelcastClient = require('../.').Client; var Config = require('../.').Config; var expect = require('chai').expect; -describe('LifecycleService', function() { +describe('LifecycleService', function () { var cluster; var client; - before(function() { - return RC.createCluster(null, null).then(function(res) { + before(function () { + return RC.createCluster(null, null).then(function (res) { cluster = res; return RC.startMember(cluster.id); }); }); - after(function() { + after(function () { return RC.shutdownCluster(cluster.id); }); - it('client should emit starting, started, shuttingDown and shutdown events in order', function(done) { + it('client should emit starting, started, shuttingDown and shutdown events in order', function (done) { var cfg = new Config.ClientConfig(); var expectedState = 'starting'; cfg.listeners.addLifecycleListener( - function(state) { + function (state) { if (state === 'starting' && expectedState === 'starting') { expectedState = 'started' } else if (state === 'started' && expectedState === 'started') { @@ -52,15 +52,15 @@ describe('LifecycleService', function() { } } ); - HazelcastClient.newHazelcastClient(cfg).then(function(client) { + HazelcastClient.newHazelcastClient(cfg).then(function (client) { client.shutdown(); }); }); - it('client should emit starting, started, shuttingDown and shutdown events in order (via import config)', function(done) { + it('client should emit starting, started, shuttingDown and shutdown events in order (via import config)', function (done) { var cfg = new Config.ClientConfig(); var expectedState = 'starting'; - exports.lifecycleListener = function(state) { + exports.lifecycleListener = function (state) { if (state === 'starting' && expectedState === 'starting') { expectedState = 'started' } else if (state === 'started' && expectedState === 'started') { @@ -74,15 +74,15 @@ describe('LifecycleService', function() { } }; cfg.listenerConfigs.push({path: __filename, exportedName: 'lifecycleListener'}); - HazelcastClient.newHazelcastClient(cfg).then(function(client) { + HazelcastClient.newHazelcastClient(cfg).then(function (client) { client.shutdown(); }); }); - it('event listener should get shuttingDown and shutdown events when added after startup', function(done) { + it('event listener should get shuttingDown and shutdown events when added after startup', function (done) { var expectedState = 'shuttingDown'; - HazelcastClient.newHazelcastClient().then(function(client) { - client.lifecycleService.on('lifecycleEvent', function(state) { + HazelcastClient.newHazelcastClient().then(function (client) { + client.lifecycleService.on('lifecycleEvent', function (state) { if (state === 'shuttingDown' && expectedState === 'shuttingDown') { expectedState = 'shutdown'; } else if (state === 'shutdown' && expectedState === 'shutdown') { @@ -95,10 +95,10 @@ describe('LifecycleService', function() { }); }); - it('isRunning returns correct values at lifecycle stages', function(done) { - HazelcastClient.newHazelcastClient().then(function(client) { + it('isRunning returns correct values at lifecycle stages', function (done) { + HazelcastClient.newHazelcastClient().then(function (client) { client.lifecycleService.on('lifecycleEvent', - function(state) { + function (state) { if (state === 'starting') { expect(client.lifecycleService.isRunning()).to.be.false; } else if (state === 'started') { @@ -117,8 +117,8 @@ describe('LifecycleService', function() { }); }); - it('emitLifecycleEvent throws for invalid event', function(done) { - HazelcastClient.newHazelcastClient().then(function(client) { + it('emitLifecycleEvent throws for invalid event', function (done) { + HazelcastClient.newHazelcastClient().then(function (client) { expect(client.lifecycleService.emitLifecycleEvent.bind(client.lifecycleService, 'invalid')).to.throw(Error); client.shutdown(); done(); diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index 22f2b774c..be32d2723 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -21,32 +21,32 @@ var expect = require('chai').expect; [true, false].forEach(function (isSmartService) { - describe('ListenerService[smart=' + isSmartService + ']', function() { + describe('ListenerService[smart=' + isSmartService + ']', function () { var cluster; var client; - before(function() { - return RC.createCluster(null, null).then(function(res) { + before(function () { + return RC.createCluster(null, null).then(function (res) { cluster = res; return Promise.resolve(cluster.id); - }).then(function(clusterId) { + }).then(function (clusterId) { return RC.startMember(clusterId) - }).then(function() { + }).then(function () { var cfg = new Config.ClientConfig(); cfg.networkConfig.smartRouting = isSmartService; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(res) { + }).then(function (res) { client = res; }); }); - after(function() { + after(function () { client.shutdown(); return RC.shutdownCluster(cluster.id); }); - it('listener is invoked when a new object is created', function(done) { - client.addDistributedObjectListener(function(name, serviceName, eventType) { + it('listener is invoked when a new object is created', function (done) { + client.addDistributedObjectListener(function (name, serviceName, eventType) { if (eventType === 'created' && name === 'mapToListen') { expect(serviceName).to.eq('hz:impl:mapService'); done(); @@ -56,10 +56,10 @@ var expect = require('chai').expect; }); }); - it('listener is invoked when an object is removed[smart=' + isSmartService + ']', function(done) { + it('listener is invoked when an object is removed[smart=' + isSmartService + ']', function (done) { var map; - client.addDistributedObjectListener(function(name, serviceName, eventType) { - if (eventType === 'destroyed' && name === 'mapToRemove' ) { + client.addDistributedObjectListener(function (name, serviceName, eventType) { + if (eventType === 'destroyed' && name === 'mapToRemove') { expect(serviceName).to.eq('hz:impl:mapService'); done(); } else if (eventType === 'created' && name === 'mapToRemove') { @@ -70,13 +70,13 @@ var expect = require('chai').expect; }); }); - it('listener is not invoked when listener was already removed by user', function(done) { + it('listener is not invoked when listener was already removed by user', function (done) { this.timeout(3000); - client.addDistributedObjectListener(function(name, serviceName, eventType) { + client.addDistributedObjectListener(function (name, serviceName, eventType) { done('Should not have run!'); - }).then(function(listenerId) { + }).then(function (listenerId) { return client.removeDistributedObjectListener(listenerId) - }).then(function() { + }).then(function () { setTimeout(done, 1000); }); }); diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 528f37524..fd2423295 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -34,13 +34,13 @@ describe('Listeners on reconnect', function () { }); }); - afterEach(function() { + afterEach(function () { this.timeout(30000); client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - [true, false].forEach(function (isSmart) { + [true, false].forEach(function (isSmart) { function closeTwoMembersOfThreeAndTestListener(done, membersToClose, turnoffMember) { var map; @@ -61,7 +61,7 @@ describe('Listeners on reconnect', function () { client = cl; map = client.getMap('testmap'); var listenerObject = { - added: function(key, oldValue, value, mergingValue) { + added: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('keyx'); expect(oldValue).to.be.undefined; @@ -91,27 +91,27 @@ describe('Listeners on reconnect', function () { * - the other unrelated connection */ - it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.terminateMember); }); - it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [0, 1], Controller.terminateMember); }); - it('kill two members [0,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('kill two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [0, 2], Controller.terminateMember); }); - it('shutdown two members [1,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('shutdown two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.shutdownMember); }); - it('shutdown two members [0,1], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('shutdown two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [0, 1], Controller.shutdownMember); }); - it('shutdown two members [0,2], listener still receives map.put event [smart=' + isSmart +']', function (done) { + it('shutdown two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { closeTwoMembersOfThreeAndTestListener(done, [0, 2], Controller.shutdownMember); }); @@ -129,7 +129,7 @@ describe('Listeners on reconnect', function () { client = cl; map = client.getMap('testmap'); var listenerObject = { - added: function(key, oldValue, value, mergingValue) { + added: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('keyx'); expect(oldValue).to.be.undefined; @@ -153,5 +153,4 @@ describe('Listeners on reconnect', function () { }); - }); diff --git a/test/LoggingTest.js b/test/LoggingTest.js index e35376c7b..a22bfc36a 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -20,7 +20,7 @@ var winston = require('winston'); var Config = require('../.').Config; var Controller = require('./RC'); var HazelcastClient = require('../.').Client; -describe('Logging Test', function() { +describe('Logging Test', function () { var cluster; var client; @@ -39,27 +39,27 @@ describe('Logging Test', function() { 'silly' ], - log: function(level, className, message, furtherInfo) { + log: function (level, className, message, furtherInfo) { this.logger.log(this.levels[level], className + ' ' + message); } }; - before(function() { - return Controller.createCluster(null, null).then(function(res) { + before(function () { + return Controller.createCluster(null, null).then(function (res) { cluster = res; return Controller.startMember(cluster.id); }); }); - after(function() { + after(function () { return Controller.shutdownCluster(cluster.id); }); - beforeEach(function() { + beforeEach(function () { sinon.spy(console, 'log'); }); - afterEach(function() { + afterEach(function () { if (client != null) { client.shutdown(); client = null; @@ -67,45 +67,45 @@ describe('Logging Test', function() { console.log.restore(); }); - it('winston should emit logging event', function() { + it('winston should emit logging event', function () { var loggingHappened = false; - winstonAdapter.logger.on('logging', function(transport, level, msg, meta) { + winstonAdapter.logger.on('logging', function (transport, level, msg, meta) { loggingHappened = true; }); var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.logging'] = winstonAdapter; - return HazelcastClient.newHazelcastClient(cfg).then(function(hz) { + return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { client = hz; return expect(loggingHappened).to.be.true; }); }); - it('no logging', function() { + it('no logging', function () { var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.logging'] = 'off'; - return HazelcastClient.newHazelcastClient(cfg).then(function(hz) { + return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { client = hz; return sinon.assert.notCalled(console.log); }); }); - it('default logging in case of empty property', function() { - return HazelcastClient.newHazelcastClient().then(function(hz) { + it('default logging in case of empty property', function () { + return HazelcastClient.newHazelcastClient().then(function (hz) { client = hz; return sinon.assert.called(console.log); }); }); - it('default logging in case of default property', function() { + it('default logging in case of default property', function () { var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.logging'] = 'default'; - return HazelcastClient.newHazelcastClient(cfg).then(function(hz) { + return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { client = hz; return sinon.assert.called(console.log); }); }); - it('error in case of unknown property value', function() { + it('error in case of unknown property value', function () { var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.logging'] = 'unknw'; return expect(HazelcastClient.newHazelcastClient.bind(this, cfg)).to.throw(Error); diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index d6257672b..9e393d8aa 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -18,41 +18,41 @@ var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; var Config = require('../.').Config; -describe('Lost connection', function() { +describe('Lost connection', function () { var cluster; var member1; var client; - before(function(done) { - Controller.createCluster(null, null).then(function(res) { + before(function (done) { + Controller.createCluster(null, null).then(function (res) { cluster = res; - Controller.startMember(cluster.id).then(function(res) { + Controller.startMember(cluster.id).then(function (res) { member1 = res; var cfg = new Config.ClientConfig(); cfg.properties['hazelcast.client.heartbeat.interval'] = 500; cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; return HazelcastClient.newHazelcastClient(cfg); - }).then(function(res) { + }).then(function (res) { client = res; done(); - }).catch(function(err) { + }).catch(function (err) { done(err); }); - }).catch(function(err) { + }).catch(function (err) { done(err); }); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - it('M2 starts, M1 goes down, client sets M2 as owner', function(done) { + it('M2 starts, M1 goes down, client sets M2 as owner', function (done) { this.timeout(12000); var newMember; - client.clusterService.on('memberAdded', function() { - Controller.shutdownMember(cluster.id, member1.uuid).then(function() { - setTimeout(function() { + client.clusterService.on('memberAdded', function () { + Controller.shutdownMember(cluster.id, member1.uuid).then(function () { + setTimeout(function () { try { expect(client.clusterService.getOwnerConnection().address.host).to.be.eq(newMember.host); expect(client.clusterService.getOwnerConnection().address.port).to.be.eq(newMember.port); @@ -63,7 +63,7 @@ describe('Lost connection', function() { }, 2500) }); }); - Controller.startMember(cluster.id).then(function(m) { + Controller.startMember(cluster.id).then(function (m) { newMember = m; }); }); diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index c81d366d0..8e1540502 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -18,34 +18,34 @@ var HazelcastClient = require('../.').Client; var Controller = require('./RC'); var expect = require('chai').expect; var Promise = require('bluebird'); -describe('MembershipListener', function() { +describe('MembershipListener', function () { this.timeout(10000); var cluster; var member; var client; - before(function(done) { - Controller.createCluster(null, null).then(function(res) { + before(function (done) { + Controller.createCluster(null, null).then(function (res) { cluster = res; - return Controller.startMember(cluster.id).then(function(res) { + return Controller.startMember(cluster.id).then(function (res) { member = res; return HazelcastClient.newHazelcastClient(); - }).then(function(res) { + }).then(function (res) { client = res; done(); - }).catch(function(err) { + }).catch(function (err) { done(err); }); - }).catch(function(err) { + }).catch(function (err) { done(err); }); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - it('sees member added event', function(done) { + it('sees member added event', function (done) { var newMember; var err = undefined; var listenerCalledResolver = Promise.defer(); @@ -54,7 +54,7 @@ describe('MembershipListener', function() { listenerCalledResolver.resolve(member); }); - Controller.startMember(cluster.id).then(function(res) { + Controller.startMember(cluster.id).then(function (res) { newMember = res; return listenerCalledResolver.promise; }).then(function (addedMember) { @@ -62,15 +62,15 @@ describe('MembershipListener', function() { expect(addedMember.address.port).to.equal(newMember.port); }).catch(function (e) { err = e; - }).finally(function(e) { - Controller.shutdownMember(cluster.id, newMember.uuid).then(function() { + }).finally(function (e) { + Controller.shutdownMember(cluster.id, newMember.uuid).then(function () { done(err); }); }); }); - it('sees member removed event', function(done) { + it('sees member removed event', function (done) { var newMember; var listenerCalledResolver = Promise.defer(); @@ -78,12 +78,12 @@ describe('MembershipListener', function() { listenerCalledResolver.resolve(member); }); - Controller.startMember(cluster.id).then(function(res) { + Controller.startMember(cluster.id).then(function (res) { newMember = res; return Controller.shutdownMember(cluster.id, newMember.uuid); - }).then(function() { + }).then(function () { return listenerCalledResolver.promise; - }).then(function(removedMember) { + }).then(function (removedMember) { try { expect(removedMember.address.host).to.equal(newMember.host); expect(removedMember.address.port).to.equal(newMember.port); @@ -94,9 +94,9 @@ describe('MembershipListener', function() { }); }); - it('sees member attribute change put event', function(done) { - client.clusterService.on('memberAttributeChange', function(uuid, key, op, value) { - if(op === 'put') { + it('sees member attribute change put event', function (done) { + client.clusterService.on('memberAttributeChange', function (uuid, key, op, value) { + if (op === 'put') { expect(uuid).to.equal(member.uuid); expect(key).to.equal('test'); expect(value).to.equal('123'); @@ -108,8 +108,8 @@ describe('MembershipListener', function() { Controller.executeOnController(cluster.id, script, 1); }); - it('sees member attribute change remove event', function(done) { - client.clusterService.on('memberAttributeChange', function(uuid, key, op, value) { + it('sees member attribute change remove event', function (done) { + client.clusterService.on('memberAttributeChange', function (uuid, key, op, value) { if (op === 'remove') { expect(uuid).to.equal(member.uuid); expect(key, 'test'); diff --git a/test/RC.js b/test/RC.js index e608db9ff..33e399b18 100644 --- a/test/RC.js +++ b/test/RC.js @@ -21,7 +21,7 @@ var controller = new RemoteController('localhost', 9701); function createCluster(hzVersion, config) { var deferred = Promise.defer(); - controller.createCluster(hzVersion, config, function(err, cluster) { + controller.createCluster(hzVersion, config, function (err, cluster) { if (err) return deferred.reject(err); return deferred.resolve(cluster); }); @@ -30,7 +30,7 @@ function createCluster(hzVersion, config) { function startMember(clusterId) { var deferred = Promise.defer(); - controller.startMember(clusterId, function(err, member) { + controller.startMember(clusterId, function (err, member) { if (err) return deferred.reject(err); return deferred.resolve(member); }); @@ -39,7 +39,7 @@ function startMember(clusterId) { function exit() { var deferred = Promise.defer(); - controller.exit(function(err, res) { + controller.exit(function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); }); @@ -48,7 +48,7 @@ function exit() { function shutdownMember(clusterId, memberUuid) { var deferred = Promise.defer(); - controller.shutdownMember(clusterId, memberUuid, function(err, res) { + controller.shutdownMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); }); @@ -66,7 +66,7 @@ function shutdownCluster(clusterId) { function terminateMember(clusterId, memberUuid) { var deferred = Promise.defer(); - controller.terminateMember(clusterId, memberUuid, function(err, res) { + controller.terminateMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); }); @@ -75,7 +75,7 @@ function terminateMember(clusterId, memberUuid) { function executeOnController(clusterId, script, lang) { var deferred = Promise.defer(); - controller.executeOnController(clusterId, script, lang, function(err, res) { + controller.executeOnController(clusterId, script, lang, function (err, res) { if (err) return deferred.reject(err); if (res.success === false) return deferred.reject(res.message); return deferred.resolve(res); diff --git a/test/Util.js b/test/Util.js index 9dcce1924..98c0d1429 100644 --- a/test/Util.js +++ b/test/Util.js @@ -18,10 +18,11 @@ var expect = require('chai').expect; var BuildMetadata = require('../lib/BuildMetadata').BuildMetadata; var promiseLater = function (time, func) { if (func === undefined) { - func = function(){}; + func = function () { + }; } - return new Promise(function(resolve, reject) { - setTimeout(function() { + return new Promise(function (resolve, reject) { + setTimeout(function () { resolve(func()); }, time); }); @@ -36,7 +37,7 @@ var expectAlmostEqual = function (actual, expected) { return expect(actual).to.be.closeTo(expected, 0.0001); } if (typeExpected === 'object') { - return (function() { + return (function () { var membersEqual = true; for (var i in expected) { if (expectAlmostEqual(actual[i], expected[i])) { @@ -71,7 +72,7 @@ exports.markEnterprise = function (_this) { if (process.env.SERVER_TYPE === 'oss' || process.env.HZ_TYPE === 'oss') { _this.skip(); } - if(!process.env.HAZELCAST_ENTERPRISE_KEY){ + if (!process.env.HAZELCAST_ENTERPRISE_KEY) { _this.skip(); } }; @@ -91,14 +92,14 @@ exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { }; exports.promiseWaitMilliseconds = function (milliseconds) { - return new Promise(function(resolve, reject) { - setTimeout(function() { + return new Promise(function (resolve, reject) { + setTimeout(function () { resolve(); }, milliseconds); }); }; -exports.getRandomInt = function(lowerLim, upperLim) { +exports.getRandomInt = function (lowerLim, upperLim) { return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; }; diff --git a/test/config/SchemaValidationTest.js b/test/config/SchemaValidationTest.js index 083c748d3..3cad5a78b 100644 --- a/test/config/SchemaValidationTest.js +++ b/test/config/SchemaValidationTest.js @@ -29,7 +29,7 @@ describe('SchemaValidationTest', function () { function validateCandidate(candidate) { var candidateJson = JSON.parse(candidate); - return validate(candidateJson, schema, { nestedErrors: true }); + return validate(candidateJson, schema, {nestedErrors: true}); } it('hazelcast-client-full.json passes validation', function () { diff --git a/test/config/hazelcast-client-ssl-basicssloptions.json b/test/config/hazelcast-client-ssl-basicssloptions.json index a3b56dd7f..40a93c370 100644 --- a/test/config/hazelcast-client-ssl-basicssloptions.json +++ b/test/config/hazelcast-client-ssl-basicssloptions.json @@ -1,7 +1,7 @@ { "network": { - "ssl": { - "enabled": true, + "ssl": { + "enabled": true, "factory": { "exportedName": "BsicSSLOponsFary", "properties": { diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index de4e21e33..2d356f4cf 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -96,7 +96,7 @@ describe("FlakeIdGeneratorProxyTest", function () { }); for (var i = 1; i < idList.length; i++) { expect(idList[i]).to.be.instanceOf(Long); - expect(idList[i-1].equals(idList[i]), 'Expected ' + idList[i-1] + ' ' + idList[i] + 'to be different.').to.be.false; + expect(idList[i - 1].equals(idList[i]), 'Expected ' + idList[i - 1] + ' ' + idList[i] + 'to be different.').to.be.false; } }); }); @@ -130,7 +130,7 @@ describe("FlakeIdGeneratorProxyTest", function () { return flakeIdGenerator.newId(); }).then(function () { return Util.promiseWaitMilliseconds(100); - }).then(function() { + }).then(function () { return flakeIdGenerator.newId(); }).then(function (secondId) { var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); diff --git a/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js index ae1d33ce4..147f7936a 100644 --- a/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js +++ b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js @@ -36,7 +36,7 @@ DistortInvalidationMetadataEntryProcessor.prototype.getFactoryId = function () { return 66; }; -DistortInvalidationMetadataEntryProcessor.prototype.getClassId = function() { +DistortInvalidationMetadataEntryProcessor.prototype.getClassId = function () { return 3; }; diff --git a/test/javaclasses/IdentifiedEntryProcessor.js b/test/javaclasses/IdentifiedEntryProcessor.js index 2073d7454..f47554eb2 100644 --- a/test/javaclasses/IdentifiedEntryProcessor.js +++ b/test/javaclasses/IdentifiedEntryProcessor.js @@ -22,7 +22,7 @@ IdentifiedEntryProcessor.prototype.readData = function (inp) { this.value = inp.readUTF(); }; -IdentifiedEntryProcessor.prototype.writeData = function(outp) { +IdentifiedEntryProcessor.prototype.writeData = function (outp) { outp.writeUTF(this.value); }; @@ -30,7 +30,7 @@ IdentifiedEntryProcessor.prototype.getFactoryId = function () { return 66; }; -IdentifiedEntryProcessor.prototype.getClassId = function() { +IdentifiedEntryProcessor.prototype.getClassId = function () { return 1; }; diff --git a/test/javaclasses/PrefixFilter.js b/test/javaclasses/PrefixFilter.js index b213a861a..9e4bd945d 100644 --- a/test/javaclasses/PrefixFilter.js +++ b/test/javaclasses/PrefixFilter.js @@ -22,7 +22,7 @@ PrefixFilter.prototype.readData = function (inp) { this.prefix = inp.readUTF(); }; -PrefixFilter.prototype.writeData = function(outp) { +PrefixFilter.prototype.writeData = function (outp) { outp.writeUTF(this.prefix); }; @@ -30,7 +30,7 @@ PrefixFilter.prototype.getFactoryId = function () { return 66; }; -PrefixFilter.prototype.getClassId = function() { +PrefixFilter.prototype.getClassId = function () { return 4; }; diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index e387db868..bb0e9b6d2 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -242,7 +242,7 @@ describe("List Proxy", function () { it("listens for added entry", function (done) { this.timeout(5000); var listener = { - "itemAdded" : function (item) { + "itemAdded": function (item) { if (item == 1) { done() } else { @@ -260,7 +260,7 @@ describe("List Proxy", function () { it("listens for removed entry with value included", function (done) { this.timeout(5000); var listener = { - "itemRemoved" : function (item) { + "itemRemoved": function (item) { if (item == 1) { done() } else { @@ -280,7 +280,7 @@ describe("List Proxy", function () { it("listens for removed entry with value not included", function (done) { this.timeout(5000); var listener = { - "itemRemoved" : function (item) { + "itemRemoved": function (item) { if (item == null) { done() } else { @@ -301,7 +301,7 @@ describe("List Proxy", function () { it("remove entry listener", function () { this.timeout(5000); return listInstance.addItemListener({ - "itemRemoved" : function (item) { + "itemRemoved": function (item) { if (item == 1) { done() } else { diff --git a/test/lock/LockProxyTest.js b/test/lock/LockProxyTest.js index e28f44573..c8e0a25d4 100644 --- a/test/lock/LockProxyTest.js +++ b/test/lock/LockProxyTest.js @@ -98,7 +98,7 @@ describe("Lock Proxy", function () { it("acquires lock before timeout is exceeded", function () { this.timeout(10000); var startTime = Date.now(); - return lockOne.lock(1000).then(function() { + return lockOne.lock(1000).then(function () { return lockTwo.tryLock(2000); }).then(function (acquired) { var elasped = Date.now() - startTime; diff --git a/test/map/ComparatorFactory.js b/test/map/ComparatorFactory.js index 5c28ddb1e..d59b6a40f 100644 --- a/test/map/ComparatorFactory.js +++ b/test/map/ComparatorFactory.js @@ -26,20 +26,20 @@ ReverseValueComparator.prototype.readData = noop; ReverseValueComparator.prototype.writeData = noop; -ReverseValueComparator.prototype.getFactoryId = function() { +ReverseValueComparator.prototype.getFactoryId = function () { return 1; }; -ReverseValueComparator.prototype.getClassId = function() { +ReverseValueComparator.prototype.getClassId = function () { return 1; }; -ReverseValueComparator.prototype.sort = function(o1, o2) { +ReverseValueComparator.prototype.sort = function (o1, o2) { return o2[1] - o1[1]; }; exports.ComparatorFactory = { - create: function(type) { + create: function (type) { if (type === 1) { return new ReverseValueComparator(); } else { diff --git a/test/map/MapAggregatorsDoubleTest.js b/test/map/MapAggregatorsDoubleTest.js index aec3fbd71..e1287c83b 100644 --- a/test/map/MapAggregatorsDoubleTest.js +++ b/test/map/MapAggregatorsDoubleTest.js @@ -39,7 +39,7 @@ describe('MapAggregatorsDoubleTest', function () { }); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); diff --git a/test/map/MapAggregatorsIntTest.js b/test/map/MapAggregatorsIntTest.js index f830b5bc1..f8f8c3fad 100644 --- a/test/map/MapAggregatorsIntTest.js +++ b/test/map/MapAggregatorsIntTest.js @@ -42,7 +42,7 @@ describe('MapAggregatorsIntTest', function () { }); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); diff --git a/test/map/MapAggregatorsLongTest.js b/test/map/MapAggregatorsLongTest.js index 4e351631f..92c172855 100644 --- a/test/map/MapAggregatorsLongTest.js +++ b/test/map/MapAggregatorsLongTest.js @@ -43,7 +43,7 @@ describe('MapAggregatorsLongTest', function () { }); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index 5e75880af..b57a48c0c 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -25,7 +25,7 @@ var _fillMap = require('../Util').fillMap; var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); var IdentifiedEntryProcessor = require('../javaclasses/IdentifiedEntryProcessor'); -describe('Entry Processor', function() { +describe('Entry Processor', function () { var MAP_SIZE = 1000; var cluster; var client; @@ -37,11 +37,11 @@ describe('Entry Processor', function() { return cfg; } - before(function() { + before(function () { return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')).then(function (res) { cluster = res; return Controller.startMember(cluster.id); - }).then(function(member) { + }).then(function (member) { var cfg = _createConfig(); return Client.newHazelcastClient(cfg); }).then(function (cli) { @@ -49,7 +49,7 @@ describe('Entry Processor', function() { }); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); @@ -65,10 +65,10 @@ describe('Entry Processor', function() { it('executeOnEntries should modify entries', function () { this.timeout(4000); - return map.executeOnEntries(new IdentifiedEntryProcessor('processed')).then(function() { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed')).then(function () { return map.entrySet(); }).then(function (entries) { - expect(entries.every(function(entry) { + expect(entries.every(function (entry) { return entry[1] == 'processed'; })).to.be.true; }); @@ -76,9 +76,9 @@ describe('Entry Processor', function() { it('executeOnEntries should return modified entries', function () { this.timeout(4000); - return map.executeOnEntries(new IdentifiedEntryProcessor('processed')).then(function(entries) { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed')).then(function (entries) { expect(entries).to.have.lengthOf(MAP_SIZE); - expect(entries.every(function(entry) { + expect(entries.every(function (entry) { return entry[1] == 'processed'; })).to.be.true; }); @@ -86,7 +86,7 @@ describe('Entry Processor', function() { it('executeOnEntries with predicate should modify entries', function () { this.timeout(4000); - return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function() { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function () { return map.getAll(["0", "1", "2"]); }).then(function (entries) { return expect(entries).to.deep.have.members([['0', 'processed'], ['1', 'processed'], ['2', '2']]); @@ -95,47 +95,47 @@ describe('Entry Processor', function() { it('executeOnEntries with predicate should return modified entries', function () { this.timeout(4000); - return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function(entries) { + return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function (entries) { expect(entries).to.have.lengthOf(2); - expect(entries.every(function(entry) { + expect(entries.every(function (entry) { return entry[1] == 'processed'; })).to.be.true; }); }); - it('executeOnKey should return modified value', function() { + it('executeOnKey should return modified value', function () { this.timeout(4000); return map.executeOnKey('4', new IdentifiedEntryProcessor('processed')).then(function (retVal) { return expect(retVal).to.equal('processed'); }); }); - it('executeOnKey should modify the value', function() { + it('executeOnKey should modify the value', function () { this.timeout(4000); - return map.executeOnKey('4', new IdentifiedEntryProcessor('processed')).then(function() { + return map.executeOnKey('4', new IdentifiedEntryProcessor('processed')).then(function () { return map.get('4'); }).then(function (value) { return expect(value).to.equal('processed'); }); }); - it('executeOnKeys should return modified entries', function() { + it('executeOnKeys should return modified entries', function () { this.timeout(4000); return map.executeOnKeys(['4', '5'], new IdentifiedEntryProcessor('processed')).then(function (entries) { return expect(entries).to.deep.have.members([['4', 'processed'], ['5', 'processed']]); }); }); - it('executeOnKeys should modify the entries', function() { + it('executeOnKeys should modify the entries', function () { this.timeout(4000); - return map.executeOnKeys(['4', '5'], new IdentifiedEntryProcessor('processed')).then(function() { + return map.executeOnKeys(['4', '5'], new IdentifiedEntryProcessor('processed')).then(function () { return map.getAll(['4', '5']); }).then(function (entries) { return expect(entries).to.deep.have.members([['4', 'processed'], ['5', 'processed']]); }); }); - it('executeOnKeys with empty array should return empty array', function() { + it('executeOnKeys with empty array should return empty array', function () { this.timeout(4000); return map.executeOnKeys([], new IdentifiedEntryProcessor('processed')).then(function (entries) { return expect(entries).to.have.lengthOf(0); diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index 73b0a6732..5a491cb7f 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -19,7 +19,7 @@ var Controller = require('../RC'); var expect = require('chai').expect; var Promise = require('bluebird'); -describe('Map Partition Aware', function() { +describe('Map Partition Aware', function () { var cluster; var numOfEntries = 10000; @@ -34,7 +34,7 @@ describe('Map Partition Aware', function() { this.partitionKey = partitionKey; } - PartitionAwareKey.prototype.getPartitionKey = function() { + PartitionAwareKey.prototype.getPartitionKey = function () { return this.partitionKey; }; @@ -49,51 +49,51 @@ describe('Map Partition Aware', function() { function _fillMap(map, ssize) { var entryList = []; for (var i = 0; i < ssize; i++) { - entryList.push([new PartitionAwareKey(''+Math.random(), 'specificKey'), ''+Math.random()]); + entryList.push([new PartitionAwareKey('' + Math.random(), 'specificKey'), '' + Math.random()]); } return map.putAll(entryList); } - before(function() { + before(function () { expect(memberCount, 'This test should have at least 2 members.').to.be.at.least(2); this.timeout(30000); - return Controller.createCluster(null, null).then(function(c) { + return Controller.createCluster(null, null).then(function (c) { cluster = c; for (var i = 0; i < memberCount; i++) { members.push(Controller.startMember(cluster.id)); } return Promise.all(members); - }).then(function(m) { + }).then(function (m) { members = m; return Client.newHazelcastClient(); - }).then(function(cl) { + }).then(function (cl) { client = cl; }); }); - after(function() { + after(function () { this.timeout(30000); client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - beforeEach(function() { + beforeEach(function () { map = client.getMap(mapName); }); - afterEach(function() { + afterEach(function () { return map.destroy(); }); - it('put', function() { + it('put', function () { this.timeout(15000); - return _fillMap(map, numOfEntries).then(function(newVal) { - var promises = members.map(function(member, index) { + return _fillMap(map, numOfEntries).then(function (newVal) { + var promises = members.map(function (member, index) { return Controller.executeOnController(cluster.id, getLocalMapStats(index), 1); }); return Promise.all(promises); - }).then(function(stats) { - var entriesPerMember = stats.map(function(item) { + }).then(function (stats) { + var entriesPerMember = stats.map(function (item) { return Number(item.result); }); var expectedArray = [numOfEntries]; @@ -104,11 +104,11 @@ describe('Map Partition Aware', function() { }); }); - it('get', function() { + it('get', function () { var key = new PartitionAwareKey('key', 'partKey'); - return map.put(key, 'value').then(function() { + return map.put(key, 'value').then(function () { return map.get(key); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('value'); }); }) diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 8b81300e2..ce08ea99b 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -27,7 +27,7 @@ var fs = require('fs'); var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); var CustomComparator = require('../javaclasses/CustomComparator'); -describe("Predicates", function() { +describe("Predicates", function () { var cluster; var client; @@ -45,26 +45,26 @@ describe("Predicates", function() { before(function () { this.timeout(32000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')).then(function(res) { + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')).then(function (res) { cluster = res; return Controller.startMember(cluster.id); - }).then(function(member) { - return HazelcastClient.newHazelcastClient(_createConfig()).then(function(hazelcastClient) { + }).then(function (member) { + return HazelcastClient.newHazelcastClient(_createConfig()).then(function (hazelcastClient) { client = hazelcastClient; }); }); }); - beforeEach(function() { + beforeEach(function () { map = client.getMap('test'); return _fillMap(); }); - afterEach(function() { + afterEach(function () { return map.destroy(); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); @@ -74,14 +74,14 @@ describe("Predicates", function() { size = 50; } var promises = []; - for (var i = 0; i< size; i++) { + for (var i = 0; i < size; i++) { promises.push(map.put('key' + i, i)); } return Promise.all(promises); } function testPredicate(predicate, expecteds, orderMatters) { - return map.valuesWithPredicate(predicate).then(function(values) { + return map.valuesWithPredicate(predicate).then(function (values) { if (orderMatters) { return expect(values.toArray()).to.deep.equal(expecteds); } else { @@ -94,19 +94,19 @@ describe("Predicates", function() { return testPredicate(Predicates.sql('this == 10'), [10]); }); - it('And', function() { + it('And', function () { return testPredicate(Predicates.and(Predicates.isEqualTo('this', 10), Predicates.isEqualTo('this', 11)), []); }); - it('GreaterThan', function() { + it('GreaterThan', function () { return testPredicate(Predicates.greaterThan('this', 47), [48, 49]); }); - it('GreaterEqual', function() { + it('GreaterEqual', function () { return testPredicate(Predicates.greaterEqual('this', 47), [47, 48, 49]); }); - it('LessThan', function() { + it('LessThan', function () { return testPredicate(Predicates.lessThan('this', 4), [0, 1, 2, 3]); }); @@ -114,24 +114,24 @@ describe("Predicates", function() { return testPredicate(Predicates.lessEqual('this', 4), [0, 1, 2, 3, 4]); }); - it('Like', function() { + it('Like', function () { var localMap = client.getMap('likePredMap'); - return localMap.put('temp', 'tempval').then(function() { + return localMap.put('temp', 'tempval').then(function () { return localMap.valuesWithPredicate(Predicates.like('this', 'tempv%')); }).then(function (values) { return expect(values.toArray()).to.have.members(['tempval']); - }).then(function() { + }).then(function () { return localMap.destroy(); }); }); - it('ILike', function() { + it('ILike', function () { var localMap = client.getMap('likePredMap'); - return localMap.putAll([['temp', 'tempval'], ['TEMP', 'TEMPVAL']]).then(function() { + return localMap.putAll([['temp', 'tempval'], ['TEMP', 'TEMPVAL']]).then(function () { return localMap.valuesWithPredicate(Predicates.ilike('this', 'tempv%')); }).then(function (values) { return expect(values.toArray()).to.have.members(['tempval', 'TEMPVAL']); - }).then(function() { + }).then(function () { return localMap.destroy(); }); }); @@ -145,39 +145,39 @@ describe("Predicates", function() { return testPredicate(Predicates.instanceOf('java.lang.Double'), assertionList); }); - it('NotEqual', function() { + it('NotEqual', function () { var assertionList = Array.apply(null, {length: 49}).map(Number.call, Number); return testPredicate(Predicates.notEqual('this', 49), assertionList); }); - it('Not', function() { + it('Not', function () { return testPredicate(Predicates.not(Predicates.greaterEqual('this', 2)), [0, 1]); }); - it('Or', function() { + it('Or', function () { return testPredicate(Predicates.or(Predicates.greaterEqual('this', 49), Predicates.lessEqual('this', 0)), [0, 49]); }); - it('Between', function() { + it('Between', function () { return testPredicate(Predicates.isBetween('this', 47, 49), [47, 48, 49]); }); - it('Null predicate throws error', function() { + it('Null predicate throws error', function () { return expect(testPredicate.bind(null, null, [0, 49])).throw(assert.AssertionError); }); - it('Regex', function() { + it('Regex', function () { var localMap = client.getMap('regexMap'); - return localMap.putAll([['06', 'ankara'], ['07', 'antalya']]).then(function() { + return localMap.putAll([['06', 'ankara'], ['07', 'antalya']]).then(function () { return localMap.valuesWithPredicate(Predicates.regex('this', '^.*ya$')); }).then(function (values) { return expect(values.toArray()).to.have.members(['antalya']); - }).then(function() { + }).then(function () { return localMap.destroy(); }); }); - it('False', function() { + it('False', function () { return testPredicate(Predicates.falsePredicate(), []); }); @@ -186,37 +186,37 @@ describe("Predicates", function() { return testPredicate(Predicates.truePredicate(), assertionList); }); - it('Paging with reverse comparator should have elements in reverse order', function() { + it('Paging with reverse comparator should have elements in reverse order', function () { var paging = Predicates.paging(Predicates.lessThan('this', 10), 3, createReverseValueComparator()); return testPredicate(paging, [9, 8, 7], true); }); - it('Paging first page should have first two items', function() { + it('Paging first page should have first two items', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); return testPredicate(paging, [40, 41]); }); - it('Paging nextPage should have 3rd and 4th items', function() { + it('Paging nextPage should have 3rd and 4th items', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.nextPage(); return testPredicate(paging, [42, 43]); }); - it('Paging fourth page should have 7th and 8th items', function() { + it('Paging fourth page should have 7th and 8th items', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(4); return testPredicate(paging, [48, 49]); }); - it('Paging #getPage should return approprate value', function() { + it('Paging #getPage should return approprate value', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(4); return expect(paging.getPage()).to.equal(4); }); - it('Paging #getPageSize should return 2', function() { + it('Paging #getPageSize should return 2', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); return expect(paging.getPageSize()).to.equal(2); }); @@ -229,44 +229,44 @@ describe("Predicates", function() { return testPredicate(paging, [46, 47]); }); - it('Get 4th page, then previous page', function() { + it('Get 4th page, then previous page', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(4); - return map.valuesWithPredicate(paging).then(function() { + return map.valuesWithPredicate(paging).then(function () { paging.previousPage(); return testPredicate(paging, [46, 47]); }); }); - it('Get 3rd page, then next page', function() { + it('Get 3rd page, then next page', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(3); - return map.valuesWithPredicate(paging).then(function() { + return map.valuesWithPredicate(paging).then(function () { paging.nextPage(); return testPredicate(paging, [48, 49]); }); }); - it('Get 10th page (which does not exist) should return empty list', function() { + it('Get 10th page (which does not exist) should return empty list', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(10); return testPredicate(paging, []); }); - it('Last page has only one element although page size is 2', function() { + it('Last page has only one element although page size is 2', function () { var paging = Predicates.paging(Predicates.greaterEqual('this', 41), 2); paging.setPage(4); return testPredicate(paging, [49]); }); - it('There is no element satisfying paging predicate returns empty array', function() { + it('There is no element satisfying paging predicate returns empty array', function () { var paging = Predicates.paging(Predicates.lessThan('this', 0), 2); return testPredicate(paging, []); }); - it('Null inner predicate in PagingPredicate does not filter out items, only does paging', function() { + it('Null inner predicate in PagingPredicate does not filter out items, only does paging', function () { var paging = Predicates.paging(null, 2); return testPredicate(paging, [0, 1]); }); diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index 27cb83945..9b0087414 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -46,10 +46,10 @@ function createClient(nearCacheEnabled) { } } -describe('MapProxy', function() { +describe('MapProxy', function () { [false, true].forEach(function (nearCacheEnabled) { - describe("Near Cache: " + nearCacheEnabled, function() { + describe("Near Cache: " + nearCacheEnabled, function () { var cluster; var client; @@ -57,26 +57,26 @@ describe('MapProxy', function() { before(function () { this.timeout(32000); - return createController(nearCacheEnabled).then(function(res) { + return createController(nearCacheEnabled).then(function (res) { cluster = res; return Controller.startMember(cluster.id); - }).then(function(member) { - return createClient(nearCacheEnabled).then(function(hazelcastClient) { + }).then(function (member) { + return createClient(nearCacheEnabled).then(function (hazelcastClient) { client = hazelcastClient; }); }); }); - beforeEach(function() { + beforeEach(function () { map = client.getMap('test'); return _fillMap(map); }); - afterEach(function() { + afterEach(function () { return map.destroy(); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); @@ -99,109 +99,109 @@ describe('MapProxy', function() { 'result=""+lockByServer();'; } - it('get_basic', function() { - return map.get('key0').then(function(v) { + it('get_basic', function () { + return map.get('key0').then(function (v) { return expect(v).to.equal('val0'); }) }); - it('get_return_null_on_non_existent', function() { - return map.get('non-existent').then(function(val) { + it('get_return_null_on_non_existent', function () { + return map.get('non-existent').then(function (val) { return expect(val).to.be.null; }); }); - it('put_return_value_not_null', function() { - return map.put('key0','new-val').then(function(val) { + it('put_return_value_not_null', function () { + return map.put('key0', 'new-val').then(function (val) { return expect(val).to.equal('val0'); }); }); - it('put with ttl puts value to map', function() { - return map.put('key-with-ttl', 'val-with-ttl', 3000).then(function() { - return map.get('key-with-ttl').then(function(val) { + it('put with ttl puts value to map', function () { + return map.put('key-with-ttl', 'val-with-ttl', 3000).then(function () { + return map.get('key-with-ttl').then(function (val) { return expect(val).to.equal('val-with-ttl'); }); }); }); - it('put with ttl removes value after ttl', function() { - return map.put('key10', 'val10', 1000).then(function() { + it('put with ttl removes value after ttl', function () { + return map.put('key10', 'val10', 1000).then(function () { return map.get('key10'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('val10'); - }).then(function() { + }).then(function () { return Util.promiseLater(1100, map.get.bind(map, 'key10')); - }).then(function(val) { + }).then(function (val) { return expect(val).to.be.null; }); }); - it('clear', function() { - return map.clear().then(function() { + it('clear', function () { + return map.clear().then(function () { return map.isEmpty(); - }).then(function(val) { + }).then(function (val) { return expect(val).to.be.true; }); }); - it('size', function() { - return map.size().then(function(size) { + it('size', function () { + return map.size().then(function (size) { expect(size).to.equal(10); }) }); - it('basic_remove_return_value', function() { - return map.remove('key9').then(function(val) { + it('basic_remove_return_value', function () { + return map.remove('key9').then(function (val) { return expect(val).to.equal('val9'); }); }); - it('basic_remove', function() { - return map.remove('key1').then(function() { + it('basic_remove', function () { + return map.remove('key1').then(function () { return map.get('key1'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.be.null; }); }); - it('remove_if_equal_false', function() { - return map.remove('key1', 'wrong').then(function(val) { + it('remove_if_equal_false', function () { + return map.remove('key1', 'wrong').then(function (val) { return expect(val).to.be.false; }); }); - it('remove_if_equal_true', function() { - return map.remove('key1', 'val1').then(function(val) { + it('remove_if_equal_true', function () { + return map.remove('key1', 'val1').then(function (val) { return expect(val).to.be.true; }); }); - it('containsKey_true', function() { - return map.containsKey('key1').then(function(val) { + it('containsKey_true', function () { + return map.containsKey('key1').then(function (val) { return expect(val).to.be.true; }); }); - it('containsKey_false', function() { - return map.containsKey('non-existent').then(function(val) { + it('containsKey_false', function () { + return map.containsKey('non-existent').then(function (val) { return expect(val).to.be.false; }); }); - it('containsValue_true', function() { - return map.containsValue('val1').then(function(val) { + it('containsValue_true', function () { + return map.containsValue('val1').then(function (val) { return expect(val).to.be.true; }); }); - it('containsValue_false', function() { - return map.containsValue('non-existent').then(function(val) { + it('containsValue_false', function () { + return map.containsValue('non-existent').then(function (val) { return expect(val).to.be.false; }); }); - it('putAll', function(done) { + it('putAll', function (done) { var arr = [ ['pa_k0', 'pa_v0'], ['pa_k1', 'pa_v1'], @@ -211,7 +211,7 @@ describe('MapProxy', function() { ]; var returnedCorrectly = 0; var verify = function (expected) { - return function(val) { + return function (val) { try { expect(val).to.equal(expected); returnedCorrectly++; @@ -224,7 +224,7 @@ describe('MapProxy', function() { } }; }; - map.putAll(arr).then(function() { + map.putAll(arr).then(function () { map.get(arr[0][0]).then(verify(arr[0][1])); map.get(arr[1][0]).then(verify(arr[1][1])); map.get(arr[2][0]).then(verify(arr[2][1])); @@ -233,7 +233,7 @@ describe('MapProxy', function() { }) }); - it('getAll', function() { + it('getAll', function () { return map.getAll([ 'key0', 'key1', 'key2', 'key3', 'key4', 'key5', 'key6', 'key7', 'key8', 'key9' @@ -248,17 +248,17 @@ describe('MapProxy', function() { }) }); - it('delete', function() { - return map.put('key-to-delete', 'value').then(function() { + it('delete', function () { + return map.put('key-to-delete', 'value').then(function () { return map.delete('key-to-delete'); - }).then(function() { + }).then(function () { return map.get('key-to-delete'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.be.null; }) }); - it('entrySet_notNull', function() { + it('entrySet_notNull', function () { var entryMap = client.getMap('entry-map'); var samples = [ ['k1', 'v1'], @@ -269,45 +269,45 @@ describe('MapProxy', function() { entryMap.put(samples[0][0], samples[0][1]), entryMap.put(samples[1][0], samples[1][1]), entryMap.put(samples[2][0], samples[2][1]) - ]).then(function() { + ]).then(function () { return entryMap.entrySet(); - }).then(function(entrySet) { + }).then(function (entrySet) { return expect(entrySet).to.deep.have.members(samples); }); }); - it('entrySet_null', function() { + it('entrySet_null', function () { var entryMap = client.getMap('null-entry-map'); - return entryMap.entrySet().then(function(entrySet) { + return entryMap.entrySet().then(function (entrySet) { return expect(entrySet).to.be.empty; }); }); - it('flush', function() { + it('flush', function () { return map.flush(); }); - it('lock', function() { - return map.lock('key0').then(function() { + it('lock', function () { + return map.lock('key0').then(function () { return map.isLocked('key0'); - }).then(function(isLocked) { + }).then(function (isLocked) { return expect(isLocked).to.be.true; - }).finally(function() { + }).finally(function () { return map.unlock('key0'); }); }); - it('unlock', function() { - return map.lock('key0').then(function() { + it('unlock', function () { + return map.lock('key0').then(function () { return map.unlock('key0'); - }).then(function() { + }).then(function () { return map.isLocked('key0'); - }).then(function(isLocked) { + }).then(function (isLocked) { return expect(isLocked).to.be.false; }); }); - it('forceUnlock', function() { + it('forceUnlock', function () { var script = 'function lockByServer() {' + ' var map = instance_0.getMap("' + map.getName() + '");' + @@ -315,17 +315,17 @@ describe('MapProxy', function() { ' return map.isLocked("key0")' + '}' + 'result=""+lockByServer();'; - return Controller.executeOnController(cluster.id, script, 1).then(function(s) { + return Controller.executeOnController(cluster.id, script, 1).then(function (s) { return map.forceUnlock('key0'); - }).then(function() { + }).then(function () { return map.isLocked('key0'); - }).then(function(isLocked) { + }).then(function (isLocked) { return expect(isLocked).to.be.false; }); }); - it('keySet', function() { - return map.keySet().then(function(keySet) { + it('keySet', function () { + return map.keySet().then(function (keySet) { return expect(keySet).to.deep.have.members([ 'key0', 'key1', 'key2', 'key3', 'key4', 'key5', 'key6', 'key7', 'key8', 'key9' @@ -333,109 +333,109 @@ describe('MapProxy', function() { }); }); - it('putIfAbsent_success', function() { - return map.putIfAbsent('key10', 'new-val').then(function(oldVal) { + it('putIfAbsent_success', function () { + return map.putIfAbsent('key10', 'new-val').then(function (oldVal) { return expect(oldVal).to.be.null; - }).then(function() { + }).then(function () { return map.get('key10'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('new-val'); }); }); - it('putIfAbsent_fail', function() { - return map.putIfAbsent('key9', 'new-val').then(function() { + it('putIfAbsent_fail', function () { + return map.putIfAbsent('key9', 'new-val').then(function () { return map.get('key9'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('val9'); }); }); it('putIfAbsent_with_ttl', function () { - return map.putIfAbsent('key10', 'new-val', 1000).then(function() { + return map.putIfAbsent('key10', 'new-val', 1000).then(function () { return map.get('key10'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('new-val'); - }).then(function() { + }).then(function () { return Util.promiseLater(1050, map.get.bind(map, 'key10')); - }).then(function(val) { + }).then(function (val) { return expect(val).to.be.null; }); }); - it('putTransient', function() { - return map.putTransient('key10', 'val10').then(function() { + it('putTransient', function () { + return map.putTransient('key10', 'val10').then(function () { return map.get('key10'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('val10'); }); }); - it('putTransient_withTTL', function() { - return map.putTransient('key10', 'val10', 1000).then(function() { + it('putTransient_withTTL', function () { + return map.putTransient('key10', 'val10', 1000).then(function () { return map.get('key10'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('val10'); - }).then(function() { + }).then(function () { return Util.promiseLater(1050, map.get.bind(map, 'key10')); - }).then(function(val) { + }).then(function (val) { return expect(val).to.be.null; }); }); - it('replace', function() { - return map.replace('key9', 'new-val').then(function(oldVal) { + it('replace', function () { + return map.replace('key9', 'new-val').then(function (oldVal) { return expect(oldVal).to.equal('val9'); - }).then(function() { + }).then(function () { return map.get('key9'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('new-val'); }); }); - it('replaceIfSame_success', function() { - return map.replaceIfSame('key9', 'val9', 'new-val').then(function(success) { + it('replaceIfSame_success', function () { + return map.replaceIfSame('key9', 'val9', 'new-val').then(function (success) { return expect(success).to.be.true; - }).then(function() { + }).then(function () { return map.get('key9'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('new-val'); }); }); - it('replaceIfSame_fail', function() { - return map.replaceIfSame('key9', 'wrong', 'new-val', function(success) { + it('replaceIfSame_fail', function () { + return map.replaceIfSame('key9', 'wrong', 'new-val', function (success) { return expect(success).to.be.false; - }).then(function() { + }).then(function () { return map.get('key9'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('val9'); }); }); - it('set', function() { - return map.set('key10', 'val10').then(function() { + it('set', function () { + return map.set('key10', 'val10').then(function () { return map.get('key10'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('val10'); }) }); - it('set_withTTL', function() { - return map.set('key10', 'val10', 1000).then(function() { + it('set_withTTL', function () { + return map.set('key10', 'val10', 1000).then(function () { return map.get('key10'); - }).then(function(val) { + }).then(function (val) { return expect(val).to.equal('val10'); - }).then(function() { + }).then(function () { return Util.promiseLater(1050, map.get.bind(map, 'key10')); - }).then(function(val) { + }).then(function (val) { return expect(val).to.be.null; }) }); - it('values', function() { - return map.values().then(function(vals) { + it('values', function () { + return map.values().then(function (vals) { return expect(vals.toArray()).to.deep.have.members([ 'val0', 'val1', 'val2', 'val3', 'val4', 'val5', 'val6', 'val7', 'val8', 'val9' @@ -443,18 +443,18 @@ describe('MapProxy', function() { }); }); - it('values_null', function() { - return map.clear().then(function() { + it('values_null', function () { + return map.clear().then(function () { return map.values(); - }).then(function(vals) { + }).then(function (vals) { return expect(vals.toArray()).to.have.lengthOf(0); }) }); - it('getEntryView', function(done) { - map.get('key0').then(function() { + it('getEntryView', function (done) { + map.get('key0').then(function () { return map.getEntryView('key0'); - }).then(function(entry) { + }).then(function (entry) { try { expect(entry.key).to.equal('key0'); expect(entry.value).to.equal('val0'); @@ -474,82 +474,82 @@ describe('MapProxy', function() { }); }); - it('getEntryView_null', function() { - return map.getEntryView('non-exist').then(function(entry) { + it('getEntryView_null', function () { + return map.getEntryView('non-exist').then(function (entry) { return expect(entry).to.be.null; }); }); - it('addIndex', function() { + it('addIndex', function () { return Promise.all([ map.addIndex('length', false), map.addIndex('length', true) ]); }); - it('tryLock_success', function() { - return map.tryLock('key0').then(function(success) { + it('tryLock_success', function () { + return map.tryLock('key0').then(function (success) { return expect(success).to.be.true; }); }); - it('tryLock_fail', function() { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function(s) { + it('tryLock_fail', function () { + return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function (s) { return map.tryLock('key0'); - }).then(function(success) { + }).then(function (success) { return expect(success).to.be.false; }); }); - it('tryLock_success with timeout', function() { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function() { + it('tryLock_success with timeout', function () { + return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { var promise = map.tryLock('key0', 1000); Controller.executeOnController(cluster.id, _generateUnlockScript(map.getName(), '"key0"'), 1); return promise; - }).then(function(success) { + }).then(function (success) { return expect(success).to.be.true; }); }); - it('tryLock_fail with timeout', function() { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function() { + it('tryLock_fail with timeout', function () { + return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { return map.tryLock('key0', 1000); - }).then(function(success) { + }).then(function (success) { return expect(success).to.be.false; }); }); - it('tryPut success', function() { - return map.tryPut('key0', 'val0', 1000).then(function(success) { + it('tryPut success', function () { + return map.tryPut('key0', 'val0', 1000).then(function (success) { return expect(success).to.be.true; }) }); - it('tryPut fail', function() { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function() { + it('tryPut fail', function () { + return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { return map.tryPut('key0', 'val0', 200); - }).then(function(success) { + }).then(function (success) { return expect(success).to.be.false; }) }); - it('tryRemove success', function() { - return map.tryRemove('key0', 1000).then(function(success) { + it('tryRemove success', function () { + return map.tryRemove('key0', 1000).then(function (success) { return expect(success).to.be.true; }) }); - it('tryRemove fail', function() { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function() { + it('tryRemove fail', function () { + return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { return map.tryRemove('key0', 200); - }).then(function(success) { + }).then(function (success) { return expect(success).to.be.false; }) }); - it('addEntryListener on map, entryAdded fires because predicate returns true for that entry', function(done) { + it('addEntryListener on map, entryAdded fires because predicate returns true for that entry', function (done) { var listenerObject = { - added: function(key, oldValue, value, mergingValue) { + added: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key10'); expect(oldValue).to.be.undefined; @@ -561,14 +561,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10')).then(function() { + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10')).then(function () { map.put('key10', 'val10'); }); }); - it('addEntryListener on key, entryAdded fires because predicate returns true for that entry', function(done) { + it('addEntryListener on key, entryAdded fires because predicate returns true for that entry', function (done) { var listenerObject = { - added: function(key, oldValue, value, mergingValue) { + added: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key10'); expect(oldValue).to.be.undefined; @@ -580,14 +580,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10').then(function() { + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10').then(function () { map.put('key10', 'val10'); }); }); - it('addEntryListener on key, entryAdded fires because predicate returns true for that entry, inlVal=yes', function(done) { + it('addEntryListener on key, entryAdded fires because predicate returns true for that entry, inlVal=yes', function (done) { var listenerObject = { - added: function(key, oldValue, value, mergingValue) { + added: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key10'); expect(oldValue).to.be.undefined; @@ -599,14 +599,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10', true).then(function() { + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10', true).then(function () { map.put('key10', 'val10'); }); }); - it('addEntryListener on map entryAdded', function(done) { + it('addEntryListener on map entryAdded', function (done) { var listenerObject = { - added: function(key, oldValue, value, mergingValue) { + added: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key10'); expect(oldValue).to.be.undefined; @@ -618,14 +618,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject).then(function() { + map.addEntryListener(listenerObject).then(function () { map.put('key10', 'val10'); }); }); - it('addEntryListener on map entryAdded', function(done) { + it('addEntryListener on map entryAdded', function (done) { var listenerObject = { - added: function(key, oldValue, value, mergingValue) { + added: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key10'); expect(oldValue).to.be.undefined; @@ -637,14 +637,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject, undefined, true).then(function() { + map.addEntryListener(listenerObject, undefined, true).then(function () { map.put('key10', 'val10'); }); }); - it('addEntryListener on map entryUpdated', function(done) { + it('addEntryListener on map entryUpdated', function (done) { var listenerObject = { - updated: function(key, oldValue, value, mergingValue) { + updated: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key0'); expect(oldValue).to.be.undefined; @@ -656,14 +656,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject).then(function() { + map.addEntryListener(listenerObject).then(function () { map.put('key0', 'new-val'); }); }); - it('addEntryListener on key entryRemoved', function(done) { + it('addEntryListener on key entryRemoved', function (done) { var listenerObject = { - removed: function(key, oldValue, value, mergingValue) { + removed: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key1'); expect(oldValue).to.be.undefined; @@ -675,14 +675,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject, 'key1', false).then(function() { + map.addEntryListener(listenerObject, 'key1', false).then(function () { map.remove('key1'); }); }); - it('addEntryListener on key entryRemoved includeValue=yes', function(done) { + it('addEntryListener on key entryRemoved includeValue=yes', function (done) { var listenerObject = { - removed: function(key, oldValue, value, mergingValue) { + removed: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key1'); expect(oldValue).to.equal('val1'); @@ -694,14 +694,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject, 'key1', true).then(function() { + map.addEntryListener(listenerObject, 'key1', true).then(function () { map.remove('key1'); }); }); - it('addEntryListener on key evicted includeValue=yes', function(done) { + it('addEntryListener on key evicted includeValue=yes', function (done) { var listenerObject = { - evicted: function(key, oldValue, value, mergingValue) { + evicted: function (key, oldValue, value, mergingValue) { try { expect(key).to.equal('key1'); expect(oldValue).to.equal('val1'); @@ -713,14 +713,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject, 'key1', true).then(function() { + map.addEntryListener(listenerObject, 'key1', true).then(function () { map.evict('key1') }); }); - it('addEntryListener on map evictAll', function(done) { + it('addEntryListener on map evictAll', function (done) { var listenerObject = { - evictedAll: function(key, oldValue, value, mergingValue, numberOfAffectedEntries) { + evictedAll: function (key, oldValue, value, mergingValue, numberOfAffectedEntries) { try { expect(key).to.be.undefined; expect(oldValue).to.be.undefined; @@ -733,14 +733,14 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject).then(function() { + map.addEntryListener(listenerObject).then(function () { map.evictAll(); }); }); - it('addEntryListener on map clearAll', function(done) { + it('addEntryListener on map clearAll', function (done) { var listenerObject = { - clearedAll: function(key, oldValue, value, mergingValue, numberOfAffectedEntries) { + clearedAll: function (key, oldValue, value, mergingValue, numberOfAffectedEntries) { try { expect(key).to.be.undefined; expect(oldValue).to.be.undefined; @@ -753,82 +753,82 @@ describe('MapProxy', function() { } } }; - map.addEntryListener(listenerObject).then(function() { + map.addEntryListener(listenerObject).then(function () { map.clear(); }); }); - it('removeEntryListener with correct id', function() { - return map.addEntryListener({}).then(function(listenerId) { + it('removeEntryListener with correct id', function () { + return map.addEntryListener({}).then(function (listenerId) { return map.removeEntryListener(listenerId); - }).then(function(success) { + }).then(function (success) { return expect(success).to.be.true; }); }); - it('removeEntryListener with wrong id', function() { - return map.removeEntryListener('aaa').then(function(success) { + it('removeEntryListener with wrong id', function () { + return map.removeEntryListener('aaa').then(function (success) { return expect(success).to.be.false; }); }); - it('entrySetWithPredicate', function() { - return map.entrySetWithPredicate(Predicates.sql('this == val3')).then(function(entrySet) { + it('entrySetWithPredicate', function () { + return map.entrySetWithPredicate(Predicates.sql('this == val3')).then(function (entrySet) { expect(entrySet.length).to.equal(1); expect(entrySet[0][0]).to.equal('key3'); expect(entrySet[0][1]).to.equal('val3'); }); }); - it('keySetWithPredicate', function() { - return map.keySetWithPredicate(Predicates.sql('this == val3')).then(function(keySet) { + it('keySetWithPredicate', function () { + return map.keySetWithPredicate(Predicates.sql('this == val3')).then(function (keySet) { expect(keySet.length).to.equal(1); expect(keySet[0]).to.equal('key3'); }); }); - it('keySetWithPredicate null response', function() { - return map.keySetWithPredicate(Predicates.sql('this == nonexisting')).then(function(keySet) { + it('keySetWithPredicate null response', function () { + return map.keySetWithPredicate(Predicates.sql('this == nonexisting')).then(function (keySet) { expect(keySet.length).to.equal(0); }); }); - it('valuesWithPredicate', function() { - return map.valuesWithPredicate(Predicates.sql('this == val3')).then(function(valueList) { + it('valuesWithPredicate', function () { + return map.valuesWithPredicate(Predicates.sql('this == val3')).then(function (valueList) { expect(valueList.toArray().length).to.equal(1); expect(valueList.toArray()[0]).to.equal('val3'); }); }); - it('entrySetWithPredicate paging', function() { - return map.entrySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function(entrySet) { + it('entrySetWithPredicate paging', function () { + return map.entrySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function (entrySet) { expect(entrySet.length).to.equal(1); expect(entrySet[0]).to.deep.equal(['key3', 'val3']); }); }); - it('keySetWithPredicate paging', function() { - return map.keySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function(keySet) { + it('keySetWithPredicate paging', function () { + return map.keySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function (keySet) { expect(keySet.length).to.equal(1); expect(keySet[0]).to.equal('key3'); }); }); - it('valuesWithPredicate paging', function() { - return map.valuesWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function(values) { + it('valuesWithPredicate paging', function () { + return map.valuesWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function (values) { expect(values.toArray().length).to.equal(1); expect(values.toArray()[0]).to.equal('val3'); }); }); - it('destroy', function() { + it('destroy', function () { var dmap = client.getMap('map-to-be-destroyed'); - return dmap.put('key', 'val').then(function() { + return dmap.put('key', 'val').then(function () { return dmap.destroy(); - }).then(function() { + }).then(function () { var newMap = client.getMap('map-to-be-destroyed'); return newMap.size(); - }).then(function(s) { + }).then(function (s) { expect(s).to.equal(0); }) }); diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index 055309674..fbfb47017 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -20,38 +20,38 @@ var Controller = require('./../RC'); var fs = require('fs'); var _fillMap = require('../Util').fillMap; -describe('MapStore', function() { +describe('MapStore', function () { var cluster; var client; var map; before(function () { this.timeout(32000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_mapstore.xml', 'utf8')).then(function(res) { + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_mapstore.xml', 'utf8')).then(function (res) { cluster = res; return Controller.startMember(cluster.id); - }).then(function(member) { - return HazelcastClient.newHazelcastClient().then(function(hazelcastClient) { + }).then(function (member) { + return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { client = hazelcastClient; }); }); }); - beforeEach(function() { + beforeEach(function () { map = client.getMap('mapstore-test'); return _fillMap(map); }); - afterEach(function() { + afterEach(function () { return map.destroy(); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); - it('loadAll with no arguments loads all keys',function () { + it('loadAll with no arguments loads all keys', function () { return _fillMap(map).then(function () { return map.evictAll(); }).then(function () { @@ -72,7 +72,7 @@ describe('MapStore', function() { }); }); - it('loadAll with empty keyset loads nothing',function () { + it('loadAll with empty keyset loads nothing', function () { return map.evictAll().then(function () { return map.loadAll([]); }).then(function () { @@ -82,11 +82,11 @@ describe('MapStore', function() { }) }); - it('loadAll with keyset loads all keys',function () { + it('loadAll with keyset loads all keys', function () { return map.evictAll().then(function () { - return map.loadAll(['key0','key1']); + return map.loadAll(['key0', 'key1']); }).then(function () { - return map.getAll(['key0','key1']); + return map.getAll(['key0', 'key1']); }).then(function (values) { return expect(values).to.deep.have.members([ ['key0', 'val0'], ['key1', 'val1'] @@ -94,15 +94,15 @@ describe('MapStore', function() { }); }); - it('loadAll overrides entries in memory by default',function () { + it('loadAll overrides entries in memory by default', function () { return map.evictAll().then(function () { return map.putTransient('key0', 'newval0'); }).then(function () { return map.putTransient('key1', 'newval1'); }).then(function () { - return map.loadAll(['key0','key1']); + return map.loadAll(['key0', 'key1']); }).then(function () { - return map.getAll(['key0','key1']); + return map.getAll(['key0', 'key1']); }).then(function (values) { return expect(values).to.deep.have.members([ ['key0', 'val0'], ['key1', 'val1'] @@ -110,15 +110,15 @@ describe('MapStore', function() { }); }); - it('loadAll with replaceExisting=true overrides the entries',function () { + it('loadAll with replaceExisting=true overrides the entries', function () { return map.evictAll().then(function () { return map.putTransient('key0', 'newval0'); }).then(function () { return map.putTransient('key1', 'newval1'); }).then(function () { - return map.loadAll(['key0','key1'],true); + return map.loadAll(['key0', 'key1'], true); }).then(function () { - return map.getAll(['key0','key1']); + return map.getAll(['key0', 'key1']); }).then(function (values) { return expect(values).to.deep.have.members([ ['key0', 'val0'], ['key1', 'val1'] @@ -126,15 +126,15 @@ describe('MapStore', function() { }); }); - it('loadAll with replaceExisting=false does not override',function () { + it('loadAll with replaceExisting=false does not override', function () { return map.evictAll().then(function () { return map.putTransient('key0', 'newval0'); }).then(function () { return map.putTransient('key1', 'newval1'); }).then(function () { - return map.loadAll(['key0','key1'],false); + return map.loadAll(['key0', 'key1'], false); }).then(function () { - return map.getAll(['key0','key1']); + return map.getAll(['key0', 'key1']); }).then(function (values) { return expect(values).to.deep.have.members([ ['key0', 'newval0'], ['key1', 'newval1'] @@ -142,26 +142,26 @@ describe('MapStore', function() { }); }); - it('evict', function() { - return map.evict('key0').then(function() { + it('evict', function () { + return map.evict('key0').then(function () { return map.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(9); }); }); - it('evict_nonexist_key', function() { - return map.evict('non-key').then(function() { + it('evict_nonexist_key', function () { + return map.evict('non-key').then(function () { return map.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(10); }); }); - it('evictAll', function() { - return map.evictAll().then(function() { + it('evictAll', function () { + return map.evictAll().then(function () { return map.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(0); }); }); diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index a64cdc205..fe3d53802 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -86,7 +86,7 @@ describe('NearCachedMapStress', function () { var op = getRandomInt(0, 100); if (op < putPercent) { map.put(getRandomInt(0, numberOfEntries), getRandomInt(0, 10000)).then(completeOperation); - } else if(op < putPercent + removePercent) { + } else if (op < putPercent + removePercent) { map.remove(getRandomInt(0, numberOfEntries)).then(completeOperation); } else { totalGetOperations++; @@ -114,7 +114,7 @@ describe('NearCachedMapStress', function () { Promise.all(p).then(function () { var stats = client1.getMap(mapName).nearCache.getStatistics(); expect(stats.hitCount + stats.missCount).to.equal(totalGetOperations + numberOfEntries); - expect(stats.entryCount).to.be.greaterThan(numberOfEntries / 100 * getPercent ); + expect(stats.entryCount).to.be.greaterThan(numberOfEntries / 100 * getPercent); expect(stats.missCount).to.be.greaterThan(100); expect(stats.hitCount).to.be.greaterThan(100); done(); diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 202d39ce8..89d0330f4 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -25,8 +25,8 @@ var fs = require('fs'); var _fillMap = require('../Util').fillMap; -describe("NearCachedMap", function() { - [true, false].forEach(function(invalidateOnChange) { +describe("NearCachedMap", function () { + [true, false].forEach(function (invalidateOnChange) { describe('invalidate on change=' + invalidateOnChange, function () { var cluster; var client1; diff --git a/test/map/hazelcast_identifiedfactory.xml b/test/map/hazelcast_identifiedfactory.xml index c8bc4eb92..ebf59f5d3 100644 --- a/test/map/hazelcast_identifiedfactory.xml +++ b/test/map/hazelcast_identifiedfactory.xml @@ -15,9 +15,9 @@ ~ limitations under the License. --> - + diff --git a/test/map/hazelcast_mapstore.xml b/test/map/hazelcast_mapstore.xml index 868354a6b..be4cb5fd5 100644 --- a/test/map/hazelcast_mapstore.xml +++ b/test/map/hazelcast_mapstore.xml @@ -14,9 +14,9 @@ ~ limitations under the License. --> - + com.hazelcast.client.test.SampleMapStore diff --git a/test/map/hazelcast_nearcache_batchinvalidation_false.xml b/test/map/hazelcast_nearcache_batchinvalidation_false.xml index 0ddf7d21f..901bfe81a 100644 --- a/test/map/hazelcast_nearcache_batchinvalidation_false.xml +++ b/test/map/hazelcast_nearcache_batchinvalidation_false.xml @@ -20,9 +20,9 @@ Please see the schema for how to configure Hazelcast at https://hazelcast.com/schema/config/hazelcast-config-3.7.xsd or the documentation at https://hazelcast.org/documentation/ --> - + false diff --git a/test/multimap/MultiMapProxyListenersTest.js b/test/multimap/MultiMapProxyListenersTest.js index 62d7a9d14..ac49d32c2 100644 --- a/test/multimap/MultiMapProxyListenersTest.js +++ b/test/multimap/MultiMapProxyListenersTest.js @@ -200,5 +200,4 @@ describe("MultiMap Proxy Listener", function () { }); - }); diff --git a/test/multimap/MultiMapProxyLockTest.js b/test/multimap/MultiMapProxyLockTest.js index 64eca2552..adc18ce2e 100644 --- a/test/multimap/MultiMapProxyLockTest.js +++ b/test/multimap/MultiMapProxyLockTest.js @@ -101,7 +101,7 @@ describe("MultiMap Proxy Lock", function () { it("acquires lock before timeout is exceeded", function () { this.timeout(10000); var startTime = Date.now(); - return mapOne.lock(1, 1000).then(function() { + return mapOne.lock(1, 1000).then(function () { return mapTwo.tryLock(1, 2000); }).then(function (acquired) { var elapsed = Date.now() - startTime; diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index 3600a1acb..92a5ed35b 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -102,7 +102,7 @@ describe('Invalidation metadata distortion', function () { for (var i = 0; i < mapSize; i++) { promises.push(map.get(i)); } - Promise.all(promises).then(function() { + Promise.all(promises).then(function () { setTimeout(populateNearCacheAndCompare, 0); }); } else { @@ -110,7 +110,9 @@ describe('Invalidation metadata distortion', function () { for (var i = 0; i < mapSize; i++) { comparisonPromises.push(compareActualAndExpected(map, validationClient.getMap(mapName), i)); } - Promise.all(comparisonPromises).then(() => {done()}).catch(done); + Promise.all(comparisonPromises).then(() => { + done() + }).catch(done); } } diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index 25e94542e..c0e7bac4f 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -23,7 +23,7 @@ var Long = require('long'); var Util = require('../Util'); var Promise = require('bluebird'); -describe('LostInvalidation', function() { +describe('LostInvalidation', function () { this.timeout(30000); var cluster; @@ -45,8 +45,8 @@ describe('LostInvalidation', function() { return cfg; } - before(function() { - return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function(resp) { + before(function () { + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function (resp) { cluster = resp; return RC.startMember(cluster.id); }).then(function (m) { @@ -68,11 +68,11 @@ describe('LostInvalidation', function() { modifyingClient.shutdown(); }); - after(function() { + after(function () { return RC.shutdownCluster(cluster.id); }); - it('client eventually receives an update for which the invalidation event was dropped', function() { + it('client eventually receives an update for which the invalidation event was dropped', function () { Util.markServerVersionAtLeast(this, client, '3.8'); var map = client.getMap(mapName); @@ -80,45 +80,45 @@ describe('LostInvalidation', function() { var value = 'val'; var updatedval = 'updatedval'; var invalidationHandlerStub; - return Util.promiseWaitMilliseconds(100).then(function(resp) { + return Util.promiseWaitMilliseconds(100).then(function (resp) { invalidationHandlerStub = blockInvalidationEvents(client, map, 1); return modifyingClient.getMap(mapName).put(key, value); - }).then(function() { + }).then(function () { return map.get(key); - }).then(function() { + }).then(function () { return modifyingClient.getMap(mapName).put(key, updatedval); }).then(function () { return Util.promiseWaitMilliseconds(1000); }).then(function () { unblockInvalidationEvents(client, invalidationHandlerStub); return Util.promiseWaitMilliseconds(1000); - }).then(function() { + }).then(function () { return map.get(key); }).then(function (result) { return expect(result).to.equal(updatedval); }); }); - it('lost invalidation stress test', function() { + it('lost invalidation stress test', function () { Util.markServerVersionAtLeast(this, client, '3.8'); var map = client.getMap(mapName); var invalidationHandlerStub; - return Util.promiseWaitMilliseconds(100).then(function(resp) { + return Util.promiseWaitMilliseconds(100).then(function (resp) { invalidationHandlerStub = blockInvalidationEvents(client, map); var entries = []; - for (var i = 0 ; i < entryCount; i++) { + for (var i = 0; i < entryCount; i++) { entries.push([i, i]); } return modifyingClient.getMap(mapName).putAll(entries); - }).then(function() { + }).then(function () { var requestedKeys = []; for (var i = 0; i < entryCount; i++) { requestedKeys.push(i); } //populate near cache return map.getAll(requestedKeys); - }).then(function() { + }).then(function () { var entries = []; for (var i = 0; i < entryCount; i++) { entries.push([i, i + entryCount]); @@ -127,7 +127,7 @@ describe('LostInvalidation', function() { }).then(function () { unblockInvalidationEvents(client, invalidationHandlerStub); return Util.promiseWaitMilliseconds(2000); - }).then(function() { + }).then(function () { var promises = []; for (var i = 0; i < entryCount; i++) { var promise = (function (key) { @@ -148,7 +148,7 @@ describe('LostInvalidation', function() { var handler = client.getInvocationService().eventHandlers[correlationId.toNumber()].handler; var numberOfBlockedInvalidations = 0; var deferred = Promise.defer(); - client.getInvocationService().eventHandlers[correlationId.toNumber()].handler = function() { + client.getInvocationService().eventHandlers[correlationId.toNumber()].handler = function () { numberOfBlockedInvalidations++; if (notifyAfterNumberOfEvents !== undefined && notifyAfterNumberOfEvents === numberOfBlockedInvalidations) { deferred.resolve(); diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index e002e6b16..07dab407b 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -24,7 +24,7 @@ var Util = require('../Util'); var Promise = require('bluebird'); var Address = require('../../.').Address; -describe('MigratedData', function() { +describe('MigratedData', function () { this.timeout(20000); var cluster; @@ -44,8 +44,8 @@ describe('MigratedData', function() { return cfg; } - before(function() { - return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function(resp) { + before(function () { + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function (resp) { cluster = resp; return RC.startMember(cluster.id); }).then(function (m) { @@ -66,11 +66,11 @@ describe('MigratedData', function() { client.shutdown(); }); - after(function() { + after(function () { return RC.shutdownCluster(cluster.id); }); - it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', function() { + it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', function () { Util.markServerVersionAtLeast(this, client, '3.8'); var map = client.getMap(mapName); @@ -80,7 +80,7 @@ describe('MigratedData', function() { return map.get(key); }).then(function () { return map.get(key); - }).then(function() { + }).then(function () { var partitionService = client.getPartitionService(); var partitionIdForKey = partitionService.getPartitionId(key); var addressForKey = partitionService.getAddressForPartition(partitionIdForKey); @@ -93,7 +93,7 @@ describe('MigratedData', function() { } }).then(function () { var partitionService = client.getPartitionService(); - var partitionIdForKey= partitionService.getPartitionId(key); + var partitionIdForKey = partitionService.getPartitionId(key); return waitUntilPartitionMovesTo(partitionService, partitionIdForKey, new Address(survivingMember.host, survivingMember.port)); }).then(function () { return Util.promiseWaitMilliseconds(1500); @@ -113,7 +113,7 @@ describe('MigratedData', function() { if (partitionService.getAddressForPartition(partitionId).equals(address)) { deferred.resolve(); } else if (remainingTries > 0) { - setTimeout(resolveOrTimeout, 1000, remainingTries-1); + setTimeout(resolveOrTimeout, 1000, remainingTries - 1); } else { deferred.reject(new Error('Partition ' + partitionId + ' was not moved to ' + address.toString())); } diff --git a/test/nearcache/NearCacheSimpleInvalidationTest.js b/test/nearcache/NearCacheSimpleInvalidationTest.js index b44ca4b40..c9ac9b7a0 100644 --- a/test/nearcache/NearCacheSimpleInvalidationTest.js +++ b/test/nearcache/NearCacheSimpleInvalidationTest.js @@ -23,7 +23,7 @@ var Config = require('../../.').Config; var Controller = require('../RC'); var HazelcastClient = require('../../.').Client; -describe('NearCacheSimpleInvalidation', function() { +describe('NearCacheSimpleInvalidation', function () { var cluster; var client; var updaterClient; @@ -39,13 +39,13 @@ describe('NearCacheSimpleInvalidation', function() { [false, true].forEach(function (batchInvalidationEnabled) { describe('batch invalidations enabled=' + batchInvalidationEnabled, function () { - before(function() { + before(function () { if (batchInvalidationEnabled) { - var clusterConfig =null; + var clusterConfig = null; } else { var clusterConfig = fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8'); } - return Controller.createCluster(null, clusterConfig).then(function(res) { + return Controller.createCluster(null, clusterConfig).then(function (res) { cluster = res; return Controller.startMember(cluster.id); }).then(function () { @@ -58,7 +58,7 @@ describe('NearCacheSimpleInvalidation', function() { }); }); - after(function() { + after(function () { client.shutdown(); updaterClient.shutdown(); return Controller.shutdownCluster(cluster.id); diff --git a/test/nearcache/NearCacheTest.js b/test/nearcache/NearCacheTest.js index 196cf6cd6..e9a1653fd 100644 --- a/test/nearcache/NearCacheTest.js +++ b/test/nearcache/NearCacheTest.js @@ -26,7 +26,7 @@ var NearCacheImpl = require('../../lib/nearcache/NearCache').NearCacheImpl; var EvictionPolicy = Config.EvictionPolicy; var promiseLater = require('../Util').promiseLater; var SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; -describe('NearCacheImpl', function() { +describe('NearCacheImpl', function () { var cluster; var client; @@ -61,8 +61,8 @@ describe('NearCacheImpl', function() { } } - before(function() { - return Controller.createCluster(null, null).then(function(res) { + before(function () { + return Controller.createCluster(null, null).then(function (res) { cluster = res; return Controller.startMember(cluster.id); }).then(function () { @@ -72,7 +72,7 @@ describe('NearCacheImpl', function() { }); }); - after(function() { + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); }); @@ -112,7 +112,7 @@ describe('NearCacheImpl', function() { }, 100); }); - it('expires after maxIdleSeconds', function(done) { + it('expires after maxIdleSeconds', function (done) { this.timeout(4000); var rec = new DataRecord(ds('key'), 'value', undefined, 100); setTimeout(function () { @@ -124,7 +124,7 @@ describe('NearCacheImpl', function() { }, 2000); }); - it('does not expire while active', function(done) { + it('does not expire while active', function (done) { var rec = new DataRecord(ds('key'), 'value', undefined, 100); setTimeout(function () { rec.setAccessTime(); @@ -175,12 +175,12 @@ describe('NearCacheImpl', function() { return expect(promiseAfter(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.be.undefined; }); - it('ttl does not expire early', function() { + it('ttl does not expire early', function () { nearCache.put(ds('key'), 'val'); return expect(promiseBefore(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.equal('val'); }); - it('evicted after maxIdleSeconds', function() { + it('evicted after maxIdleSeconds', function () { if (nearCache.maxIdleSeconds == 0) { this.skip(); } @@ -188,7 +188,7 @@ describe('NearCacheImpl', function() { return expect(promiseAfter(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.be.undefined; }); - it('not evicted after maxIdleSeconds if maxIdleSeconds is 0(unlimited)', function() { + it('not evicted after maxIdleSeconds if maxIdleSeconds is 0(unlimited)', function () { if (nearCache.maxIdleSeconds != 0) { this.skip(); } @@ -196,17 +196,17 @@ describe('NearCacheImpl', function() { return expect(promiseAfter(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.equal('val'); }); - it('not evicted before maxIdleSeconds', function() { + it('not evicted before maxIdleSeconds', function () { nearCache.put(ds('key'), 'val'); return expect(promiseBefore(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.equal('val'); }); it('evicts entries after eviction max size is reached', function () { - if (nearCache.evictionPolicy == EvictionPolicy.NONE){ + if (nearCache.evictionPolicy == EvictionPolicy.NONE) { this.skip(); } var i; - for (i = 0; i - + false diff --git a/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml index 0ddf7d21f..901bfe81a 100644 --- a/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml +++ b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml @@ -20,9 +20,9 @@ Please see the schema for how to configure Hazelcast at https://hazelcast.com/schema/config/hazelcast-config-3.7.xsd or the documentation at https://hazelcast.org/documentation/ --> - + false diff --git a/test/nearcache/impl/RepairingTaskTest.js b/test/nearcache/impl/RepairingTaskTest.js index 35f2c01ea..e2c0abd03 100644 --- a/test/nearcache/impl/RepairingTaskTest.js +++ b/test/nearcache/impl/RepairingTaskTest.js @@ -20,7 +20,7 @@ var Controller = require('../../RC'); var chai = require('chai'); var expect = chai.expect; -describe('RepairingTask', function() { +describe('RepairingTask', function () { var cluster; var member; @@ -51,25 +51,25 @@ describe('RepairingTask', function() { nccConfig.name = 'test'; cfg.nearCacheConfigs['test'] = nccConfig; cfg.properties['hazelcast.invalidation.reconciliation.interval.seconds'] = reconciliationInterval; - return Client.newHazelcastClient(cfg).then(function(cl) { + return Client.newHazelcastClient(cfg).then(function (cl) { client = cl; }); } - it('throws when reconciliation interval is set to below 30 seconds', function() { - return startClientWithReconciliationInterval(2).then(function() { + it('throws when reconciliation interval is set to below 30 seconds', function () { + return startClientWithReconciliationInterval(2).then(function () { return expect(client.getRepairingTask.bind(client)).to.throw(); }); }); - it('reconciliation interval is used when set to 50', function() { - return startClientWithReconciliationInterval(50).then(function() { + it('reconciliation interval is used when set to 50', function () { + return startClientWithReconciliationInterval(50).then(function () { return expect(client.getRepairingTask().reconcilliationInterval).to.equal(50000); }); }); - it('no reconciliation task is run when interval is set to 0', function() { - return startClientWithReconciliationInterval(0).then(function() { + it('no reconciliation task is run when interval is set to 0', function () { + return startClientWithReconciliationInterval(0).then(function () { return expect(client.getRepairingTask().antientropyTaskHandle).to.be.undefined; }); }); diff --git a/test/pncounter/hazelcast_crdtreplication_delayed.xml b/test/pncounter/hazelcast_crdtreplication_delayed.xml index 937698dbd..b242b78e8 100644 --- a/test/pncounter/hazelcast_crdtreplication_delayed.xml +++ b/test/pncounter/hazelcast_crdtreplication_delayed.xml @@ -14,9 +14,9 @@ ~ limitations under the License. --> - + 1000000 100000 diff --git a/test/pncounter/hazelcast_litemember.xml b/test/pncounter/hazelcast_litemember.xml index 6c7a0c8b1..a3d535c0f 100644 --- a/test/pncounter/hazelcast_litemember.xml +++ b/test/pncounter/hazelcast_litemember.xml @@ -14,8 +14,8 @@ ~ limitations under the License. --> - - + + diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index 82c1677e5..a464c7b85 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -68,19 +68,19 @@ describe("Queue Proxy", function () { return Controller.shutdownCluster(cluster.id); }); - it('size', function() { - return queue.size().then(function(s) { + it('size', function () { + return queue.size().then(function (s) { return expect(s).to.equal(10); }) }); - it('peek', function() { - return queue.peek().then(function(head) { + it('peek', function () { + return queue.peek().then(function (head) { return expect(head).to.equal('item0'); }) }); - it('add return true', function() { + it('add return true', function () { return queue.add('item_new').then(function (retVal) { return expect(retVal).to.be.true; }); @@ -89,130 +89,130 @@ describe("Queue Proxy", function () { it('add increases queue size', function () { return queue.add('item_new').then(function () { return queue.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(11); }); }); - it('add throws if queue is full', function() { + it('add throws if queue is full', function () { return _offerToQueue(5, 'new').then(function () { return expect(queue.add('excess_item')).to.eventually.rejected; }); }); - it('poll decreases queue size', function() { - return queue.poll().then(function() { + it('poll decreases queue size', function () { + return queue.poll().then(function () { return queue.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(9); }); }); - it('poll returns the head of the queue', function() { - return queue.poll().then(function(ret) { + it('poll returns the head of the queue', function () { + return queue.poll().then(function (ret) { return expect(ret).to.equal('item0'); }); }); - it('poll returns null after timeout', function() { - return queue.clear().then(function() { + it('poll returns null after timeout', function () { + return queue.clear().then(function () { return queue.poll(1000); - }).then(function(ret) { + }).then(function (ret) { return expect(ret).to.be.null; }); }); - it('poll returns head after a new element added', function() { - return queue.clear().then(function() { - setTimeout(function() { + it('poll returns head after a new element added', function () { + return queue.clear().then(function () { + setTimeout(function () { queue.offer('new_item'); }, 500); return queue.poll(1000); - }).then(function(ret) { + }).then(function (ret) { return expect(ret).to.equal('new_item'); }); }); - it('offer with timeout', function() { - return queue.offer('new_item', 1000).then(function() { + it('offer with timeout', function () { + return queue.offer('new_item', 1000).then(function () { return queue.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(11); }); }); - it('remaining capacity', function() { - return queue.remainingCapacity().then(function(c) { + it('remaining capacity', function () { + return queue.remainingCapacity().then(function (c) { return expect(c).to.equal(5); }); }); - it('contains returns false for absent', function() { - return queue.contains('item_absent').then(function(ret) { + it('contains returns false for absent', function () { + return queue.contains('item_absent').then(function (ret) { return expect(ret).to.be.false; }); }); - it('contains returns true for present', function() { - return queue.contains('item0').then(function(ret) { + it('contains returns true for present', function () { + return queue.contains('item0').then(function (ret) { return expect(ret).to.be.true; }); }); - it('remove', function() { - return queue.remove('item5').then(function(ret) { + it('remove', function () { + return queue.remove('item5').then(function (ret) { return expect(ret).to.be.true; }); }); - it('remove decreases size', function() { + it('remove decreases size', function () { return queue.remove('item5').then(function () { return queue.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(9); }); }); - it('toArray', function() { - return queue.toArray().then(function(arr) { + it('toArray', function () { + return queue.toArray().then(function (arr) { expect(arr).to.be.instanceof(Array); expect(arr).to.have.lengthOf(10); expect(arr).to.include.members(['item0', 'item2', 'item9']); }); }); - it('clear', function() { - return queue.clear().then(function() { + it('clear', function () { + return queue.clear().then(function () { return queue.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(0); }); }); - it('drainTo', function() { + it('drainTo', function () { var dummyArr = ['dummy_item']; - return queue.drainTo(dummyArr).then(function() { + return queue.drainTo(dummyArr).then(function () { expect(dummyArr).to.have.lengthOf(11); expect(dummyArr).to.include.members(['item0', 'dummy_item', 'item3', 'item9']); }); }); - it('drainTo with max elements', function() { + it('drainTo with max elements', function () { var dummyArr = ['dummy_item']; - return queue.drainTo(dummyArr, 2).then(function() { + return queue.drainTo(dummyArr, 2).then(function () { expect(dummyArr).to.have.lengthOf(3); expect(dummyArr).to.include.members(['item0', 'dummy_item', 'item1']); expect(dummyArr).to.not.include.members(['item2', 'item9']); }); }); - it('isEmpty false', function() { + it('isEmpty false', function () { return queue.isEmpty().then(function (ret) { return expect(ret).to.be.false; }); }); - it('isEmpty true', function() { + it('isEmpty true', function () { return queue.clear().then(function (ret) { return queue.isEmpty(); }).then(function (ret) { @@ -220,9 +220,9 @@ describe("Queue Proxy", function () { }) }); - it('take waits', function(done) { + it('take waits', function (done) { queue.clear().then(function () { - queue.take().then(function(val) { + queue.take().then(function (val) { expect(val).to.equal('item_new'); done(); }).catch(done); @@ -230,91 +230,91 @@ describe("Queue Proxy", function () { }).catch(done); }); - it('take immediately returns', function() { - return queue.take().then(function(ret) { + it('take immediately returns', function () { + return queue.take().then(function (ret) { return expect(ret).to.equal('item0'); }); }); - it('addAll', function() { + it('addAll', function () { var values = ['a', 'b', 'c']; - return queue.addAll(values).then(function(retVal) { + return queue.addAll(values).then(function (retVal) { expect(retVal).to.be.true; return queue.toArray(); - }).then(function(vals) { + }).then(function (vals) { return expect(vals).to.include.members(values); }) }); - it('containsAll true', function() { + it('containsAll true', function () { var values = ['item0', 'item1']; - return queue.containsAll(values).then(function(ret) { + return queue.containsAll(values).then(function (ret) { return expect(ret).to.be.true; }); }); - it('containsAll true', function() { + it('containsAll true', function () { var values = ['item0', 'item_absent']; - return queue.containsAll(values).then(function(ret) { + return queue.containsAll(values).then(function (ret) { return expect(ret).to.be.false; }); }); - it('containsAll true', function() { + it('containsAll true', function () { var values = []; - return queue.containsAll(values).then(function(ret) { + return queue.containsAll(values).then(function (ret) { return expect(ret).to.be.true; }); }); - it('put', function() { - return queue.put('item_new').then(function() { + it('put', function () { + return queue.put('item_new').then(function () { return queue.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(11); }); }); - it('removeAll', function() { + it('removeAll', function () { var cand = ['item1', 'item2']; - return queue.removeAll(cand).then(function(retVal) { + return queue.removeAll(cand).then(function (retVal) { return expect(retVal).to.be.true; - }).then(function() { + }).then(function () { return queue.toArray(); - }).then(function(arr) { + }).then(function (arr) { return expect(arr).to.not.include.members(cand); }); }); - it('retainAll changes queue', function() { + it('retainAll changes queue', function () { var retains = ['item1', 'item2']; - return queue.retainAll(retains).then(function(r) { + return queue.retainAll(retains).then(function (r) { return expect(r).to.be.true; - }).then(function() { + }).then(function () { return queue.toArray(); - }).then(function(arr) { + }).then(function (arr) { return expect(arr).to.deep.equal(retains); }); }); - it('retainAll does not change queue', function() { + it('retainAll does not change queue', function () { var retains; - return queue.toArray().then(function(r) { + return queue.toArray().then(function (r) { retains = r; return queue.retainAll(r); - }).then(function(r) { + }).then(function (r) { return expect(r).to.be.false; - }).then(function() { + }).then(function () { return queue.toArray(); - }).then(function(arr) { + }).then(function (arr) { return expect(arr).to.deep.equal(retains); }); }); - it('addItemListener itemAdded', function(done) { + it('addItemListener itemAdded', function (done) { queue.addItemListener({ - itemAdded: function(item) { + itemAdded: function (item) { if (item === 'item_new') { done(); } else { @@ -326,43 +326,43 @@ describe("Queue Proxy", function () { }) }); - it('addItemListener itemAdded with includeValue=false', function(done) { + it('addItemListener itemAdded with includeValue=false', function (done) { queue.addItemListener({ - itemAdded: function(item) { + itemAdded: function (item) { done(); } - }, false).then(function() { + }, false).then(function () { queue.add('item_new'); }); }); - it('addItemListener itemRemoved', function(done) { + it('addItemListener itemRemoved', function (done) { queue.addItemListener({ - itemRemoved: function(item) { + itemRemoved: function (item) { if (item === 'item0') { done(); } else { done(new Error('Expected item_new, got ' + item)); } } - }, true).then(function() { + }, true).then(function () { queue.remove('item0'); }); }); - it('removeItemListener', function() { - return queue.addItemListener({}, false).then(function(regId) { + it('removeItemListener', function () { + return queue.addItemListener({}, false).then(function (regId) { return queue.removeItemListener(regId); - }).then(function(ret) { + }).then(function (ret) { return expect(ret).to.be.true; }); }); - it('removeItemListener with wrong id returns null', function() { - return queue.addItemListener({}, false).then(function() { + it('removeItemListener with wrong id returns null', function () { + return queue.addItemListener({}, false).then(function () { return queue.removeItemListener('wrongId'); - }).then(function(ret) { + }).then(function (ret) { return expect(ret).to.be.false; }); }); diff --git a/test/queue/hazelcast_queue.xml b/test/queue/hazelcast_queue.xml index 85e281b7f..e3fbbf882 100644 --- a/test/queue/hazelcast_queue.xml +++ b/test/queue/hazelcast_queue.xml @@ -14,9 +14,9 @@ ~ limitations under the License. --> - + 15 diff --git a/test/replicatedmap/hazelcast_replicatedmap.xml b/test/replicatedmap/hazelcast_replicatedmap.xml index 804715951..3822012ac 100644 --- a/test/replicatedmap/hazelcast_replicatedmap.xml +++ b/test/replicatedmap/hazelcast_replicatedmap.xml @@ -14,9 +14,9 @@ ~ limitations under the License. --> - + OBJECT true diff --git a/test/ringbuffer/LazyReadResultSetTest.js b/test/ringbuffer/LazyReadResultSetTest.js index 4e3d5e64a..3f17abdf3 100644 --- a/test/ringbuffer/LazyReadResultSetTest.js +++ b/test/ringbuffer/LazyReadResultSetTest.js @@ -22,7 +22,7 @@ describe('LazyReadResultSetTest', function () { var mockSerializationService = { 'toObject': function (x) { - return x+100; + return x + 100; }, 'isData': function (x) { @@ -31,7 +31,7 @@ describe('LazyReadResultSetTest', function () { }; it('get', function () { - var set = new LazyReadResultSet(mockSerializationService, 4, [1,2,3,4], [11,12,13,14]); + var set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); expect(set.get(0)).to.equal(101); expect(set.get(1)).to.equal(102); expect(set.get(2)).to.equal(3); @@ -44,12 +44,12 @@ describe('LazyReadResultSetTest', function () { }); it('getSequence throws UnsupportedOperationError when there is no info', function () { - var set = new LazyReadResultSet(mockSerializationService, 4, [1,2,3,4]); + var set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4]); expect(set.getSequence.bind(set, 2)).to.throw(HzErrors.UnsupportedOperationError); }); it('get returns undefined for out of range index', function () { - var set = new LazyReadResultSet(mockSerializationService, 4, [1,2,3,4], [11,12,13,14]); + var set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); expect(set.get(4)).to.be.undefined; }); }); diff --git a/test/ringbuffer/hazelcast_ringbuffer.xml b/test/ringbuffer/hazelcast_ringbuffer.xml index 1b4186190..c641a3793 100644 --- a/test/ringbuffer/hazelcast_ringbuffer.xml +++ b/test/ringbuffer/hazelcast_ringbuffer.xml @@ -14,9 +14,9 @@ ~ limitations under the License. --> - + 3 diff --git a/test/serialization/APortable.js b/test/serialization/APortable.js index b45647655..1954d2755 100644 --- a/test/serialization/APortable.js +++ b/test/serialization/APortable.js @@ -15,8 +15,7 @@ */ function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, doubles, shorts, floats, ints, longs, strings, - portables, identifiedDataSerializable, customStreamSerializableObject, customByteArraySerializableObject, data) -{ + portables, identifiedDataSerializable, customStreamSerializableObject, customByteArraySerializableObject, data) { if (arguments.length === 0) return; this.bool = bool; this.b = b; @@ -45,7 +44,7 @@ function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, do this.bytesOffset = bytes.slice(1, 3); this.strChars = str.split(''); this.strBytes = new Buffer(this.str.length); - for (var i = 0; i < str.length; i++) { + for (var i = 0; i < str.length; i++) { this.strBytes[i] = this.strChars[i].charCodeAt(0); } unsignedByte = 137; @@ -59,15 +58,15 @@ function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, do this.data = data; } -APortable.prototype.getClassId = function() { +APortable.prototype.getClassId = function () { return 1; }; -APortable.prototype.getFactoryId = function() { +APortable.prototype.getFactoryId = function () { return 1; }; -APortable.prototype.readPortable = function(reader) { +APortable.prototype.readPortable = function (reader) { this.bool = reader.readBoolean("bool"); this.b = reader.readByte("b"); this.c = reader.readChar("c"); @@ -155,7 +154,7 @@ APortable.prototype.readPortable = function(reader) { this.data = dataInput.readData(); }; -APortable.prototype.writeData = function() { +APortable.prototype.writeData = function () { //TODO }; module.exports = APortable; diff --git a/test/serialization/AnIdentifiedDataSerializable.js b/test/serialization/AnIdentifiedDataSerializable.js index 364161a76..7a0c2dbe6 100644 --- a/test/serialization/AnIdentifiedDataSerializable.js +++ b/test/serialization/AnIdentifiedDataSerializable.js @@ -42,7 +42,7 @@ function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, this.bytesOffset = bytes.slice(1, 3); this.strChars = str.split(''); this.strBytes = new Buffer(this.str.length); - for (var i = 0; i < str.length; i++) { + for (var i = 0; i < str.length; i++) { this.strBytes[i] = this.strChars[i].charCodeAt(0); } this.unsignedByte = 137; @@ -54,15 +54,15 @@ function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, this.data = data; } -AnIdentifiedDataSerializable.prototype.getFactoryId = function() { +AnIdentifiedDataSerializable.prototype.getFactoryId = function () { return 1; }; -AnIdentifiedDataSerializable.prototype.getClassId = function() { +AnIdentifiedDataSerializable.prototype.getClassId = function () { return 1; }; -AnIdentifiedDataSerializable.prototype.readData = function(dataInput) { +AnIdentifiedDataSerializable.prototype.readData = function (dataInput) { this.bool = dataInput.readBoolean(); this.b = dataInput.readByte(); this.c = dataInput.readChar(); @@ -116,7 +116,7 @@ AnIdentifiedDataSerializable.prototype.readData = function(dataInput) { this.data = dataInput.readData(); }; -AnIdentifiedDataSerializable.prototype.writeData = function(dataOutput) { +AnIdentifiedDataSerializable.prototype.writeData = function (dataOutput) { dataOutput.writeBoolean(this.bool); dataOutput.writeByte(this.b); dataOutput.writeChar(this.c); diff --git a/test/serialization/AnInnerPortable.js b/test/serialization/AnInnerPortable.js index f9863c006..340d13124 100644 --- a/test/serialization/AnInnerPortable.js +++ b/test/serialization/AnInnerPortable.js @@ -19,22 +19,22 @@ function AnInnerPortable(anInt, aFloat) { this.aFloat = aFloat; } -AnInnerPortable.prototype.getFactoryId = function() { +AnInnerPortable.prototype.getFactoryId = function () { return 1; }; -AnInnerPortable.prototype.getClassId = function() { +AnInnerPortable.prototype.getClassId = function () { return 2; }; -AnInnerPortable.prototype.writePortable = function(writer) { +AnInnerPortable.prototype.writePortable = function (writer) { writer.writeInt('i', this.anInt); writer.writeFloat('f', this.aFloat); }; -AnInnerPortable.prototype.readPortable = function(reader) { +AnInnerPortable.prototype.readPortable = function (reader) { this.anInt = reader.readInt('i'); this.aFloat = reader.readFloat('f'); }; -AnInnerPortable.prototype.equals = function(other) { +AnInnerPortable.prototype.equals = function (other) { if (other === this) return true; if (this.anInt !== other.anInt) diff --git a/test/serialization/BinaryCompatibilityTest.js b/test/serialization/BinaryCompatibilityTest.js index 5c4465131..5730d4f6e 100644 --- a/test/serialization/BinaryCompatibilityTest.js +++ b/test/serialization/BinaryCompatibilityTest.js @@ -27,7 +27,7 @@ var APortable = require('./APortable'); var CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; var CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; var expectAlmostEqual = require('../Util').expectAlmostEqual; -describe('Binary serialization compatibility test', function() { +describe('Binary serialization compatibility test', function () { var NULL_LENGTH = -1; var versions = [1]; @@ -46,6 +46,7 @@ describe('Binary serialization compatibility test', function() { else return 'LITTLE_ENDIAN'; } + function stripArticle(name) { if (name.startsWith('an')) { return name.slice(2); @@ -59,6 +60,7 @@ describe('Binary serialization compatibility test', function() { } } } + function createObjectKey(varName, version, isBigEndian) { return version + '-' + stripArticle(varName) + '-' + convertEndiannesToByteOrder(isBigEndian); @@ -67,7 +69,7 @@ describe('Binary serialization compatibility test', function() { function createSerializationService(isBigEndian, defaultNumberType) { var cfg = new Config.ClientConfig().serializationConfig; cfg.portableFactories[ReferenceObjects.PORTABLE_FACTORY_ID] = { - create: function(classId) { + create: function (classId) { if (classId === ReferenceObjects.INNER_PORTABLE_CLASS_ID) { return new AnInnerPortable(); } else if (classId == ReferenceObjects.PORTABLE_CLASS_ID) { @@ -76,22 +78,22 @@ describe('Binary serialization compatibility test', function() { } }; cfg.dataSerializableFactories[ReferenceObjects.IDENTIFIED_DATA_SERIALIZABLE_FACTORY_ID] = { - create: function(type) { + create: function (type) { if (type === ReferenceObjects.IDENTIFIED_DATA_SERIALIZABLE_CLASS_ID) { return new AnIdentifiedDataSerializable(); } } }; cfg.customSerializers.push({ - getId: function() { + getId: function () { return ReferenceObjects.CUSTOM_BYTE_ARRAY_SERILAZABLE_ID; }, - write: function(out, object) { + write: function (out, object) { out.writeInt(8); out.writeInt(object.i); out.writeFloat(object.f); }, - read: function(inp) { + read: function (inp) { var len = inp.readInt(); var buf = new Buffer(len); inp.readCopy(buf, len); @@ -99,14 +101,14 @@ describe('Binary serialization compatibility test', function() { } }); cfg.customSerializers.push({ - getId: function() { + getId: function () { return ReferenceObjects.CUSTOM_STREAM_SERILAZABLE_ID; }, write: function (out, object) { out.writeInt(object.int); out.writeFloat(object.float); }, - read: function(inp) { + read: function (inp) { return new CustomStreamSerializable(inp.readInt(), inp.readFloat()); } }); @@ -115,8 +117,8 @@ describe('Binary serialization compatibility test', function() { return new SerializationService(cfg) } - before(function() { - versions.forEach(function(version) { + before(function () { + versions.forEach(function (version) { var input = new ObjectDataInput(fs.readFileSync(__dirname + '/' + createFileName(version)), 0, null, true); while (input.available() > 0) { var utflen = input.readUnsignedShort(); @@ -136,7 +138,7 @@ describe('Binary serialization compatibility test', function() { }); for (var vn in objects) { - (function() { + (function () { var varName = vn; var object = objects[varName]; if (objects.hasOwnProperty(varName)) { @@ -149,7 +151,7 @@ describe('Binary serialization compatibility test', function() { var deserialized = service.toObject(dataMap[key]); expectAlmostEqual(deserialized, object); }); - if ( !ReferenceObjects.skipOnSerialize[varName]) { + if (!ReferenceObjects.skipOnSerialize[varName]) { it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version + ' serialize deserialize', function () { this.timeout(10000); var key = createObjectKey(varName, version, isBigEndian); diff --git a/test/serialization/CustomSerializable.js b/test/serialization/CustomSerializable.js index 39c30aa63..394769b99 100644 --- a/test/serialization/CustomSerializable.js +++ b/test/serialization/CustomSerializable.js @@ -18,9 +18,11 @@ function CustomByteArraySerializable(int, float) { this.int = int; this.float = float; } + function CustomStreamSerializable(int, float) { this.int = int; this.float = float; } + exports.CustomByteArraySerializable = CustomByteArraySerializable; exports.CustomStreamSerializable = CustomStreamSerializable; diff --git a/test/serialization/CustomSerializerTest.js b/test/serialization/CustomSerializerTest.js index 261e2b448..525089ed4 100644 --- a/test/serialization/CustomSerializerTest.js +++ b/test/serialization/CustomSerializerTest.js @@ -17,25 +17,26 @@ var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var expect = require('chai').expect; -describe('Custom Serializer', function() { +describe('Custom Serializer', function () { var service; function CustomObject(surname) { this.surname = surname; } - CustomObject.prototype.hzGetCustomId = function() { + + CustomObject.prototype.hzGetCustomId = function () { return 10; }; - before(function() { + before(function () { var cfg = new Config.ClientConfig(); cfg.serializationConfig.customSerializers.push({ - getId: function() { + getId: function () { return 10; }, - write: function(out, emp) { + write: function (out, emp) { out.writeUTF(emp.surname); }, - read: function(inp) { + read: function (inp) { var obj = new CustomObject(); obj.surname = inp.readUTF(); return obj; @@ -44,7 +45,7 @@ describe('Custom Serializer', function() { service = new SerializationService.SerializationServiceV1(cfg.serializationConfig); }); - it('write-read', function() { + it('write-read', function () { var emp = new CustomObject('iman'); var serialized = service.toData(emp); var deserialized = service.toObject(serialized); diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index b4a56c8d5..8486bfc74 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -17,16 +17,16 @@ var Client = require('../../.').Client; var RC = require('../RC'); var expect = require('chai').expect; -describe('Default serializers with live instance', function() { +describe('Default serializers with live instance', function () { var cluster; var member; var client; var map; - before(function() { + before(function () { return RC.createCluster(null, null).then(function (res) { cluster = res; - }).then(function() { + }).then(function () { return RC.startMember(cluster.id); }).then(function (m) { member = m; @@ -37,7 +37,7 @@ describe('Default serializers with live instance', function() { }); }); - after(function() { + after(function () { client.shutdown(); return RC.shutdownCluster(cluster.id); }); @@ -59,7 +59,7 @@ describe('Default serializers with live instance', function() { it('string', function () { return map.put('testStringKey', 'testStringValue').then(function () { return RC.executeOnController(cluster.id, _generateGet('testStringKey'), 1); - }).then(function(response) { + }).then(function (response) { return expect(response.result.toString()).to.equal('testStringValue'); }) }); @@ -72,7 +72,7 @@ describe('Default serializers with live instance', function() { }); }); - it('utf8 characters test', function() { + it('utf8 characters test', function () { return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}').then(function () { return RC.executeOnController(cluster.id, _generateGet('key'), 1); }).then(function (response) { @@ -80,7 +80,7 @@ describe('Default serializers with live instance', function() { }); }); - it('utf8 characters test with surrogates', function() { + it('utf8 characters test with surrogates', function () { return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06').then(function () { return RC.executeOnController(cluster.id, _generateGet('key'), 1); }).then(function (response) { @@ -88,7 +88,7 @@ describe('Default serializers with live instance', function() { }); }); - it('utf8 sample string test', function() { + it('utf8 sample string test', function () { return map.put('key', 'Iñtërnâtiônàlizætiøn').then(function () { return RC.executeOnController(cluster.id, _generateGet('key'), 1); }).then(function (response) { @@ -99,15 +99,15 @@ describe('Default serializers with live instance', function() { it('number', function () { return map.put('a', 23).then(function () { return RC.executeOnController(cluster.id, _generateGet('a'), 1); - }).then(function(response) { + }).then(function (response) { return expect(Number.parseInt(response.result.toString())).to.equal(23); }) }); - it('array', function() { + it('array', function () { return map.put('a', ['a', 'v', 'vg']).then(function () { return RC.executeOnController(cluster.id, _generateGet('a'), 1); - }).then(function(response) { + }).then(function (response) { return expect(response.result.toString()).to.equal(['a', 'v', 'vg'].toString()); }) }) diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index 41b5727fa..f60988d41 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -19,7 +19,7 @@ var Long = require('long'); var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var Predicates = require('../../.').Predicates; -describe('Default serializers Test', function() { +describe('Default serializers Test', function () { var serializationService; @@ -31,7 +31,7 @@ describe('Default serializers Test', function() { var parameters = [ 14, 545.3, - 1<<63, + 1 << 63, true, [true, false, false, true], [], @@ -43,7 +43,7 @@ describe('Default serializers Test', function() { 'Iñtërnâtiônàlizætiøn', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}', [12, 56, 54, 12], - [43546.6, 2343.4, 8988,4], + [43546.6, 2343.4, 8988, 4], [23545798.6], null, {abc: 'abc', 'five': 5}, @@ -70,7 +70,7 @@ describe('Default serializers Test', function() { ]; parameters.forEach(function (obj) { - it('type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) + ', value: ' + JSON.stringify(obj), function() { + it('type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) + ', value: ' + JSON.stringify(obj), function () { var serializationService = new SerializationService.SerializationServiceV1(new Config.ClientConfig().serializationConfig); var serialized = serializationService.toData(obj); expect(serializationService.toObject(serialized)).to.deep.equal(obj); @@ -85,8 +85,8 @@ describe('Default serializers Test', function() { 'float' ]; - defaultNumberTypes.forEach(function(type) { - it('convert default number type: ' + type, function() { + defaultNumberTypes.forEach(function (type) { + it('convert default number type: ' + type, function () { if (type === 'long') { var num = Long.fromNumber(56); } else { @@ -100,8 +100,8 @@ describe('Default serializers Test', function() { }) }); - defaultNumberTypes.forEach(function(type) { - it('convert array of default number type: ' + type, function() { + defaultNumberTypes.forEach(function (type) { + it('convert array of default number type: ' + type, function () { if (type === 'long') { var nums = [Long.fromNumber(56), Long.fromNumber(101)]; } else { diff --git a/test/serialization/GlobalSerializerTest.js b/test/serialization/GlobalSerializerTest.js index aeaa8ffd1..27b74570f 100644 --- a/test/serialization/GlobalSerializerTest.js +++ b/test/serialization/GlobalSerializerTest.js @@ -17,22 +17,23 @@ var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var expect = require('chai').expect; -describe('Global Serializer', function() { +describe('Global Serializer', function () { var service; function CustomObject(surname) { this.surname = surname; } - before(function() { + + before(function () { var cfg = new Config.ClientConfig(); cfg.serializationConfig.globalSerializer = { - getId: function() { + getId: function () { return 10; }, - write: function(out, emp) { + write: function (out, emp) { out.writeUTF(emp.surname); }, - read: function(inp) { + read: function (inp) { var obj = new CustomObject(); obj.surname = inp.readUTF(); return obj; @@ -41,7 +42,7 @@ describe('Global Serializer', function() { service = new SerializationService.SerializationServiceV1(cfg.serializationConfig); }); - it('write-read', function() { + it('write-read', function () { var emp = new CustomObject('iman'); var serialized = service.toData(emp); var deserialized = service.toObject(serialized); diff --git a/test/serialization/IdentifiedDataSerializableTest.js b/test/serialization/IdentifiedDataSerializableTest.js index cc7904991..2810f1dd5 100644 --- a/test/serialization/IdentifiedDataSerializableTest.js +++ b/test/serialization/IdentifiedDataSerializableTest.js @@ -19,8 +19,8 @@ var SerializationService = require('../../lib/serialization/SerializationService var Config = require('../../.').Config; var Long = require('long'); var Util = require('../Util'); -describe('Identified Data Serializable', function() { - var IdentifiedDataClass = function(a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings) { +describe('Identified Data Serializable', function () { + var IdentifiedDataClass = function (a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings) { this.a_byte = a_byte; this.a_boolean = a_boolean; this.a_character = a_character; @@ -41,7 +41,7 @@ describe('Identified Data Serializable', function() { this.strings = strings; }; - IdentifiedDataClass.prototype.readData = function(inp) { + IdentifiedDataClass.prototype.readData = function (inp) { this.a_byte = inp.readByte(); this.a_boolean = inp.readBoolean(); this.a_character = inp.readChar(); @@ -63,7 +63,7 @@ describe('Identified Data Serializable', function() { this.strings = inp.readUTFArray(); }; - IdentifiedDataClass.prototype.writeData = function(outp) { + IdentifiedDataClass.prototype.writeData = function (outp) { outp.writeByte(this.a_byte); outp.writeBoolean(this.a_boolean); outp.writeChar(this.a_character); @@ -85,16 +85,16 @@ describe('Identified Data Serializable', function() { outp.writeUTFArray(this.strings); }; - IdentifiedDataClass.prototype.getFactoryId = function() { + IdentifiedDataClass.prototype.getFactoryId = function () { return 1; }; - IdentifiedDataClass.prototype.getClassId = function() { + IdentifiedDataClass.prototype.getClassId = function () { return 1; }; var identifiedFactory = { - create: function(type) { + create: function (type) { if (type === 1) { return new IdentifiedDataClass(); } @@ -103,7 +103,7 @@ describe('Identified Data Serializable', function() { var service; - it('serialize deserialize identified data serializable', function() { + it('serialize deserialize identified data serializable', function () { var cfg = new Config.ClientConfig(); cfg.serializationConfig.dataSerializableFactories[1] = identifiedFactory; service = new SerializationService.SerializationServiceV1(cfg.serializationConfig); diff --git a/test/serialization/ObjectDataTest.js b/test/serialization/ObjectDataTest.js index 6c46128ea..fb57eab4c 100644 --- a/test/serialization/ObjectDataTest.js +++ b/test/serialization/ObjectDataTest.js @@ -19,11 +19,11 @@ var Long = require('long'); var ObjectData = require('../../lib/serialization/ObjectData'); var ODInp = ObjectData.ObjectDataInput; var ODOut = ObjectData.ObjectDataOutput; -describe('ObjectData Test', function() { +describe('ObjectData Test', function () { var out = new ODOut(new Buffer(100), null, true); - before(function() { + before(function () { out.write(15); out.write(new Buffer(['t'.charCodeAt(0), 'e'.charCodeAt(0), 's'.charCodeAt(0), 't'.charCodeAt(0)])); out.writeBoolean(true); @@ -54,7 +54,7 @@ describe('ObjectData Test', function() { ]); }); - it('read', function() { + it('read', function () { var inp = new ODInp(out.toBuffer(), 0, null, true); expect(inp.read()).to.equal(15); expect(inp.read()).to.equal('t'.charCodeAt(0)); @@ -76,11 +76,11 @@ describe('ObjectData Test', function() { expect(inp.readCharArray()).to.deep.equal(['h', 'a', 'z', 'e', 'l']); expect(inp.readCharArray().join('')).to.equal('cast'); expect(inp.readDouble()).to.equals(435437.23); - inp.readDoubleArray().forEach(function(fl, index) { + inp.readDoubleArray().forEach(function (fl, index) { expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); }); expect(inp.readFloat()).to.be.closeTo(3.4, 0.0001); - inp.readFloatArray().forEach(function(fl, index) { + inp.readFloatArray().forEach(function (fl, index) { expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); }); expect(inp.readInt()).to.equal(9876543); @@ -101,20 +101,20 @@ describe('ObjectData Test', function() { expect(inp.read()).to.equal(15); }); - it('read from pos', function() { + it('read from pos', function () { var inp = new ODInp(out.toBuffer(), 0, null, true); inp.read(); expect(inp.read(0)).to.equal(15); }); - it('position', function() { + it('position', function () { var inp = new ODInp(out.toBuffer(), 0, null, true); inp.read(); inp.position(0); expect(inp.read()).to.equal(15); }); - it('non integer position does not affect', function() { + it('non integer position does not affect', function () { var inp = new ODInp(out.toBuffer(), 0, null, true); inp.read(); inp.position(0.5); diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index 706af440f..99f9d3c5a 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -37,13 +37,14 @@ function PortableObject(a_byte, a_boolean, a_character, a_short, an_integer, a_l this.strings = strings; this.portables = portables; } -PortableObject.prototype.getFactoryId = function() { + +PortableObject.prototype.getFactoryId = function () { return 10; }; -PortableObject.prototype.getClassId = function() { +PortableObject.prototype.getClassId = function () { return 111; }; -PortableObject.prototype.writePortable = function(writer) { +PortableObject.prototype.writePortable = function (writer) { writer.writeByte('a_byte', this.a_byte); writer.writeBoolean('a_boolean', this.a_boolean); writer.writeChar('a_char', this.a_character); @@ -67,7 +68,7 @@ PortableObject.prototype.writePortable = function(writer) { writer.writeUTFArray('strings', this.strings); writer.writePortableArray('portables', this.portables); }; -PortableObject.prototype.readPortable = function(reader) { +PortableObject.prototype.readPortable = function (reader) { this.a_byte = reader.readByte('a_byte'); this.a_boolean = reader.readBoolean('a_boolean'); this.a_character = reader.readChar('a_char'); @@ -97,20 +98,20 @@ function InnerPortableObject(p1, p2) { this.p2 = p2; } -InnerPortableObject.prototype.getFactoryId = function() { +InnerPortableObject.prototype.getFactoryId = function () { return 10; }; -InnerPortableObject.prototype.getClassId = function() { +InnerPortableObject.prototype.getClassId = function () { return 222; }; -InnerPortableObject.prototype.readPortable = function(reader) { +InnerPortableObject.prototype.readPortable = function (reader) { this.p1 = reader.readUTF('p1'); this.p2 = reader.readUTF('p2'); }; -InnerPortableObject.prototype.writePortable = function(writer) { +InnerPortableObject.prototype.writePortable = function (writer) { writer.writeUTF('p1', this.p1); writer.writeUTF('p2', this.p2); }; @@ -140,19 +141,19 @@ function PortableObjectV2(a_new_prop, a_byte, a_boolean, a_character, a_short, a this.portables = portables; } -PortableObjectV2.prototype.getVersion = function() { +PortableObjectV2.prototype.getVersion = function () { return 2; }; -PortableObjectV2.prototype.getFactoryId = function() { +PortableObjectV2.prototype.getFactoryId = function () { return 10; }; -PortableObjectV2.prototype.getClassId = function() { +PortableObjectV2.prototype.getClassId = function () { return 111; }; -PortableObjectV2.prototype.writePortable = function(writer) { +PortableObjectV2.prototype.writePortable = function (writer) { writer.writeUTF('a_new_prop', this.a_new_prop); writer.writeByte('a_byte', this.a_byte); writer.writeBoolean('a_boolean', this.a_boolean); @@ -176,7 +177,7 @@ PortableObjectV2.prototype.writePortable = function(writer) { writer.writeUTFArray('strings', this.strings); writer.writePortableArray('portables', this.portables); }; -PortableObjectV2.prototype.readPortable = function(reader) { +PortableObjectV2.prototype.readPortable = function (reader) { this.a_new_prop = reader.readUTF('a_new_prop'); this.a_byte = reader.readByte('a_byte'); this.a_boolean = reader.readBoolean('a_boolean'); diff --git a/test/serialization/PortableSerializersLiveTest.js b/test/serialization/PortableSerializersLiveTest.js index 8bc385018..a3bca78fa 100644 --- a/test/serialization/PortableSerializersLiveTest.js +++ b/test/serialization/PortableSerializersLiveTest.js @@ -6,7 +6,7 @@ var SimplePortable = require('./PortableObjects').SimplePortable; var InnerPortable = require('./PortableObjects').InnerPortableObject; var Promise = require('bluebird'); -describe('Default serializers with live instance', function() { +describe('Default serializers with live instance', function () { var cluster; var member; var client; @@ -15,7 +15,7 @@ describe('Default serializers with live instance', function() { function getClientConfig() { var cfg = new Config.ClientConfig(); cfg.serializationConfig.portableFactories[10] = { - create: function(classId) { + create: function (classId) { if (classId === 222) { return new InnerPortable(); } else if (classId === 21) { @@ -28,10 +28,10 @@ describe('Default serializers with live instance', function() { return cfg; } - before(function() { + before(function () { return RC.createCluster(null, null).then(function (res) { cluster = res; - }).then(function() { + }).then(function () { return RC.startMember(cluster.id); }).then(function (m) { member = m; @@ -42,7 +42,7 @@ describe('Default serializers with live instance', function() { }); }); - after(function() { + after(function () { client.shutdown(); return RC.shutdownCluster(cluster.id); }); @@ -52,7 +52,7 @@ describe('Default serializers with live instance', function() { var innerPortable = new InnerPortable('str1', 'str2'); return map.put('simpleportable', simplePortable).then(function () { return map.put('innerportable', innerPortable); - }).then(function() { + }).then(function () { return map.get('simpleportable'); }).then(function (sp) { return map.get('innerportable').then(function (ip) { @@ -68,7 +68,7 @@ describe('Default serializers with live instance', function() { var innerPortable = new InnerPortable('str1', 'str2'); return map.putAll([['simpleportable', simplePortable], ['innerportable', innerPortable]]).then(function () { client.shutdown(); - }).then(function() { + }).then(function () { return Client.newHazelcastClient(getClientConfig()); }).then(function (cl) { client = cl; diff --git a/test/serialization/PortableTest.js b/test/serialization/PortableTest.js index e2210a4dc..e9f0c60e6 100644 --- a/test/serialization/PortableTest.js +++ b/test/serialization/PortableTest.js @@ -23,12 +23,12 @@ var PortableObject = require('./PortableObjects').PortableObject; var PortableObjectV2 = require('./PortableObjects').PortableObjectV2; var InnerPortableObject = require('./PortableObjects').InnerPortableObject; var SimplePortableV3 = require('./PortableObjects').SimplePortableV3; -describe('Portable Serialization', function() { +describe('Portable Serialization', function () { function createSerializationService(constructorFunction) { var cfg = new Config.ClientConfig(); cfg.serializationConfig.portableFactories[10] = { - create: function(classId) { + create: function (classId) { if (classId === 111) { return new constructorFunction(); } else if (classId === 222) { @@ -41,7 +41,7 @@ describe('Portable Serialization', function() { return new SerializationService.SerializationServiceV1(cfg.serializationConfig); } - it('write-read', function() { + it('write-read', function () { var service = createSerializationService(PortableObject); var emp = new PortableObject(99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, @@ -55,7 +55,7 @@ describe('Portable Serialization', function() { Util.expectAlmostEqual(deserialized, emp); }); - it('write-read v2', function() { + it('write-read v2', function () { var service = createSerializationService(PortableObjectV2); var emp = new PortableObjectV2('a_new_value', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, @@ -69,7 +69,7 @@ describe('Portable Serialization', function() { Util.expectAlmostEqual(deserialized, emp); }); - it('old write - new read cross versions', function() { + it('old write - new read cross versions', function () { var oldService = createSerializationService(PortableObject); var newService = createSerializationService(PortableObjectV2); diff --git a/test/serialization/ReferenceObjects.js b/test/serialization/ReferenceObjects.js index f79ea6391..5713e911f 100644 --- a/test/serialization/ReferenceObjects.js +++ b/test/serialization/ReferenceObjects.js @@ -34,11 +34,11 @@ to.aLong = Long.fromNumber(-50992225); to.aString = ''; //TODO for (var ci = 0; ci < 65535; ci++) { - if (!(ci>= 55296 && ci < 57344)) { + if (!(ci >= 55296 && ci < 57344)) { to.aString += String.fromCharCode(ci); } } -for (var ci = 65535 - to.aString.length; ci > 0; ci-- ) { +for (var ci = 65535 - to.aString.length; ci > 0; ci--) { to.aString += String.fromCharCode(0); } diff --git a/test/serialization/portable/ClassDefinitionTest.js b/test/serialization/portable/ClassDefinitionTest.js index 9ba377500..90fa4c9ae 100644 --- a/test/serialization/portable/ClassDefinitionTest.js +++ b/test/serialization/portable/ClassDefinitionTest.js @@ -20,69 +20,69 @@ var CD = require('../../../lib/serialization/portable/ClassDefinition').ClassDef var FD = require('../../../lib/serialization/portable/ClassDefinition').FieldDefinition; var FT = require('../../../lib/serialization/portable/ClassDefinition').FieldDefinition; -describe('ClassDefinitionTest', function(){ - var a = new CD(1,2,3); +describe('ClassDefinitionTest', function () { + var a = new CD(1, 2, 3); - it('getFieldType():firstField should be type of FT.INT.', function(){ - a.addFieldDefinition(new FD(0,'firstField',FT.INT,10,10)); + it('getFieldType():firstField should be type of FT.INT.', function () { + a.addFieldDefinition(new FD(0, 'firstField', FT.INT, 10, 10)); var type = a.getFieldType('firstField'); expect(type).equal(FT.INT); }); - it('getFieldType():secondField should be type of FT.STRING.', function(){ - a.addFieldDefinition(new FD(1,'secondField',FT.CHAR_ARRAY,11,11)); + it('getFieldType():secondField should be type of FT.STRING.', function () { + a.addFieldDefinition(new FD(1, 'secondField', FT.CHAR_ARRAY, 11, 11)); var type = a.getFieldType('secondField'); expect(type).equal(FT.CHAR_ARRAY); }); - it('getFieldType():thirdField should be null because we will not add it. (It does not exist.)', function(){ - expect(a.getFieldType.bind(a,'thirdField')).to.throw(Error); + it('getFieldType():thirdField should be null because we will not add it. (It does not exist.)', function () { + expect(a.getFieldType.bind(a, 'thirdField')).to.throw(Error); }); - it('hasField():field was added so it should be return true.', function(){ - a.addFieldDefinition(new FD(2,'aField',FT.INT,10,10)); + it('hasField():field was added so it should be return true.', function () { + a.addFieldDefinition(new FD(2, 'aField', FT.INT, 10, 10)); expect(a.hasField('aField')).to.be.true; }); - it('hasField():field was not added so it should be return false.', function(){ + it('hasField():field was not added so it should be return false.', function () { var res = a.hasField('anotherField'); expect(res).to.be.false; }); - it('getFieldById():When index is not an integer it should throw an range exception.', function(){ + it('getFieldById():When index is not an integer it should throw an range exception.', function () { expect(a.getFieldById.bind(a, 0.3)).to.throw(Error); }); - it('getFieldById():When index is negative it should throw an range exception.', function(){ + it('getFieldById():When index is negative it should throw an range exception.', function () { expect(a.getFieldById.bind(a, -2)).to.throw(Error); }); - it('getFieldById():When a field with given index is found.', function(){ + it('getFieldById():When a field with given index is found.', function () { expect(a.getFieldById.bind(a, 0)).to.not.throw(Error); }); - it('getFieldById():When index is more than or equal to total number of fields it should throw an range exception.', function(){ + it('getFieldById():When index is more than or equal to total number of fields it should throw an range exception.', function () { expect(a.getFieldById.bind(a, 3)).to.throw(Error); }); - it('equals():When parameter passed is not a ClassDefinitionObject.', function(){ + it('equals():When parameter passed is not a ClassDefinitionObject.', function () { var a1 = new CD(); var b1 = new FD(); var res = a1.equals(b1); expect(res).to.equal(false); }); - it('equals():When one of the fields (or more) is not matched with the parameter.', function(){ - var a1 = new CD(1,3,4); - var b1 = new CD(1,3,6); + it('equals():When one of the fields (or more) is not matched with the parameter.', function () { + var a1 = new CD(1, 3, 4); + var b1 = new CD(1, 3, 6); var res = a1.equals(b1); expect(res).to.equal(false); }); - it('equals():When parameter is equal.', function(){ - var a1 = new CD(1,3,6); - var b1 = new CD(1,3,6); + it('equals():When parameter is equal.', function () { + var a1 = new CD(1, 3, 6); + var b1 = new CD(1, 3, 6); var res = a1.equals(b1); expect(res).to.equal(true); }); diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index 0eb62f3c1..ced261ccf 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -143,12 +143,12 @@ describe("Set Proxy", function () { }); }); - it('clear', function() { - return setInstance.addAll([1, 2, 3, 4]).then(function() { + it('clear', function () { + return setInstance.addAll([1, 2, 3, 4]).then(function () { return setInstance.clear(); - }).then(function() { + }).then(function () { return setInstance.size(); - }).then(function(s) { + }).then(function (s) { return expect(s).to.equal(0); }); }); @@ -156,7 +156,7 @@ describe("Set Proxy", function () { it("listens for added entry", function (done) { this.timeout(5000); setInstance.addItemListener({ - "itemAdded" : function (item) { + "itemAdded": function (item) { if (item == 1) { done() } else { @@ -173,7 +173,7 @@ describe("Set Proxy", function () { it("listens for removed entry", function (done) { this.timeout(5000); setInstance.addItemListener({ - "itemRemoved" : function (item) { + "itemRemoved": function (item) { if (item == 1) { done() } else { @@ -193,7 +193,7 @@ describe("Set Proxy", function () { it("remove entry listener", function () { this.timeout(5000); return setInstance.addItemListener({ - "itemRemoved" : function (item) { + "itemRemoved": function (item) { if (item == 1) { done() } else { diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index f3f2940a8..9b979b279 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -39,7 +39,7 @@ describe('SSL Client Authentication Test', function () { }); function createMemberWithXML() { - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8')).then(function(cl) { + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8')).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function (m) { @@ -94,7 +94,7 @@ describe('SSL Client Authentication Test', function () { it('ma:required, they both know each other should connect', function () { return createMemberWithXML(maRequiredXML).then(function () { return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server1.pem')); - }).then(function(client) { + }).then(function (client) { client.shutdown(); }); }); @@ -121,7 +121,7 @@ describe('SSL Client Authentication Test', function () { it('ma:optional, they both know each other should connect', function () { return createMemberWithXML(maOptionalXML).then(function () { return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server1.pem')); - }).then(function(client) { + }).then(function (client) { client.shutdown(); }); }); @@ -136,7 +136,7 @@ describe('SSL Client Authentication Test', function () { it('ma:optional, server does not know client, client knows server should connect', function () { return createMemberWithXML(maOptionalXML).then(function () { return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server1.pem')); - }).then(function(cl) { + }).then(function (cl) { client = cl; }) }); diff --git a/test/ssl/ClientSslTest.js b/test/ssl/ClientSslTest.js index 95b0d0f07..74b1aeb23 100644 --- a/test/ssl/ClientSslTest.js +++ b/test/ssl/ClientSslTest.js @@ -29,9 +29,10 @@ var markEnterprise = require('../Util').markEnterprise; var authorizedSslConfig = new Config.ClientConfig(); -authorizedSslConfig.networkConfig.sslOptions = {rejectUnauthorized: true, - ca: [ fs.readFileSync(__dirname + '/server1.pem') ], - servername:'foo.bar.com' +authorizedSslConfig.networkConfig.sslOptions = { + rejectUnauthorized: true, + ca: [fs.readFileSync(__dirname + '/server1.pem')], + servername: 'foo.bar.com' }; var unauthorizedSslConfig = new Config.ClientConfig(); diff --git a/test/ssl/hazelcast-ma-optional.xml b/test/ssl/hazelcast-ma-optional.xml index a3b1aac8b..64ee156b9 100644 --- a/test/ssl/hazelcast-ma-optional.xml +++ b/test/ssl/hazelcast-ma-optional.xml @@ -15,9 +15,9 @@ ~ limitations under the License. --> - + dev dev-pass @@ -49,7 +49,8 @@ com/hazelcast/nio/ssl-mutual-auth/server1.keystore password - com/hazelcast/nio/ssl-mutual-auth/server1_knows_client1/server1.truststore + com/hazelcast/nio/ssl-mutual-auth/server1_knows_client1/server1.truststore + password SunX509 OPTIONAL diff --git a/test/ssl/hazelcast-ma-required.xml b/test/ssl/hazelcast-ma-required.xml index 6806b6b54..9f4e1cb6a 100644 --- a/test/ssl/hazelcast-ma-required.xml +++ b/test/ssl/hazelcast-ma-required.xml @@ -15,9 +15,9 @@ ~ limitations under the License. --> - + dev dev-pass @@ -49,7 +49,8 @@ com/hazelcast/nio/ssl-mutual-auth/server1.keystore password - com/hazelcast/nio/ssl-mutual-auth/server1_knows_client1/server1.truststore + com/hazelcast/nio/ssl-mutual-auth/server1_knows_client1/server1.truststore + password SunX509 REQUIRED diff --git a/test/ssl/hazelcast-ssl.xml b/test/ssl/hazelcast-ssl.xml index 0ca4f97c8..97f57114f 100644 --- a/test/ssl/hazelcast-ssl.xml +++ b/test/ssl/hazelcast-ssl.xml @@ -15,9 +15,9 @@ ~ limitations under the License. --> - + dev dev-pass diff --git a/test/topic/hazelcast_topic.xml b/test/topic/hazelcast_topic.xml index ce0a0d9aa..b385e7a82 100644 --- a/test/topic/hazelcast_topic.xml +++ b/test/topic/hazelcast_topic.xml @@ -14,9 +14,9 @@ ~ limitations under the License. --> - + diff --git a/tsconfig.json b/tsconfig.json index fc2da9d52..f5df56b3e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,10 @@ "target": "es5", "outDir": "lib", "preserveConstEnums": true, - "lib": ["es5", "es6"], + "lib": [ + "es5", + "es6" + ], "removeComments": false, "sourceMap": true }, diff --git a/tslint.json b/tslint.json index 0299c127a..dbb07e5e6 100644 --- a/tslint.json +++ b/tslint.json @@ -1,67 +1,56 @@ { - "rules": { - "class-name": true, - "curly": true, - "eofline": true, - "indent": [ - false - ], - "label-position": true, - "max-line-length": [ - true, - 130 - ], - "no-arg": true, - "no-bitwise": true, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-construct": true, - "no-debugger": true, - "no-duplicate-variable": false, - "no-empty": true, - "no-eval": true, - "no-switch-case-fall-through": true, - "trailing-comma": [ - true, - { - "multiline": "never", - "singleline": "never" - } - ], - "no-unused-expression": true, - "no-unused-variable": false, - "no-use-before-declare": true, - "one-line": [ - true, - "check-open-brace", - "check-catch", - "check-else", - "check-whitespace" - ], - "quotemark": [ - true, - "single" - ], - "radix": true, - "semicolon": true, - "triple-equals": [ - true, - "allow-null-check" - ], - "variable-name": false, - "whitespace": [ - true, - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type" - ] - } + "extends": "tslint:recommended", + "rules": { + "max-line-length": [ + true, + 130 + ], + "quotemark": [ + true, + "single" + ], + "member-access": false, + "only-arrow-functions": false, + "space-before-function-paren": [ + true, + { + "anonymous": "always", + "named": "never", + "method": "never", + "asyncArrow": "always" + } + ], + "member-ordering": [ + true, + { + "order": [ + "public-static-field", + "protected-static-field", + "private-static-field", + "public-instance-field", + "protected-instance-field", + "private-instance-field", + "public-constructor", + "protected-constructor", + "private-constructor", + "public-static-method", + "protected-static-method", + "private-static-method", + "public-instance-method", + "protected-instance-method", + "private-instance-method" + ] + } + ], + "forin": false, + "max-classes-per-file": false, + "interface-name": false, + "ban-types": false, + "object-literal-sort-keys": false, + "no-var-requires": false, + "no-console": false, + "no-empty-interface": false, + "ordered-imports": false, + "no-conditional-assignment": false + } } From 3bd44fa6a57d0c9f0287a7aa46258b3e1c38c475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Fri, 8 Jun 2018 09:47:24 +0300 Subject: [PATCH 104/685] fix SSL tests --- src/connection/BasicSSLOptionsFactory.ts | 27 ++++++++----- test/RC.js | 18 +++++++-- test/ssl/BasicSSLOptionsFactoryTest.js | 8 ++-- test/ssl/ClientSSLAuthenticationTest.js | 47 +++++++++++----------- test/ssl/ClientSslTest.js | 2 +- test/ssl/{client1.pem => client1-cert.pem} | 34 ++++++++-------- test/ssl/client1-key.pem | 32 +++++++++++++++ test/ssl/{client2.pem => client2-cert.pem} | 34 ++++++++-------- test/ssl/client2-key.pem | 32 +++++++++++++++ test/ssl/{server1.pem => server1-cert.pem} | 0 test/ssl/{server2.pem => server2-cert.pem} | 0 11 files changed, 160 insertions(+), 74 deletions(-) rename test/ssl/{client1.pem => client1-cert.pem} (98%) create mode 100644 test/ssl/client1-key.pem rename test/ssl/{client2.pem => client2-cert.pem} (98%) create mode 100644 test/ssl/client2-key.pem rename test/ssl/{server1.pem => server1-cert.pem} (100%) rename test/ssl/{server2.pem => server2-cert.pem} (100%) diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts index c994f37a6..ed73a1f9e 100644 --- a/src/connection/BasicSSLOptionsFactory.ts +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -25,8 +25,9 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { private servername: string; private rejectUnauthorized: boolean; - private cert: Buffer; private ca: Buffer; + private key: Buffer; + private cert: Buffer; private ciphers: string; init(properties: Properties): Promise { @@ -38,14 +39,9 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { const readFile = Promise.promisify(fs.readFile); - const certPath = getStringOrUndefined(properties.certPath); const caPath = getStringOrUndefined(properties.caPath); - - if (certPath !== undefined) { - promises.push(readFile(resolvePath(certPath)).then((data: Buffer) => { - this.cert = data; - })); - } + const keyPath = getStringOrUndefined(properties.keyPath); + const certPath = getStringOrUndefined(properties.certPath); if (caPath !== undefined) { promises.push(readFile(resolvePath(caPath)).then((data: Buffer) => { @@ -53,6 +49,18 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { })); } + if (keyPath !== undefined) { + promises.push(readFile(resolvePath(keyPath)).then((data: Buffer) => { + this.key = data; + })); + } + + if (certPath !== undefined) { + promises.push(readFile(resolvePath(certPath)).then((data: Buffer) => { + this.cert = data; + })); + } + this.servername = getStringOrUndefined(properties.servername); this.rejectUnauthorized = getBooleanOrUndefined(properties.rejectUnauthorized); this.ciphers = getStringOrUndefined(properties.ciphers); @@ -64,8 +72,9 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { return { servername: this.servername, rejectUnauthorized: this.rejectUnauthorized, - cert: this.cert, ca: this.ca, + key: this.key, + cert: this.cert, ciphers: this.ciphers, }; } diff --git a/test/RC.js b/test/RC.js index 33e399b18..f8d89874f 100644 --- a/test/RC.js +++ b/test/RC.js @@ -56,12 +56,12 @@ function shutdownMember(clusterId, memberUuid) { } function shutdownCluster(clusterId) { - var deferrred = Promise.defer(); + var deferred = Promise.defer(); controller.shutdownCluster(clusterId, function (err, res) { - if (err) return deferrred.reject(err); - return deferrred.resolve(res); + if (err) return deferred.reject(err); + return deferred.resolve(res); }); - return deferrred.promise; + return deferred.promise; } function terminateMember(clusterId, memberUuid) { @@ -73,6 +73,15 @@ function terminateMember(clusterId, memberUuid) { return deferred.promise; } +function terminateCluster(clusterId) { + var deferred = Promise.defer(); + controller.terminateCluster(clusterId, function (err, res) { + if (err) return deferred.reject(err); + return deferred.resolve(res); + }); + return deferred.promise; +} + function executeOnController(clusterId, script, lang) { var deferred = Promise.defer(); controller.executeOnController(clusterId, script, lang, function (err, res) { @@ -90,3 +99,4 @@ exports.shutdownMember = shutdownMember; exports.shutdownCluster = shutdownCluster; exports.executeOnController = executeOnController; exports.terminateMember = terminateMember; +exports.terminateCluster = terminateCluster; diff --git a/test/ssl/BasicSSLOptionsFactoryTest.js b/test/ssl/BasicSSLOptionsFactoryTest.js index 1ff7ff289..f974d8726 100644 --- a/test/ssl/BasicSSLOptionsFactoryTest.js +++ b/test/ssl/BasicSSLOptionsFactoryTest.js @@ -25,8 +25,9 @@ describe('BasicSSLOptionsFactoryTest', function () { var options = { servername: 'foo.bar.com', rejectUnauthorized: true, - certPath: Path.join(__dirname, './client1.pem'), - caPath: Path.join(__dirname, './server1.pem'), + caPath: Path.join(__dirname, './server1-cert.pem'), + keyPath: Path.join(__dirname, './client1-key.pem'), + certPath: Path.join(__dirname, './client1-cert.pem'), ciphers: 'cipherliststring' }; var factory = new BasicSSLOptionsFactory(); @@ -34,8 +35,9 @@ describe('BasicSSLOptionsFactoryTest', function () { var optsObject = factory.getSSLOptions(); expect(optsObject.servername).to.equal('foo.bar.com'); expect(optsObject.rejectUnauthorized).to.be.true; - expect(optsObject.cert).to.be.instanceOf(Buffer); expect(optsObject.ca).to.be.instanceOf(Buffer); + expect(optsObject.key).to.be.instanceOf(Buffer); + expect(optsObject.cert).to.be.instanceOf(Buffer); expect(optsObject.ciphers).to.equal('cipherliststring'); }); }); diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 9b979b279..6eefb4041 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -38,8 +38,8 @@ describe('SSL Client Authentication Test', function () { markEnterprise(this); }); - function createMemberWithXML() { - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8')).then(function (cl) { + function createMemberWithXML(serverXML) { + return Controller.createCluster(null, fs.readFileSync(serverXML, 'utf8')).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function (m) { @@ -47,12 +47,13 @@ describe('SSL Client Authentication Test', function () { }); } - function createClientConfigWithSSLOptsUsingProgrammaticConfiguration(key, ca) { + function createClientConfigWithSSLOptsUsingProgrammaticConfiguration(key, cert, ca) { var sslOpts = { servername: 'foo.bar.com', rejectUnauthorized: true, - cert: fs.readFileSync(Path.join(__dirname, key)), - ca: fs.readFileSync(Path.join(__dirname, ca)) + ca: fs.readFileSync(Path.join(__dirname, ca)), + key: fs.readFileSync(Path.join(__dirname, key)), + cert: fs.readFileSync(Path.join(__dirname, cert)) }; var cfg = new Config.ClientConfig(); cfg.networkConfig.sslOptions = sslOpts; @@ -61,14 +62,15 @@ describe('SSL Client Authentication Test', function () { return cfg; } - function createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory(key, ca) { + function createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory(key, cert, ca) { var cfg = new Config.ClientConfig(); cfg.networkConfig.sslOptionsFactoryConfig = { exportedName: 'BasicSSLOptionsFactory' }; cfg.networkConfig.sslOptionsFactoryProperties = { caPath: Path.resolve(__dirname, ca), - certPath: Path.resolve(__dirname, key), + keyPath: Path.resolve(__dirname, key), + certPath: Path.resolve(__dirname, cert), rejectUnauthorized: true, servername: 'foo.bar.com' }; @@ -88,12 +90,12 @@ describe('SSL Client Authentication Test', function () { describe(title, function () { afterEach(function () { - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('ma:required, they both know each other should connect', function () { return createMemberWithXML(maRequiredXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server1.pem')); + return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server1-cert.pem')); }).then(function (client) { client.shutdown(); }); @@ -101,49 +103,48 @@ describe('SSL Client Authentication Test', function () { it('ma:required, server knows client, client does not know server should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server2.pem'))) + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server2-cert.pem'))) .to.be.rejectedWith(HzErrors.IllegalStateError); }); }); it('ma:required, server does not know client, client knows server should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server1.pem'))).to.throw; + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server1-cert.pem'))).to.throw; }); }); it('ma:required, neither one knows the other should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server2.pem'))).to.throw; + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server2-cert.pem'))).to.throw; }); }); it('ma:optional, they both know each other should connect', function () { return createMemberWithXML(maOptionalXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server1.pem')); + return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server1-cert.pem')); }).then(function (client) { client.shutdown(); }); }); it('ma:optional, server knows client, client does not know server should fail', function () { - return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1.pem', './server2.pem'))) + return createMemberWithXML(maOptionalXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server2-cert.pem'))) .to.be.rejectedWith(HzErrors.IllegalStateError); }); }); - it('ma:optional, server does not know client, client knows server should connect', function () { + it('ma:optional, server does not know client, client knows server should fail', function () { return createMemberWithXML(maOptionalXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server1.pem')); - }).then(function (cl) { - client = cl; - }) + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server1-cert.pem'))) + .to.be.rejectedWith(HzErrors.IllegalStateError); + }); }); - it('ma:optional, neither knows the otherr should fail', function () { - return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2.pem', './server2.pem'))) + it('ma:optional, neither knows the other should fail', function () { + return createMemberWithXML(maOptionalXML).then(function () { + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server2-cert.pem'))) .to.be.rejectedWith(HzErrors.IllegalStateError); }); }); diff --git a/test/ssl/ClientSslTest.js b/test/ssl/ClientSslTest.js index 74b1aeb23..a0640e1ef 100644 --- a/test/ssl/ClientSslTest.js +++ b/test/ssl/ClientSslTest.js @@ -31,7 +31,7 @@ var markEnterprise = require('../Util').markEnterprise; var authorizedSslConfig = new Config.ClientConfig(); authorizedSslConfig.networkConfig.sslOptions = { rejectUnauthorized: true, - ca: [fs.readFileSync(__dirname + '/server1.pem')], + ca: [fs.readFileSync(__dirname + '/server1-cert.pem')], servername: 'foo.bar.com' }; diff --git a/test/ssl/client1.pem b/test/ssl/client1-cert.pem similarity index 98% rename from test/ssl/client1.pem rename to test/ssl/client1-cert.pem index 5cc9604ab..24ae5ae5b 100644 --- a/test/ssl/client1.pem +++ b/test/ssl/client1-cert.pem @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDUzCCAjugAwIBAgIEYtZhRjANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV -UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD -VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyOFoX -DTI3MDYxNjEyMjYyOFowWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG -A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm -b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKL+xBBd -OLIlMIN54lStfR97DEdDhHu4qyKThhDnX8hDAoiYz4xrtiDsE2PnBqTht/VSMg9d -5t02/Mp27Xem7UnBnM+uH8gUfZGuVjeyYVcZuKr8UEBK1TJPJ9ujSYfGvXlMbATx -0UzraUFn7DGH0x8U7XoZnEWHZKEn8+Rev2XbUqzI7jpcADn5IWXbUuzQC+fHuf4l -G1/+JhXzdlItNdQyC2pYvNl2NCtTGbQHpUZ/fzyzQVSg67QiNE/lhIS+h6qr8zox -mJ/iTqHpyss7fKNn/BVahDZndYeh6ErT88PjDIffOlGTKmCxSkhnhW06uAVa+NN8 -RdA1f5HuLjnOg1sCAwEAAaMhMB8wHQYDVR0OBBYEFNn+zJY4Z6Pb5Qdw91GmVq// -qKiZMA0GCSqGSIb3DQEBCwUAA4IBAQAoxqXhg+FPIgVYX+/F/VL7CIiJOr9nwZB8 -g9gE2PcIOrQQtFwgoNsuMGdqClv2M0RBFtXk6xlk8GVEfOPzRWmVpPZ9lElew6BD -sdXP/1W4eltKNJSakZEPETiEUWhUpcqkHWzuFDtG2XDf75j05YbGOyl1VQJvZ9wP -XDI/rjEqKxDg6bm1r+c5HUq+Xe3wBEhQgLcYkNag1E9n8h/7bSPMp8YDrsoFQjKv -QIGmFUR1Um6we9lX7eaInXzrho9o4+O8T9mw30Iapkpl93WlEn8VuACXOXH0a4Se +MIIDUzCCAjugAwIBAgIEYtZhRjANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV +UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD +VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyOFoX +DTI3MDYxNjEyMjYyOFowWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG +A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm +b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKL+xBBd +OLIlMIN54lStfR97DEdDhHu4qyKThhDnX8hDAoiYz4xrtiDsE2PnBqTht/VSMg9d +5t02/Mp27Xem7UnBnM+uH8gUfZGuVjeyYVcZuKr8UEBK1TJPJ9ujSYfGvXlMbATx +0UzraUFn7DGH0x8U7XoZnEWHZKEn8+Rev2XbUqzI7jpcADn5IWXbUuzQC+fHuf4l +G1/+JhXzdlItNdQyC2pYvNl2NCtTGbQHpUZ/fzyzQVSg67QiNE/lhIS+h6qr8zox +mJ/iTqHpyss7fKNn/BVahDZndYeh6ErT88PjDIffOlGTKmCxSkhnhW06uAVa+NN8 +RdA1f5HuLjnOg1sCAwEAAaMhMB8wHQYDVR0OBBYEFNn+zJY4Z6Pb5Qdw91GmVq// +qKiZMA0GCSqGSIb3DQEBCwUAA4IBAQAoxqXhg+FPIgVYX+/F/VL7CIiJOr9nwZB8 +g9gE2PcIOrQQtFwgoNsuMGdqClv2M0RBFtXk6xlk8GVEfOPzRWmVpPZ9lElew6BD +sdXP/1W4eltKNJSakZEPETiEUWhUpcqkHWzuFDtG2XDf75j05YbGOyl1VQJvZ9wP +XDI/rjEqKxDg6bm1r+c5HUq+Xe3wBEhQgLcYkNag1E9n8h/7bSPMp8YDrsoFQjKv +QIGmFUR1Um6we9lX7eaInXzrho9o4+O8T9mw30Iapkpl93WlEn8VuACXOXH0a4Se uiXSX/9tHzdC0O4ygWOg9GTNw3fIvUiZkDgF91gYgV2/i2OPbpUn -----END CERTIFICATE----- diff --git a/test/ssl/client1-key.pem b/test/ssl/client1-key.pem new file mode 100644 index 000000000..c554e6f01 --- /dev/null +++ b/test/ssl/client1-key.pem @@ -0,0 +1,32 @@ +Bag Attributes + friendlyName: client1 + localKeyID: 54 69 6D 65 20 31 35 32 38 34 33 35 36 31 38 36 31 32 +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCi/sQQXTiyJTCD +eeJUrX0fewxHQ4R7uKsik4YQ51/IQwKImM+Ma7Yg7BNj5wak4bf1UjIPXebdNvzK +du13pu1JwZzPrh/IFH2RrlY3smFXGbiq/FBAStUyTyfbo0mHxr15TGwE8dFM62lB +Z+wxh9MfFO16GZxFh2ShJ/PkXr9l21KsyO46XAA5+SFl21Ls0Avnx7n+JRtf/iYV +83ZSLTXUMgtqWLzZdjQrUxm0B6VGf388s0FUoOu0IjRP5YSEvoeqq/M6MZif4k6h +6crLO3yjZ/wVWoQ2Z3WHoehK0/PD4wyH3zpRkypgsUpIZ4VtOrgFWvjTfEXQNX+R +7i45zoNbAgMBAAECggEAG0Sr4GD4HzWBjD1T0/7CNAYN484z187pMnujrihHKeWs +AtYtwrwyWAempsv7nJH2iKAbp955xQByAh0rVR0kDXbKmSP0RTDIYRrdaav6BOxU +rKZRdrAOQsBjVqdWodRp1mUmnR0nesrXbQ3Jwe+LLmP95rNqJWelOiDI+KexNYTa +DCeIz5RrnxhpdlWSUP7oiF/do+OnEkW07aKsTJVbUZVbOBQ16F8qs6dI8ctkginm +VFAmwD+tBhdsV+uYVZdUJ4H7eqs/RZuHYFrwogtE2WxohHMie65Orj5c3NWmZaY1 +AoncOWtI1mdC91U9Eg5f3xPG6P5ffIqlC3J76R0E4QKBgQD3vi+4rVxj9jhAjZpu +1ZEKQIzx1nsNfY6HNZb1CRnks8GztqWSaKzie8O4KjVh1KtoXeo0c8WS9khndXtO +NgZFeO2wzfDn2SkQs4oLkFTpLkNmuWxcN/3xT+U8z6bc50iN3Hltdb7JS3Qpfn/7 +2xWxdA8G5eChh93yQ3u2HWXL9QKBgQCobXzLSUHY4+2CQ2bjYIipIUolLwMtx/yT +H7GLS9a0bpiT6MMvAN9J9h8at/ONYN4SPf3vQyWRNIwhfF2w6NT75NPzfNBKBSP4 +ojOkB1kbJYonUWJ1ujbXJBlu+pqRahXPQNvJ+vEvowMwsuySRfIsRBDfOxjgFOyT +a/ix7s9QDwKBgQDMTA3WYT+7PyQMN7mOhJdiuPCBzbkT2uJaJZsi3ip4KrQlmwzW +u3M2IZG4oTX8QwBGxIuKTZ40Htx+VKcmS+7IA30fO/TZfH8cwrGn75HV6My0PVxa +f+HtyVDk4Ohdamyub43C8kIuhQZ54VNxQa2V9Hsf2RlwmzYvve6as4tqsQKBgGg6 +OPvj/aemhRgTddxHpMplG2kfSqxOEfNJrakx6VAHEMyXQhIYTBWNBXqXU1SuGT7Y +tggWWW0eQ4mFWMVdkE/BL5iCKLNlsvjuB17+XRn7hR8HshKAhedlI4gV9Qj/yTdU +P68iZ5a/Hf5I+zUZq9/Qz1AVVjN1P2GLc39I9WnpAoGALVRKcLlsYbn6SGPxMrys +TopwtBWB/4IkCI0jp86FPI+5WmhQlNIUMjUlWpUt0Nszs22SMrAJLmUV2dRfaYmK +j5egcIidREiw6FchwxNUPvB1EGNeSr+PYjpMOFl9vDeQc735ysiBYRjgjhCVeHRH +YiUavRehrMqce+2ZumHreZ0= +-----END PRIVATE KEY----- diff --git a/test/ssl/client2.pem b/test/ssl/client2-cert.pem similarity index 98% rename from test/ssl/client2.pem rename to test/ssl/client2-cert.pem index fca10df6e..968c3014b 100644 --- a/test/ssl/client2.pem +++ b/test/ssl/client2-cert.pem @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDUzCCAjugAwIBAgIELChsqzANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV -UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD -VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyOVoX -DTI3MDYxNjEyMjYyOVowWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG -A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm -b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAXHMGv -anqYQQE/PO75/9OZwJojX/VgFHLUPE6sNPGCPZAaNNqAGTBniOqmFhkW/9WJA9wq -fIvMx5Blbc3Ictc7Crhopf4dsoiSobmTrZ+hwZjlPMHM70DcTtKUeB3vwhrH0HTd -PHFFGV4X6oYdJCt8qubIyU6DcoTiIYkSI/R7of2CEfLCkPymBtJj20c9oTReaew9 -mW/rrUj0RrH75gvs3ZCGXBQyBAhwv9VqyDSIORj5uo785EDk53OV5Qj7JfKuIfax -cXIH7jq3L4TVos9q1E7QDorvuxGwqDMxrMdyqgnSkOagJ7/PINhsYdW6X8d8m/n5 -B3UPvy+Z/s4chPcCAwEAAaMhMB8wHQYDVR0OBBYEFAWHXjsl8atiO0qurSm18CY0 -6c+hMA0GCSqGSIb3DQEBCwUAA4IBAQB6ipD1AaO5AMMpry/m2QB/lDiRmhK5VtNK -GflYrOyjtWKuWBC4n8dWfavqiGSOX7MDerilRt+FMrtgdEZet+sHdMqo139/Zk6J -k0AcsMHE2M8larah1T/ah7fOpQAJEK6SB6x9LKruJwQIj1juGBFGAo8YrigKQY9u -IKWjqOjcK0js4fHLZVGdmHxpU2fAs9UTeFF4EztchRzg30McrUKCiN9sLC0jdm2O -VYLTLC4PcBzAGPBFuIz+MxA+BU5iECZWjXrGKIUw57AtMf4owj4leBuoywLH0iHa +MIIDUzCCAjugAwIBAgIELChsqzANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJV +UzEMMAoGA1UECBMDQmFyMQwwCgYDVQQHEwNGb28xCzAJBgNVBAoTAkhaMQwwCgYD +VQQLEwNEUkUxFDASBgNVBAMTC2Zvby5iYXIuY29tMB4XDTE3MDgwNzEyMjYyOVoX +DTI3MDYxNjEyMjYyOVowWjELMAkGA1UEBhMCVVMxDDAKBgNVBAgTA0JhcjEMMAoG +A1UEBxMDRm9vMQswCQYDVQQKEwJIWjEMMAoGA1UECxMDRFJFMRQwEgYDVQQDEwtm +b28uYmFyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAXHMGv +anqYQQE/PO75/9OZwJojX/VgFHLUPE6sNPGCPZAaNNqAGTBniOqmFhkW/9WJA9wq +fIvMx5Blbc3Ictc7Crhopf4dsoiSobmTrZ+hwZjlPMHM70DcTtKUeB3vwhrH0HTd +PHFFGV4X6oYdJCt8qubIyU6DcoTiIYkSI/R7of2CEfLCkPymBtJj20c9oTReaew9 +mW/rrUj0RrH75gvs3ZCGXBQyBAhwv9VqyDSIORj5uo785EDk53OV5Qj7JfKuIfax +cXIH7jq3L4TVos9q1E7QDorvuxGwqDMxrMdyqgnSkOagJ7/PINhsYdW6X8d8m/n5 +B3UPvy+Z/s4chPcCAwEAAaMhMB8wHQYDVR0OBBYEFAWHXjsl8atiO0qurSm18CY0 +6c+hMA0GCSqGSIb3DQEBCwUAA4IBAQB6ipD1AaO5AMMpry/m2QB/lDiRmhK5VtNK +GflYrOyjtWKuWBC4n8dWfavqiGSOX7MDerilRt+FMrtgdEZet+sHdMqo139/Zk6J +k0AcsMHE2M8larah1T/ah7fOpQAJEK6SB6x9LKruJwQIj1juGBFGAo8YrigKQY9u +IKWjqOjcK0js4fHLZVGdmHxpU2fAs9UTeFF4EztchRzg30McrUKCiN9sLC0jdm2O +VYLTLC4PcBzAGPBFuIz+MxA+BU5iECZWjXrGKIUw57AtMf4owj4leBuoywLH0iHa RAvKPHwtknKBSfL4Gqle1zYy2OlyMPqr3TOc+BpPmJp/OWFEVVus -----END CERTIFICATE----- diff --git a/test/ssl/client2-key.pem b/test/ssl/client2-key.pem new file mode 100644 index 000000000..ed53dc007 --- /dev/null +++ b/test/ssl/client2-key.pem @@ -0,0 +1,32 @@ +Bag Attributes + friendlyName: client2 + localKeyID: 54 69 6D 65 20 31 35 32 38 34 33 37 36 35 33 30 38 36 +Key Attributes: +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCgFxzBr2p6mEEB +Pzzu+f/TmcCaI1/1YBRy1DxOrDTxgj2QGjTagBkwZ4jqphYZFv/ViQPcKnyLzMeQ +ZW3NyHLXOwq4aKX+HbKIkqG5k62focGY5TzBzO9A3E7SlHgd78Iax9B03TxxRRle +F+qGHSQrfKrmyMlOg3KE4iGJEiP0e6H9ghHywpD8pgbSY9tHPaE0XmnsPZlv661I +9Eax++YL7N2QhlwUMgQIcL/Vasg0iDkY+bqO/ORA5OdzleUI+yXyriH2sXFyB+46 +ty+E1aLPatRO0A6K77sRsKgzMazHcqoJ0pDmoCe/zyDYbGHVul/HfJv5+Qd1D78v +mf7OHIT3AgMBAAECggEAGf+G4QFuxlgBfoVZjOm2nROEDsQd6khfKcLDxHb85hej +jcpjuPRCovS9bHXqcsqkY3Yr1U5lCYMJCa8fJOMfm0pwVEBSbLE/9CPz9aJA+QKY +4Q6hTkvMsvjUKCiKVTpBiH3YoZHoJfD1zK0PnhYPcKx/SJlk78YzC9d5YLw8cJB9 +Gbpa8CdQojbDwT3T8owtKspTOIRsZPTdFqt1FY4uacIKTyQ7w0IKXLBeyPXHJ6jw +Rdc9jZg090R4SkPdYubgE6ZHDwvLR4GhUd8ibuYMiTbylUYW8+NK9NRuLjEdM94G +M3pEg/rEYLtxO7ryGG9VhKNTpFQ1iCG0u1SW2j5MyQKBgQDlf1MmZdqWG6Cx0hhF +E5+hm3OxW97u5pqRjMAEfoVu/SWF2cZovFvQ4lqxVwOtDZnIn5tAlxZ7kOhuNssz +rUai4SiafsKR3lnq0kbgoYCyvQQdYomNf4N0AapWQmEw5WGuDddaB5jNYfRUbsIM +V1okDDXneE9M1/aacibY/Vpp7QKBgQCyk+R7pFP8F84Iuk9byoBAU2QLvolpPxT5 +TU4S40MvHZWrulhCQBnMhQHXI5Z24Y8qY0y9WIc3XduH9um645OJC4w/QKNQWxu/ +u9hIldH7FPzDqnknr9iLqOwyqAWVkpCDfSkh5AZoBFUWLics1ZVFqpAVz4b/zpgm +Cb1Gmq698wKBgQDd4mt/LWzYQp/sLMfASYfGFOkXak6xRg3deWrRLY5Oz7vunK5C +5xISdDbhTNLGBudPXFkbariXAXRn0txF+1rW8cBzFumBZKwk5+cVGbC3nx4SVwnM +36M1jsKkoYscXjpBsSor5jprIDC9TVSZ3/7L6W5YfC6XihnoG0PJ+bHnxQKBgQCx +he/3Me8Dhq6dYokNmQtR5xRn0GxNohY5ly3r/NyG9AQcCU0/3vVGqVqhApHLcIOg +AcMB4AXbdoSMb1r/HMlHzaEIKDux4EB/pD9oOPfbgIud/9QdLeQ5Qh48ZWfXvzHG +ZSAEvufXc6caO5taKKER9nLyG7H6jugVuEze6VqZHQKBgBiFkMuvrZQ9hZScRXtO +AkVRIWPut3tclWylAcCkBwo/nsvElOCxXptC7SWnrqXTxK6nn0YQe7J14LH6p1nG +E7G1th5dkMa1GLyAzrBOOc0kiArl9mKbaOTw1Hqk16GqHZGpDJVknG3NLs/m67a7 +JZpgUGsZ7Q3Btyjlkttp4dvB +-----END PRIVATE KEY----- diff --git a/test/ssl/server1.pem b/test/ssl/server1-cert.pem similarity index 100% rename from test/ssl/server1.pem rename to test/ssl/server1-cert.pem diff --git a/test/ssl/server2.pem b/test/ssl/server2-cert.pem similarity index 100% rename from test/ssl/server2.pem rename to test/ssl/server2-cert.pem From 4b9707524256b27861a099e65098e6da8249b4e1 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 19 Jun 2018 20:05:43 -0400 Subject: [PATCH 105/685] OS independent build and test Removes .sh script dependency from package.json --- .npmignore | 1 + create-build-info.js | 3 ++- download-remote-controller.js | 14 ++++++++++++++ package.json | 4 ++-- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 download-remote-controller.js diff --git a/.npmignore b/.npmignore index fc183d297..d7718e57c 100644 --- a/.npmignore +++ b/.npmignore @@ -12,3 +12,4 @@ benchmark/ scripts/ *.jar *.log +download-remote-controller.js diff --git a/create-build-info.js b/create-build-info.js index 49d7b9c7b..e00aebdef 100644 --- a/create-build-info.js +++ b/create-build-info.js @@ -1,4 +1,5 @@ var fs = require('fs'); +var path = require('path'); var pjson = require('./package.json'); var tsjon = require('./tsconfig.json'); @@ -16,4 +17,4 @@ var infoExport = 'module.exports = ' + JSON.stringify(buildInfo) + ';'; if (!fs.existsSync(libDir)) { fs.mkdirSync(libDir); } -fs.writeFileSync(libDir + '/BuildInfo.js', infoExport); +fs.writeFileSync(path.join(libDir, 'BuildInfo.js'), infoExport); diff --git a/download-remote-controller.js b/download-remote-controller.js new file mode 100644 index 000000000..4bb9c6354 --- /dev/null +++ b/download-remote-controller.js @@ -0,0 +1,14 @@ +var child_process = require('child_process'); +var path = require('path'); + +var scriptName = path.join('scripts', 'download-rc'); +var options = { + stdio: [0, 1, 2] +}; + +if (process.platform === 'win32') { + scriptName = scriptName + '.bat'; +} else if (process.platform === 'linux' || process.platform === 'darwin') { + scriptName = scriptName + '.sh' +} +child_process.execFileSync(scriptName, options); diff --git a/package.json b/package.json index b6b723fd9..dfed1f9e1 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,9 @@ "clean": "rimraf lib typings *.jar *.log", "precompile": "node create-build-info.js", "compile": "tsc", - "pretest": "./scripts/download-rc.sh", + "pretest": "node download-remote-controller.js", "test": "mocha --recursive", - "precoverage": "./scripts/download-rc.sh", + "precoverage": "node download-remote-controller.js", "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", From 59f454d4a99613bda4bb731b1cc4233ba60780cc Mon Sep 17 00:00:00 2001 From: Ondrej Lukas Date: Fri, 22 Jun 2018 12:11:07 +0200 Subject: [PATCH 106/685] Added download-rc.bat --- package.json | 4 +- scripts/download-rc.bat | 87 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 scripts/download-rc.bat diff --git a/package.json b/package.json index dfed1f9e1..5ab0405b8 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "pretest": "node download-remote-controller.js", "test": "mocha --recursive", "precoverage": "node download-remote-controller.js", - "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", - "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources _mocha -- --recursive --reporter spec", + "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", + "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", "pregenerate-docs": "rimraf docs", "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat new file mode 100644 index 000000000..c310e9e45 --- /dev/null +++ b/scripts/download-rc.bat @@ -0,0 +1,87 @@ +set HZ_VERSION="3.10-BETA-1" +set HZ_TEST_VERSION="3.10-SNAPSHOT" +set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% +set HAZELCAST_VERSION=%HZ_VERSION% +set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% +set HAZELCAST_RC_VERSION="0.3-SNAPSHOT" +set SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" +set RELEASE_REPO="http://repo1.maven.apache.org/maven2" +set ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" +set ENTERPRISE_SNAPSHOT_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/snapshot/" + +echo %HZ_VERSION% | findstr /r ".*-SNAPSHOT" >nul 2>&1 +if errorlevel 1 ( + set REPO=%RELEASE_REPO% + set ENTERPRISE_REPO=%ENTERPRISE_RELEASE_REPO% +) else ( + set REPO=%SNAPSHOT_REPO% + set ENTERPRISE_REPO=%ENTERPRISE_SNAPSHOT_REPO% +) + +echo %HZ_TEST_VERSION% | findstr /r ".*-SNAPSHOT" >nul 2>&1 +if errorlevel 1 ( + set TEST_REPO=%RELEASE_REPO% + set ENTRERPRISE_TEST_REPO=%ENTERPRISE_RELEASE_REPO% +) else ( + set TEST_REPO=%SNAPSHOT_REPO% + set ENTRERPRISE_TEST_REPO=%ENTERPRISE_SNAPSHOT_REPO% +) + +if exist hazelcast-remote-controller-%HAZELCAST_RC_VERSION%.jar ( + echo remote controller already exist, not downloading from maven. +) else ( + echo Downloading: remote-controller jar com.hazelcast:hazelcast-remote-controller:%HAZELCAST_RC_VERSION% + call mvn -q dependency:get -DrepoUrl=%SNAPSHOT_REPO% -Dartifact=com.hazelcast:hazelcast-remote-controller:%HAZELCAST_RC_VERSION% -Ddest=hazelcast-remote-controller-%HAZELCAST_RC_VERSION%.jar + if errorlevel 1 ( + echo Failed download remote-controller jar com.hazelcast:hazelcast-remote-controller:%HAZELCAST_RC_VERSION% + exit 1 + ) +) + +if exist hazelcast-%HAZELCAST_TEST_VERSION%-tests.jar ( + echo hazelcast-test.jar already exists, not downloading from maven. +) else ( + echo Downloading: hazelcast test jar com.hazelcast:hazelcast:%HAZELCAST_TEST_VERSION%:jar:tests + call mvn -q dependency:get -DrepoUrl=%TEST_REPO% -Dartifact=com.hazelcast:hazelcast:%HAZELCAST_TEST_VERSION%:jar:tests -Ddest=hazelcast-%HAZELCAST_TEST_VERSION%-tests.jar + if errorlevel 1 ( + echo Failed download hazelcast test jar com.hazelcast:hazelcast:%HAZELCAST_TEST_VERSION%:jar:tests + exit 1 + ) +) + +set CLASSPATH=hazelcast-remote-controller-%HAZELCAST_RC_VERSION%.jar;hazelcast-%HAZELCAST_TEST_VERSION%-tests.jar;test\javaclasses + +if defined HAZELCAST_ENTERPRISE_KEY ( + if exist hazelcast-enterprise-%HAZELCAST_ENTERPRISE_VERSION%.jar ( + echo hazelcast-enterprise.jar already exists, not downloading from maven. + ) else ( + echo Downloading: hazelcast enterprise jar com.hazelcast:hazelcast-enterprise:%HAZELCAST_ENTERPRISE_VERSION% + call mvn -q dependency:get -DrepoUrl=%ENTERPRISE_REPO% -Dartifact=com.hazelcast:hazelcast-enterprise:%HAZELCAST_ENTERPRISE_VERSION% -Ddest=hazelcast-enterprise-%HAZELCAST_ENTERPRISE_VERSION%.jar + if errorlevel 1 ( + echo Failed download hazelcast enterprise jar com.hazelcast:hazelcast-enterprise:%HAZELCAST_ENTERPRISE_VERSION% + exit 1 + ) + ) + set CLASSPATH=hazelcast-enterprise-%HAZELCAST_ENTERPRISE_VERSION%.jar;%CLASSPATH% + echo Starting Remote Controller ... enterprise ... +) else ( + if exist hazelcast-%HAZELCAST_VERSION%.jar ( + echo hazelcast.jar already exists, not downloading from maven. + ) else ( + echo Downloading: hazelcast jar com.hazelcast:hazelcast:%HAZELCAST_VERSION% + call mvn -q dependency:get -DrepoUrl=%REPO% -Dartifact=com.hazelcast:hazelcast:%HAZELCAST_VERSION% -Ddest=hazelcast-%HAZELCAST_VERSION%.jar + if errorlevel 1 ( + echo Failed download hazelcast jar com.hazelcast:hazelcast:%HAZELCAST_VERSION% + exit 1 + ) + ) + set CLASSPATH=hazelcast-%HAZELCAST_VERSION%.jar;%CLASSPATH% + echo Starting Remote Controller ... oss ... +) + +start /min "hazelcast-remote-controller" cmd /c "java -Dhazelcast.enterprise.license.key=%HAZELCAST_ENTERPRISE_KEY% -cp %CLASSPATH% com.hazelcast.remotecontroller.Main> rc_stdout.txt 2>rc_stderr.txt" + +echo wait for Hazelcast to start ... +ping -n 15 127.0.0.1 > nul + + From a170642954a8262d2164b08f9067638718cb038e Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 27 Jun 2018 17:49:17 +0300 Subject: [PATCH 107/685] fix Map Partition Aware Test (#309) --- test/map/MapPartitionAwareTest.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index 5a491cb7f..f7dfad57c 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -46,10 +46,10 @@ describe('Map Partition Aware', function () { 'result=""+getLocalMapStats();'; } - function _fillMap(map, ssize) { + function _fillMap(map, size) { var entryList = []; - for (var i = 0; i < ssize; i++) { - entryList.push([new PartitionAwareKey('' + Math.random(), 'specificKey'), '' + Math.random()]); + for (var i = 0; i < size; i++) { + entryList.push([new PartitionAwareKey('' + i, 'specificKey'), '' + Math.random()]); } return map.putAll(entryList); } From ebca97a001f0acd27cfa3b5b797046072091a2d1 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 2 Jul 2018 14:52:05 +0300 Subject: [PATCH 108/685] Update CONFIG.md --- CONFIG.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CONFIG.md b/CONFIG.md index cbf929202..928fe6d43 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -195,8 +195,9 @@ Below subsections describe each way. Hazelcast Node.js Client includes a utility factory class that creates the necessary `options` object out of the supplied properties. All you need to do is specifying your factory as `BasicSSLOptionsFactory` and provide the following options: - certPath caPath + keyPath + certPath servername rejectUnauthorized ciphers @@ -214,6 +215,7 @@ Please refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_t "exportedName": "BasicSSLOptionsFactory", "properties": { "caPath": "ca.pem", + "keyPath": "key.pem", "certPath": "cert.pem", "rejectUnauthorized": false } @@ -243,6 +245,7 @@ An example configuration: "exportedName": "SSLFactory", "properties": { "caPath": "ca.pem", + "keyPath": "key.pem", "certPath": "cert.pem", "keepOrder": true } @@ -261,8 +264,9 @@ function SSLFactory() { } SSLFactory.prototype.init = function(props) { - this.keyPath = props.keyPath; this.caPath = props.caPath; + this.keyPath = props.keyPath; + this.certPath = props.certPath; this.keepOrder = props.userDefinedProperty1; }; @@ -270,8 +274,9 @@ SSLFactory.prototype.getSSLOptions = function() { var sslOpts = { servername: 'foo.bar.com', rejectUnauthorized: true, - cert: fs.readFileSync(this.keyPath), ca: fs.readFileSync(this.caPath) + key: fs.readFileSync(this.keyPath), + cert: fs.readFileSync(this.certPath), }; if (this.keepOrder) { sslOpts.honorCipherOrder = true; From b8981563ff8a5988dfa263092d6df7d31c511506 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Thu, 12 Jul 2018 10:00:43 +0300 Subject: [PATCH 109/685] fix Near Cache bugs (#312) --- src/nearcache/MetadataFetcher.ts | 12 ++-- src/nearcache/NearCache.ts | 61 +++++++++------- src/nearcache/RepairingHandler.ts | 1 + src/nearcache/RepairingTask.ts | 19 ++--- src/proxy/NearCachedMapProxy.ts | 111 +++++++++++++++++------------- test/nearcache/NearCacheTest.js | 10 ++- 6 files changed, 124 insertions(+), 90 deletions(-) diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index e269e862b..a3491f849 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -37,11 +37,13 @@ export class MetadataFetcher { } initHandler(handler: RepairingHandler): Promise { - const scanPromise = this.scanMembers([handler.getName()])[0]; - return scanPromise.then((response: ClientMessage) => { - const metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(response); - handler.initUuid(metadata.partitionUuidList); - handler.initSequence(metadata.namePartitionSequenceList[0]); + const scanPromises = this.scanMembers([handler.getName()]); + return Promise.all(scanPromises).then((responses: ClientMessage[]) => { + responses.forEach((response) => { + const metadata = MapFetchNearCacheInvalidationMetadataCodec.decodeResponse(response); + handler.initUuid(metadata.partitionUuidList); + handler.initSequence(metadata.namePartitionSequenceList[0]); + }); }); } diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index e9ae0ff6e..3ece36f1d 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -25,6 +25,7 @@ import {shuffleArray} from '../Util'; import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; import {DataRecord} from './DataRecord'; import {StaleReadDetector} from './StaleReadDetector'; +import * as Promise from 'bluebird'; export interface NearCacheStatistics { evictedCount: number; @@ -37,7 +38,7 @@ export interface NearCacheStatistics { export interface NearCache { put(key: Data, value: any): void; - get(key: Data): Data | any; + get(key: Data): Promise; invalidate(key: Data): void; @@ -52,6 +53,8 @@ export interface NearCache { tryReserveForUpdate(key: Data): Long; tryPublishReserved(key: Data, value: any, reservationId: Long): any; + + setReady(): void; } export class NearCacheImpl implements NearCache { @@ -76,6 +79,7 @@ export class NearCacheImpl implements NearCache { private missCount: number = 0; private hitCount: number = 0; private compareFunc: (x: DataRecord, y: DataRecord) => number; + private ready: Promise.Resolver; constructor(nearCacheConfig: NearCacheConfig, serializationService: SerializationService) { this.serializationService = serializationService; @@ -100,6 +104,11 @@ export class NearCacheImpl implements NearCache { this.evictionCandidatePool = []; this.internalStore = new DataKeyedHashMap(); + this.ready = Promise.defer(); + } + + setReady(): void { + this.ready.resolve(); } nextReservationId(): Long { @@ -173,30 +182,32 @@ export class NearCacheImpl implements NearCache { * @param key * @returns the value if present in near cache, 'undefined' if not */ - get(key: Data): Data | any { - const dr = this.internalStore.get(key); - if (dr === undefined) { - this.missCount++; - return undefined; - } - if (this.staleReadDetector.isStaleRead(key, dr)) { - this.internalStore.delete(key); - this.missCount++; - return undefined; - } - if (dr.isExpired(this.maxIdleSeconds)) { - this.expireRecord(key); - this.missCount++; - return undefined; - } - dr.setAccessTime(); - dr.hitRecord(); - this.hitCount++; - if (this.inMemoryFormat === InMemoryFormat.BINARY) { - return this.serializationService.toObject(dr.value); - } else { - return dr.value; - } + get(key: Data): Promise { + return this.ready.promise.then(() => { + const dr = this.internalStore.get(key); + if (dr === undefined) { + this.missCount++; + return undefined; + } + if (this.staleReadDetector.isStaleRead(key, dr)) { + this.internalStore.delete(key); + this.missCount++; + return undefined; + } + if (dr.isExpired(this.maxIdleSeconds)) { + this.expireRecord(key); + this.missCount++; + return undefined; + } + dr.setAccessTime(); + dr.hitRecord(); + this.hitCount++; + if (this.inMemoryFormat === InMemoryFormat.BINARY) { + return this.serializationService.toObject(dr.value); + } else { + return dr.value; + } + }); } invalidate(key: Data): void { diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index a5474a729..d10823015 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -101,6 +101,7 @@ export class RepairingHandler { if (currentUuid != null && currentUuid.equals(newuuid)) { return; } + metadata.setUuid(newuuid); metadata.reset(); } diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index 78aebd5c1..0efc5d588 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -21,6 +21,7 @@ import {LoggingService} from '../logging/LoggingService'; import {MetadataFetcher} from './MetadataFetcher'; import {NearCache} from './NearCache'; import {RepairingHandler} from './RepairingHandler'; +import * as Promise from 'bluebird'; const PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.reconciliation.interval.seconds'; const PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.min.reconciliation.interval.seconds'; @@ -52,18 +53,20 @@ export class RepairingTask { this.partitionCount = this.client.getPartitionService().getPartitionCount(); } - registerAndGetHandler(objectName: string, nearCache: NearCache): RepairingHandler { + registerAndGetHandler(objectName: string, nearCache: NearCache): Promise { let handler = this.handlers.get(objectName); if (handler !== undefined) { - return handler; + return Promise.resolve(handler); } + handler = new RepairingHandler(objectName, this.client.getPartitionService(), nearCache, this.localUuid); - this.metadataFetcher.initHandler(handler); - this.handlers.set(objectName, handler); - if (this.antientropyTaskHandle === undefined) { - this.start(); - } - return handler; + return this.metadataFetcher.initHandler(handler).then(() => { + this.handlers.set(objectName, handler); + if (this.antientropyTaskHandle === undefined) { + this.start(); + } + return handler; + }); } deregisterHandler(objectName: string): void { diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 2b5d4a616..25903469f 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -43,7 +43,10 @@ export class NearCachedMapProxy extends MapProxy { if (this.nearCache.isInvalidatedOnChange()) { this.addNearCacheInvalidationListener().then((id: string) => { this.invalidationListenerId = id; + this.nearCache.setReady(); }); + } else { + this.nearCache.setReady(); } } @@ -57,12 +60,13 @@ export class NearCachedMapProxy extends MapProxy { } protected containsKeyInternal(keyData: Data): Promise { - const cachedValue = this.nearCache.get(keyData); - if (cachedValue !== undefined) { - return Promise.resolve(cachedValue != null); - } else { - return super.containsKeyInternal(keyData); - } + return this.nearCache.get(keyData).then((cachedValue) => { + if (cachedValue !== undefined) { + return Promise.resolve(cachedValue != null); + } else { + return super.containsKeyInternal(keyData); + } + }); } protected deleteInternal(keyData: Data): Promise { @@ -110,18 +114,20 @@ export class NearCachedMapProxy extends MapProxy { } protected getInternal(keyData: Data): Promise { - const cachedValue = this.nearCache.get(keyData); - if (cachedValue !== undefined) { - return Promise.resolve(cachedValue); - } else { - const reservation = this.nearCache.tryReserveForUpdate(keyData); - return super.getInternal(keyData).then((val: V) => { - this.nearCache.tryPublishReserved(keyData, val, reservation); - return val; - }).catch((err: any) => { - throw err; - }); - } + return this.nearCache.get(keyData).then((cachedValue) => { + if (cachedValue !== undefined) { + return Promise.resolve(cachedValue); + } else { + const reservation = this.nearCache.tryReserveForUpdate(keyData); + return super.getInternal(keyData).then((val: V) => { + + this.nearCache.tryPublishReserved(keyData, val, reservation); + return val; + }).catch((err: any) => { + throw err; + }); + } + }); } protected tryRemoveInternal(keyData: Data, timeout: number): Promise { @@ -133,35 +139,39 @@ export class NearCachedMapProxy extends MapProxy { } protected getAllInternal(partitionsToKeys: { [id: string]: any }, result: any[] = []): Promise { + const promises = []; try { for (const partition in partitionsToKeys) { let partitionArray = partitionsToKeys[partition]; for (let i = partitionArray.length - 1; i >= 0; i--) { const key = partitionArray[i]; - const cachedResult = this.nearCache.get(key); - if (cachedResult !== undefined) { - result.push([this.toObject(partitionArray[i]), cachedResult]); - partitionArray = partitionArray.splice(i, 1); - } + promises.push(this.nearCache.get(key).then((cachedResult) => { + if (cachedResult !== undefined) { + result.push([this.toObject(partitionArray[i]), cachedResult]); + partitionArray = partitionArray.splice(i, 1); + } + })); } } } catch (err) { return Promise.resolve([]); } - const reservations: Long[] = []; - for (const partition in partitionsToKeys) { - const partitionArray = partitionsToKeys[partition]; - for (const key of partitionArray) { - reservations.push(this.nearCache.tryReserveForUpdate(key)); + return Promise.all(promises).then(() => { + const reservations: Long[] = []; + for (const partition in partitionsToKeys) { + const partitionArray = partitionsToKeys[partition]; + for (const key of partitionArray) { + reservations.push(this.nearCache.tryReserveForUpdate(key)); + } } - } - return super.getAllInternal(partitionsToKeys, result).then((serializedEntryArray: Array<[Data, Data]>) => { - serializedEntryArray.forEach((serializedEntry: [Data, Data], index: number) => { - const key = serializedEntry[0]; - const value = serializedEntry[1]; - this.nearCache.tryPublishReserved(key, value, reservations[index]); + return super.getAllInternal(partitionsToKeys, result).then((serializedEntryArray: Array<[Data, Data]>) => { + serializedEntryArray.forEach((serializedEntry: [Data, Data], index: number) => { + const key = serializedEntry[0]; + const value = serializedEntry[1]; + this.nearCache.tryPublishReserved(key, value, reservations[index]); + }); + return result; }); - return result; }); } @@ -200,7 +210,9 @@ export class NearCachedMapProxy extends MapProxy { private addNearCacheInvalidationListener(): Promise { const codec = this.createInvalidationListenerCodec(this.name, EntryEventType.INVALIDATION); if (this.supportsRepairableNearCache()) { - return this.client.getListenerService().registerListener(codec, this.createNearCacheEventHandler()); + return this.createNearCacheEventHandler().then((handler) => { + return this.client.getListenerService().registerListener(codec, handler); + }); } else { return this.client.getListenerService().registerListener(codec, this.createPre38NearCacheEventHandler()); } @@ -259,20 +271,21 @@ export class NearCachedMapProxy extends MapProxy { }; } - private createNearCacheEventHandler() { + private createNearCacheEventHandler(): Promise { const repairingTask = this.client.getRepairingTask(); - const repairingHandler = repairingTask.registerAndGetHandler(this.getName(), this.nearCache); - const staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); - this.nearCache.setStaleReadDetector(staleReadDetector); - const handle = function (key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long) { - repairingHandler.handle(key, sourceUuid, partitionUuid, sequence); - }; - const handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]) { - repairingHandler.handleBatch(keys, sourceUuids, partititonUuids, sequences); - }; + return repairingTask.registerAndGetHandler(this.getName(), this.nearCache).then((repairingHandler) => { + const staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); + this.nearCache.setStaleReadDetector(staleReadDetector); + const handle = function (key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long) { + repairingHandler.handle(key, sourceUuid, partitionUuid, sequence); + }; + const handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]) { + repairingHandler.handleBatch(keys, sourceUuids, partititonUuids, sequences); + }; - return function (m: ClientMessage) { - MapAddNearCacheInvalidationListenerCodec.handle(m, handle, handleBatch); - }; + return function (m: ClientMessage) { + MapAddNearCacheInvalidationListenerCodec.handle(m, handle, handleBatch); + }; + }); } } diff --git a/test/nearcache/NearCacheTest.js b/test/nearcache/NearCacheTest.js index e9a1653fd..718c4d04b 100644 --- a/test/nearcache/NearCacheTest.js +++ b/test/nearcache/NearCacheTest.js @@ -145,18 +145,22 @@ describe('NearCacheImpl', function () { beforeEach(function () { nearCache = new NearCacheImpl(testConfig, createSerializationService()); + nearCache.setReady(); }); it('simple put/get', function () { nearCache.put(ds('key'), 'val'); - return expect(nearCache.get(ds('key'))).to.equal('val'); + return nearCache.get(ds('key')).then((res) => { + return expect(res).to.equal('val'); + }); }); it('returns undefined for non existing value', function () { - nearCache.get(ds('random')); - return expect(nearCache.getStatistics().missCount).to.equal(1); + return nearCache.get(ds('random')).then(() => { + return expect(nearCache.getStatistics().missCount).to.equal(1); + }); }); it('record does not expire if ttl is 0', function () { From 385facd208aa238e937743a6a1a5f51ec5174c48 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Fri, 13 Jul 2018 12:31:38 +0300 Subject: [PATCH 110/685] add nested portable version test (#292) * add nested portable version test * implement ClassDefinitionBuilder --- src/HazelcastError.ts | 7 + src/index.ts | 6 + src/protocol/ErrorFactory.ts | 3 +- src/serialization/portable/ClassDefinition.ts | 27 ++- .../portable/ClassDefinitionBuilder.ts | 161 ++++++++++++++++++ .../portable/ClassDefinitionContext.ts | 13 +- .../portable/ClassDefinitionWriter.ts | 125 +++++++------- .../portable/DefaultPortableWriter.ts | 8 +- .../portable/MorphingPortableReader.ts | 8 +- src/serialization/portable/PortableContext.ts | 62 ++++--- .../portable/PortableSerializer.ts | 42 ++--- test/serialization/PortableObjects.js | 43 +++++ .../portable/ClassDefinitionTest.js | 6 +- .../portable/NestedPortableVersionTest.js | 53 ++++++ 14 files changed, 427 insertions(+), 137 deletions(-) create mode 100644 src/serialization/portable/ClassDefinitionBuilder.ts create mode 100644 test/serialization/portable/NestedPortableVersionTest.js diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index 4f58e9d90..9a163d771 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -33,6 +33,13 @@ export class HazelcastError extends Error { } } +export class HazelcastSerializationError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, HazelcastSerializationError.prototype); + } +} + export class AuthenticationError extends HazelcastError { constructor(msg: string, cause?: Error) { super(msg, cause); diff --git a/src/index.ts b/src/index.ts index 327119f45..f5fae6c4f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -26,6 +26,9 @@ import HazelcastClient from './HazelcastClient'; import * as HazelcastErrors from './HazelcastError'; import {IMap} from './proxy/IMap'; import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; +import {ClassDefinitionBuilder} from './serialization/portable/ClassDefinitionBuilder'; +import {ClassDefinition} from './serialization/portable/ClassDefinition'; +import {FieldDefinition} from './serialization/portable/ClassDefinition'; export { HazelcastClient as Client, @@ -40,4 +43,7 @@ export { IterationType, Aggregators, ImportConfig, + FieldDefinition, + ClassDefinition, + ClassDefinitionBuilder, }; diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index 9410cc0be..13c086295 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -50,6 +50,7 @@ import { TransactionTimedOutError, UndefinedErrorCodeError, UnsupportedOperationError, + HazelcastSerializationError, } from '../HazelcastError'; import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; import {ErrorCodec} from './ErrorCodec'; @@ -78,7 +79,7 @@ export class ClientErrorFactory { this.register(ClientProtocolErrorCodes.HAZELCAST_INSTANCE_NOT_ACTIVE, (m, c) => new HazelcastInstanceNotActiveError(m, c)); this.register(ClientProtocolErrorCodes.HAZELCAST_OVERLOAD, (m, c) => new HazelcastError(m, c)); - this.register(ClientProtocolErrorCodes.HAZELCAST_SERIALIZATION, (m, c) => new HazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST_SERIALIZATION, (m, c) => new HazelcastSerializationError(m, c)); this.register(ClientProtocolErrorCodes.IO, (m, c) => new IOError(m, c)); this.register(ClientProtocolErrorCodes.ILLEGAL_ARGUMENT, (m, c) => new TypeError(m)); this.register(ClientProtocolErrorCodes.ILLEGAL_STATE, (m, c) => new IllegalStateError(m, c)); diff --git a/src/serialization/portable/ClassDefinition.ts b/src/serialization/portable/ClassDefinition.ts index 81b71e929..b9e4d4871 100644 --- a/src/serialization/portable/ClassDefinition.ts +++ b/src/serialization/portable/ClassDefinition.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +import {deepEqual} from 'assert'; + export class ClassDefinition { private factoryId: number; private classId: number; @@ -83,23 +85,30 @@ export class ClassDefinition { if (o.factoryId !== this.factoryId || o.classId !== this.classId || o.version !== this.version) { return false; } + try { + deepEqual(o.fields, this.fields); + } catch (e) { + return false; + } return true; } } export class FieldDefinition { - private index: number; - private fieldName: string; - private type: FieldType; - private factoryId: number; - private classId: number; - - constructor(index: number, fieldName: string, type: FieldType, factoryId: number, classId: number) { + private readonly index: number; + private readonly fieldName: string; + private readonly type: FieldType; + private readonly factoryId: number; + private readonly classId: number; + private readonly version: number; + + constructor(index: number, fieldName: string, type: FieldType, version: number, factoryId = 0, classId = 0) { this.index = index; this.fieldName = fieldName; this.type = type; this.factoryId = factoryId; this.classId = classId; + this.version = version; } getType(): FieldType { @@ -121,6 +130,10 @@ export class FieldDefinition { getFactoryId(): number { return this.factoryId; } + + getVersion(): number { + return this.version; + } } export enum FieldType { diff --git a/src/serialization/portable/ClassDefinitionBuilder.ts b/src/serialization/portable/ClassDefinitionBuilder.ts new file mode 100644 index 000000000..d4a552ec7 --- /dev/null +++ b/src/serialization/portable/ClassDefinitionBuilder.ts @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; +import {HazelcastSerializationError} from '../../HazelcastError'; + +export class ClassDefinitionBuilder { + private readonly factoryId: number; + private readonly classId: number; + private readonly version: number; + + private fieldDefinitions: FieldDefinition[] = []; + + private index: number = 0; + private done: boolean; + + constructor(factoryId: number, classId: number, version: number = 0) { + this.factoryId = factoryId; + this.classId = classId; + this.version = version; + } + + getFactoryId(): number { + return this.factoryId; + } + + getClassId(): number { + return this.classId; + } + + getVersion(): number { + return this.version; + } + + addByteField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.BYTE, this.version)); + } + + addBooleanField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.BOOLEAN, this.version)); + } + + addCharField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.CHAR, this.version)); + } + + addShortField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.SHORT, this.version)); + } + + addIntField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.INT, this.version)); + } + + addLongField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.LONG, this.version)); + } + + addFloatField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.FLOAT, this.version)); + } + + addDoubleField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.DOUBLE, this.version)); + } + + addUTFField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.UTF, this.version)); + } + + addPortableField(fieldName: string, def: ClassDefinition): ClassDefinitionBuilder { + if (def.getClassId() === 0) { + throw new RangeError('Portable class ID cannot be zero!'); + } + + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.PORTABLE, def.getVersion(), + def.getFactoryId(), def.getClassId())); + } + + addByteArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.BYTE_ARRAY, this.version)); + } + + addBooleanArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.BOOLEAN_ARRAY, this.version)); + } + + addCharArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.CHAR_ARRAY, this.version)); + } + + addShortArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.SHORT_ARRAY, this.version)); + } + + addIntArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.INT_ARRAY, this.version)); + } + + addLongArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.LONG_ARRAY, this.version)); + } + + addFloatArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.FLOAT_ARRAY, this.version)); + } + + addDoubleArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.DOUBLE_ARRAY, this.version)); + } + + addUTFArrayField(fieldName: string): ClassDefinitionBuilder { + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.UTF_ARRAY, this.version)); + } + + addPortableArrayField(fieldName: string, def: ClassDefinition): ClassDefinitionBuilder { + if (def.getClassId() === 0) { + throw new RangeError('Portable class ID cannot be zero!'); + } + + return this.addField(new FieldDefinition(this.index, fieldName, FieldType.PORTABLE_ARRAY, def.getVersion(), + def.getFactoryId(), def.getClassId())); + } + + addField(fieldDefinition: FieldDefinition): ClassDefinitionBuilder { + if (this.done) { + throw new HazelcastSerializationError(`ClassDefinition is already built for ${this.classId}`); + } + + if (this.index !== fieldDefinition.getIndex()) { + throw new RangeError('Invalid field index'); + } + + this.fieldDefinitions.push(fieldDefinition); + this.index++; + return this; + } + + build(): ClassDefinition { + this.done = true; + const cd = new ClassDefinition(this.factoryId, this.classId, this.version); + for (const fd of this.fieldDefinitions) { + cd.addFieldDefinition(fd); + } + return cd; + } + +} diff --git a/src/serialization/portable/ClassDefinitionContext.ts b/src/serialization/portable/ClassDefinitionContext.ts index 5ebbb1713..5bb09b672 100644 --- a/src/serialization/portable/ClassDefinitionContext.ts +++ b/src/serialization/portable/ClassDefinitionContext.ts @@ -15,12 +15,14 @@ */ import {ClassDefinition} from './ClassDefinition'; +import {HazelcastSerializationError} from '../../HazelcastError'; export class ClassDefinitionContext { private factoryId: number; + private classDefs: { [classId: string]: ClassDefinition }; - constructor(factoryId: number, portableVersion: number) { + constructor(factoryId: number) { this.factoryId = factoryId; this.classDefs = {}; } @@ -39,7 +41,7 @@ export class ClassDefinitionContext { return null; } if (classDefinition.getFactoryId() !== this.factoryId) { - throw new RangeError(`This factory's number is ${this.factoryId}. + throw new HazelcastSerializationError(`This factory's number is ${this.factoryId}. Intended factory id is ${classDefinition.getFactoryId()}`); } const cdKey = ClassDefinitionContext.encodeVersionedClassId(classDefinition.getClassId(), classDefinition.getVersion()); @@ -48,9 +50,12 @@ export class ClassDefinitionContext { this.classDefs[cdKey] = classDefinition; return classDefinition; } - if (current instanceof ClassDefinition && !current.equals(classDefinition)) { - throw new RangeError(`Incompatible class definition with same class id: ${classDefinition.getClassId()}`); + + if (!current.equals(classDefinition)) { + throw new HazelcastSerializationError(`Incompatible class definition with same class id: + ${classDefinition.getClassId()}`); } + return classDefinition; } } diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index 327448098..33bc0d12f 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -14,141 +14,142 @@ * limitations under the License. */ -import * as Long from 'long'; -import * as Util from '../../Util'; -import {Portable} from '../Serializable'; -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; -import {PortableContext} from './PortableContext'; import {PortableWriter} from './PortableSerializer'; +import {ClassDefinition} from './ClassDefinition'; +import {PortableContext} from './PortableContext'; +import {Portable} from '../Serializable'; +import * as Long from 'long'; +import {ClassDefinitionBuilder} from './ClassDefinitionBuilder'; +import {HazelcastSerializationError} from '../../HazelcastError'; export class ClassDefinitionWriter implements PortableWriter { - private portableContext: PortableContext; - private buildingDefinition: ClassDefinition; + private context: PortableContext; + private builder: ClassDefinitionBuilder; - private index: number = 0; - private factoryId: number; - private classId: number; - private version: number; - private fieldDefinitions: { [fieldName: string]: FieldDefinition } = {}; - - constructor(portableContext: PortableContext, factoryId: number, classId: number, version: number) { - this.portableContext = portableContext; - this.buildingDefinition = new ClassDefinition(factoryId, classId, version); - } - - addFieldByType(fieldName: string, fieldType: FieldType, factoryId: number = 0, classId: number = 0) { - this.fieldDefinitions[fieldName] = new FieldDefinition(this.index, fieldName, fieldType, factoryId, classId); - this.index += 1; + constructor(context: PortableContext, builder: ClassDefinitionBuilder) { + this.context = context; + this.builder = builder; } writeInt(fieldName: string, value: number): void { - this.addFieldByType(fieldName, FieldType.INT); + this.builder.addIntField(fieldName); } writeLong(fieldName: string, long: Long): void { - this.addFieldByType(fieldName, FieldType.LONG); + this.builder.addLongField(fieldName); } writeUTF(fieldName: string, str: string): void { - this.addFieldByType(fieldName, FieldType.UTF); + this.builder.addUTFField(fieldName); } writeBoolean(fieldName: string, value: boolean): void { - this.addFieldByType(fieldName, FieldType.BOOLEAN); + this.builder.addBooleanField(fieldName); } writeByte(fieldName: string, value: number): void { - this.addFieldByType(fieldName, FieldType.BYTE); + this.builder.addByteField(fieldName); } writeChar(fieldName: string, char: string): void { - this.addFieldByType(fieldName, FieldType.CHAR); + this.builder.addCharField(fieldName); } writeDouble(fieldName: string, double: number): void { - this.addFieldByType(fieldName, FieldType.DOUBLE); + this.builder.addDoubleField(fieldName); } writeFloat(fieldName: string, float: number): void { - this.addFieldByType(fieldName, FieldType.FLOAT); + this.builder.addFloatField(fieldName); } writeShort(fieldName: string, value: number): void { - this.addFieldByType(fieldName, FieldType.SHORT); + this.builder.addShortField(fieldName); } writePortable(fieldName: string, portable: Portable): void { - Util.assertNotNull(portable); - const nestedCD = this.portableContext.lookupOrRegisterClassDefinition(portable); - this.addFieldByType(fieldName, FieldType.PORTABLE, nestedCD.getFactoryId(), nestedCD.getClassId()); + if (portable == null) { + throw new HazelcastSerializationError('Cannot write null portable without explicitly ' + + 'registering class definition!'); + } + const version = this.context.getClassVersion(portable); + const nestedClassDef = this.createNestedClassDef(portable, new ClassDefinitionBuilder(portable.getFactoryId(), + portable.getClassId(), version)); + this.builder.addPortableField(fieldName, nestedClassDef); } writeNullPortable(fieldName: string, factoryId: number, classId: number): void { - const version: number = 0; - const nestedCD = this.portableContext.lookupClassDefinition(factoryId, classId, version); - if (nestedCD == null) { - throw new RangeError('Cannot write null portable without explicitly registering class definition!'); + const nestedClassDef = this.context.lookupClassDefinition(factoryId, classId, this.context.getVersion()); + if (nestedClassDef == null) { + throw new HazelcastSerializationError('Cannot write null portable without explicitly ' + + 'registering class definition!'); } - this.addFieldByType(fieldName, FieldType.PORTABLE, nestedCD.getFactoryId(), nestedCD.getClassId()); + this.builder.addPortableField(fieldName, nestedClassDef); } writeByteArray(fieldName: string, bytes: number[]): void { - this.addFieldByType(fieldName, FieldType.BYTE_ARRAY); + this.builder.addByteArrayField(fieldName); } writeBooleanArray(fieldName: string, booleans: boolean[]): void { - this.addFieldByType(fieldName, FieldType.BOOLEAN_ARRAY); + this.builder.addBooleanArrayField(fieldName); } writeCharArray(fieldName: string, chars: string[]): void { - this.addFieldByType(fieldName, FieldType.CHAR_ARRAY); + this.builder.addCharArrayField(fieldName); } writeIntArray(fieldName: string, ints: number[]): void { - this.addFieldByType(fieldName, FieldType.INT_ARRAY); + this.builder.addIntArrayField(fieldName); } writeLongArray(fieldName: string, longs: Long[]): void { - this.addFieldByType(fieldName, FieldType.LONG_ARRAY); + this.builder.addLongArrayField(fieldName); } writeDoubleArray(fieldName: string, doubles: number[]): void { - this.addFieldByType(fieldName, FieldType.DOUBLE_ARRAY); + this.builder.addDoubleArrayField(fieldName); } writeFloatArray(fieldName: string, floats: number[]): void { - this.addFieldByType(fieldName, FieldType.FLOAT_ARRAY); + this.builder.addFloatArrayField(fieldName); } writeShortArray(fieldName: string, shorts: number[]): void { - this.addFieldByType(fieldName, FieldType.SHORT_ARRAY); + this.builder.addShortArrayField(fieldName); } writeUTFArray(fieldName: string, val: string[]): void { - this.addFieldByType(fieldName, FieldType.UTF_ARRAY); + this.builder.addUTFArrayField(fieldName); } writePortableArray(fieldName: string, portables: Portable[]): void { - Util.assertNotNull(portables); - if (portables.length === 0) { - throw new RangeError('Cannot write empty array!'); + if (portables == null || portables.length === 0) { + throw new HazelcastSerializationError('Cannot write null portable array without explicitly ' + + 'registering class definition!'); } - const sample = portables[0]; - const nestedCD = this.portableContext.lookupOrRegisterClassDefinition(sample); - this.addFieldByType(fieldName, FieldType.PORTABLE_ARRAY, nestedCD.getFactoryId(), nestedCD.getClassId()); - } - - end(): void { - for (const field in this.fieldDefinitions) { - this.buildingDefinition.addFieldDefinition(this.fieldDefinitions[field]); + const p = portables[0]; + const classId = p.getClassId(); + for (let i = 1; i < portables.length; i++) { + if (portables[i].getClassId() !== classId) { + throw new RangeError('Detected different class-ids in portable array!'); + } } - } - getDefinition(): ClassDefinition { - return this.buildingDefinition; + const version = this.context.getClassVersion(p); + const nestedClassDef = this.createNestedClassDef(p, new ClassDefinitionBuilder(p.getFactoryId(), p.getClassId(), + version)); + this.builder.addPortableArrayField(fieldName, nestedClassDef); } registerAndGet(): ClassDefinition { - return this.portableContext.registerClassDefinition(this.buildingDefinition); + const cd = this.builder.build(); + return this.context.registerClassDefinition(cd); + } + + private createNestedClassDef(portable: Portable, nestedBuilder: ClassDefinitionBuilder): ClassDefinition { + const writer = new ClassDefinitionWriter(this.context, nestedBuilder); + portable.writePortable(writer); + return this.context.registerClassDefinition(nestedBuilder.build()); } } diff --git a/src/serialization/portable/DefaultPortableWriter.ts b/src/serialization/portable/DefaultPortableWriter.ts index a98d7157c..69c9cdbc2 100644 --- a/src/serialization/portable/DefaultPortableWriter.ts +++ b/src/serialization/portable/DefaultPortableWriter.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import * as Long from 'long'; -import {BitsUtil} from '../../BitsUtil'; +import {PortableSerializer} from './PortableSerializer'; import {PositionalDataOutput} from '../Data'; -import {Portable} from '../Serializable'; import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; -import {PortableSerializer} from './PortableSerializer'; +import {BitsUtil} from '../../BitsUtil'; +import {Portable} from '../Serializable'; +import * as Long from 'long'; export class DefaultPortableWriter { private serializer: PortableSerializer; diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index bdb2155bc..164c337a7 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import * as Long from 'long'; -import {DataInput} from '../Data'; -import {Portable} from '../Serializable'; -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; import {DefaultPortableReader} from './DefaultPortableReader'; import {PortableSerializer} from './PortableSerializer'; +import {DataInput} from '../Data'; +import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; +import {Portable} from '../Serializable'; +import * as Long from 'long'; export class MorphingPortableReader extends DefaultPortableReader { constructor(portableSerializer: PortableSerializer, input: DataInput, classDefinition: ClassDefinition) { diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index a2b5052f3..5a38d10f7 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -14,32 +14,33 @@ * limitations under the License. */ -import {BitsUtil} from '../../BitsUtil'; -import {DataInput} from '../Data'; -import {Portable, VersionedPortable} from '../Serializable'; import {SerializationService} from '../SerializationService'; -import {ClassDefinition, FieldType} from './ClassDefinition'; import {ClassDefinitionContext} from './ClassDefinitionContext'; +import {DataInput} from '../Data'; +import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; import {ClassDefinitionWriter} from './ClassDefinitionWriter'; +import {BitsUtil} from '../../BitsUtil'; +import {Portable, VersionedPortable} from '../Serializable'; +import {ClassDefinitionBuilder} from './ClassDefinitionBuilder'; export class PortableContext { private service: SerializationService; - private portableVersion: number = 0; + private version: number; private classDefContext: { [factoyId: number]: ClassDefinitionContext }; constructor(service: SerializationService, portableVersion: number) { this.service = service; - this.portableVersion = portableVersion; + this.version = portableVersion; this.classDefContext = {}; } getVersion(): number { - return this.portableVersion; + return this.version; } readClassDefinitionFromInput(input: DataInput, factoryId: number, classId: number, version: number): ClassDefinition { let register = true; - const cdWriter = new ClassDefinitionWriter(this, factoryId, classId, version); + const builder = new ClassDefinitionBuilder(factoryId, classId, version); input.readInt(); const fieldCount = input.readInt(); @@ -58,6 +59,7 @@ export class PortableContext { const name = chars; let fieldFactoryId = 0; let fieldClassId = 0; + let fieldVersion = this.version; if (type === FieldType.PORTABLE) { // is null if (input.readBoolean()) { @@ -68,7 +70,7 @@ export class PortableContext { // TODO: what there's a null inner Portable field if (register) { - const fieldVersion = input.readInt(); + fieldVersion = input.readInt(); this.readClassDefinitionFromInput(input, fieldFactoryId, fieldClassId, fieldVersion); } } else if (type === FieldType.PORTABLE_ARRAY) { @@ -80,30 +82,31 @@ export class PortableContext { if (k > 0) { const p = input.readInt(); input.position(p); - const fieldVersion = input.readInt(); + fieldVersion = input.readInt(); this.readClassDefinitionFromInput(input, fieldFactoryId, fieldClassId, fieldVersion); } else { register = false; } } - cdWriter.addFieldByType(name, type, fieldFactoryId, fieldClassId); + builder.addField(new FieldDefinition(i, name, type, fieldVersion, fieldFactoryId, fieldClassId)); } - cdWriter.end(); - let classDefinition = cdWriter.getDefinition(); + let classDefinition = builder.build(); if (register) { - classDefinition = cdWriter.registerAndGet(); + classDefinition = this.registerClassDefinition(classDefinition); } return classDefinition; } - lookupOrRegisterClassDefinition(portable: Portable): ClassDefinition { - const version = this.getClassVersion(portable); - let definition = this.lookupClassDefinition(portable.getFactoryId(), portable.getClassId(), version); - if (definition == null) { - definition = this.generateClassDefinitionForPortable(portable); - this.registerClassDefinition(definition); + lookupOrRegisterClassDefinition(p: Portable): ClassDefinition { + const portableVersion = this.getClassVersion(p); + let cd = this.lookupClassDefinition(p.getFactoryId(), p.getClassId(), portableVersion); + if (cd == null) { + const writer = new ClassDefinitionWriter(this, new ClassDefinitionBuilder(p.getFactoryId(), p.getClassId(), + portableVersion)); + p.writePortable(writer); + cd = writer.registerAndGet(); } - return definition; + return cd; } lookupClassDefinition(factoryId: number, classId: number, version: number): ClassDefinition { @@ -115,29 +118,22 @@ export class PortableContext { } } - generateClassDefinitionForPortable(portable: Portable): ClassDefinition { - const version: number = this.getClassVersion(portable); - const classDefinitionWriter = new ClassDefinitionWriter(this, portable.getFactoryId(), portable.getClassId(), version); - portable.writePortable(classDefinitionWriter); - classDefinitionWriter.end(); - return classDefinitionWriter.registerAndGet(); - } - registerClassDefinition(classDefinition: ClassDefinition): ClassDefinition { const factoryId = classDefinition.getFactoryId(); - const classId = classDefinition.getClassId(); - const version = classDefinition.getVersion(); if (!this.classDefContext[factoryId]) { - this.classDefContext[factoryId] = new ClassDefinitionContext(factoryId, this.portableVersion); + this.classDefContext[factoryId] = new ClassDefinitionContext(factoryId); } return this.classDefContext[factoryId].register(classDefinition); } getClassVersion(portable: VersionedPortable | Portable): number { if ((portable as VersionedPortable).getVersion) { + if ((portable as VersionedPortable).getVersion() < 0) { + throw new RangeError('Version cannot be negative!'); + } return (portable as VersionedPortable).getVersion(); } else { - return this.portableVersion; + return this.version; } } diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index f4c436e12..068cfd2e4 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -14,17 +14,18 @@ * limitations under the License. */ -import * as Long from 'long'; -import * as Path from 'path'; -import {SerializationConfig} from '../../config/SerializationConfig'; -import {DataInput, PositionalDataOutput} from '../Data'; -import {Portable, PortableFactory} from '../Serializable'; import {SerializationService, Serializer} from '../SerializationService'; -import {ClassDefinition, FieldType} from './ClassDefinition'; +import {PortableContext} from './PortableContext'; +import {Portable, PortableFactory} from '../Serializable'; +import {DataInput, PositionalDataOutput} from '../Data'; import {DefaultPortableReader} from './DefaultPortableReader'; -import {DefaultPortableWriter} from './DefaultPortableWriter'; import {MorphingPortableReader} from './MorphingPortableReader'; -import {PortableContext} from './PortableContext'; +import {ClassDefinition, FieldType} from './ClassDefinition'; +import {DefaultPortableWriter} from './DefaultPortableWriter'; +import * as Long from 'long'; +import {SerializationConfig} from '../../config/SerializationConfig'; +import * as Path from 'path'; +import {HazelcastSerializationError} from '../../HazelcastError'; export class PortableSerializer implements Serializer { @@ -58,12 +59,7 @@ export class PortableSerializer implements Serializer { readObject(input: DataInput, factoryId: number, classId: number): Portable { const version = input.readInt(); - const factory = this.factories[factoryId]; - if (factory == null) { - throw new RangeError(`There is no suitable portable factory for ${factoryId}.`); - } - - const portable: Portable = factory.create(classId); + const portable = this.createNewPortableInstance(factoryId, classId); let classDefinition = this.portableContext.lookupClassDefinition(factoryId, classId, version); if (classDefinition == null) { const backupPos = input.position(); @@ -73,7 +69,7 @@ export class PortableSerializer implements Serializer { input.position(backupPos); } } - let reader: PortableReader; + let reader: DefaultPortableReader; if (classDefinition.getVersion() === this.portableContext.getClassVersion(portable)) { reader = new DefaultPortableReader(this, input, classDefinition); } else { @@ -99,6 +95,18 @@ export class PortableSerializer implements Serializer { object.writePortable(writer); writer.end(); } + + private createNewPortableInstance(factoryId: number, classId: number): Portable { + const factory = this.factories[factoryId]; + if (factory == null) { + throw new HazelcastSerializationError(`There is no suitable portable factory for ${factoryId}.`); + } + const portable: Portable = factory.create(classId); + if (portable == null) { + throw new HazelcastSerializationError(`Could not create Portable for class-id: ${classId}`); + } + return portable; + } } export interface PortableWriter { @@ -143,8 +151,6 @@ export interface PortableWriter { writeUTFArray(fieldName: string, val: string[]): void; writePortableArray(fieldName: string, portables: Portable[]): void; - - end(): void; } export interface PortableReader { @@ -195,6 +201,4 @@ export interface PortableReader { readUTFArray(fieldName: string): string[]; readPortableArray(fieldName: string): Portable[]; - - end(): void; } diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index 99f9d3c5a..e157b9e1b 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -246,9 +246,52 @@ SimplePortableV3.prototype.getVersion = function () { return 3; }; +function Parent(child) { + this.child = child; +} + +Parent.prototype.getFactoryId = function () { + return 1; +}; + +Parent.prototype.getClassId = function () { + return 1; +}; + +Parent.prototype.writePortable = function (writer) { + writer.writePortable('child', this.child); +}; + +Parent.prototype.readPortable = function (reader) { + this.child = reader.readPortable('child'); +}; + +function Child(name) { + this.name = name; +} + +Child.prototype.getFactoryId = function () { + return 1; +}; + +Child.prototype.getClassId = function () { + return 2; +}; + +Child.prototype.writePortable = function (writer) { + writer.writeUTF('name', this.name); +}; + +Child.prototype.readPortable = function (reader) { + this.name = reader.readUTF('name'); +}; + exports.PortableObject = PortableObject; exports.PortableObjectV2 = PortableObjectV2; exports.InnerPortableObject = InnerPortableObject; exports.SimplePortable = SimplePortable; exports.SimplePortableV3 = SimplePortableV3; +exports.Parent = Parent; +exports.Child = Child; + diff --git a/test/serialization/portable/ClassDefinitionTest.js b/test/serialization/portable/ClassDefinitionTest.js index 90fa4c9ae..64f69f47e 100644 --- a/test/serialization/portable/ClassDefinitionTest.js +++ b/test/serialization/portable/ClassDefinitionTest.js @@ -16,9 +16,9 @@ var expect = require('chai').expect; var assert = require('chai').assert; -var CD = require('../../../lib/serialization/portable/ClassDefinition').ClassDefinition; -var FD = require('../../../lib/serialization/portable/ClassDefinition').FieldDefinition; -var FT = require('../../../lib/serialization/portable/ClassDefinition').FieldDefinition; +var CD = require('../../../').ClassDefinition; +var FD = require('../../../').FieldDefinition; +var FT = require('../../../').FieldDefinition; describe('ClassDefinitionTest', function () { var a = new CD(1, 2, 3); diff --git a/test/serialization/portable/NestedPortableVersionTest.js b/test/serialization/portable/NestedPortableVersionTest.js new file mode 100644 index 000000000..275dbd4be --- /dev/null +++ b/test/serialization/portable/NestedPortableVersionTest.js @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Config = require('../../../.').Config; +var SerializationService = require('../../../lib/serialization/SerializationService'); +var Parent = require('../PortableObjects').Parent; +var Child = require('../PortableObjects').Child; +var Util = require('../../Util'); + +describe('Nested Portable Version', function () { + + it('compatible versions', function () { + var sc = new Config.SerializationConfig(); + sc.portableVersion = 6; + sc.portableFactories[1] = { + create: function (classId) { + if (classId === 1) { + return new Parent(); + } else if (classId === 2) { + return new Child(); + } + return null; + } + }; + + var ss1 = new SerializationService.SerializationServiceV1(sc); + var ss2 = new SerializationService.SerializationServiceV1(sc); + + // make sure ss2 cached class definition of child + ss2.toData(new Child("Furkan")); + + // serialized parent from ss1 + var p = new Parent(new Child("Furkan")); + var data = ss1.toData(p); + + // cached class definition of child and the class definition from data coming from ss1 should be compatible + Util.expectAlmostEqual(p, ss2.toObject(data)); + }); + +}); From 35feaaf12a554ed66bd0669f4735530c73a1313f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Mon, 4 Jun 2018 18:20:38 +0300 Subject: [PATCH 111/685] update scripts --- scripts/dev-test-rc.sh | 6 +++--- scripts/download-rc.sh | 6 +++--- test/ssl/ClientSSLAuthenticationTest.js | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 816ef4ed1..923896229 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,9 +1,9 @@ #!/bin/sh -HZ_VERSION="3.10-BETA-1" -HAZELCAST_TEST_VERSION="3.10-SNAPSHOT" +HZ_VERSION="3.10" +HAZELCAST_TEST_VERSION="3.10" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.3-SNAPSHOT" +HAZELCAST_RC_VERSION="0.4-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 1beeb9110..4db9439ab 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,10 +1,10 @@ #!/bin/sh -HZ_VERSION="3.10-BETA-1" -HZ_TEST_VERSION="3.10-SNAPSHOT" +HZ_VERSION="3.10" +HZ_TEST_VERSION="3.10" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.3-SNAPSHOT" +HAZELCAST_RC_VERSION="0.4-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 6eefb4041..f408117b3 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -110,13 +110,15 @@ describe('SSL Client Authentication Test', function () { it('ma:required, server does not know client, client knows server should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server1-cert.pem'))).to.throw; + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', + './server1-cert.pem'))).to.be.rejectedWith(HzErrors.IllegalStateError); }); }); it('ma:required, neither one knows the other should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server2-cert.pem'))).to.throw; + return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', + './server2-cert.pem'))).to.be.rejectedWith(HzErrors.IllegalStateError); }); }); From ccb0988e42b68d50501acd1f7bf3911ff013a3dd Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Tue, 17 Jul 2018 15:51:51 +0300 Subject: [PATCH 112/685] implement Hazelcast Cloud Discovery (#305) --- package-lock.json | 8 +- package.json | 2 +- src/HazelcastClient.ts | 48 +++++++++- src/config/ClientCloudConfig.ts | 29 ++++++ src/config/ClientNetworkConfig.ts | 9 +- src/config/ConfigBuilder.ts | 18 +++- src/connection/AddressProvider.ts | 29 ++++++ src/connection/AddressTranslator.ts | 39 ++++++++ src/connection/DefaultAddressProvider.ts | 44 +++++++++ src/connection/DefaultAddressTranslator.ts | 32 +++++++ .../HazelcastCloudAddressProvider.ts | 40 ++++++++ .../HazelcastCloudAddressTranslator.ts | 60 ++++++++++++ src/discovery/HazelcastCloudDiscovery.ts | 70 ++++++++++++++ src/invocation/ClientConnectionManager.ts | 46 ++++++---- src/invocation/ClusterService.ts | 44 ++++++--- test/ClusterServiceTest.js | 4 +- .../config/ConfigBuilderHazelcastCloudTest.js | 65 +++++++++++++ test/config/ConfigBuilderTest.js | 11 ++- ...hazelcast-client-cloud-config-enabled.json | 8 ++ test/config/hazelcast-client-full.json | 4 + ...hazelcast-client-invalid-cloud-config.json | 8 ++ test/discovery/HazelcastCloudProviderTest.js | 67 ++++++++++++++ .../discovery/HazelcastCloudTranslatorTest.js | 92 +++++++++++++++++++ 23 files changed, 734 insertions(+), 43 deletions(-) create mode 100644 src/config/ClientCloudConfig.ts create mode 100644 src/connection/AddressProvider.ts create mode 100644 src/connection/AddressTranslator.ts create mode 100644 src/connection/DefaultAddressProvider.ts create mode 100644 src/connection/DefaultAddressTranslator.ts create mode 100644 src/discovery/HazelcastCloudAddressProvider.ts create mode 100644 src/discovery/HazelcastCloudAddressTranslator.ts create mode 100644 src/discovery/HazelcastCloudDiscovery.ts create mode 100644 test/config/ConfigBuilderHazelcastCloudTest.js create mode 100644 test/config/hazelcast-client-cloud-config-enabled.json create mode 100644 test/config/hazelcast-client-invalid-cloud-config.json create mode 100644 test/discovery/HazelcastCloudProviderTest.js create mode 100644 test/discovery/HazelcastCloudTranslatorTest.js diff --git a/package-lock.json b/package-lock.json index e991b1929..06db9189e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "hazelcast-client", - "version": "0.7.0", + "version": "0.8.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1123,6 +1123,12 @@ } } }, + "jsonschema": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.4.tgz", + "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw==", + "dev": true + }, "load-json-file": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", diff --git a/package.json b/package.json index 5ab0405b8..7db0d4dec 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "chai-as-promised": "7.1.1", "hazelcast-remote-controller": "^1.0.0", "istanbul": "0.4.5", - "jsonschema": "^1.2.2", + "jsonschema": "1.2.4", "mocha": "3.5.3", "mousse": "0.3.1", "remap-istanbul": "0.9.6", diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index b3055217b..e86c41975 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -46,6 +46,12 @@ import {PNCounter} from './proxy/PNCounter'; import {ProxyManager} from './proxy/ProxyManager'; import {ITopic} from './proxy/topic/ITopic'; import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; +import {AddressProvider} from './connection/AddressProvider'; +import {HazelcastCloudAddressProvider} from './discovery/HazelcastCloudAddressProvider'; +import {HazelcastCloudAddressTranslator} from './discovery/HazelcastCloudAddressTranslator'; +import {AddressTranslator} from './connection/AddressTranslator'; +import {DefaultAddressTranslator} from './connection/DefaultAddressTranslator'; +import {DefaultAddressProvider} from './connection/DefaultAddressProvider'; export default class HazelcastClient { @@ -76,7 +82,9 @@ export default class HazelcastClient { this.serializationService = new SerializationServiceV1(this.config.serializationConfig); this.proxyManager = new ProxyManager(this); this.partitionService = new PartitionService(this); - this.connectionManager = new ClientConnectionManager(this); + const addressProviders = this.createAddressProviders(); + const addressTranslator = this.createAddressTranslator(); + this.connectionManager = new ClientConnectionManager(this, addressTranslator, addressProviders); this.clusterService = new ClusterService(this); this.lifecycleService = new LifecycleService(this); this.heartbeat = new Heartbeat(this); @@ -339,4 +347,42 @@ export default class HazelcastClient { throw e; }); } + + private createAddressTranslator(): AddressTranslator { + const cloudConfig = this.getConfig().networkConfig.cloudConfig; + if (cloudConfig.enabled) { + return new HazelcastCloudAddressTranslator(cloudConfig.discoveryToken, this.getConnectionTimeoutMillis(), + this.loggingService); + } + return new DefaultAddressTranslator(); + + } + + private createAddressProviders(): AddressProvider[] { + const networkConfig = this.getConfig().networkConfig; + const addressProviders: AddressProvider[] = []; + + const cloudAddressProvider = this.initCloudAddressProvider(); + if (cloudAddressProvider != null) { + addressProviders.push(cloudAddressProvider); + } + + addressProviders.push(new DefaultAddressProvider(networkConfig, addressProviders.length === 0)); + return addressProviders; + } + + private initCloudAddressProvider(): HazelcastCloudAddressProvider { + const cloudConfig = this.getConfig().networkConfig.cloudConfig; + if (cloudConfig.enabled) { + return new HazelcastCloudAddressProvider(cloudConfig.discoveryToken, this.getConnectionTimeoutMillis(), + this.loggingService); + } + return null; + } + + private getConnectionTimeoutMillis(): number { + const networkConfig = this.getConfig().networkConfig; + const connTimeout = networkConfig.connectionTimeout; + return connTimeout === 0 ? Number.MAX_VALUE : connTimeout; + } } diff --git a/src/config/ClientCloudConfig.ts b/src/config/ClientCloudConfig.ts new file mode 100644 index 000000000..4d1bbf13b --- /dev/null +++ b/src/config/ClientCloudConfig.ts @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * hazelcast.cloud configuration to let the client connect the cluster via hazelcast.cloud + */ +export class ClientCloudConfig { + /** + * hazelcast.cloud discoveryToken of your cluster + */ + discoveryToken: string = null; + /** + * enabled true to use hazelcast.cloud + */ + enabled: boolean = false; +} diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index 9a37d5fe8..a398ae8f6 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import Address = require('../Address'); import {ImportConfig} from './ImportConfig'; import {Properties} from './Properties'; import {SSLOptions} from './SSLOptions'; +import {ClientCloudConfig} from './ClientCloudConfig'; /** * Network configuration @@ -26,7 +26,12 @@ export class ClientNetworkConfig { /** * Client tries to connect the members at these addresses. */ - addresses: Address[] = []; + addresses: string[] = []; + + /** + * hazelcast.cloud configuration to let the client connect the cluster via hazelcast.cloud + */ + cloudConfig: ClientCloudConfig = new ClientCloudConfig(); /** * While client is trying to connect initially to one of the members in the {@link addresses}, diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 01fd60c71..1cb1d2fe4 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -18,7 +18,7 @@ import * as Promise from 'bluebird'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {HazelcastError} from '../HazelcastError'; import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; -import {createAddressFromString, mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; +import {mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; import {ClientConfig} from './Config'; import {EvictionPolicy} from './EvictionPolicy'; import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; @@ -100,6 +100,20 @@ export class ConfigBuilder { this.clientConfig.networkConfig.connectionAttemptLimit = tryGetNumber(jsonObject[key]); } else if (key === 'ssl') { this.handleSsl(jsonObject[key]); + } else if (key === 'hazelcastCloud') { + this.handleHazelcastCloud(jsonObject[key]); + } + } + } + + private handleHazelcastCloud(jsonObject: any): void { + const cloudConfigEnabled = tryGetBoolean(jsonObject.enabled); + if (cloudConfigEnabled) { + this.clientConfig.networkConfig.cloudConfig.enabled = cloudConfigEnabled; + } + for (const key in jsonObject) { + if (key === 'discoveryToken') { + this.clientConfig.networkConfig.cloudConfig.discoveryToken = tryGetString(jsonObject[key]); } } } @@ -140,7 +154,7 @@ export class ConfigBuilder { const addressArray = tryGetArray(jsonObject); for (const index in addressArray) { const address = addressArray[index]; - this.clientConfig.networkConfig.addresses.push(createAddressFromString(tryGetString(address))); + this.clientConfig.networkConfig.addresses.push(tryGetString(address)); } } diff --git a/src/connection/AddressProvider.ts b/src/connection/AddressProvider.ts new file mode 100644 index 000000000..a15d50480 --- /dev/null +++ b/src/connection/AddressProvider.ts @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Promise from 'bluebird'; + +/** + * Provides initial addresses for client to find and connect to a node + */ +export interface AddressProvider { + + /** + * @return The possible member addresses to connect to. + */ + loadAddresses(): Promise; + +} diff --git a/src/connection/AddressTranslator.ts b/src/connection/AddressTranslator.ts new file mode 100644 index 000000000..80a21eedf --- /dev/null +++ b/src/connection/AddressTranslator.ts @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import Address = require('../Address'); +import * as Promise from 'bluebird'; + +/** + * Address Translator is used for resolve private ip + * addresses of cloud services. + */ +export interface AddressTranslator { + + /** + * Translates the given address to another address specific to + * network or service + * + * @param address + * @return new address if given address is known, otherwise return null + */ + translate(address: Address): Promise
; + + /** + * Refreshes the internal lookup table if necessary. + */ + refresh(): Promise; +} diff --git a/src/connection/DefaultAddressProvider.ts b/src/connection/DefaultAddressProvider.ts new file mode 100644 index 000000000..f5acacb56 --- /dev/null +++ b/src/connection/DefaultAddressProvider.ts @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {AddressProvider} from './AddressProvider'; +import {ClientNetworkConfig} from '../config/ClientNetworkConfig'; +import * as Promise from 'bluebird'; + +/** + * Default address provider of Hazelcast. + * + * Loads addresses from the Hazelcast configuration. + */ +export class DefaultAddressProvider implements AddressProvider { + + private networkConfig: ClientNetworkConfig; + private readonly noOtherAddressProviderExist: boolean; + + constructor(networkConfig: ClientNetworkConfig, noOtherAddressProviderExist: boolean) { + this.networkConfig = networkConfig; + this.noOtherAddressProviderExist = noOtherAddressProviderExist; + } + + loadAddresses(): Promise { + const addresses: string[] = this.networkConfig.addresses; + if (addresses.length === 0 && this.noOtherAddressProviderExist) { + addresses.push('localhost:5701'); + } + + return Promise.resolve(addresses); + } +} diff --git a/src/connection/DefaultAddressTranslator.ts b/src/connection/DefaultAddressTranslator.ts new file mode 100644 index 000000000..6b39f62c8 --- /dev/null +++ b/src/connection/DefaultAddressTranslator.ts @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {AddressTranslator} from './AddressTranslator'; +import * as Promise from 'bluebird'; +import Address = require('../Address'); + +/** + * Default Address Translator is a no-op. It always returns the given address. + */ +export class DefaultAddressTranslator implements AddressTranslator { + refresh(): Promise { + return Promise.resolve(); + } + + translate(address: Address): Promise
{ + return Promise.resolve(address); + } +} diff --git a/src/discovery/HazelcastCloudAddressProvider.ts b/src/discovery/HazelcastCloudAddressProvider.ts new file mode 100644 index 000000000..216a68c89 --- /dev/null +++ b/src/discovery/HazelcastCloudAddressProvider.ts @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {LoggingService} from '../logging/LoggingService'; +import {HazelcastCloudDiscovery} from './HazelcastCloudDiscovery'; +import {AddressProvider} from '../connection/AddressProvider'; +import * as Promise from 'bluebird'; + +export class HazelcastCloudAddressProvider implements AddressProvider { + private readonly loggingService: LoggingService; + private readonly cloudDiscovery: HazelcastCloudDiscovery; + + constructor(token: string, connectionTimeoutMillis: number, loggingService: LoggingService) { + this.cloudDiscovery = new HazelcastCloudDiscovery(token, connectionTimeoutMillis); + this.loggingService = loggingService; + } + + loadAddresses(): Promise { + return this.cloudDiscovery.discoverNodes().then((res) => { + return Array.from(res.keys()); + }).catch((e) => { + this.loggingService.warn('HazelcastCloudAddressProvider', + 'Failed to load addresses from hazelcast.cloud : ' + e.message); + return []; + }); + } +} diff --git a/src/discovery/HazelcastCloudAddressTranslator.ts b/src/discovery/HazelcastCloudAddressTranslator.ts new file mode 100644 index 000000000..46013286d --- /dev/null +++ b/src/discovery/HazelcastCloudAddressTranslator.ts @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {HazelcastCloudDiscovery} from './HazelcastCloudDiscovery'; +import {LoggingService} from '../logging/LoggingService'; +import {AddressTranslator} from '../connection/AddressTranslator'; +import * as Promise from 'bluebird'; +import Address = require('../Address'); + +export class HazelcastCloudAddressTranslator implements AddressTranslator { + private loggingService: LoggingService; + private readonly hazelcastCloudDiscovery: HazelcastCloudDiscovery; + + private privateToPublic: Map = new Map(); + + constructor(token: string, connectionTimeoutMillis: number, loggingService: LoggingService) { + this.hazelcastCloudDiscovery = new HazelcastCloudDiscovery(token, connectionTimeoutMillis); + this.loggingService = loggingService; + } + + translate(address: Address): Promise
{ + if (address == null) { + return Promise.resolve(null); + } + const publicAddress = this.privateToPublic.get(address.toString()); + if (publicAddress != null) { + return Promise.resolve(publicAddress); + } + + return this.refresh().then(() => { + if (this.privateToPublic.get(address.toString())) { + return this.privateToPublic.get(address.toString()); + } else { + return null; + } + }); + } + + refresh(): Promise { + return this.hazelcastCloudDiscovery.discoverNodes().then((res) => { + this.privateToPublic = res; + }).catch((e) => { + this.loggingService.warn('HazelcastCloudAddressTranslator', + 'Failed to load addresses from hazelcast.cloud : ' + e.message); + }); + } +} diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts new file mode 100644 index 000000000..0fe1d28d2 --- /dev/null +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -0,0 +1,70 @@ +import Address = require('../Address'); +import {createAddressFromString} from '../Util'; +import {get} from 'https'; +import {IncomingMessage} from 'http'; +import * as Promise from 'bluebird'; + +/** + * Discovery service that discover nodes via hazelcast.cloud + * https://coordinator.hazelcast.cloud/cluster/discovery?token= + */ +export class HazelcastCloudDiscovery { + private static readonly HOST = 'coordinator.hazelcast.cloud'; + private static readonly PATH = '/cluster/discovery?token='; + private static readonly PRIVATE_ADDRESS_PROPERTY = 'private-address'; + private static readonly PUBLIC_ADDRESS_PROPERTY = 'public-address'; + + private readonly endpointUrl: string; + private readonly connectionTimeoutInMillis: number; + + constructor(cloudToken: string, connectionTimeoutInMillis: number) { + this.endpointUrl = HazelcastCloudDiscovery.PATH + cloudToken; + this.connectionTimeoutInMillis = connectionTimeoutInMillis; + } + + discoverNodes(): Promise> { + return this.callService().catch((e) => { + throw e; + }); + } + + callService(): Promise> { + const deferred = Promise.defer>(); + let dataAsAString: string = ''; + + const options = { + host: HazelcastCloudDiscovery.HOST, + path: this.endpointUrl, + }; + + get(options, (res: IncomingMessage) => { + res.setEncoding('utf8'); + res.on('data', (chunk) => { + dataAsAString += chunk; + }); + + res.on('end', () => { + deferred.resolve(this.parseResponse(dataAsAString)); + }); + }).on('error', (e) => { + deferred.reject(e); + }); + + return deferred.promise; + } + + private parseResponse(data: string): Map { + const jsonValue = JSON.parse(data); + + const privateToPublicAddresses: Map = new Map(); + for (const value of jsonValue) { + const privateAddress = value[HazelcastCloudDiscovery.PRIVATE_ADDRESS_PROPERTY]; + const publicAddress = value[HazelcastCloudDiscovery.PUBLIC_ADDRESS_PROPERTY]; + + const publicAddr = createAddressFromString(publicAddress.toString()); + privateToPublicAddresses.set(new Address(privateAddress, publicAddr.port).toString(), publicAddr); + } + + return privateToPublicAddresses; + } +} diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 7b5d03345..37558e493 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -25,6 +25,8 @@ import * as net from 'net'; import * as tls from 'tls'; import {loadNameFromPath} from '../Util'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; +import {AddressTranslator} from '../connection/AddressTranslator'; +import {AddressProvider} from '../connection/AddressProvider'; import Address = require('../Address'); const EMIT_CONNECTION_CLOSED = 'connectionClosed'; @@ -35,13 +37,17 @@ const EMIT_CONNECTION_OPENED = 'connectionOpened'; */ export class ClientConnectionManager extends EventEmitter { establishedConnections: { [address: string]: ClientConnection } = {}; - private client: HazelcastClient; + readonly addressProviders: AddressProvider[]; + private readonly client: HazelcastClient; private pendingConnections: { [address: string]: Promise.Resolver } = {}; private logger = LoggingService.getLoggingService(); + private readonly addressTranslator: AddressTranslator; - constructor(client: HazelcastClient) { + constructor(client: HazelcastClient, addressTranslator: AddressTranslator, addressProviders: AddressProvider[]) { super(); this.client = client; + this.addressTranslator = addressTranslator; + this.addressProviders = addressProviders; } getActiveConnections(): { [address: string]: ClientConnection } { @@ -76,22 +82,28 @@ export class ClientConnectionManager extends EventEmitter { this.client.getInvocationService().processResponse(data); }; - this.triggerConnect(address, asOwner).then((socket: net.Socket) => { - const clientConnection = new ClientConnection(this.client, address, socket); - - return this.initiateCommunication(clientConnection).then(() => { - return clientConnection.registerResponseCallback(processResponseCallback); - }).then(() => { - return this.authenticate(clientConnection, asOwner); - }).then(() => { - this.establishedConnections[clientConnection.getAddress().toString()] = clientConnection; - this.onConnectionOpened(clientConnection); - connectionResolver.resolve(clientConnection); + this.addressTranslator.translate(address).then((addr) => { + if (addr == null) { + throw new RangeError('Address Translator could not translate address ' + addr.toString()); + } + + this.triggerConnect(addr, asOwner).then((socket: net.Socket) => { + const clientConnection = new ClientConnection(this.client, addr, socket); + + return this.initiateCommunication(clientConnection).then(() => { + return clientConnection.registerResponseCallback(processResponseCallback); + }).then(() => { + return this.authenticate(clientConnection, asOwner); + }).then(() => { + this.establishedConnections[clientConnection.getAddress().toString()] = clientConnection; + this.onConnectionOpened(clientConnection); + connectionResolver.resolve(clientConnection); + }); + }).catch((e: any) => { + connectionResolver.reject(e); + }).finally(() => { + delete this.pendingConnections[addressIndex]; }); - }).catch((e: any) => { - connectionResolver.reject(e); - }).finally(() => { - delete this.pendingConnections[addressIndex]; }); const connectionTimeout = this.client.getConfig().networkConfig.connectionTimeout; diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 544c670a2..9a619f960 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -25,6 +25,7 @@ import HazelcastClient from '../HazelcastClient'; import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; +import {createAddressFromString} from '../Util'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); @@ -82,20 +83,37 @@ export class ClusterService extends EventEmitter { * @returns */ connectToCluster(): Promise { - if (this.members.length > 0) { - this.knownAddresses = new Array
(); - this.members.forEach((member: Member) => { - this.knownAddresses.push(member.address); + return this.getPossibleMemberAddresses().then((res) => { + this.knownAddresses = []; + res.forEach((value) => { + this.knownAddresses.push(createAddressFromString(value)); }); - } else { - this.knownAddresses = this.client.getConfig().networkConfig.addresses; - } - if (this.knownAddresses.length === 0) { - this.knownAddresses.push(new Address('127.0.0.1', 5701)); - } - const attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; - const attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; - return this.tryConnectingToAddresses(0, attemptLimit, attemptPeriod); + + const attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; + const attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; + return this.tryConnectingToAddresses(0, attemptLimit, attemptPeriod); + }); + } + + getPossibleMemberAddresses(): Promise { + const addresses: Set = new Set(); + + this.getMembers().forEach(function (member) { + addresses.add(member.address.toString()); + }); + + let providerAddresses: Set = new Set(); + const promises: Array> = []; + this.client.getConnectionManager().addressProviders.forEach(function (addressProvider) { + promises.push(addressProvider.loadAddresses().then((res) => { + providerAddresses = new Set([...Array.from(providerAddresses), ...res]); + }).catch((err) => { + this.logger.warning('Error from AddressProvider: ' + addressProvider, err); + })); + }); + return Promise.all(promises).then(() => { + return Array.from(new Set([...Array.from(addresses), ...Array.from(providerAddresses)])); + }); } /** diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index e77daaa8e..3b2811da6 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -107,8 +107,8 @@ describe('ClusterService', function () { it('should throw with message containing wrong host addresses in config', function () { var cfg = new Config.ClientConfig(); cfg.networkConfig.addresses = [ - new Address('0.0.0.0', 5709), - new Address('0.0.0.1', 5710) + '0.0.0.0:5709', + '0.0.0.1:5710' ]; var falseStart = false; diff --git a/test/config/ConfigBuilderHazelcastCloudTest.js b/test/config/ConfigBuilderHazelcastCloudTest.js new file mode 100644 index 000000000..b26c469bb --- /dev/null +++ b/test/config/ConfigBuilderHazelcastCloudTest.js @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + + +var expect = require('chai').expect; +var ClientConfig = require('../../').Config.ClientConfig; +require('chai').use(require('chai-as-promised')); +var path = require('path'); +var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; + +describe('ConfigBuilderHazelcastCloud Test', function () { + var configFull; + + afterEach(function () { + delete process.env['HAZELCAST_CLIENT_CONFIG']; + }); + + function loadJson(jsonPath) { + var configBuilder = new ConfigBuilder(); + process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, jsonPath); + return configBuilder.loadConfig().then(function () { + configFull = configBuilder.build(); + }); + } + + it('cloudConfig', function () { + return loadJson('hazelcast-client-full.json').then(function () { + var networkConfig = configFull.networkConfig; + expect(networkConfig.cloudConfig.enabled).to.be.false; + expect(networkConfig.cloudConfig.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); + }); + }); + + it('cloudConfig_enabled_nullToken', function () { + return expect(loadJson('hazelcast-client-invalid-cloud-config.json')).to.be.rejectedWith(Error); + }); + + it('cloudConfig_defaults', function () { + var clientConfig = new ClientConfig(); + expect(clientConfig.networkConfig.cloudConfig.enabled).to.be.false; + expect(clientConfig.networkConfig.cloudConfig.discoveryToken).to.be.null; + + }); + + it('cloudConfig_enabled', function () { + return loadJson('hazelcast-client-cloud-config-enabled.json').then(function () { + var networkConfig = configFull.networkConfig; + expect(networkConfig.cloudConfig.enabled).to.be.true; + expect(networkConfig.cloudConfig.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); + }); + }); +}); diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 77d324bfa..9fd5b1672 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -19,6 +19,7 @@ var path = require('path'); var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; var Config = require('../../lib/index').Config; var Long = require('long'); +var createAddressFromString = require("../../lib/Util").createAddressFromString; describe('ConfigBuilder Test', function () { var configFull; @@ -37,10 +38,12 @@ describe('ConfigBuilder Test', function () { it('networkConfig', function () { var networkCfg = configFull.networkConfig; - expect(networkCfg.addresses[0].host).to.equal('127.0.0.9'); - expect(networkCfg.addresses[0].port).to.be.undefined; - expect(networkCfg.addresses[1].host).to.equal('127.0.0.2'); - expect(networkCfg.addresses[1].port).to.equal(5702); + var address0 = createAddressFromString(networkCfg.addresses[0]); + var address1 = createAddressFromString(networkCfg.addresses[1]); + expect(address0.host).to.equal('127.0.0.9'); + expect(address0.port).to.be.undefined; + expect(address1.host).to.equal('127.0.0.2'); + expect(address1.port).to.equal(5702); expect(networkCfg.smartRouting).to.be.false; expect(networkCfg.connectionTimeout).to.equal(6000); expect(networkCfg.connectionAttemptPeriod).to.equal(4000); diff --git a/test/config/hazelcast-client-cloud-config-enabled.json b/test/config/hazelcast-client-cloud-config-enabled.json new file mode 100644 index 000000000..a3e901235 --- /dev/null +++ b/test/config/hazelcast-client-cloud-config-enabled.json @@ -0,0 +1,8 @@ +{ + "network": { + "hazelcastCloud": { + "discoveryToken": "EXAMPLE_TOKEN", + "enabled": true + } + } +} diff --git a/test/config/hazelcast-client-full.json b/test/config/hazelcast-client-full.json index 781d49d43..960654e3d 100644 --- a/test/config/hazelcast-client-full.json +++ b/test/config/hazelcast-client-full.json @@ -29,6 +29,10 @@ "userDefinedProperty1": "userDefinedValue" } } + }, + "hazelcastCloud": { + "discoveryToken": "EXAMPLE_TOKEN", + "enabled": false } }, "listeners": [ diff --git a/test/config/hazelcast-client-invalid-cloud-config.json b/test/config/hazelcast-client-invalid-cloud-config.json new file mode 100644 index 000000000..e5806d162 --- /dev/null +++ b/test/config/hazelcast-client-invalid-cloud-config.json @@ -0,0 +1,8 @@ +{ + "network": { + "hazelcastCloud": { + "discoveryToken": null, + "enabled": true + } + } +} diff --git a/test/discovery/HazelcastCloudProviderTest.js b/test/discovery/HazelcastCloudProviderTest.js new file mode 100644 index 000000000..9cbd2f1a2 --- /dev/null +++ b/test/discovery/HazelcastCloudProviderTest.js @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + + +var IllegalStateError = require('../../').HazelcastErrors.IllegalStateError; + +var Address = require('../../lib/Address'); +var sinon = require('sinon'); +var expect = require('chai').expect; +var LoggingService = require('../../lib/logging/LoggingService').LoggingService; +var Promise = require('bluebird'); + +var HazelcastCloudAddressProvider = require('../../lib/discovery/HazelcastCloudAddressProvider').HazelcastCloudAddressProvider; +var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; + +describe('HazelcastCloudProvider Test', function () { + var expectedAddresses = new Map(); + var hazelcastCloudDiscovery; + var provider; + + before(function () { + expectedAddresses.set('10.0.0.1:5701', new Address('198.51.100.1', 5701)); + expectedAddresses.set('10.0.0.1:5702', new Address('198.51.100.1', 5702)); + expectedAddresses.set('10.0.0.2:5701', new Address('198.51.100.2', 5701)); + + var loggingService = LoggingService.getLoggingService(); + hazelcastCloudDiscovery = new HazelcastCloudDiscovery(); + sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(() => Promise.resolve(expectedAddresses)); + + provider = new HazelcastCloudAddressProvider(hazelcastCloudDiscovery, null, loggingService); + }); + + afterEach(function () { + HazelcastCloudDiscovery.prototype.discoverNodes.restore(); + }); + + + it('loadAddresses', function () { + return provider.loadAddresses().then((res) => { + return expect(res).to.have.length(3); + }); + }); + + it('loadAddresses_whenErrorIsThrown', function () { + sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(function () { + return Promise.reject(new IllegalStateError('Expected exception')); + }); + + return provider.loadAddresses().then((res) => { + return expect(res).to.have.length(0); + }); + }); + +}); diff --git a/test/discovery/HazelcastCloudTranslatorTest.js b/test/discovery/HazelcastCloudTranslatorTest.js new file mode 100644 index 000000000..f6b23e253 --- /dev/null +++ b/test/discovery/HazelcastCloudTranslatorTest.js @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; + +var Address = require('../../lib/Address'); +var sinon = require('sinon'); +var expect = require('chai').expect; +var LoggingService = require('../../lib/logging/LoggingService').LoggingService; +var Promise = require('bluebird'); +var IllegalStateError = require('../../lib/HazelcastError').IllegalStateError; + +var HazelcastCloudAddressTranslator = require('../../lib/discovery/HazelcastCloudAddressTranslator').HazelcastCloudAddressTranslator; + +describe('HazelcastCloudTranslator Test', function () { + + var lookup = new Map(); + var privateAddress; + var publicAddress; + var translator; + var hazelcastCloudDiscovery; + + before(function () { + privateAddress = '127.0.0.1:5701'; + publicAddress = new Address('192.168.0.1', 5701); + lookup.set(privateAddress, publicAddress); + lookup.set('127.0.0.2:5701', new Address('192.168.0.2', 5701)); + + var loggingService = LoggingService.getLoggingService(); + hazelcastCloudDiscovery = new HazelcastCloudDiscovery(); + + translator = new HazelcastCloudAddressTranslator(hazelcastCloudDiscovery, null, loggingService); + }); + + beforeEach(function () { + sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(() => Promise.resolve(lookup)); + }); + + afterEach(function () { + HazelcastCloudDiscovery.prototype.discoverNodes.restore(); + }); + + it('translate_whenAddressIsNull_thenReturnNull', function () { + return translator.translate(null).then((res) => { + expect(res).to.be.null; + }); + }); + + it('translate', function () { + return translator.translate(privateAddress).then((res) => { + expect(publicAddress.host).to.equal(res.host); + expect(publicAddress.port).to.equal(res.port); + }); + }); + + it('refresh_and_translate', function () { + return translator.refresh().then( + translator.translate(privateAddress).then((res) => { + expect(publicAddress.host).to.equal(res.host); + expect(publicAddress.port).to.equal(res.port); + })); + }); + + it('translate_whenNotFound_thenReturnNull', function () { + var notAvailableAddress = new Address('127.0.0.3', 5701); + return translator.translate(notAvailableAddress).then((res) => { + expect(res).to.be.null; + }); + }); + + it('refresh_whenException_thenLogWarning', function () { + HazelcastCloudDiscovery.prototype.discoverNodes.restore(); + sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(function () { + return Promise.reject(new IllegalStateError('Expected exception')); + }); + translator.refresh(); + }); + +}); From 4db466d98a4cb0bdbb5a767ad5934924ad3a0a87 Mon Sep 17 00:00:00 2001 From: saitTalhaNisanci Date: Wed, 18 Jul 2018 13:51:25 +0300 Subject: [PATCH 113/685] remove redundant methods from vector clock --- src/core/VectorClock.ts | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/core/VectorClock.ts b/src/core/VectorClock.ts index add352704..30b5de990 100644 --- a/src/core/VectorClock.ts +++ b/src/core/VectorClock.ts @@ -18,7 +18,7 @@ import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; import {DataInput, DataOutput} from '../serialization/Data'; import {IdentifiedDataSerializable} from '../serialization/Serializable'; -export class VectorClock implements IdentifiedDataSerializable { +export class VectorClock { private replicaTimestamps = new Map(); @@ -46,29 +46,4 @@ export class VectorClock implements IdentifiedDataSerializable { }); return entrySet; } - - readData(input: DataInput): any { - const stateSize = input.readInt(); - for (let i = 0; i < stateSize; i++) { - const replicaId = input.readUTF(); - const timestamp = input.readLong(); - this.replicaTimestamps.set(replicaId, timestamp); - } - } - - writeData(output: DataOutput): void { - output.writeInt(this.replicaTimestamps.size); - this.replicaTimestamps.forEach((timestamp: Long, replicaId: string) => { - output.writeUTF(replicaId); - output.writeLong(timestamp); - }); - } - - getFactoryId(): number { - return ClusterDataFactoryHelper.FACTORY_ID; - } - - getClassId(): number { - return ClusterDataFactoryHelper.VECTOR_CLOCK; - } } From 51b284dafb360b56a42a6d7dc236e75e9d51f919 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 18 Jul 2018 17:13:58 +0300 Subject: [PATCH 114/685] add ability to set custom url endpoint for internal testing of hazelcast.cloud (#315) --- src/HazelcastClient.ts | 10 ++-- src/config/Config.ts | 10 ++-- .../HazelcastCloudAddressProvider.ts | 4 +- .../HazelcastCloudAddressTranslator.ts | 4 +- src/discovery/HazelcastCloudDiscovery.ts | 30 ++++++++---- test/discovery/HazelcastCloudConfigTest.js | 47 +++++++++++++++++++ 6 files changed, 85 insertions(+), 20 deletions(-) create mode 100644 test/discovery/HazelcastCloudConfigTest.js diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index e86c41975..7ab1d7c71 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -52,6 +52,7 @@ import {HazelcastCloudAddressTranslator} from './discovery/HazelcastCloudAddress import {AddressTranslator} from './connection/AddressTranslator'; import {DefaultAddressTranslator} from './connection/DefaultAddressTranslator'; import {DefaultAddressProvider} from './connection/DefaultAddressProvider'; +import {HazelcastCloudDiscovery} from './discovery/HazelcastCloudDiscovery'; export default class HazelcastClient { @@ -351,7 +352,9 @@ export default class HazelcastClient { private createAddressTranslator(): AddressTranslator { const cloudConfig = this.getConfig().networkConfig.cloudConfig; if (cloudConfig.enabled) { - return new HazelcastCloudAddressTranslator(cloudConfig.discoveryToken, this.getConnectionTimeoutMillis(), + const urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(this.getConfig().properties, + cloudConfig.discoveryToken); + return new HazelcastCloudAddressTranslator(urlEndpoint, this.getConnectionTimeoutMillis(), this.loggingService); } return new DefaultAddressTranslator(); @@ -374,8 +377,9 @@ export default class HazelcastClient { private initCloudAddressProvider(): HazelcastCloudAddressProvider { const cloudConfig = this.getConfig().networkConfig.cloudConfig; if (cloudConfig.enabled) { - return new HazelcastCloudAddressProvider(cloudConfig.discoveryToken, this.getConnectionTimeoutMillis(), - this.loggingService); + const discoveryToken = cloudConfig.discoveryToken; + const urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(this.getConfig().properties, discoveryToken); + return new HazelcastCloudAddressProvider(urlEndpoint, this.getConnectionTimeoutMillis(), this.loggingService); } return null; } diff --git a/src/config/Config.ts b/src/config/Config.ts index ec865a918..b94ef76ec 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -33,19 +33,21 @@ import {SerializationConfig} from './SerializationConfig'; */ export class ClientConfig { - /** - * Name of this client instance. - */ - instanceName: string; properties: Properties = { 'hazelcast.client.heartbeat.interval': 5000, 'hazelcast.client.heartbeat.timeout': 60000, 'hazelcast.client.invocation.retry.pause.millis': 1000, 'hazelcast.client.invocation.timeout.millis': 120000, + 'hazelcast.client.cloud.url': 'https://coordinator.hazelcast.cloud', 'hazelcast.invalidation.reconciliation.interval.seconds': 60, 'hazelcast.invalidation.max.tolerated.miss.count': 10, 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30, }; + + /** + * Name of this client instance. + */ + instanceName: string; groupConfig: GroupConfig = new GroupConfig(); networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); customCredentials: any = null; diff --git a/src/discovery/HazelcastCloudAddressProvider.ts b/src/discovery/HazelcastCloudAddressProvider.ts index 216a68c89..9d35728d9 100644 --- a/src/discovery/HazelcastCloudAddressProvider.ts +++ b/src/discovery/HazelcastCloudAddressProvider.ts @@ -23,8 +23,8 @@ export class HazelcastCloudAddressProvider implements AddressProvider { private readonly loggingService: LoggingService; private readonly cloudDiscovery: HazelcastCloudDiscovery; - constructor(token: string, connectionTimeoutMillis: number, loggingService: LoggingService) { - this.cloudDiscovery = new HazelcastCloudDiscovery(token, connectionTimeoutMillis); + constructor(endpointUrl: string, connectionTimeoutMillis: number, loggingService: LoggingService) { + this.cloudDiscovery = new HazelcastCloudDiscovery(endpointUrl, connectionTimeoutMillis); this.loggingService = loggingService; } diff --git a/src/discovery/HazelcastCloudAddressTranslator.ts b/src/discovery/HazelcastCloudAddressTranslator.ts index 46013286d..43abcd116 100644 --- a/src/discovery/HazelcastCloudAddressTranslator.ts +++ b/src/discovery/HazelcastCloudAddressTranslator.ts @@ -26,8 +26,8 @@ export class HazelcastCloudAddressTranslator implements AddressTranslator { private privateToPublic: Map = new Map(); - constructor(token: string, connectionTimeoutMillis: number, loggingService: LoggingService) { - this.hazelcastCloudDiscovery = new HazelcastCloudDiscovery(token, connectionTimeoutMillis); + constructor(endpointUrl: string, connectionTimeoutMillis: number, loggingService: LoggingService) { + this.hazelcastCloudDiscovery = new HazelcastCloudDiscovery(endpointUrl, connectionTimeoutMillis); this.loggingService = loggingService; } diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index 0fe1d28d2..568978df5 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -3,25 +3,36 @@ import {createAddressFromString} from '../Util'; import {get} from 'https'; import {IncomingMessage} from 'http'; import * as Promise from 'bluebird'; +import {Properties} from '../config/Properties'; +import * as URL from 'url'; /** * Discovery service that discover nodes via hazelcast.cloud * https://coordinator.hazelcast.cloud/cluster/discovery?token= */ export class HazelcastCloudDiscovery { - private static readonly HOST = 'coordinator.hazelcast.cloud'; - private static readonly PATH = '/cluster/discovery?token='; + /** + * Internal client property to change base url of cloud discovery endpoint. + * Used for testing cloud discovery. + */ + private static readonly CLOUD_URL_BASE_PROPERTY = 'hazelcast.client.cloud.url'; + private static readonly CLOUD_URL_PATH = '/cluster/discovery?token='; private static readonly PRIVATE_ADDRESS_PROPERTY = 'private-address'; private static readonly PUBLIC_ADDRESS_PROPERTY = 'public-address'; private readonly endpointUrl: string; private readonly connectionTimeoutInMillis: number; - constructor(cloudToken: string, connectionTimeoutInMillis: number) { - this.endpointUrl = HazelcastCloudDiscovery.PATH + cloudToken; + constructor(endpointUrl: string, connectionTimeoutInMillis: number) { + this.endpointUrl = endpointUrl; this.connectionTimeoutInMillis = connectionTimeoutInMillis; } + public static createUrlEndpoint(properties: Properties, cloudToken: string): string { + const cloudBaseUrl = properties[HazelcastCloudDiscovery.CLOUD_URL_BASE_PROPERTY] as string; + return cloudBaseUrl + this.CLOUD_URL_PATH + cloudToken; + } + discoverNodes(): Promise> { return this.callService().catch((e) => { throw e; @@ -30,14 +41,15 @@ export class HazelcastCloudDiscovery { callService(): Promise> { const deferred = Promise.defer>(); - let dataAsAString: string = ''; - const options = { - host: HazelcastCloudDiscovery.HOST, - path: this.endpointUrl, + const url = URL.parse(this.endpointUrl); + const endpointUrlOptions = { + host: url.host, + path: url.path, }; - get(options, (res: IncomingMessage) => { + let dataAsAString: string = ''; + get(endpointUrlOptions, (res: IncomingMessage) => { res.setEncoding('utf8'); res.on('data', (chunk) => { dataAsAString += chunk; diff --git a/test/discovery/HazelcastCloudConfigTest.js b/test/discovery/HazelcastCloudConfigTest.js new file mode 100644 index 000000000..1ec7d4b8b --- /dev/null +++ b/test/discovery/HazelcastCloudConfigTest.js @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; + +var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; +var ClientConfig = require('../../').Config.ClientConfig; + +describe('Hazelcast ClientCloudConfig Test', function () { + + it('defaultCloudUrlEndpoint', function () { + var config = new ClientConfig(); + + var token = 'TOKEN'; + config.networkConfig.cloudConfig.discoveryToken = token; + + var urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(config.properties, token); + + expect(urlEndpoint).to.be.equal('https://coordinator.hazelcast.cloud/cluster/discovery?token=TOKEN'); + }); + + it('customCloudUrlEndpoint', function () { + var config = new ClientConfig(); + + var token = 'TOKEN'; + config.networkConfig.cloudConfig.discoveryToken = token; + config.properties['hazelcast.client.cloud.url'] = 'https://custom'; + + var urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(config.properties, token); + + expect(urlEndpoint).to.be.equal('https://custom/cluster/discovery?token=TOKEN'); + }); + +}); From 182ad389ce3ecad0285322f692e56cab155f3bf3 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Thu, 26 Jul 2018 13:05:16 +0300 Subject: [PATCH 115/685] add readme for code samples (#317) --- README.md | 6 ++- code_samples/README.md | 37 +++++++++++++++++++ ...ener.js => distributed_object_listener.js} | 0 ...akeidgenerator.js => flakeid_generator.js} | 0 code_samples/{pncounter.js => pn_counter.js} | 0 code_samples/ssl_authentication.js | 8 ++-- 6 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 code_samples/README.md rename code_samples/{distributedobject_listener.js => distributed_object_listener.js} (100%) rename code_samples/{flakeidgenerator.js => flakeid_generator.js} (100%) rename code_samples/{pncounter.js => pn_counter.js} (100%) diff --git a/README.md b/README.md index a6fb21369..57076e040 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ * [Features](#features) * [Installing the Client](#installing-the-client) * [Using the Client](#using-the-client) +* [Code Samples](#code-samples) * [Serialization Considerations](#serialization-considerations) * [Development](#development) * [Building And Installing from Sources](#building-and-installing-from-sources) @@ -101,6 +102,10 @@ You can configure Hazelcast Node.js Client declaratively (JSON) or programmatica See [CONFIG.md](CONFIG.md) for details. +# Code Samples + +See [Code Samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) + # Serialization Considerations @@ -140,7 +145,6 @@ readData(dataInput) { ``` - # Development ## Building And Installing from Sources diff --git a/code_samples/README.md b/code_samples/README.md new file mode 100644 index 000000000..ea68a7009 --- /dev/null +++ b/code_samples/README.md @@ -0,0 +1,37 @@ +# Code Samples + +This folder contains an extensive collection of Hazelcast Node.js Client code samples, which helps you to learn how to use Hazelcast features. The following lists the samples with their brief descriptions. + +**org-website/** — Folder including the samples to display on https://hazelcast.org. + +**aggregation.js** — Built-in aggregation samples. + +**custom_serializer.js** — Creating and adding custom serializer to serialization configuration. + +**distibuted_object_listener.js** — Listening to distributed object events. + +**flakeid_generator.js** — Usage of distributed Flake ID Generator. + +**global_serializer.js** — Creating and adding global serializer to serialization configuration. + +**lifecycle_listener.js** — Listening to lifecycle events of the Hazelcast instance. + +**list.js** — Usage of distributed list. + +**logging.js** — Defining log levels. + +**map.js** — Usage of distributed map. + +**map_entry_listener.js** — Listening to map events. + +**near_cache.js** — Usage of distributed map with a near cache. + +**paging_predicate.js** — Getting a page-by-page result of query. + +**pn_counter.js** — Usage of distributed PN Counter. + +**queue.js** — Usage of distributed queue. + +**set.js** — Usage of distributed set. + +**ssl_authentication.js** — Mutual authentication to cluster via SSL. diff --git a/code_samples/distributedobject_listener.js b/code_samples/distributed_object_listener.js similarity index 100% rename from code_samples/distributedobject_listener.js rename to code_samples/distributed_object_listener.js diff --git a/code_samples/flakeidgenerator.js b/code_samples/flakeid_generator.js similarity index 100% rename from code_samples/flakeidgenerator.js rename to code_samples/flakeid_generator.js diff --git a/code_samples/pncounter.js b/code_samples/pn_counter.js similarity index 100% rename from code_samples/pncounter.js rename to code_samples/pn_counter.js diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js index 760e2138f..09acad738 100644 --- a/code_samples/ssl_authentication.js +++ b/code_samples/ssl_authentication.js @@ -19,15 +19,17 @@ var HazelcastClient = require('hazelcast-client').Client; if (process.argv.length < 5) { console.log('Usage: \n' + - 'node ssl_authentication.js [servername] [certificate-file] [trusted-ca]'); + 'node ssl_authentication.js [servername] [trusted-ca] [private-key] [certificate-file] '); return } var cfg = new Config.ClientConfig(); cfg.networkConfig.sslOptions = { servername: process.argv[2], - cert: process.argv[3], - ca: process.argv[4] + ca: process.argv[3], + key: process.argv[4], + cert: process.argv[5], + }; HazelcastClient.newHazelcastClient(cfg).then(function (client) { From 553804e31aaa6c8352a00a8abf0fa94a93bd5fad Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Fri, 27 Jul 2018 17:45:34 +0300 Subject: [PATCH 116/685] don't run ssl test under server v3.8.1 (#321) --- test/ssl/ClientSSLAuthenticationTest.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index f408117b3..dd0b99da8 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -23,9 +23,9 @@ var Client = require("../../.").Client; var Controller = require('./../RC'); var Config = require('../..').Config; var HzErrors = require('../..').HazelcastErrors; -var Promise = require('bluebird'); var markEnterprise = require('../Util').markEnterprise; var Path = require('path'); +var Util = require('../Util'); describe('SSL Client Authentication Test', function () { var cluster; @@ -89,6 +89,10 @@ describe('SSL Client Authentication Test', function () { describe(title, function () { + before(function () { + Util.markServerVersionAtLeast(this, null, '3.8.1'); + }); + afterEach(function () { return Controller.terminateCluster(cluster.id); }); From b0b372424e4a66e52479a34ee219cba3c6edd8a0 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Tue, 31 Jul 2018 15:13:13 +0300 Subject: [PATCH 117/685] update readme and add cloud discovery sample (#320) --- CONFIG.md | 48 ++++++++++++++----- README.md | 1 + code_samples/README.md | 2 + code_samples/hazelcast_cloud_discovery.js | 57 +++++++++++++++++++++++ 4 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 code_samples/hazelcast_cloud_discovery.js diff --git a/CONFIG.md b/CONFIG.md index 928fe6d43..c01b8c684 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -20,7 +20,7 @@ Refer to [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcas # Declarative Configuration (JSON) For declarative configuration, the Hazelcast client looks at the following places for the client configuration file. -1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, +1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, the client looks for the configuration file in the specified location. 2. Current working directory: If there is no environment variable set, the client tries to load `hazelcast-client.json` from the current working directory. @@ -147,7 +147,7 @@ Default value is 5000 milliseconds. ### Setting Connection Attempt Limit While the client is trying to connect initially to one of the members in the address list, that member -might not be available at that moment. Instead of giving up, throwing an error and stopping the client, +might not be available at that moment. Instead of giving up, throwing an error and stopping the client, the client will retry as many as connection attempt limit times. This is also the case when the previously established connection between the client and that member goes down. @@ -178,10 +178,10 @@ Default value is 3000. ### Enabling Client TLS/SSL You can use TLS/SSL to secure the connection between the client and members. If you want TLS/SSL enabled -for the client-cluster connection, you should set an SSL configuration. Once set, the connection (socket) is +for the client-cluster connection, you should set an SSL configuration. Once set, the connection (socket) is established out of an `options` object supplied by the user. -Hazelcast Node.js Client uses a user supplied SSL `options` object to pass to +Hazelcast Node.js Client uses a user supplied SSL `options` object to pass to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). There are two ways to provide this object to the client: @@ -245,7 +245,7 @@ An example configuration: "exportedName": "SSLFactory", "properties": { "caPath": "ca.pem", - "keyPath": "key.pem", + "keyPath": "key.pem", "certPath": "cert.pem", "keepOrder": true } @@ -262,14 +262,14 @@ And your own factory, `My_Factory.js`: ```javascript function SSLFactory() { } - + SSLFactory.prototype.init = function(props) { this.caPath = props.caPath; this.keyPath = props.keyPath; this.certPath = props.certPath; this.keepOrder = props.userDefinedProperty1; }; - + SSLFactory.prototype.getSSLOptions = function() { var sslOpts = { servername: 'foo.bar.com', @@ -291,6 +291,30 @@ the properties section in the JSON configuration file. Lastly, the client calls For information about the path resolution, please refer to the [Path Resolution](#path-resolution-and-object-loading) section. +### Enabling Hazelcast Cloud Discovery +The purpose of Hazelcast Cloud Discovery is to provide clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to "true". + +Hazelcast Cloud configuration is as follows: + +```json +{ + "group": { + "name": "hazel", + "password": "cast" + }, + + "network": { + "hazelcastCloud": { + "discoveryToken": "EXAMPLE_TOKEN", + "enabled": true + } + } +} + +``` + +To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. + ## Serialization Configuration This section shows how to configure Hazelcast serialization declaratively. Please refer to [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#serialization) @@ -341,7 +365,7 @@ Serialization configuration is as follows: One important aspect of Node.js Client's serialization is `defaultNumberType`. Hazelcast servers use 4 different primitive numeric types; `int`, `long`, `float` and `double`. However, Javascript has only one numeric type which is `number`. Number is a floating point type. If you do not work with heterogenous clients (multiple languages), -you do not need to worry about this setting. However, if your numeric data is accessed by the clients in different +you do not need to worry about this setting. However, if your numeric data is accessed by the clients in different languages, you need to map `number` type to one of the numeric types recognized by the Java servers. Hazelcast handles type conversions automatically. Accepted values for `defaultNumberType` are `integer`, `float` and `double`. You may use `long` module for working with longs. [long module](https://www.npmjs.com/package/long) is included @@ -389,7 +413,7 @@ You may configure flake id generators as the following: ``` For meanings of configuration options refer to FlakeIdGenerator's API documantation [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) -> Note: Since Javascript cannot represent numbers greater than 2^53, you need to put long numbers in quotes as a string. +> Note: Since Javascript cannot represent numbers greater than 2^53, you need to put long numbers in quotes as a string. ## Composing Declarative Configuration @@ -435,12 +459,12 @@ shown below. } ``` -> Note: Use `import` element on top level of JSON hierarchy. +> Note: Use `import` element on top level of JSON hierarchy. ## Path Resolution and Object Loading -For configuration elements that require you to specify a code piece, you will need to specify the path to the +For configuration elements that require you to specify a code piece, you will need to specify the path to the code and name of the exported element that you want the client to use. This configuration is set as follows: ```json @@ -464,7 +488,7 @@ Let's say your project's directory structure is as follows: my_app/hazelcast-client.json my_app/node_modules/ my_app/node_modules/hazelcast-client - + In `factory_utils.js`, you have multiple exported functions. ```javascript diff --git a/README.md b/README.md index 57076e040..82ca1f7ec 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ Hazelcast Node.js client supports the following data structures and features: * Hazelcast Native Serialization * Lifecycle Service * SSL connection support (requires enterprise server) +* Hazelcast Cloud Discovery # Installing the Client diff --git a/code_samples/README.md b/code_samples/README.md index ea68a7009..b36dc738e 100644 --- a/code_samples/README.md +++ b/code_samples/README.md @@ -14,6 +14,8 @@ This folder contains an extensive collection of Hazelcast Node.js Client code sa **global_serializer.js** — Creating and adding global serializer to serialization configuration. +**hazelcast-cloud-discovery.js** — Usage of cloud discovery. + **lifecycle_listener.js** — Listening to lifecycle events of the Hazelcast instance. **list.js** — Usage of distributed list. diff --git a/code_samples/hazelcast_cloud_discovery.js b/code_samples/hazelcast_cloud_discovery.js new file mode 100644 index 000000000..d61ddc21e --- /dev/null +++ b/code_samples/hazelcast_cloud_discovery.js @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Client = require('hazelcast-client').Client; +var ClientConfig = require('hazelcast-client').Config.ClientConfig; +var fs = require('fs'); +var Path = require('path'); + + +function createClientConfigWithSSLOpts(key, cert, ca) { + var sslOpts = { + servername: 'Hazelcast-Inc', + rejectUnauthorized: true, + ca: fs.readFileSync(Path.join(__dirname, ca)), + key: fs.readFileSync(Path.join(__dirname, key)), + cert: fs.readFileSync(Path.join(__dirname, cert)) + }; + var cfg = new ClientConfig(); + cfg.networkConfig.sslOptions = sslOpts; + cfg.networkConfig.connectionAttemptLimit = 1000; + + var token = 'EXAMPLE_TOKEN'; + + cfg.networkConfig.cloudConfig.enabled = true; + cfg.networkConfig.cloudConfig.discoveryToken = token; + cfg.groupConfig.name = 'hazel'; + cfg.groupConfig.password = 'cast'; + return cfg; +} + +var cfg = createClientConfigWithSSLOpts('./key.pem', './cert.pem', './ca.pem'); + +Client.newHazelcastClient(cfg).then(function (hazelcastClient) { + var mp = hazelcastClient.getMap("testMap"); + + mp.put('key', 'value').then(function () { + return mp.get('key'); + }).then((res) => { + console.log(res); + }); +}); + + + From 3c756bf3e696f34f0597345d42823cf37533539a Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 1 Aug 2018 10:34:49 +0000 Subject: [PATCH 118/685] 0.9.0 --- package.json | 116 +++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index 7db0d4dec..72ea7a8d1 100644 --- a/package.json +++ b/package.json @@ -1,60 +1,60 @@ { - "name": "hazelcast-client", - "version": "0.8.0", - "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", - "main": "lib/index.js", - "dependencies": { - "bluebird": "3.5.0", - "long": "3.2.0" - }, - "devDependencies": { - "@types/bluebird": "3.5.12", - "@types/long": "3.0.32", - "@types/node": "6.0.87", - "chai": "4.1.2", - "chai-as-promised": "7.1.1", - "hazelcast-remote-controller": "^1.0.0", - "istanbul": "0.4.5", - "jsonschema": "1.2.4", - "mocha": "3.5.3", - "mousse": "0.3.1", - "remap-istanbul": "0.9.6", - "rimraf": "2.6.2", - "sinon": "4.0.0", - "tslint": "5.7.0", - "typescript": "2.5.2", - "winston": "2.3.1" - }, - "scripts": { - "clean": "rimraf lib typings *.jar *.log", - "precompile": "node create-build-info.js", - "compile": "tsc", - "pretest": "node download-remote-controller.js", - "test": "mocha --recursive", - "precoverage": "node download-remote-controller.js", - "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", - "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", - "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", - "pregenerate-docs": "rimraf docs", - "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", - "lint": "tslint --project tsconfig.json -t stylish" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/hazelcast/hazelcast-nodejs-client.git" - }, - "keywords": [ - "hazelcast", - "nodejs", - "node", - "client", - "data", - "grid" - ], - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues" - }, - "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme", - "typings": "./lib/index" + "name": "hazelcast-client", + "version": "0.9.0", + "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", + "main": "lib/index.js", + "dependencies": { + "bluebird": "3.5.0", + "long": "3.2.0" + }, + "devDependencies": { + "@types/bluebird": "3.5.12", + "@types/long": "3.0.32", + "@types/node": "6.0.87", + "chai": "4.1.2", + "chai-as-promised": "7.1.1", + "hazelcast-remote-controller": "^1.0.0", + "istanbul": "0.4.5", + "jsonschema": "1.2.4", + "mocha": "3.5.3", + "mousse": "0.3.1", + "remap-istanbul": "0.9.6", + "rimraf": "2.6.2", + "sinon": "4.0.0", + "tslint": "5.7.0", + "typescript": "2.5.2", + "winston": "2.3.1" + }, + "scripts": { + "clean": "rimraf lib typings *.jar *.log", + "precompile": "node create-build-info.js", + "compile": "tsc", + "pretest": "node download-remote-controller.js", + "test": "mocha --recursive", + "precoverage": "node download-remote-controller.js", + "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", + "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", + "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", + "pregenerate-docs": "rimraf docs", + "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", + "lint": "tslint --project tsconfig.json -t stylish" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/hazelcast/hazelcast-nodejs-client.git" + }, + "keywords": [ + "hazelcast", + "nodejs", + "node", + "client", + "data", + "grid" + ], + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues" + }, + "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme", + "typings": "./lib/index" } From 72f42f98b6e285140216381082e1b6d63a141aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roxane=20Mac=C3=A9?= <9531852+roxanemace@users.noreply.github.com> Date: Mon, 6 Aug 2018 16:19:30 +0200 Subject: [PATCH 119/685] Fix typing of `hazelcast.logging` property in HazelcastClient (#324) --- src/HazelcastClient.ts | 4 ++-- src/config/Properties.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 7ab1d7c71..ada0dfba3 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -27,7 +27,7 @@ import {InvocationService} from './invocation/InvocationService'; import {LifecycleEvent, LifecycleService} from './LifecycleService'; import {ListenerService} from './ListenerService'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; -import {LoggingService} from './logging/LoggingService'; +import {LoggingService, ILogger} from './logging/LoggingService'; import {RepairingTask} from './nearcache/RepairingTask'; import {PartitionService} from './PartitionService'; import {ClientErrorFactory} from './protocol/ErrorFactory'; @@ -76,7 +76,7 @@ export default class HazelcastClient { this.config = config; } - LoggingService.initialize(this.config.properties['hazelcast.logging'] as string); + LoggingService.initialize(this.config.properties['hazelcast.logging'] as string | ILogger); this.loggingService = LoggingService.getLoggingService(); this.invocationService = new InvocationService(this); this.listenerService = new ListenerService(this); diff --git a/src/config/Properties.ts b/src/config/Properties.ts index 0ab8e4ac6..f23e93441 100644 --- a/src/config/Properties.ts +++ b/src/config/Properties.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +import {ILogger} from '../logging/LoggingService'; + export interface Properties { - [prop: string]: string | number | boolean; + [prop: string]: string | number | boolean | ILogger; } From 6742c6f24ffe715c04d73eaa69b533fa8b3a8e2d Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 8 Aug 2018 17:35:19 +0300 Subject: [PATCH 120/685] fix on HazelcastClientTest (#326) --- test/HazelcastClientTest.js | 40 +++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 9c241673c..65eeb9b5e 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -42,19 +42,24 @@ ManagedObjects.prototype.getObject = function (func, name) { }; ManagedObjects.prototype.destroyAll = function () { + var promises = []; this.managedObjects.forEach(function (obj) { - obj.destroy(); + promises.push(obj.destroy()); }); + + return Promise.all(promises); }; ManagedObjects.prototype.destroy = function (name) { + var deferred = Promise.defer(); this.managedObjects.filter((el) => { - if (el.getName() == name) { - el.destroy(); - return false; + if (el.getName() === name) { + el.destroy().then(function () { + deferred.resolve(); + }); } - return true; }); + return deferred.promise; }; @@ -130,18 +135,19 @@ configParams.forEach(function (cfg) { managed.getObject(client.getMap.bind(client, 'map3')); setTimeout(function () { - managed.destroy('map1'); - client.getDistributedObjects().then(function (distObjects) { - try { - names = distObjects.map(function (o) { - return o.getName(); - }); - expect(names).to.have.members(['map2', 'map3']); - done(); - } catch (e) { - done(e); - } - }) + managed.destroy('map1').then(function () { + client.getDistributedObjects().then(function (distObjects) { + try { + var names = distObjects.map(function (o) { + return o.getName(); + }); + expect(names).to.have.members(['map2', 'map3']); + done(); + } catch (e) { + done(e); + } + }); + }); }, 300); }); }); From 5d0796d8109d06d4e2656cad81a82b1b76dfb8cf Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Thu, 9 Aug 2018 18:57:28 +0300 Subject: [PATCH 121/685] update windows batch script (#328) --- scripts/download-rc.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index c310e9e45..4a3bff263 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,9 +1,9 @@ -set HZ_VERSION="3.10-BETA-1" -set HZ_TEST_VERSION="3.10-SNAPSHOT" +set HZ_VERSION="3.10" +set HZ_TEST_VERSION="3.10" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% -set HAZELCAST_RC_VERSION="0.3-SNAPSHOT" +set HAZELCAST_RC_VERSION="0.4-SNAPSHOT" set SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" set RELEASE_REPO="http://repo1.maven.apache.org/maven2" set ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" From 30a64d6b82aa5c16e9a78e9e45f7e3c9c2d6e32f Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Thu, 9 Aug 2018 18:58:09 +0300 Subject: [PATCH 122/685] fix on ListenersOnReconnectTest (#329) --- test/ListenersOnReconnectTest.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index fd2423295..064250cf0 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -27,6 +27,7 @@ describe('Listeners on reconnect', function () { var client; var members = []; var cluster; + var map; beforeEach(function () { return Controller.createCluster(null, null).then(function (cl) { @@ -35,7 +36,7 @@ describe('Listeners on reconnect', function () { }); afterEach(function () { - this.timeout(30000); + map.destroy(); client.shutdown(); return Controller.shutdownCluster(cluster.id); }); @@ -43,7 +44,6 @@ describe('Listeners on reconnect', function () { [true, false].forEach(function (isSmart) { function closeTwoMembersOfThreeAndTestListener(done, membersToClose, turnoffMember) { - var map; Controller.startMember(cluster.id).then(function (m) { members[0] = m; return Controller.startMember(cluster.id); @@ -116,8 +116,6 @@ describe('Listeners on reconnect', function () { }); it('restart member, listener still receives map.put event [smart=' + isSmart + ']', function (done) { - this.timeout(7000); - var map; var member; Controller.startMember(cluster.id).then(function (m) { member = m; From c424eacfb3ee100efda27f413479b2bdcda64a67 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 13 Aug 2018 16:54:16 +0300 Subject: [PATCH 123/685] add typedef rule to tslint (#330) --- src/BitsUtil.ts | 8 ++-- src/ClientMessage.ts | 40 +++++++++---------- src/HazelcastClient.ts | 4 +- src/HeartbeatService.ts | 12 +++--- src/ListenerService.ts | 13 +++--- src/PartitionService.ts | 2 +- src/Util.ts | 16 ++++---- src/aggregation/Aggregator.ts | 2 +- src/config/ConfigBuilder.ts | 4 +- src/config/ListenerConfig.ts | 4 +- src/core/Member.ts | 2 +- src/core/Predicate.ts | 38 +++++++++--------- src/core/UUID.ts | 2 +- src/invocation/ClientConnection.ts | 4 +- src/invocation/ClientConnectionManager.ts | 6 +-- src/invocation/ClusterService.ts | 24 +++++------ src/invocation/InvocationService.ts | 2 +- src/invocation/RegistrationKey.ts | 2 +- src/logging/DefaultLogger.ts | 2 +- src/logging/LoggingService.ts | 14 +++---- src/logging/NoLogger.ts | 2 +- src/nearcache/DataRecord.ts | 8 ++-- src/nearcache/MetadataContainer.ts | 2 +- src/nearcache/NearCache.ts | 2 +- src/nearcache/RepairingHandler.ts | 2 +- src/proxy/BaseProxy.ts | 2 +- src/proxy/LockProxy.ts | 2 +- src/proxy/MapProxy.ts | 37 ++++++++--------- src/proxy/MultiMapProxy.ts | 2 +- src/proxy/NearCachedMapProxy.ts | 16 ++++---- src/proxy/ProxyManager.ts | 6 +-- src/proxy/QueueProxy.ts | 12 +++--- src/proxy/ReplicatedMapProxy.ts | 6 +-- src/proxy/topic/ReliableTopicProxy.ts | 4 +- src/serialization/DefaultPredicates.ts | 14 +++---- src/serialization/ObjectData.ts | 4 +- src/serialization/SerializationService.ts | 14 +++---- src/serialization/SerializationUtil.ts | 2 +- src/serialization/portable/ClassDefinition.ts | 2 +- .../portable/ClassDefinitionContext.ts | 2 +- .../portable/DefaultPortableReader.ts | 2 +- .../portable/MorphingPortableReader.ts | 4 +- tslint.json | 7 +++- 43 files changed, 180 insertions(+), 175 deletions(-) diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index 57b45ad4e..b5fffa97a 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -70,7 +70,7 @@ export class BitsUtil { static HEADER_SIZE: number = BitsUtil.DATA_OFFSET_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; - static calculateSizeData(data: Data) { + static calculateSizeData(data: Data): number { return BitsUtil.INT_SIZE_IN_BYTES + data.totalSize(); } @@ -87,17 +87,17 @@ export class BitsUtil { return size; } - public static calculateSizeString(value: string) { + public static calculateSizeString(value: string): number { return this.getStringSize(value); } - public static calculateSizeBuffer(value: Buffer) { + public static calculateSizeBuffer(value: Buffer): number { let size = 4; size += value.length; return size; } - public static calculateSizeAddress(value: Address) { + public static calculateSizeAddress(value: Address): number { let size = 4; size += this.calculateSizeString(value.host); return size; diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 98e28a47c..41549481a 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -73,7 +73,7 @@ class ClientMessage { return this.readLongInternal(offset); } - setCorrelationId(value: Long) { + setCorrelationId(value: Long): void { this.writeLongInternal(value, BitsUtil.CORRELATION_ID_FIELD_OFFSET); } @@ -81,11 +81,11 @@ class ClientMessage { return this.buffer.readInt32LE(BitsUtil.PARTITION_ID_FIELD_OFFSET); } - setPartitionId(value: number) { + setPartitionId(value: number): void { this.buffer.writeInt32LE(value, BitsUtil.PARTITION_ID_FIELD_OFFSET); } - setVersion(value: number) { + setVersion(value: number): void { this.buffer.writeUInt8(value, BitsUtil.VERSION_FIELD_OFFSET); } @@ -93,7 +93,7 @@ class ClientMessage { return this.buffer.readUInt16LE(BitsUtil.TYPE_FIELD_OFFSET); } - setMessageType(value: number) { + setMessageType(value: number): void { this.buffer.writeUInt16LE(value, BitsUtil.TYPE_FIELD_OFFSET); } @@ -101,7 +101,7 @@ class ClientMessage { return this.buffer.readUInt8(BitsUtil.FLAGS_FIELD_OFFSET); } - setFlags(value: number) { + setFlags(value: number): void { this.buffer.writeUInt8(value, BitsUtil.FLAGS_FIELD_OFFSET); } @@ -113,7 +113,7 @@ class ClientMessage { return this.buffer.readInt32LE(BitsUtil.FRAME_LENGTH_FIELD_OFFSET); } - setFrameLength(value: number) { + setFrameLength(value: number): void { this.buffer.writeInt32LE(value, BitsUtil.FRAME_LENGTH_FIELD_OFFSET); } @@ -121,39 +121,39 @@ class ClientMessage { return this.buffer.readInt16LE(BitsUtil.DATA_OFFSET_FIELD_OFFSET); } - setDataOffset(value: number) { + setDataOffset(value: number): void { this.buffer.writeInt16LE(value, BitsUtil.DATA_OFFSET_FIELD_OFFSET); } - setRetryable(value: boolean) { + setRetryable(value: boolean): void { this.isRetryable = value; } - appendByte(value: number) { + appendByte(value: number): void { this.buffer.writeUInt8(value, this.cursor); this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; } - appendBoolean(value: boolean) { + appendBoolean(value: boolean): void { return this.appendByte(value ? 1 : 0); } - appendInt32(value: number) { + appendInt32(value: number): void { this.buffer.writeInt32LE(value, this.cursor); this.cursor += BitsUtil.INT_SIZE_IN_BYTES; } - appendUint8(value: number) { + appendUint8(value: number): void { this.buffer.writeUInt8(value, this.cursor); this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; } - appendLong(value: any) { + appendLong(value: any): void { this.writeLongInternal(value, this.cursor); this.cursor += BitsUtil.LONG_SIZE_IN_BYTES; } - appendString(value: string) { + appendString(value: string): void { const length = value.length; this.buffer.writeInt32LE(length, this.cursor); this.cursor += 4; @@ -161,22 +161,22 @@ class ClientMessage { this.cursor += length; } - appendBuffer(buffer: Buffer) { + appendBuffer(buffer: Buffer): void { const length = buffer.length; this.appendInt32(length); buffer.copy(this.buffer, this.cursor); this.cursor += length; } - appendData(data: Data) { + appendData(data: Data): void { this.appendBuffer(data.toBuffer()); } - addFlag(value: number) { + addFlag(value: number): void { this.buffer.writeUInt8(value | this.getFlags(), BitsUtil.FLAGS_FIELD_OFFSET); } - updateFrameLength() { + updateFrameLength(): void { this.setFrameLength(this.cursor); } @@ -238,7 +238,7 @@ class ClientMessage { // TODO } - private writeLongInternal(value: any, offset: number) { + private writeLongInternal(value: any, offset: number): void { if (!Long.isLong(value)) { value = Long.fromValue(value); } @@ -247,7 +247,7 @@ class ClientMessage { this.buffer.writeInt32LE(value.high, offset + 4); } - private readLongInternal(offset: number) { + private readLongInternal(offset: number): Long { const low = this.buffer.readInt32LE(offset); const high = this.buffer.readInt32LE(offset + 4); return new Long(low, high); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index ada0dfba3..416c79f99 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -27,7 +27,7 @@ import {InvocationService} from './invocation/InvocationService'; import {LifecycleEvent, LifecycleService} from './LifecycleService'; import {ListenerService} from './ListenerService'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; -import {LoggingService, ILogger} from './logging/LoggingService'; +import {ILogger, LoggingService} from './logging/LoggingService'; import {RepairingTask} from './nearcache/RepairingTask'; import {PartitionService} from './PartitionService'; import {ClientErrorFactory} from './protocol/ErrorFactory'; @@ -127,7 +127,7 @@ export default class HazelcastClient { const clientMessage = ClientGetDistributedObjectsCodec.encodeRequest(); const toObjectFunc = this.serializationService.toObject.bind(this); const proxyManager = this.proxyManager; - return this.invocationService.invokeOnRandomTarget(clientMessage).then(function (resp) { + return this.invocationService.invokeOnRandomTarget(clientMessage).then(function (resp): any { const response = ClientGetDistributedObjectsCodec.decodeResponse(resp, toObjectFunc).response; return response.map((objectInfo: { [key: string]: any }) => { return proxyManager.getOrCreateProxy(objectInfo.value, objectInfo.key, false); diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts index 326fdb517..a77db8f6b 100644 --- a/src/HeartbeatService.ts +++ b/src/HeartbeatService.ts @@ -46,14 +46,14 @@ export class Heartbeat { /** * Starts sending periodic heartbeat operations. */ - start() { + start(): void { this.timer = setTimeout(this.heartbeatFunction.bind(this), this.heartbeatInterval); } /** * Cancels scheduled heartbeat operations. */ - cancel() { + cancel(): void { clearTimeout(this.timer); } @@ -61,11 +61,11 @@ export class Heartbeat { * Registers a heartbeat listener. Listener is invoked when a heartbeat related event occurs. * @param heartbeatListener */ - addListener(heartbeatListener: ConnectionHeartbeatListener) { + addListener(heartbeatListener: ConnectionHeartbeatListener): void { this.listeners.push(heartbeatListener); } - private heartbeatFunction() { + private heartbeatFunction(): void { const estConnections = this.client.getConnectionManager().establishedConnections; for (const address in estConnections) { if (estConnections[address]) { @@ -97,7 +97,7 @@ export class Heartbeat { this.timer = setTimeout(this.heartbeatFunction.bind(this), this.heartbeatInterval); } - private onHeartbeatStopped(connection: ClientConnection) { + private onHeartbeatStopped(connection: ClientConnection): void { this.logger.warn('HeartbeatService', 'Heartbeat stopped on ' + connection.toString()); this.listeners.forEach((listener) => { if (listener.hasOwnProperty('onHeartbeatStopped')) { @@ -106,7 +106,7 @@ export class Heartbeat { }); } - private onHeartbeatRestored(connection: ClientConnection) { + private onHeartbeatRestored(connection: ClientConnection): void { this.logger.warn('HeartbeatService', 'Heartbeat restored on ' + connection.toString()); this.listeners.forEach((listener) => { if (listener.hasOwnProperty('onHeartbeatRestored')) { diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 5ac0ca9de..2b780a971 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -55,7 +55,7 @@ export class ListenerService implements ConnectionHeartbeatListener { this.connectionRefreshTaskInterval = 2000; } - start() { + start(): void { this.client.getConnectionManager().on('connectionOpened', this.onConnectionAdded.bind(this)); this.client.getConnectionManager().on('connectionClosed', this.onConnectionRemoved.bind(this)); if (this.isSmart()) { @@ -63,12 +63,11 @@ export class ListenerService implements ConnectionHeartbeatListener { } } - onConnectionAdded(connection: ClientConnection) { + onConnectionAdded(connection: ClientConnection): void { this.reregisterListenersOnConnection(connection); - } - onConnectionRemoved(connection: ClientConnection) { + onConnectionRemoved(connection: ClientConnection): void { this.removeRegistrationsOnConnection(connection); } @@ -79,14 +78,14 @@ export class ListenerService implements ConnectionHeartbeatListener { }); } - reregisterListeners() { + reregisterListeners(): void { const connections = this.client.getConnectionManager().getActiveConnections(); for (const connAddress in connections) { this.reregisterListenersOnConnection(connections[connAddress]); } } - reregisterListenersOnConnection(connection: ClientConnection) { + reregisterListenersOnConnection(connection: ClientConnection): void { this.activeRegistrations.forEach((registrationMap: Map, userKey: string) => { if (registrationMap.has(connection)) { return; @@ -99,7 +98,7 @@ export class ListenerService implements ConnectionHeartbeatListener { }, this); } - removeRegistrationsOnConnection(connection: ClientConnection) { + removeRegistrationsOnConnection(connection: ClientConnection): void { this.failedRegistrations.delete(connection); this.activeRegistrations.forEach((registrationsOnUserKey: Map, userKey: string) => { diff --git a/src/PartitionService.ts b/src/PartitionService.ts index c551f2fe0..ad960920e 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -89,7 +89,7 @@ export class PartitionService { * @param key * @returns the partition id. */ - getPartitionId(key: any) { + getPartitionId(key: any): number { let partitionHash: number; if (typeof key === 'object' && 'getPartitionHash' in key) { partitionHash = key.getPartitionHash(); diff --git a/src/Util.ts b/src/Util.ts index 4128a4c83..b7b5249d8 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -23,11 +23,11 @@ import {IterationType} from './core/Predicate'; import {PagingPredicate} from './serialization/DefaultPredicates'; import Address = require('./Address'); -export function assertNotNull(v: any) { +export function assertNotNull(v: any): void { assert.notEqual(v, null, 'Non null value expected.'); } -export function assertArray(x: any) { +export function assertArray(x: any): void { assert(Array.isArray(x), 'Should be array.'); } @@ -42,7 +42,7 @@ export function shuffleArray(array: T[]): void { } } -export function assertNotNegative(v: number, message: string = 'The value cannot be negative.') { +export function assertNotNegative(v: number, message: string = 'The value cannot be negative.'): void { assert(v >= 0, message); } @@ -64,7 +64,7 @@ export function enumFromString(enumType: any, value: string): T { return enumType[value]; } -export function getSortedQueryResultSet(list: any[], predicate: PagingPredicate) { +export function getSortedQueryResultSet(list: any[], predicate: PagingPredicate): any[] { if (list.length === 0) { return list; } @@ -89,7 +89,7 @@ export function getSortedQueryResultSet(list: any[], predicate: PagingPredicate) setAnchor(list, predicate, nearestPage); const iterationType = predicate.getIterationType(); - return list.slice(begin, end).map(function (item) { + return list.slice(begin, end).map(function (item): any { switch (iterationType) { case IterationType.ENTRY: return item; @@ -149,7 +149,7 @@ export function tryGetString(val: any): string { } } -export function getStringOrUndefined(val: any) { +export function getStringOrUndefined(val: any): string { try { return tryGetString(val); } catch (e) { @@ -157,7 +157,7 @@ export function getStringOrUndefined(val: any) { } } -export function getBooleanOrUndefined(val: any) { +export function getBooleanOrUndefined(val: any): boolean { try { return tryGetBoolean(val); } catch (e) { @@ -256,7 +256,7 @@ function createComparator(iterationType: IterationType): Comparator { return object; } -function setAnchor(list: any[], predicate: PagingPredicate, nearestPage: number) { +function setAnchor(list: any[], predicate: PagingPredicate, nearestPage: number): void { assert(list.length > 0); const size = list.length; const pageSize = predicate.getPageSize(); diff --git a/src/aggregation/Aggregator.ts b/src/aggregation/Aggregator.ts index 049de2256..82f65fa67 100644 --- a/src/aggregation/Aggregator.ts +++ b/src/aggregation/Aggregator.ts @@ -42,7 +42,7 @@ export abstract class AbstractAggregator implements IdentifiedDataSerializabl } export class CountAggregator extends AbstractAggregator { - readData(input: DataInput) { + readData(input: DataInput): any { this.attributePath = input.readUTF(); // member side field, not used in client input.readLong(); diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 1cb1d2fe4..461a20349 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -133,7 +133,7 @@ export class ConfigBuilder { return importConfig; } - private handleSsl(jsonObject: any) { + private handleSsl(jsonObject: any): void { const sslEnabled = tryGetBoolean(jsonObject.enabled); if (sslEnabled) { if (jsonObject.factory) { @@ -150,7 +150,7 @@ export class ConfigBuilder { } } - private handleClusterMembers(jsonObject: any) { + private handleClusterMembers(jsonObject: any): void { const addressArray = tryGetArray(jsonObject); for (const index in addressArray) { const address = addressArray[index]; diff --git a/src/config/ListenerConfig.ts b/src/config/ListenerConfig.ts index e2949f467..f98c146fb 100644 --- a/src/config/ListenerConfig.ts +++ b/src/config/ListenerConfig.ts @@ -20,11 +20,11 @@ export class ListenerConfig { lifecycle: Function[] = []; - addLifecycleListener(listener: Function) { + addLifecycleListener(listener: Function): void { this.lifecycle.push(listener); } - getLifecycleListeners() { + getLifecycleListeners(): Function[] { return this.lifecycle; } } diff --git a/src/core/Member.ts b/src/core/Member.ts index 79bedde73..d2c22f0c2 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -51,7 +51,7 @@ export class Member { return false; } - toString() { + toString(): string { return 'Member[ uuid: ' + this.uuid.toString() + ', address: ' + this.address.toString() + ']'; } } diff --git a/src/core/Predicate.ts b/src/core/Predicate.ts index add8d97a8..368bc07a4 100644 --- a/src/core/Predicate.ts +++ b/src/core/Predicate.ts @@ -42,79 +42,79 @@ export function sql(str: string): Predicate { return new SqlPredicate(str); } -export function and(...predicates: Predicate[]) { +export function and(...predicates: Predicate[]): Predicate { return new AndPredicate(...predicates); } -export function isBetween(field: string, from: any, to: any) { +export function isBetween(field: string, from: any, to: any): Predicate { return new BetweenPredicate(field, from, to); } -export function isFalse() { +export function isFalse(): Predicate { return FalsePredicate.INSTANCE; } -export function isEqualTo(field: string, value: any) { +export function isEqualTo(field: string, value: any): Predicate { return new EqualPredicate(field, value); } -export function greaterThan(field: string, value: any) { +export function greaterThan(field: string, value: any): Predicate { return new GreaterLessPredicate(field, value, false, false); } -export function greaterEqual(field: string, value: any) { +export function greaterEqual(field: string, value: any): Predicate { return new GreaterLessPredicate(field, value, true, false); } -export function lessThan(field: string, value: any) { +export function lessThan(field: string, value: any): Predicate { return new GreaterLessPredicate(field, value, false, true); } -export function lessEqual(field: string, value: any) { +export function lessEqual(field: string, value: any): Predicate { return new GreaterLessPredicate(field, value, true, true); } -export function like(field: string, expr: string) { +export function like(field: string, expr: string): Predicate { return new LikePredicate(field, expr); } -export function ilike(field: string, expr: string) { +export function ilike(field: string, expr: string): Predicate { return new ILikePredicate(field, expr); } -export function inPredicate(field: string, ...values: any[]) { +export function inPredicate(field: string, ...values: any[]): Predicate { return new InPredicate(field, ...values); } -export function instanceOf(className: string) { +export function instanceOf(className: string): Predicate { return new InstanceOfPredicate(className); } -export function notEqual(field: string, value: any) { +export function notEqual(field: string, value: any): Predicate { return new NotEqualPredicate(field, value); } -export function not(predic: Predicate) { +export function not(predic: Predicate): Predicate { return new NotPredicate(predic); } -export function or(...predicates: Predicate[]) { +export function or(...predicates: Predicate[]): Predicate { return new OrPredicate(...predicates); } -export function regex(field: string, reg: string) { +export function regex(field: string, reg: string): Predicate { return new RegexPredicate(field, reg); } -export function truePredicate() { +export function truePredicate(): Predicate { return TruePredicate.INSTANCE; } -export function falsePredicate() { +export function falsePredicate(): Predicate { return FalsePredicate.INSTANCE; } -export function paging(predicate: Predicate, pageSize: number, comparator: Comparator = null) { +export function paging(predicate: Predicate, pageSize: number, comparator: Comparator = null): Predicate { return new PagingPredicate(predicate, pageSize, comparator); } diff --git a/src/core/UUID.ts b/src/core/UUID.ts index 4f892cd21..42d36a8b7 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -25,7 +25,7 @@ export class UUID { this.leastSignificant = leastSig; } - equals(other: UUID) { + equals(other: UUID): boolean { if (other == null) { return false; } diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 55d3f1eb0..46fa7f1c6 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -51,7 +51,7 @@ export class ClientConnection { * Returns the address of local port that is associated with this connection. * @returns */ - getLocalAddress() { + getLocalAddress(): Address { return this.localAddress; } @@ -132,7 +132,7 @@ export class ClientConnection { * Registers a function to pass received data on 'data' events on this connection. * @param callback */ - registerResponseCallback(callback: Function) { + registerResponseCallback(callback: Function): void { this.socket.on('data', (buffer: Buffer) => { this.lastRead = new Date().getTime(); this.readBuffer = Buffer.concat([this.readBuffer, buffer], this.readBuffer.length + buffer.length); diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 37558e493..0ca5a7631 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -130,7 +130,7 @@ export class ClientConnectionManager extends EventEmitter { } } - shutdown() { + shutdown(): void { for (const pending in this.pendingConnections) { this.pendingConnections[pending].reject(new ClientNotActiveError('Client is shutting down!')); } @@ -205,11 +205,11 @@ export class ClientConnectionManager extends EventEmitter { return connection.write(buffer); } - private onConnectionClosed(connection: ClientConnection) { + private onConnectionClosed(connection: ClientConnection): void { this.emit(EMIT_CONNECTION_CLOSED, connection); } - private onConnectionOpened(connection: ClientConnection) { + private onConnectionOpened(connection: ClientConnection): void { this.emit(EMIT_CONNECTION_OPENED, connection); } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 9a619f960..9c63dcb82 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -98,13 +98,13 @@ export class ClusterService extends EventEmitter { getPossibleMemberAddresses(): Promise { const addresses: Set = new Set(); - this.getMembers().forEach(function (member) { + this.getMembers().forEach(function (member): void { addresses.add(member.address.toString()); }); let providerAddresses: Set = new Set(); const promises: Array> = []; - this.client.getConnectionManager().addressProviders.forEach(function (addressProvider) { + this.client.getConnectionManager().addressProviders.forEach(function (addressProvider): void { promises.push(addressProvider.loadAddresses().then((res) => { providerAddresses = new Set([...Array.from(providerAddresses), ...res]); }).catch((err) => { @@ -125,7 +125,7 @@ export class ClusterService extends EventEmitter { return this.members; } else { const members: Member[] = []; - this.members.forEach(function (member) { + this.members.forEach(function (member): void { if (selector.select(member)) { members.push(member); } @@ -138,7 +138,7 @@ export class ClusterService extends EventEmitter { * Returns the number of nodes in cluster. * @returns {number} */ - getSize() { + getSize(): number { return this.members.length; } @@ -177,17 +177,17 @@ export class ClusterService extends EventEmitter { }); } - private initHeartbeatListener() { + private initHeartbeatListener(): void { this.client.getHeartbeat().addListener({ onHeartbeatStopped: this.onHeartbeatStopped.bind(this), }); } - private initConnectionListener() { + private initConnectionListener(): void { this.client.getConnectionManager().on('connectionClosed', this.onConnectionClosed.bind(this)); } - private onConnectionClosed(connection: ClientConnection) { + private onConnectionClosed(connection: ClientConnection): void { this.logger.warn('ClusterService', 'Connection closed to ' + connection.toString()); if (connection.isAuthenticatedAsOwner()) { this.ownerConnection = null; @@ -243,7 +243,7 @@ export class ClusterService extends EventEmitter { } } - private handleMember(member: Member, eventType: number) { + private handleMember(member: Member, eventType: number): void { if (eventType === MEMBER_ADDED) { this.logger.info('ClusterService', member.toString() + ' added to cluster'); this.memberAdded(member); @@ -254,22 +254,22 @@ export class ClusterService extends EventEmitter { this.client.getPartitionService().refresh(); } - private handleMemberList(members: Member[]) { + private handleMemberList(members: Member[]): void { this.members = members; this.client.getPartitionService().refresh(); this.logger.info('ClusterService', 'Members received.', this.members); } - private handleMemberAttributeChange(uuid: string, key: string, operationType: number, value: string) { + private handleMemberAttributeChange(uuid: string, key: string, operationType: number, value: string): void { this.emit(EMIT_ATTRIBUTE_CHANGE, uuid, key, ATTRIBUTE_CHANGE[operationType], value); } - private memberAdded(member: Member) { + private memberAdded(member: Member): void { this.members.push(member); this.emit(EMIT_MEMBER_ADDED, member); } - private memberRemoved(member: Member) { + private memberRemoved(member: Member): void { const memberIndex = this.members.findIndex(member.equals, member); if (memberIndex !== -1) { const removedMemberList = this.members.splice(memberIndex, 1); diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 2cf3b44db..1ac5297d7 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -347,7 +347,7 @@ export class InvocationService { } } - private registerInvocation(invocation: Invocation) { + private registerInvocation(invocation: Invocation): void { const message = invocation.request; const correlationId = message.getCorrelationId().toNumber(); if (invocation.hasPartitionId()) { diff --git a/src/invocation/RegistrationKey.ts b/src/invocation/RegistrationKey.ts index 367587a95..dae4e3884 100644 --- a/src/invocation/RegistrationKey.ts +++ b/src/invocation/RegistrationKey.ts @@ -42,7 +42,7 @@ export class RegistrationKey { return this.codec; } - setCodec(value: ListenerMessageCodec) { + setCodec(value: ListenerMessageCodec): void { this.codec = value; } diff --git a/src/logging/DefaultLogger.ts b/src/logging/DefaultLogger.ts index 519a4621f..4c41b5a27 100644 --- a/src/logging/DefaultLogger.ts +++ b/src/logging/DefaultLogger.ts @@ -19,7 +19,7 @@ import {ILogger, LogLevel} from './LoggingService'; export class DefaultLogger implements ILogger { level = LogLevel.INFO; - log(level: LogLevel, className: string, message: string, furtherInfo: any) { + log(level: LogLevel, className: string, message: string, furtherInfo: any): void { if (level <= this.level) { console.log('[DefaultLogger] %s at %s: %s', LogLevel[level], className, message); if (furtherInfo != null) { diff --git a/src/logging/LoggingService.ts b/src/logging/LoggingService.ts index 3de51f176..164a2d29b 100644 --- a/src/logging/LoggingService.ts +++ b/src/logging/LoggingService.ts @@ -50,7 +50,7 @@ export class LoggingService { return LoggingService.loggingService; } - static initialize(loggerModule: string | ILogger = null) { + static initialize(loggerModule: string | ILogger = null): void { if (typeof loggerModule === 'string') { if (loggerModule === 'off') { LoggingService.loggingService = new LoggingService(new NoLogger()); @@ -64,27 +64,27 @@ export class LoggingService { } } - log(level: LogLevel, className: string, message: string, furtherInfo: any) { + log(level: LogLevel, className: string, message: string, furtherInfo: any): void { this.logger.log(level, className, message, furtherInfo); } - error(className: string, message: string, furtherInfo: any = null) { + error(className: string, message: string, furtherInfo: any = null): void { this.log(LogLevel.ERROR, className, message, furtherInfo); } - warn(className: string, message: string, furtherInfo: any = null) { + warn(className: string, message: string, furtherInfo: any = null): void { this.log(LogLevel.WARN, className, message, furtherInfo); } - info(className: string, message: string, furtherInfo: any = null) { + info(className: string, message: string, furtherInfo: any = null): void { this.log(LogLevel.INFO, className, message, furtherInfo); } - debug(className: string, message: string, furtherInfo: any = null) { + debug(className: string, message: string, furtherInfo: any = null): void { this.log(LogLevel.DEBUG, className, message, furtherInfo); } - trace(className: string, message: string, furtherInfo: any = null) { + trace(className: string, message: string, furtherInfo: any = null): void { this.log(LogLevel.TRACE, className, message, furtherInfo); } } diff --git a/src/logging/NoLogger.ts b/src/logging/NoLogger.ts index 4cd6fc89c..c4b043a88 100644 --- a/src/logging/NoLogger.ts +++ b/src/logging/NoLogger.ts @@ -17,7 +17,7 @@ import {ILogger, LogLevel} from './LoggingService'; export class NoLogger implements ILogger { - log(level: LogLevel, className: string, message: string, furtherInfo: any) { + log(level: LogLevel, className: string, message: string, furtherInfo: any): void { /* tslint:disable */ } } diff --git a/src/nearcache/DataRecord.ts b/src/nearcache/DataRecord.ts index 53b802f53..d36400415 100644 --- a/src/nearcache/DataRecord.ts +++ b/src/nearcache/DataRecord.ts @@ -56,19 +56,19 @@ export class DataRecord { } /*tslint:disable:member-ordering*/ - public static lruComp(x: DataRecord, y: DataRecord) { + public static lruComp(x: DataRecord, y: DataRecord): number { return x.lastAccessTime - y.lastAccessTime; } - public static lfuComp(x: DataRecord, y: DataRecord) { + public static lfuComp(x: DataRecord, y: DataRecord): number { return x.accessHit - y.accessHit; } - public static randomComp(x: DataRecord, y: DataRecord) { + public static randomComp(x: DataRecord, y: DataRecord): number { return Math.random() - 0.5; } - isExpired(maxIdleSeconds: number) { + isExpired(maxIdleSeconds: number): boolean { const now = new Date().getTime(); if ((this.expirationTime > 0 && this.expirationTime < now) || (maxIdleSeconds > 0 && this.lastAccessTime + maxIdleSeconds * 1000 < now)) { diff --git a/src/nearcache/MetadataContainer.ts b/src/nearcache/MetadataContainer.ts index 22fb6c32b..ee3feb339 100644 --- a/src/nearcache/MetadataContainer.ts +++ b/src/nearcache/MetadataContainer.ts @@ -53,7 +53,7 @@ export class MetadataContainer { return this.missedSequenceCount; } - setUuid(uuid: UUID) { + setUuid(uuid: UUID): void { this.uuid = uuid; } diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 3ece36f1d..4c292bcde 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -233,7 +233,7 @@ export class NearCacheImpl implements NearCache { return stats; } - protected isEvictionRequired() { + protected isEvictionRequired(): boolean { return this.evictionPolicy !== EvictionPolicy.NONE && this.evictionMaxSize <= this.internalStore.size; } diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index d10823015..fd461756e 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -122,7 +122,7 @@ export class RepairingHandler { return this.name; } - private getPartitionIdOrDefault(key: Data) { + private getPartitionIdOrDefault(key: Data): number { if (key != null) { return this.partitionService.getPartitionId(key); } else { diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index ca7b15e49..5a7220936 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -144,7 +144,7 @@ export class BaseProxy { private createPromise(codec: any, promise: Promise): Promise { const toObject = this.toObject.bind(this); - return promise.then(function (clientMessage: ClientMessage) { + return promise.then(function (clientMessage: ClientMessage): any { if (codec.decodeResponse) { const raw = codec.decodeResponse(clientMessage, toObject); diff --git a/src/proxy/LockProxy.ts b/src/proxy/LockProxy.ts index b91c846f2..f2f3b7036 100644 --- a/src/proxy/LockProxy.ts +++ b/src/proxy/LockProxy.ts @@ -63,7 +63,7 @@ export class LockProxy extends PartitionSpecificProxy implements ILock { } getRemainingLeaseTime(): Promise { - return this.encodeInvoke(LockGetRemainingLeaseTimeCodec).then(function (long) { + return this.encodeInvoke(LockGetRemainingLeaseTimeCodec).then(function (long): number { return long.toNumber(); }); } diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 0ffb02d6b..d66977bde 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -144,8 +144,8 @@ export class MapProxy extends BaseProxy implements IMap { const pData = this.toData(predicate); return this.encodeInvokeOnRandomTarget( MapValuesWithPagingPredicateCodec, pData, - ).then(function (rawValues: Array<[Data, Data]>) { - const deserValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { + ).then(function (rawValues: Array<[Data, Data]>): any[] { + const deserValues = rawValues.map<[K, V]>(function (ite: [Data, Data]): [K, V] { return [toObject(ite[0]), toObject(ite[1])]; }); return getSortedQueryResultSet(deserValues, predicate); @@ -154,8 +154,8 @@ export class MapProxy extends BaseProxy implements IMap { const pData = this.toData(predicate); const deserializedSet: Array<[K, V]> = []; return this.encodeInvokeOnRandomTarget(MapEntriesWithPredicateCodec, pData).then( - function (entrySet: Array<[Data, Data]>) { - entrySet.forEach(function (entry) { + function (entrySet: Array<[Data, Data]>): Array<[K, V]> { + entrySet.forEach(function (entry): void { deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); }); return deserializedSet; @@ -170,17 +170,18 @@ export class MapProxy extends BaseProxy implements IMap { predicate.setIterationType(IterationType.KEY); const predData = this.toData(predicate); return this.encodeInvokeOnRandomTarget(MapKeySetWithPagingPredicateCodec, predData).then( - function (rawValues: Data[]) { - const deserValues = rawValues.map<[K, V]>(function (ite: Data) { + function (rawValues: Data[]): any[] { + const deserValues = rawValues.map<[K, V]>(function (ite: Data): [K, V] { return [toObject(ite), null]; }); return getSortedQueryResultSet(deserValues, predicate); }); } else { const predicateData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapKeySetWithPredicateCodec, predicateData).then(function (entrySet: Data[]) { - return entrySet.map(toObject); - }); + return this.encodeInvokeOnRandomTarget(MapKeySetWithPredicateCodec, predicateData).then( + function (entrySet: Data[]): K[] { + return entrySet.map(toObject); + }); } } @@ -193,7 +194,7 @@ export class MapProxy extends BaseProxy implements IMap { return this.encodeInvokeOnRandomTarget( MapValuesWithPagingPredicateCodec, predData, ).then((rawValues: Array<[Data, Data]>) => { - const desValues = rawValues.map<[K, V]>(function (ite: [Data, Data]) { + const desValues = rawValues.map<[K, V]>(function (ite: [Data, Data]): [K, V] { return [toObject(ite[0]), toObject(ite[1])]; }); return new ReadOnlyLazyList(getSortedQueryResultSet(desValues, predicate), this.client.getSerializationService()); @@ -288,7 +289,7 @@ export class MapProxy extends BaseProxy implements IMap { partitionsToKeys[pId].push(keyData); } const result: Array<[any, any]> = []; - return this.getAllInternal(partitionsToKeys, result).then(function () { + return this.getAllInternal(partitionsToKeys, result).then(function (): Array<[any, any]> { return result; }); @@ -303,8 +304,8 @@ export class MapProxy extends BaseProxy implements IMap { entrySet(): Promise { const deserializedSet: Array<[K, V]> = []; const toObject = this.toObject.bind(this); - return this.encodeInvokeOnRandomTarget(MapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>) { - entrySet.forEach(function (entry) { + return this.encodeInvokeOnRandomTarget(MapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>): Array<[K, V]> { + entrySet.forEach(function (entry): void { deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); }); return deserializedSet; @@ -351,7 +352,7 @@ export class MapProxy extends BaseProxy implements IMap { keySet(): Promise { const toObject = this.toObject.bind(this); - return this.encodeInvokeOnRandomTarget(MapKeySetCodec).then(function (entrySet) { + return this.encodeInvokeOnRandomTarget(MapKeySetCodec).then(function (entrySet): K[] { return entrySet.map(toObject); }); } @@ -471,7 +472,7 @@ export class MapProxy extends BaseProxy implements IMap { this.encodeInvokeOnPartition(MapPutAllCodec, Number(partition), partitionsToKeysData[partition]), ); } - return Promise.all(partitionPromises).then(function () { + return Promise.all(partitionPromises).then(function (): any { return; }); } @@ -499,10 +500,10 @@ export class MapProxy extends BaseProxy implements IMap { ); } const toObject = this.toObject.bind(this); - const deserializeEntry = function (entry: [Data, Data]) { + const deserializeEntry = function (entry: [Data, Data]): any[] { return [toObject(entry[0]), toObject(entry[1])]; }; - return Promise.all(partitionPromises).then(function (serializedEntryArrayArray: Array>) { + return Promise.all(partitionPromises).then(function (serializedEntryArrayArray: Array>): any[] { const serializedEntryArray = Array.prototype.concat.apply([], serializedEntryArrayArray); result.push(...(serializedEntryArray.map(deserializeEntry))); return serializedEntryArray; @@ -568,7 +569,7 @@ export class MapProxy extends BaseProxy implements IMap { const entryEventHandler = function ( /* tslint:disable-next-line:no-shadowed-variable */ key: K, val: V, oldVal: V, mergingVal: V, event: number, uuid: string, numberOfAffectedEntries: number, - ) { + ): void { let eventParams: any[] = [key, oldVal, val, mergingVal, numberOfAffectedEntries, uuid]; eventParams = eventParams.map(toObject); switch (event) { diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 48a6c9f5b..9928eaffe 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -136,7 +136,7 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { const toObject = this.toObject.bind(this); /* tslint:disable: no-shadowed-variable */ - const entryEventHandler = function (key: K, value: V, oldValue: V, mergingValue: V, event: number) { + const entryEventHandler = function (key: K, value: V, oldValue: V, mergingValue: V, event: number): void { let parameters: any[] = [key, oldValue, value]; parameters = parameters.map(toObject); let name: string; diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 25903469f..acb94d303 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -193,7 +193,7 @@ export class NearCachedMapProxy extends MapProxy { .then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); } - private removeNearCacheInvalidationListener() { + private removeNearCacheInvalidationListener(): Promise { return this.client.getListenerService().deregisterListener(this.invalidationListenerId); } @@ -251,22 +251,22 @@ export class NearCachedMapProxy extends MapProxy { return this.getConnectedServerVersion() >= MIN_EVENTUALLY_CONSISTENT_NEARCACHE_VERSION; } - private createPre38NearCacheEventHandler() { + private createPre38NearCacheEventHandler(): Function { const nearCache = this.nearCache; - const handle = function (keyData: Data) { + const handle = function (keyData: Data): void { if (keyData == null) { nearCache.clear(); } else { nearCache.invalidate(keyData); } }; - const handleBatch = function (keys: Data[]) { + const handleBatch = function (keys: Data[]): void { keys.forEach((key: Data) => { nearCache.invalidate(key); }); }; - return function (m: ClientMessage) { + return function (m: ClientMessage): void { MapAddNearCacheEntryListenerCodec.handle(m, handle, handleBatch); }; } @@ -276,14 +276,14 @@ export class NearCachedMapProxy extends MapProxy { return repairingTask.registerAndGetHandler(this.getName(), this.nearCache).then((repairingHandler) => { const staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); this.nearCache.setStaleReadDetector(staleReadDetector); - const handle = function (key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long) { + const handle = function (key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long): void { repairingHandler.handle(key, sourceUuid, partitionUuid, sequence); }; - const handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]) { + const handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]): void { repairingHandler.handleBatch(keys, sourceUuids, partititonUuids, sequences); }; - return function (m: ClientMessage) { + return function (m: ClientMessage): void { MapAddNearCacheInvalidationListenerCodec.handle(m, handle, handleBatch); }; }); diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index f144d7a32..3dbedf2d2 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -113,8 +113,8 @@ export class ProxyManager { } addDistributedObjectListener(listenerFunc: Function): Promise { - const handler = function (clientMessage: ClientMessage) { - const converterFunc = function (name: string, serviceName: string, eventType: string) { + const handler = function (clientMessage: ClientMessage): void { + const converterFunc = function (name: string, serviceName: string, eventType: string): void { if (eventType === 'CREATED') { listenerFunc(name, serviceName, 'created'); } else if (eventType === 'DESTROYED') { @@ -127,7 +127,7 @@ export class ProxyManager { return this.client.getListenerService().registerListener(codec, handler); } - removeDistributedObjectListener(listenerId: string) { + removeDistributedObjectListener(listenerId: string): Promise { return this.client.getListenerService().deregisterListener(listenerId); } diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index cd6b8788f..c3faa35ab 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -46,7 +46,7 @@ import ClientMessage = require('../ClientMessage'); export class QueueProxy extends PartitionSpecificProxy implements IQueue { add(item: E): Promise { - return this.offer(item).then(function (ret) { + return this.offer(item).then(function (ret): boolean { if (ret) { return true; } else { @@ -58,7 +58,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { addAll(items: E[]): Promise { const rawList: Data[] = []; const toData = this.toData.bind(this); - items.forEach(function (item) { + items.forEach(function (item): void { rawList.push(toData(item)); }); return this.encodeInvoke(QueueAddAllCodec, rawList); @@ -107,8 +107,8 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } else { promise = this.encodeInvoke(QueueDrainToMaxSizeCodec, maxElements); } - return promise.then(function (rawArr: Data[]) { - rawArr.forEach(function (rawItem) { + return promise.then(function (rawArr: Data[]): number { + rawArr.forEach(function (rawItem): void { arr.push(toObject(rawItem)); }); return rawArr.length; @@ -173,8 +173,8 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { toArray(): Promise { const arr: E[] = []; const toObject = this.toObject.bind(this); - return this.encodeInvoke(QueueIteratorCodec).then(function (dataArray) { - dataArray.forEach(function (data) { + return this.encodeInvoke(QueueIteratorCodec).then(function (dataArray): E[] { + dataArray.forEach(function (data): void { arr.push(toObject(data)); }); return arr; diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index 516dff9ed..48c49528b 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -115,7 +115,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements keySet(): Promise { const toObject = this.toObject.bind(this); - return this.encodeInvoke(ReplicatedMapKeySetCodec).then(function (keySet) { + return this.encodeInvoke(ReplicatedMapKeySetCodec).then(function (keySet): K[] { return keySet.map(toObject); }); } @@ -133,7 +133,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements entrySet(): Promise> { const toObject = this.toObject.bind(this); - return this.encodeInvoke(ReplicatedMapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>) { + return this.encodeInvoke(ReplicatedMapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>): Array<[K, V]> { return entrySet.map<[K, V]>((entry) => [toObject(entry[0]), toObject(entry[1])]); }); } @@ -163,7 +163,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements const toObject = this.toObject.bind(this); /* tslint:disable-next-line:no-shadowed-variable */ const entryEventHandler = function (key: K, val: V, oldVal: V, mergingVal: V, - event: number, uuid: string, numberOfAffectedEntries: number) { + event: number, uuid: string, numberOfAffectedEntries: number): void { let eventParams: any[] = [key, oldVal, val, mergingVal, numberOfAffectedEntries, uuid]; eventParams = eventParams.map(toObject); const eventToListenerMap: { [key: number]: string } = { diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index e8a260c6f..7e6e5149d 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -143,7 +143,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { let resolve: Function; - const promise = new Promise(function () { + const promise = new Promise(function (): void { resolve = arguments[0]; }); @@ -152,7 +152,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { return promise; } - private trySendMessage(message: RawTopicMessage, delay: number, resolve: Function) { + private trySendMessage(message: RawTopicMessage, delay: number, resolve: Function): void { this.ringbuffer.add(message, OverflowPolicy.FAIL).then((seq: Long) => { if (seq.toNumber() === -1) { let newDelay = delay *= 2; diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index 927a1c1fd..cfcb0afcc 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -59,9 +59,9 @@ export class AndPredicate extends AbstractPredicate { } } - writeData(output: DataOutput) { + writeData(output: DataOutput): void { output.writeInt(this.predicates.length); - this.predicates.forEach(function (pred: Predicate) { + this.predicates.forEach(function (pred: Predicate): void { output.writeObject(pred); }); } @@ -218,7 +218,7 @@ export class InPredicate extends AbstractPredicate { writeData(output: DataOutput): void { output.writeUTF(this.field); output.writeInt(this.values.length); - this.values.forEach(function (val) { + this.values.forEach(function (val): void { output.writeObject(val); }); } @@ -299,7 +299,7 @@ export class OrPredicate extends AbstractPredicate { writeData(output: DataOutput): void { output.writeInt(this.preds.length); - this.preds.forEach(function (pred: Predicate) { + this.preds.forEach(function (pred: Predicate): void { output.writeObject(pred); }); } @@ -410,7 +410,7 @@ export class PagingPredicate extends AbstractPredicate { output.writeInt(this.pageSize); output.writeUTF(IterationType[this.iterationType]); output.writeInt(this.anchorList.length); - this.anchorList.forEach(function (anchorEntry: [number, [any, any]]) { + this.anchorList.forEach(function (anchorEntry: [number, [any, any]]): void { output.writeInt(anchorEntry[0]); output.writeObject(anchorEntry[1][0]); output.writeObject(anchorEntry[1][1]); @@ -421,7 +421,7 @@ export class PagingPredicate extends AbstractPredicate { return 15; } - setIterationType(iterationType: IterationType) { + setIterationType(iterationType: IterationType): void { this.iterationType = iterationType; } @@ -440,7 +440,7 @@ export class PagingPredicate extends AbstractPredicate { return this; } - setAnchor(page: number, anchor: [any, any]) { + setAnchor(page: number, anchor: [any, any]): void { const anchorEntry: [number, [any, any]] = [page, anchor]; const anchorCount = this.anchorList.length; if (page < anchorCount) { diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 95c796104..1e44bfecd 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -238,7 +238,7 @@ export class ObjectDataOutput implements DataOutput { } } - private writeArray(func: Function, arr: any[]) { + private writeArray(func: Function, arr: any[]): void { const len = (arr != null) ? arr.length : BitsUtil.NULL_ARRAY_LENGTH; this.writeInt(len); if (len > 0) { @@ -546,7 +546,7 @@ export class ObjectDataInput implements DataInput { return this.buffer.length - this.pos; } - private readArray(func: Function, pos?: number) { + private readArray(func: Function, pos?: number): T[] { const backupPos = this.pos; if (pos !== undefined) { this.pos = pos; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index d63c0293e..5284613e4 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -231,7 +231,7 @@ export class SerializationServiceV1 implements SerializationService { return (obj.readPortable && obj.writePortable && obj.getFactoryId && obj.getClassId); } - protected registerDefaultSerializers() { + protected registerDefaultSerializers(): void { this.registerSerializer('string', new StringSerializer()); this.registerSerializer('double', new DoubleSerializer()); this.registerSerializer('byte', new ByteSerializer()); @@ -261,7 +261,7 @@ export class SerializationServiceV1 implements SerializationService { ); } - protected registerIdentifiedFactories() { + protected registerIdentifiedFactories(): void { const factories: { [id: number]: IdentifiedDataSerializableFactory } = {}; for (const id in this.serializationConfig.dataSerializableFactories) { factories[id] = this.serializationConfig.dataSerializableFactories[id]; @@ -280,10 +280,10 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('identified', new IdentifiedDataSerializableSerializer(factories)); } - protected registerCustomSerializers() { + protected registerCustomSerializers(): void { const customSerializersArray: any[] = this.serializationConfig.customSerializers; const self = this; - customSerializersArray.forEach(function (candidate) { + customSerializersArray.forEach(function (candidate): void { self.assertValidCustomSerializer(candidate); self.registerSerializer('!custom' + candidate.getId(), candidate); }); @@ -295,7 +295,7 @@ export class SerializationServiceV1 implements SerializationService { } } - protected registerGlobalSerializer() { + protected registerGlobalSerializer(): void { let candidate: any = null; if (this.serializationConfig.globalSerializerConfig != null) { const exportedName = this.serializationConfig.globalSerializerConfig.exportedName; @@ -313,7 +313,7 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('!global', candidate); } - protected assertValidCustomSerializer(candidate: any) { + protected assertValidCustomSerializer(candidate: any): void { const fGetId = 'getId'; const fRead = 'read'; const fWrite = 'write'; @@ -330,7 +330,7 @@ export class SerializationServiceV1 implements SerializationService { } } - protected isCustomSerializable(object: any) { + protected isCustomSerializable(object: any): boolean { const prop = 'hzGetCustomId'; return (object[prop] && typeof object[prop] === 'function' && object[prop]() >= 1); } diff --git a/src/serialization/SerializationUtil.ts b/src/serialization/SerializationUtil.ts index 8e1ad6bae..fb7853448 100644 --- a/src/serialization/SerializationUtil.ts +++ b/src/serialization/SerializationUtil.ts @@ -18,7 +18,7 @@ import {Data} from './Data'; export function deserializeEntryList(toObject: Function, entrySet: Array<[Data, Data]>): Array<[K, V]> { const deserializedSet: Array<[K, V]> = []; - entrySet.forEach(function (entry) { + entrySet.forEach(function (entry): void { deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); }); return deserializedSet; diff --git a/src/serialization/portable/ClassDefinition.ts b/src/serialization/portable/ClassDefinition.ts index b9e4d4871..8d0253471 100644 --- a/src/serialization/portable/ClassDefinition.ts +++ b/src/serialization/portable/ClassDefinition.ts @@ -28,7 +28,7 @@ export class ClassDefinition { this.version = version; } - addFieldDefinition(definition: FieldDefinition) { + addFieldDefinition(definition: FieldDefinition): void { this.fields[definition.getName()] = definition; } diff --git a/src/serialization/portable/ClassDefinitionContext.ts b/src/serialization/portable/ClassDefinitionContext.ts index 5bb09b672..391a9a899 100644 --- a/src/serialization/portable/ClassDefinitionContext.ts +++ b/src/serialization/portable/ClassDefinitionContext.ts @@ -31,7 +31,7 @@ export class ClassDefinitionContext { return classId + 'v' + version; } - lookup(classId: number, version: number) { + lookup(classId: number, version: number): ClassDefinition { const encoded = ClassDefinitionContext.encodeVersionedClassId(classId, version); return this.classDefs[encoded]; } diff --git a/src/serialization/portable/DefaultPortableReader.ts b/src/serialization/portable/DefaultPortableReader.ts index f27ceaadc..b9d1a8581 100644 --- a/src/serialization/portable/DefaultPortableReader.ts +++ b/src/serialization/portable/DefaultPortableReader.ts @@ -203,7 +203,7 @@ export class DefaultPortableReader implements PortableReader { return this.input; } - end() { + end(): void { this.input.position(this.finalPos); } diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index 164c337a7..1113f0ec3 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -183,7 +183,7 @@ export class MorphingPortableReader extends DefaultPortableReader { return this.validateCompatibleAndCall(fieldName, FieldType.UTF, super.readUTF); } - private validateCompatibleAndCall(fieldName: string, expectedType: FieldType, superFunc: Function) { + private validateCompatibleAndCall(fieldName: string, expectedType: FieldType, superFunc: Function): any { const fd = this.classDefinition.getField(fieldName); if (fd === null) { return undefined; @@ -194,7 +194,7 @@ export class MorphingPortableReader extends DefaultPortableReader { return superFunc.call(this, fieldName); } - private createIncompatibleClassChangeError(fd: FieldDefinition, expectedType: FieldType) { + private createIncompatibleClassChangeError(fd: FieldDefinition, expectedType: FieldType): Error { return new TypeError(`Incompatible to read ${expectedType} from ${fd.getType()} while reading field : ${fd.getName()}`); } } diff --git a/tslint.json b/tslint.json index dbb07e5e6..d2a63957c 100644 --- a/tslint.json +++ b/tslint.json @@ -51,6 +51,11 @@ "no-console": false, "no-empty-interface": false, "ordered-imports": false, - "no-conditional-assignment": false + "no-conditional-assignment": false, + "typedef": [ + true, + "call-signature", + "property-declaration" + ] } } From eb3a5a95a42b53994616f677cc0df23097ae01ce Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 15 Aug 2018 17:48:35 +0300 Subject: [PATCH 124/685] update address configuration (#334) --- CONFIG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONFIG.md b/CONFIG.md index c01b8c684..abb2efcf1 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -11,7 +11,7 @@ desired aspects. An example is shown below. var Config = require('hazelcast-client').Config; var Address = require('hazelcast-client').Address; var cfg = new Config.ClientConfig(); -cfg.networkConfig.addresses.push(new Address('127.0.0.11', 5701)); +cfg.networkConfig.addresses.push('127.0.0.1:5701'); return HazelcastClient.newHazelcastClient(cfg); ``` From fd30bc09e0b753e6cefefa37555f3e3c388fc475 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 15 Aug 2018 19:31:01 +0300 Subject: [PATCH 125/685] fix on LockProxyTest (#333) --- test/lock/LockProxyTest.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lock/LockProxyTest.js b/test/lock/LockProxyTest.js index c8e0a25d4..bd65c9c23 100644 --- a/test/lock/LockProxyTest.js +++ b/test/lock/LockProxyTest.js @@ -143,11 +143,11 @@ describe("Lock Proxy", function () { it("correctly reports remaining lease time", function () { return lockOne.lock(1000).then(function () { - return lockOne.getRemainingLeaseTime(); + return Util.promiseWaitMilliseconds(30) }).then(function (remaining) { return lockOne.getRemainingLeaseTime(); }).then(function (remaining) { - expect(remaining).to.be.lessThan(1000); + expect(remaining).to.be.lessThan(971); }) }); From 84107d57b9b31273eac706e0d81a8b50d79ee614 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Thu, 30 Aug 2018 18:37:39 +0300 Subject: [PATCH 126/685] prevent client hanging due to incompatible server (#331) --- src/invocation/ClientConnectionManager.ts | 5 ++++- test/ConnectionManagerTest.js | 27 ++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 0ca5a7631..71bc31a1f 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -108,7 +108,10 @@ export class ClientConnectionManager extends EventEmitter { const connectionTimeout = this.client.getConfig().networkConfig.connectionTimeout; if (connectionTimeout !== 0) { - return connectionResolver.promise.timeout(connectionTimeout, new HazelcastError('Connection timed-out')); + return connectionResolver.promise.timeout(connectionTimeout, new HazelcastError( + 'Connection timed-out')).finally(() => { + delete this.pendingConnections[addressIndex]; + }); } return connectionResolver.promise; } diff --git a/test/ConnectionManagerTest.js b/test/ConnectionManagerTest.js index 37e710c4e..7337ebc89 100644 --- a/test/ConnectionManagerTest.js +++ b/test/ConnectionManagerTest.js @@ -14,13 +14,17 @@ * limitations under the License. */ -var Controller = require('./RC'); var chai = require('chai'); chai.should(); chai.use(require('chai-as-promised')); +var expect = chai.expect; + +var net = require('net'); + var Config = require('../.').Config; var Hazelcast = require('../.').Client; -var net = require('net'); +var Controller = require('./RC'); +var Errors = require('../').HazelcastErrors; describe('ConnectionManager', function () { @@ -36,7 +40,7 @@ describe('ConnectionManager', function () { return Controller.startMember(cluster.id); }).then(function (m) { member = m; - }) + }); }); beforeEach(function () { @@ -46,7 +50,9 @@ describe('ConnectionManager', function () { afterEach(function () { testend = true; stopUnresponsiveServer(); - return client.shutdown(); + if (client != null) { + return client.shutdown(); + } }); after(function () { @@ -100,5 +106,16 @@ describe('ConnectionManager', function () { done(new Error('Client should be retrying!\n' + e)); } }); - }) + }); + + it('should throw IllegalStateError if there is an incompatible server', function () { + client = null; + var timeoutTime = 100; + var cfg = new Config.ClientConfig(); + cfg.networkConfig.connectionTimeout = timeoutTime; + cfg.networkConfig.addresses = ['127.0.0.1:9999']; + startUnresponsiveServer(9999); + return expect(Hazelcast.newHazelcastClient(cfg)).to.be.rejectedWith(Errors.IllegalStateError); + }); + }); From cd329d239309e15de26a97ba7d4dfe01a1c2d629 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Fri, 31 Aug 2018 00:50:34 +0300 Subject: [PATCH 127/685] implement Client Statistics and NearCacheManager (#327) --- src/BuildMetadata.ts | 6 +- src/HazelcastClient.ts | 66 ++++++-- src/Util.ts | 24 +++ src/codec/ClientStatisticsCodec.ts | 44 +++++ src/config/Config.ts | 7 + src/invocation/ClientConnection.ts | 9 +- src/invocation/ClusterService.ts | 3 +- src/nearcache/NearCache.ts | 9 + src/nearcache/NearCacheManager.ts | 60 +++++++ src/proxy/NearCachedMapProxy.ts | 41 +++-- src/statistics/Statistics.ts | 263 +++++++++++++++++++++++++++++ test/BuildMetadataTest.js | 34 ++-- test/RepetitionTaskTest.js | 79 +++++++++ test/map/NearCachedMapTest.js | 4 +- test/statistics/StatisticsTest.js | 223 ++++++++++++++++++++++++ 15 files changed, 814 insertions(+), 58 deletions(-) create mode 100644 src/codec/ClientStatisticsCodec.ts create mode 100644 src/nearcache/NearCacheManager.ts create mode 100644 src/statistics/Statistics.ts create mode 100644 test/RepetitionTaskTest.js create mode 100644 test/statistics/StatisticsTest.js diff --git a/src/BuildMetadata.ts b/src/BuildMetadata.ts index dccd10e8f..2f1a2c807 100644 --- a/src/BuildMetadata.ts +++ b/src/BuildMetadata.ts @@ -21,7 +21,7 @@ export class BuildMetadata { private static readonly MINOR_VERSION_MULTIPLIER = 100; private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?(-BETA-.)?$/; - public static calculateVersion(versionString: string): number { + public static calculateVersionFromString(versionString: string): number { if (versionString == null) { return BuildMetadata.UNKNOWN_VERSION_ID; } @@ -37,6 +37,10 @@ export class BuildMetadata { } else { patch = Number.parseInt(info[3]); } + return this.calculateVersion(major, minor, patch); + } + + public static calculateVersion(major: number, minor: number, patch: number): number { return BuildMetadata.MAJOR_VERSION_MULTIPLIER * major + BuildMetadata.MINOR_VERSION_MULTIPLIER * minor + patch; } diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 416c79f99..2d5c05821 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -53,35 +53,50 @@ import {AddressTranslator} from './connection/AddressTranslator'; import {DefaultAddressTranslator} from './connection/DefaultAddressTranslator'; import {DefaultAddressProvider} from './connection/DefaultAddressProvider'; import {HazelcastCloudDiscovery} from './discovery/HazelcastCloudDiscovery'; +import {Statistics} from './statistics/Statistics'; +import {NearCacheManager} from './nearcache/NearCacheManager'; export default class HazelcastClient { + private static CLIENT_ID = 0; + + private readonly instanceName: string; + private readonly id: number = HazelcastClient.CLIENT_ID++; + private readonly config: ClientConfig = new ClientConfig(); + private readonly loggingService: LoggingService; + private readonly serializationService: SerializationService; + private readonly invocationService: InvocationService; + private readonly listenerService: ListenerService; + private readonly connectionManager: ClientConnectionManager; + private readonly partitionService: PartitionService; + private readonly clusterService: ClusterService; + private readonly lifecycleService: LifecycleService; + private readonly proxyManager: ProxyManager; + private readonly nearCacheManager: NearCacheManager; + private readonly heartbeat: Heartbeat; + private readonly lockReferenceIdGenerator: LockReferenceIdGenerator; + private readonly errorFactory: ClientErrorFactory; + private readonly statistics: Statistics; - private config: ClientConfig = new ClientConfig(); - private loggingService: LoggingService; - private serializationService: SerializationService; - private invocationService: InvocationService; - private listenerService: ListenerService; - private connectionManager: ClientConnectionManager; - private partitionService: PartitionService; - private clusterService: ClusterService; - private lifecycleService: LifecycleService; - private proxyManager: ProxyManager; - private heartbeat: Heartbeat; - private lockReferenceIdGenerator: LockReferenceIdGenerator; private mapRepairingTask: RepairingTask; - private errorFactory: ClientErrorFactory; constructor(config?: ClientConfig) { if (config) { this.config = config; } - LoggingService.initialize(this.config.properties['hazelcast.logging'] as string | ILogger); + if (config.getInstanceName() != null) { + this.instanceName = config.getInstanceName(); + } else { + this.instanceName = 'hz.client_' + this.id; + } + + LoggingService.initialize(this.config.properties['hazelcast.logging'] as string); this.loggingService = LoggingService.getLoggingService(); this.invocationService = new InvocationService(this); this.listenerService = new ListenerService(this); this.serializationService = new SerializationServiceV1(this.config.serializationConfig); this.proxyManager = new ProxyManager(this); + this.nearCacheManager = new NearCacheManager(this); this.partitionService = new PartitionService(this); const addressProviders = this.createAddressProviders(); const addressTranslator = this.createAddressTranslator(); @@ -91,6 +106,7 @@ export default class HazelcastClient { this.heartbeat = new Heartbeat(this); this.lockReferenceIdGenerator = new LockReferenceIdGenerator(); this.errorFactory = new ClientErrorFactory(); + this.statistics = new Statistics(this); } /** @@ -111,6 +127,15 @@ export default class HazelcastClient { } } + /** + * Returns the name of this Hazelcast instance. + * + * @return name of this Hazelcast instance + */ + getName(): string { + return this.instanceName; + } + /** * Gathers information of this local client. * @returns {ClientInfo} @@ -125,7 +150,7 @@ export default class HazelcastClient { */ getDistributedObjects(): Promise { const clientMessage = ClientGetDistributedObjectsCodec.encodeRequest(); - const toObjectFunc = this.serializationService.toObject.bind(this); + const toObjectFunc = this.getSerializationService().toObject.bind(this); const proxyManager = this.proxyManager; return this.invocationService.invokeOnRandomTarget(clientMessage).then(function (resp): any { const response = ClientGetDistributedObjectsCodec.decodeResponse(resp, toObjectFunc).response; @@ -265,6 +290,10 @@ export default class HazelcastClient { return this.proxyManager; } + getNearCacheManager(): NearCacheManager { + return this.nearCacheManager; + } + getClusterService(): ClusterService { return this.clusterService; } @@ -284,6 +313,10 @@ export default class HazelcastClient { return this.mapRepairingTask; } + getLoggingService(): LoggingService { + return this.loggingService; + } + /** * Registers a distributed object listener to cluster. * @param listenerFunc Callback function will be called with following arguments. @@ -322,6 +355,8 @@ export default class HazelcastClient { if (this.mapRepairingTask !== undefined) { this.mapRepairingTask.shutdown(); } + this.nearCacheManager.destroyAllNearCaches(); + this.statistics.stop(); this.partitionService.shutdown(); this.lifecycleService.emitLifecycleEvent(LifecycleEvent.shuttingDown); this.heartbeat.cancel(); @@ -341,6 +376,7 @@ export default class HazelcastClient { }).then(() => { this.proxyManager.init(); this.listenerService.start(); + this.statistics.start(); this.loggingService.info('HazelcastClient', 'Client started'); return this; }).catch((e) => { diff --git a/src/Util.ts b/src/Util.ts index b7b5249d8..a45cb3e4b 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -267,3 +267,27 @@ function setAnchor(list: any[], predicate: PagingPredicate, nearestPage: number) predicate.setAnchor(nearestPage, anchor); } } + +export class Task { + intervalId: NodeJS.Timer; + timeoutId: NodeJS.Timer; +} + +export function scheduleWithRepetition(callback: (...args: any[]) => void, initialDelay: number, + periodMillis: number): Task { + const task = new Task(); + task.timeoutId = setTimeout(function (): void { + callback(); + task.intervalId = setInterval(callback, periodMillis); + }, initialDelay); + + return task; +} + +export function cancelRepetitionTask(task: Task): void { + if (task.intervalId != null) { + clearInterval(task.intervalId); + } else if (task.timeoutId != null) { + clearTimeout(task.timeoutId); + } +} diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts new file mode 100644 index 000000000..283ef05f8 --- /dev/null +++ b/src/codec/ClientStatisticsCodec.ts @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* tslint:disable */ +import ClientMessage = require('../ClientMessage'); +import {BitsUtil} from '../BitsUtil'; +import {ClientMessageType} from './ClientMessageType'; + +var REQUEST_TYPE = ClientMessageType.CLIENT_STATISTICS; +var RETRYABLE = false; + + +export class ClientStatisticsCodec { + static calculateSize(stats: string) { + var dataSize: number = 0; + dataSize += BitsUtil.calculateSizeString(stats); + return dataSize; + } + + static encodeRequest(stats: string) { + var clientMessage = ClientMessage.newClientMessage(this.calculateSize(stats)); + clientMessage.setMessageType(REQUEST_TYPE); + clientMessage.setRetryable(RETRYABLE); + clientMessage.appendString(stats); + clientMessage.updateFrameLength(); + return clientMessage; + } + +// Empty decodeResponse(ClientMessage), this message has no parameters to decode + +} diff --git a/src/config/Config.ts b/src/config/Config.ts index b94ef76ec..3a279e349 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -27,6 +27,7 @@ import {NearCacheConfig} from './NearCacheConfig'; import {Properties} from './Properties'; import {ReliableTopicConfig} from './ReliableTopicConfig'; import {SerializationConfig} from './SerializationConfig'; +import {Statistics} from '../statistics/Statistics'; /** * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. @@ -39,6 +40,8 @@ export class ClientConfig { 'hazelcast.client.invocation.retry.pause.millis': 1000, 'hazelcast.client.invocation.timeout.millis': 120000, 'hazelcast.client.cloud.url': 'https://coordinator.hazelcast.cloud', + 'hazelcast.client.statistics.enabled': false, + 'hazelcast.client.statistics.period.seconds': Statistics.PERIOD_SECONDS_DEFAULT_VALUE, 'hazelcast.invalidation.reconciliation.interval.seconds': 60, 'hazelcast.invalidation.max.tolerated.miss.count': 10, 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30, @@ -60,6 +63,10 @@ export class ClientConfig { private configPatternMatcher = new ConfigPatternMatcher(); + getInstanceName(): string { + return this.instanceName; + } + getReliableTopicConfig(name: string): ReliableTopicConfig { const matching = this.lookupByPattern(this.reliableTopicConfigs, name); let config: ReliableTopicConfig; diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 46fa7f1c6..3bfd3efcf 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -24,11 +24,12 @@ import Address = require('../Address'); export class ClientConnection { private address: Address; - private localAddress: Address; + private readonly localAddress: Address; private lastRead: number; private heartbeating = true; private client: HazelcastClient; private readBuffer: Buffer; + private readonly startTime: number = Date.now(); private closedTime: number; private connectedServerVersionString: string; private connectedServerVersion: number; @@ -85,7 +86,7 @@ export class ClientConnection { setConnectedServerVersion(versionString: string): void { this.connectedServerVersionString = versionString; - this.connectedServerVersion = BuildMetadata.calculateVersion(versionString); + this.connectedServerVersion = BuildMetadata.calculateVersionFromString(versionString); } getConnectedServerVersion(): number { @@ -120,6 +121,10 @@ export class ClientConnection { this.authenticatedAsOwner = asOwner; } + getStartTime(): number { + return this.startTime; + } + getLastRead(): number { return this.lastRead; } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 9c63dcb82..e46452b68 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -26,6 +26,7 @@ import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; import {createAddressFromString} from '../Util'; +import {BuildMetadata} from '../BuildMetadata'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); @@ -205,7 +206,7 @@ export class ClusterService extends EventEmitter { private tryConnectingToAddresses(index: number, remainingAttemptLimit: number, attemptPeriod: number, cause?: Error): Promise { this.logger.debug('ClusterService', 'Trying to connect to addresses, remaining attempt limit: ' + remainingAttemptLimit - + 'attempt period: ' + attemptPeriod); + + ', attempt period: ' + attemptPeriod); if (this.knownAddresses.length <= index) { remainingAttemptLimit = remainingAttemptLimit - 1; if (remainingAttemptLimit === 0) { diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 4c292bcde..eef4d1d62 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -28,6 +28,7 @@ import {StaleReadDetector} from './StaleReadDetector'; import * as Promise from 'bluebird'; export interface NearCacheStatistics { + creationTime: number; evictedCount: number; expiredCount: number; missCount: number; @@ -40,6 +41,8 @@ export interface NearCache { get(key: Data): Promise; + getName(): string; + invalidate(key: Data): void; clear(): void; @@ -78,6 +81,7 @@ export class NearCacheImpl implements NearCache { private expiredCount: number = 0; private missCount: number = 0; private hitCount: number = 0; + private creationTime = new Date().getTime(); private compareFunc: (x: DataRecord, y: DataRecord) => number; private ready: Promise.Resolver; @@ -111,6 +115,10 @@ export class NearCacheImpl implements NearCache { this.ready.resolve(); } + getName(): string { + return this.name; + } + nextReservationId(): Long { const res = this.reservationCounter; this.reservationCounter = this.reservationCounter.add(1); @@ -224,6 +232,7 @@ export class NearCacheImpl implements NearCache { getStatistics(): NearCacheStatistics { const stats: NearCacheStatistics = { + creationTime: this.creationTime, evictedCount: this.evictedCount, expiredCount: this.expiredCount, missCount: this.missCount, diff --git a/src/nearcache/NearCacheManager.ts b/src/nearcache/NearCacheManager.ts new file mode 100644 index 000000000..1ab3dcc21 --- /dev/null +++ b/src/nearcache/NearCacheManager.ts @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {NearCache, NearCacheImpl} from './NearCache'; +import {SerializationService} from '../serialization/SerializationService'; +import HazelcastClient from '../HazelcastClient'; + +export class NearCacheManager { + + protected readonly serializationService: SerializationService; + private readonly caches: Map = new Map(); + private readonly client: HazelcastClient; + + constructor(client: HazelcastClient) { + this.client = client; + } + + public getOrCreateNearCache(name: string): NearCache { + let nearCache = this.caches.get(name); + if (nearCache == null) { + nearCache = new NearCacheImpl(this.client.getConfig().getNearCacheConfig(name), + this.client.getSerializationService()); + + this.caches.set(name, nearCache); + } + return nearCache; + } + + public destroyNearCache(name: string): void { + const nearCache = this.caches.get(name); + if (nearCache != null) { + this.caches.delete(name); + nearCache.clear(); + } + } + + public destroyAllNearCaches(): void { + for (const key of Array.from(this.caches.keys())) { + this.destroyNearCache(key); + } + } + + public listAllNearCaches(): NearCache[] { + return Array.from(this.caches.values()); + } + +} diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index acb94d303..f0c3c3a34 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -15,7 +15,6 @@ */ import * as Promise from 'bluebird'; -import {BuildMetadata} from '../BuildMetadata'; import {MapAddNearCacheEntryListenerCodec} from '../codec/MapAddNearCacheEntryListenerCodec'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; @@ -23,14 +22,13 @@ import {EntryEventType} from '../core/EntryEventType'; import {UUID} from '../core/UUID'; import HazelcastClient from '../HazelcastClient'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {NearCache, NearCacheImpl} from '../nearcache/NearCache'; +import {NearCache} from '../nearcache/NearCache'; import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetectorImpl'; import {Data} from '../serialization/Data'; import {MapProxy} from './MapProxy'; +import {BuildMetadata} from '../BuildMetadata'; import ClientMessage = require('../ClientMessage'); -const MIN_EVENTUALLY_CONSISTENT_NEARCACHE_VERSION = BuildMetadata.calculateVersion('3.8'); - export class NearCachedMapProxy extends MapProxy { private nearCache: NearCache; @@ -38,8 +36,8 @@ export class NearCachedMapProxy extends MapProxy { constructor(client: HazelcastClient, servicename: string, name: string) { super(client, servicename, name); - this.nearCache = new NearCacheImpl(this.client.getConfig().getNearCacheConfig(name), - this.client.getSerializationService()); + + this.nearCache = this.client.getNearCacheManager().getOrCreateNearCache(name); if (this.nearCache.isInvalidatedOnChange()) { this.addNearCacheInvalidationListener().then((id: string) => { this.invalidationListenerId = id; @@ -71,11 +69,11 @@ export class NearCachedMapProxy extends MapProxy { protected deleteInternal(keyData: Data): Promise { this.nearCache.invalidate(keyData); - return super.deleteInternal(keyData).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.deleteInternal(keyData).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected evictInternal(key: Data): Promise { - return super.evictInternal(key).then(this.invalidatCacheEntryAndReturn.bind(this, key)); + return super.evictInternal(key).then(this.invalidateCacheEntryAndReturn.bind(this, key)); } protected putAllInternal(partitionsToKeysData: { [id: string]: Array<[Data, Data]> }): Promise { @@ -90,27 +88,27 @@ export class NearCachedMapProxy extends MapProxy { protected postDestroy(): Promise { return this.removeNearCacheInvalidationListener().then(() => { - this.client.getRepairingTask().deregisterHandler(this.name); + this.client.getNearCacheManager().destroyNearCache(this.name); }).then(() => { return super.postDestroy(); }); } protected putIfAbsentInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return super.putIfAbsentInternal(keyData, valueData, ttl).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.putIfAbsentInternal(keyData, valueData, ttl).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected putTransientInternal(keyData: Data, valueData: Data, ttl: number): Promise { return super - .putTransientInternal(keyData, valueData, ttl).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + .putTransientInternal(keyData, valueData, ttl).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected executeOnKeyInternal(keyData: Data, proData: Data): Promise { - return super.executeOnKeyInternal(keyData, proData).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.executeOnKeyInternal(keyData, proData).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected putInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return super.putInternal(keyData, valueData, ttl).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.putInternal(keyData, valueData, ttl).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected getInternal(keyData: Data): Promise { @@ -131,11 +129,11 @@ export class NearCachedMapProxy extends MapProxy { } protected tryRemoveInternal(keyData: Data, timeout: number): Promise { - return super.tryRemoveInternal(keyData, timeout).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.tryRemoveInternal(keyData, timeout).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected removeInternal(keyData: Data, value: V): Promise { - return super.removeInternal(keyData, value).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.removeInternal(keyData, value).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected getAllInternal(partitionsToKeys: { [id: string]: any }, result: any[] = []): Promise { @@ -177,27 +175,28 @@ export class NearCachedMapProxy extends MapProxy { protected replaceIfSameInternal(keyData: Data, oldValueData: Data, newValueData: Data): Promise { return super.replaceIfSameInternal(keyData, oldValueData, newValueData) - .then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + .then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected replaceInternal(keyData: Data, valueData: Data): Promise { - return super.replaceInternal(keyData, valueData).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.replaceInternal(keyData, valueData).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected setInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return super.setInternal(keyData, valueData, ttl).then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + return super.setInternal(keyData, valueData, ttl).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected tryPutInternal(keyData: Data, valueData: Data, timeout: number): Promise { return super.tryPutInternal(keyData, valueData, timeout) - .then(this.invalidatCacheEntryAndReturn.bind(this, keyData)); + .then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } private removeNearCacheInvalidationListener(): Promise { + this.client.getRepairingTask().deregisterHandler(this.name); return this.client.getListenerService().deregisterListener(this.invalidationListenerId); } - private invalidatCacheEntryAndReturn(keyData: Data, retVal: T): T { + private invalidateCacheEntryAndReturn(keyData: Data, retVal: T): T { this.nearCache.invalidate(keyData); return retVal; } @@ -248,7 +247,7 @@ export class NearCachedMapProxy extends MapProxy { } private supportsRepairableNearCache(): boolean { - return this.getConnectedServerVersion() >= MIN_EVENTUALLY_CONSISTENT_NEARCACHE_VERSION; + return this.getConnectedServerVersion() >= BuildMetadata.calculateVersion(3, 8, 0); } private createPre38NearCacheEventHandler(): Function { diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts new file mode 100644 index 000000000..0849a2ec0 --- /dev/null +++ b/src/statistics/Statistics.ts @@ -0,0 +1,263 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import HazelcastClient from '../HazelcastClient'; +import {LoggingService} from '../logging/LoggingService'; +import {ClientConnection} from '../invocation/ClientConnection'; +import {Properties} from '../config/Properties'; +import {ClientStatisticsCodec} from '../codec/ClientStatisticsCodec'; +import * as Util from '../Util'; +import {Task} from '../Util'; +import {BuildInfoLoader} from '../BuildInfoLoader'; +import * as os from 'os'; +import {BuildMetadata} from '../BuildMetadata'; +import Address = require('../Address'); + +/** + * This class is the main entry point for collecting and sending the client + * statistics to the cluster. If the client statistics feature is enabled, + * it will be scheduled for periodic statistics collection and sent. + */ +export class Statistics { + + public static readonly PERIOD_SECONDS_DEFAULT_VALUE = 3; + private static readonly ENABLED = 'hazelcast.client.statistics.enabled'; + private static readonly PERIOD_SECONDS = 'hazelcast.client.statistics.period.seconds'; + + private static readonly NEAR_CACHE_CATEGORY_PREFIX: string = 'nc.'; + private static readonly FEATURE_SUPPORTED_SINCE_VERSION_STRING: string = '3.9'; + private static readonly FEATURE_SUPPORTED_SINCE_VERSION: number = BuildMetadata.calculateVersionFromString( + Statistics.FEATURE_SUPPORTED_SINCE_VERSION_STRING); + private static readonly STAT_SEPARATOR: string = ','; + private static readonly KEY_VALUE_SEPARATOR: string = '='; + private static readonly ESCAPE_CHAR: string = '\\'; + private static readonly EMPTY_STAT_VALUE: string = ''; + private readonly allGauges: { [name: string]: () => any } = {}; + private readonly enabled: boolean; + private readonly properties: Properties; + private readonly logger = LoggingService.getLoggingService(); + private client: HazelcastClient; + private ownerAddress: Address; + private task: Task; + + constructor(clientInstance: HazelcastClient) { + this.properties = clientInstance.getConfig().properties; + this.enabled = this.properties[Statistics.ENABLED] as boolean; + this.client = clientInstance; + } + + /** + * Registers all client statistics and schedules periodic collection of stats. + */ + start(): void { + if (!this.enabled) { + return; + } + + this.registerMetrics(); + + let periodSeconds = this.properties[Statistics.PERIOD_SECONDS] as number; + if (periodSeconds <= 0) { + const defaultValue = Statistics.PERIOD_SECONDS_DEFAULT_VALUE; + this.logger.warn('Statistics', 'Provided client statistics ' + Statistics.PERIOD_SECONDS + + ' can not be less than or equal to 0. You provided ' + periodSeconds + + ' seconds as the configuration. Client will use the default value of ' + defaultValue + ' instead.'); + periodSeconds = defaultValue; + } + + this.task = this.schedulePeriodicStatisticsSendTask(periodSeconds); + + this.logger.info('Statistics', 'Client statistics is enabled with period ' + periodSeconds + ' seconds.'); + } + + stop(): void { + if (this.task != null) { + Util.cancelRepetitionTask(this.task); + } + } + + /** + * @param periodSeconds the interval at which the statistics collection and send is being run + */ + schedulePeriodicStatisticsSendTask(periodSeconds: number): Task { + return Util.scheduleWithRepetition(() => { + const ownerConnection: ClientConnection = this.getOwnerConnection(); + if (ownerConnection == null) { + this.logger.trace('Statistics', 'Can not send client statistics to the server. No owner connection.'); + return; + } + + const stats: string[] = []; + + this.fillMetrics(stats, ownerConnection); + + this.addNearCacheStats(stats); + + this.sendStats(stats.join(''), ownerConnection); + }, 0, periodSeconds * 1000); + } + + sendStats(newStats: string, ownerConnection: ClientConnection): void { + const request = ClientStatisticsCodec.encodeRequest(newStats); + + this.client.getInvocationService().invokeOnTarget(request, ownerConnection.getAddress()).catch((err) => { + this.logger.trace('Statistics', 'Could not send stats ', err); + }); + } + + /** + * @return the owner connection to the server for the client only if the server supports the client statistics feature + */ + private getOwnerConnection(): ClientConnection { + const connection = this.client.getClusterService().getOwnerConnection(); + if (connection == null) { + return null; + } + + const ownerConnectionAddress: Address = connection.getAddress(); + const serverVersion: number = connection.getConnectedServerVersion(); + if (serverVersion < Statistics.FEATURE_SUPPORTED_SINCE_VERSION) { + + // do not print too many logs if connected to an old version server + if (this.ownerAddress == null || !ownerConnectionAddress.equals(this.ownerAddress)) { + this.logger.trace('Statistics', 'Client statistics can not be sent to server ' + + ownerConnectionAddress + ' since, connected ' + + 'owner server version is less than the minimum supported server version ' + + Statistics.FEATURE_SUPPORTED_SINCE_VERSION_STRING); + + } + // cache the last connected server address for decreasing the log prints + this.ownerAddress = ownerConnectionAddress; + return null; + } + return connection; + } + + private registerMetrics(): void { + this.registerGauge('os.committedVirtualMemorySize', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('os.freePhysicalMemorySize', () => os.freemem()); + this.registerGauge('os.freeSwapSpaceSize', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('os.maxFileDescriptorCount', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('os.openFileDescriptorCount', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('os.processCpuTime', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('os.systemLoadAverage', () => '[' + os.loadavg().toString() + ']'); + this.registerGauge('os.totalPhysicalMemorySize', () => os.totalmem()); + this.registerGauge('os.totalSwapSpaceSize', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('runtime.availableProcessors', () => os.cpus().length); + this.registerGauge('runtime.freeMemory', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('runtime.maxMemory', () => Statistics.EMPTY_STAT_VALUE); + this.registerGauge('runtime.totalMemory', () => process.memoryUsage().heapTotal); + this.registerGauge('runtime.uptime', () => process.uptime()); + this.registerGauge('runtime.usedMemory', () => process.memoryUsage().heapUsed); + this.registerGauge('executionService.userExecutorQueueSize', () => Statistics.EMPTY_STAT_VALUE); + } + + private registerGauge(gaugeName: string, gaugeFunc: () => any): void { + try { + // try a gauge function read, we will register it if it succeeds. + gaugeFunc(); + this.allGauges[gaugeName] = gaugeFunc; + } catch (e) { + this.logger.warn('Statistics', 'Could not collect data for gauge ' + gaugeName + ' , it won\'t be registered', e); + this.allGauges[gaugeName] = () => Statistics.EMPTY_STAT_VALUE; + } + } + + private addStat(stats: string[], name: string, value: any, keyPrefix?: string): void { + if (stats.length !== 0) { + stats.push(Statistics.STAT_SEPARATOR); + } + + if (keyPrefix != null) { + stats.push(keyPrefix); + } + + stats.push(name); + stats.push(Statistics.KEY_VALUE_SEPARATOR); + stats.push(value); + } + + private addEmptyStat(stats: string[], name: string, keyPrefix: string): void { + this.addStat(stats, name, Statistics.EMPTY_STAT_VALUE, keyPrefix); + } + + private fillMetrics(stats: string[], ownerConnection: ClientConnection): void { + this.addStat(stats, 'lastStatisticsCollectionTime', new Date().getTime()); + this.addStat(stats, 'enterprise', 'false'); + this.addStat(stats, 'clientType', this.client.getClusterService().getClientInfo().type); + this.addStat(stats, 'clientVersion', BuildInfoLoader.getClientVersion()); + this.addStat(stats, 'clusterConnectionTimestamp', ownerConnection.getStartTime()); + this.addStat(stats, 'clientAddress', ownerConnection.getLocalAddress().toString()); + this.addStat(stats, 'clientName', this.client.getName()); + this.addStat(stats, 'credentials.principal', this.client.getConfig().groupConfig.name); + + for (const gaugeName in this.allGauges) { + const gaugeValueFunc = this.allGauges[gaugeName]; + + try { + const value = gaugeValueFunc(); + this.addStat(stats, gaugeName, value); + } catch (e) { + this.logger.trace('Could not collect data for gauge ' + gaugeName, e); + + } + } + } + + private getNameWithPrefix(name: string): string[] { + const escapedName = [Statistics.NEAR_CACHE_CATEGORY_PREFIX]; + const prefixLen = Statistics.NEAR_CACHE_CATEGORY_PREFIX.length; + escapedName.push(name); + if (escapedName[prefixLen] === '/') { + escapedName.splice(prefixLen, 1); + } + + this.escapeSpecialCharacters(escapedName, prefixLen); + return escapedName; + } + + private escapeSpecialCharacters(buffer: string[], start: number): void { + for (let i = start; i < buffer.length; i++) { + const c = buffer[i]; + if (c === '=' || c === '.' || c === ',' || c === Statistics.ESCAPE_CHAR) { + buffer.splice(i, 0, Statistics.ESCAPE_CHAR); + i++; + } + } + } + + private addNearCacheStats(stats: string[]): void { + for (const nearCache of this.client.getNearCacheManager().listAllNearCaches()) { + const nearCacheNameWithPrefix = this.getNameWithPrefix(nearCache.getName()); + nearCacheNameWithPrefix.push('.'); + const nearCacheStats = nearCache.getStatistics(); + const prefix = nearCacheNameWithPrefix.join(''); + this.addStat(stats, 'creationTime', nearCacheStats.creationTime, prefix); + this.addStat(stats, 'evictions', nearCacheStats.evictedCount, prefix); + this.addStat(stats, 'hits', nearCacheStats.hitCount, prefix); + this.addEmptyStat(stats, 'lastPersistenceDuration', prefix); + this.addEmptyStat(stats, 'lastPersistenceKeyCount', prefix); + this.addEmptyStat(stats, 'lastPersistenceTime', prefix); + this.addEmptyStat(stats, 'lastPersistenceWrittenBytes', prefix); + this.addStat(stats, 'misses', nearCacheStats.missCount, prefix); + this.addStat(stats, 'ownedEntryCount', nearCacheStats.entryCount, prefix); + this.addStat(stats, 'expirations', nearCacheStats.expiredCount, prefix); + this.addEmptyStat(stats, 'ownedEntryMemoryCost', prefix); + this.addEmptyStat(stats, 'lastPersistenceFailure', prefix); + } + } + +} diff --git a/test/BuildMetadataTest.js b/test/BuildMetadataTest.js index 18874b54b..4d93ff8b8 100644 --- a/test/BuildMetadataTest.js +++ b/test/BuildMetadataTest.js @@ -19,21 +19,25 @@ var assert = require('chai').assert; describe('BuildMetadata', function () { it('version calculation test', function () { - assert.equal(-1, BuildMetadata.calculateVersion(null)); - assert.equal(-1, BuildMetadata.calculateVersion("")); - assert.equal(-1, BuildMetadata.calculateVersion("a.3.7.5")); - assert.equal(-1, BuildMetadata.calculateVersion("3.a.5")); - assert.equal(-1, BuildMetadata.calculateVersion("3,7.5")); - assert.equal(-1, BuildMetadata.calculateVersion("3.7,5")); - assert.equal(-1, BuildMetadata.calculateVersion("10.99.RC1")); + assert.equal(-1, BuildMetadata.calculateVersionFromString(null)); + assert.equal(-1, BuildMetadata.calculateVersionFromString("")); + assert.equal(-1, BuildMetadata.calculateVersionFromString("a.3.7.5")); + assert.equal(-1, BuildMetadata.calculateVersionFromString("3.a.5")); + assert.equal(-1, BuildMetadata.calculateVersionFromString("3,7.5")); + assert.equal(-1, BuildMetadata.calculateVersionFromString("3.7,5")); + assert.equal(-1, BuildMetadata.calculateVersionFromString("10.99.RC1")); - assert.equal(30700, BuildMetadata.calculateVersion("3.7")); - assert.equal(30700, BuildMetadata.calculateVersion("3.7-SNAPSHOT")); - assert.equal(30702, BuildMetadata.calculateVersion("3.7.2")); - assert.equal(30702, BuildMetadata.calculateVersion("3.7.2-SNAPSHOT")); - assert.equal(109902, BuildMetadata.calculateVersion("10.99.2-SNAPSHOT")); - assert.equal(19930, BuildMetadata.calculateVersion("1.99.30")); - assert.equal(109930, BuildMetadata.calculateVersion("10.99.30-SNAPSHOT")); - assert.equal(109900, BuildMetadata.calculateVersion("10.99-RC1")); + assert.equal(30700, BuildMetadata.calculateVersion(3, 7, 0)); + assert.equal(30702, BuildMetadata.calculateVersion(3, 7, 2)); + assert.equal(19930, BuildMetadata.calculateVersion(1, 99, 30)); + + assert.equal(30700, BuildMetadata.calculateVersionFromString("3.7")); + assert.equal(30700, BuildMetadata.calculateVersionFromString("3.7-SNAPSHOT")); + assert.equal(30702, BuildMetadata.calculateVersionFromString("3.7.2")); + assert.equal(30702, BuildMetadata.calculateVersionFromString("3.7.2-SNAPSHOT")); + assert.equal(109902, BuildMetadata.calculateVersionFromString("10.99.2-SNAPSHOT")); + assert.equal(19930, BuildMetadata.calculateVersionFromString("1.99.30")); + assert.equal(109930, BuildMetadata.calculateVersionFromString("10.99.30-SNAPSHOT")); + assert.equal(109900, BuildMetadata.calculateVersionFromString("10.99-RC1")); }); }); diff --git a/test/RepetitionTaskTest.js b/test/RepetitionTaskTest.js new file mode 100644 index 000000000..e6927ef2a --- /dev/null +++ b/test/RepetitionTaskTest.js @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; + +var Util = require("../lib/Util"); +var TestUtil = require('./Util'); + +describe('Repetition Task', function () { + + it('should be cancelled before timeout', function () { + var counter = 0; + var task = Util.scheduleWithRepetition(function () { + counter++; + }, 50, 75); + + return TestUtil.promiseWaitMilliseconds(40).then(function () { + Util.cancelRepetitionTask(task); + expect(counter).to.be.equal(0); + }).then(function () { + return TestUtil.promiseWaitMilliseconds(130) + }).then(function () { + expect(counter).to.be.equal(0); + }); + }); + + it('should be cancelled after timeout', function () { + var counter = 0; + var task = Util.scheduleWithRepetition(function () { + counter++; + }, 50, 75); + + return TestUtil.promiseWaitMilliseconds(60).then(function () { + Util.cancelRepetitionTask(task); + expect(counter).to.be.equal(1); + }).then(function () { + return TestUtil.promiseWaitMilliseconds(75) + }).then(function () { + expect(counter).to.be.equal(1); + }); + }); + + it('should be cancelled after interval', function () { + var counter = 0; + var task = Util.scheduleWithRepetition(function () { + counter++; + }, 50, 75); + + return TestUtil.promiseWaitMilliseconds(130).then(function () { + Util.cancelRepetitionTask(task); + expect(counter).to.be.equal(2); + }).then(function () { + return TestUtil.promiseWaitMilliseconds(75) + }).then(function () { + expect(counter).to.be.equal(2); + }); + }); + + it('should not throw when cancelled twice', function () { + var task = Util.scheduleWithRepetition(function () { + }, 100, 200); + + Util.cancelRepetitionTask(task); + Util.cancelRepetitionTask(task); + }); +}); diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 89d0330f4..ec83f0826 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -16,8 +16,6 @@ var expect = require("chai").expect; var HazelcastClient = require("../../.").Client; -var Predicates = require("../../.").Predicates; -var Promise = require("bluebird"); var Controller = require('./../RC'); var Util = require('./../Util'); var Config = require('../../.').Config; @@ -102,7 +100,7 @@ describe("NearCachedMap", function () { return map1.get('key1'); }).then(function (val) { var stats = getNearCacheStats(map1); - expect(val).to.be.be.null; + expect(val).to.be.null; expect(stats.hitCount).to.equal(0); expect(stats.missCount).to.equal(2); expect(stats.entryCount).to.equal(1); diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js new file mode 100644 index 000000000..999e35954 --- /dev/null +++ b/test/statistics/StatisticsTest.js @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var Promise = require('bluebird'); + +var RC = require('../RC'); +var Client = require('../../').Client; +var Util = require('../Util'); +var Config = require('../../').Config; +var BuildInfoLoader = require('../../lib/BuildInfoLoader').BuildInfoLoader; + + +describe('Statistics with default period', function () { + + var cluster; + var client; + var map; + var member; + + before(function () { + return RC.createCluster(null, null).then(function (res) { + cluster = res; + }).then(function () { + return RC.startMember(cluster.id); + }).then(function (m) { + member = m; + var cfg = new Config.ClientConfig(); + var ncc = new Config.NearCacheConfig(); + ncc.name = 'nearCachedMap*'; + ncc.invalidateOnChange = false; + cfg.nearCacheConfigs['nearCachedMap*'] = ncc; + cfg.properties['hazelcast.client.statistics.enabled'] = true; + return Client.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; + map = client.getMap('nearCachedMap1'); + }); + }); + + after(function () { + map.destroy(); + client.shutdown(); + RC.shutdownCluster(cluster.id); + }); + + it('should be enabled via configuration', function () { + return Util.promiseWaitMilliseconds(1000).then(function () { + return getClientStatisticsFromServer(cluster); + }).then(function (stats) { + expect(stats).to.not.equal(''); + }); + }); + + it('should contain statistics content', function () { + return Util.promiseWaitMilliseconds(1000).then(function () { + return getClientStatisticsFromServer(cluster); + }).then(function (stats) { + expect(stats).to.not.be.null; + expect(contains(stats, 'clientName=' + client.getName())).to.be.true; + expect(contains(stats, 'lastStatisticsCollectionTime=')).to.be.true; + expect(contains(stats, 'enterprise=false')).to.be.true; + expect(contains(stats, 'clientType=NodeJS')).to.be.true; + expect(contains(stats, 'clientVersion=' + BuildInfoLoader.getClientVersion())).to.be.true; + + var ownerConnection = client.getClusterService().getOwnerConnection(); + expect(contains(stats, 'clusterConnectionTimestamp=' + ownerConnection.getStartTime())).to.be.true; + expect(contains(stats, 'clientAddress=' + ownerConnection.getLocalAddress().toString())).to.be.true; + expect(contains(stats, 'os.committedVirtualMemorySize=')).to.be.true; + expect(contains(stats, 'os.freeSwapSpaceSize=')).to.be.true; + expect(contains(stats, 'os.maxFileDescriptorCount=')).to.be.true; + expect(contains(stats, 'os.openFileDescriptorCount=')).to.be.true; + expect(contains(stats, 'os.processCpuTime=')).to.be.true; + expect(contains(stats, 'os.systemLoadAverage=')).to.be.true; + expect(contains(stats, 'os.totalPhysicalMemorySize=')).to.be.true; + expect(contains(stats, 'os.totalSwapSpaceSize=')).to.be.true; + expect(contains(stats, 'runtime.availableProcessors=')).to.be.true; + expect(contains(stats, 'runtime.freeMemory=')).to.be.true; + expect(contains(stats, 'runtime.maxMemory=')).to.be.true; + expect(contains(stats, 'runtime.totalMemory=')).to.be.true; + expect(contains(stats, 'runtime.uptime=')).to.be.true; + expect(contains(stats, 'runtime.usedMemory=')).to.be.true; + expect(contains(stats, 'executionService.userExecutorQueueSize=')).to.be.true; + }); + + + }); + + it('should contain near cache statistics content', function () { + return map.put('key', 'value').then(function () { + return map.get('key'); + }).then(function () { + return map.get('key'); + }).then(function () { + return Util.promiseWaitMilliseconds(5000); + }).then(function () { + return getClientStatisticsFromServer(cluster); + }).then(function (stats) { + expect(contains(stats, 'nc.nearCachedMap1.hits=1')).to.be.true; + expect(contains(stats, 'nc.nearCachedMap1.creationTime=')).to.be.true; + expect(contains(stats, 'nc.nearCachedMap1.misses=1')).to.be.true; + expect(contains(stats, 'nc.nearCachedMap1.ownedEntryCount=1')).to.be.true; + }); + }); + + function contains(base, search) { + var firstIndex = base.indexOf(search); + return firstIndex > -1 && firstIndex == base.lastIndexOf(search); + } + +}); + +describe('Statistics with non-default period', function () { + var cluster; + var client; + + before(function () { + return RC.createCluster(null, null).then(function (res) { + cluster = res; + }).then(function () { + return RC.startMember(cluster.id); + }).then(function () { + var cfg = new Config.ClientConfig(); + cfg.properties['hazelcast.client.statistics.enabled'] = true; + cfg.properties['hazelcast.client.statistics.period.seconds'] = 2; + return Client.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; + }); + }); + + + after(function () { + client.shutdown(); + RC.shutdownCluster(cluster.id); + }); + + it('should not change before period', function () { + var stats1; + return Util.promiseWaitMilliseconds(1000).then(function () { + return getClientStatisticsFromServer(cluster); + }).then(function (st) { + stats1 = st; + return getClientStatisticsFromServer(cluster) + }).then(function (stats2) { + expect(stats1).to.be.equal(stats2); + }); + }); + + it('should change after period', function () { + var stats1; + return Util.promiseWaitMilliseconds(1000).then(function () { + return getClientStatisticsFromServer(cluster); + }).then(function (st) { + stats1 = st; + return Util.promiseWaitMilliseconds(2000) + }).then(function () { + return getClientStatisticsFromServer(cluster); + }).then(function (stats2) { + expect(stats1).not.to.be.equal(stats2); + }); + }); +}); + +describe('Statistics with negative period', function () { + var client; + var cluster; + + before(function () { + return RC.createCluster(null, null).then(function (res) { + cluster = res; + }).then(function () { + return RC.startMember(cluster.id); + }).then(function () { + var cfg = new Config.ClientConfig(); + cfg.properties['hazelcast.client.statistics.enabled'] = true; + cfg.properties['hazelcast.client.statistics.period.seconds'] = -2; + return Client.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; + }); + }); + + after(function () { + client.shutdown(); + RC.shutdownCluster(cluster.id); + }); + + it('should be enabled via configuration', function () { + return Util.promiseWaitMilliseconds(1000).then(function () { + return getClientStatisticsFromServer(cluster); + }).then(function (stats) { + expect(stats).to.not.equal(''); + }); + }); +}); + +function getClientStatisticsFromServer(cluster) { + var deferred = Promise.defer(); + var script = 'client0=instance_0.getClientService().getConnectedClients().' + + 'toArray()[0]\nresult=client0.getClientStatistics();'; + RC.executeOnController(cluster.id, script, 1).then(function (response) { + if (response.result != null) { + return deferred.resolve(response.result.toString()); + } + return deferred.resolve(null); + }); + + return deferred.promise; +} From c64ab424e8d7b94d6233d7a3851f418e987c01f6 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Fri, 31 Aug 2018 21:33:54 +0300 Subject: [PATCH 128/685] fix Lost connection test (#339) --- test/LostConnectionTest.js | 53 +++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index 9e393d8aa..231ad546c 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -18,27 +18,26 @@ var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; var Config = require('../.').Config; +var Util = require('./Util'); + describe('Lost connection', function () { var cluster; - var member1; + var oldMember; var client; - before(function (done) { - Controller.createCluster(null, null).then(function (res) { + before(function () { + return Controller.createCluster(null, null).then(function (res) { cluster = res; - Controller.startMember(cluster.id).then(function (res) { - member1 = res; - var cfg = new Config.ClientConfig(); - cfg.properties['hazelcast.client.heartbeat.interval'] = 500; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (res) { - client = res; - done(); - }).catch(function (err) { - done(err); - }); - }).catch(function (err) { - done(err); + }).then(function () { + return Controller.startMember(cluster.id); + }).then(function (m) { + oldMember = m; + }).then(function () { + var cfg = new Config.ClientConfig(); + cfg.properties['hazelcast.client.heartbeat.interval'] = 500; + cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; + return HazelcastClient.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; }); }); @@ -51,16 +50,16 @@ describe('Lost connection', function () { this.timeout(12000); var newMember; client.clusterService.on('memberAdded', function () { - Controller.shutdownMember(cluster.id, member1.uuid).then(function () { - setTimeout(function () { - try { - expect(client.clusterService.getOwnerConnection().address.host).to.be.eq(newMember.host); - expect(client.clusterService.getOwnerConnection().address.port).to.be.eq(newMember.port); - done(); - } catch (e) { - done(e); - } - }, 2500) + Controller.shutdownMember(cluster.id, oldMember.uuid).then(function () { + return Util.promiseWaitMilliseconds(4000); + }).then(function () { + try { + expect(client.clusterService.getOwnerConnection().address.host).to.be.eq(newMember.host); + expect(client.clusterService.getOwnerConnection().address.port).to.be.eq(newMember.port); + done(); + } catch (e) { + done(e); + } }); }); Controller.startMember(cluster.id).then(function (m) { From 2dd076542b146a27366db5627313f00f5caa1b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Wed, 15 Aug 2018 17:27:41 +0300 Subject: [PATCH 129/685] fix Listeners on reconnect restart member test --- test/ListenersOnReconnectTest.js | 105 ++++++++++++++++--------------- 1 file changed, 53 insertions(+), 52 deletions(-) diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 064250cf0..799ccc53a 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -36,53 +36,54 @@ describe('Listeners on reconnect', function () { }); afterEach(function () { - map.destroy(); - client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return map.destroy().then(function () { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); }); - [true, false].forEach(function (isSmart) { - - function closeTwoMembersOfThreeAndTestListener(done, membersToClose, turnoffMember) { - Controller.startMember(cluster.id).then(function (m) { - members[0] = m; - return Controller.startMember(cluster.id); - }).then(function (m) { - members[1] = m; - return Controller.startMember(cluster.id); - }).then(function (m) { - members[2] = m; - var cfg = new Config.ClientConfig(); - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; - cfg.networkConfig.smartRouting = isSmart; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (cl) { - client = cl; - map = client.getMap('testmap'); - var listenerObject = { - added: function (key, oldValue, value, mergingValue) { - try { - expect(key).to.equal('keyx'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('valx'); - expect(mergingValue).to.be.undefined; - done(); - } catch (err) { - done(err); - } + function closeTwoMembersOfThreeAndTestListener(done, isSmart, membersToClose, turnoffMember) { + Controller.startMember(cluster.id).then(function (m) { + members[0] = m; + return Controller.startMember(cluster.id); + }).then(function (m) { + members[1] = m; + return Controller.startMember(cluster.id); + }).then(function (m) { + members[2] = m; + var cfg = new Config.ClientConfig(); + cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; + cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; + cfg.networkConfig.smartRouting = isSmart; + return HazelcastClient.newHazelcastClient(cfg); + }).then(function (cl) { + client = cl; + map = client.getMap('testmap'); + var listenerObject = { + added: function (key, oldValue, value, mergingValue) { + try { + expect(key).to.equal('keyx'); + expect(oldValue).to.be.undefined; + expect(value).to.equal('valx'); + expect(mergingValue).to.be.undefined; + done(); + } catch (err) { + done(err); } - }; - return map.addEntryListener(listenerObject, 'keyx', true); - }).then(function () { - return Promise.all([ - turnoffMember(cluster.id, members[membersToClose[0]].uuid), - turnoffMember(cluster.id, members[membersToClose[1]].uuid) - ]); - }).then(function () { - map.put('keyx', 'valx'); - }); - } + } + }; + return map.addEntryListener(listenerObject, 'keyx', true); + }).then(function () { + return Promise.all([ + turnoffMember(cluster.id, members[membersToClose[0]].uuid), + turnoffMember(cluster.id, members[membersToClose[1]].uuid) + ]); + }).then(function () { + return map.put('keyx', 'valx'); + }); + } + + [true, false].forEach(function (isSmart) { /** * We use three members to simulate all configurations where connection is closed to; @@ -92,27 +93,27 @@ describe('Listeners on reconnect', function () { */ it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.terminateMember); + closeTwoMembersOfThreeAndTestListener(done, isSmart, [1, 2], Controller.terminateMember); }); it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, [0, 1], Controller.terminateMember); + closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 1], Controller.terminateMember); }); it('kill two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, [0, 2], Controller.terminateMember); + closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 2], Controller.terminateMember); }); it('shutdown two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, [1, 2], Controller.shutdownMember); + closeTwoMembersOfThreeAndTestListener(done, isSmart, [1, 2], Controller.shutdownMember); }); it('shutdown two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, [0, 1], Controller.shutdownMember); + closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 1], Controller.shutdownMember); }); it('shutdown two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, [0, 2], Controller.shutdownMember); + closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 2], Controller.shutdownMember); }); it('restart member, listener still receives map.put event [smart=' + isSmart + ']', function (done) { @@ -144,11 +145,11 @@ describe('Listeners on reconnect', function () { return Controller.terminateMember(cluster.id, member.uuid); }).then(function () { return Controller.startMember(cluster.id); + }).then(function () { + return Util.promiseWaitMilliseconds(5000); }).then(function () { return map.put('keyx', 'valx'); }); }); }); - - }); From 5a67a1edf8f43bb72cb3c68aedc974f42dba3ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Thu, 30 Aug 2018 12:24:44 +0300 Subject: [PATCH 130/685] fix Listeners on reconnect kill two members test --- test/ListenersOnReconnectTest.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 799ccc53a..d6b11e784 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -23,7 +23,7 @@ var Promise = require('bluebird'); describe('Listeners on reconnect', function () { - this.timeout(120000); + this.timeout(30000); var client; var members = []; var cluster; @@ -38,7 +38,7 @@ describe('Listeners on reconnect', function () { afterEach(function () { return map.destroy().then(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); }); @@ -78,6 +78,8 @@ describe('Listeners on reconnect', function () { turnoffMember(cluster.id, members[membersToClose[0]].uuid), turnoffMember(cluster.id, members[membersToClose[1]].uuid) ]); + }).then(function () { + return Util.promiseWaitMilliseconds(5000); }).then(function () { return map.put('keyx', 'valx'); }); From b2886ce82d3f38dc6c6d2c44fbaa6ec08197bf23 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 12 Sep 2018 10:52:44 +0300 Subject: [PATCH 131/685] refactor predicate helper function names (#350) --- src/core/Predicate.ts | 12 ++++-------- test/map/MapPredicateTest.js | 8 ++++---- test/serialization/DefaultSerializersTest.js | 15 +++++++-------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/core/Predicate.ts b/src/core/Predicate.ts index 368bc07a4..74bfda365 100644 --- a/src/core/Predicate.ts +++ b/src/core/Predicate.ts @@ -46,15 +46,11 @@ export function and(...predicates: Predicate[]): Predicate { return new AndPredicate(...predicates); } -export function isBetween(field: string, from: any, to: any): Predicate { +export function between(field: string, from: any, to: any): Predicate { return new BetweenPredicate(field, from, to); } -export function isFalse(): Predicate { - return FalsePredicate.INSTANCE; -} - -export function isEqualTo(field: string, value: any): Predicate { +export function equal(field: string, value: any): Predicate { return new EqualPredicate(field, value); } @@ -106,11 +102,11 @@ export function regex(field: string, reg: string): Predicate { return new RegexPredicate(field, reg); } -export function truePredicate(): Predicate { +export function alwaysTrue(): Predicate { return TruePredicate.INSTANCE; } -export function falsePredicate(): Predicate { +export function alwaysFalse(): Predicate { return FalsePredicate.INSTANCE; } diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index ce08ea99b..b3604c935 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -95,7 +95,7 @@ describe("Predicates", function () { }); it('And', function () { - return testPredicate(Predicates.and(Predicates.isEqualTo('this', 10), Predicates.isEqualTo('this', 11)), []); + return testPredicate(Predicates.and(Predicates.equal('this', 10), Predicates.equal('this', 11)), []); }); it('GreaterThan', function () { @@ -159,7 +159,7 @@ describe("Predicates", function () { }); it('Between', function () { - return testPredicate(Predicates.isBetween('this', 47, 49), [47, 48, 49]); + return testPredicate(Predicates.between('this', 47, 49), [47, 48, 49]); }); it('Null predicate throws error', function () { @@ -178,12 +178,12 @@ describe("Predicates", function () { }); it('False', function () { - return testPredicate(Predicates.falsePredicate(), []); + return testPredicate(Predicates.alwaysFalse(), []); }); it('True', function () { var assertionList = Array.apply(null, {length: 50}).map(Number.call, Number); - return testPredicate(Predicates.truePredicate(), assertionList); + return testPredicate(Predicates.alwaysTrue(), assertionList); }); it('Paging with reverse comparator should have elements in reverse order', function () { diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index f60988d41..dc67ff54d 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -48,10 +48,9 @@ describe('Default serializers Test', function () { null, {abc: 'abc', 'five': 5}, Predicates.sql('test'), - Predicates.and(Predicates.truePredicate(), Predicates.truePredicate()), - Predicates.isBetween('this', 0, 1), - Predicates.isFalse(), - Predicates.isEqualTo('this', 10), + Predicates.and(Predicates.alwaysTrue(), Predicates.alwaysTrue()), + Predicates.between('this', 0, 1), + Predicates.equal('this', 10), Predicates.greaterThan('this', 10), Predicates.greaterEqual('this', 10), Predicates.lessThan('this', 10), @@ -61,11 +60,11 @@ describe('Default serializers Test', function () { Predicates.inPredicate('this', 10, 11, 12), Predicates.instanceOf('java.lang.Serializable'), Predicates.notEqual('this', 10), - Predicates.not(Predicates.truePredicate()), - Predicates.or(Predicates.truePredicate(), Predicates.truePredicate()), + Predicates.not(Predicates.alwaysTrue()), + Predicates.or(Predicates.alwaysTrue(), Predicates.alwaysTrue()), Predicates.regex('this', '/abc/'), - Predicates.truePredicate(), - Predicates.falsePredicate(), + Predicates.alwaysTrue(), + Predicates.alwaysFalse(), Predicates.paging(Predicates.greaterEqual('this', 10), 10) ]; From ab363cc9f9088421dd3596bdf96a051e4d5505eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Thu, 13 Sep 2018 19:32:36 +0300 Subject: [PATCH 132/685] update the version in packaege-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 06db9189e..311ee3cef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "hazelcast-client", - "version": "0.8.0", + "version": "0.9.0", "lockfileVersion": 1, "requires": true, "dependencies": { From 1adb1cddf5a3a80181891727aab486a5cec47091 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 19 Sep 2018 18:00:36 +0300 Subject: [PATCH 133/685] refactor map listeners (#354) --- code_samples/map_entry_listener.js | 10 +- src/core/EntryListener.ts | 83 ++++++++++++ src/core/{EntryEventType.ts => EventType.ts} | 2 +- src/core/MapListener.ts | 46 +++++-- src/invocation/ClusterService.ts | 10 +- src/proxy/IMap.ts | 12 +- src/proxy/IReplicatedMap.ts | 10 +- src/proxy/MapProxy.ts | 76 ++++++----- src/proxy/MultiMap.ts | 4 +- src/proxy/MultiMapProxy.ts | 49 ++++--- src/proxy/NearCachedMapProxy.ts | 4 +- src/proxy/ReplicatedMapProxy.ts | 57 +++++--- test/ListenersOnReconnectTest.js | 24 ++-- test/map/MapProxyTest.js | 134 ++++++++++--------- test/multimap/MultiMapProxyListenersTest.js | 36 ++--- test/replicatedmap/ReplicatedMapProxyTest.js | 82 +++++++----- 16 files changed, 414 insertions(+), 225 deletions(-) create mode 100644 src/core/EntryListener.ts rename src/core/{EntryEventType.ts => EventType.ts} (96%) diff --git a/code_samples/map_entry_listener.js b/code_samples/map_entry_listener.js index d7844f4a9..ff815709f 100644 --- a/code_samples/map_entry_listener.js +++ b/code_samples/map_entry_listener.js @@ -16,11 +16,13 @@ var Client = require('hazelcast-client').Client; var listener = { - added: function (key, oldVal, newVal) { - console.log('added key: ' + key + ', old value: ' + oldVal + ', new value: ' + newVal); + added: function (entryEvent) { + console.log('added key: ' + entryEvent.key + ', new value: ' + entryEvent.value + + ', old value: ' + entryEvent.oldValue); }, - removed: function (key, oldVal, newVal) { - console.log('removed key: ' + key + ', old value: ' + oldVal + ', new value: ' + newVal); + removed: function (entryEvent) { + console.log('removed key: ' + entryEvent.key + ', new value: ' + entryEvent.value + + ', old value: ' + entryEvent.oldValue); } }; diff --git a/src/core/EntryListener.ts b/src/core/EntryListener.ts new file mode 100644 index 000000000..fd8100345 --- /dev/null +++ b/src/core/EntryListener.ts @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {MapEventListener} from './MapListener'; +import {Member} from './Member'; + +/** + * An interface which is used to get notified upon a map or an entry event. + */ +export interface EntryListener { + added?: EntryEventListener; + removed?: EntryEventListener; + updated?: EntryEventListener; + merged?: EntryEventListener; + evicted?: EntryEventListener; + mapEvicted?: MapEventListener; + mapCleared?: MapEventListener; + + [event: string]: EntryEventListener | MapEventListener; +} + +/** + * A type which is used for entry events. + */ +export type EntryEventListener = (entryEvent: EntryEvent) => void; + +/** + * Map Entry event. + */ +export class EntryEvent { + + /** + * The name of the map for this event. + */ + name: string; + + /** + * The key of the entry event. + */ + key: K; + + /** + * The value of the entry event. + */ + value: V; + + /** + * The old value of the entry event. + */ + oldValue: V; + + /** + * The incoming merging value of the entry event. + */ + mergingValue: V; + + /** + * The member that fired this event. + */ + member: Member; + + constructor(name: string, key: K, value: V, oldValue: V, mergingValue: V, member: Member) { + this.name = name; + this.key = key; + this.value = value; + this.oldValue = oldValue; + this.mergingValue = mergingValue; + this.member = member; + } +} diff --git a/src/core/EntryEventType.ts b/src/core/EventType.ts similarity index 96% rename from src/core/EntryEventType.ts rename to src/core/EventType.ts index d5cf49b5d..d6deccb46 100644 --- a/src/core/EntryEventType.ts +++ b/src/core/EventType.ts @@ -15,7 +15,7 @@ */ /* tslint:disable:no-bitwise */ -export enum EntryEventType { +export enum EventType { ADDED = 1 << 0, REMOVED = 1 << 1, UPDATED = 1 << 2, diff --git a/src/core/MapListener.ts b/src/core/MapListener.ts index a2deabbc6..2971d6af8 100644 --- a/src/core/MapListener.ts +++ b/src/core/MapListener.ts @@ -14,16 +14,42 @@ * limitations under the License. */ -export interface IMapListener { - added?: EntryEventListener; - removed?: EntryEventListener; - updated?: EntryEventListener; - merged?: EntryEventListener; - evicted?: EntryEventListener; - evictedAll?: EntryEventListener; - clearedAll?: EntryEventListener; +import {EntryListener} from './EntryListener'; +import {Member} from './Member'; - [event: string]: EntryEventListener; +/** + * An interface which is used to get notified upon a map or an entry event. + */ +export interface MapListener extends EntryListener { } -export type EntryEventListener = (key: K, oldValue: V, value: V, mergingValue: V) => void; +/** + * A type which is used for map events. + */ +export type MapEventListener = (mapEvent: MapEvent) => void; + +/** + * Used for map-wide events. + */ +export class MapEvent { + + /** + * The name of the map for this event. + */ + name: string; + /** + * Number of entries affected by this event. + */ + numberOfAffectedEntries: number; + + /** + * The member that fired this event. + */ + member: Member; + + constructor(name: string, numberOfAffectedEntries: number, member: Member) { + this.name = name; + this.numberOfAffectedEntries = numberOfAffectedEntries; + this.member = member; + } +} diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index e46452b68..8992366b5 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -26,7 +26,6 @@ import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; import {createAddressFromString} from '../Util'; -import {BuildMetadata} from '../BuildMetadata'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); @@ -135,6 +134,15 @@ export class ClusterService extends EventEmitter { } } + getMember(uuid: string): Member { + for (const member of this.members) { + if (member.uuid === uuid) { + return member; + } + } + return null; + } + /** * Returns the number of nodes in cluster. * @returns {number} diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index a6f75476f..fe5f181b7 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -17,7 +17,7 @@ import * as Promise from 'bluebird'; import {Aggregator} from '../aggregation/Aggregator'; import {EntryView} from '../core/EntryView'; -import {IMapListener} from '../core/MapListener'; +import {MapListener} from '../core/MapListener'; import {Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../DistributedObject'; @@ -332,16 +332,16 @@ export interface IMap extends DistributedObject { tryRemove(key: K, timeout: number): Promise; /** - * Adds a {@link IMapListener} for this map. + * Adds a {@link MapListener} for this map. * @param listener * @param key Events are triggered for only this key if set. * @param includeValue Event message contains new value of the key if set to {true}. * @return Registration id of the listener. */ - addEntryListener(listener: IMapListener, key?: K, includeValue?: boolean): Promise; + addEntryListener(listener: MapListener, key?: K, includeValue?: boolean): Promise; /** - * Adds a {@link IMapListener} for this map. + * Adds a {@link MapListener} for this map. * Listener will get notified for map add/remove/update/evict events filtered by the given predicate. * @param listener * @param predicate @@ -349,11 +349,11 @@ export interface IMap extends DistributedObject { * @param includeValue Event message contains new value of the key if set to `true`. * @return Registration id of the listener. */ - addEntryListenerWithPredicate(listener: IMapListener, predicate: Predicate, + addEntryListenerWithPredicate(listener: MapListener, predicate: Predicate, key?: K, includeValue?: boolean): Promise; /** - * Removes a {@link IMapListener} from this map. + * Removes a {@link MapListener} from this map. * @param listenerId Registration Id of the listener. * @return `true` if remove operation is successful, `false` if unsuccessful or this listener did not exist. */ diff --git a/src/proxy/IReplicatedMap.ts b/src/proxy/IReplicatedMap.ts index b8bcbc203..c4c6e7112 100644 --- a/src/proxy/IReplicatedMap.ts +++ b/src/proxy/IReplicatedMap.ts @@ -15,7 +15,7 @@ */ import * as Promise from 'bluebird'; -import {IMapListener} from '../core/MapListener'; +import {EntryListener} from '../core/EntryListener'; import {Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../DistributedObject'; @@ -138,7 +138,7 @@ export interface IReplicatedMap extends DistributedObject { * @param localOnly * @return Registration id of the listener. */ - addEntryListenerToKeyWithPredicate(listener: IMapListener, key: K, predicate: Predicate): Promise; + addEntryListenerToKeyWithPredicate(listener: EntryListener, key: K, predicate: Predicate): Promise; /** * Adds an continuous entry listener for this map. The listener will be notified for @@ -148,7 +148,7 @@ export interface IReplicatedMap extends DistributedObject { * @param predicate * @return Registration id of the listener. */ - addEntryListenerWithPredicate(listener: IMapListener, predicate: Predicate): Promise; + addEntryListenerWithPredicate(listener: EntryListener, predicate: Predicate): Promise; /** * Adds the specified entry listener for the specified key. The listener will be @@ -158,7 +158,7 @@ export interface IReplicatedMap extends DistributedObject { * @param key * @return Registration id of the listener. */ - addEntryListenerToKey(listener: IMapListener, key: K): Promise; + addEntryListenerToKey(listener: EntryListener, key: K): Promise; /** * Adds an entry listener for this map. The listener will be notified for all @@ -167,7 +167,7 @@ export interface IReplicatedMap extends DistributedObject { * @param listener * @return Registration id of the listener. */ - addEntryListener(listener: IMapListener): Promise; + addEntryListener(listener: EntryListener): Promise; /** * Removes the specified entry listener. Returns silently if there was no such diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index d66977bde..1ff031e38 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -66,9 +66,9 @@ import {MapUnlockCodec} from '../codec/MapUnlockCodec'; import {MapValuesCodec} from '../codec/MapValuesCodec'; import {MapValuesWithPagingPredicateCodec} from '../codec/MapValuesWithPagingPredicateCodec'; import {MapValuesWithPredicateCodec} from '../codec/MapValuesWithPredicateCodec'; -import {EntryEventType} from '../core/EntryEventType'; +import {EventType} from '../core/EventType'; import {EntryView} from '../core/EntryView'; -import {IMapListener} from '../core/MapListener'; +import {MapEvent, MapListener} from '../core/MapListener'; import {IterationType, Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; @@ -79,6 +79,7 @@ import * as SerializationUtil from '../serialization/SerializationUtil'; import {assertArray, assertNotNull, getSortedQueryResultSet} from '../Util'; import {BaseProxy} from './BaseProxy'; import {IMap} from './IMap'; +import {EntryEvent} from '../core/EntryListener'; import ClientMessage = require('../ClientMessage'); export class MapProxy extends BaseProxy implements IMap { @@ -207,7 +208,7 @@ export class MapProxy extends BaseProxy implements IMap { } } - addEntryListenerWithPredicate(listener: IMapListener, predicate: Predicate, key: K, + addEntryListenerWithPredicate(listener: MapListener, predicate: Predicate, key: K, includeValue: boolean): Promise { return this.addEntryListenerInternal(listener, predicate, key, includeValue); } @@ -445,7 +446,7 @@ export class MapProxy extends BaseProxy implements IMap { return this.tryRemoveInternal(keyData, timeout); } - addEntryListener(listener: IMapListener, key: K, includeValue: boolean = false): Promise { + addEntryListener(listener: MapListener, key: K, includeValue: boolean = false): Promise { return this.addEntryListenerInternal(listener, undefined, key, includeValue); } @@ -547,17 +548,17 @@ export class MapProxy extends BaseProxy implements IMap { } private addEntryListenerInternal( - listener: IMapListener, predicate: Predicate, key: K, includeValue: boolean, + listener: MapListener, predicate: Predicate, key: K, includeValue: boolean, ): Promise { let flags: any = null; - const conversionTable: { [funcName: string]: EntryEventType } = { - added: EntryEventType.ADDED, - clearedAll: EntryEventType.CLEAR_ALL, - evicted: EntryEventType.EVICTED, - evictedAll: EntryEventType.EVICT_ALL, - merged: EntryEventType.MERGED, - removed: EntryEventType.REMOVED, - updated: EntryEventType.UPDATED, + const conversionTable: { [funcName: string]: EventType } = { + added: EventType.ADDED, + mapCleared: EventType.CLEAR_ALL, + evicted: EventType.EVICTED, + mapEvicted: EventType.EVICT_ALL, + merged: EventType.MERGED, + removed: EventType.REMOVED, + updated: EventType.UPDATED, }; for (const funcName in conversionTable) { if (listener[funcName]) { @@ -566,33 +567,42 @@ export class MapProxy extends BaseProxy implements IMap { } } const toObject = this.toObject.bind(this); - const entryEventHandler = function ( + const entryEventHandler = ( /* tslint:disable-next-line:no-shadowed-variable */ - key: K, val: V, oldVal: V, mergingVal: V, event: number, uuid: string, numberOfAffectedEntries: number, - ): void { - let eventParams: any[] = [key, oldVal, val, mergingVal, numberOfAffectedEntries, uuid]; - eventParams = eventParams.map(toObject); - switch (event) { - case EntryEventType.ADDED: - listener.added.apply(null, eventParams); + key: K, value: V, oldValue: V, mergingValue: V, eventType: number, uuid: string, numberOfAffectedEntries: number) => { + const member = this.client.getClusterService().getMember(uuid); + const name = this.name; + + key = toObject(key); + value = toObject(value); + oldValue = toObject(oldValue); + mergingValue = toObject(mergingValue); + + const entryEvent = new EntryEvent(name, key, value, oldValue, mergingValue, member); + + const mapEvent = new MapEvent(name, numberOfAffectedEntries, member); + + switch (eventType) { + case EventType.ADDED: + listener.added.apply(null, [entryEvent]); break; - case EntryEventType.REMOVED: - listener.removed.apply(null, eventParams); + case EventType.REMOVED: + listener.removed.apply(null, [entryEvent]); break; - case EntryEventType.UPDATED: - listener.updated.apply(null, eventParams); + case EventType.UPDATED: + listener.updated.apply(null, [entryEvent]); break; - case EntryEventType.EVICTED: - listener.evicted.apply(null, eventParams); + case EventType.EVICTED: + listener.evicted.apply(null, [entryEvent]); break; - case EntryEventType.EVICT_ALL: - listener.evictedAll.apply(null, eventParams); + case EventType.EVICT_ALL: + listener.mapEvicted.apply(null, [mapEvent]); break; - case EntryEventType.CLEAR_ALL: - listener.clearedAll.apply(null, eventParams); + case EventType.CLEAR_ALL: + listener.mapCleared.apply(null, [mapEvent]); break; - case EntryEventType.MERGED: - listener.merged.apply(null, eventParams); + case EventType.MERGED: + listener.merged.apply(null, [entryEvent]); break; } }; diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index d6936bbe6..680d64aee 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -15,7 +15,7 @@ */ import * as Promise from 'bluebird'; -import {IMapListener} from '../core/MapListener'; +import {EntryListener} from '../core/EntryListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../DistributedObject'; @@ -117,7 +117,7 @@ export interface MultiMap extends DistributedObject { * @param includeValue if `true`, then the event will include the modified value. * @return registration ID for this entry listener */ - addEntryListener(listener: IMapListener, key?: K, includeValue?: boolean): Promise; + addEntryListener(listener: EntryListener, key?: K, includeValue?: boolean): Promise; /** * Removes the entry listener by the registration ID. diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 9928eaffe..75e9a9d92 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -22,8 +22,8 @@ import {MultiMapIsLockedCodec} from '../codec/MultiMapIsLockedCodec'; import {MultiMapLockCodec} from '../codec/MultiMapLockCodec'; import {MultiMapTryLockCodec} from '../codec/MultiMapTryLockCodec'; import {MultiMapUnlockCodec} from '../codec/MultiMapUnlockCodec'; -import {EntryEventType} from '../core/EntryEventType'; -import {IMapListener} from '../core/MapListener'; +import {EventType} from '../core/EventType'; +import {EntryEvent, EntryListener} from '../core/EntryListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; @@ -47,6 +47,7 @@ import {MultiMapValuesCodec} from './../codec/MultiMapValuesCodec'; import {BaseProxy} from './BaseProxy'; import {MultiMap} from './MultiMap'; import ClientMessage = require('../ClientMessage'); +import {MapEvent} from '../core/MapListener'; export class MultiMapProxy extends BaseProxy implements MultiMap { @@ -132,32 +133,42 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { return this.encodeInvokeOnKey(MultiMapValueCountCodec, keyData, keyData, 1); } - addEntryListener(listener: IMapListener, key?: K, includeValue: boolean = true): Promise { + addEntryListener(listener: EntryListener, key?: K, includeValue: boolean = true): Promise { const toObject = this.toObject.bind(this); /* tslint:disable: no-shadowed-variable */ - const entryEventHandler = function (key: K, value: V, oldValue: V, mergingValue: V, event: number): void { - let parameters: any[] = [key, oldValue, value]; - parameters = parameters.map(toObject); - let name: string; + const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, eventType: number, uuid: string, + numberOfAffectedEntries: number) => { + const member = this.client.getClusterService().getMember(uuid); + const name = this.name; + + key = toObject(key); + value = toObject(value); + oldValue = toObject(oldValue); + mergingValue = toObject(mergingValue); + + const entryEvent = new EntryEvent(name, key, value, oldValue, mergingValue, member); + + const mapEvent = new MapEvent(name, numberOfAffectedEntries, member); // Multi map only supports these three event types - switch (event) { - case EntryEventType.ADDED: - name = 'added'; + switch (eventType) { + case EventType.ADDED: + if (listener.added) { + listener.added.apply(null, [entryEvent]); + } break; - case EntryEventType.REMOVED: - name = 'removed'; + case EventType.REMOVED: + if (listener.removed) { + listener.removed.apply(null, [entryEvent]); + } break; - case EntryEventType.CLEAR_ALL: - name = 'clearedAll'; + case EventType.CLEAR_ALL: + if (listener.mapCleared) { + listener.mapCleared.apply(null, [mapEvent]); + } break; } - - const handlerFunction = listener[name]; - if (handlerFunction) { - handlerFunction.apply(undefined, parameters); - } }; if (key) { diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index f0c3c3a34..72c3c6912 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -18,7 +18,7 @@ import * as Promise from 'bluebird'; import {MapAddNearCacheEntryListenerCodec} from '../codec/MapAddNearCacheEntryListenerCodec'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; -import {EntryEventType} from '../core/EntryEventType'; +import {EventType} from '../core/EventType'; import {UUID} from '../core/UUID'; import HazelcastClient from '../HazelcastClient'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; @@ -207,7 +207,7 @@ export class NearCachedMapProxy extends MapProxy { } private addNearCacheInvalidationListener(): Promise { - const codec = this.createInvalidationListenerCodec(this.name, EntryEventType.INVALIDATION); + const codec = this.createInvalidationListenerCodec(this.name, EventType.INVALIDATION); if (this.supportsRepairableNearCache()) { return this.createNearCacheEventHandler().then((handler) => { return this.client.getListenerService().registerListener(codec, handler); diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index 48c49528b..c430aaa8f 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -33,8 +33,8 @@ import {ReplicatedMapRemoveCodec} from '../codec/ReplicatedMapRemoveCodec'; import {ReplicatedMapRemoveEntryListenerCodec} from '../codec/ReplicatedMapRemoveEntryListenerCodec'; import {ReplicatedMapSizeCodec} from '../codec/ReplicatedMapSizeCodec'; import {ReplicatedMapValuesCodec} from '../codec/ReplicatedMapValuesCodec'; -import {EntryEventType} from '../core/EntryEventType'; -import {IMapListener} from '../core/MapListener'; +import {EventType} from '../core/EventType'; +import {EntryEvent, EntryListener} from '../core/EntryListener'; import {Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; @@ -43,6 +43,7 @@ import {assertNotNull} from '../Util'; import {ArrayComparator} from '../util/ArrayComparator'; import {IReplicatedMap} from './IReplicatedMap'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; +import {MapEvent} from '../core/MapListener'; /* tslint:enable:max-line-length */ import Long = require('long'); import ClientMessage = require('../ClientMessage'); @@ -138,19 +139,19 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements }); } - addEntryListenerToKeyWithPredicate(listener: IMapListener, key: K, predicate: Predicate): Promise { + addEntryListenerToKeyWithPredicate(listener: EntryListener, key: K, predicate: Predicate): Promise { return this.addEntryListenerInternal(listener, predicate, key); } - addEntryListenerWithPredicate(listener: IMapListener, predicate: Predicate): Promise { + addEntryListenerWithPredicate(listener: EntryListener, predicate: Predicate): Promise { return this.addEntryListenerInternal(listener, predicate, undefined); } - addEntryListenerToKey(listener: IMapListener, key: K): Promise { + addEntryListenerToKey(listener: EntryListener, key: K): Promise { return this.addEntryListenerInternal(listener, undefined, key); } - addEntryListener(listener: IMapListener): Promise { + addEntryListener(listener: EntryListener): Promise { return this.addEntryListenerInternal(listener, undefined, undefined); } @@ -158,25 +159,41 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements return this.client.getListenerService().deregisterListener(listenerId); } - private addEntryListenerInternal(listener: IMapListener, predicate: Predicate, + private addEntryListenerInternal(listener: EntryListener, predicate: Predicate, key: K): Promise { const toObject = this.toObject.bind(this); /* tslint:disable-next-line:no-shadowed-variable */ - const entryEventHandler = function (key: K, val: V, oldVal: V, mergingVal: V, - event: number, uuid: string, numberOfAffectedEntries: number): void { - let eventParams: any[] = [key, oldVal, val, mergingVal, numberOfAffectedEntries, uuid]; - eventParams = eventParams.map(toObject); - const eventToListenerMap: { [key: number]: string } = { - [EntryEventType.ADDED]: 'added', - [EntryEventType.REMOVED]: 'removed', - [EntryEventType.UPDATED]: 'updated', - [EntryEventType.EVICTED]: 'evicted', - [EntryEventType.CLEAR_ALL]: 'clearedAll', + const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, + event: number, uuid: string, numberOfAffectedEntries: number) => { + const member = this.client.getClusterService().getMember(uuid); + const name = this.name; + + key = toObject(key); + value = toObject(value); + oldValue = toObject(oldValue); + mergingValue = toObject(mergingValue); + + const entryEvent = new EntryEvent(name, key, value, oldValue, mergingValue, member); + + const mapEvent = new MapEvent(name, numberOfAffectedEntries, member); + + const entryEventToListenerMap: { [key: number]: string } = { + [EventType.ADDED]: 'added', + [EventType.REMOVED]: 'removed', + [EventType.UPDATED]: 'updated', + [EventType.EVICTED]: 'evicted', + }; + + const mapEventToListenerMap: { [key: number]: string } = { + [EventType.CLEAR_ALL]: 'mapCleared', }; - const eventMethod = eventToListenerMap[event]; - if (listener.hasOwnProperty(eventMethod)) { - listener[eventMethod].apply(null, eventParams); + const entryEventMethod = entryEventToListenerMap[event]; + const mapEventMethod = mapEventToListenerMap[event]; + if (listener.hasOwnProperty(entryEventMethod)) { + listener[entryEventMethod].apply(null, [entryEvent]); + } else if (listener.hasOwnProperty(mapEventMethod)) { + listener[mapEventMethod].apply(null, [mapEvent]); } }; let listenerHandler: Function; diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index d6b11e784..9cdae83f1 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -60,12 +60,14 @@ describe('Listeners on reconnect', function () { client = cl; map = client.getMap('testmap'); var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { try { - expect(key).to.equal('keyx'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('valx'); - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('testmap'); + expect(entryEvent.key).to.equal('keyx'); + expect(entryEvent.value).to.equal('valx'); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -130,12 +132,14 @@ describe('Listeners on reconnect', function () { client = cl; map = client.getMap('testmap'); var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { try { - expect(key).to.equal('keyx'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('valx'); - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('testmap'); + expect(entryEvent.key).to.equal('keyx'); + expect(entryEvent.value).to.equal('valx'); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index 9b0087414..33227fa10 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -60,7 +60,7 @@ describe('MapProxy', function () { return createController(nearCacheEnabled).then(function (res) { cluster = res; return Controller.startMember(cluster.id); - }).then(function (member) { + }).then(function (m) { return createClient(nearCacheEnabled).then(function (hazelcastClient) { client = hazelcastClient; }); @@ -549,12 +549,14 @@ describe('MapProxy', function () { it('addEntryListener on map, entryAdded fires because predicate returns true for that entry', function (done) { var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { try { - expect(key).to.equal('key10'); - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key10'); + expect(entryEvent.value).to.be.undefined; + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -568,12 +570,14 @@ describe('MapProxy', function () { it('addEntryListener on key, entryAdded fires because predicate returns true for that entry', function (done) { var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { try { - expect(key).to.equal('key10'); - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key10'); + expect(entryEvent.value).to.be.undefined; + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -587,12 +591,13 @@ describe('MapProxy', function () { it('addEntryListener on key, entryAdded fires because predicate returns true for that entry, inlVal=yes', function (done) { var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { try { - expect(key).to.equal('key10'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('val10'); - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key10'); + expect(entryEvent.value).to.equal('val10'); + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -604,33 +609,37 @@ describe('MapProxy', function () { }); }); - it('addEntryListener on map entryAdded', function (done) { + it('addEntryListener with predicate on map entryAdded', function (done) { var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { try { - expect(key).to.equal('key10'); - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key10'); + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); } } }; - map.addEntryListener(listenerObject).then(function () { + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10', true).then(function () { map.put('key10', 'val10'); }); }); it('addEntryListener on map entryAdded', function (done) { var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { try { - expect(key).to.equal('key10'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('val10'); - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key10'); + expect(entryEvent.value).to.equal('val10'); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -644,12 +653,14 @@ describe('MapProxy', function () { it('addEntryListener on map entryUpdated', function (done) { var listenerObject = { - updated: function (key, oldValue, value, mergingValue) { + updated: function (entryEvent) { try { - expect(key).to.equal('key0'); - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key0'); + expect(entryEvent.value).to.be.undefined; + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -663,12 +674,14 @@ describe('MapProxy', function () { it('addEntryListener on key entryRemoved', function (done) { var listenerObject = { - removed: function (key, oldValue, value, mergingValue) { + removed: function (entryEvent) { try { - expect(key).to.equal('key1'); - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key1'); + expect(entryEvent.value).to.be.undefined; + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -682,12 +695,14 @@ describe('MapProxy', function () { it('addEntryListener on key entryRemoved includeValue=yes', function (done) { var listenerObject = { - removed: function (key, oldValue, value, mergingValue) { + removed: function (entryEvent) { try { - expect(key).to.equal('key1'); - expect(oldValue).to.equal('val1'); - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key1'); + expect(entryEvent.value).to.be.undefined; + expect(entryEvent.oldValue).to.equal('val1'); + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -701,12 +716,14 @@ describe('MapProxy', function () { it('addEntryListener on key evicted includeValue=yes', function (done) { var listenerObject = { - evicted: function (key, oldValue, value, mergingValue) { + evicted: function (entryEvent) { try { - expect(key).to.equal('key1'); - expect(oldValue).to.equal('val1'); - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key1'); + expect(entryEvent.value).to.be.undefined; + expect(entryEvent.oldValue).to.equal('val1'); + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -720,13 +737,11 @@ describe('MapProxy', function () { it('addEntryListener on map evictAll', function (done) { var listenerObject = { - evictedAll: function (key, oldValue, value, mergingValue, numberOfAffectedEntries) { + mapEvicted: function (mapEvent) { try { - expect(key).to.be.undefined; - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; - expect(numberOfAffectedEntries).to.equal(10); + expect(mapEvent.name).to.equal('test'); + expect(mapEvent.numberOfAffectedEntries).to.equal(10); + expect(mapEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -740,13 +755,11 @@ describe('MapProxy', function () { it('addEntryListener on map clearAll', function (done) { var listenerObject = { - clearedAll: function (key, oldValue, value, mergingValue, numberOfAffectedEntries) { + mapCleared: function (mapEvent) { try { - expect(key).to.be.undefined; - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; - expect(mergingValue).to.be.undefined; - expect(numberOfAffectedEntries).to.equal(10); + expect(mapEvent.name).to.equal('test'); + expect(mapEvent.numberOfAffectedEntries).to.equal(10); + expect(mapEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); @@ -833,7 +846,6 @@ describe('MapProxy', function () { }) }); }); - }); }); diff --git a/test/multimap/MultiMapProxyListenersTest.js b/test/multimap/MultiMapProxyListenersTest.js index ac49d32c2..3ead99d1f 100644 --- a/test/multimap/MultiMapProxyListenersTest.js +++ b/test/multimap/MultiMapProxyListenersTest.js @@ -53,14 +53,18 @@ describe("MultiMap Proxy Listener", function () { return Controller.shutdownCluster(cluster.id); }); - function Listener(eventName, doneCallback, expectedKey, expectedOldValue, expectedValue) { + function Listener(eventName, doneCallback, expectedName, expectedKey, expectedValue, expectedOldValue, + expectedMergingValue) { - this[eventName] = function (key, oldValue, value) { + this[eventName] = function (entryEvent) { try { - expect(key).to.equal(expectedKey); - expect(oldValue).to.equal(expectedOldValue); - expect(value).to.equal(expectedValue); - doneCallback() + expect(entryEvent.name).to.equal(expectedName); + expect(entryEvent.key).to.equal(expectedKey); + expect(entryEvent.value).to.equal(expectedValue); + expect(entryEvent.oldValue).to.equal(expectedOldValue); + expect(entryEvent.mergingValue).to.equal(expectedMergingValue); + expect(entryEvent.member).to.not.be.equal(null); + doneCallback(); } catch (err) { doneCallback(err); } @@ -70,7 +74,7 @@ describe("MultiMap Proxy Listener", function () { // Add tests it("listens for add with value excluded", function (done) { - var listener = new Listener("added", done, "foo", undefined, undefined); + var listener = new Listener("added", done, "test", "foo", undefined, undefined, undefined); map.addEntryListener(listener, null, false).then(function () { map.put("foo", "bar"); @@ -79,7 +83,7 @@ describe("MultiMap Proxy Listener", function () { it("listens for add with value included", function (done) { - var listener = new Listener("added", done, "foo", undefined, "bar"); + var listener = new Listener("added", done, "test", "foo", "bar", undefined, undefined); map.addEntryListener(listener, null, true).then(function () { map.put("foo", "bar"); @@ -87,7 +91,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for add to specific key", function (done) { - var listener = new Listener("added", done, "foo", undefined, undefined); + var listener = new Listener("added", done, "test", "foo", undefined, undefined, undefined); map.addEntryListener(listener, "foo", false).then(function () { map.put("foo", "bar"); @@ -113,7 +117,7 @@ describe("MultiMap Proxy Listener", function () { // Remove tests it("listens for remove with value excluded", function (done) { - var listener = new Listener("removed", done, "foo", undefined, undefined); + var listener = new Listener("removed", done, "test", "foo", undefined, undefined, undefined); map.addEntryListener(listener, null, false).then(function () { return map.put("foo", "bar"); @@ -123,7 +127,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for remove with value included", function (done) { - var listener = new Listener("removed", done, "foo", "bar", undefined); + var listener = new Listener("removed", done, "test", "foo", undefined, "bar", undefined); map.addEntryListener(listener, null, true).then(function () { return map.put("foo", "bar"); @@ -133,7 +137,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for remove on specific key", function (done) { - var listener = new Listener("added", done, "foo", undefined, undefined); + var listener = new Listener("added", done, "test", "foo", undefined, undefined, undefined); map.addEntryListener(listener, "foo", false).then(function () { return map.put("foo", "bar"); @@ -165,11 +169,11 @@ describe("MultiMap Proxy Listener", function () { it("listens for clear", function (done) { this.timeout(10000); var listener = { - clearedAll: function (key, oldValue, value) { + mapCleared: function (mapEvent) { try { - expect(key).to.be.undefined; - expect(oldValue).to.be.undefined; - expect(value).to.be.undefined; + expect(mapEvent.name).to.be.equal("test"); + expect(mapEvent.numberOfAffectedEntries).to.be.equal(1); + expect(mapEvent.member).to.not.be.equal(null); done(); } catch (err) { done(err); diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 67fca8239..7e43b9d89 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -276,13 +276,15 @@ describe('ReplicatedMap Proxy', function () { var registrationId; var listener = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { var error; try { - expect(key).to.equal('new-key'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('value'); - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('new-key'); + expect(entryEvent.value).to.equal('value'); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; } @@ -305,12 +307,15 @@ describe('ReplicatedMap Proxy', function () { it('addEntryListener listens to remove event', function (done) { var registrationId; var listener = { - removed: function (key, value, oldValue, mergingValue, numberOfAffectedEntries) { + removed: function (entryEvent) { var error; try { - expect(key).to.equal('key-to-remove'); - expect(value).to.equal('value'); - expect(numberOfAffectedEntries).to.equal(1); + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key-to-remove'); + expect(entryEvent.value).to.be.undefined; + expect(entryEvent.oldValue).to.equal('value'); + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; } @@ -334,13 +339,15 @@ describe('ReplicatedMap Proxy', function () { it('addEntryListener listens to updated event', function (done) { var registrationId; var listener = { - updated: function (key, oldValue, value, mergingValue, numberOfAffectedEntries) { + updated: function (entryEvent) { var error; try { - expect(key).to.equal('key-to-update'); - expect(value).to.equal('value2'); - expect(oldValue).to.equal('value1'); - expect(numberOfAffectedEntries).to.equal(1); + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key-to-update'); + expect(entryEvent.value).to.equal('value2'); + expect(entryEvent.oldValue).to.equal('value1'); + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; } @@ -364,13 +371,12 @@ describe('ReplicatedMap Proxy', function () { it('addEntryListener listens to clearedAll event', function (done) { var registrationId; var listener = { - clearedAll: function (key, oldValue, value, mergingValue, numberOfAffectedEntries) { + mapCleared: function (mapEvent) { var error; try { - expect(key).to.be.undefined; - expect(value).to.be.undefined; - expect(oldValue).to.be.undefined; - expect(numberOfAffectedEntries).to.equal(4); + expect(mapEvent.name).to.equal('test'); + expect(mapEvent.numberOfAffectedEntries).to.equal(4); + expect(mapEvent.member).to.not.be.equal(null); } catch (err) { error = err; } @@ -400,18 +406,20 @@ describe('ReplicatedMap Proxy', function () { var listeners = []; var listener1 = { - added: function () { + added: function (entryEvent) { done(new Error('This listener must not be fired')); } }; var listener2 = { - added: function (key, oldValue, value, merginValue) { + added: function (entryEvent) { var error; try { - expect(key).to.equal('key1'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('value'); - expect(merginValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key1'); + expect(entryEvent.value).to.equal('value'); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; } @@ -439,13 +447,15 @@ describe('ReplicatedMap Proxy', function () { it('addEntryListenerWithPredicate', function (done) { var listenerId; var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { var error; try { - expect(key).to.equal('key10'); - expect(oldValue).to.be.undefined; - expect(value).to.equal('val10'); - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key10'); + expect(entryEvent.value).to.equal('val10'); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; } @@ -466,13 +476,15 @@ describe('ReplicatedMap Proxy', function () { it('addEntryListenerToKeyWithPredicate', function (done) { var listenerId; var listenerObject = { - added: function (key, oldValue, value, mergingValue) { + added: function (entryEvent) { var error; try { - expect(key).to.equal('key'); - expect(oldValue).to.be.undefined; - expect(value).to.be.equal('value'); - expect(mergingValue).to.be.undefined; + expect(entryEvent.name).to.equal('test'); + expect(entryEvent.key).to.equal('key'); + expect(entryEvent.value).to.be.equal('value'); + expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; From 962572273216bedd9a0e418e3710c1605ac3c093 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Thu, 20 Sep 2018 13:28:25 +0300 Subject: [PATCH 134/685] add configuration overview chapter documentation (#342) --- README.md | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 82ca1f7ec..4d238da06 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,12 @@ * [Features](#features) * [Installing the Client](#installing-the-client) * [Using the Client](#using-the-client) +* [Configuration Overview](#configuration-overview) + * [1. Configuration Options](#1-configuration-options) + * [1.1. Programmatic Configuration](#11-programmatic-configuration) + * [1.2. Declarative Configuration (JSON)](#12-declarative-configuration-json) + * [2. Importing Multiple Configurations](#2-importing-multiple-configurations) + * [3. Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) * [Code Samples](#code-samples) * [Serialization Considerations](#serialization-considerations) * [Development](#development) @@ -97,11 +103,161 @@ Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelca You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). -# Configuration +# Configuration Overview + +This chapter describes the options to configure your Node.js client and explains how you can import multiple configurations +and how you should set paths and exported names for the client to load objects. + +## 1. Configuration Options You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). -See [CONFIG.md](CONFIG.md) for details. +* Programmatic configuration +* Declarative configuration (JSON file) + +### 1.1. Programmatic Configuration + +For programmatic configuration of the Hazelcast Node.js Client, just instantiate a `ClientConfig` object and configure the +desired aspects. An example is shown below. + +```javascript +var Config = require('hazelcast-client').Config; +var Address = require('hazelcast-client').Address; +var cfg = new Config.ClientConfig(); +cfg.networkConfig.addresses.push('127.0.0.1:5701'); +return HazelcastClient.newHazelcastClient(cfg); +``` + +Refer to `ClientConfig` class documentation at [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. + +### 1.2. Declarative Configuration (JSON) + +If the client is not supplied with a programmatic configuration at the time of initialization, it will look for a configuration file named `hazelcast-client.json`. If this file exists, then the configuration is loaded from it. Otherwise, the client will start with the default configuration. The following are the places that the client looks for a `hazelcast-client.json` in order: + +1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, +the client looks for the configuration file in the specified location. +2. Current working directory: If there is no environment variable set, the client tries to load `hazelcast-client.json` +from the current working directory. +3. Default configuration: If all of the above methods fail, the client starts with the default configuration. +The default configuration is programmatic. If you want to override the default configuration declaratively, you need to create +a `hazelcast-client.json` file in your working directory. If you want to have an example for this file, you can find `hazelcast-client-default.json` and `hazelcast-client-sample.json` files in the Github repository. + +Following is a sample JSON configuration file: + +```json +{ + "group": { + "name": "hazel", + "password": "cast" + }, + "properties": { + "hazelcast.client.heartbeat.timeout": 10000, + "hazelcast.client.invocation.retry.pause.millis": 4000, + "hazelcast.client.invocation.timeout.millis": 180000, + "hazelcast.invalidation.reconciliation.interval.seconds": 50, + "hazelcast.invalidation.max.tolerated.miss.count": 15, + "hazelcast.invalidation.min.reconciliation.interval.seconds": 60 + }, + "network": { + "clusterMembers": [ + "127.0.0.1:5701" + ], + "smartRouting": true, + "connectionTimeout": 6000, + "connectionAttemptPeriod": 4000, + "connectionAttemptLimit": 3 + } +} +``` + +In the following chapters you will learn the description of all elements included in a JSON configuration file used to configure Hazelcast Node.js client. + +## 2. Importing Multiple Configurations + +You can compose the declarative configuration of your Node.js client from multiple declarative +configuration snippets. In order to compose a declarative configuration, you can use the `import` element to load +different declarative configuration files. + +Let's assume you have the following two configurations: + +`group-config.json`: + +```json +{ + "group": { + "name": "hazel", + "password": "cast" + } +} +``` + +`network-config.json`: + +```json +{ + "network": { + "clusterMembers": [ + "127.0.0.10:4001", + "127.0.0.11:4001" + ] + } +} +``` + +To get your example client configuration out of the above two, use the `import` element as +shown below. + +```json +{ + "import": [ + "group-config.json", + "network-config.json" + ] +} +``` + +> Note: Use `import` element on top level of JSON hierarchy. + +## 3. Loading Objects and Path Resolution + +For configuration elements that require you to specify a code piece, you will need to specify the path to the +code and name of the exported element that you want the client to use. This configuration is set as follows: + +```json +{ + "path": "path/to/file", + "exportedName": "MyObject" +} +``` + +In the above configuration, `path` shows the address to the file that you want the client to load. Unless this is an +absolute path, it is relative to the location of `hazelcast-config.json` file. + +In Javascript, you can define and export as many objects as you want in a single file. Above configuration element +is designed to load only one specified object from a file (`MyObject`). Therefore, `exportedName` specifies the name of desired object. + +Let's say your project's directory structure is as follows: + + my_app/ + my_app/index.js + my_app/factory_utils.js + my_app/hazelcast-client.json + my_app/node_modules/ + my_app/node_modules/hazelcast-client + +In `factory_utils.js`, you have multiple exported functions. + +```javascript +exports.utilityFunction = function() {...} +exports.MySSLFactory = function() {...} +``` + +In order to load `MySSLFactory` in your SSL configuration, you should set `path` and `exportedName` as `factory_utils.js` +and `MySSLFactory` respectively. + +If you have only one export as the default export from `factory_utils.js`, just skip `exportedName` property and +the client will load the default export from the file. + # Code Samples From b6b1ecc905fa4023e18f4540a486b2e2a2c33707 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 1 Oct 2018 16:39:25 +0300 Subject: [PATCH 135/685] fix ProxyManager proxies map (#369) --- src/proxy/ProxyManager.ts | 8 ++++---- test/ClientProxyTest.js | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 3dbedf2d2..6c76604d2 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -88,8 +88,8 @@ export class ProxyManager { } public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): DistributedObject { - if (this.proxies[name]) { - return this.proxies[name]; + if (this.proxies[serviceName + name]) { + return this.proxies[serviceName + name]; } else { let newProxy: DistributedObject; if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().getNearCacheConfig(name)) { @@ -100,13 +100,13 @@ export class ProxyManager { if (createAtServer) { this.createProxy(newProxy); } - this.proxies[name] = newProxy; + this.proxies[serviceName + name] = newProxy; return newProxy; } } destroyProxy(name: string, serviceName: string): Promise { - delete this.proxies[name]; + delete this.proxies[serviceName + name]; const clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); clientMessage.setPartitionId(-1); return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).return(); diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index c967f32ed..1f4da0d93 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -14,6 +14,9 @@ * limitations under the License. */ +var Controller = require('./RC'); +var expect = require('chai').expect; + var MapProxy = require('../lib/proxy/MapProxy').MapProxy; var ConnectionManager = require('../lib/invocation/ClientConnectionManager').ClientConnectionManager; var ClientConnection = require('../lib/invocation/ClientConnection').ClientConnection; @@ -23,10 +26,21 @@ var assert = require('chai').assert; var sandbox = sinon.createSandbox(); describe('Generic proxy test', function () { + var cluster; + var client; + var map; + var list; afterEach(function () { - sandbox.restore(); - }); + sandbox.restore(); + if (map && list) { + map.destroy(); + list.destroy(); + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + } + } + ); it('Client without active connection should return unknown version', function () { var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); @@ -51,4 +65,18 @@ describe('Generic proxy test', function () { var mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); assert.equal(mapProxy.getConnectedServerVersion(), 30700); }); + + it('Proxies with the same name should be different for different services', function () { + return Controller.createCluster().then(function (response) { + cluster = response; + return Controller.startMember(cluster.id); + }).then(function () { + return HazelcastClient.newHazelcastClient(); + }).then(function (res) { + client = res; + map = client.getMap('Furkan'); + list = client.getList('Furkan'); + expect(list.getServiceName()).to.be.equal('hz:impl:listService'); + }); + }); }) From a5d82c84d1daf52e666e17d0f263404aa11996b2 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 1 Oct 2018 16:39:36 +0300 Subject: [PATCH 136/685] add AddressHelper object and refactor the connection behavior (#368) --- src/Util.ts | 62 ++++++++++++++++-------- src/discovery/HazelcastCloudDiscovery.ts | 4 +- src/invocation/ClusterService.ts | 4 +- test/AddressHelperTest.js | 55 +++++++++++++++++++++ test/config/ConfigBuilderTest.js | 22 +++++++-- 5 files changed, 121 insertions(+), 26 deletions(-) create mode 100644 test/AddressHelperTest.js diff --git a/src/Util.ts b/src/Util.ts index a45cb3e4b..221c0153f 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -188,30 +188,54 @@ export function loadNameFromPath(path: string, exportedName: string): any { } } -export function createAddressFromString(address: string, defaultPort?: number): Address { - const indexBracketStart = address.indexOf('['); - const indexBracketEnd = address.indexOf(']', indexBracketStart); - const indexColon = address.indexOf(':'); - const lastIndexColon = address.lastIndexOf(':'); - let host: string; - let port = defaultPort; - if (indexColon > -1 && lastIndexColon > indexColon) { - // IPv6 - if (indexBracketStart === 0 && indexBracketEnd > indexBracketStart) { - host = address.substring(indexBracketStart + 1, indexBracketEnd); - if (lastIndexColon === indexBracketEnd + 1) { - port = Number.parseInt(address.substring(lastIndexColon + 1)); +export class AddressHelper { + private static readonly MAX_PORT_TRIES: number = 3; + private static readonly INITIAL_FIRST_PORT: number = 5701; + + static getSocketAddresses(address: string): Address[] { + const addressHolder = this.createAddressFromString(address, -1); + let possiblePort = addressHolder.port; + let maxPortTryCount = 1; + if (possiblePort === -1) { + maxPortTryCount = AddressHelper.MAX_PORT_TRIES; + possiblePort = AddressHelper.INITIAL_FIRST_PORT; + } + + const addresses: Address[] = []; + + for (let i = 0; i < maxPortTryCount; i++) { + addresses.push(new Address(addressHolder.host, possiblePort + i)); + } + + return addresses; + } + + static createAddressFromString(address: string, defaultPort?: number): Address { + const indexBracketStart = address.indexOf('['); + const indexBracketEnd = address.indexOf(']', indexBracketStart); + const indexColon = address.indexOf(':'); + const lastIndexColon = address.lastIndexOf(':'); + let host: string; + let port = defaultPort; + if (indexColon > -1 && lastIndexColon > indexColon) { + // IPv6 + if (indexBracketStart === 0 && indexBracketEnd > indexBracketStart) { + host = address.substring(indexBracketStart + 1, indexBracketEnd); + if (lastIndexColon === indexBracketEnd + 1) { + port = Number.parseInt(address.substring(lastIndexColon + 1)); + } + } else { + host = address; } + } else if (indexColon > 0 && indexColon === lastIndexColon) { + host = address.substring(0, indexColon); + port = Number.parseInt(address.substring(indexColon + 1)); } else { host = address; } - } else if (indexColon > 0 && indexColon === lastIndexColon) { - host = address.substring(0, indexColon); - port = Number.parseInt(address.substring(indexColon + 1)); - } else { - host = address; + return new Address(host, port); } - return new Address(host, port); + } export function mergeJson(base: any, other: any): void { diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index 568978df5..8c123ade6 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -1,5 +1,5 @@ import Address = require('../Address'); -import {createAddressFromString} from '../Util'; +import {AddressHelper} from '../Util'; import {get} from 'https'; import {IncomingMessage} from 'http'; import * as Promise from 'bluebird'; @@ -73,7 +73,7 @@ export class HazelcastCloudDiscovery { const privateAddress = value[HazelcastCloudDiscovery.PRIVATE_ADDRESS_PROPERTY]; const publicAddress = value[HazelcastCloudDiscovery.PUBLIC_ADDRESS_PROPERTY]; - const publicAddr = createAddressFromString(publicAddress.toString()); + const publicAddr = AddressHelper.createAddressFromString(publicAddress.toString()); privateToPublicAddresses.set(new Address(privateAddress, publicAddr.port).toString(), publicAddr); } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 8992366b5..56d7e81f8 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -25,7 +25,7 @@ import HazelcastClient from '../HazelcastClient'; import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; -import {createAddressFromString} from '../Util'; +import {AddressHelper} from '../Util'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); @@ -86,7 +86,7 @@ export class ClusterService extends EventEmitter { return this.getPossibleMemberAddresses().then((res) => { this.knownAddresses = []; res.forEach((value) => { - this.knownAddresses.push(createAddressFromString(value)); + this.knownAddresses = this.knownAddresses.concat(AddressHelper.getSocketAddresses(value)); }); const attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; diff --git a/test/AddressHelperTest.js b/test/AddressHelperTest.js new file mode 100644 index 000000000..14a8e3d6a --- /dev/null +++ b/test/AddressHelperTest.js @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Controller = require('./RC'); +var expect = require('chai').expect; + +var HazelcastClient = require('../.').Client; +var Config = require('../.').Config; + +describe('AddressHelper', function () { + this.timeout(30000); + + var cluster; + var client; + + before(function () { + return Controller.createCluster(null, null).then(function (res) { + cluster = res; + return Controller.startMember(cluster.id); + }).then(function () { + var cfg = new Config.ClientConfig(); + cfg.networkConfig.addresses = ['127.0.0.2', '127.0.0.1:5701']; + return HazelcastClient.newHazelcastClient(cfg); + }).then(function (res) { + client = res; + }); + }); + + after(function () { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + + it('should try all addresses', function () { + var knownAddresses = client.getClusterService().knownAddresses.map(function (address) { + return address.toString(); + }); + + expect(knownAddresses).to.have.members(['127.0.0.2:5701', '127.0.0.2:5702', '127.0.0.2:5703', '127.0.0.1:5701']); + }); +}); diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 9fd5b1672..1ced70fba 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -19,7 +19,7 @@ var path = require('path'); var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; var Config = require('../../lib/index').Config; var Long = require('long'); -var createAddressFromString = require("../../lib/Util").createAddressFromString; +var AddressHelper = require("../../lib/Util").AddressHelper; describe('ConfigBuilder Test', function () { var configFull; @@ -38,8 +38,24 @@ describe('ConfigBuilder Test', function () { it('networkConfig', function () { var networkCfg = configFull.networkConfig; - var address0 = createAddressFromString(networkCfg.addresses[0]); - var address1 = createAddressFromString(networkCfg.addresses[1]); + + var addresses0 = AddressHelper.getSocketAddresses(networkCfg.addresses[0]); + expect(addresses0[0].host).to.equal('127.0.0.9'); + expect(addresses0[0].port).to.equal(5701); + expect(addresses0[1].host).to.equal('127.0.0.9'); + expect(addresses0[1].port).to.equal(5702); + expect(addresses0[2].host).to.equal('127.0.0.9'); + expect(addresses0[2].port).to.equal(5703); + expect(addresses0.length).to.equal(3); + + var addresses1 = AddressHelper.getSocketAddresses(networkCfg.addresses[1]); + expect(addresses1[0].host).to.equal('127.0.0.2'); + expect(addresses1[0].port).to.equal(5702); + expect(addresses1.length).to.equal(1); + + + var address0 = AddressHelper.createAddressFromString(networkCfg.addresses[0]); + var address1 = AddressHelper.createAddressFromString(networkCfg.addresses[1]); expect(address0.host).to.equal('127.0.0.9'); expect(address0.port).to.be.undefined; expect(address1.host).to.equal('127.0.0.2'); From 59f2747f7c65ef16f479790e7dcee500f3ea74ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Wed, 5 Sep 2018 20:08:32 +0300 Subject: [PATCH 137/685] add documentation for Node.js Client API Overview and some data structures --- README.md | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/README.md b/README.md index 4d238da06..50626f9c3 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,13 @@ * [3. Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) * [Code Samples](#code-samples) * [Serialization Considerations](#serialization-considerations) +* [Using Node.js Client with Hazelcast IMDG](#using-nodejs-client-with-hazelcast-imdg) + * [1. Node.js Client API Overview](#1-nodejs-client-api-overview) + * [2. Using Distributed Data Structures](#2-using-distributed-data-structures) + * [2.1. Using Map](#21-using-map) + * [2.2. Using MultiMap](#22-using-multimap) + * [2.3. Using ReplicatedMap](#23-using-replicatedmap) + * [2.4. Using Queue](#24-using-queue) * [Development](#development) * [Building And Installing from Sources](#building-and-installing-from-sources) * [Using Locally Installed Package](#using-locally-installed-package) @@ -301,6 +308,123 @@ readData(dataInput) { } ``` +# Using Node.js Client with Hazelcast IMDG + +## 1. Node.js Client API Overview + +Most of the functions in the API return `Promise`. Therefore, you need to be familiar with the concept of promises to use the Node.js client. If not, you can learn about them using various online resources. + +Promises provide a better way of working with callbacks. You can chain asynchronous functions by `then()` function of promise. Also, you can use `async/await`, if you use Node.js 8 and higher versions. + +If you are ready to go, let's start to use Hazelcast Node.js client! + +The first step is configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. Please refer to the [Node.js Client Declarative Configuration section](#declarative-configuration) for details. + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.groupConfig.name = 'dev'; +clientConfig.networkConfig.addresses.push('10.90.0.1', '10.90.0.2:5702'); +``` + +The second step is to initialize the `HazelcastClient` to be connected to the cluster. + +```javascript +Client.newHazelcastClient(clientConfig).then(function (client) { + // some operation +}); +``` + +**This client object is your gateway to access all Hazelcast distributed objects.** + +Let’s create a map and populate it with some data. + +```javascript +var client; +var mapCustomers; +Client.newHazelcastClient(clientConfig).then(function (res) { + client = res; + mapCustomers = client.getMap('customers'); // creates the map proxy + return mapCustomers.put('1', new Customer('Furkan', 'Senharputlu')); +}).then(function () { + return mapCustomers.put('2', new Customer("Joe", "Smith")); +}).then(function () { + return mapCustomers.put('3', new Customer("Muhammet", "Ali")); +}); +``` + +As a final step, if you are done with your client, you can shut it down as shown below. This will release all the used resources and will close connections to the cluster. + +```javascript +... +.then(function () { + client.shutdown(); +}); +``` + +## 2. Using Distributed Data Structures + +Most of the Distributed Data Structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. + +## 2.1. Using Map + +A Map usage example is shown below. + +```javascript +var map = client.getMap('myMap'); + +map.put(1, 'Furkan').then(function (oldValue) { + return map.get(1); +}).then(function (value) { + console.log(value); // Furkan + return map.remove(1); +}); +``` + +## 2.2. Using MultiMap + +A MultiMap usage example is shown below. + +```javascript +var multiMap = client.getMultiMap('myMultiMap'); + +multiMap.put(1, 'Furkan').then(function () { + return multiMap.put(1, 'Mustafa'); +}).then(function () { + return multiMap.get(1); +}).then(function (values) { + console.log(values.get(0), values.get(1)); // Furkan Mustafa +}); +``` + +## 2.3. Using ReplicatedMap + +A ReplicatedMap usage example is shown below. + +```javascript +var replicatedMap = client.getReplicatedMap('myReplicatedMap'); + +replicatedMap.put(1, 'Furkan').then(function () { + return replicatedMap.put(2, 'Ahmet'); +}).then(function () { + return replicatedMap.get(2); +}).then(function (value) { + console.log(value); // Ahmet +}); +``` + +## 2.4. Using Queue + +A Queue usage example is shown below. + +```javascript +var queue = client.getQueue('myQueue'); + +queue.offer('Furkan').then(function () { + return queue.peek(); +}).then(function (head) { + console.log(head); // Furkan +}); +``` # Development From e53f549d58c6f215f47b550a17b674960d222edf Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Fri, 5 Oct 2018 17:28:08 +0300 Subject: [PATCH 138/685] add documentatition for Setting Up Client Network Chapter (#343) --- README.md | 241 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) diff --git a/README.md b/README.md index 50626f9c3..ef74e6691 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,14 @@ * [3. Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) * [Code Samples](#code-samples) * [Serialization Considerations](#serialization-considerations) +* [Setting Up Client Network](#setting-up-client-network) + * [1. Providing the Member Addresses](#1-providing-the-member-addresses) + * [2. Setting Smart Routing](#2-setting-smart-routing) + * [3. Setting Redo Operation](#3-enabling-redo-operation) + * [4. Setting Connection Timeout](#4-setting-connection-timeout) + * [5. Setting Connection Attempt Limit](#5-setting-connection-attempt-limit) + * [6. Setting Connection Attempt Period](#6-setting-connection-attempt-period) + * [7. Enabling Hazelcast Cloud Discovery](#7-enabling-hazelcast-cloud-discovery) * [Using Node.js Client with Hazelcast IMDG](#using-nodejs-client-with-hazelcast-imdg) * [1. Node.js Client API Overview](#1-nodejs-client-api-overview) * [2. Using Distributed Data Structures](#2-using-distributed-data-structures) @@ -308,6 +316,239 @@ readData(dataInput) { } ``` +# Setting Up Client Network + +All network related configuration of Hazelcast Node.js Client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let’s first give the examples for these two approaches. Then we will look at its sub-elements and attributes. + +### Declarative Client Network Configuration + +Here is an example of configuring network for Node.js Client declaratively. + +```json +{ + "network": { + "clusterMembers": [ + "10.1.1.21", + "10.1.1.22:5703" + ], + "smartRouting": true, + "redoOperation": true, + "connectionTimeout": 6000, + "connectionAttemptPeriod": 5000, + "connectionAttemptLimit": 5 + } +} +``` + +### Programmatic Client Network Configuration + +Here is an example of configuring network for Node.js Client programmatically. + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); +clientConfig.networkConfig.smartRouting = true; +clientConfig.networkConfig.redoOperation = true; +clientConfig.networkConfig.connectionTimeout = 6000; +clientConfig.networkConfig.connectionAttemptPeriod = 5000; +clientConfig.networkConfig.connectionAttemptLimit = 5; +``` + +## 1. Providing the Member Addresses + +Address list is the initial list of cluster addresses to which the client will connect. The client uses this +list to find an alive member. Although it may be enough to give only one address of a member in the cluster +(since all members communicate with each other), it is recommended that you give the addresses for all the members. + +**Declarative:** + +```json +{ + "network": { + "clusterMembers": [ + "10.1.1.21", + "10.1.1.22:5703" + ] + } +} +``` + +**Programmatic:** + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); +``` + +If the port part is omitted, then 5701, 5702 and 5703 will be tried in random order. + +You can specify multiple addresses with or without port information as seen above. The provided list is shuffled and tried in random order. Its default value is `localhost`. + +## 2. Setting Smart Routing + +Smart routing defines whether the client mode is smart or unisocket. See [Node.js Client Operation Modes section](#nodejs-client-operation-modes) +for the description of smart and unisocket modes. + +The following are example configurations. + +**Declarative:** + +```json +{ + "network": { + "smartRouting": true + } +} +``` + +**Programmatic:** + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.smartRouting = true; +``` + +Its default value is `true` (smart client mode). + +## 3. Enabling Redo Operation + +It enables/disables redo-able operations. While sending the requests to related members, operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. + +**Declarative:** + +```json +{ + "network": { + "redoOperation": true + } +} +``` + +**Programmatic:** + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.redoOperation = true; +``` + +Its default value is `false` (disabled). + +## 4. Setting Connection Timeout + +Connection timeout is the timeout value in milliseconds for members to accept client connection requests. +If server does not respond within the timeout, the client will retry to connect as many as `ClientNetworkConfig.connectionAttemptLimit` times. + +The following are the example configurations. + + +**Declarative:** + +```json +{ + "network": { + "connectionTimeout": 6000 + } +} +``` + +**Programmatic:** + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.connectionTimeout = 6000; +``` + +Its default value is `5000` milliseconds. + +## 5. Setting Connection Attempt Limit + +While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addresses`, that member might not be available at that moment. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `ClientNetworkConfig.connectionAttemptLimit` times. This is also the case when the previously established connection between the client and that member goes down. + +The following are example configurations. + +**Declarative:** + +```json +{ + "network": { + "connectionAttemptLimit": 5 + } +} +``` + +**Programmatic:** + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.connectionAttemptLimit = 5; +``` + +Its default value is `2`. + +## 6. Setting Connection Attempt Period + +Connection timeout period is the duration in milliseconds between the connection attempts defined by `ClientNetworkConfig.connectionAttemptLimit`. + +The following are example configurations. + +**Declarative:** + +```json +{ + "network": { + "connectionAttemptPeriod": 5000 + } +} +``` + +**Programmatic:** + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.connectionAttemptPeriod = 5000; +``` + +Its default value is `3000` milliseconds. + +## 7. Enabling Hazelcast Cloud Discovery + +The purpose of Hazelcast Cloud Discovery is to provide clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. + +The following are example configurations. + +**Declarative:** + +```json +{ + "group": { + "name": "hazel", + "password": "cast" + }, + + "network": { + "hazelcastCloud": { + "discoveryToken": "EXAMPLE_TOKEN", + "enabled": true + } + } +} + +``` + +**Programmatic:** + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.groupConfig.name = 'hazel'; +clientConfig.groupConfig.password = 'cast'; + +clientConfig.networkConfig.cloudConfig.enabled = true; +clientConfig.networkConfig.cloudConfig.discoveryToken = 'EXAMPLE_TOKEN'; +``` + +To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. + + # Using Node.js Client with Hazelcast IMDG ## 1. Node.js Client API Overview From 9b567895ad645d8602b00b7686bf3842c83780fd Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Thu, 6 Sep 2018 12:41:00 -0400 Subject: [PATCH 139/685] Adds getting started in Readme.MD --- README.md | 315 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 288 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index ef74e6691..5e068a59b 100644 --- a/README.md +++ b/README.md @@ -80,43 +80,306 @@ Hazelcast Node.js client supports the following data structures and features: * SSL connection support (requires enterprise server) * Hazelcast Cloud Discovery -# Installing the Client +# Getting Started -Following command installs Hazelcast Node.js client: +This part explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG, IMDG and client +configuration and how to use distributed maps with Hazelcast. +## Requirements + +1. Windows, Linux or MacOS +1. Node.js >= 4 +2. Java >= 6 +3. Hazelcast IMDG >= 3.6 +4. Latest Hazelcast Node.js Client + +## Working with Hazelcast Clusters + +Hazelcast Node.js Client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of user data. +Clients are a way to connect to IMDG cluster and access such data. + +IMDG cluster consists of one or more Hazelcast IMDG members. These members generally run on multiple virtual or physical machines +and are connected to each other via network. Any data put on the cluster is partitioned to multiple members transparent to the user. +It is therefore very easy to scale the system by adding new members as the data grows. IMDG cluster also offers resilience. Should +any hardware or software problem causes a crash to any member, the data on that member is recovered from backups and the cluster +continues to operate without any downtime. Hazelcast clients are an easy way to connect to an IMDG cluster and perform tasks on +distributed data structures that live on the cluster. + +In order to use Hazelcast Node.js Client, we first need to setup an IMDG cluster. + +### Setting up an IMDG cluster +There are multiple ways of starting an IMDG cluster easily. You can run standalone IMDG members by downloading and running jar files +from the website. You can embed IMDG members to your Java projects. The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) +if you have brew installed in your computer. We are going to download jars from the website and run a standalone member for this guide. + +#### Running standalone jars +Go to https://hazelcast.org/download/ and download `.zip` or `.tar` distribution. Decompress the contents into any directory that you +want to run IMDG members from. Change into the directory that you decompressed hazelcast content. Go into `bin` directory. Use either +`start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see IMDG logs on the terminal. +Once you see some log similar to the following, your 1-member cluster is ready to use: +``` +INFO: [192.168.0.3]:5701 [dev] [3.10.4] + +Members {size:1, ver:1} [ + Member [192.168.0.3]:5701 - 65dac4d1-2559-44bb-ba2e-ca41c56eedd6 this +] + +Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService +INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED +``` + + +#### Using hazelcast-member tool +hazelcast-member is a tool to make downloading and running IMDG members as easy as it could be. If you have brew installed, just run +``` +brew tap hazelcast/homebrew-hazelcast +brew install hazelcast-member +hazelcast-member start +``` +In order to stop the member later, just type +``` +hazelcast-member stop +``` +Find more information about hazelcast-member tool at https://github.com/hazelcast/hazelcast-member-tool + +Please refer to official [hazelcast documentation](http://docs.hazelcast.org/docs/3.10.4/manual/html-single/index.html#getting-started) for more information regarding starting clusters. + +# Downloading and Installing +Hazelcast Node.js Client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. ``` npm install hazelcast-client --save ``` -# Using the Client +# Basic Configuration +If you are using Hazelcast IMDG and Node.js Client on the same computer, generally default configuration just works. This is great for +trying out the client and experimenting. However, if you run the client on a different computer than any of the cluster members, you may +need to do some simple configuration such as member addresses. + +IMDG members and the clients has their own configuration options. You may need to reflect some configuration options that you made on member +side to client side in order to connect to the cluster. This section describes the most common configuration elements to get you started in no time. +It discusses some member side configuration options to ease understanding Hazelcast's ecosystem. Then, client side configuration options +regarding cluster connection are discussed. Configuration material regarding data structures are discussed in the following sections. +You can refer to [IMDG Documentation](https://hazelcast.org/documentation/) and [CONFIG.md](CONFIG.MD) for more information. + +## IMDG Configuration +There are two ways to configure Hazelcast IMDG. One is to use a `hazelcast.xml` file and the other is to programmatically configure the +instance before starting it from Java code. Since we use standalone servers, we will use `hazelcast.xml` to configure our cluster members. + +When you download and unzip hazelcast-.zip, you see the `hazelcast.xml` in /bin folder. When a Hazelcast member starts, it looks for +`hazelcast.xml` file to load configuration from. In `hazelcast.xml` file, you will see the default configuration. We will go over some important +elements here: + +- ``: This tag specifies to which cluster this member belongs to. A member only connects to other members that are in the same group as +itself. You will see `` and `` tags with some preconfigured values. You may give your clusters different names so that they can +live in the same network without disturbing each other. Note that the cluster name should be the same across all members and clients that belong + to the same cluster. `` tag is not in use since Hazelcast 3.9. It is there for backward compatibility +purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. +- `` + - ``: This specifies the port number that the member will use when it starts. You can specify a port number. If you set `auto-increment` + to `true`, than Hazelcast will try subsequent ports until it finds an available port or `port-count` is reached. + - ``: This tag specifies the strategies that member uses to find other members of the cluster. Choose which strategy you want to + use by setting its `enabled` attribute to `true` and the others to `false`. + - ``: Members find each other by sending multicast requests to the specified address and port. It is very useful if ip addresses + of the members are not static. + - ``: This strategy uses a pre-configured list of known members to find and already existing cluster. It is enough for a member to + find only one cluster member to connect to the cluster. The rest of the member list is automatically retrieved from that member. We recommend + putting multiple known member addresses there to avoid disconnectivity should one of the members in the list is unavailable at the time + of connection. + +These configuration elements are enough for most connection scenarios. Now we will move onto configuration of the Node.js client. + +## Hazelcast Client Configuration +There are two ways to configure a Hazelcast Node.js Client: +- Programmatically +- Declaratively (JSON) + +This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. Refer to (CONFIG.md) +and the following sections for information about detailed network configuration and/or additional features of Hazelcast Node.js Client +configuration. + +An easy way to configure your Hazelcast Node.js Client is to create a `Config` object and set the appropriate options. Then you can +supply this object to your client at the startup. Another way to configure your client is to provide a `hazelcast-client.json` file. This approach is similar to `hazelcast.xml` approach +in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas member configuration is XML based. Although these +two formats are different, you will realize that the names of the configuration parameters are the same for both client and the member. +It is done this way to make it easier to transfer Hazelcast skills to multiple platforms easily. + +Once you embedded hazelcast-client to your Node.js project. You may follow any of programmatic or declarative configuration approaches. +We will provide both ways for each configuration option in this section. Pick one way and stick to it. + +--- + +**Programmatic configuration** +You need to create a `ClientConfig` object and adjust its properties. Then you can pass this object to the client when starting it. -Hazelcast Node.js Client connects to a Hazelcast IMDG cluster. See [https://hazelcast.org/download/](https://hazelcast.org/download/). +```javascript +let Client = require('hazelcast-client').Client; +let Config = require('hazelcast-client').Config; +let cfg = new Config.ClientConfig(); +Client.newHazelcastClient(cfg) +``` + +**Declarative configuration** +Hazelcast Node.js Client looks for a `hazelcast-client.json` in the current working directory unless you provide a configuration object +at the startup. If you intend to configure your client using a configuration file, then place a `hazelcast-client.json` in the directory +of your application's entry point. + +If you prefer to keep your `hazelcast-client.json` file somewhere else, you can override the environment variable `HAZELCAST_CLIENT_CONFIG` +with the location of your config file. In this case, the client uses the configuration file specified in the environment variable. + +For the structure of `hazelcast-client.json`, take a look at [hazelcast-client-full.json](test/config/hazelcast-client-full.json). You +can use only the relevant parts of the file in your `hazelcast-client.json` and remove the rest. Default configuration is used for any +part that you do not explicitly set in `hazelcast-client.json`. + +--- + +If you run Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster +names as explained in the previous section. If you did, then you need to make certain changes to network settings of your client. + +### Group Settings + +- Programmatic +``` +let cfg = new Config.ClientConfig(); +cfg.group.name = //group name of you cluster +``` -Following script illustrates a basic example in which a map is created in Hazelcast Node.js client and an entry is added to that map: +- Declarative +``` +{ + "group": { + "name": "group name of you cluster" + } +} +``` +### Network Settings +You need to provide the ip address and port of at least one member in your cluster so the client finds it. +- Programmatic +``` +let cfg = new Config.ClientConfig(); +cfg.network.addresses.push('some-ip-address:port'); +``` +- Declarative +``` +{ + "network": { + "clusterMembers": [ + "some-ip-address:port" + ], + } +} + +## Basic Usage +Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a +distributed map in Node.js + +The following example first creates a programmatic configuration object. Then, it starts a client. + +```javascript +let Client = require('hazelcast-client').Client; +let Config = require('hazelcast-client').Config; +let config = new Config.ClientConfig(); // We create a config for illustrative purposes. + // We do not adjust this config. Therefore it has default settings. + +Client.newHazelcastClient(config).then(function(client) { + console.log(client.getLocalEndpoint()); // Connects and prints some information about this client +}); +``` +This should print logs about the cluster members and information about the client itself such as client type, uuid and address. +``` +[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 192.168.0.3:5701 authenticated +[DefaultLogger] INFO at ClusterService: Members received. +[ Member { + address: Address { host: '192.168.0.3', port: 5701, type: 4 }, + uuid: '05db1504-4f23-426b-9e8a-c9db587ad0d6', + isLiteMember: false, + attributes: {} } ] +[DefaultLogger] INFO at HazelcastClient: Client started +ClientInfo { + type: 'NodeJS', + uuid: '532e8479-2b86-47f9-a0fb-a2da13a8d584', + localAddress: Address { host: '127.0.0.1', port: 51903, type: 4 } } +``` +Congratulations, you just started a Hazelcast Node.js Client. + +**Using a map** + +Let us manipulate a distributed map on a cluster using the client. + +Save the following file as `IT.js` and run it using `node IT.js` +**IT.js** ```javascript -var HazelcastClient = require('hazelcast-client').Client; -var person = { - firstName: "Joe", - lastName: "Doe", - age: 42 -}; -var map; -HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { - map = hazelcastClient.getMap("personMap"); - map.put(1, person).then(function (val) { - // prints previous value for key `1` - console.log(val); +let Client = require('hazelcast-client').Client; +let Config = require('hazelcast-client').Config; +let config = new Config.ClientConfig(); + +Client.newHazelcastClient(config).then(function(client) { + let personnelMap = client.getMap('personnelMap'); + return personnelMap.put('Alice', 'IT').then(function () { + return personnelMap.put('Bob', 'IT'); + }).then(function () { + return personnelMap.put('Clark', 'IT'); + }).then(function () { + console.log("Added IT personnel. Logging all known personnel"); + return personnelMap.entrySet(); + }).then(function (allPersonnel) { + allPersonnel.forEach(function (person) { + console.log(person[0] + ' is in ' + person[1] + ' department'); + }); + return client.shutdown(); }); - map.get(1).then(function (value) { - console.log(value); - }) }); ``` +**Output** +``` +[DefaultLogger] INFO at HazelcastClient: Client started +Added IT personnel. Logging all known personnel +Alice is in IT department +Clark is in IT department +Bob is in IT department +``` -Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. +You see this example puts all IT personnel into a cluster-wide `personnelMap` and then prints all known personnel. -You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). +Now create `Sales.js` and run it using `node Sales.js` +**Sales.js** +```javascript +let Client = require('hazelcast-client').Client; +let Config = require('hazelcast-client').Config; +let config = new Config.ClientConfig(); + +Client.newHazelcastClient(config).then(function(client) { + let personnelMap = client.getMap('personnelMap'); + return personnelMap.put('Denise', 'Sales').then(function () { + return personnelMap.put('Erwing', 'Sales'); + }).then(function () { + return personnelMap.put('Faith', 'Sales'); + }).then(function () { + console.log("Added Sales personnel. Logging all known personnel"); + return personnelMap.entrySet(); + }).then(function (allPersonnel) { + allPersonnel.forEach(function (person) { + console.log(person[0] + ' is in ' + person[1] + ' department'); + }); + return client.shutdown(); + }); +}); +``` +**Output** +``` +[DefaultLogger] INFO at HazelcastClient: Client started +Added Sales personnel. Logging all known personnel +Denise is in Sales department +Erwing is in Sales department +Faith is in Sales department +Alice is in IT department +Clark is in IT department +Bob is in IT department + +``` + +You will see this time we add only the sales employees but we get the list all known employees including the ones in IT. +That is because our map lives in the cluster and no matter which client we use, we can access the whole map. # Configuration Overview @@ -125,8 +388,6 @@ and how you should set paths and exported names for the client to load objects. ## 1. Configuration Options -You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). - * Programmatic configuration * Declarative configuration (JSON file) @@ -274,10 +535,10 @@ If you have only one export as the default export from `factory_utils.js`, just the client will load the default export from the file. -# Code Samples - -See [Code Samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) +## Code Samples +Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. +You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). # Serialization Considerations From 7dd27b275f4f57ba9d8cf867d1f907ab324a4dee Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 11 Sep 2018 15:09:52 -0400 Subject: [PATCH 140/685] Fixes language in getting-started --- README.md | 139 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 88 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 5e068a59b..24bd40be1 100644 --- a/README.md +++ b/README.md @@ -82,20 +82,20 @@ Hazelcast Node.js client supports the following data structures and features: # Getting Started -This part explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG, IMDG and client +This chapter explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG, IMDG and client configuration and how to use distributed maps with Hazelcast. ## Requirements -1. Windows, Linux or MacOS -1. Node.js >= 4 -2. Java >= 6 -3. Hazelcast IMDG >= 3.6 -4. Latest Hazelcast Node.js Client +- Windows, Linux or MacOS +- Node.js 4 or newer +- Java 6 or newer +- Hazelcast IMDG 3.6 or newer +- Latest Hazelcast Node.js Client ## Working with Hazelcast Clusters -Hazelcast Node.js Client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of user data. +Hazelcast Node.js Client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of the user data. Clients are a way to connect to IMDG cluster and access such data. IMDG cluster consists of one or more Hazelcast IMDG members. These members generally run on multiple virtual or physical machines @@ -107,14 +107,14 @@ distributed data structures that live on the cluster. In order to use Hazelcast Node.js Client, we first need to setup an IMDG cluster. -### Setting up an IMDG cluster +### Setting Up an IMDG Cluster There are multiple ways of starting an IMDG cluster easily. You can run standalone IMDG members by downloading and running jar files from the website. You can embed IMDG members to your Java projects. The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) if you have brew installed in your computer. We are going to download jars from the website and run a standalone member for this guide. -#### Running standalone jars -Go to https://hazelcast.org/download/ and download `.zip` or `.tar` distribution. Decompress the contents into any directory that you -want to run IMDG members from. Change into the directory that you decompressed hazelcast content. Go into `bin` directory. Use either +#### Running Standalone Jars +Go to https://hazelcast.org/download/ and download `.zip` or `.tar` distribution of Hazelcast IMDG. Decompress the contents into any directory that you +want to run IMDG members from. Change into the directory that you decompressed the Hazelcast content. Go into `bin` directory. Use either `start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see IMDG logs on the terminal. Once you see some log similar to the following, your 1-member cluster is ready to use: ``` @@ -129,59 +129,90 @@ INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED ``` -#### Using hazelcast-member tool -hazelcast-member is a tool to make downloading and running IMDG members as easy as it could be. If you have brew installed, just run +#### Using hazelcast-member Tool +`hazelcast-member` is a tool to make downloading and running IMDG members as easy as it could be. If you have brew installed, run the following commands: ``` brew tap hazelcast/homebrew-hazelcast brew install hazelcast-member hazelcast-member start ``` -In order to stop the member later, just type +In order to stop the member, run the following command: ``` hazelcast-member stop ``` -Find more information about hazelcast-member tool at https://github.com/hazelcast/hazelcast-member-tool +Find more information about `hazelcast-member` tool at https://github.com/hazelcast/hazelcast-member-tool -Please refer to official [hazelcast documentation](http://docs.hazelcast.org/docs/3.10.4/manual/html-single/index.html#getting-started) for more information regarding starting clusters. +Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/3.10.4/manual/html-single/index.html#getting-started) for more information regarding starting clusters. -# Downloading and Installing +## Downloading and Installing Hazelcast Node.js Client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. ``` npm install hazelcast-client --save ``` -# Basic Configuration +## Basic Configuration If you are using Hazelcast IMDG and Node.js Client on the same computer, generally default configuration just works. This is great for -trying out the client and experimenting. However, if you run the client on a different computer than any of the cluster members, you may -need to do some simple configuration such as member addresses. +trying out the client. However, if you run the client on a different computer than any of the cluster members, you may +need to do some simple configuration such as specifying the member addresses. -IMDG members and the clients has their own configuration options. You may need to reflect some configuration options that you made on member -side to client side in order to connect to the cluster. This section describes the most common configuration elements to get you started in no time. +The IMDG members and clients have their own configuration options. You may need to reflect some of the member side configurations on the client side to properly connect to the cluster. +This section describes the most common configuration elements to get you started in no time. It discusses some member side configuration options to ease understanding Hazelcast's ecosystem. Then, client side configuration options regarding cluster connection are discussed. Configuration material regarding data structures are discussed in the following sections. -You can refer to [IMDG Documentation](https://hazelcast.org/documentation/) and [CONFIG.md](CONFIG.MD) for more information. +You can refer to [IMDG Documentation](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview](#configuration-overview) for more information. ## IMDG Configuration +Hazelcast IMDG aims to run out of the box for most common scenarios. However if you have limitations on your network such as multicast being disabled, +you may have to configure your Hazelcast IMDG instances so that they can find each other on the network. Also most data structures are configurable. +Therefore, you may want to configure your Hazelcast IMDG. We will show you the basics about network configuration here. + There are two ways to configure Hazelcast IMDG. One is to use a `hazelcast.xml` file and the other is to programmatically configure the instance before starting it from Java code. Since we use standalone servers, we will use `hazelcast.xml` to configure our cluster members. -When you download and unzip hazelcast-.zip, you see the `hazelcast.xml` in /bin folder. When a Hazelcast member starts, it looks for -`hazelcast.xml` file to load configuration from. In `hazelcast.xml` file, you will see the default configuration. We will go over some important -elements here: - -- ``: This tag specifies to which cluster this member belongs to. A member only connects to other members that are in the same group as -itself. You will see `` and `` tags with some preconfigured values. You may give your clusters different names so that they can +When you download and unzip `hazelcast-.zip`, you see the `hazelcast.xml` in `bin` folder. When a Hazelcast member starts, it looks for +`hazelcast.xml` file to load configuration from. A sample `hazelcast.xml` is below. We will go over some important elements in the rest of this section. +```xml + + + dev + dev-pass + + + 5701 + + + 224.2.2.3 + 54327 + + + 127.0.0.1 + + 127.0.0.1 + + + + + + + + 1 + + +``` + +- ``: Specifies which cluster this member belongs to. A member connects only to other members that are in the same group as +itself. You will see `` and `` tags with some pre-configured values. You may give your clusters different names so that they can live in the same network without disturbing each other. Note that the cluster name should be the same across all members and clients that belong to the same cluster. `` tag is not in use since Hazelcast 3.9. It is there for backward compatibility purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. - `` - - ``: This specifies the port number that the member will use when it starts. You can specify a port number. If you set `auto-increment` - to `true`, than Hazelcast will try subsequent ports until it finds an available port or `port-count` is reached. - - ``: This tag specifies the strategies that member uses to find other members of the cluster. Choose which strategy you want to + - ``: Specifies the port number to be used by the member when it starts. Its default value is 5701 You can specify another port number, and if + you set `auto-increment` to `true`, than Hazelcast will try subsequent ports until it finds an available port or `port-count` is reached. + - ``: Specifies the strategies to be used by the member to find other cluster members. Choose which strategy you want to use by setting its `enabled` attribute to `true` and the others to `false`. - - ``: Members find each other by sending multicast requests to the specified address and port. It is very useful if ip addresses + - ``: Members find each other by sending multicast requests to the specified address and port. It is very useful if IP addresses of the members are not static. - - ``: This strategy uses a pre-configured list of known members to find and already existing cluster. It is enough for a member to + - ``: This strategy uses a pre-configured list of known members to find an already existing cluster. It is enough for a member to find only one cluster member to connect to the cluster. The rest of the member list is automatically retrieved from that member. We recommend putting multiple known member addresses there to avoid disconnectivity should one of the members in the list is unavailable at the time of connection. @@ -193,22 +224,21 @@ There are two ways to configure a Hazelcast Node.js Client: - Programmatically - Declaratively (JSON) -This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. Refer to (CONFIG.md) +This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. Refer to [Configuration Overview](#configuration-overview) and the following sections for information about detailed network configuration and/or additional features of Hazelcast Node.js Client configuration. An easy way to configure your Hazelcast Node.js Client is to create a `Config` object and set the appropriate options. Then you can supply this object to your client at the startup. Another way to configure your client is to provide a `hazelcast-client.json` file. This approach is similar to `hazelcast.xml` approach in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas member configuration is XML based. Although these -two formats are different, you will realize that the names of the configuration parameters are the same for both client and the member. -It is done this way to make it easier to transfer Hazelcast skills to multiple platforms easily. +two formats are different, you will realize that the names of the configuration parameters are the same for both the client and member. +It is done this way to make it easier to transfer Hazelcast skills to multiple platforms. -Once you embedded hazelcast-client to your Node.js project. You may follow any of programmatic or declarative configuration approaches. +Once you embedded `hazelcast-client` to your Node.js project, you may follow any of programmatic or declarative configuration approaches. We will provide both ways for each configuration option in this section. Pick one way and stick to it. ---- - **Programmatic configuration** + You need to create a `ClientConfig` object and adjust its properties. Then you can pass this object to the client when starting it. ```javascript @@ -219,6 +249,7 @@ Client.newHazelcastClient(cfg) ``` **Declarative configuration** + Hazelcast Node.js Client looks for a `hazelcast-client.json` in the current working directory unless you provide a configuration object at the startup. If you intend to configure your client using a configuration file, then place a `hazelcast-client.json` in the directory of your application's entry point. @@ -233,18 +264,18 @@ part that you do not explicitly set in `hazelcast-client.json`. --- If you run Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster -names as explained in the previous section. If you did, then you need to make certain changes to network settings of your client. +names as explained in the previous section. If you did, then you need to make certain changes to the network settings of your client. ### Group Settings -- Programmatic -``` +**Programmatic:** +```javascript let cfg = new Config.ClientConfig(); cfg.group.name = //group name of you cluster ``` -- Declarative -``` +**Declarative:** +```json { "group": { "name": "group name of you cluster" @@ -254,13 +285,15 @@ cfg.group.name = //group name of you cluster ### Network Settings You need to provide the ip address and port of at least one member in your cluster so the client finds it. -- Programmatic -``` + +**Programmatic:** +```javascript let cfg = new Config.ClientConfig(); cfg.network.addresses.push('some-ip-address:port'); ``` -- Declarative -``` + +**Declarative:** +```json { "network": { "clusterMembers": [ @@ -268,10 +301,11 @@ cfg.network.addresses.push('some-ip-address:port'); ], } } +``` ## Basic Usage Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a -distributed map in Node.js +distributed map in Node.js client. The following example first creates a programmatic configuration object. Then, it starts a client. @@ -302,11 +336,12 @@ ClientInfo { ``` Congratulations, you just started a Hazelcast Node.js Client. -**Using a map** +**Using a Map** Let us manipulate a distributed map on a cluster using the client. Save the following file as `IT.js` and run it using `node IT.js` + **IT.js** ```javascript let Client = require('hazelcast-client').Client; @@ -342,6 +377,7 @@ Bob is in IT department You see this example puts all IT personnel into a cluster-wide `personnelMap` and then prints all known personnel. Now create `Sales.js` and run it using `node Sales.js` + **Sales.js** ```javascript let Client = require('hazelcast-client').Client; @@ -387,6 +423,7 @@ This chapter describes the options to configure your Node.js client and explains and how you should set paths and exported names for the client to load objects. ## 1. Configuration Options +You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). * Programmatic configuration * Declarative configuration (JSON file) From 82146605e131db7931345474865b0ef73727b40e Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 8 Oct 2018 10:23:33 +0300 Subject: [PATCH 141/685] add DistributedObjectEvent and refactor DistibutedObjectListener (#362) --- code_samples/distributed_object_listener.js | 25 ++++++----- src/HazelcastClient.ts | 5 ++- src/core/DistributedObjectListener.ts | 49 +++++++++++++++++++++ src/proxy/ProxyManager.ts | 13 +++--- test/ListenerServiceTest.js | 36 +++++++++------ 5 files changed, 94 insertions(+), 34 deletions(-) create mode 100644 src/core/DistributedObjectListener.ts diff --git a/code_samples/distributed_object_listener.js b/code_samples/distributed_object_listener.js index a64212fd5..8117a5cb6 100644 --- a/code_samples/distributed_object_listener.js +++ b/code_samples/distributed_object_listener.js @@ -15,17 +15,18 @@ */ var Client = require('hazelcast-client').Client; -Client.newHazelcastClient().then(function (hazelcastClient) { - hazelcastClient.addDistributedObjectListener(function (serviceName, name, event) { - console.log('Distributed object event >>> ' + JSON.stringify({ - serviceName: serviceName, - name: name, - event: event - })); +Client.newHazelcastClient().then(function (client) { + client.addDistributedObjectListener(function (distributedObjectEvent) { + console.log('Distributed object event >>> ', + distributedObjectEvent.serviceName, + distributedObjectEvent.objectName, + distributedObjectEvent.eventType + ); + }).then(function () { + var mapname = 'test'; + //this causes a created event + client.getMap(mapname); + //this causes no event because map was already created + client.getMap(mapname); }); - var mapname = 'test' + new Date(); - //this causes a created event - hazelcastClient.getMap(mapname); - //this causes no event because map was already created - hazelcastClient.getMap(mapname); }); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 2d5c05821..822e80418 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -55,6 +55,7 @@ import {DefaultAddressProvider} from './connection/DefaultAddressProvider'; import {HazelcastCloudDiscovery} from './discovery/HazelcastCloudDiscovery'; import {Statistics} from './statistics/Statistics'; import {NearCacheManager} from './nearcache/NearCacheManager'; +import {DistributedObjectListener} from './core/DistributedObjectListener'; export default class HazelcastClient { private static CLIENT_ID = 0; @@ -327,8 +328,8 @@ export default class HazelcastClient { * * @returns registration id of the listener. */ - addDistributedObjectListener(listenerFunc: Function): Promise { - return this.proxyManager.addDistributedObjectListener(listenerFunc); + addDistributedObjectListener(distributedObjectListener: DistributedObjectListener): Promise { + return this.proxyManager.addDistributedObjectListener(distributedObjectListener); } /** diff --git a/src/core/DistributedObjectListener.ts b/src/core/DistributedObjectListener.ts new file mode 100644 index 000000000..64eb19246 --- /dev/null +++ b/src/core/DistributedObjectListener.ts @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * DistributedObjectListener notifies when a DistributedObject + * is created or destroyed cluster-wide. + */ +export type DistributedObjectListener = (distributedObjectListener: DistributedObjectEvent) => void; + +/** + * DistributedObjectEvent is fired when a DistributedObject + * is created or destroyed cluster-wide. + */ +export class DistributedObjectEvent { + + /** + * The type of this event; one of 'created' or 'destroyed'. + */ + eventType: string; + + /** + * The service name of related DistributedObject. + */ + serviceName: string; + + /** + * The name of related DistributedObject. + */ + objectName: string; + + constructor(eventType: string, serviceName: string, objectName: string) { + this.eventType = eventType; + this.serviceName = serviceName; + this.objectName = objectName; + } +} diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 6c76604d2..1efc159c7 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -40,6 +40,7 @@ import {RingbufferProxy} from './ringbuffer/RingbufferProxy'; import {SemaphoreProxy} from './SemaphoreProxy'; import {SetProxy} from './SetProxy'; import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; +import {DistributedObjectEvent, DistributedObjectListener} from '../core/DistributedObjectListener'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); @@ -112,14 +113,12 @@ export class ProxyManager { return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).return(); } - addDistributedObjectListener(listenerFunc: Function): Promise { + addDistributedObjectListener(distributedObjectListener: DistributedObjectListener): Promise { const handler = function (clientMessage: ClientMessage): void { - const converterFunc = function (name: string, serviceName: string, eventType: string): void { - if (eventType === 'CREATED') { - listenerFunc(name, serviceName, 'created'); - } else if (eventType === 'DESTROYED') { - listenerFunc(name, serviceName, 'destroyed'); - } + const converterFunc = (objectName: string, serviceName: string, eventType: string) => { + eventType = eventType.toLowerCase(); + const distributedObjectEvent = new DistributedObjectEvent(eventType, serviceName, objectName); + distributedObjectListener(distributedObjectEvent); }; ClientAddDistributedObjectListenerCodec.handle(clientMessage, converterFunc, null); }; diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index be32d2723..2034edb28 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -46,33 +46,43 @@ var expect = require('chai').expect; }); it('listener is invoked when a new object is created', function (done) { - client.addDistributedObjectListener(function (name, serviceName, eventType) { - if (eventType === 'created' && name === 'mapToListen') { - expect(serviceName).to.eq('hz:impl:mapService'); - done(); - } - }).then(function () { - client.getMap('mapToListen'); + var map; + var listenerId; + client.addDistributedObjectListener(function (distributedObjectEvent) { + expect(distributedObjectEvent.objectName).to.eq('mapToListen'); + expect(distributedObjectEvent.serviceName).to.eq('hz:impl:mapService'); + expect(distributedObjectEvent.eventType).to.eq('created'); + client.removeDistributedObjectListener(listenerId); + done(); + }).then(function (id) { + listenerId = id; + map = client.getMap('mapToListen'); + map.destroy(); }); }); it('listener is invoked when an object is removed[smart=' + isSmartService + ']', function (done) { var map; - client.addDistributedObjectListener(function (name, serviceName, eventType) { - if (eventType === 'destroyed' && name === 'mapToRemove') { - expect(serviceName).to.eq('hz:impl:mapService'); + var listenerId; + client.addDistributedObjectListener(function (distributedObjectEvent) { + if (distributedObjectEvent.eventType === 'destroyed' && distributedObjectEvent.objectName === 'mapToRemove') { + expect(distributedObjectEvent.objectName).to.eq('mapToRemove'); + expect(distributedObjectEvent.serviceName).to.eq('hz:impl:mapService'); + expect(distributedObjectEvent.eventType).to.eq('destroyed'); + client.removeDistributedObjectListener(listenerId); done(); - } else if (eventType === 'created' && name === 'mapToRemove') { + } else if (distributedObjectEvent.eventType === 'created' && distributedObjectEvent.objectName === 'mapToRemove') { map.destroy(); } - }).then(function () { + }).then(function (id) { + listenerId = id; map = client.getMap('mapToRemove'); }); }); it('listener is not invoked when listener was already removed by user', function (done) { this.timeout(3000); - client.addDistributedObjectListener(function (name, serviceName, eventType) { + client.addDistributedObjectListener(function (distributedObjectEvent) { done('Should not have run!'); }).then(function (listenerId) { return client.removeDistributedObjectListener(listenerId) From b69b8ce4dbcd1285e4165a76410138b7e5b803c1 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 8 Oct 2018 10:23:56 +0300 Subject: [PATCH 142/685] add MemberAttributeEvent and refactor listener (#360) --- src/core/MemberAttributeEvent.ts | 65 ++++++++++++++++++++++++++++++++ src/index.ts | 6 ++- src/invocation/ClusterService.ts | 12 +++--- test/MembershipListenerTest.js | 19 +++++----- 4 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 src/core/MemberAttributeEvent.ts diff --git a/src/core/MemberAttributeEvent.ts b/src/core/MemberAttributeEvent.ts new file mode 100644 index 000000000..3e07fce53 --- /dev/null +++ b/src/core/MemberAttributeEvent.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Member} from './Member'; + +/** + * Event for member attribute changes. + */ +export class MemberAttributeEvent { + /** + * the member for this MemberAttributeEvent. + */ + member: Member; + + /** + * the key for this MemberAttributeEvent. + */ + key: string; + + /** + * the type of member attribute change for this MemberAttributeEvent. + */ + operationType: MemberAttributeOperationType; + + /** + * the value for this MemberAttributeEvent. + */ + value: string; + + constructor(member: Member, key: string, operationType: MemberAttributeOperationType, value: string) { + this.member = member; + this.key = key; + this.operationType = operationType; + this.value = value; + } +} + +/** + * Used to identify the type of member attribute change, either PUT or REMOVED. + * + */ +export enum MemberAttributeOperationType { + /** + * Indicates an attribute being put. + */ + PUT = 1, + + /** + * Indicates an attribute being removed. + */ + REMOVE = 2, +} diff --git a/src/index.ts b/src/index.ts index f5fae6c4f..c93623704 100644 --- a/src/index.ts +++ b/src/index.ts @@ -27,8 +27,8 @@ import * as HazelcastErrors from './HazelcastError'; import {IMap} from './proxy/IMap'; import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; import {ClassDefinitionBuilder} from './serialization/portable/ClassDefinitionBuilder'; -import {ClassDefinition} from './serialization/portable/ClassDefinition'; -import {FieldDefinition} from './serialization/portable/ClassDefinition'; +import {ClassDefinition, FieldDefinition} from './serialization/portable/ClassDefinition'; +import {MemberAttributeEvent, MemberAttributeOperationType} from './core/MemberAttributeEvent'; export { HazelcastClient as Client, @@ -46,4 +46,6 @@ export { FieldDefinition, ClassDefinition, ClassDefinitionBuilder, + MemberAttributeEvent, + MemberAttributeOperationType, }; diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 56d7e81f8..c245f8ffa 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -26,6 +26,7 @@ import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; import {AddressHelper} from '../Util'; +import {MemberAttributeEvent, MemberAttributeOperationType} from '../core/MemberAttributeEvent'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); @@ -35,10 +36,6 @@ const MEMBER_REMOVED = 2; const EMIT_MEMBER_ADDED = 'memberAdded'; const EMIT_MEMBER_REMOVED = 'memberRemoved'; const EMIT_ATTRIBUTE_CHANGE = 'memberAttributeChange'; -const ATTRIBUTE_CHANGE: { [key: string]: string } = { - 1: 'put', - 2: 'remove', -}; /** * Manages the relationship of this client with the cluster. @@ -269,8 +266,11 @@ export class ClusterService extends EventEmitter { this.logger.info('ClusterService', 'Members received.', this.members); } - private handleMemberAttributeChange(uuid: string, key: string, operationType: number, value: string): void { - this.emit(EMIT_ATTRIBUTE_CHANGE, uuid, key, ATTRIBUTE_CHANGE[operationType], value); + private handleMemberAttributeChange( + uuid: string, key: string, operationType: MemberAttributeOperationType, value: string): void { + const member = this.getMember(uuid); + const memberAttributeEvent = new MemberAttributeEvent(member, key, operationType, value); + this.emit(EMIT_ATTRIBUTE_CHANGE, memberAttributeEvent); } private memberAdded(member: Member): void { diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index 8e1540502..1abbcbcce 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -18,6 +18,7 @@ var HazelcastClient = require('../.').Client; var Controller = require('./RC'); var expect = require('chai').expect; var Promise = require('bluebird'); +var MemberAttributeOperationType = require('../.').MemberAttributeOperationType describe('MembershipListener', function () { this.timeout(10000); var cluster; @@ -95,11 +96,11 @@ describe('MembershipListener', function () { }); it('sees member attribute change put event', function (done) { - client.clusterService.on('memberAttributeChange', function (uuid, key, op, value) { - if (op === 'put') { - expect(uuid).to.equal(member.uuid); - expect(key).to.equal('test'); - expect(value).to.equal('123'); + client.clusterService.on('memberAttributeChange', function (memberAttributeEvent) { + if (memberAttributeEvent.operationType === MemberAttributeOperationType.PUT) { + expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); + expect(memberAttributeEvent.key).to.equal('test'); + expect(memberAttributeEvent.value).to.equal('123'); done(); } }); @@ -109,10 +110,10 @@ describe('MembershipListener', function () { }); it('sees member attribute change remove event', function (done) { - client.clusterService.on('memberAttributeChange', function (uuid, key, op, value) { - if (op === 'remove') { - expect(uuid).to.equal(member.uuid); - expect(key, 'test'); + client.clusterService.on('memberAttributeChange', function (memberAttributeEvent) { + if (memberAttributeEvent.operationType === MemberAttributeOperationType.REMOVE) { + expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); + expect(memberAttributeEvent.key, 'test'); done(); } }); From cc96e2a428c0028e51a4434dd5f209f3a0f03b99 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 8 Oct 2018 11:37:55 +0300 Subject: [PATCH 143/685] add documentation for Securing Client Connection chapter (#344) --- README.md | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24bd40be1..51cfbee13 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,13 @@ * [4. Setting Connection Timeout](#4-setting-connection-timeout) * [5. Setting Connection Attempt Limit](#5-setting-connection-attempt-limit) * [6. Setting Connection Attempt Period](#6-setting-connection-attempt-period) - * [7. Enabling Hazelcast Cloud Discovery](#7-enabling-hazelcast-cloud-discovery) + * [7. Enabling Client TLS/SSL](#7-enabling-client-tlsssl) + * [8. Enabling Hazelcast Cloud Discovery](#8-enabling-hazelcast-cloud-discovery) +* [Securing Client Connection](#securing-client-connection) + * [1. TLS/SSL](#1-tlsssl) + * [1.1. TLS/SSL for Hazelcast Members](#11-tlsssl-for-hazelcast-members) + * [1.2. TLS/SSL for Hazelcast Node.js Clients](#12-tlsssl-for-hazelcast-nodejs-clients) + * [1.3. Mutual Authentication](#13-mutual-authentication) * [Using Node.js Client with Hazelcast IMDG](#using-nodejs-client-with-hazelcast-imdg) * [1. Node.js Client API Overview](#1-nodejs-client-api-overview) * [2. Using Distributed Data Structures](#2-using-distributed-data-structures) @@ -808,7 +814,14 @@ clientConfig.networkConfig.connectionAttemptPeriod = 5000; Its default value is `3000` milliseconds. -## 7. Enabling Hazelcast Cloud Discovery +## 7. Enabling Client TLS/SSL + +You can use TLS/SSL to secure the connection between the clients and members. If you want TLS/SSL enabled +for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#1-tlsssl). + +As explained in the [TLS/SSL section](#1-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates and members to have their certificate authorities so that the members can know which clients they can trust. Please see the [Mutual Authentication section](#13-mutual-authentication). + +## 8. Enabling Hazelcast Cloud Discovery The purpose of Hazelcast Cloud Discovery is to provide clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. @@ -846,6 +859,172 @@ clientConfig.networkConfig.cloudConfig.discoveryToken = 'EXAMPLE_TOKEN'; To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. +# Securing Client Connection + +This chapter describes the security features of Hazelcast Node.js Client. These include using TLS/SSL for connections between members and between clients and members and mutual authentication. These security features require **Hazelcast IMDG Enterprise** edition. + +### 1. TLS/SSL + +One of the offers of Hazelcast is the TLS/SSL protocol which you can use to establish an encrypted communication across your cluster with key stores and trust stores. + +- A Java `keyStore` is a file that includes a private key and a public certificate. The equivalent of a key store is the combination of `key` and `cert` files at the Node.js client side. + +- A Java `trustStore` is a file that includes a list of certificates trusted by your application which is named certificate authority. The equivalent of a trust store is a `ca` file at the Node.js client side. + +You should set `keyStore` and `trustStore` before starting the members. See the next section how to set `keyStore` and `trustStore` on the server side. + +#### 1.1. TLS/SSL for Hazelcast Members + +Hazelcast allows you to encrypt socket level communication between Hazelcast members and between Hazelcast clients and members, for end to end encryption. To use it, see [TLS/SSL for Hazelcast Members section](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#tls-ssl-for-hazelcast-members). + +#### 1.2. TLS/SSL for Hazelcast Node.js Clients + +Hazelcast Node.js clients which support TLS/SSL should have the following user supplied SSL `options` object, to pass to +[`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback): + +```javascript +var fs = require('fs'); + +var clientConfig = new Config.ClientConfig(); +clientConfig.networkConfig.sslOptions = { + rejectUnauthorized: true, + ca: [fs.readFileSync(__dirname + '/server-cert.pem')], + servername: 'foo.bar.com' +}; +``` + +#### 1.3. Mutual Authentication + +As explained above, Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast clients have trust stores used to define which members they can trust. + +Using mutual authentication, the clients also have their key stores and members have their trust stores so that the members can know which clients they can trust. + +To enable mutual authentication, firstly, you need to set the following property at server side by configuring `hazelcast.xml`: + +```xml + + + + REQUIRED + + + +``` + +You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/3.10.5/manual/html-single/index.html#mutual-authentication) of the Reference Manual. + +And at the Node.js client side, you need to supply SSL `options` object to pass to +[`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). + + +There are two ways to provide this object to the client: + +1. Using the built-in `BasicSSLOptionsFactory` bundled with the client. +2. Writing an SSLOptionsFactory. + +Below subsections describe each way. + +**Using Built-in BasicSSLOptionsFactory** + +Hazelcast Node.js Client includes a utility factory class that creates the necessary `options` object out of the supplied +properties. All you need to do is specifying your factory as `BasicSSLOptionsFactory` and provide the following options: + +- caPath +- keyPath +- certPath +- servername +- rejectUnauthorized +- ciphers + +Please refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) for the descriptions of each option. + +> `caPath`, `keyPath` and `certPath` define file path to respective file that stores such information. + +```json +{ + "network": { + "ssl": { + "enabled": true, + "factory": { + "exportedName": "BasicSSLOptionsFactory", + "properties": { + "caPath": "ca.pem", + "keyPath": "key.pem", + "certPath": "cert.pem", + "rejectUnauthorized": false + } + } + } + } +} +``` + +If these options are not enough for your application, you may write your own options factory and instruct the client +to get the options from it, as explained below. + +**Writing an SSL Options Factory** + +In order to use the full range of options provided to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback), +you may write your own factory object. + +An example configuration: + +```json +{ + "network": { + "ssl": { + "enabled": true, + "factory": { + "path": "my_factory.js", + "exportedName": "SSLFactory", + "properties": { + "caPath": "ca.pem", + "keyPath": "key.pem", + "certPath": "cert.pem", + "keepOrder": true + } + } + } + } +} +``` + + +And your own factory, `My_Factory.js`: + + +```javascript +function SSLFactory() { +} + +SSLFactory.prototype.init = function(props) { + this.caPath = props.caPath; + this.keyPath = props.keyPath; + this.certPath = props.certPath; + this.keepOrder = props.userDefinedProperty1; +}; + +SSLFactory.prototype.getSSLOptions = function() { + var sslOpts = { + servername: 'foo.bar.com', + rejectUnauthorized: true, + ca: fs.readFileSync(this.caPath) + key: fs.readFileSync(this.keyPath), + cert: fs.readFileSync(this.certPath), + }; + if (this.keepOrder) { + sslOpts.honorCipherOrder = true; + } + return sslOpts; +}; +exports.SSLFactory = SSLFactory; +``` + +The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with +the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. + +For information about the path resolution, please refer to the [Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) section. + # Using Node.js Client with Hazelcast IMDG From 33b6b8ad3b3b19b78c666ec133f654fab317efde Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 8 Oct 2018 17:23:09 +0300 Subject: [PATCH 144/685] add documentation for Distributed Events (#359) --- README.md | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/README.md b/README.md index 51cfbee13..727c71616 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,13 @@ * [2.2. Using MultiMap](#22-using-multimap) * [2.3. Using ReplicatedMap](#23-using-replicatedmap) * [2.4. Using Queue](#24-using-queue) + * [4. Distributed Events](#4-distributed-events) + * [4.1. Cluster Events](#41-cluster-events) + * [4.1.1. Listening for Member Events](#411-listening-for-member-events) + * [4.1.2. Listening for Distributed Object Events](#412-listening-for-distributed-object-events) + * [4.1.3. Listening for Lifecycle Events](#413-listening-for-lifecycle-events) + * [4.2. Distributed Data Structure Events](#42-distributed-data-structure-events) + * [4.2.1. Listening for Map Events](#421-listening-for-map-events) * [Development](#development) * [Building And Installing from Sources](#building-and-installing-from-sources) * [Using Locally Installed Package](#using-locally-installed-package) @@ -1144,6 +1151,165 @@ queue.offer('Furkan').then(function () { }); ``` +## 4. Distributed Events + + +This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. + +### 4.1. Cluster Events + +You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side. + +`Membership Listener`: Notifies when a member joins to/leaves the cluster, or when an attribute is changed in a member. + +`Distributed Object Listener`: Notifies when a distributed object is created or destroyed throughout the cluster. + +`Lifecycle Listener`: Notifies when the client is starting, started, shutting down, and shutdown. + +#### 4.1.1. Listening for Member Events + +You can add the following types of member events to the `ClusterService`. + +- `memberAdded`: A new member is added to the cluster. +- `memberRemoved`: An existing member leaves the cluster. +- `memberAttributeChanged`: An attribute of a member is changed. Please refer to [Defining Member Attributes](https://docs.hazelcast.org/docs/3.10.5/manual/html-single/index.html#defining-member-attributes) section in the Hazelcast IMDG Reference Manual to learn about member attributes. + +The `ClusterService` object exposes an `ClusterService.on()` function that allows one or more functions to be attached to member events emitted by the object. + +The following is a membership listener registration by using `ClusterService.on()` function. + +```javascript +client.clusterService.on('memberAdded', function (member) { + console.log('Member Added: The address is', member.address.toString()); +}); +``` + +The `memberAttributeChanged` has its own type of event named `MemberAttributeEvent`. When there is an attribute change on the member, this event is fired. + +Let’s take a look at the following example. + +```javascript +client.clusterService.on('memberAttributeChanged', function (memberAttributeEvent) { + console.log('Member Attribute Changed: The address is', memberAttributeEvent.member.address.toString()); +}); +``` + +#### 4.1.2. Listening for Distributed Object Events + +The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: + +`serviceName`: Service name of the distributed object. + +`objectName`: Name of the distributed object. + +`eventType`: Type of the invoked event. It can be `created` or `destroyed`. + +The following is an example of adding a Distributed Object Listener. + +```javascript +client.addDistributedObjectListener(function (distributedObjectEvent) { + console.log('Distributed object event >>> ', + distributedObjectEvent.serviceName, + distributedObjectEvent.objectName, + distributedObjectEvent.eventType + ); +}).then(function () { + var mapname = 'test'; + //this causes a created event + client.getMap(mapname); + //this causes no event because map was already created + client.getMap(mapname); +}); +``` + +#### 4.1.3. Listening for Lifecycle Events + +The Lifecycle Listener notifies for the following events: +- `starting`: A client is starting. +- `started`: A client has started. +- `shuttingDown`: A client is shutting down. +- `shutdown`: A client’s shutdown has completed. + +The following is an example of Lifecycle Listener that is added to config and its output. + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.listeners.addLifecycleListener(function (state) { + console.log('Lifecycle Event >>> ' + state); +}); + +Client.newHazelcastClient(clientConfig).then(function (hazelcastClient) { + hazelcastClient.shutdown(); +}); +``` + +**Output:** + +``` +Lifecycle Event >>> starting +[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.62:5701 authenticated +[DefaultLogger] INFO at ClusterService: Members received. +[ Member { + address: Address { host: '10.216.1.62', port: 5701, type: 4 }, + uuid: 'dc001432-7868-4ced-9161-5649ff6f31fc', + isLiteMember: false, + attributes: {} } ] +Lifecycle Event >>> started +[DefaultLogger] INFO at HazelcastClient: Client started +Lifecycle Event >>> shuttingDown +Lifecycle Event >>> shutdown + +Process finished with exit code 0 +``` + +### 4.2. Distributed Data Structure Events + +You can add event listeners to the Distributed Data Structures. + +> **NOTE: Hazelcast Node.js Client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, + some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** + +#### 4.2.1. Listening for Map Events + +You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. + +- An entry-based event is fired after the operations that affect a specific entry. For example, `IMap.put()`, `IMap.remove()` or `IMap.evict()`. You should use the `EntryEventListener` type to listen these events. An `EntryEvent` object is passed to the listener function. + +Let’s take a look at the following example. + +```javascript +var entryEventListener = { + added: function (entryEvent) { + console.log('Entry Added:', entryEvent.key, entryEvent.value); // Entry Added: 1 Furkan + } +}; +map.addEntryListener(entryEventListener, undefined, true).then(function () { + return map.put('1', 'Furkan'); +}); +``` + + +- A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen these events. A `MapEvent` object is passed to the listener function. + +Let’s take a look at the following example. + +```javascript +var mapEventListener = { + mapCleared: function (mapEvent) { + console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 3 + } +}; +map.addEntryListener(mapEventListener).then(function () { + return map.put('1', 'Mali'); +}).then(function () { + return map.put('2', 'Ahmet'); +}).then(function () { + return map.put('3', 'Furkan'); +}).then(function () { + return map.clear(); +}); +``` + # Development ## Building And Installing from Sources From 3d699607ad78b8d89184c012ebe3c0006d7397a0 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Mon, 8 Oct 2018 18:08:57 +0300 Subject: [PATCH 145/685] fix Client API get functions (#372) --- code_samples/distributed_object_listener.js | 27 ++-- src/HazelcastClient.ts | 94 +++++++----- src/proxy/ProxyManager.ts | 26 +++- src/proxy/topic/ReliableTopicProxy.ts | 17 ++- test/ClientProxyTest.js | 10 +- test/ClientReconnectTest.js | 38 ++--- test/HazelcastClientTest.js | 11 +- test/ListenerServiceTest.js | 15 +- test/ListenersOnReconnectTest.js | 8 +- test/atomiclong/AtomicLongTest.js | 4 +- .../flakeid/FlakeIdGeneratorOutOfRangeTest.js | 8 +- test/flakeid/FlakeIdGeneratorProxyTest.js | 118 ++++++++------- test/list/ListProxyTest.js | 4 +- test/lock/LockProxyTest.js | 10 +- test/map/MapAggregatorsDoubleTest.js | 4 +- test/map/MapAggregatorsIntTest.js | 4 +- test/map/MapAggregatorsLongTest.js | 4 +- test/map/MapEntryProcessorTest.js | 7 +- test/map/MapPartitionAwareTest.js | 4 +- test/map/MapPredicateTest.js | 25 ++- test/map/MapProxyTest.js | 44 ++++-- test/map/MapStoreTest.js | 7 +- test/map/NearCachedMapStressTest.js | 65 ++++---- test/map/NearCachedMapTest.js | 10 +- test/multimap/MultiMapProxyListenersTest.js | 4 +- test/multimap/MultiMapProxyLockTest.js | 18 ++- test/multimap/MultiMapProxyTest.js | 4 +- .../InvalidationMetadataDistortionTest.js | 38 ++--- test/nearcache/LostInvalidationsTest.js | 34 +++-- test/nearcache/MigratedDataTest.js | 8 +- .../NearCacheSimpleInvalidationTest.js | 15 +- test/pncounter/PNCounterBasicTest.js | 4 +- test/pncounter/PNCounterConsistencyTest.js | 14 +- .../pncounter/PNCounterWithLiteMembersTest.js | 4 +- test/queue/QueueProxyTest.js | 6 +- test/replicatedmap/ReplicatedMapProxyTest.js | 4 +- test/ringbuffer/RingbufferTest.js | 23 ++- test/semaphore/SemaphoreProxyTest.js | 29 +++- .../DefaultSerializersLiveTest.js | 4 +- .../PortableSerializersLiveTest.js | 8 +- test/set/SetProxyTest.js | 4 +- .../{ClientSslTest.js => ClientSSLTest.js} | 7 +- test/statistics/StatisticsTest.js | 4 +- test/topic/TopicTest.js | 143 +++++++++++------- 44 files changed, 596 insertions(+), 343 deletions(-) rename test/ssl/{ClientSslTest.js => ClientSSLTest.js} (93%) diff --git a/code_samples/distributed_object_listener.js b/code_samples/distributed_object_listener.js index 8117a5cb6..0f630eda1 100644 --- a/code_samples/distributed_object_listener.js +++ b/code_samples/distributed_object_listener.js @@ -16,17 +16,24 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (client) { - client.addDistributedObjectListener(function (distributedObjectEvent) { - console.log('Distributed object event >>> ', - distributedObjectEvent.serviceName, - distributedObjectEvent.objectName, - distributedObjectEvent.eventType - ); + return client.addDistributedObjectListener(function (serviceName, name, event) { + console.log('Distributed object event >>> ' + JSON.stringify({ + serviceName: serviceName, + name: name, + event: event + })); }).then(function () { + var map; var mapname = 'test'; - //this causes a created event - client.getMap(mapname); - //this causes no event because map was already created - client.getMap(mapname); + + // this causes a created event + return client.getMap(mapname).then(function (mp) { + map = mp; + // this causes no event because map was already created + return client.getMap(mapname); + }).then(function () { + // this causes a destroyed event + return map.destroy(); + }); }); }); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 822e80418..8c57f221d 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -27,7 +27,7 @@ import {InvocationService} from './invocation/InvocationService'; import {LifecycleEvent, LifecycleService} from './LifecycleService'; import {ListenerService} from './ListenerService'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; -import {ILogger, LoggingService} from './logging/LoggingService'; +import {LoggingService} from './logging/LoggingService'; import {RepairingTask} from './nearcache/RepairingTask'; import {PartitionService} from './PartitionService'; import {ClientErrorFactory} from './protocol/ErrorFactory'; @@ -156,7 +156,7 @@ export default class HazelcastClient { return this.invocationService.invokeOnRandomTarget(clientMessage).then(function (resp): any { const response = ClientGetDistributedObjectsCodec.decodeResponse(resp, toObjectFunc).response; return response.map((objectInfo: { [key: string]: any }) => { - return proxyManager.getOrCreateProxy(objectInfo.value, objectInfo.key, false); + return proxyManager.getOrCreateProxy(objectInfo.value, objectInfo.key, false).value(); }); }); } @@ -164,98 +164,118 @@ export default class HazelcastClient { /** * Returns the distributed map instance with given name. * @param name - * @returns {IMap} + * @returns {Promise>} */ - getMap(name: string): IMap { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.MAP_SERVICE) as IMap; + getMap(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.MAP_SERVICE) as Promise>; } /** * Returns the distributed set instance with given name. * @param name - * @returns {ISet} + * @returns {Promise>} */ - getSet(name: string): ISet { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.SET_SERVICE) as ISet; + getSet(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.SET_SERVICE) as Promise>; } /** * Returns the distributed lock instance with given name. * @param name - * @returns {ILock} + * @returns {Promise} */ - getLock(name: string): ILock { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.LOCK_SERVICE) as ILock; + getLock(name: string): Promise { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.LOCK_SERVICE) as Promise; } /** * Returns the distributed queue instance with given name. * @param name - * @returns {IQueue} + * @returns {Promise>} */ - getQueue(name: string): IQueue { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.QUEUE_SERVICE) as IQueue; + getQueue(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.QUEUE_SERVICE) as Promise>; } /** * Returns the distributed list instance with given name. * @param name - * @returns {IQueue} + * @returns {Promise>} */ - getList(name: string): IList { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.LIST_SERVICE) as IList; + getList(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.LIST_SERVICE) as Promise>; } /** * Returns the distributed multi-map instance with given name. * @param name - * @returns {MultiMap} + * @returns {Promise>} */ - getMultiMap(name: string): MultiMap { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.MULTIMAP_SERVICE) as MultiMap; + getMultiMap(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.MULTIMAP_SERVICE) as Promise>; } /** * Returns a distributed ringbuffer instance with the given name. * @param name - * @returns {IRingbuffer} + * @returns {Promise>} */ - getRingbuffer(name: string): IRingbuffer { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE) as IRingbuffer; + getRingbuffer(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE) as Promise>; } /** * Returns a distributed reliable topic instance with the given name. * @param name - * @returns {ITopic} + * @returns {Promise>} */ - getReliableTopic(name: string): ITopic { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.RELIABLETOPIC_SERVICE) as ITopic; + getReliableTopic(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.RELIABLETOPIC_SERVICE) as Promise>; } - getReplicatedMap(name: string): IReplicatedMap { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE) as IReplicatedMap; + /** + * Returns the distributed replicated-map instance with given name. + * @param name + * @returns {Promise>} + */ + getReplicatedMap(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE) as Promise>; } - getAtomicLong(name: string): IAtomicLong { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.ATOMICLONG_SERVICE) as IAtomicLong; + /** + * Returns the distributed atomic long instance with given name. + * @param name + * @returns {Promise} + */ + getAtomicLong(name: string): Promise { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.ATOMICLONG_SERVICE) as Promise; } - getFlakeIdGenerator(name: string): FlakeIdGenerator { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.FLAKEID_SERVICE) as FlakeIdGenerator; + /** + * Returns the distributed flake ID generator instance with given name. + * @param name + * @returns {Promise} + */ + getFlakeIdGenerator(name: string): Promise { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.FLAKEID_SERVICE) as Promise; } - getPNCounter(name: string): PNCounter { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE) as PNCounter; + /** + * Returns the distributed PN Counter instance with given name. + * @param name + * @returns {Promise} + */ + getPNCounter(name: string): Promise { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE) as Promise; } /** * Returns the distributed semaphore instance with given name. * @param name - * @returns {ISemaphore} + * @returns {Promise} */ - getSemaphore(name: string): ISemaphore { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.SEMAPHORE_SERVICE) as ISemaphore; + getSemaphore(name: string): Promise { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.SEMAPHORE_SERVICE) as Promise; } /** diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 1efc159c7..f8b261538 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -60,7 +60,7 @@ export class ProxyManager { public static readonly RELIABLETOPIC_SERVICE: string = 'hz:impl:reliableTopicService'; public readonly service: { [serviceName: string]: any } = {}; - private readonly proxies: { [proxyName: string]: DistributedObject; } = {}; + private readonly proxies: { [namespace: string]: DistributedObject; } = {}; private readonly client: HazelcastClient; private readonly logger = LoggingService.getLoggingService(); private readonly invocationTimeoutMillis: number; @@ -88,21 +88,37 @@ export class ProxyManager { this.service[ProxyManager.RELIABLETOPIC_SERVICE] = ReliableTopicProxy; } - public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): DistributedObject { + public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): Promise { if (this.proxies[serviceName + name]) { - return this.proxies[serviceName + name]; + return Promise.resolve(this.proxies[serviceName + name]); } else { + const deferred = Promise.defer (); let newProxy: DistributedObject; if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().getNearCacheConfig(name)) { newProxy = new NearCachedMapProxy(this.client, serviceName, name); + } else if (serviceName === ProxyManager.RELIABLETOPIC_SERVICE) { + newProxy = new ReliableTopicProxy(this.client, serviceName, name); + if (createAtServer) { + (newProxy as ReliableTopicProxy).setRingbuffer().then(() => { + return this.createProxy(newProxy); + }).then(function (): void { + deferred.resolve(newProxy); + }); + } + this.proxies[serviceName + name] = newProxy; + return deferred.promise; } else { newProxy = new this.service[serviceName](this.client, serviceName, name); } if (createAtServer) { - this.createProxy(newProxy); + this.createProxy(newProxy).then(function (): void { + deferred.resolve(newProxy); + }); } + this.proxies[serviceName + name] = newProxy; - return newProxy; + return deferred.promise; + } } diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 7e6e5149d..b69dfff31 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -36,15 +36,14 @@ export const TOPIC_MAX_BACKOFF = 2000; export class ReliableTopicProxy extends BaseProxy implements ITopic { private ringbuffer: IRingbuffer; - private localAddress: Address; - private batchSize: number; - private runners: { [key: string]: ReliableTopicListenerRunner } = {}; - private serializationService: SerializationService; - private overloadPolicy: TopicOverloadPolicy; + private readonly localAddress: Address; + private readonly batchSize: number; + private readonly runners: { [key: string]: ReliableTopicListenerRunner } = {}; + private readonly serializationService: SerializationService; + private readonly overloadPolicy: TopicOverloadPolicy; constructor(client: HazelcastClient, serviceName: string, name: string) { super(client, serviceName, name); - this.ringbuffer = client.getRingbuffer(RINGBUFFER_PREFIX + name); this.localAddress = client.getClusterService().getClientInfo().localAddress; const config = client.getConfig().getReliableTopicConfig(name); this.batchSize = config.readBatchSize; @@ -53,6 +52,12 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { this.name = name; } + setRingbuffer(): Promise { + return this.client.getRingbuffer(RINGBUFFER_PREFIX + this.name).then((buffer) => { + this.ringbuffer = buffer; + }); + } + addMessageListener(listener: TopicMessageListener): string { const listenerId = UuidUtil.generate().toString(); diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index 1f4da0d93..c7fedb8d9 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -74,9 +74,13 @@ describe('Generic proxy test', function () { return HazelcastClient.newHazelcastClient(); }).then(function (res) { client = res; - map = client.getMap('Furkan'); - list = client.getList('Furkan'); - expect(list.getServiceName()).to.be.equal('hz:impl:listService'); + return client.getMap('Furkan').then(function (m) { + map = m; + return client.getList('Furkan'); + }).then(function (l) { + list = l; + expect(list.getServiceName()).to.be.equal('hz:impl:listService'); + }); }); }); }) diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index 0457f90d5..0463d4146 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -45,8 +45,9 @@ describe('Client reconnect', function () { return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { client = cl; - map = client.getMap('test'); - }).then(function () { + return client.getMap('test'); + }).then(function (mp) { + map = mp; return Controller.terminateMember(cluster.id, member.uuid); }).then(function () { return Controller.startMember(cluster.id); @@ -75,8 +76,9 @@ describe('Client reconnect', function () { return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { client = cl; - map = client.getMap('test'); - }).then(function () { + return client.getMap('test'); + }).then(function (mp) { + map = mp; return Controller.terminateMember(cluster.id, member.uuid); }).then(function () { map.put('testkey', 'testvalue').then(function () { @@ -94,11 +96,11 @@ describe('Client reconnect', function () { }); }); - it('create proxy while member is down, member comes back', function () { - this.timeout(5000); + it('create proxy while member is down, member comes back', function (done) { + this.timeout(10000); var member; var map; - return Controller.createCluster(null, null).then(function (cl) { + Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function (m) { @@ -111,15 +113,17 @@ describe('Client reconnect', function () { client = cl; return Controller.terminateMember(cluster.id, member.uuid); }).then(function () { - map = client.getMap('test'); - }).then(function () { - return Controller.startMember(cluster.id); - }).then(function () { - return map.put('testkey', 'testvalue'); - }).then(function () { - return map.get('testkey'); - }).then(function (val) { - return expect(val).to.equal('testvalue'); - }); + client.getMap('test').then(function (mp) { + map = mp; + }).then(function () { + return map.put('testkey', 'testvalue'); + }).then(function () { + return map.get('testkey'); + }).then(function (val) { + expect(val).to.equal('testvalue'); + done(); + }); + Controller.startMember(cluster.id); + }) }); }); diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 65eeb9b5e..82cc57c4a 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -36,9 +36,10 @@ function ManagedObjects() { } ManagedObjects.prototype.getObject = function (func, name) { - var obj = func(name); - this.managedObjects.push(obj); - return obj; + return func(name).then((obj) => { + this.managedObjects.push(obj); + return obj; + }); }; ManagedObjects.prototype.destroyAll = function () { @@ -62,7 +63,6 @@ ManagedObjects.prototype.destroy = function (name) { return deferred.promise; }; - configParams.forEach(function (cfg) { describe('HazelcastClient', function () { this.timeout(4000); @@ -86,7 +86,7 @@ configParams.forEach(function (cfg) { }); afterEach(function () { - managed.destroyAll(); + return managed.destroyAll(); }); after(function () { @@ -151,5 +151,4 @@ configParams.forEach(function (cfg) { }, 300); }); }); - }); diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index 2034edb28..22ac41757 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -18,6 +18,7 @@ var RC = require('./RC'); var HazelcastClient = require('../.').Client; var Config = require('../.').Config; var expect = require('chai').expect; +var Util = require('./Util'); [true, false].forEach(function (isSmartService) { @@ -56,8 +57,10 @@ var expect = require('chai').expect; done(); }).then(function (id) { listenerId = id; - map = client.getMap('mapToListen'); - map.destroy(); + client.getMap('mapToListen').then(function (mp) { + map = mp; + map.destroy(); + }); }); }); @@ -72,11 +75,15 @@ var expect = require('chai').expect; client.removeDistributedObjectListener(listenerId); done(); } else if (distributedObjectEvent.eventType === 'created' && distributedObjectEvent.objectName === 'mapToRemove') { - map.destroy(); + Util.promiseWaitMilliseconds(1000).then(function () { + map.destroy(); + }); } }).then(function (id) { listenerId = id; - map = client.getMap('mapToRemove'); + client.getMap('mapToRemove').then(function (mp) { + map = mp; + }); }); }); diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 9cdae83f1..a6f39a107 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -58,7 +58,9 @@ describe('Listeners on reconnect', function () { return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { client = cl; - map = client.getMap('testmap'); + return client.getMap('testmap'); + }).then(function (mp) { + map = mp; var listenerObject = { added: function (entryEvent) { try { @@ -130,7 +132,9 @@ describe('Listeners on reconnect', function () { return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { client = cl; - map = client.getMap('testmap'); + return client.getMap('testmap'); + }).then(function (mp) { + map = mp; var listenerObject = { added: function (entryEvent) { try { diff --git a/test/atomiclong/AtomicLongTest.js b/test/atomiclong/AtomicLongTest.js index 6c2a09d2f..3ffc8c96e 100644 --- a/test/atomiclong/AtomicLongTest.js +++ b/test/atomiclong/AtomicLongTest.js @@ -43,7 +43,9 @@ describe("AtomicLong Proxy", function () { }); beforeEach(function () { - l = client.getAtomicLong('along'); + return client.getAtomicLong('along').then(function (al) { + l = al; + }); }); afterEach(function () { diff --git a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js index cc80b3be3..8970b4f4c 100644 --- a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js +++ b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js @@ -67,7 +67,9 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { return HazelcastClient.newHazelcastClient(cfg); }).then(function (value) { client = value; - flakeIdGenerator = client.getFlakeIdGenerator('test'); + return client.getFlakeIdGenerator('test'); + }).then(function (idGenerator) { + flakeIdGenerator = idGenerator; var promise = Promise.resolve(); for (var i = 0; i < 100; i++) { promise = promise.then(function () { @@ -94,7 +96,9 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { return HazelcastClient.newHazelcastClient(); }).then(function (cl) { client = cl; - flakeIdGenerator = client.getFlakeIdGenerator('test'); + return client.getFlakeIdGenerator('test'); + }).then(function (idGenerator) { + flakeIdGenerator = idGenerator; return expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(Err.HazelcastError); }); }); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index 2d356f4cf..a26433a68 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -70,72 +70,88 @@ describe("FlakeIdGeneratorProxyTest", function () { } it('newId succeeds', function () { - flakeIdGenerator = client.getFlakeIdGenerator('test'); - return flakeIdGenerator.newId(); + return client.getFlakeIdGenerator('test').then(function (idGenerator) { + flakeIdGenerator = idGenerator; + return flakeIdGenerator.newId(); + }); }); it('newId returns a unique long', function () { - flakeIdGenerator = client.getFlakeIdGenerator('test'); - var promise = Promise.resolve(); - var idList = []; - for (var i = 0; i < 10; i++) { - promise = promise.then(function () { - return Promise.all([ - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)), - flakeIdGenerator.newId().then(addToListFunction(idList)) - ]); - }); - } - return promise.then(function () { - expect(idList.length).to.be.equal(50); - idList.sort(function (a, b) { - return (a.greaterThan(b) ? 1 : (a.lessThan(b) ? -1 : 0)); - }); - for (var i = 1; i < idList.length; i++) { - expect(idList[i]).to.be.instanceOf(Long); - expect(idList[i - 1].equals(idList[i]), 'Expected ' + idList[i - 1] + ' ' + idList[i] + 'to be different.').to.be.false; + return client.getFlakeIdGenerator('test').then(function (idGenerator) { + flakeIdGenerator = idGenerator; + var promise = Promise.resolve(); + var idList = []; + for (var i = 0; i < 10; i++) { + promise = promise.then(function () { + return Promise.all([ + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)), + flakeIdGenerator.newId().then(addToListFunction(idList)) + ]); + }); } + return promise.then(function () { + expect(idList.length).to.be.equal(50); + idList.sort(function (a, b) { + return (a.greaterThan(b) ? 1 : (a.lessThan(b) ? -1 : 0)); + }); + for (var i = 1; i < idList.length; i++) { + expect(idList[i]).to.be.instanceOf(Long); + expect(idList[i - 1].equals(idList[i]), 'Expected ' + idList[i - 1] + ' ' + idList[i] + 'to be different.').to.be.false; + } + }); }); }); it('subsequent ids are from the same batch', function () { - flakeIdGenerator = client.getFlakeIdGenerator('test'); - return flakeIdGenerator.newId().then(function (firstId) { - return flakeIdGenerator.newId().then(function (secondId) { - return expect(secondId.equals(firstId.add(FLAKE_ID_STEP))).to.be.true; - }); + var firstId; + return client.getFlakeIdGenerator('test').then(function (idGenerator) { + flakeIdGenerator = idGenerator; + return flakeIdGenerator.newId() + }).then(function (id) { + firstId=id; + return flakeIdGenerator.newId(); + }).then(function (secondId) { + return expect(secondId.equals(firstId.add(FLAKE_ID_STEP))).to.be.true; }); }); it('ids are from new batch after validity period', function () { - flakeIdGenerator = client.getFlakeIdGenerator('shortterm'); - return flakeIdGenerator.newId().then(function (firstId) { - return Util.promiseWaitMilliseconds(SHORT_TERM_VALIDITY_MILLIS + 1000).then(function () { - return flakeIdGenerator.newId(); - }).then(function (secondId) { - var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); - expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; - }); + var firstId; + return client.getFlakeIdGenerator('shortterm').then(function (idGenerator) { + flakeIdGenerator = idGenerator; + return flakeIdGenerator.newId() + }).then(function (id) { + firstId=id; + return Util.promiseWaitMilliseconds(SHORT_TERM_VALIDITY_MILLIS + 1000); + }).then(function () { + return flakeIdGenerator.newId(); + }).then(function (secondId) { + var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); + return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; }); }); it('ids are from new batch after prefetched ones are exhausted', function () { - flakeIdGenerator = client.getFlakeIdGenerator('shortterm'); - return flakeIdGenerator.newId().then(function (firstId) { - return flakeIdGenerator.newId().then(function () { - //after this we exhausted the batch at hand - return flakeIdGenerator.newId(); - }).then(function () { - return Util.promiseWaitMilliseconds(100); - }).then(function () { - return flakeIdGenerator.newId(); - }).then(function (secondId) { - var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); - return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; - }); - }); + var firstId; + return client.getFlakeIdGenerator('shortterm').then(function (idGenerator) { + flakeIdGenerator = idGenerator; + return flakeIdGenerator.newId() + }).then(function (id) { + firstId=id; + return flakeIdGenerator.newId(); + }).then(function () { + //after this we exhausted the batch at hand + return flakeIdGenerator.newId(); + }).then(function () { + return Util.promiseWaitMilliseconds(100); + }).then(function () { + return flakeIdGenerator.newId(); + }).then(function (secondId) { + var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); + return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; + });; }); }); diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index bb0e9b6d2..e8a82f8ee 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -38,7 +38,9 @@ describe("List Proxy", function () { }); beforeEach(function () { - listInstance = client.getList('test') + return client.getList('test').then(function (list) { + listInstance = list; + }) }); afterEach(function () { diff --git a/test/lock/LockProxyTest.js b/test/lock/LockProxyTest.js index bd65c9c23..3731020bb 100644 --- a/test/lock/LockProxyTest.js +++ b/test/lock/LockProxyTest.js @@ -47,8 +47,12 @@ describe("Lock Proxy", function () { }); beforeEach(function () { - lockOne = clientOne.getLock('test'); - lockTwo = clientTwo.getLock('test'); + return clientOne.getLock('test').then(function (lock) { + lockOne = lock; + return clientTwo.getLock('test'); + }).then(function (lock) { + lockTwo = lock; + }); }); afterEach(function () { @@ -103,7 +107,7 @@ describe("Lock Proxy", function () { }).then(function (acquired) { var elasped = Date.now() - startTime; expect(acquired).to.be.true; - expect(elasped).to.be.greaterThan(1000); + expect(elasped).to.be.greaterThan(995); }) }); diff --git a/test/map/MapAggregatorsDoubleTest.js b/test/map/MapAggregatorsDoubleTest.js index e1287c83b..fddea6990 100644 --- a/test/map/MapAggregatorsDoubleTest.js +++ b/test/map/MapAggregatorsDoubleTest.js @@ -35,7 +35,9 @@ describe('MapAggregatorsDoubleTest', function () { return Client.newHazelcastClient(); }).then(function (cl) { client = cl; - map = client.getMap('aggregatorsMap'); + return client.getMap('aggregatorsMap'); + }).then(function (mp) { + map = mp; }); }); diff --git a/test/map/MapAggregatorsIntTest.js b/test/map/MapAggregatorsIntTest.js index f8f8c3fad..a160e779e 100644 --- a/test/map/MapAggregatorsIntTest.js +++ b/test/map/MapAggregatorsIntTest.js @@ -38,7 +38,9 @@ describe('MapAggregatorsIntTest', function () { return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; - map = client.getMap('aggregatorsMap'); + return client.getMap('aggregatorsMap'); + }).then(function (mp) { + map = mp; }); }); diff --git a/test/map/MapAggregatorsLongTest.js b/test/map/MapAggregatorsLongTest.js index 92c172855..f2cd6f256 100644 --- a/test/map/MapAggregatorsLongTest.js +++ b/test/map/MapAggregatorsLongTest.js @@ -39,7 +39,9 @@ describe('MapAggregatorsLongTest', function () { return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; - map = client.getMap('aggregatorsMap'); + return client.getMap('aggregatorsMap'); + }).then(function (mp) { + map = mp; }); }); diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index b57a48c0c..f0a2cc5af 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -55,8 +55,11 @@ describe('Entry Processor', function () { }); beforeEach(function () { - map = client.getMap('map-to-be-processed'); - return _fillMap(map, MAP_SIZE, '', ''); + return client.getMap('map-to-be-processed').then(function (mp) { + map = mp; + return _fillMap(map, MAP_SIZE, '', ''); + }); + }); afterEach(function () { diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index f7dfad57c..f42407fbf 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -78,7 +78,9 @@ describe('Map Partition Aware', function () { }); beforeEach(function () { - map = client.getMap(mapName); + return client.getMap(mapName).then(function (mp) { + map = mp; + }); }); afterEach(function () { diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index b3604c935..77ffb749e 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -56,8 +56,10 @@ describe("Predicates", function () { }); beforeEach(function () { - map = client.getMap('test'); - return _fillMap(); + return client.getMap('test').then(function (mp) { + map = mp; + return _fillMap(); + }); }); afterEach(function () { @@ -115,8 +117,10 @@ describe("Predicates", function () { }); it('Like', function () { - var localMap = client.getMap('likePredMap'); - return localMap.put('temp', 'tempval').then(function () { + return client.getMap('likePredMap').then(function (mp) { + localMap = mp; + return localMap.put('temp', 'tempval'); + }).then(function () { return localMap.valuesWithPredicate(Predicates.like('this', 'tempv%')); }).then(function (values) { return expect(values.toArray()).to.have.members(['tempval']); @@ -126,8 +130,11 @@ describe("Predicates", function () { }); it('ILike', function () { - var localMap = client.getMap('likePredMap'); - return localMap.putAll([['temp', 'tempval'], ['TEMP', 'TEMPVAL']]).then(function () { + var localMap; + return client.getMap('likePredMap').then(function (mp) { + localMap = mp; + return localMap.putAll([['temp', 'tempval'], ['TEMP', 'TEMPVAL']]); + }).then(function () { return localMap.valuesWithPredicate(Predicates.ilike('this', 'tempv%')); }).then(function (values) { return expect(values.toArray()).to.have.members(['tempval', 'TEMPVAL']); @@ -167,8 +174,10 @@ describe("Predicates", function () { }); it('Regex', function () { - var localMap = client.getMap('regexMap'); - return localMap.putAll([['06', 'ankara'], ['07', 'antalya']]).then(function () { + return client.getMap('regexMap').then(function (mp) { + localMap = mp; + return localMap.putAll([['06', 'ankara'], ['07', 'antalya']]) + }).then(function () { return localMap.valuesWithPredicate(Predicates.regex('this', '^.*ya$')); }).then(function (values) { return expect(values.toArray()).to.have.members(['antalya']); diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index 33227fa10..870c39c6f 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -68,8 +68,10 @@ describe('MapProxy', function () { }); beforeEach(function () { - map = client.getMap('test'); - return _fillMap(map); + return client.getMap('test').then(function (mp) { + map = mp; + return _fillMap(map); + }); }); afterEach(function () { @@ -259,17 +261,22 @@ describe('MapProxy', function () { }); it('entrySet_notNull', function () { - var entryMap = client.getMap('entry-map'); + var entryMap; + var samples = [ ['k1', 'v1'], ['k2', 'v2'], ['k3', 'v3'] ]; - return Promise.all([ - entryMap.put(samples[0][0], samples[0][1]), - entryMap.put(samples[1][0], samples[1][1]), - entryMap.put(samples[2][0], samples[2][1]) - ]).then(function () { + + return client.getMap('entry-map').then(function (mp) { + entryMap = mp; + return Promise.all([ + entryMap.put(samples[0][0], samples[0][1]), + entryMap.put(samples[1][0], samples[1][1]), + entryMap.put(samples[2][0], samples[2][1]) + ]); + }).then(function () { return entryMap.entrySet(); }).then(function (entrySet) { return expect(entrySet).to.deep.have.members(samples); @@ -277,8 +284,11 @@ describe('MapProxy', function () { }); it('entrySet_null', function () { - var entryMap = client.getMap('null-entry-map'); - return entryMap.entrySet().then(function (entrySet) { + var entryMap; + return client.getMap('null-entry-map').then(function (mp) { + entryMap = mp; + return entryMap.entrySet(); + }).then(function (entrySet) { return expect(entrySet).to.be.empty; }); }); @@ -835,15 +845,21 @@ describe('MapProxy', function () { }); it('destroy', function () { - var dmap = client.getMap('map-to-be-destroyed'); - return dmap.put('key', 'val').then(function () { + var dmap; + var newMap; + return client.getMap('map-to-be-destroyed').then(function (mp) { + dmap = mp; + return dmap.put('key', 'val'); + }).then(function () { return dmap.destroy(); }).then(function () { - var newMap = client.getMap('map-to-be-destroyed'); + return client.getMap('map-to-be-destroyed'); + }).then(function (mp) { + newMap = mp; return newMap.size(); }).then(function (s) { expect(s).to.equal(0); - }) + }); }); }); }); diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index fbfb47017..adcded9da 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -38,8 +38,11 @@ describe('MapStore', function () { }); beforeEach(function () { - map = client.getMap('mapstore-test'); - return _fillMap(map); + return client.getMap('mapstore-test').then(function (mp) { + map = mp; + return _fillMap(map); + }); + }); afterEach(function () { diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index fe3d53802..3384b1c15 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -74,27 +74,31 @@ describe('NearCachedMapStress', function () { it('stress test with put, get and remove', function (done) { this.timeout(120000); - var map = client1.getMap(mapName); - (function innerOperation() { - if (completedOperations >= totalNumOperations) { - return; - } - if (runningOperations >= concurrencyLevel) { - setTimeout(innerOperation, 1); - } else { - runningOperations++; - var op = getRandomInt(0, 100); - if (op < putPercent) { - map.put(getRandomInt(0, numberOfEntries), getRandomInt(0, 10000)).then(completeOperation); - } else if (op < putPercent + removePercent) { - map.remove(getRandomInt(0, numberOfEntries)).then(completeOperation); + var map; + client1.getMap(mapName).then(function (mp) { + map = mp; + (function innerOperation() { + if (completedOperations >= totalNumOperations) { + return; + } + if (runningOperations >= concurrencyLevel) { + setTimeout(innerOperation, 1); } else { - totalGetOperations++; - map.get(getRandomInt(0, numberOfEntries)).then(completeOperation); + runningOperations++; + var op = getRandomInt(0, 100); + if (op < putPercent) { + map.put(getRandomInt(0, numberOfEntries), getRandomInt(0, 10000)).then(completeOperation); + } else if (op < putPercent + removePercent) { + map.remove(getRandomInt(0, numberOfEntries)).then(completeOperation); + } else { + totalGetOperations++; + map.get(getRandomInt(0, numberOfEntries)).then(completeOperation); + } + process.nextTick(innerOperation); } - process.nextTick(innerOperation); - } - })(); + })(); + }); + completedDeferred.promise.then(function () { var p = []; @@ -102,8 +106,12 @@ describe('NearCachedMapStress', function () { for (var i = 0; i < numberOfEntries; i++) { (function () { var key = i; - var promise = validatingClient.getMap(mapName).get(key).then(function (expected) { - return client1.getMap(mapName).get(key).then(function (actual) { + var promise = validatingClient.getMap(mapName).then(function (mp) { + return mp.get(key); + }).then(function (expected) { + return client1.getMap(mapName).then(function (mp) { + return mp.get(key); + }).then(function (actual) { return expect(actual).to.be.equal(expected); }) }); @@ -112,12 +120,15 @@ describe('NearCachedMapStress', function () { } //Near cache usage check Promise.all(p).then(function () { - var stats = client1.getMap(mapName).nearCache.getStatistics(); - expect(stats.hitCount + stats.missCount).to.equal(totalGetOperations + numberOfEntries); - expect(stats.entryCount).to.be.greaterThan(numberOfEntries / 100 * getPercent); - expect(stats.missCount).to.be.greaterThan(100); - expect(stats.hitCount).to.be.greaterThan(100); - done(); + var stats; + client1.getMap(mapName).then(function (mp) { + stats = mp.nearCache.getStatistics(); + expect(stats.hitCount + stats.missCount).to.equal(totalGetOperations + numberOfEntries); + expect(stats.entryCount).to.be.greaterThan(numberOfEntries / 100 * getPercent); + expect(stats.missCount).to.be.greaterThan(100); + expect(stats.hitCount).to.be.greaterThan(100); + done(); + }); }).catch(function (e) { done(e); }); diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index ec83f0826..89e66546d 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -55,9 +55,13 @@ describe("NearCachedMap", function () { beforeEach(function () { this.timeout(10000); - map1 = client1.getMap('ncc-map'); - map2 = client2.getMap('ncc-map'); - return _fillMap(map1); + return client1.getMap('ncc-map').then(function (mp) { + map1 = mp + return client2.getMap('ncc-map'); + }).then(function (mp) { + map2 = mp; + return _fillMap(map1); + }); }); afterEach(function () { diff --git a/test/multimap/MultiMapProxyListenersTest.js b/test/multimap/MultiMapProxyListenersTest.js index 3ead99d1f..3ae45875e 100644 --- a/test/multimap/MultiMapProxyListenersTest.js +++ b/test/multimap/MultiMapProxyListenersTest.js @@ -41,7 +41,9 @@ describe("MultiMap Proxy Listener", function () { }); beforeEach(function () { - map = client.getMultiMap('test'); + return client.getMultiMap('test').then(function (mp) { + map = mp; + }); }); afterEach(function () { diff --git a/test/multimap/MultiMapProxyLockTest.js b/test/multimap/MultiMapProxyLockTest.js index adc18ce2e..f237a3693 100644 --- a/test/multimap/MultiMapProxyLockTest.js +++ b/test/multimap/MultiMapProxyLockTest.js @@ -47,8 +47,12 @@ describe("MultiMap Proxy Lock", function () { }); beforeEach(function () { - mapOne = clientOne.getMultiMap('test'); - mapTwo = clientTwo.getMultiMap('test'); + return clientOne.getMultiMap('test').then(function (mp) { + mapOne = mp; + return clientTwo.getMultiMap('test') + }).then(function (mp) { + mapTwo = mp; + }); }); afterEach(function () { @@ -74,7 +78,7 @@ describe("MultiMap Proxy Lock", function () { return mapTwo.lock(1) }).then(function () { var elapsed = Date.now() - startTime; - expect(elapsed).to.be.greaterThan(1000); + expect(elapsed).to.be.greaterThan(995); }); }); @@ -85,7 +89,7 @@ describe("MultiMap Proxy Lock", function () { return mapTwo.lock(1); }).then(function () { var elapsed = Date.now() - startTime; - expect(elapsed).to.be.greaterThan(1000); + expect(elapsed).to.be.greaterThan(995); }); }); @@ -106,7 +110,7 @@ describe("MultiMap Proxy Lock", function () { }).then(function (acquired) { var elapsed = Date.now() - startTime; expect(acquired).to.be.true; - expect(elapsed).to.be.greaterThan(1000); + expect(elapsed).to.be.greaterThan(995); }) }); @@ -117,11 +121,11 @@ describe("MultiMap Proxy Lock", function () { return mapTwo.tryLock(1, 2000, 1000); }).then(function () { var elapsed = Date.now() - startTime; - expect(elapsed).to.be.greaterThan(1000); + expect(elapsed).to.be.greaterThan(995); return mapOne.lock(1, 2000); }).then(function () { var elapsed = Date.now() - startTime; - expect(elapsed).to.be.greaterThan(1000); + expect(elapsed).to.be.greaterThan(995); }); }); diff --git a/test/multimap/MultiMapProxyTest.js b/test/multimap/MultiMapProxyTest.js index 0fdcdb4be..4e180c32b 100644 --- a/test/multimap/MultiMapProxyTest.js +++ b/test/multimap/MultiMapProxyTest.js @@ -40,7 +40,9 @@ describe("MultiMap Proxy", function () { }); beforeEach(function () { - map = client.getMultiMap('test'); + return client.getMultiMap('test').then(function (mp) { + map = mp; + }); }); afterEach(function () { diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index 92a5ed35b..8935b1125 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -78,19 +78,32 @@ describe('Invalidation metadata distortion', function () { this.timeout(13000); var stopTest = false; - - var map = client.getMap(mapName); + var map; + var populatePromises = []; var ignoredKey = mapSize; + client.getMap(mapName).then(function (mp) { + map = mp; + for (var i = 0; i < mapSize; i++) { + populatePromises.push(map.put(i, i)); + } + populatePromises.push(map.put(ignoredKey, ignoredKey)); + }).then(function () { + return Promise.all(populatePromises).then(function () { + map.executeOnKey(ignoredKey, new DistortInvalidationMetadataEntryProcessor(mapName, mapSize, 5)).then(function () { + stopTest = true; + }).catch(function (err) { + done(err); + }); + setTimeout(populateNearCacheAndCompare, 100); + }) + }); - var populatePromises = []; - for (var i = 0; i < mapSize; i++) { - populatePromises.push(map.put(i, i)); - } - populatePromises.push(map.put(ignoredKey, ignoredKey)); function compareActualAndExpected(actualMap, verificationMap, index) { return actualMap.get(index).then(function (actual) { - return verificationMap.get(index).then(function (expected) { + return verificationMap.then(function (mp) { + return mp.get(index); + }).then(function (expected) { return expect(actual).to.equal(expected); }); }); @@ -116,14 +129,5 @@ describe('Invalidation metadata distortion', function () { } } - Promise.all(populatePromises).then(function () { - map.executeOnKey(ignoredKey, new DistortInvalidationMetadataEntryProcessor(mapName, mapSize, 5)).then(function () { - stopTest = true; - }).catch(function (err) { - done(err); - }); - setTimeout(populateNearCacheAndCompare, 100); - }) - }); }); diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index c0e7bac4f..5b9214e7d 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -75,18 +75,24 @@ describe('LostInvalidation', function () { it('client eventually receives an update for which the invalidation event was dropped', function () { Util.markServerVersionAtLeast(this, client, '3.8'); - var map = client.getMap(mapName); var key = 'key'; var value = 'val'; var updatedval = 'updatedval'; var invalidationHandlerStub; - return Util.promiseWaitMilliseconds(100).then(function (resp) { + return client.getMap(mapName).then(function (mp) { + map = mp; + return Util.promiseWaitMilliseconds(100) + }).then(function (resp) { invalidationHandlerStub = blockInvalidationEvents(client, map, 1); - return modifyingClient.getMap(mapName).put(key, value); + return modifyingClient.getMap(mapName); + }).then(function (mp) { + return mp.put(key, value); }).then(function () { return map.get(key); }).then(function () { - return modifyingClient.getMap(mapName).put(key, updatedval); + return modifyingClient.getMap(mapName); + }).then(function (mp) { + return mp.put(key, updatedval); }).then(function () { return Util.promiseWaitMilliseconds(1000); }).then(function () { @@ -101,16 +107,20 @@ describe('LostInvalidation', function () { it('lost invalidation stress test', function () { Util.markServerVersionAtLeast(this, client, '3.8'); - - var map = client.getMap(mapName); var invalidationHandlerStub; - return Util.promiseWaitMilliseconds(100).then(function (resp) { + var map; + var entries = []; + return client.getMap(mapName).then(function (mp) { + map = mp; + return Util.promiseWaitMilliseconds(100); + }).then(function (resp) { invalidationHandlerStub = blockInvalidationEvents(client, map); - var entries = []; for (var i = 0; i < entryCount; i++) { entries.push([i, i]); } - return modifyingClient.getMap(mapName).putAll(entries); + return modifyingClient.getMap(mapName); + }).then(function (mp) { + return mp.putAll(entries); }).then(function () { var requestedKeys = []; for (var i = 0; i < entryCount; i++) { @@ -119,11 +129,13 @@ describe('LostInvalidation', function () { //populate near cache return map.getAll(requestedKeys); }).then(function () { - var entries = []; + entries = []; for (var i = 0; i < entryCount; i++) { entries.push([i, i + entryCount]); } - return modifyingClient.getMap(mapName).putAll(entries); + return modifyingClient.getMap(mapName); + }).then(function (mp) { + return mp.putAll(entries); }).then(function () { unblockInvalidationEvents(client, invalidationHandlerStub); return Util.promiseWaitMilliseconds(2000); diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index 07dab407b..63cb8871b 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -72,11 +72,13 @@ describe('MigratedData', function () { it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', function () { Util.markServerVersionAtLeast(this, client, '3.8'); - - var map = client.getMap(mapName); + var map; var survivingMember; var key = 1; - return map.put(key, 1).then(function () { + return client.getMap(mapName).then(function (mp) { + map = mp; + return map.put(key, 1); + }).then(function () { return map.get(key); }).then(function () { return map.get(key); diff --git a/test/nearcache/NearCacheSimpleInvalidationTest.js b/test/nearcache/NearCacheSimpleInvalidationTest.js index c9ac9b7a0..90634447d 100644 --- a/test/nearcache/NearCacheSimpleInvalidationTest.js +++ b/test/nearcache/NearCacheSimpleInvalidationTest.js @@ -67,12 +67,15 @@ describe('NearCacheSimpleInvalidation', function () { it('client observes outside invalidations', function () { this.timeout(4000); var entryCount = 1000; - var map = client.getMap(mapName); - var getPromise = Promise.resolve(); - for (var i = 0; i < entryCount; i++) { - getPromise = getPromise.then(map.get.bind(map, '' + i)); - } - return getPromise.then(function () { + var map; + return client.getMap(mapName).then(function (mp) { + map = mp; + var getPromise = Promise.resolve(); + for (var i = 0; i < entryCount; i++) { + getPromise = getPromise.then(map.get.bind(map, '' + i)); + } + return getPromise; + }).then(function () { var stats = map.nearCache.getStatistics(); expect(stats.missCount).to.equal(entryCount); expect(stats.entryCount).to.equal(entryCount); diff --git a/test/pncounter/PNCounterBasicTest.js b/test/pncounter/PNCounterBasicTest.js index e637764f4..e637cc82f 100644 --- a/test/pncounter/PNCounterBasicTest.js +++ b/test/pncounter/PNCounterBasicTest.js @@ -43,7 +43,9 @@ describe('PNCounterBasicTest', function () { beforeEach(function () { Util.markServerVersionAtLeast(this, client, '3.10'); - pncounter = client.getPNCounter('pncounter') + return client.getPNCounter('pncounter').then(function (counter) { + pncounter = counter; + }) }); afterEach(function () { diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index 0e2722765..f1de81ba6 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -57,8 +57,11 @@ describe('PNCounterConsistencyTest', function () { it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () { Util.markServerVersionAtLeast(this, client, '3.10'); - var pncounter = client.getPNCounter('pncounter'); - return pncounter.getAndAdd(3).then(function () { + var pncounter; + return client.getPNCounter('pncounter').then(function (counter) { + pncounter = counter; + return pncounter.getAndAdd(3) + }).then(function () { var currentReplicaAddress = pncounter.currentTargetReplicaAddress; var currentReplicaMember = Util.findMemberByAddress(client, currentReplicaAddress); return RC.terminateMember(cluster.id, currentReplicaMember.uuid); @@ -69,8 +72,11 @@ describe('PNCounterConsistencyTest', function () { it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () { Util.markServerVersionAtLeast(this, client, '3.10'); - var pncounter = client.getPNCounter('pncounter'); - return pncounter.getAndAdd(3).then(function () { + var pncounter; + return client.getPNCounter('pncounter').then(function (counter) { + pncounter = counter; + return pncounter.getAndAdd(3); + }).then(function () { var currentReplicaAddress = pncounter.currentTargetReplicaAddress; var currentReplicaMember = Util.findMemberByAddress(client, currentReplicaAddress); return RC.terminateMember(cluster.id, currentReplicaMember.uuid); diff --git a/test/pncounter/PNCounterWithLiteMembersTest.js b/test/pncounter/PNCounterWithLiteMembersTest.js index d0a6ac040..6d2b84e91 100644 --- a/test/pncounter/PNCounterWithLiteMembersTest.js +++ b/test/pncounter/PNCounterWithLiteMembersTest.js @@ -48,7 +48,9 @@ describe('PNCounterWithLiteMembersTest', function () { beforeEach(function () { Util.markServerVersionAtLeast(this, client, '3.10'); - pncounter = client.getPNCounter('pncounter'); + return client.getPNCounter('pncounter').then(function (counter) { + pncounter = counter; + }); }); afterEach(function () { diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index a464c7b85..75fbd7715 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -44,8 +44,10 @@ describe("Queue Proxy", function () { }); beforeEach(function () { - queue = client.getQueue('ClientQueueTest'); - return _offerToQueue(10); + return client.getQueue('ClientQueueTest').then(function (q) { + queue = q; + return _offerToQueue(10); + }); }); afterEach(function () { diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 7e43b9d89..3e6c2bd2d 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -46,7 +46,9 @@ describe('ReplicatedMap Proxy', function () { }); beforeEach(function () { - rm = client.getReplicatedMap('test'); + return client.getReplicatedMap('test').then(function (mp) { + rm = mp; + }); }); afterEach(function () { diff --git a/test/ringbuffer/RingbufferTest.js b/test/ringbuffer/RingbufferTest.js index 3343cd6e7..d96a12c7a 100644 --- a/test/ringbuffer/RingbufferTest.js +++ b/test/ringbuffer/RingbufferTest.js @@ -42,7 +42,9 @@ describe("Ringbuffer Proxy", function () { }); beforeEach(function () { - rb = client.getRingbuffer('test') + return client.getRingbuffer('test').then(function (buffer) { + rb = buffer; + }) }); afterEach(function () { @@ -101,8 +103,11 @@ describe("Ringbuffer Proxy", function () { }); it("correctly reports head sequence", function () { - var limitedCapacity = client.getRingbuffer("capacity"); - return limitedCapacity.addAll([1, 2, 3, 4, 5]).then(function () { + var limitedCapacity; + return client.getRingbuffer("capacity").then(function (buffer) { + limitedCapacity = buffer; + return limitedCapacity.addAll([1, 2, 3, 4, 5]); + }).then(function () { return limitedCapacity.headSequence().then(function (sequence) { expect(sequence.toNumber()).to.equal(2); }); @@ -110,8 +115,10 @@ describe("Ringbuffer Proxy", function () { }); it("correctly reports remaining capacity", function () { - var ttl = client.getRingbuffer("ttl-cap"); - return ttl.addAll([1, 2]).then(function () { + var ttl = client.getRingbuffer("ttl-cap").then(function (buffer) { + ttl = buffer; + return ttl.addAll([1, 2]); + }).then(function () { return ttl.remainingCapacity().then(function (rc) { expect(rc.toNumber()).to.equal(3); }); @@ -119,8 +126,10 @@ describe("Ringbuffer Proxy", function () { }); it("correctly reports total capacity", function () { - var ttl = client.getRingbuffer("ttl-cap"); - return ttl.capacity().then(function (capacity) { + return client.getRingbuffer("ttl-cap").then(function (buffer) { + ttl = buffer; + return ttl.capacity(); + }).then(function (capacity) { expect(capacity.toNumber()).to.equal(5); }); }); diff --git a/test/semaphore/SemaphoreProxyTest.js b/test/semaphore/SemaphoreProxyTest.js index d0d4beeaa..d0c029a11 100644 --- a/test/semaphore/SemaphoreProxyTest.js +++ b/test/semaphore/SemaphoreProxyTest.js @@ -42,7 +42,9 @@ describe("Semaphore Proxy", function () { }); beforeEach(function () { - semaphore = client1.getSemaphore('test'); + return client1.getSemaphore('test').then(function (s) { + semaphore = s; + }); }); afterEach(function () { @@ -145,10 +147,15 @@ describe("Semaphore Proxy", function () { }); it('only one client proceeds when two clients race for 1 permit', function (done) { - var sem1 = client1.getSemaphore("race"); - var sem2 = client2.getSemaphore("race"); - - sem1.init(1).then(function () { + var sem1; + var sem2; + client1.getSemaphore("race").then(function (s) { + sem1 = s; + return client2.getSemaphore("race"); + }).then(function (s) { + sem2 = s; + return sem1.init(1); + }).then(function () { return sem2.acquire(); }).then(function () { sem1.acquire().then(function () { @@ -159,9 +166,15 @@ describe("Semaphore Proxy", function () { }); it('client is able to proceed after sufficient number of permits is available', function (done) { - var sem1 = client1.getSemaphore("proceed"); - var sem2 = client2.getSemaphore("proceed"); - sem1.init(1).then(function () { + var sem1; + var sem2; + client1.getSemaphore("proceed").then(function (s) { + sem1 = s; + return client2.getSemaphore("proceed"); + }).then(function (s) { + sem2 = s; + return sem1.init(1); + }).then(function () { return sem1.acquire(); }).then(function () { sem2.acquire().then(done); diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index 8486bfc74..fe16aaa9d 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -33,7 +33,9 @@ describe('Default serializers with live instance', function () { return Client.newHazelcastClient(); }).then(function (cl) { client = cl; - map = client.getMap('test'); + return client.getMap('test').then(function (mp) { + map = mp; + }); }); }); diff --git a/test/serialization/PortableSerializersLiveTest.js b/test/serialization/PortableSerializersLiveTest.js index a3bca78fa..9ee1f6261 100644 --- a/test/serialization/PortableSerializersLiveTest.js +++ b/test/serialization/PortableSerializersLiveTest.js @@ -38,7 +38,9 @@ describe('Default serializers with live instance', function () { return Client.newHazelcastClient(getClientConfig()); }).then(function (cl) { client = cl; - map = client.getMap('test'); + return client.getMap('test'); + }).then(function (mp) { + map = mp; }); }); @@ -72,7 +74,9 @@ describe('Default serializers with live instance', function () { return Client.newHazelcastClient(getClientConfig()); }).then(function (cl) { client = cl; - map = client.getMap('test'); + return client.getMap('test'); + }).then(function (mp) { + map = mp; return map.get('simpleportable'); }).then(function (sp) { return map.get('innerportable').then(function (ip) { diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index ced261ccf..69dbde121 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -38,7 +38,9 @@ describe("Set Proxy", function () { }); beforeEach(function () { - setInstance = client.getSet('test') + return client.getSet('test').then(function (s) { + setInstance = s; + }) }); afterEach(function () { diff --git a/test/ssl/ClientSslTest.js b/test/ssl/ClientSSLTest.js similarity index 93% rename from test/ssl/ClientSslTest.js rename to test/ssl/ClientSSLTest.js index a0640e1ef..d7c87fc5a 100644 --- a/test/ssl/ClientSslTest.js +++ b/test/ssl/ClientSSLTest.js @@ -76,8 +76,11 @@ configParams.forEach(function (cfg) { }); it('basic map size', function () { - map = client.getMap('test'); - return _fillMap(map).then(function () { + var map; + return client.getMap('test').then(function (mp) { + map = mp; + return _fillMap(map); + }).then(function () { return map.size().then(function (size) { expect(size).to.equal(10); }); diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index 999e35954..51795f3c4 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -47,7 +47,9 @@ describe('Statistics with default period', function () { return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; - map = client.getMap('nearCachedMap1'); + return client.getMap('nearCachedMap1').then(function (mp) { + map = mp; + }); }); }); diff --git a/test/topic/TopicTest.js b/test/topic/TopicTest.js index ac8f9c2b5..d45345d59 100644 --- a/test/topic/TopicTest.js +++ b/test/topic/TopicTest.js @@ -89,51 +89,66 @@ describe("Reliable Topic Proxy", function () { it("writes and reads messages", function (done) { var topicName = 't' + Math.random(); - var topicOne = clientOne.getReliableTopic(topicName); - var topicTwo = clientTwo.getReliableTopic(topicName); - - topicTwo.addMessageListener(function (msg) { - if (msg.messageObject["value"] === "foo") { - done(); - } + var topicOne; + var topicTwo; + clientOne.getReliableTopic(topicName).then(function (t) { + topicOne = t; + return clientTwo.getReliableTopic(topicName); + }).then(function (t) { + topicTwo = t; + topicTwo.addMessageListener(function (msg) { + if (msg.messageObject["value"] === "foo") { + done(); + } + }); + setTimeout(function () { + topicOne.publish({"value": "foo"}); + }, 500); }); - - setTimeout(function () { - topicOne.publish({"value": "foo"}); - }, 500); }); it('removed message listener does not receive items after removal', function (done) { var topicName = 't' + Math.random(); - var topicOne = clientOne.getReliableTopic(topicName); - var topicTwo = clientTwo.getReliableTopic(topicName); - - var receivedMessages = 0; + var topicOne; + var topicTwo; + clientOne.getReliableTopic(topicName).then(function (topic) { + topicOne = topic; + return clientTwo.getReliableTopic(topicName); + }).then(function (topic) { + topicTwo = topic; + var receivedMessages = 0; + + var id = topicTwo.addMessageListener(function (msg) { + receivedMessages++; + if (receivedMessages > 2) { + done(new Error('Kept receiving messages after message listener is removed.')); + } + }); - var id = topicTwo.addMessageListener(function (msg) { - receivedMessages++; - if (receivedMessages > 2) { - done(new Error('Kept receiving messages after message listener is removed.')); - } + topicOne.publish({"value0": "foo0"}); + topicOne.publish({"value1": "foo1"}); + setTimeout(function () { + topicTwo.removeMessageListener(id); + topicOne.publish({"value2": "foo2"}); + topicOne.publish({"value3": "foo3"}); + topicOne.publish({"value4": "foo4"}); + topicOne.publish({"value5": "foo5"}); + setTimeout(done, 500); + }, 500); }); - topicOne.publish({"value0": "foo0"}); - topicOne.publish({"value1": "foo1"}); - setTimeout(function () { - topicTwo.removeMessageListener(id); - topicOne.publish({"value2": "foo2"}); - topicOne.publish({"value3": "foo3"}); - topicOne.publish({"value4": "foo4"}); - topicOne.publish({"value5": "foo5"}); - setTimeout(done, 500); - }, 500); }); it("blocks when there is no more space", function () { - var topic = clientOne.getReliableTopic("blocking"); - var ringbuffer = topic.getRingbuffer(); - - return ringbuffer.capacity().then(function (capacity) { + var topic; + var ringbuffer; + return clientOne.getReliableTopic("blocking").then(function (t) { + topic = t; + return topic.getRingbuffer(); + }).then(function (rb) { + ringbuffer = rb; + return ringbuffer.capacity(); + }).then(function (capacity) { var all = []; for (var i = 0; i < capacity.toNumber() + 1; i++) { @@ -162,29 +177,37 @@ describe("Reliable Topic Proxy", function () { }); it("continues operating when stale sequence is reached", function (done) { - var topic = clientOne.getReliableTopic("stale"); - var ringbuffer = topic.getRingbuffer(); + var topic; + var ringbuffer; + clientOne.getReliableTopic("stale").then(function (t) { + topic = t; + return topic.getRingbuffer(); + }).then(function (rb) { + ringbuffer = rb; + topic.addMessageListener(function (e) { + if (e.messageObject === 20) { + done(); + } + }); - topic.addMessageListener(function (e) { - if (e.messageObject === 20) { - done(); - } + var all = generateItems(clientOne, 20); + ringbuffer.addAll(all); }); - - var all = generateItems(clientOne, 20); - - ringbuffer.addAll(all); }); it("discards the item when there is no more space", function () { - var topic = clientOne.getReliableTopic("discard"); - var ringbuffer = topic.getRingbuffer(); - - var all = generateItems(clientOne, 10); + var topic; + return clientOne.getReliableTopic("discard").then(function (t) { + topic = t; + return topic.getRingbuffer(); + }).then(function (rb) { + ringbuffer = rb; + var all = generateItems(clientOne, 10); - ringbuffer.addAll(all); + ringbuffer.addAll(all); - return topic.publish(11).then(function () { + return topic.publish(11); + }).then(function () { return ringbuffer.tailSequence(); }).then(function (seq) { return ringbuffer.readOne(seq); @@ -195,14 +218,18 @@ describe("Reliable Topic Proxy", function () { }); it("overwrites the oldest item when there is no more space", function () { - var topic = clientOne.getReliableTopic("overwrite"); - var ringbuffer = topic.getRingbuffer(); - - var all = generateItems(clientOne, 10); - - ringbuffer.addAll(all); - - return topic.publish(11).then(function () { + var topic; + var ringbuffer; + return clientOne.getReliableTopic("overwrite").then(function (t) { + topic = t; + return topic.getRingbuffer(); + }).then(function (rb) { + ringbuffer = rb; + var all = generateItems(clientOne, 10); + + ringbuffer.addAll(all); + return topic.publish(11); + }).then(function () { return ringbuffer.tailSequence(); }).then(function (seq) { return ringbuffer.readOne(seq); From 202dc24b75fe092fbff73d53dcc79d5068c7c2ba Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Wed, 10 Oct 2018 16:56:19 +0300 Subject: [PATCH 146/685] fix code samples' get functions (#374) --- code_samples/aggregation.js | 18 ++++++++++-------- code_samples/custom_serializer.js | 7 +++++-- code_samples/flakeid_generator.js | 8 +++++--- code_samples/global_serializer.js | 7 +++++-- code_samples/hazelcast_cloud_discovery.js | 13 ++++++++----- code_samples/lifecycle_listener.js | 2 ++ code_samples/list.js | 8 +++++--- code_samples/map.js | 8 +++++--- code_samples/map_entry_listener.js | 7 +++++-- code_samples/near_cache.js | 18 ++++++++++++++---- code_samples/org-website/AtomicLongSample.js | 9 ++++++--- .../org-website/EntryProcessorSample.js | 9 ++++++--- code_samples/org-website/ListSample.js | 9 ++++++--- code_samples/org-website/LockSample.js | 11 +++++++---- code_samples/org-website/MapSample.js | 11 +++++++---- code_samples/org-website/MultiMapSample.js | 9 ++++++--- code_samples/org-website/QuerySample.js | 13 ++++++++----- code_samples/org-website/QueueSample.js | 13 ++++++++----- .../org-website/ReliableTopicSample.js | 17 +++++++++++------ .../org-website/ReplicatedMapSample.js | 13 ++++++++----- code_samples/org-website/RingBufferSample.js | 8 ++++++-- code_samples/org-website/SetSample.js | 9 ++++++--- code_samples/paging_predicate.js | 9 ++++++--- code_samples/pn_counter.js | 8 +++++--- code_samples/queue.js | 8 +++++--- code_samples/set.js | 8 +++++--- 26 files changed, 170 insertions(+), 90 deletions(-) diff --git a/code_samples/aggregation.js b/code_samples/aggregation.js index 36f328547..b10689272 100644 --- a/code_samples/aggregation.js +++ b/code_samples/aggregation.js @@ -20,14 +20,16 @@ var Predicates = require('hazelcast-client').Predicates; Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; - var map = hazelcastClient.getMap('person-age-map'); - - map.putAll([ - ['Philip', 46], - ['Elizabeth', 44], - ['Henry', 13], - ['Paige', 15] - ]).then(function () { + var map; + hazelcastClient.getMap('person-age-map').then(function (mp) { + map = mp; + return map.putAll([ + ['Philip', 46], + ['Elizabeth', 44], + ['Henry', 13], + ['Paige', 15] + ]) + }).then(function () { return map.aggregate(Aggregators.count()); }).then(function (count) { console.log('There are ' + count + ' people.'); diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index 5a6595250..e230475eb 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -60,10 +60,13 @@ var giveInformation = function (timeofday) { cfg.serializationConfig.customSerializers.push(CustomSerializer); Client.newHazelcastClient(cfg).then(function (client) { - var map = client.getMap('time'); + var map; var t = new TimeOfDay(5, 32, 59); giveInformation(t); - map.put(1, t).then(function () { + client.getMap('time').then(function (mp) { + map = mp; + return map.put(1, t) + }).then(function () { return map.get(1); }).then(function (deserialized) { giveInformation(deserialized); diff --git a/code_samples/flakeid_generator.js b/code_samples/flakeid_generator.js index bd8353c09..368082655 100644 --- a/code_samples/flakeid_generator.js +++ b/code_samples/flakeid_generator.js @@ -18,9 +18,11 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; - var flakeIdGenerator = hazelcastClient.getFlakeIdGenerator('generator'); - - return flakeIdGenerator.newId().then(function (value) { + var flakeIdGenerator; + hazelcastClient.getFlakeIdGenerator('generator').then(function (gen) { + flakeIdGenerator = gen; + return flakeIdGenerator.newId(); + }).then(function (value) { console.log('New id: ' + value.toString()); return client.shutdown(); }); diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index 312951f07..ec99b99fa 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -45,8 +45,11 @@ var selfReferringObject = { selfReferringObject.self = selfReferringObject; Client.newHazelcastClient(cfg).then(function (client) { - var map = client.getMap('objects'); - map.put(1, selfReferringObject).then(function () { + var map; + client.getMap('objects').then(function (mp) { + map = mp; + return map.put(1, selfReferringObject); + }).then(function () { return map.get(1); }).then(function (obj) { console.log(obj); diff --git a/code_samples/hazelcast_cloud_discovery.js b/code_samples/hazelcast_cloud_discovery.js index d61ddc21e..9b6e85288 100644 --- a/code_samples/hazelcast_cloud_discovery.js +++ b/code_samples/hazelcast_cloud_discovery.js @@ -43,13 +43,16 @@ function createClientConfigWithSSLOpts(key, cert, ca) { var cfg = createClientConfigWithSSLOpts('./key.pem', './cert.pem', './ca.pem'); -Client.newHazelcastClient(cfg).then(function (hazelcastClient) { - var mp = hazelcastClient.getMap("testMap"); - - mp.put('key', 'value').then(function () { - return mp.get('key'); +Client.newHazelcastClient(cfg).then(function (client) { + var map; + client.getMap("testMap").then(function (mp) { + map = mp; + return map.put('key', 'value'); + }).then(function () { + return map.get('key'); }).then((res) => { console.log(res); + client.shutdown(); }); }); diff --git a/code_samples/lifecycle_listener.js b/code_samples/lifecycle_listener.js index 61bc13bd4..5468f8345 100644 --- a/code_samples/lifecycle_listener.js +++ b/code_samples/lifecycle_listener.js @@ -17,9 +17,11 @@ var HazelcastClient = require('hazelcast-client').Client; var Config = require('hazelcast-client').Config; var cfg = new Config.ClientConfig(); + cfg.listeners.addLifecycleListener(function (state) { console.log('Lifecycle Event >>> ' + state); }); + HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { hazelcastClient.shutdown(); }); diff --git a/code_samples/list.js b/code_samples/list.js index ce2949bb7..17d6b362d 100644 --- a/code_samples/list.js +++ b/code_samples/list.js @@ -18,9 +18,11 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; - var list = hazelcastClient.getList('people'); - - list.add('John').then(function (value) { + var list; + hazelcastClient.getList('people').then(function (l) { + list = l; + return list.add('John'); + }).then(function (value) { console.log('Added John.'); return list.add('Jane', 1); }).then(function () { diff --git a/code_samples/map.js b/code_samples/map.js index 3f5b2a20d..e6e693a0c 100644 --- a/code_samples/map.js +++ b/code_samples/map.js @@ -18,9 +18,11 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; - var map = hazelcastClient.getMap('my-distributed-map'); - - map.put('key', 'value').then(function () { + var map; + hazelcastClient.getMap('my-distributed-map').then(function (mp) { + map = mp; + return map.put('key', 'value'); + }).then(function () { return map.get('key'); }).then(function (val) { console.log(val); diff --git a/code_samples/map_entry_listener.js b/code_samples/map_entry_listener.js index ff815709f..0133a1a8e 100644 --- a/code_samples/map_entry_listener.js +++ b/code_samples/map_entry_listener.js @@ -35,8 +35,11 @@ var removeNotification = function (map, key) { }; Client.newHazelcastClient().then(function (client) { - var map = client.getMap('notifications'); - map.addEntryListener(listener, undefined, true).then(function () { + var map; + client.getMap('notifications').then(function (mp) { + map = mp; + return map.addEntryListener(listener, undefined, true); + }).then(function () { return pushNotification(map, 1, 'new-value'); }).then(function () { return removeNotification(map, 1); diff --git a/code_samples/near_cache.js b/code_samples/near_cache.js index 1e365f341..0f30d50ff 100644 --- a/code_samples/near_cache.js +++ b/code_samples/near_cache.js @@ -14,15 +14,25 @@ cfg.nearCacheConfigs[nearCachedMapName] = nearCacheConfig; function do50000Gets(client, mapName) { var timerStart; var timerEnd; + var map; - return client.getMap(mapName).put('item', 'anItem').then(function () { - //warm up the cache - return client.getMap(mapName).get('item') + return client.getMap(mapName).then(function (mp) { + map = mp; + return map.put('item', 'anItem'); + }).then(function () { + // warm up the cache + return client.getMap(mapName); + }).then(function (mp) { + map = mp; + return map.get('item'); }).then(function () { timerStart = Date.now(); var requests = []; for (var i = 0; i < 50000; i++) { - requests.push(client.getMap(mapName).get('item')); + requests.push(client.getMap(mapName).then(function (mp) { + map = mp; + return map.get('item'); + })); } return Promise.all(requests); }).then(function () { diff --git a/code_samples/org-website/AtomicLongSample.js b/code_samples/org-website/AtomicLongSample.js index a2b1c1023..2bcd82b54 100644 --- a/code_samples/org-website/AtomicLongSample.js +++ b/code_samples/org-website/AtomicLongSample.js @@ -1,10 +1,13 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var counter; // Get an Atomic Counter, we'll call it "counter" - var counter = hz.getAtomicLong("counter"); - // Add and Get the "counter" - return counter.addAndGet(3).then(function (value) { + hz.getAtomicLong("counter").then(function (c) { + counter = c; + // Add and Get the "counter" + return counter.addAndGet(3); + }).then(function (value) { return counter.get(); }).then(function (value) { // Display the "counter" value diff --git a/code_samples/org-website/EntryProcessorSample.js b/code_samples/org-website/EntryProcessorSample.js index e6589a62c..e075c2320 100644 --- a/code_samples/org-website/EntryProcessorSample.js +++ b/code_samples/org-website/EntryProcessorSample.js @@ -34,10 +34,13 @@ var cfg = new Config.ClientConfig(); cfg.serializationConfig.dataSerializableFactories[1] = new EntryProcessorDataSerializableFactory(); // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient(cfg).then(function (hz) { + var map; // Get the Distributed Map from Cluster. - var map = hz.getMap('my-distributed-map'); - // Put the double value of 0 into the Distributed Map - return map.put('key', 0).then(function () { + hz.getMap('my-distributed-map').then(function (mp) { + map = mp; + // Put the double value of 0 into the Distributed Map + return map.put('key', 0); + }).then(function () { // Run the IdentifiedEntryProcessor class on the Hazelcast Cluster Member holding the key called "key" return map.executeOnKey('key', new IdentifiedEntryProcessor()); }).then(function () { diff --git a/code_samples/org-website/ListSample.js b/code_samples/org-website/ListSample.js index 1030846e5..2c3cfc6e4 100644 --- a/code_samples/org-website/ListSample.js +++ b/code_samples/org-website/ListSample.js @@ -1,10 +1,13 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var list; // Get the Distributed List from Cluster. - var list = hz.getList('my-distributed-list'); - // Add elements to the list - return list.add('item1').then(function () { + hz.getList('my-distributed-list').then(function (l) { + list = l; + // Add elements to the list + return list.add('item1'); + }).then(function () { return list.add('item2'); }).then(function () { //Remove the first element diff --git a/code_samples/org-website/LockSample.js b/code_samples/org-website/LockSample.js index 946dbd8ca..d0f9563a3 100644 --- a/code_samples/org-website/LockSample.js +++ b/code_samples/org-website/LockSample.js @@ -1,11 +1,14 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var lock; // Get a distributed lock called "my-distributed-lock" - var lock = hz.getLock("my-distributed-lock"); - // Now create a lock and execute some guarded code. - return lock.lock().then(function () { - //do something here + hz.getLock("my-distributed-lock").then(function (l) { + lock = l; + // Now create a lock and execute some guarded code. + return lock.lock(); + }).then(function () { + // do something here }).finally(function () { return lock.unlock(); }).then(function () { diff --git a/code_samples/org-website/MapSample.js b/code_samples/org-website/MapSample.js index 431f7f37a..965a50021 100644 --- a/code_samples/org-website/MapSample.js +++ b/code_samples/org-website/MapSample.js @@ -1,13 +1,16 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var map; // Get the Distributed Map from Cluster. - var map = hz.getMap('my-distributed-map'); - //Standard Put and Get. - return map.put('key', 'value').then(function () { + hz.getMap('my-distributed-map').then(function (mp) { + map = mp; + // Standard Put and Get. + return map.put('key', 'value'); + }).then(function () { return map.get('key'); }).then(function (val) { - //Concurrent Map methods, optimistic updating + // Concurrent Map methods, optimistic updating return map.putIfAbsent('somekey', 'somevalue'); }).then(function () { return map.replace('key', 'value', 'newvalue'); diff --git a/code_samples/org-website/MultiMapSample.js b/code_samples/org-website/MultiMapSample.js index 7bc670dbb..552c7ec2d 100644 --- a/code_samples/org-website/MultiMapSample.js +++ b/code_samples/org-website/MultiMapSample.js @@ -1,10 +1,13 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var multiMap; // Get the Distributed MultiMap from Cluster. - var multiMap = hz.getMultiMap('my-distributed-multimap'); - // Put values in the map against the same key - return multiMap.put('my-key', 'value1').then(function () { + hz.getMultiMap('my-distributed-multimap').then(function (mmp) { + multiMap = mmp; + // Put values in the map against the same key + return multiMap.put('my-key', 'value1'); + }).then(function () { return multiMap.put('my-key', 'value2'); }).then(function () { return multiMap.put('my-key', 'value3'); diff --git a/code_samples/org-website/QuerySample.js b/code_samples/org-website/QuerySample.js index ac7b1f6b9..8ce20a1ef 100644 --- a/code_samples/org-website/QuerySample.js +++ b/code_samples/org-website/QuerySample.js @@ -51,14 +51,17 @@ var cfg = new Config.ClientConfig(); cfg.serializationConfig.portableFactories[1] = new PortableFactory(); // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient(cfg).then(function (hz) { + var users; // Get a Distributed Map called "users" - var users = hz.getMap('users'); - // Add some users to the Distributed Map - return generateUsers(users).then(function () { + hz.getMap('users').then(function (mp) { + users = mp; + // Add some users to the Distributed Map + return generateUsers(users) + }).then(function () { // Create a Predicate var criteriaQuery = Predicates.and( - Predicates.truePredicate('active', true), - Predicates.isBetween('age', 18, 21) + Predicates.equal('active', true), + Predicates.between('age', 18, 21) ); // Get result collections using the the Predicate return users.valuesWithPredicate(criteriaQuery); diff --git a/code_samples/org-website/QueueSample.js b/code_samples/org-website/QueueSample.js index bba5984d7..0cafd5ef6 100644 --- a/code_samples/org-website/QueueSample.js +++ b/code_samples/org-website/QueueSample.js @@ -1,19 +1,22 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var queue; // Get a Blocking Queue called "my-distributed-queue" - var queue = hz.getQueue('my-distributed-queue'); - // Offer a String into the Distributed Queue - return queue.offer('item').then(function () { + hz.getQueue('my-distributed-queue').then(function (q) { + queue = q; + // Offer a String into the Distributed Queue + return queue.offer('item'); + }).then(function () { // Poll the Distributed Queue and return the String return queue.poll(); }).then(function () { - //Timed blocking Operations + // Timed blocking Operations return queue.offer('anotheritem', 500); }).then(function () { return queue.poll(5000); }).then(function () { - //Indefinitely blocking Operations + // Indefinitely blocking Operations return queue.put('yetanotheritem'); }).then(function () { return queue.take(); diff --git a/code_samples/org-website/ReliableTopicSample.js b/code_samples/org-website/ReliableTopicSample.js index ba5bcd11e..b1facb81e 100644 --- a/code_samples/org-website/ReliableTopicSample.js +++ b/code_samples/org-website/ReliableTopicSample.js @@ -1,14 +1,19 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var topic; // Get a Topic called "my-distributed-topic" - var topic = hz.getReliableTopic("my-distributed-topic"); - // Add a Listener to the Topic - topic.addMessageListener(function (message) { - console.log(message); + hz.getReliableTopic("my-distributed-topic").then(function (t) { + topic = t; + // Add a Listener to the Topic + topic.addMessageListener(function (message) { + console.log(message); + }); + // Publish a message to the Topic + return topic.publish('Hello to distributed world'); + }).then(function () { // Shutdown this Hazelcast Client hz.shutdown(); }); - // Publish a message to the Topic - topic.publish('Hello to distributed world'); + }); diff --git a/code_samples/org-website/ReplicatedMapSample.js b/code_samples/org-website/ReplicatedMapSample.js index 0f196f4b2..8954e80b3 100644 --- a/code_samples/org-website/ReplicatedMapSample.js +++ b/code_samples/org-website/ReplicatedMapSample.js @@ -1,15 +1,18 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var map; // Get a Replicated Map called "my-replicated-map" - var map = hz.getReplicatedMap('my-replicated-map'); - // Put and Get a value from the Replicated Map - // key/value replicated to all members - return map.put('key', 'value').then(function (replacedValue) { + hz.getReplicatedMap('my-replicated-map').then(function (rmp) { + map = rmp; + // Put and Get a value from the Replicated Map + // key/value replicated to all members + return map.put('key', 'value'); + }).then(function (replacedValue) { console.log('replaced value = ' + replacedValue); // Will be null as its first update return map.get('key'); }).then(function (value) { - // the value is retrieved from a random member in the cluster + // The value is retrieved from a random member in the cluster console.log('value for key = ' + value); // Shutdown this Hazelcast Client hz.shutdown(); diff --git a/code_samples/org-website/RingBufferSample.js b/code_samples/org-website/RingBufferSample.js index 7e0c15a5c..b837c15ad 100644 --- a/code_samples/org-website/RingBufferSample.js +++ b/code_samples/org-website/RingBufferSample.js @@ -1,8 +1,12 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { - var rb = hz.getRingbuffer('rb'); - return rb.add(100).then(function () { + var rb; + // Get a Ringbuffer called "rb" + hz.getRingbuffer('rb').then(function (buffer) { + rb = buffer; + return rb.add(100); + }).then(function () { return rb.add(200); }).then(function (value) { // we start from the oldest item. diff --git a/code_samples/org-website/SetSample.js b/code_samples/org-website/SetSample.js index 0c37df369..1754706a6 100644 --- a/code_samples/org-website/SetSample.js +++ b/code_samples/org-website/SetSample.js @@ -1,10 +1,13 @@ var Client = require('hazelcast-client').Client; // Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 Client.newHazelcastClient().then(function (hz) { + var set; // Get the Distributed Set from Cluster. - var set = hz.getSet('my-distributed-set'); - // Add items to the set with duplicates - return set.add('item1').then(function () { + hz.getSet('my-distributed-set').then(function (s) { + set = s; + // Add items to the set with duplicates + return set.add('item1'); + }).then(function () { return set.add('item1'); }).then(function () { return set.add('item2'); diff --git a/code_samples/paging_predicate.js b/code_samples/paging_predicate.js index 5971a3764..77b4dcf6a 100644 --- a/code_samples/paging_predicate.js +++ b/code_samples/paging_predicate.js @@ -55,10 +55,13 @@ cfg.serializationConfig.dataSerializableFactories[1] = { } }; -var predicate = Predicates.paging(Predicates.truePredicate(), 2, comparator); +var predicate = Predicates.paging(Predicates.alwaysTrue(), 2, comparator); Client.newHazelcastClient(cfg).then(function (client) { - var map = client.getMap('test'); - map.putAll([['a', 1], ['b', 2], ['c', 3], ['d', 4], ['e', 5], ['f', 6], ['g', 7]]).then(function () { + var map; + client.getMap('test').then(function (mp) { + map = mp; + return map.putAll([['a', 1], ['b', 2], ['c', 3], ['d', 4], ['e', 5], ['f', 6], ['g', 7]]); + }).then(function () { return map.size(); }).then(function (mapSize) { console.log('Added ' + mapSize + ' elements.'); diff --git a/code_samples/pn_counter.js b/code_samples/pn_counter.js index 07922a35c..f698caf7a 100644 --- a/code_samples/pn_counter.js +++ b/code_samples/pn_counter.js @@ -18,9 +18,11 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; - var pnCounter = hazelcastClient.getPNCounter('counter'); - - pnCounter.addAndGet(5).then(function (val) { + var pnCounter; + hazelcastClient.getPNCounter('counter').then(function (counter) { + pnCounter = counter; + return pnCounter.addAndGet(5); + }).then(function (val) { console.log('Added 5 to `counter`. Current value is ' + val); return pnCounter.decrementAndGet(); }).then(function (val) { diff --git a/code_samples/queue.js b/code_samples/queue.js index a691c68e6..18b6faf7f 100644 --- a/code_samples/queue.js +++ b/code_samples/queue.js @@ -18,9 +18,11 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; - var queue = hazelcastClient.getQueue('people'); - - queue.put('Item1').then(function () { + var queue; + hazelcastClient.getQueue('people').then(function (q) { + queue = q; + return queue.put('Item1'); + }).then(function () { return queue.put('Item2'); }).then(function () { return queue.peek(); diff --git a/code_samples/set.js b/code_samples/set.js index 8229fad75..eb08763dd 100644 --- a/code_samples/set.js +++ b/code_samples/set.js @@ -18,9 +18,11 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hazelcastClient) { var client = hazelcastClient; - var set = hazelcastClient.getSet('my-distributed-set'); - - set.add('key').then(function () { + var set; + hazelcastClient.getSet('my-distributed-set').then(function (s) { + set = s; + return set.add('key'); + }).then(function () { console.log('"key" is added to the set.'); return set.contains('key'); }).then(function (contains) { From 6e5275e087af2eb802772d6bd49e788018f8c57d Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Thu, 11 Oct 2018 14:33:44 +0300 Subject: [PATCH 147/685] make ConfigBuilder accessible by user (#375) --- src/index.ts | 2 ++ test/config/ConfigBuilderHazelcastCloudTest.js | 2 +- test/config/ConfigBuilderSSLTest.js | 2 +- test/config/ConfigBuilderTest.js | 2 +- test/config/ConfigLocationTest.js | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index c93623704..90f513734 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,6 +19,7 @@ import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); import * as Aggregators from './aggregation/Aggregators'; import {ClientInfo} from './ClientInfo'; import * as Config from './config/Config'; +import {ConfigBuilder} from './config/ConfigBuilder'; import {ImportConfig} from './config/ImportConfig'; import * as Predicates from './core/Predicate'; import {IterationType} from './core/Predicate'; @@ -33,6 +34,7 @@ import {MemberAttributeEvent, MemberAttributeOperationType} from './core/MemberA export { HazelcastClient as Client, Config, + ConfigBuilder, ClientInfo, IMap, Address, diff --git a/test/config/ConfigBuilderHazelcastCloudTest.js b/test/config/ConfigBuilderHazelcastCloudTest.js index b26c469bb..70daa4e05 100644 --- a/test/config/ConfigBuilderHazelcastCloudTest.js +++ b/test/config/ConfigBuilderHazelcastCloudTest.js @@ -19,7 +19,7 @@ var expect = require('chai').expect; var ClientConfig = require('../../').Config.ClientConfig; require('chai').use(require('chai-as-promised')); var path = require('path'); -var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +var ConfigBuilder = require('../../').ConfigBuilder; describe('ConfigBuilderHazelcastCloud Test', function () { var configFull; diff --git a/test/config/ConfigBuilderSSLTest.js b/test/config/ConfigBuilderSSLTest.js index 620c5af38..fb0f5749a 100644 --- a/test/config/ConfigBuilderSSLTest.js +++ b/test/config/ConfigBuilderSSLTest.js @@ -18,7 +18,7 @@ require('chai').use(require('chai-as-promised')); var expect = require('chai').expect; var path = require('path'); -var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +var ConfigBuilder = require('../../').ConfigBuilder; var Config = require('../../lib/index').Config; describe('ConfigBuilderSSLTest', function () { diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 1ced70fba..59511911d 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -16,7 +16,7 @@ var expect = require('chai').expect; var path = require('path'); -var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +var ConfigBuilder = require('../../').ConfigBuilder; var Config = require('../../lib/index').Config; var Long = require('long'); var AddressHelper = require("../../lib/Util").AddressHelper; diff --git a/test/config/ConfigLocationTest.js b/test/config/ConfigLocationTest.js index 08a05e7e5..4f40baabe 100644 --- a/test/config/ConfigLocationTest.js +++ b/test/config/ConfigLocationTest.js @@ -16,7 +16,7 @@ var expect = require('chai').expect; var path = require('path'); -var ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +var ConfigBuilder = require('../../').ConfigBuilder; var fs = require('fs'); var path = require('path'); var RuntimeUtil = require('../../lib/Util'); From d0bf052d1b2b9205ccea2855118ba091937f953d Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Fri, 12 Oct 2018 10:41:34 +0300 Subject: [PATCH 148/685] add serialization introduction and IdentifiedDataSerializable docs (#341) --- README.md | 105 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 727c71616..fd2756562 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ * [Hazelcast Node.js Client](#hazelcast-nodejs-client) * [Features](#features) -* [Installing the Client](#installing-the-client) -* [Using the Client](#using-the-client) * [Configuration Overview](#configuration-overview) * [1. Configuration Options](#1-configuration-options) * [1.1. Programmatic Configuration](#11-programmatic-configuration) @@ -11,7 +9,7 @@ * [2. Importing Multiple Configurations](#2-importing-multiple-configurations) * [3. Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) * [Code Samples](#code-samples) -* [Serialization Considerations](#serialization-considerations) +* [Serialization](#serialization) * [Setting Up Client Network](#setting-up-client-network) * [1. Providing the Member Addresses](#1-providing-the-member-addresses) * [2. Setting Smart Routing](#2-setting-smart-routing) @@ -590,43 +588,96 @@ Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelca You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). -# Serialization Considerations +# Serialization -Hazelcast needs to serialize objects in order to be able to keep them in the server memory. For primitive types, it uses Hazelcast native serialization. For other complex types (e.g. JS objects), it uses JSON serialization. +Serialization is the process of converting an object into a stream of bytes to store the object in memory, a file or database, or transmit it through network. Its main purpose is to save the state of an object in order to be able to recreate it when needed. The reverse process is called deserialization. Hazelcast offers you its own native serialization methods. You will see these methods throughout the chapter. -For example, when you try to query your data using predicates, this querying is handled on the server side so Hazelcast does not have to bring all data to the client but only the relevant entries. Otherwise, there would be a lot of unneccessary data traffic between the client and the server and the performance would severely drop. -Because predicates run on the server side, the server should be able to reason about your objects. That is why you need to implement serialization on the server side. +Hazelcast serializes all your objects before sending them to the server. The `boolean`, `number`,`string` and `Long` types are serialized natively and you cannot override this behavior. The following table is the conversion of types for Java server side. -The same applies to MapStore. The server should be able to deserialize your objects in order to store them in MapStore. +| Node.js | Java | +|---------|-------------------------------------| +| boolean | Boolean | +| number | Byte, Short, Integer, Float, Double | +| string | String | +| Long | Long | -Regarding arrays in a serializable object, you can use methods like `writeIntArray` if the array is of a primitive type. +> Note: A `number`type is serialized as `Double` by default. You can configure this behaviour from `SerializationConfig.defaultNumberType`. -If you have nested objects, these nested objects also need to be serializable. Register the serializers for nested objects and the method `writeObject` will not have any problem with finding a suitable serializer for and writing/reading the nested object. +Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for Java server side respectively. -If you have arrays of custom objects, you can serialize/deserialize them like the following: +Note that if the object is not one of the above-mentioned types, the Node.js client uses `JSON Serialization` by default. + +However, `JSON Serialization` is not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization types, such as [IdentifiedDataSerializable Serialization](#1-identifieddataserializable-serialization) and [Portable Serialization](#2-portable-serialization). + +On top of all, if you want to use your own serialization type, you can use a [Custom Serialization](#3-custom-serialization). + +> **NOTE: Hazelcast Node.js Client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, + some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** + +## 1. IdentifiedDataSerializable Serialization +For a faster serialization of objects, Hazelcast recommends to implement IdentifiedDataSerializable interface. + +Here is an example of an object implementing IdentifiedDataSerializable interface: ```javascript -writeData(dataOutput) { - ... - dataOutput.writeInt(this.arrayOfCustomObjects); - this.arrayOfCustomObjects.forEach(function(element) { - dataOutput.writeObject(element); - }); - ... +function Address(street, zipCode, city, state) { + this.street = street; + this.zipCode = zipCode; + this.city = city; + this.state = state; } -readData(dataInput) { - ... - var arrayOfCustomObjects = []; - var lenOfArray = dataInput.readInt(); - for (i=0;i Date: Mon, 15 Oct 2018 17:05:09 +0300 Subject: [PATCH 149/685] fix portable factory declarative configuration (#377) --- .../portable/PortableSerializer.ts | 3 +- test/serialization/config/Address.js | 57 +++++++++++++++++ test/serialization/config/FactoriesTest.js | 62 +++++++++++++++++++ test/serialization/config/Foo.js | 49 +++++++++++++++ .../config/hazelcast-client.json | 20 ++++++ 5 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 test/serialization/config/Address.js create mode 100644 test/serialization/config/FactoriesTest.js create mode 100644 test/serialization/config/Foo.js create mode 100644 test/serialization/config/hazelcast-client.json diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 068cfd2e4..b61165590 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -26,6 +26,7 @@ import * as Long from 'long'; import {SerializationConfig} from '../../config/SerializationConfig'; import * as Path from 'path'; import {HazelcastSerializationError} from '../../HazelcastError'; +import * as Util from '../../Util'; export class PortableSerializer implements Serializer { @@ -41,7 +42,7 @@ export class PortableSerializer implements Serializer { for (const id in factoryConfigs) { const exportedName = factoryConfigs[id].exportedName; const path = factoryConfigs[id].path; - const factoryConstructor = require(Path.resolve(require.main.filename, path))[exportedName]; + const factoryConstructor = Util.loadNameFromPath(path, exportedName); this.factories[id] = new factoryConstructor(); } } diff --git a/test/serialization/config/Address.js b/test/serialization/config/Address.js new file mode 100644 index 000000000..c291b48eb --- /dev/null +++ b/test/serialization/config/Address.js @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +function Address(street, zipCode, city, state) { + this.street = street; + this.zipCode = zipCode; + this.city = city; + this.state = state; +} + +Address.prototype.getClassId = function () { + return 1; +}; + +Address.prototype.getFactoryId = function () { + return 1; +}; + +Address.prototype.writeData = function (objectDataOutput) { + objectDataOutput.writeUTF(this.street); + objectDataOutput.writeInt(this.zipCode); + objectDataOutput.writeUTF(this.city); + objectDataOutput.writeUTF(this.state); +}; + +Address.prototype.readData = function (objectDataInput) { + this.street = objectDataInput.readUTF(); + this.zipCode = objectDataInput.readInt(); + this.city = objectDataInput.readUTF(); + this.state = objectDataInput.readUTF(); +}; + +function MyIdentifiedFactory() { + +} + +MyIdentifiedFactory.prototype.create = function (type) { + if (type === 1) { + return new Address(); + } +} + +exports.MyIdentifiedFactory = MyIdentifiedFactory; +exports.Address = Address; diff --git a/test/serialization/config/FactoriesTest.js b/test/serialization/config/FactoriesTest.js new file mode 100644 index 000000000..c16e0e675 --- /dev/null +++ b/test/serialization/config/FactoriesTest.js @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Controller = require('../../RC'); +var expect = require('chai').expect; + +var Client = require('../../../').Client; +var Foo = require('./Foo').Foo; +var Address = require('./Address').Address; + +describe('Factories', function () { + var cluster; + + before(function () { + process.chdir('test/serialization/config'); + return Controller.createCluster(null, null).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }); + }); + + after(function () { + Controller.shutdownCluster(cluster.id); + process.chdir('../../../'); + }) + + it('should be configured declaratively', function () { + return Client.newHazelcastClient().then(function (client) { + var map; + return client.getMap('furkan').then(function (mp) { + map = mp; + return map.put('foo', new Foo("elma")); + }).then(function () { + return map.put('address', new Address('Sahibiata', 42000, 'Konya', 'Turkey')) + }).then(function () { + return map.get('foo'); + }).then(function (res) { + expect(res.foo).to.be.equal('elma'); + return map.get('address'); + }).then(function (res) { + expect(res.street).to.be.equal('Sahibiata'); + expect(res.zipCode).to.be.equal(42000); + expect(res.city).to.be.equal('Konya'); + expect(res.state).to.be.equal('Turkey'); + client.shutdown(); + }); + }); + }); +}); diff --git a/test/serialization/config/Foo.js b/test/serialization/config/Foo.js new file mode 100644 index 000000000..cfcc29c61 --- /dev/null +++ b/test/serialization/config/Foo.js @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + + +function Foo(foo) { + this.foo = foo; +} + +Foo.prototype.getClassId = function () { + return 1; +} + +Foo.prototype.getFactoryId = function () { + return 1; +} + +Foo.prototype.writePortable = function (portableWriter) { + portableWriter.writeUTF('foo', this.foo); +} + +Foo.prototype.readPortable = function (portableReader) { + this.foo = portableReader.readUTF('foo'); +} + +function MyPortableFactory() { + +} + +MyPortableFactory.prototype.create = function (type) { + if (type === 1) { + return new Foo(); + } +} + +exports.MyPortableFactory = MyPortableFactory; +exports.Foo = Foo; diff --git a/test/serialization/config/hazelcast-client.json b/test/serialization/config/hazelcast-client.json new file mode 100644 index 000000000..6af514dbe --- /dev/null +++ b/test/serialization/config/hazelcast-client.json @@ -0,0 +1,20 @@ +{ + "serialization": { + "defaultNumberType": "integer", + "isBigEndian": false, + "dataSerializableFactories": [ + { + "path": "Address.js", + "exportedName": "MyIdentifiedFactory", + "factoryId": 1 + } + ], + "portableFactories": [ + { + "path": "Foo.js", + "exportedName": "MyPortableFactory", + "factoryId": 1 + } + ] + } +} From 0c08d5a204dd9cc451886d48b0527691b99ffeb9 Mon Sep 17 00:00:00 2001 From: furkansenharputlu Date: Tue, 16 Oct 2018 11:26:40 +0300 Subject: [PATCH 150/685] add documentation for Portable Serialization (#376) * add documentation for Portable Serialization * add declarative configurations of factories --- README.md | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 103 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fd2756562..f04f05a1f 100644 --- a/README.md +++ b/README.md @@ -655,24 +655,121 @@ IdentifiedDataSerializable uses `getClassId()` and `getFactoryId()` to reconstit A sample `IdentifiedDataSerializableFactory` could be implemented as following: ```javascript -var myIdentifiedFactory = { - create: function (type) { - if (type === 1) { - return new Address(); - } +function MyIdentifiedFactory() { + +} + +MyIdentifiedFactory.prototype.create = function (type) { + if (type === 1) { + return new Address(); } }; ``` The last step is to register the `IdentifiedDataSerializableFactory` to the `SerializationConfig`. +**Programmatic Configuration:** ```javascript var config = new Config.ClientConfig(); -config.serializationConfig.dataSerializableFactories[1] = myIdentifiedFactory; +config.serializationConfig.dataSerializableFactories[1] = new MyIdentifiedFactory(); ``` +**Declarative Configuration:** +```json +{ + "serialization": { + "dataSerializableFactories": [ + { + "path": "address.js", + "exportedName": "MyIdentifiedFactory", + "factoryId": 1 + } + ] + } +} +``` + +Note that the id that is passed to the `SerializationConfig` is same as the `factoryId` that `Address` object returns. + ## 2. Portable Serialization +As an alternative to the existing serialization methods, Hazelcast offers Portable serialization. To use it, you need to implement `Portable` interface. Portable serialization has the following advantages: + +- Supporting multiversion of the same object type +- Fetching individual fields without having to rely on reflection +- Querying and indexing support without de-serialization and/or reflection + +In order to support these features, a serialized Portable object contains meta information like the version and the concrete location of the each field in the binary data. This way Hazelcast is able to navigate in the binary data and de-serialize only the required field without actually de-serializing the whole object which improves the Query performance. + +With multiversion support, you can have two nodes where each of them having different versions of the same object and Hazelcast will store both meta information and use the correct one to serialize and de-serialize Portable objects depending on the node. This is very helpful when you are doing a rolling upgrade without shutting down the cluster. + +Also note that Portable serialization is totally language independent and is used as the binary protocol between Hazelcast server and clients. + +A sample Portable implementation of a `Foo` class will look like the following: + +```javascript +function Foo(foo) { + this.foo = foo; +} + +Foo.prototype.getClassId = function () { + return 1; +}; + +Foo.prototype.getFactoryId = function () { + return 1; +}; + +Foo.prototype.writePortable = function (portableWriter) { + portableWriter.writeUTF('foo', this.foo); +}; + +Foo.prototype.readPortable = function (portableReader) { + this.foo = portableReader.readUTF('foo'); +}; +``` + +Similar to `IdentifiedDataSerializable`, a Portable object must provide `classId` and `factoryId`. The factory object will be used to create the Portable object given the classId. + +A sample `PortableFactory` could be implemented as following: + +```javascript +function MyPortableFactory() { + +} + +MyPortableFactory.prototype.create = function (type) { + if (type === 1) { + return new Foo(); + } +}; +``` + +The last step is to register the `PortableFactory` to the `SerializationConfig`. + +**Programmatic Configuration:** +```javascript +var config = new Config.ClientConfig(); +config.serializationConfig.portableFactories[1] = new MyPortableFactory(); +``` + +**Declarative Configuration:** +```json +{ + "serialization": { + "portableFactories": [ + { + "path": "foo.js", + "exportedName": "MyPortableFactory", + "factoryId": 1 + } + ] + } +} +``` + +Note that the id that is passed to the `SerializationConfig` is same as the `factoryId` that `Foo` object returns. + ## 3. Custom Serialization ## 4. Global Serialization From a5f9eba1d2300a1b81f5ac95cfb72d2ef8cb5651 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Tue, 11 Sep 2018 15:35:19 -0400 Subject: [PATCH 151/685] Adds Development and Testing section This section is mostly the same with the old one. The PR is mostly about paraphrasing and style --- README.md | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index f04f05a1f..6b630d161 100644 --- a/README.md +++ b/README.md @@ -1458,43 +1458,41 @@ map.addEntryListener(mapEventListener).then(function () { }); ``` -# Development +# Development and Testing -## Building And Installing from Sources +Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or +tweak the implementation to your application's needs, you can follow the steps in this section. -Follow the below steps to build and install Hazelcast Node.js client from its source: - -- Clone the GitHub repository [https://github.com/hazelcast/hazelcast-nodejs-client.git](https://github.com/hazelcast/hazelcast-nodejs-client.git). -- Install the dependencies using the command `npm install`. -- Compile TypeScript using the command `npm run compile`. -- Link the package locally using the command `npm link`. -- Run static analysis tool using the command `npm run lint` +## Building and Using Client From Sources -## Using Locally Installed Package +Follow the below steps to build and install Hazelcast Node.js client from its source: -- Change directory to the project directory. -- Use a locally linked module: `npm link hazelcast-client`. -- Tryout the example shown in [Using the Client](#using-the-client) section. +1. Clone the GitHub repository (https://github.com/hazelcast/hazelcast-nodejs-client.git). +2. Run `npm install` to automatically download and install all required modules under `node_modules' directory. +3. Run `npm run compile` to compile TypeScript files to JavaScript. -# Testing +At this point you have all the runnable code(`.js`) and type declarations(`.d.ts`) in `lib` directory. You may create a link to this module so that your local +applications can depend on your local copy of Hazelcast Node.js Client. In order to create a link, run: +- `npm link`. +This will create a global link to this module in your computer. Whenever you need to depend on this module from another +local project, run: +- `npm link hazelcast-client` -## Testing Prerequisites +If you are planning to contribute, please run the style checker, as shown below, and fix the reported issues before sending a pull request. +- `npm run lint` -* [Java 6+](http://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html) +## Testing +In order to test Hazelcast Node.js Client locally, you will need the following: +* Java 6 or newer * Maven - ``` - Maven automatically downloads hazelcast-remote-controller and hazelcast from maven repository. - ``` - -## Running the Tests - Following command starts the tests: ``` npm test ``` +Test script automatically downloads `hazelcast-remote-controller` and Hazelcast IMDG. The script uses Maven to download those. # Release Notes You can see the release notes for each release on the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page. From c4c2005b878eb3c7bacfc2438bdf4d7386a7ba56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Fri, 19 Oct 2018 17:21:25 +0300 Subject: [PATCH 152/685] add documentation for handling failures --- README.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/README.md b/README.md index 6b630d161..ac7146cf4 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,9 @@ * [1.3. Mutual Authentication](#13-mutual-authentication) * [Using Node.js Client with Hazelcast IMDG](#using-nodejs-client-with-hazelcast-imdg) * [1. Node.js Client API Overview](#1-nodejs-client-api-overview) + * [Handling Failures](#handling-failures) + * [1. Handling Client Connection Failure](#1-handling-client-connection-failure) + * [2. Handling Retry-able Operation Failure](#2-handling-retry-able-operation-failure) * [2. Using Distributed Data Structures](#2-using-distributed-data-structures) * [2.1. Using Map](#21-using-map) * [2.2. Using MultiMap](#22-using-multimap) @@ -1234,6 +1237,33 @@ As a final step, if you are done with your client, you can shut it down as shown }); ``` +## Handling Failures + +There are two main failure cases you should be aware of, and configurations you can perform to achieve proper behavior. + +### 1. Handling Client Connection Failure + +While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might be not available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. + +You can configure `connectionAttemptLimit` for the number of times you want the client to retry connecting. Please see [Setting Connection Attempt Limit](#5-setting-connection-attempt-limit). + +The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. + +### 2. Handling Retry-able Operation Failure + +While sending the requests to related members, operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. Please see [Enabling Redo Operation](#3-enabling-redo-operation). + +You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in `ClientConfig.properties`. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: + +- Member throws an exception. + +- Connection between the client and member is closed. + +- Client’s heartbeat requests are timed out. + +When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member, and then the connection is lost. Since there will be no response for this operation, you will not now whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. + + ## 2. Using Distributed Data Structures Most of the Distributed Data Structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. @@ -1493,6 +1523,7 @@ npm test ``` Test script automatically downloads `hazelcast-remote-controller` and Hazelcast IMDG. The script uses Maven to download those. + # Release Notes You can see the release notes for each release on the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page. From 911dc7915baaba5932effe04cb5e38872506ce50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Fri, 19 Oct 2018 15:12:44 +0300 Subject: [PATCH 153/685] add test for custom serialization declarative configuration --- .../config/CustomSerializerTest.js | 53 +++++++++++++++++++ test/serialization/config/Musician.js | 47 ++++++++++++++++ .../config/hazelcast-client.json | 15 ++---- 3 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 test/serialization/config/CustomSerializerTest.js create mode 100644 test/serialization/config/Musician.js diff --git a/test/serialization/config/CustomSerializerTest.js b/test/serialization/config/CustomSerializerTest.js new file mode 100644 index 000000000..36362ac30 --- /dev/null +++ b/test/serialization/config/CustomSerializerTest.js @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Controller = require('../../RC'); +var expect = require('chai').expect; + +var Client = require('../../../').Client; +var Musician = require('./Musician').Musician; + +describe('CustomSerializer', function () { + var cluster; + + before(function () { + process.chdir('test/serialization/config'); + return Controller.createCluster(null, null).then(function (cl) { + cluster = cl; + return Controller.startMember(cluster.id); + }); + }); + + after(function () { + Controller.shutdownCluster(cluster.id); + process.chdir('../../../'); + }) + + it('should be configured declaratively', function () { + return Client.newHazelcastClient().then(function (client) { + var map; + return client.getMap('musicians').then(function (mp) { + map = mp; + return map.put('neyzen', new Musician('Furkan')); + }).then(function () { + return map.get('neyzen'); + }).then(function (res) { + expect(res.name).to.be.equal('Furkan'); + }); + }); + }); +}); + diff --git a/test/serialization/config/Musician.js b/test/serialization/config/Musician.js new file mode 100644 index 000000000..39bfb666f --- /dev/null +++ b/test/serialization/config/Musician.js @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +function Musician(name) { + this.name = name; +} + +function MusicianSerializer() { + +} + +MusicianSerializer.prototype.getId = function () { + return 10; +} + + +MusicianSerializer.prototype.write = function (objectDataOutput, object) { + objectDataOutput.writeInt(object.value.length); + for (var i = 0; i < object.value.length; i++) { + objectDataOutput.writeInt(t.value.charCodeAt(i)); + } +} + +MusicianSerializer.prototype.read = function (objectDataInput) { + var len = objectDataInput.readInt(); + var name = ''; + for (var i = 0; i < len; i++) { + name = name + String.fromCharCode(objectDataInput.readInt()); + } + return new Musician(name); +} + +exports.MusicianSerializer = MusicianSerializer; +exports.Musician = Musician; diff --git a/test/serialization/config/hazelcast-client.json b/test/serialization/config/hazelcast-client.json index 6af514dbe..5da6890b0 100644 --- a/test/serialization/config/hazelcast-client.json +++ b/test/serialization/config/hazelcast-client.json @@ -2,18 +2,11 @@ "serialization": { "defaultNumberType": "integer", "isBigEndian": false, - "dataSerializableFactories": [ + "serializers": [ { - "path": "Address.js", - "exportedName": "MyIdentifiedFactory", - "factoryId": 1 - } - ], - "portableFactories": [ - { - "path": "Foo.js", - "exportedName": "MyPortableFactory", - "factoryId": 1 + "path": "Musician.js", + "exportedName": "MusicianSerializer", + "typeId": 10 } ] } From c9fee0808c1c56458a77311678e9105cd9654562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Mon, 22 Oct 2018 15:16:01 +0300 Subject: [PATCH 154/685] add test for custom serialization declarative configuration --- test/serialization/config/CustomSerializerTest.js | 4 +++- test/serialization/config/Musician.js | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/serialization/config/CustomSerializerTest.js b/test/serialization/config/CustomSerializerTest.js index 36362ac30..471abdd97 100644 --- a/test/serialization/config/CustomSerializerTest.js +++ b/test/serialization/config/CustomSerializerTest.js @@ -37,11 +37,13 @@ describe('CustomSerializer', function () { }) it('should be configured declaratively', function () { + var m = new Musician('Furkan'); return Client.newHazelcastClient().then(function (client) { + expect(client.getSerializationService().findSerializerFor(m).getId()).to.be.equal(10); var map; return client.getMap('musicians').then(function (mp) { map = mp; - return map.put('neyzen', new Musician('Furkan')); + return map.put('neyzen',m); }).then(function () { return map.get('neyzen'); }).then(function (res) { diff --git a/test/serialization/config/Musician.js b/test/serialization/config/Musician.js index 39bfb666f..bc5a1abc0 100644 --- a/test/serialization/config/Musician.js +++ b/test/serialization/config/Musician.js @@ -18,6 +18,10 @@ function Musician(name) { this.name = name; } +Musician.prototype.hzGetCustomId = function () { + return 10; +}; + function MusicianSerializer() { } @@ -28,9 +32,9 @@ MusicianSerializer.prototype.getId = function () { MusicianSerializer.prototype.write = function (objectDataOutput, object) { - objectDataOutput.writeInt(object.value.length); - for (var i = 0; i < object.value.length; i++) { - objectDataOutput.writeInt(t.value.charCodeAt(i)); + objectDataOutput.writeInt(object.name.length); + for (var i = 0; i < object.name.length; i++) { + objectDataOutput.writeInt(object.name.charCodeAt(i)); } } From a363f6a9e4d79c11527687262d66311ad3855112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Fri, 19 Oct 2018 15:13:03 +0300 Subject: [PATCH 155/685] add documentation for custom serialization --- README.md | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/README.md b/README.md index ac7146cf4..3283cb4ac 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ * [3. Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) * [Code Samples](#code-samples) * [Serialization](#serialization) + * [1. IdentifiedDataSerializable Serialization](#1-identifieddataserializable-serialization) + * [2. Portable Serialization](#2-portable-serialization) + * [3. Custom Serialization](#3-custom-serialization) + * [4. Global Serialization](#4-global-serialization) * [Setting Up Client Network](#setting-up-client-network) * [1. Providing the Member Addresses](#1-providing-the-member-addresses) * [2. Setting Smart Routing](#2-setting-smart-routing) @@ -775,6 +779,74 @@ Note that the id that is passed to the `SerializationConfig` is same as the `fac ## 3. Custom Serialization +Hazelcast lets you to plug a custom serializer to be used for serialization of objects. + +Let's say you have an object `Musician` and you would like to customize the serialization. The reason could be you are not happy with the default serialization. + +```javascript +function Musician(name) { + this.name = name; +} +``` + +Let's say your custom `MusicianSerializer` will serialize `Musician`. + +```javascript +function MusicianSerializer() { + +} + +MusicianSerializer.prototype.getId = function () { + return 10; +} + + +MusicianSerializer.prototype.write = function (objectDataOutput, object) { + objectDataOutput.writeInt(object.value.length); + for (var i = 0; i < object.value.length; i++) { + objectDataOutput.writeInt(t.value.charCodeAt(i)); + } +} + +MusicianSerializer.prototype.read = function (objectDataInput) { + var len = objectDataInput.readInt(); + var name = ''; + for (var i = 0; i < len; i++) { + name = name + String.fromCharCode(objectDataInput.readInt()); + } + return new Musician(name); +} +``` + +Note that the serializer id must be unique as Hazelcast will use it to lookup the `MusicianSerializer` while it deserializes the object. Now the last required step is to register the `MusicianSerializer` to the configuration. + +**Programmatic Configuration:** + +```javascript +var config = new Config.ClientConfig(); +config.serializationConfig.customSerializers.push(new MusicianSerializer()); +``` + +**Declarative Configuration:** + +```json +{ + "serialization": { + "defaultNumberType": "integer", + "isBigEndian": false, + "serializers": [ + { + "path": "Musician.js", + "exportedName": "MusicianSerializer", + "typeId": 10 + } + ] + } +} +``` + +From now on, Hazelcast will use `MusicianSerializer` to serialize `Musician` objects. + ## 4. Global Serialization From 4cb6ab7c5729e6bfc2701835b92fa73fe860f9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Fri, 19 Oct 2018 15:52:03 +0300 Subject: [PATCH 156/685] add documentation for global serialization --- README.md | 52 +++++++++++++++++++ .../config/hazelcast-client.json | 14 +++++ 2 files changed, 66 insertions(+) diff --git a/README.md b/README.md index 3283cb4ac..89f2edda8 100644 --- a/README.md +++ b/README.md @@ -849,6 +849,58 @@ From now on, Hazelcast will use `MusicianSerializer` to serialize `Musician` obj ## 4. Global Serialization +The global serializer is identical to custom serializers from the implementation perspective. The global serializer is registered as a fallback serializer to handle all other objects if a serializer cannot be located for them. + +By default, JSON serialization is used if the object is not `IdentifiedDataSerializable` and `Portable` or there is no custom serializer for it. When you configure a global serializer, it is used instead of JSON serialization. + +**Use cases** + +- Third party serialization frameworks can be integrated using the global serializer. + +- For your custom objects, you can implement a single serializer to handle all of them. + +A sample global serializer that integrates with a third party serializer is shown below. + +```javascript +function GlobalSerializer() { + +} + +GlobalSerializer.prototype.getId = function () { + return 20; +}; + +GlobalSerializer.prototype.write = function (objectDataOutput, object) { + objectDataOutput.write(SomeThirdPartySerializer.serialize(object)) +}; + +GlobalSerializer.prototype.read = function (objectDataInput) { + return SomeThirdPartySerializer.deserialize(objectDataInput); +}; +``` + +You should register the global serializer in the configuration. + +**Programmatic Configuration:** + +```javascript +config.serializationConfig.globalSerializer = new GlobalSerializer(); +``` + +**Declarative Configuration:** + +```json +{ + "serialization": { + "defaultNumberType": "integer", + "isBigEndian": false, + "globalSerializer": { + "path": "SomeThirdPartySerializer.js", + "exportedName": "SomeThirdPartySerializer" + }, + } +} +``` # Setting Up Client Network diff --git a/test/serialization/config/hazelcast-client.json b/test/serialization/config/hazelcast-client.json index 5da6890b0..aa0dde390 100644 --- a/test/serialization/config/hazelcast-client.json +++ b/test/serialization/config/hazelcast-client.json @@ -2,6 +2,20 @@ "serialization": { "defaultNumberType": "integer", "isBigEndian": false, + "dataSerializableFactories": [ + { + "path": "Address.js", + "exportedName": "MyIdentifiedFactory", + "factoryId": 1 + } + ], + "portableFactories": [ + { + "path": "Foo.js", + "exportedName": "MyPortableFactory", + "factoryId": 1 + } + ], "serializers": [ { "path": "Musician.js", From 479ca3d2d4db6209bc0b50114efb396a044bda37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Mon, 22 Oct 2018 15:24:13 +0300 Subject: [PATCH 157/685] fix language and sample in custom serialization section --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 89f2edda8..2f359a644 100644 --- a/README.md +++ b/README.md @@ -779,14 +779,18 @@ Note that the id that is passed to the `SerializationConfig` is same as the `fac ## 3. Custom Serialization -Hazelcast lets you to plug a custom serializer to be used for serialization of objects. +Hazelcast lets you plug a custom serializer to be used for serialization of objects. -Let's say you have an object `Musician` and you would like to customize the serialization. The reason could be you are not happy with the default serialization. +Let's say you have an object `Musician` and you would like to customize the serialization. The reason may be you want to use an external serializer for only one object. ```javascript function Musician(name) { this.name = name; } + +Musician.prototype.hzGetCustomId = function () { + return 10; +}; ``` Let's say your custom `MusicianSerializer` will serialize `Musician`. @@ -802,9 +806,9 @@ MusicianSerializer.prototype.getId = function () { MusicianSerializer.prototype.write = function (objectDataOutput, object) { - objectDataOutput.writeInt(object.value.length); - for (var i = 0; i < object.value.length; i++) { - objectDataOutput.writeInt(t.value.charCodeAt(i)); + objectDataOutput.writeInt(object.name.length); + for (var i = 0; i < object.name.length; i++) { + objectDataOutput.writeInt(object.name.charCodeAt(i)); } } @@ -818,7 +822,7 @@ MusicianSerializer.prototype.read = function (objectDataInput) { } ``` -Note that the serializer id must be unique as Hazelcast will use it to lookup the `MusicianSerializer` while it deserializes the object. Now the last required step is to register the `MusicianSerializer` to the configuration. +Note that the serializer `id` must be unique as Hazelcast will use it to lookup the `MusicianSerializer` while it deserializes the object. Now the last required step is to register the `MusicianSerializer` to the configuration. **Programmatic Configuration:** From 75b509077c1223e92ee02518ab3072c1301ab21f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Wed, 24 Oct 2018 09:43:39 +0300 Subject: [PATCH 158/685] swap getting started and features chapters --- README.md | 93 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 2f359a644..c8461017a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,15 @@ # Table of Contents * [Hazelcast Node.js Client](#hazelcast-nodejs-client) +* [Getting Started](#getting-started) + * [1. Requirements](#1-requirements) + * [2. Working with Hazelcast Clusters](#2-working-with-hazelcast-clusters) + * [3. Downloading and Installing](#3-downloading-and-installing) + * [4. Basic Configuration](#4-basic-configuration) + * [4.1. IMDG Configuration](#41-imdg-configuration) + * [4.2. Hazelcast Client Configuration](#42-hazelcast-client-configuration) + * [5. Basic Usage](#5-basic-usage) + * [6. Code Samples](#6-code-samples) * [Features](#features) * [Configuration Overview](#configuration-overview) * [1. Configuration Options](#1-configuration-options) @@ -8,7 +17,6 @@ * [1.2. Declarative Configuration (JSON)](#12-declarative-configuration-json) * [2. Importing Multiple Configurations](#2-importing-multiple-configurations) * [3. Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) -* [Code Samples](#code-samples) * [Serialization](#serialization) * [1. IdentifiedDataSerializable Serialization](#1-identifieddataserializable-serialization) * [2. Portable Serialization](#2-portable-serialization) @@ -68,42 +76,12 @@ This document explains Node.js client for Hazelcast which uses Hazelcast's Open **Hazelcast** is a clustering and highly scalable data distribution platform. With its various distributed data structures, distributed caching capabilities, elastic nature and more importantly with so many happy users, Hazelcast is a feature-rich, enterprise-ready and developer-friendly in-memory data grid solution. - -# Features - -Hazelcast Node.js client supports the following data structures and features: - -* Map -* Queue -* Set -* List -* Multi Map -* Replicated Map -* Ringbuffer -* Reliable Topic -* Near Cache support for Map -* Lock -* Semaphore -* Atomic Long -* Flake Id Generator -* Fast Aggregations -* CRDT Counter -* Event Listeners -* Entry Processors -* Predicates -* Smart Client -* Unisocket Client -* Hazelcast Native Serialization -* Lifecycle Service -* SSL connection support (requires enterprise server) -* Hazelcast Cloud Discovery - # Getting Started This chapter explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG, IMDG and client configuration and how to use distributed maps with Hazelcast. -## Requirements +## 1. Requirements - Windows, Linux or MacOS - Node.js 4 or newer @@ -111,7 +89,7 @@ configuration and how to use distributed maps with Hazelcast. - Hazelcast IMDG 3.6 or newer - Latest Hazelcast Node.js Client -## Working with Hazelcast Clusters +## 2. Working with Hazelcast Clusters Hazelcast Node.js Client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of the user data. Clients are a way to connect to IMDG cluster and access such data. @@ -162,13 +140,13 @@ Find more information about `hazelcast-member` tool at https://github.com/hazelc Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/3.10.4/manual/html-single/index.html#getting-started) for more information regarding starting clusters. -## Downloading and Installing +## 3. Downloading and Installing Hazelcast Node.js Client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. ``` npm install hazelcast-client --save ``` -## Basic Configuration +## 4. Basic Configuration If you are using Hazelcast IMDG and Node.js Client on the same computer, generally default configuration just works. This is great for trying out the client. However, if you run the client on a different computer than any of the cluster members, you may need to do some simple configuration such as specifying the member addresses. @@ -179,7 +157,7 @@ It discusses some member side configuration options to ease understanding Hazelc regarding cluster connection are discussed. Configuration material regarding data structures are discussed in the following sections. You can refer to [IMDG Documentation](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview](#configuration-overview) for more information. -## IMDG Configuration +### 4.1. IMDG Configuration Hazelcast IMDG aims to run out of the box for most common scenarios. However if you have limitations on your network such as multicast being disabled, you may have to configure your Hazelcast IMDG instances so that they can find each other on the network. Also most data structures are configurable. Therefore, you may want to configure your Hazelcast IMDG. We will show you the basics about network configuration here. @@ -237,7 +215,7 @@ purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. These configuration elements are enough for most connection scenarios. Now we will move onto configuration of the Node.js client. -## Hazelcast Client Configuration +### 4.2. Hazelcast Client Configuration There are two ways to configure a Hazelcast Node.js Client: - Programmatically - Declaratively (JSON) @@ -321,7 +299,7 @@ cfg.network.addresses.push('some-ip-address:port'); } ``` -## Basic Usage +## 5. Basic Usage Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a distributed map in Node.js client. @@ -435,6 +413,40 @@ Bob is in IT department You will see this time we add only the sales employees but we get the list all known employees including the ones in IT. That is because our map lives in the cluster and no matter which client we use, we can access the whole map. +## 6. Code Samples +Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. + +You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). + +# Features + +Hazelcast Node.js client supports the following data structures and features: + +* Map +* Queue +* Set +* List +* Multi Map +* Replicated Map +* Ringbuffer +* Reliable Topic +* Near Cache support for Map +* Lock +* Semaphore +* Atomic Long +* Flake Id Generator +* Fast Aggregations +* CRDT Counter +* Event Listeners +* Entry Processors +* Predicates +* Smart Client +* Unisocket Client +* Hazelcast Native Serialization +* Lifecycle Service +* SSL connection support (requires enterprise server) +* Hazelcast Cloud Discovery + # Configuration Overview This chapter describes the options to configure your Node.js client and explains how you can import multiple configurations @@ -590,11 +602,6 @@ If you have only one export as the default export from `factory_utils.js`, just the client will load the default export from the file. -## Code Samples -Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. - -You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). - # Serialization Serialization is the process of converting an object into a stream of bytes to store the object in memory, a file or database, or transmit it through network. Its main purpose is to save the state of an object in order to be able to recreate it when needed. The reverse process is called deserialization. Hazelcast offers you its own native serialization methods. You will see these methods throughout the chapter. From 07694b681854a7a711f7a8ad9c3074e8fa1f048e Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 24 Oct 2018 11:12:58 +0300 Subject: [PATCH 159/685] add documentation for client operation modes (#382) --- README.md | 78 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index c8461017a..9c233ac42 100644 --- a/README.md +++ b/README.md @@ -38,21 +38,24 @@ * [1.3. Mutual Authentication](#13-mutual-authentication) * [Using Node.js Client with Hazelcast IMDG](#using-nodejs-client-with-hazelcast-imdg) * [1. Node.js Client API Overview](#1-nodejs-client-api-overview) - * [Handling Failures](#handling-failures) - * [1. Handling Client Connection Failure](#1-handling-client-connection-failure) - * [2. Handling Retry-able Operation Failure](#2-handling-retry-able-operation-failure) - * [2. Using Distributed Data Structures](#2-using-distributed-data-structures) - * [2.1. Using Map](#21-using-map) - * [2.2. Using MultiMap](#22-using-multimap) - * [2.3. Using ReplicatedMap](#23-using-replicatedmap) - * [2.4. Using Queue](#24-using-queue) - * [4. Distributed Events](#4-distributed-events) - * [4.1. Cluster Events](#41-cluster-events) - * [4.1.1. Listening for Member Events](#411-listening-for-member-events) - * [4.1.2. Listening for Distributed Object Events](#412-listening-for-distributed-object-events) - * [4.1.3. Listening for Lifecycle Events](#413-listening-for-lifecycle-events) - * [4.2. Distributed Data Structure Events](#42-distributed-data-structure-events) - * [4.2.1. Listening for Map Events](#421-listening-for-map-events) + * [2. Node.js Client Operation Modes](#2-nodejs-client-operation-modes) + * [2.1. Smart Client](#21-smart-client) + * [2.2. Unisocket Client](#22-unisocket-client) + * [3. Handling Failures](#3-handling-failures) + * [3.1. Handling Client Connection Failure](#31-handling-client-connection-failure) + * [3.2. Handling Retry-able Operation Failure](#32-handling-retry-able-operation-failure) + * [4. Using Distributed Data Structures](#4-using-distributed-data-structures) + * [4.1. Using Map](#41-using-map) + * [4.2. Using MultiMap](#42-using-multimap) + * [4.3. Using ReplicatedMap](#43-using-replicatedmap) + * [4.4. Using Queue](#44-using-queue) + * [5. Distributed Events](#5-distributed-events) + * [5.1. Cluster Events](#51-cluster-events) + * [5.1.1. Listening for Member Events](#511-listening-for-member-events) + * [5.1.2. Listening for Distributed Object Events](#512-listening-for-distributed-object-events) + * [5.1.3. Listening for Lifecycle Events](#513-listening-for-lifecycle-events) + * [5.2. Distributed Data Structure Events](#52-distributed-data-structure-events) + * [5.2.1. Listening for Map Events](#521-listening-for-map-events) * [Development](#development) * [Building And Installing from Sources](#building-and-installing-from-sources) * [Using Locally Installed Package](#using-locally-installed-package) @@ -1372,11 +1375,26 @@ As a final step, if you are done with your client, you can shut it down as shown }); ``` -## Handling Failures +## 2. Node.js Client Operation Modes + +The client has two operation modes because of the distributed nature of the data and cluster. + +### 2.1. Smart Client + +In the smart mode, clients connect to each cluster member. Since each data partition uses the well known and consistent hashing algorithm, each client can send an operation to the relevant cluster member, which increases the overall throughput and efficiency. Smart mode is the default mode. + + +### 2.2. Unisocket Client + +For some cases, the clients can be required to connect to a single member instead of each member in the cluster. Firewalls, security, or some custom networking issues can be the reason for these cases. + +In the unisocket client mode, the client will only connect to one of the configured addresses. This single member will behave as a gateway to the other members. For any operation requested from the client, it will redirect the request to the relevant member and return the response back to the client returned from this member. + +## 3. Handling Failures There are two main failure cases you should be aware of, and configurations you can perform to achieve proper behavior. -### 1. Handling Client Connection Failure +### 3.1. Handling Client Connection Failure While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might be not available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. @@ -1384,7 +1402,7 @@ You can configure `connectionAttemptLimit` for the number of times you want the The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. -### 2. Handling Retry-able Operation Failure +### 3.2. Handling Retry-able Operation Failure While sending the requests to related members, operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. Please see [Enabling Redo Operation](#3-enabling-redo-operation). @@ -1399,11 +1417,11 @@ You can set a timeout for retrying the operations sent to a member. This can be When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member, and then the connection is lost. Since there will be no response for this operation, you will not now whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. -## 2. Using Distributed Data Structures +## 4. Using Distributed Data Structures Most of the Distributed Data Structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. -## 2.1. Using Map +### 4.1. Using Map A Map usage example is shown below. @@ -1418,7 +1436,7 @@ map.put(1, 'Furkan').then(function (oldValue) { }); ``` -## 2.2. Using MultiMap +### 4.2. Using MultiMap A MultiMap usage example is shown below. @@ -1434,7 +1452,7 @@ multiMap.put(1, 'Furkan').then(function () { }); ``` -## 2.3. Using ReplicatedMap +### 4.3. Using ReplicatedMap A ReplicatedMap usage example is shown below. @@ -1450,7 +1468,7 @@ replicatedMap.put(1, 'Furkan').then(function () { }); ``` -## 2.4. Using Queue +### 4.4. Using Queue A Queue usage example is shown below. @@ -1464,12 +1482,12 @@ queue.offer('Furkan').then(function () { }); ``` -## 4. Distributed Events +## 5. Distributed Events This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. -### 4.1. Cluster Events +### 5.1. Cluster Events You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side. @@ -1479,7 +1497,7 @@ You can add event listeners to a Hazelcast Node.js client. You can configure the `Lifecycle Listener`: Notifies when the client is starting, started, shutting down, and shutdown. -#### 4.1.1. Listening for Member Events +#### 5.1.1. Listening for Member Events You can add the following types of member events to the `ClusterService`. @@ -1507,7 +1525,7 @@ client.clusterService.on('memberAttributeChanged', function (memberAttributeEven }); ``` -#### 4.1.2. Listening for Distributed Object Events +#### 5.1.2. Listening for Distributed Object Events The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: @@ -1535,7 +1553,7 @@ client.addDistributedObjectListener(function (distributedObjectEvent) { }); ``` -#### 4.1.3. Listening for Lifecycle Events +#### 5.1.3. Listening for Lifecycle Events The Lifecycle Listener notifies for the following events: - `starting`: A client is starting. @@ -1575,14 +1593,14 @@ Lifecycle Event >>> shutdown Process finished with exit code 0 ``` -### 4.2. Distributed Data Structure Events +### 5.2. Distributed Data Structure Events You can add event listeners to the Distributed Data Structures. > **NOTE: Hazelcast Node.js Client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** -#### 4.2.1. Listening for Map Events +#### 5.2.1. Listening for Map Events You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. From c467f0b7e9625f4274faa3574c12c82cbc628858 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 24 Oct 2018 12:40:28 +0300 Subject: [PATCH 160/685] index all topics as in the documentation issue (#373) --- README.md | 258 ++++++++++++++++++++++++++---------------------------- 1 file changed, 125 insertions(+), 133 deletions(-) diff --git a/README.md b/README.md index 9c233ac42..9ea93b919 100644 --- a/README.md +++ b/README.md @@ -1,74 +1,68 @@ # Table of Contents -* [Hazelcast Node.js Client](#hazelcast-nodejs-client) -* [Getting Started](#getting-started) - * [1. Requirements](#1-requirements) - * [2. Working with Hazelcast Clusters](#2-working-with-hazelcast-clusters) - * [3. Downloading and Installing](#3-downloading-and-installing) - * [4. Basic Configuration](#4-basic-configuration) - * [4.1. IMDG Configuration](#41-imdg-configuration) - * [4.2. Hazelcast Client Configuration](#42-hazelcast-client-configuration) - * [5. Basic Usage](#5-basic-usage) - * [6. Code Samples](#6-code-samples) -* [Features](#features) -* [Configuration Overview](#configuration-overview) - * [1. Configuration Options](#1-configuration-options) - * [1.1. Programmatic Configuration](#11-programmatic-configuration) - * [1.2. Declarative Configuration (JSON)](#12-declarative-configuration-json) - * [2. Importing Multiple Configurations](#2-importing-multiple-configurations) - * [3. Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) -* [Serialization](#serialization) - * [1. IdentifiedDataSerializable Serialization](#1-identifieddataserializable-serialization) - * [2. Portable Serialization](#2-portable-serialization) - * [3. Custom Serialization](#3-custom-serialization) - * [4. Global Serialization](#4-global-serialization) -* [Setting Up Client Network](#setting-up-client-network) - * [1. Providing the Member Addresses](#1-providing-the-member-addresses) - * [2. Setting Smart Routing](#2-setting-smart-routing) - * [3. Setting Redo Operation](#3-enabling-redo-operation) - * [4. Setting Connection Timeout](#4-setting-connection-timeout) - * [5. Setting Connection Attempt Limit](#5-setting-connection-attempt-limit) - * [6. Setting Connection Attempt Period](#6-setting-connection-attempt-period) - * [7. Enabling Client TLS/SSL](#7-enabling-client-tlsssl) - * [8. Enabling Hazelcast Cloud Discovery](#8-enabling-hazelcast-cloud-discovery) -* [Securing Client Connection](#securing-client-connection) - * [1. TLS/SSL](#1-tlsssl) - * [1.1. TLS/SSL for Hazelcast Members](#11-tlsssl-for-hazelcast-members) - * [1.2. TLS/SSL for Hazelcast Node.js Clients](#12-tlsssl-for-hazelcast-nodejs-clients) - * [1.3. Mutual Authentication](#13-mutual-authentication) -* [Using Node.js Client with Hazelcast IMDG](#using-nodejs-client-with-hazelcast-imdg) - * [1. Node.js Client API Overview](#1-nodejs-client-api-overview) - * [2. Node.js Client Operation Modes](#2-nodejs-client-operation-modes) - * [2.1. Smart Client](#21-smart-client) - * [2.2. Unisocket Client](#22-unisocket-client) - * [3. Handling Failures](#3-handling-failures) - * [3.1. Handling Client Connection Failure](#31-handling-client-connection-failure) - * [3.2. Handling Retry-able Operation Failure](#32-handling-retry-able-operation-failure) - * [4. Using Distributed Data Structures](#4-using-distributed-data-structures) - * [4.1. Using Map](#41-using-map) - * [4.2. Using MultiMap](#42-using-multimap) - * [4.3. Using ReplicatedMap](#43-using-replicatedmap) - * [4.4. Using Queue](#44-using-queue) - * [5. Distributed Events](#5-distributed-events) - * [5.1. Cluster Events](#51-cluster-events) - * [5.1.1. Listening for Member Events](#511-listening-for-member-events) - * [5.1.2. Listening for Distributed Object Events](#512-listening-for-distributed-object-events) - * [5.1.3. Listening for Lifecycle Events](#513-listening-for-lifecycle-events) - * [5.2. Distributed Data Structure Events](#52-distributed-data-structure-events) - * [5.2.1. Listening for Map Events](#521-listening-for-map-events) -* [Development](#development) - * [Building And Installing from Sources](#building-and-installing-from-sources) - * [Using Locally Installed Package](#using-locally-installed-package) -* [Testing](#testing) - * [Testing Prerequisites](#testing-prerequisites) - * [Running the Tests](#running-the-tests) -* [Release Notes](#release-notes) -* [Mail Group](#mail-group) -* [License](#license) -* [Copyright](#copyright) - - -# Hazelcast Node.js Client +* [Introduction](#introduction) +* [1. Getting Started](#1-getting-started) + * [1.1. Requirements](#11-requirements) + * [1.2. Working with Hazelcast Clusters](#12-working-with-hazelcast-clusters) + * [1.3. Downloading and Installing](#13-downloading-and-installing) + * [1.4. Basic Configuration](#14-basic-configuration) + * [1.4.1. IMDG Configuration](#141-imdg-configuration) + * [1.4.2. Hazelcast Client Configuration](#142-hazelcast-client-configuration) + * [1.5. Basic Usage](#15-basic-usage) + * [1.6. Code Samples](#16-code-samples) +* [2. Features](#2-features) +* [3. Configuration Overview](#3-configuration-overview) + * [3.1. Configuration Options](#31-configuration-options) + * [3.1.1. Programmatic Configuration](#311-programmatic-configuration) + * [3.1.2. Declarative Configuration (JSON)](#312-declarative-configuration-json) + * [3.2. Importing Multiple Configurations](#32-importing-multiple-configurations) + * [3.3. Loading Objects and Path Resolution](#33-loading-objects-and-path-resolution) +* [4. Serialization](#4-serialization) + * [4.1. IdentifiedDataSerializable Serialization](#41-identifieddataserializable-serialization) + * [4.2. Portable Serialization](#42-portable-serialization) + * [4.3. Custom Serialization](#43-custom-serialization) + * [4.4. Global Serialization](#44-global-serialization) +* [5. Setting Up Client Network](#5-setting-up-client-network) + * [5.1. Providing the Member Addresses](#51-providing-the-member-addresses) + * [5.2. Setting Smart Routing](#52-setting-smart-routing) + * [5.3. Setting Redo Operation](#53-enabling-redo-operation) + * [5.4. Setting Connection Timeout](#54-setting-connection-timeout) + * [5.5. Setting Connection Attempt Limit](#55-setting-connection-attempt-limit) + * [5.6. Setting Connection Attempt Period](#56-setting-connection-attempt-period) + * [5.7. Enabling Client TLS/SSL](#57-enabling-client-tlsssl) + * [5.8. Enabling Hazelcast Cloud Discovery](#58-enabling-hazelcast-cloud-discovery) +* [6. Securing Client Connection](#6-securing-client-connection) + * [6.1. TLS/SSL](#61-tlsssl) + * [6.1.1. TLS/SSL for Hazelcast Members](#611-tlsssl-for-hazelcast-members) + * [6.1.2. TLS/SSL for Hazelcast Node.js Clients](#612-tlsssl-for-hazelcast-nodejs-clients) + * [6.1.3. Mutual Authentication](#613-mutual-authentication) +* [7. Using Node.js Client with Hazelcast IMDG](#7-using-nodejs-client-with-hazelcast-imdg) + * [7.1. Node.js Client API Overview](#71-nodejs-client-api-overview) + * [7.2. Node.js Client Operation Modes](#72-nodejs-client-operation-modes) + * [7.2.1. Smart Client](#721-smart-client) + * [7.2.2. Unisocket Client](#722-unisocket-client) + * [7.3. Handling Failures](#73-handling-failures) + * [7.3.1. Handling Client Connection Failure](#731-handling-client-connection-failure) + * [7.3.2. Handling Retry-able Operation Failure](#732-handling-retry-able-operation-failure) + * [7.4. Using Distributed Data Structures](#74-using-distributed-data-structures) + * [7.4.1. Using Map](#741-using-map) + * [7.4.2. Using MultiMap](#742-using-multimap) + * [7.4.3. Using ReplicatedMap](#743-using-replicatedmap) + * [7.4.4. Using Queue](#744-using-queue) + * [7.5. Distributed Events](#75-distributed-events) + * [7.5.1. Cluster Events](#751-cluster-events) + * [7.5.1.1. Listening for Member Events](#7511-listening-for-member-events) + * [7.5.1.2. Listening for Distributed Object Events](#7512-listening-for-distributed-object-events) + * [7.5.1.3. Listening for Lifecycle Events](#7513-listening-for-lifecycle-events) + * [7.5.2. Distributed Data Structure Events](#752-distributed-data-structure-events) + * [7.5.2.1. Listening for Map Events](#7521-listening-for-map-events) +* [8. Development and Testing](#8-development-and-testing) + * [8.1. Building and Using Client From Sources](#81-building-and-using-client-from-sources) + * [8.2. Testing](#82-testing) +* [9. Support, License and Copyright](#9-support-license-and-copyright) + + +# Introduction > **NOTE: This project is currently in active development.** @@ -79,12 +73,12 @@ This document explains Node.js client for Hazelcast which uses Hazelcast's Open **Hazelcast** is a clustering and highly scalable data distribution platform. With its various distributed data structures, distributed caching capabilities, elastic nature and more importantly with so many happy users, Hazelcast is a feature-rich, enterprise-ready and developer-friendly in-memory data grid solution. -# Getting Started +# 1. Getting Started This chapter explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG, IMDG and client configuration and how to use distributed maps with Hazelcast. -## 1. Requirements +## 1.1. Requirements - Windows, Linux or MacOS - Node.js 4 or newer @@ -92,7 +86,7 @@ configuration and how to use distributed maps with Hazelcast. - Hazelcast IMDG 3.6 or newer - Latest Hazelcast Node.js Client -## 2. Working with Hazelcast Clusters +## 1.2. Working with Hazelcast Clusters Hazelcast Node.js Client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of the user data. Clients are a way to connect to IMDG cluster and access such data. @@ -143,13 +137,13 @@ Find more information about `hazelcast-member` tool at https://github.com/hazelc Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/3.10.4/manual/html-single/index.html#getting-started) for more information regarding starting clusters. -## 3. Downloading and Installing +## 1.3. Downloading and Installing Hazelcast Node.js Client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. ``` npm install hazelcast-client --save ``` -## 4. Basic Configuration +## 1.4. Basic Configuration If you are using Hazelcast IMDG and Node.js Client on the same computer, generally default configuration just works. This is great for trying out the client. However, if you run the client on a different computer than any of the cluster members, you may need to do some simple configuration such as specifying the member addresses. @@ -160,7 +154,7 @@ It discusses some member side configuration options to ease understanding Hazelc regarding cluster connection are discussed. Configuration material regarding data structures are discussed in the following sections. You can refer to [IMDG Documentation](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview](#configuration-overview) for more information. -### 4.1. IMDG Configuration +### 1.4.1. IMDG Configuration Hazelcast IMDG aims to run out of the box for most common scenarios. However if you have limitations on your network such as multicast being disabled, you may have to configure your Hazelcast IMDG instances so that they can find each other on the network. Also most data structures are configurable. Therefore, you may want to configure your Hazelcast IMDG. We will show you the basics about network configuration here. @@ -218,7 +212,7 @@ purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. These configuration elements are enough for most connection scenarios. Now we will move onto configuration of the Node.js client. -### 4.2. Hazelcast Client Configuration +### 1.4.2. Hazelcast Client Configuration There are two ways to configure a Hazelcast Node.js Client: - Programmatically - Declaratively (JSON) @@ -302,7 +296,7 @@ cfg.network.addresses.push('some-ip-address:port'); } ``` -## 5. Basic Usage +## 1.5. Basic Usage Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a distributed map in Node.js client. @@ -416,12 +410,12 @@ Bob is in IT department You will see this time we add only the sales employees but we get the list all known employees including the ones in IT. That is because our map lives in the cluster and no matter which client we use, we can access the whole map. -## 6. Code Samples +## 1.6. Code Samples Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). -# Features +# 2. Features Hazelcast Node.js client supports the following data structures and features: @@ -450,18 +444,18 @@ Hazelcast Node.js client supports the following data structures and features: * SSL connection support (requires enterprise server) * Hazelcast Cloud Discovery -# Configuration Overview +# 3. Configuration Overview This chapter describes the options to configure your Node.js client and explains how you can import multiple configurations and how you should set paths and exported names for the client to load objects. -## 1. Configuration Options +## 3.1. Configuration Options You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). * Programmatic configuration * Declarative configuration (JSON file) -### 1.1. Programmatic Configuration +### 3.1.1. Programmatic Configuration For programmatic configuration of the Hazelcast Node.js Client, just instantiate a `ClientConfig` object and configure the desired aspects. An example is shown below. @@ -476,7 +470,7 @@ return HazelcastClient.newHazelcastClient(cfg); Refer to `ClientConfig` class documentation at [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. -### 1.2. Declarative Configuration (JSON) +### 3.1.2. Declarative Configuration (JSON) If the client is not supplied with a programmatic configuration at the time of initialization, it will look for a configuration file named `hazelcast-client.json`. If this file exists, then the configuration is loaded from it. Otherwise, the client will start with the default configuration. The following are the places that the client looks for a `hazelcast-client.json` in order: @@ -518,7 +512,7 @@ Following is a sample JSON configuration file: In the following chapters you will learn the description of all elements included in a JSON configuration file used to configure Hazelcast Node.js client. -## 2. Importing Multiple Configurations +## 3.2. Importing Multiple Configurations You can compose the declarative configuration of your Node.js client from multiple declarative configuration snippets. In order to compose a declarative configuration, you can use the `import` element to load @@ -564,7 +558,7 @@ shown below. > Note: Use `import` element on top level of JSON hierarchy. -## 3. Loading Objects and Path Resolution +## 3.3. Loading Objects and Path Resolution For configuration elements that require you to specify a code piece, you will need to specify the path to the code and name of the exported element that you want the client to use. This configuration is set as follows: @@ -605,7 +599,7 @@ If you have only one export as the default export from `factory_utils.js`, just the client will load the default export from the file. -# Serialization +# 4. Serialization Serialization is the process of converting an object into a stream of bytes to store the object in memory, a file or database, or transmit it through network. Its main purpose is to save the state of an object in order to be able to recreate it when needed. The reverse process is called deserialization. Hazelcast offers you its own native serialization methods. You will see these methods throughout the chapter. @@ -631,7 +625,7 @@ On top of all, if you want to use your own serialization type, you can use a [Cu > **NOTE: Hazelcast Node.js Client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** -## 1. IdentifiedDataSerializable Serialization +## 4.1. IdentifiedDataSerializable Serialization For a faster serialization of objects, Hazelcast recommends to implement IdentifiedDataSerializable interface. Here is an example of an object implementing IdentifiedDataSerializable interface: @@ -708,7 +702,7 @@ config.serializationConfig.dataSerializableFactories[1] = new MyIdentifiedFactor Note that the id that is passed to the `SerializationConfig` is same as the `factoryId` that `Address` object returns. -## 2. Portable Serialization +## 4.2. Portable Serialization As an alternative to the existing serialization methods, Hazelcast offers Portable serialization. To use it, you need to implement `Portable` interface. Portable serialization has the following advantages: @@ -787,7 +781,7 @@ config.serializationConfig.portableFactories[1] = new MyPortableFactory(); Note that the id that is passed to the `SerializationConfig` is same as the `factoryId` that `Foo` object returns. -## 3. Custom Serialization +## 4.3. Custom Serialization Hazelcast lets you plug a custom serializer to be used for serialization of objects. @@ -861,7 +855,7 @@ config.serializationConfig.customSerializers.push(new MusicianSerializer()); From now on, Hazelcast will use `MusicianSerializer` to serialize `Musician` objects. -## 4. Global Serialization +## 4.4. Global Serialization The global serializer is identical to custom serializers from the implementation perspective. The global serializer is registered as a fallback serializer to handle all other objects if a serializer cannot be located for them. @@ -916,7 +910,7 @@ config.serializationConfig.globalSerializer = new GlobalSerializer(); } ``` -# Setting Up Client Network +# 5. Setting Up Client Network All network related configuration of Hazelcast Node.js Client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let’s first give the examples for these two approaches. Then we will look at its sub-elements and attributes. @@ -954,7 +948,7 @@ clientConfig.networkConfig.connectionAttemptPeriod = 5000; clientConfig.networkConfig.connectionAttemptLimit = 5; ``` -## 1. Providing the Member Addresses +## 5.1. Providing the Member Addresses Address list is the initial list of cluster addresses to which the client will connect. The client uses this list to find an alive member. Although it may be enough to give only one address of a member in the cluster @@ -984,7 +978,7 @@ If the port part is omitted, then 5701, 5702 and 5703 will be tried in random or You can specify multiple addresses with or without port information as seen above. The provided list is shuffled and tried in random order. Its default value is `localhost`. -## 2. Setting Smart Routing +## 5.2. Setting Smart Routing Smart routing defines whether the client mode is smart or unisocket. See [Node.js Client Operation Modes section](#nodejs-client-operation-modes) for the description of smart and unisocket modes. @@ -1010,7 +1004,7 @@ clientConfig.networkConfig.smartRouting = true; Its default value is `true` (smart client mode). -## 3. Enabling Redo Operation +## 5.3. Enabling Redo Operation It enables/disables redo-able operations. While sending the requests to related members, operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. @@ -1033,7 +1027,7 @@ clientConfig.networkConfig.redoOperation = true; Its default value is `false` (disabled). -## 4. Setting Connection Timeout +## 5.4. Setting Connection Timeout Connection timeout is the timeout value in milliseconds for members to accept client connection requests. If server does not respond within the timeout, the client will retry to connect as many as `ClientNetworkConfig.connectionAttemptLimit` times. @@ -1060,7 +1054,7 @@ clientConfig.networkConfig.connectionTimeout = 6000; Its default value is `5000` milliseconds. -## 5. Setting Connection Attempt Limit +## 5.5. Setting Connection Attempt Limit While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addresses`, that member might not be available at that moment. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `ClientNetworkConfig.connectionAttemptLimit` times. This is also the case when the previously established connection between the client and that member goes down. @@ -1085,7 +1079,7 @@ clientConfig.networkConfig.connectionAttemptLimit = 5; Its default value is `2`. -## 6. Setting Connection Attempt Period +## 5.6. Setting Connection Attempt Period Connection timeout period is the duration in milliseconds between the connection attempts defined by `ClientNetworkConfig.connectionAttemptLimit`. @@ -1110,14 +1104,14 @@ clientConfig.networkConfig.connectionAttemptPeriod = 5000; Its default value is `3000` milliseconds. -## 7. Enabling Client TLS/SSL +## 5.7. Enabling Client TLS/SSL You can use TLS/SSL to secure the connection between the clients and members. If you want TLS/SSL enabled for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#1-tlsssl). As explained in the [TLS/SSL section](#1-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates and members to have their certificate authorities so that the members can know which clients they can trust. Please see the [Mutual Authentication section](#13-mutual-authentication). -## 8. Enabling Hazelcast Cloud Discovery +## 5.8. Enabling Hazelcast Cloud Discovery The purpose of Hazelcast Cloud Discovery is to provide clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. @@ -1155,11 +1149,11 @@ clientConfig.networkConfig.cloudConfig.discoveryToken = 'EXAMPLE_TOKEN'; To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. -# Securing Client Connection +# 6. Securing Client Connection This chapter describes the security features of Hazelcast Node.js Client. These include using TLS/SSL for connections between members and between clients and members and mutual authentication. These security features require **Hazelcast IMDG Enterprise** edition. -### 1. TLS/SSL +### 6.1. TLS/SSL One of the offers of Hazelcast is the TLS/SSL protocol which you can use to establish an encrypted communication across your cluster with key stores and trust stores. @@ -1169,11 +1163,11 @@ One of the offers of Hazelcast is the TLS/SSL protocol which you can use to esta You should set `keyStore` and `trustStore` before starting the members. See the next section how to set `keyStore` and `trustStore` on the server side. -#### 1.1. TLS/SSL for Hazelcast Members +#### 6.1.1. TLS/SSL for Hazelcast Members Hazelcast allows you to encrypt socket level communication between Hazelcast members and between Hazelcast clients and members, for end to end encryption. To use it, see [TLS/SSL for Hazelcast Members section](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#tls-ssl-for-hazelcast-members). -#### 1.2. TLS/SSL for Hazelcast Node.js Clients +#### 6.1.2. TLS/SSL for Hazelcast Node.js Clients Hazelcast Node.js clients which support TLS/SSL should have the following user supplied SSL `options` object, to pass to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback): @@ -1189,7 +1183,7 @@ clientConfig.networkConfig.sslOptions = { }; ``` -#### 1.3. Mutual Authentication +#### 6.1.3. Mutual Authentication As explained above, Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast clients have trust stores used to define which members they can trust. @@ -1322,9 +1316,9 @@ the properties section in the JSON configuration file. Lastly, the client calls For information about the path resolution, please refer to the [Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) section. -# Using Node.js Client with Hazelcast IMDG +# 7. Using Node.js Client with Hazelcast IMDG -## 1. Node.js Client API Overview +## 7.1. Node.js Client API Overview Most of the functions in the API return `Promise`. Therefore, you need to be familiar with the concept of promises to use the Node.js client. If not, you can learn about them using various online resources. @@ -1375,26 +1369,26 @@ As a final step, if you are done with your client, you can shut it down as shown }); ``` -## 2. Node.js Client Operation Modes +## 7.2. Node.js Client Operation Modes The client has two operation modes because of the distributed nature of the data and cluster. -### 2.1. Smart Client +### 7.2.1. Smart Client In the smart mode, clients connect to each cluster member. Since each data partition uses the well known and consistent hashing algorithm, each client can send an operation to the relevant cluster member, which increases the overall throughput and efficiency. Smart mode is the default mode. -### 2.2. Unisocket Client +### 7.2.2. Unisocket Client For some cases, the clients can be required to connect to a single member instead of each member in the cluster. Firewalls, security, or some custom networking issues can be the reason for these cases. In the unisocket client mode, the client will only connect to one of the configured addresses. This single member will behave as a gateway to the other members. For any operation requested from the client, it will redirect the request to the relevant member and return the response back to the client returned from this member. -## 3. Handling Failures +## 7.3. Handling Failures There are two main failure cases you should be aware of, and configurations you can perform to achieve proper behavior. -### 3.1. Handling Client Connection Failure +### 7.3.1. Handling Client Connection Failure While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might be not available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. @@ -1402,7 +1396,7 @@ You can configure `connectionAttemptLimit` for the number of times you want the The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. -### 3.2. Handling Retry-able Operation Failure +### 7.3.2. Handling Retry-able Operation Failure While sending the requests to related members, operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. Please see [Enabling Redo Operation](#3-enabling-redo-operation). @@ -1417,11 +1411,11 @@ You can set a timeout for retrying the operations sent to a member. This can be When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member, and then the connection is lost. Since there will be no response for this operation, you will not now whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. -## 4. Using Distributed Data Structures +## 7.4. Using Distributed Data Structures Most of the Distributed Data Structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. -### 4.1. Using Map +### 7.4.1. Using Map A Map usage example is shown below. @@ -1436,7 +1430,7 @@ map.put(1, 'Furkan').then(function (oldValue) { }); ``` -### 4.2. Using MultiMap +### 7.4.2. Using MultiMap A MultiMap usage example is shown below. @@ -1452,7 +1446,7 @@ multiMap.put(1, 'Furkan').then(function () { }); ``` -### 4.3. Using ReplicatedMap +### 7.4.3. Using ReplicatedMap A ReplicatedMap usage example is shown below. @@ -1468,7 +1462,7 @@ replicatedMap.put(1, 'Furkan').then(function () { }); ``` -### 4.4. Using Queue +### 7.4.4. Using Queue A Queue usage example is shown below. @@ -1482,12 +1476,12 @@ queue.offer('Furkan').then(function () { }); ``` -## 5. Distributed Events +## 7.5. Distributed Events This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. -### 5.1. Cluster Events +### 7.5.1. Cluster Events You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side. @@ -1497,7 +1491,7 @@ You can add event listeners to a Hazelcast Node.js client. You can configure the `Lifecycle Listener`: Notifies when the client is starting, started, shutting down, and shutdown. -#### 5.1.1. Listening for Member Events +#### 7.5.1.1. Listening for Member Events You can add the following types of member events to the `ClusterService`. @@ -1525,7 +1519,7 @@ client.clusterService.on('memberAttributeChanged', function (memberAttributeEven }); ``` -#### 5.1.2. Listening for Distributed Object Events +#### 7.5.1.2. Listening for Distributed Object Events The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: @@ -1553,7 +1547,7 @@ client.addDistributedObjectListener(function (distributedObjectEvent) { }); ``` -#### 5.1.3. Listening for Lifecycle Events +#### 7.5.1.3. Listening for Lifecycle Events The Lifecycle Listener notifies for the following events: - `starting`: A client is starting. @@ -1593,14 +1587,14 @@ Lifecycle Event >>> shutdown Process finished with exit code 0 ``` -### 5.2. Distributed Data Structure Events +### 7.5.2. Distributed Data Structure Events You can add event listeners to the Distributed Data Structures. > **NOTE: Hazelcast Node.js Client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** -#### 5.2.1. Listening for Map Events +#### 7.5.2.1. Listening for Map Events You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. @@ -1641,12 +1635,12 @@ map.addEntryListener(mapEventListener).then(function () { }); ``` -# Development and Testing +# 8. Development and Testing Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or tweak the implementation to your application's needs, you can follow the steps in this section. -## Building and Using Client From Sources +## 8.1. Building and Using Client From Sources Follow the below steps to build and install Hazelcast Node.js client from its source: @@ -1664,7 +1658,7 @@ local project, run: If you are planning to contribute, please run the style checker, as shown below, and fix the reported issues before sending a pull request. - `npm run lint` -## Testing +## 8.2. Testing In order to test Hazelcast Node.js Client locally, you will need the following: * Java 6 or newer * Maven @@ -1677,21 +1671,19 @@ npm test Test script automatically downloads `hazelcast-remote-controller` and Hazelcast IMDG. The script uses Maven to download those. -# Release Notes +# 9. Support, License and Copyright -You can see the release notes for each release on the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page. - -# Mail Group +## Mail Group Please join the mail group if you are interested in using or developing Hazelcast. http://groups.google.com/group/hazelcast -# License +## License Hazelcast is available under the Apache 2 License. Please see the [Licensing appendix](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#license-questions) for more information. -# Copyright +## Copyright Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. From 5c03ecc2dd12a1b078bd508dfee886f12b365423 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Wed, 24 Oct 2018 14:15:31 +0300 Subject: [PATCH 161/685] Adding the support/license related content and some minor improvements. --- README.md | 57 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 9ea93b919..51c90415c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + # Table of Contents * [Introduction](#introduction) @@ -64,18 +66,24 @@ # Introduction -> **NOTE: This project is currently in active development.** +This document provides information about the Node.js client for [Hazelcast](https://hazelcast.org/). This client uses Hazelcast's [Open Client Protocol](https://hazelcast.org/documentation/#open-binary) and works with Hazelcast IMDG 3.6 and higher versions. -[![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -
+### Resources + +See the following for more information on Node.js and Hazelcast IMDG: + +* Hazelcast IMDG [website](https://hazelcast.org/) +* Hazelcast IMDG [Reference Manual](https://hazelcast.org/documentation/#imdg) +* About [Node.js](https://nodejs.org/en/about/) + +### Release Notes -This document explains Node.js client for Hazelcast which uses Hazelcast's Open Client Protocol 1.6. This client works with Hazelcast 3.6 and higher. +You can see the release notes for each Node.js client release on the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page of this repository. -**Hazelcast** is a clustering and highly scalable data distribution platform. With its various distributed data structures, distributed caching capabilities, elastic nature and more importantly with so many happy users, Hazelcast is a feature-rich, enterprise-ready and developer-friendly in-memory data grid solution. # 1. Getting Started -This chapter explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG, IMDG and client +This chapter explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG and client configuration and how to use distributed maps with Hazelcast. ## 1.1. Requirements @@ -101,11 +109,13 @@ distributed data structures that live on the cluster. In order to use Hazelcast Node.js Client, we first need to setup an IMDG cluster. ### Setting Up an IMDG Cluster + There are multiple ways of starting an IMDG cluster easily. You can run standalone IMDG members by downloading and running jar files from the website. You can embed IMDG members to your Java projects. The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) if you have brew installed in your computer. We are going to download jars from the website and run a standalone member for this guide. #### Running Standalone Jars + Go to https://hazelcast.org/download/ and download `.zip` or `.tar` distribution of Hazelcast IMDG. Decompress the contents into any directory that you want to run IMDG members from. Change into the directory that you decompressed the Hazelcast content. Go into `bin` directory. Use either `start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see IMDG logs on the terminal. @@ -123,6 +133,7 @@ INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED #### Using hazelcast-member Tool + `hazelcast-member` is a tool to make downloading and running IMDG members as easy as it could be. If you have brew installed, run the following commands: ``` brew tap hazelcast/homebrew-hazelcast @@ -138,12 +149,14 @@ Find more information about `hazelcast-member` tool at https://github.com/hazelc Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/3.10.4/manual/html-single/index.html#getting-started) for more information regarding starting clusters. ## 1.3. Downloading and Installing + Hazelcast Node.js Client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. ``` npm install hazelcast-client --save ``` ## 1.4. Basic Configuration + If you are using Hazelcast IMDG and Node.js Client on the same computer, generally default configuration just works. This is great for trying out the client. However, if you run the client on a different computer than any of the cluster members, you may need to do some simple configuration such as specifying the member addresses. @@ -155,6 +168,7 @@ regarding cluster connection are discussed. Configuration material regarding dat You can refer to [IMDG Documentation](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview](#configuration-overview) for more information. ### 1.4.1. IMDG Configuration + Hazelcast IMDG aims to run out of the box for most common scenarios. However if you have limitations on your network such as multicast being disabled, you may have to configure your Hazelcast IMDG instances so that they can find each other on the network. Also most data structures are configurable. Therefore, you may want to configure your Hazelcast IMDG. We will show you the basics about network configuration here. @@ -213,9 +227,11 @@ purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. These configuration elements are enough for most connection scenarios. Now we will move onto configuration of the Node.js client. ### 1.4.2. Hazelcast Client Configuration + There are two ways to configure a Hazelcast Node.js Client: -- Programmatically -- Declaratively (JSON) + +* Programmatically +* Declaratively (JSON) This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. Refer to [Configuration Overview](#configuration-overview) and the following sections for information about detailed network configuration and/or additional features of Hazelcast Node.js Client @@ -277,6 +293,7 @@ cfg.group.name = //group name of you cluster ``` ### Network Settings + You need to provide the ip address and port of at least one member in your cluster so the client finds it. **Programmatic:** @@ -297,6 +314,7 @@ cfg.network.addresses.push('some-ip-address:port'); ``` ## 1.5. Basic Usage + Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a distributed map in Node.js client. @@ -411,6 +429,7 @@ You will see this time we add only the sales employees but we get the list all k That is because our map lives in the cluster and no matter which client we use, we can access the whole map. ## 1.6. Code Samples + Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). @@ -450,6 +469,7 @@ This chapter describes the options to configure your Node.js client and explains and how you should set paths and exported names for the client to load objects. ## 3.1. Configuration Options + You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). * Programmatic configuration @@ -626,6 +646,7 @@ On top of all, if you want to use your own serialization type, you can use a [Cu some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** ## 4.1. IdentifiedDataSerializable Serialization + For a faster serialization of objects, Hazelcast recommends to implement IdentifiedDataSerializable interface. Here is an example of an object implementing IdentifiedDataSerializable interface: @@ -1671,19 +1692,25 @@ npm test Test script automatically downloads `hazelcast-remote-controller` and Hazelcast IMDG. The script uses Maven to download those. -# 9. Support, License and Copyright +# 9. Getting Help -## Mail Group +You can use the following channels for your questions and development/usage issues: + +* This repository by opening an issue. +* Hazelcast Node.js client channel on Gitter: +[![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +* Our Google Groups directory: https://groups.google.com/forum/#!forum/hazelcast +* Stackoverflow: https://stackoverflow.com/questions/tagged/hazelcast -Please join the mail group if you are interested in using or developing Hazelcast. +# 9. Contributing -http://groups.google.com/group/hazelcast +You can always open a pull request on this repository for your feature and implementation/change requests. -## License +# 10. License -Hazelcast is available under the Apache 2 License. Please see the [Licensing appendix](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#license-questions) for more information. +[Apache 2 License](https://github.com/hazelcast/hazelcast-nodejs-client/blob/master/LICENSE). -## Copyright +# 11. Copyright Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. From 41117449b7c6fa46c8e1e522213d24d02a114ee8 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Wed, 24 Oct 2018 14:49:44 +0300 Subject: [PATCH 162/685] Addressing the comments/updating TOC --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 51c90415c..f5361522a 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,10 @@ * [8. Development and Testing](#8-development-and-testing) * [8.1. Building and Using Client From Sources](#81-building-and-using-client-from-sources) * [8.2. Testing](#82-testing) -* [9. Support, License and Copyright](#9-support-license-and-copyright) +* [9. Getting Help](#9-getting-help) +* [10. Contributing](#10-contributing) +* [11. License](#11-license) +* [12. Copyright](#12-copyright) # Introduction @@ -1702,15 +1705,15 @@ You can use the following channels for your questions and development/usage issu * Our Google Groups directory: https://groups.google.com/forum/#!forum/hazelcast * Stackoverflow: https://stackoverflow.com/questions/tagged/hazelcast -# 9. Contributing +# 10. Contributing -You can always open a pull request on this repository for your feature and implementation/change requests. +Besides your development contributions as explained in the [Development and Testing chapter](#8-development-and-testing) above, you can always open a pull request on this repository for your other requests such as documentation changes. -# 10. License +# 11. License [Apache 2 License](https://github.com/hazelcast/hazelcast-nodejs-client/blob/master/LICENSE). -# 11. Copyright +# 12. Copyright Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. From 993a78922b8858100a9a5db449c3f895c95a5635 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Wed, 24 Oct 2018 14:54:18 +0300 Subject: [PATCH 163/685] Addressing more comments (IMDG Reference Manual links) --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f5361522a..bda86ef76 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ You can see the release notes for each Node.js client release on the [Releases]( # 1. Getting Started -This chapter explains all the neccessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG and client +This chapter explains all the necessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG and client configuration and how to use distributed maps with Hazelcast. ## 1.1. Requirements @@ -149,7 +149,7 @@ hazelcast-member stop ``` Find more information about `hazelcast-member` tool at https://github.com/hazelcast/hazelcast-member-tool -Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/3.10.4/manual/html-single/index.html#getting-started) for more information regarding starting clusters. +Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#getting-started) for more information regarding starting clusters. ## 1.3. Downloading and Installing @@ -1225,7 +1225,7 @@ To enable mutual authentication, firstly, you need to set the following property ``` -You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/3.10.5/manual/html-single/index.html#mutual-authentication) of the Reference Manual. +You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#mutual-authentication) of the Reference Manual. And at the Node.js client side, you need to supply SSL `options` object to pass to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). @@ -1521,7 +1521,7 @@ You can add the following types of member events to the `ClusterService`. - `memberAdded`: A new member is added to the cluster. - `memberRemoved`: An existing member leaves the cluster. -- `memberAttributeChanged`: An attribute of a member is changed. Please refer to [Defining Member Attributes](https://docs.hazelcast.org/docs/3.10.5/manual/html-single/index.html#defining-member-attributes) section in the Hazelcast IMDG Reference Manual to learn about member attributes. +- `memberAttributeChanged`: An attribute of a member is changed. Please refer to [Defining Member Attributes](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#defining-member-attributes) section in the Hazelcast IMDG Reference Manual to learn about member attributes. The `ClusterService` object exposes an `ClusterService.on()` function that allows one or more functions to be attached to member events emitted by the object. From 2f65316cb928bcff8740d595ab7ebd88a64dddf5 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Wed, 24 Oct 2018 15:09:20 +0300 Subject: [PATCH 164/685] Minor typo corrections. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bda86ef76..fa013b431 100644 --- a/README.md +++ b/README.md @@ -217,7 +217,7 @@ live in the same network without disturbing each other. Note that the cluster na purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. - `` - ``: Specifies the port number to be used by the member when it starts. Its default value is 5701 You can specify another port number, and if - you set `auto-increment` to `true`, than Hazelcast will try subsequent ports until it finds an available port or `port-count` is reached. + you set `auto-increment` to `true`, then Hazelcast will try subsequent ports until it finds an available port or `port-count` is reached. - ``: Specifies the strategies to be used by the member to find other cluster members. Choose which strategy you want to use by setting its `enabled` attribute to `true` and the others to `false`. - ``: Members find each other by sending multicast requests to the specified address and port. It is very useful if IP addresses @@ -635,7 +635,7 @@ Hazelcast serializes all your objects before sending them to the server. The `bo | string | String | | Long | Long | -> Note: A `number`type is serialized as `Double` by default. You can configure this behaviour from `SerializationConfig.defaultNumberType`. +> Note: A `number` type is serialized as `Double` by default. You can configure this behavior from `SerializationConfig.defaultNumberType`. Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for Java server side respectively. @@ -1358,7 +1358,7 @@ clientConfig.groupConfig.name = 'dev'; clientConfig.networkConfig.addresses.push('10.90.0.1', '10.90.0.2:5702'); ``` -The second step is to initialize the `HazelcastClient` to be connected to the cluster. +The second step is initializing the `HazelcastClient` to be connected to the cluster. ```javascript Client.newHazelcastClient(clientConfig).then(function (client) { @@ -1703,7 +1703,7 @@ You can use the following channels for your questions and development/usage issu * Hazelcast Node.js client channel on Gitter: [![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) * Our Google Groups directory: https://groups.google.com/forum/#!forum/hazelcast -* Stackoverflow: https://stackoverflow.com/questions/tagged/hazelcast +* Stack Overflow: https://stackoverflow.com/questions/tagged/hazelcast # 10. Contributing From c011646e6039aa7f01b00542fd371d9bc947850d Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Wed, 24 Oct 2018 15:56:37 +0300 Subject: [PATCH 165/685] Adds missing items in features list Follows the order in https://hazelcast.org/clients/node-js/ --- README.md | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fa013b431..171fc9209 100644 --- a/README.md +++ b/README.md @@ -445,26 +445,39 @@ Hazelcast Node.js client supports the following data structures and features: * Queue * Set * List -* Multi Map +* MultiMap * Replicated Map * Ringbuffer * Reliable Topic -* Near Cache support for Map * Lock * Semaphore * Atomic Long +* CRDT PN Counter * Flake Id Generator -* Fast Aggregations -* CRDT Counter * Event Listeners -* Entry Processors -* Predicates +* Entry Processor +* Query (Predicates) +* Paging Predicate +* Built-in Predicates +* Listener with Predicate +* Fast Aggregations +* Near Cache Support +* Eventual Consistency Control +* Declarative Configuration (JSON) +* Programmatic Configuration +* Client Configuration Import +* Fail Fast on Invalid Configuration +* SSL Support (requires Enterprise server) +* Mutual Authentication (requires Enterprise server) +* Authorization * Smart Client * Unisocket Client -* Hazelcast Native Serialization * Lifecycle Service -* SSL connection support (requires enterprise server) * Hazelcast Cloud Discovery +* IdentifiedDataSerializable Serialization +* Portable Serialization +* Custom Serialization +* Global Serialization # 3. Configuration Overview From b84c599224da1d22955679f0939272f63e156848 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 24 Oct 2018 17:51:38 +0300 Subject: [PATCH 166/685] add documentation for distributed query and using predicates (#379) * add documentation for distributed query and using predicates * fix language on queries documentation --- README.md | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 286 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 171fc9209..2e9fc29ac 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ * [5. Setting Up Client Network](#5-setting-up-client-network) * [5.1. Providing the Member Addresses](#51-providing-the-member-addresses) * [5.2. Setting Smart Routing](#52-setting-smart-routing) - * [5.3. Setting Redo Operation](#53-enabling-redo-operation) + * [5.3. Enabling Redo Operation](#53-enabling-redo-operation) * [5.4. Setting Connection Timeout](#54-setting-connection-timeout) * [5.5. Setting Connection Attempt Limit](#55-setting-connection-attempt-limit) * [5.6. Setting Connection Attempt Period](#56-setting-connection-attempt-period) @@ -58,6 +58,12 @@ * [7.5.1.3. Listening for Lifecycle Events](#7513-listening-for-lifecycle-events) * [7.5.2. Distributed Data Structure Events](#752-distributed-data-structure-events) * [7.5.2.1. Listening for Map Events](#7521-listening-for-map-events) + * [7.7. Distributed Query](#77-distributed-query) + * [7.7.1 How Distributed Query Works](#771-how-distributed-query-works) + * [7.7.1.1. Employee Map Query Example](#7711-employee-map-query-example) + * [7.7.1.2. Querying by Combining Predicates with AND, OR, NOT](#7712-querying-by-combining-predicates-with-and-or-not) + * [7.7.1.3. Querying with SQL](#7713-querying-with-sql) + * [7.7.1.4. Filtering with Paging Predicates](#7714-filtering-with-paging-predicates) * [8. Development and Testing](#8-development-and-testing) * [8.1. Building and Using Client From Sources](#81-building-and-using-client-from-sources) * [8.2. Testing](#82-testing) @@ -134,6 +140,24 @@ Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED ``` +#### Adding User Library to CLASSPATH + + When you want to use features such as querying and language interoperability, you might need to add your own Java classes to Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to `user-lib` folder in the extracted `hazelcast-.zip`. Then, you can start your Hazelcast member by using the start scripts in the `bin` folder. The start scripts will automatically add your compiled classes to the `CLASSPATH`. + Note that if you are adding an `IdentifiedDataSerializable` or a `Portable` class, you need to add its factory too. Then, you should configure the factory in the `hazelcast.xml` in the `bin` folder like the following: + ```xml + + ... + + + > + IdentifiedFactoryClassName + + + + ... + +``` +Similarly, use `` instead of `` if you are using portables. #### Using hazelcast-member Tool @@ -1672,6 +1696,267 @@ map.addEntryListener(mapEventListener).then(function () { }); ``` +## 7.7. Distributed Query + +Hazelcast partitions your data and spreads it across cluster of members. You can iterate over the map entries and look for certain entries (specified by predicates) you are interested in. However, this is not very efficient because you will have to bring the entire entry set and iterate locally. Instead, Hazelcast allows you to run distributed queries on your distributed map. + +### 7.7.1. How Distributed Query Works + +1. The requested predicate is sent to each member in the cluster. +2. Each member looks at its own local entries and filters them according to the predicate. At this stage, key/value pairs of the entries are deserialized and then passed to the predicate. +3. The predicate requester merges all the results coming from each member into a single set. + +Distributed query is highly scalable. If you add new members to the cluster, the partition count for each member is reduced and thus the time spent by each member on iterating its entries is reduced. In addition, the pool of partition threads evaluates the entries concurrently in each member, and the network traffic is also reduced since only filtered data is sent to the requester. + +**Predicates Object Operators** + +The `Predicates` object offered by the client includes many operators for your query requirements. Some of them are explained below. + +- `equal`: Checks if the result of an expression is equal to a given value. + +- `notEqual`: Checks if the result of an expression is not equal to a given value. + +- `instanceOf`: Checks if the result of an expression has a certain type. + +- `like`: Checks if the result of an expression matches some string pattern. `%` (percentage sign) is the placeholder for many characters, `_` (underscore) is placeholder for only one character. + +- `greaterThan`: Checks if the result of an expression is greater than a certain value. + +- `greaterEqual`: Checks if the result of an expression is greater than or equal to a certain value. + +- `lessThan`: Checks if the result of an expression is less than a certain value. + +- `lessEqual`: Checks if the result of an expression is less than or equal to a certain value. + +- `between`: Checks if the result of an expression is between two values (this is inclusive). + +- `inPredicate`: Checks if the result of an expression is an element of a certain list. + +- `not`: Checks if the result of an expression is false. + +- `regex`: Checks if the result of an expression matches some regular expression. + +Hazelcast offers the following ways for distributed query purposes: + +- Combining Predicates with AND, OR, NOT + +- Distributed SQL Query + +#### 7.7.1.1. Employee Map Query Example + +Assume that you have an `employee` map containing values of `Employee` objects, as coded below. + +```javascript +function Employee(name, age, active, salary) { + this.name = name; + this.age = age; + this.active = active; + this.salary = salary; +} + +Employee.prototype.getClassId = function () { + return 1; +} + +Employee.prototype.getFactoryId = function () { + return 1; +} + +Employee.prototype.readData = function (objectDataInput) { + this.name = objectDataInput.readUTF(); + this.age = objectDataInput.readInt(); + this.active = objectDataInput.readBoolean(); + this.salary = objectDataInput.readDouble(); +} + +Employee.prototype.writeData = function (objectDataOutput) { + objectDataOutput.writeUTF(this.name); + objectDataOutput.writeInt(this.age); + objectDataOutput.writeBoolean(this.active); + objectDataOutput.writeDouble(this.salary); +} +``` + +Note that `Employee` is an `IdentifiedDataSerializable` object. If you just want to save the `Employee` objects as byte arrays on the map, you don't need to implement its equivalent on the server-side. However, if you want to query on the `employee` map, server needs the `Employee` objects rather than byte array formats. Therefore, you need to implement its Java equivalent and its data serializable factory on server side for server to reconstitute the objects from binary formats. After implementing the Java class and its factory, you need to add the factory to the data serializable factories or the portable factories by giving a factory `id`. Here is the example XML configuration of the server. + +```xml + + ... + + + + mypackage.MyIdentifiedFactory + + + + ... + +``` + +Note that before starting the server, you need to compile the `Employee` and `MyIdentifiedFactory` classes with server's `CLASSPATH` and add them to the `user-lib` folder in the extracted `hazelcast-.zip`. See [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). + +> **NOTE: You can also make this object `Portable` and implement its Java equivalent and its portable factory on the server side. Note that querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** + +#### 7.7.1.2. Querying by Combining Predicates with AND, OR, NOT + +You can combine predicates by using the `and`, `or`, and `not` operators, as shown in the below example. + +```javascript +var map; +client.getMap('employee').then(function (mp) { + map = mp; + var predicate = Predicates.and(Predicates.equal('active', true), Predicates.lessThan('age', 30)); + return map.valuesWithPredicate(predicate); +}).then(function (employees) { + // some operations +}); +``` + +In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than 30. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. + +> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast distributed map.** + +#### 7.7.1.3. Querying with SQL + +`SqlPredicate` takes the regular SQL `where` clause. Here is an example: + +```javascript +var map; +client.getMap('employee').then(function (mp) { + map = mp; + return map.valuesWithPredicate(new SqlPredicate('active AND age < 30')); +}).then(function (employees) { + // some operations +}); +``` + +##### Supported SQL Syntax + +**AND/OR:** ` AND AND …` + +- `active AND age > 30` +- `active = false OR age = 45 OR name = 'Joe'` +- `active AND ( age > 20 OR salary < 60000 )` + +**Equality:** `=, !=, <, ⇐, >, >=` + +- ` = value` +- `age <= 30` +- `name = 'Joe'` +- `salary != 50000` + +**BETWEEN:** ` [NOT] BETWEEN AND ` + +- `age BETWEEN 20 AND 33 ( same as age >= 20 AND age ⇐ 33 )` +- `age NOT BETWEEN 30 AND 40 ( same as age < 30 OR age > 40 )` + +**IN:** ` [NOT] IN (val1, val2,…)` + +- `age IN ( 20, 30, 40 )` +- `age NOT IN ( 60, 70 )` +- `active AND ( salary >= 50000 OR ( age NOT BETWEEN 20 AND 30 ) )` +- `age IN ( 20, 30, 40 ) AND salary BETWEEN ( 50000, 80000 )` + +**LIKE:** ` [NOT] LIKE 'expression'` + +The `%` (percentage sign) is placeholder for multiple characters, an `_` (underscore) is placeholder for only one character. + +- `name LIKE 'Jo%'` (true for 'Joe', 'Josh', 'Joseph' etc.) +- `name LIKE 'Jo_'` (true for 'Joe'; false for 'Josh') +- `name NOT LIKE 'Jo_'` (true for 'Josh'; false for 'Joe') +- `name LIKE 'J_s%'` (true for 'Josh', 'Joseph'; false 'John', 'Joe') + +**ILIKE:** ` [NOT] ILIKE 'expression'` + +Similar to LIKE predicate but in a case-insensitive manner. + +- `name ILIKE 'Jo%'` (true for 'Joe', 'joe', 'jOe','Josh','joSH', etc.) +- `name ILIKE 'Jo_'` (true for 'Joe' or 'jOE'; false for 'Josh') + +**REGEX:** ` [NOT] REGEX 'expression'` + +- `name REGEX 'abc-.*'` (true for 'abc-123'; false for 'abx-123') + +##### Querying Examples with Predicates + +You can use `__key` attribute to perform a predicated search for entry keys. Please see the following example: + +```javascript +var personMap; +client.getMap('persons').then(function (mp) { + personMap = mp; + return personMap.put('Ahmet', 28); +}).then(function () { + return personMap.put('Ali', 30); +}).then(function () { + return personMap.put('Furkan', 23); +}).then(function () { + var predicate = new Predicates.sql('__key like F%'); + return personMap.valuesWithPredicate(predicate); +}).then(function (startingWithA) { + console.log(startingWithA.get(0)); // 23 +}); +``` + +In this example, the code creates a list with the values whose keys start with the letter "F”. + +You can use `this` attribute to perform a predicated search for entry values. Please see the following example: + +```javascript +var personMap; +client.getMap('persons').then(function (mp) { + personMap = mp; + return personMap.put('Ahmet', 28); +}).then(function () { + return personMap.put('Ali', 30); +}).then(function () { + return personMap.put('Furkan', 23); +}).then(function () { + var predicate = new Predicates.greaterEqual('this', 27); + return personMap.valuesWithPredicate(predicate); +}).then(function (olderThan27) { + console.log(olderThan27.get(0), olderThan27.get(1)); // 28 30 +}); +``` + +In this example, the code creates a list with the values greater than or equal to "27". + +#### 7.7.1.4. Filtering with Paging Predicates + +The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values, or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. + +```javascript +var map; +hazelcastClient.getMap('students').then(function (mp) { + map = mp; + + var greaterEqual = Predicates.greaterEqual('age', 18); + var pagingPredicate = Predicates.paging(greaterEqual, 5); + +// Set page to retrieve third page + pagingPredicate.setPage(3); + + // Retrieve third page + return map.valuesWithPredicate(pagingPredicate) +}).then(function (values) { + // some operations +... + + // Set up next page + pagingPredicate.nextPage(); + + // Retrieve next page + return map.valuesWithPredicate(pagingPredicate); +}).then(function (values) { + // some operations +}); +``` + +If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing the Node.js version, you need to implement the Java equivalent of the comparator and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that `compare` function of the `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). + +Also, You can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the hundredth page, for example, it will get all 100 pages at once instead of reaching the hundredth page one by one using the `nextPage` function. + + # 8. Development and Testing Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or From 9ac4278cf6f2860a8ac605cf55a9333f138659ee Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 24 Oct 2018 17:58:51 +0300 Subject: [PATCH 167/685] fix Hazelcast Node.js Client to Hazelcast Node.js client (#388) --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 2e9fc29ac..ebd4d3b44 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ You can see the release notes for each Node.js client release on the [Releases]( # 1. Getting Started -This chapter explains all the necessary things to start using Hazelcast Node.js Client including basic Hazelcast IMDG and client +This chapter explains all the necessary things to start using Hazelcast Node.js client including basic Hazelcast IMDG and client configuration and how to use distributed maps with Hazelcast. ## 1.1. Requirements @@ -101,11 +101,11 @@ configuration and how to use distributed maps with Hazelcast. - Node.js 4 or newer - Java 6 or newer - Hazelcast IMDG 3.6 or newer -- Latest Hazelcast Node.js Client +- Latest Hazelcast Node.js client ## 1.2. Working with Hazelcast Clusters -Hazelcast Node.js Client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of the user data. +Hazelcast Node.js client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of the user data. Clients are a way to connect to IMDG cluster and access such data. IMDG cluster consists of one or more Hazelcast IMDG members. These members generally run on multiple virtual or physical machines @@ -115,7 +115,7 @@ any hardware or software problem causes a crash to any member, the data on that continues to operate without any downtime. Hazelcast clients are an easy way to connect to an IMDG cluster and perform tasks on distributed data structures that live on the cluster. -In order to use Hazelcast Node.js Client, we first need to setup an IMDG cluster. +In order to use Hazelcast Node.js client, we first need to setup an IMDG cluster. ### Setting Up an IMDG Cluster @@ -177,7 +177,7 @@ Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.or ## 1.3. Downloading and Installing -Hazelcast Node.js Client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. +Hazelcast Node.js client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. ``` npm install hazelcast-client --save ``` @@ -255,16 +255,16 @@ These configuration elements are enough for most connection scenarios. Now we wi ### 1.4.2. Hazelcast Client Configuration -There are two ways to configure a Hazelcast Node.js Client: +There are two ways to configure a Hazelcast Node.js client: * Programmatically * Declaratively (JSON) This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. Refer to [Configuration Overview](#configuration-overview) -and the following sections for information about detailed network configuration and/or additional features of Hazelcast Node.js Client +and the following sections for information about detailed network configuration and/or additional features of Hazelcast Node.js client configuration. -An easy way to configure your Hazelcast Node.js Client is to create a `Config` object and set the appropriate options. Then you can +An easy way to configure your Hazelcast Node.js client is to create a `Config` object and set the appropriate options. Then you can supply this object to your client at the startup. Another way to configure your client is to provide a `hazelcast-client.json` file. This approach is similar to `hazelcast.xml` approach in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas member configuration is XML based. Although these two formats are different, you will realize that the names of the configuration parameters are the same for both the client and member. @@ -286,7 +286,7 @@ Client.newHazelcastClient(cfg) **Declarative configuration** -Hazelcast Node.js Client looks for a `hazelcast-client.json` in the current working directory unless you provide a configuration object +Hazelcast Node.js client looks for a `hazelcast-client.json` in the current working directory unless you provide a configuration object at the startup. If you intend to configure your client using a configuration file, then place a `hazelcast-client.json` in the directory of your application's entry point. @@ -372,7 +372,7 @@ ClientInfo { uuid: '532e8479-2b86-47f9-a0fb-a2da13a8d584', localAddress: Address { host: '127.0.0.1', port: 51903, type: 4 } } ``` -Congratulations, you just started a Hazelcast Node.js Client. +Congratulations, you just started a Hazelcast Node.js client. **Using a Map** @@ -510,14 +510,14 @@ and how you should set paths and exported names for the client to load objects. ## 3.1. Configuration Options -You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). +You can configure Hazelcast Node.js client declaratively (JSON) or programmatically (API). * Programmatic configuration * Declarative configuration (JSON file) ### 3.1.1. Programmatic Configuration -For programmatic configuration of the Hazelcast Node.js Client, just instantiate a `ClientConfig` object and configure the +For programmatic configuration of the Hazelcast Node.js client, just instantiate a `ClientConfig` object and configure the desired aspects. An example is shown below. ```javascript @@ -682,7 +682,7 @@ However, `JSON Serialization` is not the best way of serialization in terms of p On top of all, if you want to use your own serialization type, you can use a [Custom Serialization](#3-custom-serialization). -> **NOTE: Hazelcast Node.js Client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, +> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** ## 4.1. IdentifiedDataSerializable Serialization @@ -973,7 +973,7 @@ config.serializationConfig.globalSerializer = new GlobalSerializer(); # 5. Setting Up Client Network -All network related configuration of Hazelcast Node.js Client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let’s first give the examples for these two approaches. Then we will look at its sub-elements and attributes. +All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let’s first give the examples for these two approaches. Then we will look at its sub-elements and attributes. ### Declarative Client Network Configuration @@ -1212,7 +1212,7 @@ To be able to connect to the provided IP addresses, you should use secure TLS/SS # 6. Securing Client Connection -This chapter describes the security features of Hazelcast Node.js Client. These include using TLS/SSL for connections between members and between clients and members and mutual authentication. These security features require **Hazelcast IMDG Enterprise** edition. +This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members and mutual authentication. These security features require **Hazelcast IMDG Enterprise** edition. ### 6.1. TLS/SSL @@ -1277,7 +1277,7 @@ Below subsections describe each way. **Using Built-in BasicSSLOptionsFactory** -Hazelcast Node.js Client includes a utility factory class that creates the necessary `options` object out of the supplied +Hazelcast Node.js client includes a utility factory class that creates the necessary `options` object out of the supplied properties. All you need to do is specifying your factory as `BasicSSLOptionsFactory` and provide the following options: - caPath @@ -1652,7 +1652,7 @@ Process finished with exit code 0 You can add event listeners to the Distributed Data Structures. -> **NOTE: Hazelcast Node.js Client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, +> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** #### 7.5.2.1. Listening for Map Events @@ -1971,7 +1971,7 @@ Follow the below steps to build and install Hazelcast Node.js client from its so 3. Run `npm run compile` to compile TypeScript files to JavaScript. At this point you have all the runnable code(`.js`) and type declarations(`.d.ts`) in `lib` directory. You may create a link to this module so that your local -applications can depend on your local copy of Hazelcast Node.js Client. In order to create a link, run: +applications can depend on your local copy of Hazelcast Node.js client. In order to create a link, run: - `npm link`. This will create a global link to this module in your computer. Whenever you need to depend on this module from another local project, run: @@ -1981,7 +1981,7 @@ If you are planning to contribute, please run the style checker, as shown below, - `npm run lint` ## 8.2. Testing -In order to test Hazelcast Node.js Client locally, you will need the following: +In order to test Hazelcast Node.js client locally, you will need the following: * Java 6 or newer * Maven From b1b699f06e3e383eeda7a3cbad74a069e61419f0 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 26 Oct 2018 15:27:47 +0300 Subject: [PATCH 168/685] add note about group password (#389) --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index ebd4d3b44..80fda83bb 100644 --- a/README.md +++ b/README.md @@ -305,12 +305,14 @@ names as explained in the previous section. If you did, then you need to make ce ### Group Settings **Programmatic:** + ```javascript let cfg = new Config.ClientConfig(); cfg.group.name = //group name of you cluster ``` **Declarative:** + ```json { "group": { @@ -319,17 +321,21 @@ cfg.group.name = //group name of you cluster } ``` +> **NOTE: If you have a Hazelcast release older than `3.11`, you need to provide also a group password along with the group name.** + ### Network Settings You need to provide the ip address and port of at least one member in your cluster so the client finds it. **Programmatic:** + ```javascript let cfg = new Config.ClientConfig(); cfg.network.addresses.push('some-ip-address:port'); ``` **Declarative:** + ```json { "network": { From e7c23f3997b956cda3b380d12f153ec7a07d21ca Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 26 Oct 2018 15:52:01 +0300 Subject: [PATCH 169/685] add EntryProcessor documentation (#384) * add EntryProcessor documentation * fix language in entry processor documentation --- README.md | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/README.md b/README.md index 80fda83bb..a29fe82c3 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,8 @@ * [7.5.1.3. Listening for Lifecycle Events](#7513-listening-for-lifecycle-events) * [7.5.2. Distributed Data Structure Events](#752-distributed-data-structure-events) * [7.5.2.1. Listening for Map Events](#7521-listening-for-map-events) + * [7.6. Distributed Computing](#76-distributed-computing) + * [7.6.1. Using EntryProcessor](#761-using-entryprocessor) * [7.7. Distributed Query](#77-distributed-query) * [7.7.1 How Distributed Query Works](#771-how-distributed-query-works) * [7.7.1.1. Employee Map Query Example](#7711-employee-map-query-example) @@ -1702,6 +1704,156 @@ map.addEntryListener(mapEventListener).then(function () { }); ``` +## 7.6. Distributed Computing + +This chapter explains Hazelcast’s entry processor implementation. + +### 7.6.1. Using EntryProcessor + +Hazelcast supports entry processing. An entry processor is a function that executes your code on a map entry in an atomic way. + +An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys-- executing `IMap.get(key)`, mutating the value, and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. + +If you are doing the process described above, you should consider using entry processors. An entry processor executes a read and updates upon the member where the data resides. This eliminates the costly network hops described above. + +> **NOTE: Entry processor is meant to process a single entry per call. Processing multiple entries and data structures in an entry processor is not supported as it may result in deadlocks on the server side.** + +Hazelcast sends the entry processor to each cluster member and these members apply it to the map entries. Therefore, if you add more members, your processing completes faster. + +#### Processing Entries + +The `IMap` interface provides the following functions for entry processing: + +- `executeOnKey` processes an entry mapped by a key. + +- `executeOnKeys` processes entries mapped by a list of keys. + +- `executeOnEntries` can process all entries in a map with a defined predicate. Predicate is optional. + +In the Node.js client, an `EntryProcessor` should be `IdentifiedDataSerializable` or `Portable` because the server should be able to deserialize it to process. + +The following is an example for `EntryProcessor` which is `IdentifiedDataSerializable`. + +```javascript +function IdentifiedEntryProcessor(value) { + this.value = value; +} + +IdentifiedEntryProcessor.prototype.readData = function (inp) { + this.value = inp.readUTF(); +}; + +IdentifiedEntryProcessor.prototype.writeData = function (outp) { + outp.writeUTF(this.value); +}; + +IdentifiedEntryProcessor.prototype.getFactoryId = function () { + return 5; +}; + +IdentifiedEntryProcessor.prototype.getClassId = function () { + return 1; +}; +``` + +Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, please see [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). + +The following is an example code which can be the Java equivalent of entry processor in Node.js client: + +```java +import com.hazelcast.map.AbstractEntryProcessor; +import com.hazelcast.nio.ObjectDataInput; +import com.hazelcast.nio.ObjectDataOutput; +import com.hazelcast.nio.serialization.IdentifiedDataSerializable; +import java.io.IOException; +import java.util.Map; + +public class IdentifiedEntryProcessor extends AbstractEntryProcessor implements IdentifiedDataSerializable { + static final int CLASS_ID = 1; + private String value; + + public IdentifiedEntryProcessor() { + } + + @Override + public int getFactoryId() { + return IdentifiedFactory.FACTORY_ID; + } + + @Override + public int getId() { + return CLASS_ID; + } + + @Override + public void writeData(ObjectDataOutput out) throws IOException { + out.writeUTF(value); + } + + @Override + public void readData(ObjectDataInput in) throws IOException { + value = in.readUTF(); + } + + @Override + public Object process(Map.Entry entry) { + entry.setValue(value); + return value; + } +} +``` + +You can implement the above processor’s factory as follows: + +```java +import com.hazelcast.nio.serialization.DataSerializableFactory; +import com.hazelcast.nio.serialization.IdentifiedDataSerializable; + +public class IdentifiedFactory implements DataSerializableFactory { + public static final int FACTORY_ID = 5; + + @Override + public IdentifiedDataSerializable create(int typeId) { + if (typeId == IdentifiedEntryProcessor.CLASS_ID) { + return new IdentifiedEntryProcessor(); + } + return null; + } +} +``` + +Note that you need to configure the `hazelcast.xml` to add your factory. And the following is the configuration for the above factory: + +```xml + + + + + IdentifiedFactory + + + + +``` + +The code that runs on the entries is implemented in Java on the server side. Client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, please see [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. + +After all implementation and starting the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. Let's take a look at the following example. + +```javascript +var map; +hazelcastClient.getMap('my-distributed-map').then(function (mp) { + map = mp; + return map.put('key', 'not-processed'); +}).then(function () { + return map.executeOnKey('key', new IdentifiedEntryProcessor('processed')); +}).then(function () { + return map.get('key'); +}).then(function (value) { + console.log(value); // processed +}); +``` + ## 7.7. Distributed Query Hazelcast partitions your data and spreads it across cluster of members. You can iterate over the map entries and look for certain entries (specified by predicates) you are interested in. However, this is not very efficient because you will have to bring the entire entry set and iterate locally. Instead, Hazelcast allows you to run distributed queries on your distributed map. From 767b5e5b9c3862627966192cd51d87937ba4e699 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 26 Oct 2018 16:02:56 +0300 Subject: [PATCH 170/685] some fixes on documentation (#390) --- README.md | 7 +++---- code_samples/org-website/GlobalSerializerSample.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a29fe82c3..bf7986117 100644 --- a/README.md +++ b/README.md @@ -266,7 +266,7 @@ This section describes some network configuration settings to cover common use c and the following sections for information about detailed network configuration and/or additional features of Hazelcast Node.js client configuration. -An easy way to configure your Hazelcast Node.js client is to create a `Config` object and set the appropriate options. Then you can +An easy way to configure your Hazelcast Node.js client is to create a `ClientConfig` object and set the appropriate options. Then you can supply this object to your client at the startup. Another way to configure your client is to provide a `hazelcast-client.json` file. This approach is similar to `hazelcast.xml` approach in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas member configuration is XML based. Although these two formats are different, you will realize that the names of the configuration parameters are the same for both the client and member. @@ -530,7 +530,6 @@ desired aspects. An example is shown below. ```javascript var Config = require('hazelcast-client').Config; -var Address = require('hazelcast-client').Address; var cfg = new Config.ClientConfig(); cfg.networkConfig.addresses.push('127.0.0.1:5701'); return HazelcastClient.newHazelcastClient(cfg); @@ -948,11 +947,11 @@ GlobalSerializer.prototype.getId = function () { }; GlobalSerializer.prototype.write = function (objectDataOutput, object) { - objectDataOutput.write(SomeThirdPartySerializer.serialize(object)) + objectDataOutput.writeByteArray(SomeThirdPartySerializer.serialize(object)) }; GlobalSerializer.prototype.read = function (objectDataInput) { - return SomeThirdPartySerializer.deserialize(objectDataInput); + return SomeThirdPartySerializer.deserialize(objectDataInput.readByteArray()); }; ``` diff --git a/code_samples/org-website/GlobalSerializerSample.js b/code_samples/org-website/GlobalSerializerSample.js index 56c8a34da..eced67cc3 100644 --- a/code_samples/org-website/GlobalSerializerSample.js +++ b/code_samples/org-website/GlobalSerializerSample.js @@ -11,11 +11,11 @@ GlobalSerializer.prototype.getId = function () { }; GlobalSerializer.prototype.read = function (input) { - // return MyFavoriteSerializer.deserialize(input); + // return MyFavoriteSerializer.deserialize(input.readByteArray()); }; GlobalSerializer.prototype.write = function (output, obj) { - // output.write(MyFavoriteSerializer.serialize(obj)) + // output.writeByteArray(MyFavoriteSerializer.serialize(obj)) }; cfg.serializationConfig.globalSerializer = new GlobalSerializer(); From 756cd5b956cfa56b22ab8e081b9b85ce060bc733 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Tue, 30 Oct 2018 15:08:03 +0300 Subject: [PATCH 171/685] add usages of data structures to documentation (#378) * add usages of data structures to documentation * add brief explanations and give links to reference manual --- README.md | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 189 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bf7986117..7654db3b2 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,17 @@ * [7.4. Using Distributed Data Structures](#74-using-distributed-data-structures) * [7.4.1. Using Map](#741-using-map) * [7.4.2. Using MultiMap](#742-using-multimap) - * [7.4.3. Using ReplicatedMap](#743-using-replicatedmap) + * [7.4.3. Using Replicated Map](#743-using-replicated-map) * [7.4.4. Using Queue](#744-using-queue) + * [7.4.5. Using Set](#745-using-set) + * [7.4.6. Using List](#746-using-list) + * [7.4.7. Using Ringbuffer](#747-using-ringbuffer) + * [7.4.8. Using Reliable Topic](#748-using-reliable-topic) + * [7.4.9. Using Lock](#749-using-lock) + * [7.4.10. Using Atomic Long](#7410-using-atomic-long) + * [7.4.11. Using Semaphore](#7411-using-semaphore) + * [7.4.12. Using PN Counter](#7412-using-pn-counter) + * [7.4.13. Using Flake ID Generator](#7413-using-flake-id-generator) * [7.5. Distributed Events](#75-distributed-events) * [7.5.1. Cluster Events](#751-cluster-events) * [7.5.1.1. Listening for Member Events](#7511-listening-for-member-events) @@ -1485,6 +1494,8 @@ Most of the Distributed Data Structures are supported by the Node.js client. In ### 7.4.1. Using Map +Hazelcast Map (`IMap`) is a distributed map. Through Node.js client, you can perform operations like reading and writing from/to a Hazelcast Map with the well known get and put methods. For details refer to [Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#map) in the Hazelcast IMDG Reference Manual. + A Map usage example is shown below. ```javascript @@ -1500,6 +1511,8 @@ map.put(1, 'Furkan').then(function (oldValue) { ### 7.4.2. Using MultiMap +Hazelcast `MultiMap` is a distributed and specialized map where you can store multiple values under a single key. For details refer to [MultiMap section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#multimap) in the Hazelcast IMDG Reference Manual. + A MultiMap usage example is shown below. ```javascript @@ -1514,9 +1527,11 @@ multiMap.put(1, 'Furkan').then(function () { }); ``` -### 7.4.3. Using ReplicatedMap +### 7.4.3. Using Replicated Map + +Hazelcast `ReplicatedMap` is a distributed key-value data structure where the data is replicated to all members in the cluster. It provides full replication of entries to all members for high speed access. For details refer to [Replicated Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#replicated-map) in the Hazelcast IMDG Reference Manual. -A ReplicatedMap usage example is shown below. +A Replicated Map usage example is shown below. ```javascript var replicatedMap = client.getReplicatedMap('myReplicatedMap'); @@ -1532,6 +1547,8 @@ replicatedMap.put(1, 'Furkan').then(function () { ### 7.4.4. Using Queue +Hazelcast Queue(`IQueue`) is a distributed queue which enables all cluster members to interact with it. For details refer to [Queue section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#queue) in the Hazelcast IMDG Reference Manual. + A Queue usage example is shown below. ```javascript @@ -1544,6 +1561,174 @@ queue.offer('Furkan').then(function () { }); ``` +## 7.4.5. Using Set + +Hazelcast Set(`ISet`) is a distributed set which does not allow duplicate elements. For details refer to [Set section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#set) in the Hazelcast IMDG Reference Manual. + +A Set usage example is shown below. + +```javascript +var set; +hazelcastClient.getSet('mySet').then(function (s) { + set = s; + return set.add('Furkan'); +}).then(function () { + return set.contains('Furkan'); +}).then(function (val) { + console.log(val); // true +}); +``` + +## 7.4.6. Using List + +Hazelcast List(`IList`) is distributed list which allows duplicate elements and preserves the order of elements. For details refer to [List section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#list) in the Hazelcast IMDG Reference Manual. + +A List usage example is shown below. + +```javascript +var list; +hazelcastClient.getList('myList').then(function (l) { + list = l; + return list.add('Muhammet Ali'); +}).then(function () { + return list.add('Ahmet'); +}).then(function () { + return list.add('Furkan'); +}).then(function () { + return list.size(); +}).then(function (size) { + console.log(size); // 3 +}); +``` + +## 7.4.7. Using Ringbuffer + +Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that stores its data in a ring-like structure. You can think of it as a circular array with a given capacity. Each Ringbuffer has a tail and a head. The tail is where the items are added and the head is where the items are overwritten or expired. You can reach each element in a Ringbuffer using a sequence ID, which is mapped to the elements between the head and tail (inclusive) of the Ringbuffer. For details refer to [Ringbuffer section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#ringbuffer) in the Hazelcast IMDG Reference Manual. + +A Ringbuffer usage example is shown below. + +```javascript +var ringbuffer; +hazelcastClient.getRingbuffer('myRingbuffer').then(function (buffer) { + ringbuffer = buffer; + return ringbuffer.addAll(['Muhammet Ali', 'Ahmet', 'Furkan']); +}).then(function () { + return Promise.all([ + ringbuffer.readOne(0), ringbuffer.readOne(1), ringbuffer.readOne(2) + ]); +}).then(function (brothers) { + console.log(brothers); // [ 'Muhammet Ali', 'Ahmet', 'Furkan' ] +}); +``` + +## 7.4.8. Using Reliable Topic + +Hazelcast `ReliableTopic` is a distributed topic implementation backed up by the `Ringbuffer` data structure. For details refer to [Reliable Topic section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#reliable-topic) in the Hazelcast IMDG Reference Manual. + +A Reliable Topic usage example is shown below. + +```javascript +var topic; +hazelcastClient.getReliableTopic('myReliableTopic').then(function (t) { + topic = t; + topic.addMessageListener(function (message) { + console.log(message.messageObject); + }); + return topic.publish('Hello to distributed world!'); +}); +``` + +## 7.4.9 Using Lock + +Hazelcast Lock(`ILock`) is a distributed lock implementation. You can synchronize Hazelcast members and clients using a Lock. For details refer to [Lock section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#lock) in the Hazelcast IMDG Reference Manual. + +A Lock usage example is shown below. + +```javascript +var lock; +hazelcastClient.getLock('myLock').then(function (l) { + lock = l; + return lock.lock(); +}).then(function () { + // cluster wide critical section +}).finally(function () { + return lock.unlock(); +}); +``` + +## 7.4.10 Using Atomic Long + +Hazelcast Atomic Long(`IAtomicLong`) is the distributed long which offers most of the operations such as `get`, `set`, `getAndSet`, `compareAndSet` and `incrementAndGet`. For details refer to [Atomic Long section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#iatomiclong) in the Hazelcast IMDG Reference Manual. + +An Atomic Long usage example is shown below. + +```javascript +var atomicLong; +hazelcastClient.getAtomicLong('myAtomicLong').then(function (counter) { + atomicLong = counter; + return atomicLong.addAndGet(3); +}).then(function (value) { + return atomicLong.get(); +}).then(function (value) { + console.log('counter: ' + value); // counter: 3 +}); +``` + +## 7.4.11 Using Semaphore + +Hazelcast Semaphore(`ISemaphore`) is a distributed semaphore implementation. For details refer to [Semaphore section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#isemaphore) in the Hazelcast IMDG Reference Manual. + +A Semaphore usage example is shown below. + +```javascript +var semaphore; +hazelcastClient.getSemaphore('mySemaphore').then(function (s) { + semaphore = s; + return semaphore.init(10); +}).then(function () { + return semaphore.acquire(5); +}).then(function () { + return semaphore.availablePermits(); +}).then(function (res) { + console.log(res); // 5 +}); +``` + +## 7.4.12 Using PN Counter + +Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative counter implementation. It is an eventually consistent counter given there is no member failure. For details refer to [PN Counter section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#pn-counter) in the Hazelcast IMDG Reference Manual. + +A PN Counter usage example is shown below. + +```javascript +var pnCounter; +hazelcastClient.getPNCounter('myPNCounter').then(function (counter) { + pnCounter = counter; + return pnCounter.addAndGet(5); +}).then(function (value) { + console.log(value); // 5 + return pnCounter.decrementAndGet(); +}).then(function (value) { + console.log(value); // 4 +}); +``` + +## 7.4.13 Using Flake ID Generator + +Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers. Generated identifiers are long primitive values and are k-ordered (roughly ordered). IDs are in the range from 0 to `2^63-1 (maximum signed long value)`. For details refer to [FlakeIdGenerator section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#flakeidgenerator) in the Hazelcast IMDG Reference Manual. + +A Flake ID Generator usage example is shown below. + +```javascript +var flakeIdGenerator; +hazelcastClient.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { + flakeIdGenerator = gen; + return flakeIdGenerator.newId(); +}).then(function (value) { + console.log('New id: ' + value.toString()); +}); +``` + ## 7.5. Distributed Events @@ -1693,7 +1878,7 @@ var mapEventListener = { } }; map.addEntryListener(mapEventListener).then(function () { - return map.put('1', 'Mali'); + return map.put('1', 'Muhammet Ali'); }).then(function () { return map.put('2', 'Ahmet'); }).then(function () { From 00039f1fc07365ca1370b64f0a4b546bf8784dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Fri, 26 Oct 2018 16:44:55 +0300 Subject: [PATCH 172/685] add fast-aggregations documentation --- README.md | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7654db3b2..d83020fe2 100644 --- a/README.md +++ b/README.md @@ -70,11 +70,12 @@ * [7.6. Distributed Computing](#76-distributed-computing) * [7.6.1. Using EntryProcessor](#761-using-entryprocessor) * [7.7. Distributed Query](#77-distributed-query) - * [7.7.1 How Distributed Query Works](#771-how-distributed-query-works) + * [7.7.1. How Distributed Query Works](#771-how-distributed-query-works) * [7.7.1.1. Employee Map Query Example](#7711-employee-map-query-example) * [7.7.1.2. Querying by Combining Predicates with AND, OR, NOT](#7712-querying-by-combining-predicates-with-and-or-not) * [7.7.1.3. Querying with SQL](#7713-querying-with-sql) * [7.7.1.4. Filtering with Paging Predicates](#7714-filtering-with-paging-predicates) + * [7.7.2. Fast-Aggregations](#772-fast-aggregations) * [8. Development and Testing](#8-development-and-testing) * [8.1. Building and Using Client From Sources](#81-building-and-using-client-from-sources) * [8.2. Testing](#82-testing) @@ -2298,6 +2299,51 @@ If you want to sort the result before paging, you need to specify a comparator o Also, You can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the hundredth page, for example, it will get all 100 pages at once instead of reaching the hundredth page one by one using the `nextPage` function. +### 7.7.2. Fast-Aggregations + +Fast-Aggregations provides some aggregate functions (such as sum, average, max, min) on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. + +The `Aggregators` object provides a wide variety of built-in aggregators. The full list is presented below: + +- count +- doubleAvg +- doubleSum +- numberAvg +- fixedPointSum +- floatingPointSum +- max +- min +- integerAvg +- integerSum +- longAvg +- longSum + +You can use these aggregators with the `IMap.aggregate()` and `IMap.aggregateWithPredicate()` functions. + +Let's look at the following example. + +```javascript +var map; +hazelcastClient.getMap('brothersMap').then(function (mp) { + map = mp; + return map.putAll([ + ['Muhammet Ali', 30], + ['Ahmet', 27], + ['Furkan', 23], + ]); +}).then(function () { + return map.aggregate(Aggregators.count()); +}).then(function (count) { + console.log('There are ' + count + ' brothers.'); // There are 3 brothers. + return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); +}).then(function (count) { + console.log('There are ' + count + ' brothers older than 25.'); // There are 2 brothers older than 25. + return map.aggregate(Aggregators.numberAvg()); +}).then(function (avgAge) { + console.log('Average age is ' + avgAge); // Average age is 26.666666666666668 +}); +``` + # 8. Development and Testing From 00e99f62f14cc18a14910f3652d1d80933e58d07 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Tue, 30 Oct 2018 17:26:29 +0300 Subject: [PATCH 173/685] Started to copyedit the document. --- README.md | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index d83020fe2..ae94830b3 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,15 @@ * [Introduction](#introduction) * [1. Getting Started](#1-getting-started) * [1.1. Requirements](#11-requirements) - * [1.2. Working with Hazelcast Clusters](#12-working-with-hazelcast-clusters) + * [1.2. Working with Hazelcast IMDG Clusters](#12-working-with-hazelcast-imdg-clusters) + * [1.2.1. Setting Up a Hazelcast IMDG Cluster](#121-setting-up-a-hazelcast-imdg-cluster) + * [1.2.2. Running Standalone Jars](#122-running-standalone-jars) + * [1.2.3. Adding User Library to CLASSPATH](#123-adding-user-library-to-classpath) + * [1.2.4. Using hazelcast-member Tool](#124-using-hazelcast-member-tool) * [1.3. Downloading and Installing](#13-downloading-and-installing) * [1.4. Basic Configuration](#14-basic-configuration) - * [1.4.1. IMDG Configuration](#141-imdg-configuration) - * [1.4.2. Hazelcast Client Configuration](#142-hazelcast-client-configuration) + * [1.4.1. Configuring Hazelcast IMDG](#141-configuring-hazelcast-imdg) + * [1.4.2. Configuring Hazelcast Node.js Client](#142-configuring-hazelcast-nodejs-client) * [1.5. Basic Usage](#15-basic-usage) * [1.6. Code Samples](#16-code-samples) * [2. Features](#2-features) @@ -99,13 +103,12 @@ See the following for more information on Node.js and Hazelcast IMDG: ### Release Notes -You can see the release notes for each Node.js client release on the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page of this repository. +See the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page of this repository. # 1. Getting Started -This chapter explains all the necessary things to start using Hazelcast Node.js client including basic Hazelcast IMDG and client -configuration and how to use distributed maps with Hazelcast. +This chapter provides information on how to get started with your Hazelcast Node.js client. It outlines the requirements, installation and configuration of the client, setting up a cluster, and provides a simple application that uses a distributed map in Node.js client. ## 1.1. Requirements @@ -115,27 +118,27 @@ configuration and how to use distributed maps with Hazelcast. - Hazelcast IMDG 3.6 or newer - Latest Hazelcast Node.js client -## 1.2. Working with Hazelcast Clusters +## 1.2. Working with Hazelcast IMDG Clusters -Hazelcast Node.js client requires a working Hazelcast IMDG cluster to run. IMDG cluster handles storage and manipulation of the user data. -Clients are a way to connect to IMDG cluster and access such data. +Hazelcast Node.js client requires a working Hazelcast IMDG cluster to run. This cluster handles storage and manipulation of the user data. +Clients are a way to connect to the Hazelcast IMDG cluster and access such data. -IMDG cluster consists of one or more Hazelcast IMDG members. These members generally run on multiple virtual or physical machines +Hazelcast IMDG cluster consists of one or more cluster members. These members generally run on multiple virtual or physical machines and are connected to each other via network. Any data put on the cluster is partitioned to multiple members transparent to the user. -It is therefore very easy to scale the system by adding new members as the data grows. IMDG cluster also offers resilience. Should +It is therefore very easy to scale the system by adding new members as the data grows. Hazelcast IMDG cluster also offers resilience. Should any hardware or software problem causes a crash to any member, the data on that member is recovered from backups and the cluster -continues to operate without any downtime. Hazelcast clients are an easy way to connect to an IMDG cluster and perform tasks on +continues to operate without any downtime. Hazelcast clients are an easy way to connect to a Hazelcast IMDG cluster and perform tasks on distributed data structures that live on the cluster. -In order to use Hazelcast Node.js client, we first need to setup an IMDG cluster. +In order to use Hazelcast Node.js client, we first need to setup a Hazelcast IMDG cluster. -### Setting Up an IMDG Cluster +### 1.2.1. Setting Up a Hazelcast IMDG Cluster There are multiple ways of starting an IMDG cluster easily. You can run standalone IMDG members by downloading and running jar files from the website. You can embed IMDG members to your Java projects. The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) if you have brew installed in your computer. We are going to download jars from the website and run a standalone member for this guide. -#### Running Standalone Jars +#### 1.2.2. Running Standalone Jars Go to https://hazelcast.org/download/ and download `.zip` or `.tar` distribution of Hazelcast IMDG. Decompress the contents into any directory that you want to run IMDG members from. Change into the directory that you decompressed the Hazelcast content. Go into `bin` directory. Use either @@ -152,7 +155,7 @@ Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED ``` -#### Adding User Library to CLASSPATH +#### 1.2.3. Adding User Library to CLASSPATH When you want to use features such as querying and language interoperability, you might need to add your own Java classes to Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to `user-lib` folder in the extracted `hazelcast-.zip`. Then, you can start your Hazelcast member by using the start scripts in the `bin` folder. The start scripts will automatically add your compiled classes to the `CLASSPATH`. Note that if you are adding an `IdentifiedDataSerializable` or a `Portable` class, you need to add its factory too. Then, you should configure the factory in the `hazelcast.xml` in the `bin` folder like the following: @@ -171,7 +174,7 @@ INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED ``` Similarly, use `` instead of `` if you are using portables. -#### Using hazelcast-member Tool +#### 1.2.4. Using hazelcast-member Tool `hazelcast-member` is a tool to make downloading and running IMDG members as easy as it could be. If you have brew installed, run the following commands: ``` @@ -206,7 +209,7 @@ It discusses some member side configuration options to ease understanding Hazelc regarding cluster connection are discussed. Configuration material regarding data structures are discussed in the following sections. You can refer to [IMDG Documentation](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview](#configuration-overview) for more information. -### 1.4.1. IMDG Configuration +### 1.4.1. Configuring Hazelcast IMDG Hazelcast IMDG aims to run out of the box for most common scenarios. However if you have limitations on your network such as multicast being disabled, you may have to configure your Hazelcast IMDG instances so that they can find each other on the network. Also most data structures are configurable. @@ -265,7 +268,7 @@ purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. These configuration elements are enough for most connection scenarios. Now we will move onto configuration of the Node.js client. -### 1.4.2. Hazelcast Client Configuration +### 1.4.2. Configuring Hazelcast Node.js Client There are two ways to configure a Hazelcast Node.js client: From 0507d46b88e797a4b9a280a000f4116e42390413 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Thu, 1 Nov 2018 10:17:21 +0300 Subject: [PATCH 174/685] export EvictionPolicy (#393) --- code_samples/near_cache.js | 2 ++ src/index.ts | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/code_samples/near_cache.js b/code_samples/near_cache.js index 0f30d50ff..388d5dc3d 100644 --- a/code_samples/near_cache.js +++ b/code_samples/near_cache.js @@ -1,5 +1,6 @@ var Client = require('hazelcast-client').Client; var Config = require('hazelcast-client').Config; +var EvictionPolicy = require('hazelcast-client').EvictionPolicy; var nearCachedMapName = 'nearCachedMap'; var regularMapName = 'reqularMap'; @@ -8,6 +9,7 @@ var client; var cfg = new Config.ClientConfig(); var nearCacheConfig = new Config.NearCacheConfig(); nearCacheConfig.name = nearCachedMapName; +nearCacheConfig.evictionPolicy = EvictionPolicy.LFU; nearCacheConfig.invalidateOnChange = true; cfg.nearCacheConfigs[nearCachedMapName] = nearCacheConfig; diff --git a/src/index.ts b/src/index.ts index 90f513734..c30b112ed 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,6 +30,8 @@ import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; import {ClassDefinitionBuilder} from './serialization/portable/ClassDefinitionBuilder'; import {ClassDefinition, FieldDefinition} from './serialization/portable/ClassDefinition'; import {MemberAttributeEvent, MemberAttributeOperationType} from './core/MemberAttributeEvent'; +import {EvictionPolicy} from './config/EvictionPolicy'; +import {InMemoryFormat} from './config/InMemoryFormat'; export { HazelcastClient as Client, @@ -50,4 +52,6 @@ export { ClassDefinitionBuilder, MemberAttributeEvent, MemberAttributeOperationType, + EvictionPolicy, + InMemoryFormat, }; From 7b393858e2d552590020b5eaaa3e7f3962e81806 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Thu, 1 Nov 2018 10:58:39 +0300 Subject: [PATCH 175/685] Copyedited Chapter 1. --- README.md | 149 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 93 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index ae94830b3..3551fbeb4 100644 --- a/README.md +++ b/README.md @@ -134,16 +134,25 @@ In order to use Hazelcast Node.js client, we first need to setup a Hazelcast IMD ### 1.2.1. Setting Up a Hazelcast IMDG Cluster -There are multiple ways of starting an IMDG cluster easily. You can run standalone IMDG members by downloading and running jar files -from the website. You can embed IMDG members to your Java projects. The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) -if you have brew installed in your computer. We are going to download jars from the website and run a standalone member for this guide. +There are following options to start a Hazelcast IMDG cluster easily: -#### 1.2.2. Running Standalone Jars +* You can run standalone members by downloading and running JAR files from the website. +* You can embed members to your Java projects. The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) if you have brew installed in your computer. + +We are going to download JARs from the website and run a standalone member for this guide. + +#### 1.2.2. Running Standalone JARs + +Follow the instructions below to create a Hazelcast IMDG cluster: + +1. Go to Hazelcast's download [page](https://hazelcast.org/download/) and download either the `.zip` or `.tar` distribution of Hazelcast IMDG. +2. Decompress the contents into any directory that you +want to run members from. +3. Change into the directory that you decompressed the Hazelcast content and then into the `bin` directory. +4. Use either `start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see the Hazelcast IMDG logs in the terminal. + +You should see a log similar to the following, which means that your 1-member cluster is ready to be used: -Go to https://hazelcast.org/download/ and download `.zip` or `.tar` distribution of Hazelcast IMDG. Decompress the contents into any directory that you -want to run IMDG members from. Change into the directory that you decompressed the Hazelcast content. Go into `bin` directory. Use either -`start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see IMDG logs on the terminal. -Once you see some log similar to the following, your 1-member cluster is ready to use: ``` INFO: [192.168.0.3]:5701 [dev] [3.10.4] @@ -157,9 +166,13 @@ INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED #### 1.2.3. Adding User Library to CLASSPATH - When you want to use features such as querying and language interoperability, you might need to add your own Java classes to Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to `user-lib` folder in the extracted `hazelcast-.zip`. Then, you can start your Hazelcast member by using the start scripts in the `bin` folder. The start scripts will automatically add your compiled classes to the `CLASSPATH`. - Note that if you are adding an `IdentifiedDataSerializable` or a `Portable` class, you need to add its factory too. Then, you should configure the factory in the `hazelcast.xml` in the `bin` folder like the following: - ```xml +When you want to use features such as querying and language interoperability, you might need to add your own Java classes to the Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). Then, you can start your Hazelcast member by using the start scripts in the `bin` directory. The start scripts will automatically add your compiled classes to the `CLASSPATH`. + +Note that if you are adding an `IdentifiedDataSerializable` or a `Portable` class, you need to add its factory too. Then, you should configure the factory in the `hazelcast.xml` configuration file. This file resides in the `bin` directory where you extracted the `hazelcast-.zip` (or `tar`). + +The following is an example configuration when you are adding an `IdentifiedDataSerializable` class: + +```xml ... @@ -172,54 +185,69 @@ INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED ... ``` -Similarly, use `` instead of `` if you are using portables. +If you want to add a `Portable` class, you should use `` instead of `` in the above configuration. #### 1.2.4. Using hazelcast-member Tool -`hazelcast-member` is a tool to make downloading and running IMDG members as easy as it could be. If you have brew installed, run the following commands: +`hazelcast-member` is a tool to download and run Hazelcast IMDG members easily. If you have brew installed, run the following commands to instal this tool: + ``` brew tap hazelcast/homebrew-hazelcast brew install hazelcast-member +``` + +Now, you can start a member by running the following command: + +``` hazelcast-member start ``` -In order to stop the member, run the following command: + +To stop a member, run the following command: + ``` hazelcast-member stop ``` -Find more information about `hazelcast-member` tool at https://github.com/hazelcast/hazelcast-member-tool -Refer to the official [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#getting-started) for more information regarding starting clusters. +You can find more information about the `hazelcast-member` tool at its GitHub [repo](https://github.com/hazelcast/hazelcast-member-tool). + +See the [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#getting-started) for more information on setting up the clusters. ## 1.3. Downloading and Installing Hazelcast Node.js client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. + ``` npm install hazelcast-client --save ``` ## 1.4. Basic Configuration -If you are using Hazelcast IMDG and Node.js Client on the same computer, generally default configuration just works. This is great for +If you are using Hazelcast IMDG and Node.js Client on the same computer, generally the default configuration should be fine. This is great for trying out the client. However, if you run the client on a different computer than any of the cluster members, you may -need to do some simple configuration such as specifying the member addresses. +need to do some simple configurations such as specifying the member addresses. + +The Hazelcast IMDG members and clients have their own configuration options. You may need to reflect some of the member side configurations on the client side to properly connect to the cluster. -The IMDG members and clients have their own configuration options. You may need to reflect some of the member side configurations on the client side to properly connect to the cluster. This section describes the most common configuration elements to get you started in no time. -It discusses some member side configuration options to ease understanding Hazelcast's ecosystem. Then, client side configuration options -regarding cluster connection are discussed. Configuration material regarding data structures are discussed in the following sections. -You can refer to [IMDG Documentation](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview](#configuration-overview) for more information. +It discusses some member side configuration options to ease the understanding of Hazelcast's ecosystem. Then, the client side configuration options +regarding the cluster connection are discussed. The configurations for the Hazelcast IMDG data structures that can be used in the Node.js client are discussed in the following sections. + +See the [Hazelcast IMDG Reference Manual](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview section](#configuration-overview) for more information. ### 1.4.1. Configuring Hazelcast IMDG -Hazelcast IMDG aims to run out of the box for most common scenarios. However if you have limitations on your network such as multicast being disabled, -you may have to configure your Hazelcast IMDG instances so that they can find each other on the network. Also most data structures are configurable. -Therefore, you may want to configure your Hazelcast IMDG. We will show you the basics about network configuration here. +Hazelcast IMDG aims to run out-of-the-box for most common scenarios. However if you have limitations on your network such as multicast being disabled, +you may have to configure your Hazelcast IMDG members so that they can find each other on the network. Also, since most of the distributed data structures are configurable, you may want to configure them according to your needs. We will show you the basics about network configuration here. -There are two ways to configure Hazelcast IMDG. One is to use a `hazelcast.xml` file and the other is to programmatically configure the -instance before starting it from Java code. Since we use standalone servers, we will use `hazelcast.xml` to configure our cluster members. +There are two ways to configure Hazelcast IMDG: + +* Using the `hazelcast.xml` configuration file. +* Programmatically configuring the member before starting it from the Java code. + +Since we use standalone servers, we will use the `hazelcast.xml` file to configure our cluster members. + +When you download and unzip `hazelcast-.zip` (or `tar`), you see the `hazelcast.xml` in the `bin` directory. When a Hazelcast member starts, it looks for the `hazelcast.xml` file to load the configuration from. A sample `hazelcast.xml` is shown below. -When you download and unzip `hazelcast-.zip`, you see the `hazelcast.xml` in `bin` folder. When a Hazelcast member starts, it looks for -`hazelcast.xml` file to load configuration from. A sample `hazelcast.xml` is below. We will go over some important elements in the rest of this section. ```xml @@ -249,14 +277,16 @@ When you download and unzip `hazelcast-.zip`, you see the `hazelcast.xm ``` -- ``: Specifies which cluster this member belongs to. A member connects only to other members that are in the same group as -itself. You will see `` and `` tags with some pre-configured values. You may give your clusters different names so that they can +We will go over some important configuration elements in the rest of this section. + +- ``: Specifies which cluster this member belongs to. A member connects only to the other members that are in the same group as +itself. As shown in the above configuration sample, there are `` and `` tags under the `` element with some pre-configured values. You may give your clusters different names so that they can live in the same network without disturbing each other. Note that the cluster name should be the same across all members and clients that belong - to the same cluster. `` tag is not in use since Hazelcast 3.9. It is there for backward compatibility + to the same cluster. The `` tag is not in use since Hazelcast 3.9. It is there for backward compatibility purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. - `` - - ``: Specifies the port number to be used by the member when it starts. Its default value is 5701 You can specify another port number, and if - you set `auto-increment` to `true`, then Hazelcast will try subsequent ports until it finds an available port or `port-count` is reached. + - ``: Specifies the port number to be used by the member when it starts. Its default value is 5701. You can specify another port number, and if + you set `auto-increment` to `true`, then Hazelcast will try the subsequent ports until it finds an available port or the `port-count` is reached. - ``: Specifies the strategies to be used by the member to find other cluster members. Choose which strategy you want to use by setting its `enabled` attribute to `true` and the others to `false`. - ``: Members find each other by sending multicast requests to the specified address and port. It is very useful if IP addresses @@ -266,7 +296,7 @@ purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. putting multiple known member addresses there to avoid disconnectivity should one of the members in the list is unavailable at the time of connection. -These configuration elements are enough for most connection scenarios. Now we will move onto configuration of the Node.js client. +These configuration elements are enough for most connection scenarios. Now we will move onto the configuration of the Node.js client. ### 1.4.2. Configuring Hazelcast Node.js Client @@ -275,14 +305,13 @@ There are two ways to configure a Hazelcast Node.js client: * Programmatically * Declaratively (JSON) -This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. Refer to [Configuration Overview](#configuration-overview) -and the following sections for information about detailed network configuration and/or additional features of Hazelcast Node.js client -configuration. +This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. See the [Configuration Overview section](#configuration-overview) +and the following sections for information about detailed network configurations and/or additional features of Hazelcast Node.js client configuration. An easy way to configure your Hazelcast Node.js client is to create a `ClientConfig` object and set the appropriate options. Then you can -supply this object to your client at the startup. Another way to configure your client is to provide a `hazelcast-client.json` file. This approach is similar to `hazelcast.xml` approach -in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas member configuration is XML based. Although these -two formats are different, you will realize that the names of the configuration parameters are the same for both the client and member. +supply this object to your client at the startup. This is the programmatic configuration approach. Another way to configure your client, which is the declarative approach, is to provide a `hazelcast-client.json` file. This is similar to the `hazelcast.xml` approach +in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas the member configuration is XML based. Although these +two formats are different, you will realize that the names of configuration parameters are the same for both the client and member. It is done this way to make it easier to transfer Hazelcast skills to multiple platforms. Once you embedded `hazelcast-client` to your Node.js project, you may follow any of programmatic or declarative configuration approaches. @@ -308,13 +337,13 @@ of your application's entry point. If you prefer to keep your `hazelcast-client.json` file somewhere else, you can override the environment variable `HAZELCAST_CLIENT_CONFIG` with the location of your config file. In this case, the client uses the configuration file specified in the environment variable. -For the structure of `hazelcast-client.json`, take a look at [hazelcast-client-full.json](test/config/hazelcast-client-full.json). You -can use only the relevant parts of the file in your `hazelcast-client.json` and remove the rest. Default configuration is used for any -part that you do not explicitly set in `hazelcast-client.json`. +For the structure of `hazelcast-client.json`, see the [hazelcast-client-full.json file](test/config/hazelcast-client-full.json). You +can use only the relevant parts of the file in your `hazelcast-client.json` and remove the rest. The default configuration is used for any +part that you do not explicitly set in the `hazelcast-client.json` file. --- -If you run Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster +If you run the Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster names as explained in the previous section. If you did, then you need to make certain changes to the network settings of your client. ### Group Settings @@ -336,11 +365,11 @@ cfg.group.name = //group name of you cluster } ``` -> **NOTE: If you have a Hazelcast release older than `3.11`, you need to provide also a group password along with the group name.** +> **NOTE: If you have a Hazelcast IMDG release older than 3.11, you need to provide also a group password along with the group name.** ### Network Settings -You need to provide the ip address and port of at least one member in your cluster so the client finds it. +You need to provide the IP address and port of at least one member in your cluster so the client can find it. **Programmatic:** @@ -364,7 +393,7 @@ cfg.network.addresses.push('some-ip-address:port'); ## 1.5. Basic Usage Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a -distributed map in Node.js client. +distributed map in the Node.js client. The following example first creates a programmatic configuration object. Then, it starts a client. @@ -378,7 +407,9 @@ Client.newHazelcastClient(config).then(function(client) { console.log(client.getLocalEndpoint()); // Connects and prints some information about this client }); ``` -This should print logs about the cluster members and information about the client itself such as client type, uuid and address. + +This should print logs about the cluster members and information about the client itself such as the client type, UUID and address. + ``` [DefaultLogger] INFO at ConnectionAuthenticator: Connection to 192.168.0.3:5701 authenticated [DefaultLogger] INFO at ClusterService: Members received. @@ -393,13 +424,14 @@ ClientInfo { uuid: '532e8479-2b86-47f9-a0fb-a2da13a8d584', localAddress: Address { host: '127.0.0.1', port: 51903, type: 4 } } ``` -Congratulations, you just started a Hazelcast Node.js client. + +Congratulations! You just started a Hazelcast Node.js client. **Using a Map** -Let us manipulate a distributed map on a cluster using the client. +Let's manipulate a distributed map on a cluster using the client. -Save the following file as `IT.js` and run it using `node IT.js` +Save the following file as `IT.js` and run it using `node IT.js`. **IT.js** ```javascript @@ -424,7 +456,9 @@ Client.newHazelcastClient(config).then(function(client) { }); }); ``` + **Output** + ``` [DefaultLogger] INFO at HazelcastClient: Client started Added IT personnel. Logging all known personnel @@ -433,11 +467,12 @@ Clark is in IT department Bob is in IT department ``` -You see this example puts all IT personnel into a cluster-wide `personnelMap` and then prints all known personnel. +You see this example puts all the IT personnel into a cluster-wide `personnelMap` and then prints all the known personnel. -Now create `Sales.js` and run it using `node Sales.js` +Now create a `Sales.js` file as shown below and run it using `node Sales.js`. **Sales.js** + ```javascript let Client = require('hazelcast-client').Client; let Config = require('hazelcast-client').Config; @@ -460,7 +495,9 @@ Client.newHazelcastClient(config).then(function(client) { }); }); ``` + **Output** + ``` [DefaultLogger] INFO at HazelcastClient: Client started Added Sales personnel. Logging all known personnel @@ -478,9 +515,9 @@ That is because our map lives in the cluster and no matter which client we use, ## 1.6. Code Samples -Please see Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. +See the Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. -You can also refer to Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). +You can also see the Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). # 2. Features From aefd9d85f6b891a9c6c2d85303c0efe34cd932a4 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Thu, 1 Nov 2018 11:10:18 +0300 Subject: [PATCH 176/685] Copyedited Chapter 3. --- README.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3551fbeb4..5aa2f7913 100644 --- a/README.md +++ b/README.md @@ -568,10 +568,7 @@ and how you should set paths and exported names for the client to load objects. ## 3.1. Configuration Options -You can configure Hazelcast Node.js client declaratively (JSON) or programmatically (API). - -* Programmatic configuration -* Declarative configuration (JSON file) +You can configure the Hazelcast Node.js client declaratively (JSON) or programmatically (API). ### 3.1.1. Programmatic Configuration @@ -585,11 +582,11 @@ cfg.networkConfig.addresses.push('127.0.0.1:5701'); return HazelcastClient.newHazelcastClient(cfg); ``` -Refer to `ClientConfig` class documentation at [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. +See the `ClientConfig` class documentation at [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. ### 3.1.2. Declarative Configuration (JSON) -If the client is not supplied with a programmatic configuration at the time of initialization, it will look for a configuration file named `hazelcast-client.json`. If this file exists, then the configuration is loaded from it. Otherwise, the client will start with the default configuration. The following are the places that the client looks for a `hazelcast-client.json` in order: +If the client is not supplied with a programmatic configuration at the time of initialization, it will look for a configuration file named `hazelcast-client.json`. If this file exists, then the configuration is loaded from it. Otherwise, the client will start with the default configuration. The following are the places that the client looks for a `hazelcast-client.json` in the given order: 1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, the client looks for the configuration file in the specified location. @@ -597,7 +594,7 @@ the client looks for the configuration file in the specified location. from the current working directory. 3. Default configuration: If all of the above methods fail, the client starts with the default configuration. The default configuration is programmatic. If you want to override the default configuration declaratively, you need to create -a `hazelcast-client.json` file in your working directory. If you want to have an example for this file, you can find `hazelcast-client-default.json` and `hazelcast-client-sample.json` files in the Github repository. +a `hazelcast-client.json` file in your working directory. If you want to have an example for this file, you can find `hazelcast-client-default.json` and `hazelcast-client-sample.json` files in the GitHub repository. Following is a sample JSON configuration file: @@ -702,7 +699,7 @@ Let's say your project's directory structure is as follows: my_app/node_modules/ my_app/node_modules/hazelcast-client -In `factory_utils.js`, you have multiple exported functions. +In the `factory_utils.js` file, you have multiple exported functions: ```javascript exports.utilityFunction = function() {...} @@ -710,9 +707,9 @@ exports.MySSLFactory = function() {...} ``` In order to load `MySSLFactory` in your SSL configuration, you should set `path` and `exportedName` as `factory_utils.js` -and `MySSLFactory` respectively. +and `MySSLFactory`, respectively. -If you have only one export as the default export from `factory_utils.js`, just skip `exportedName` property and +If you have only one export as the default export from `factory_utils.js`, just skip the `exportedName` property and the client will load the default export from the file. From 6d20eab9eda7298d40b63815e3c1fe22dbeb23e9 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Thu, 1 Nov 2018 11:43:02 +0300 Subject: [PATCH 177/685] Copyedited Chapter 4. --- README.md | 57 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 5aa2f7913..e38a05e1a 100644 --- a/README.md +++ b/README.md @@ -715,9 +715,9 @@ the client will load the default export from the file. # 4. Serialization -Serialization is the process of converting an object into a stream of bytes to store the object in memory, a file or database, or transmit it through network. Its main purpose is to save the state of an object in order to be able to recreate it when needed. The reverse process is called deserialization. Hazelcast offers you its own native serialization methods. You will see these methods throughout the chapter. +Serialization is the process of converting an object into a stream of bytes to store the object in the memory, a file or database, or transmit it through the network. Its main purpose is to save the state of an object in order to be able to recreate it when needed. The reverse process is called deserialization. Hazelcast offers you its own native serialization methods. You will see these methods throughout this chapter. -Hazelcast serializes all your objects before sending them to the server. The `boolean`, `number`,`string` and `Long` types are serialized natively and you cannot override this behavior. The following table is the conversion of types for Java server side. +Hazelcast serializes all your objects before sending them to the server. The `boolean`, `number`,`string` and `Long` types are serialized natively and you cannot override this behavior. The following table is the conversion of types for the Java server side. | Node.js | Java | |---------|-------------------------------------| @@ -726,24 +726,22 @@ Hazelcast serializes all your objects before sending them to the server. The `bo | string | String | | Long | Long | -> Note: A `number` type is serialized as `Double` by default. You can configure this behavior from `SerializationConfig.defaultNumberType`. +> Note: A `number` type is serialized as `Double` by default. You can configure this behavior using the `SerializationConfig.defaultNumberType` method. -Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for Java server side respectively. +Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for the Java server side, respectively. Note that if the object is not one of the above-mentioned types, the Node.js client uses `JSON Serialization` by default. -However, `JSON Serialization` is not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization types, such as [IdentifiedDataSerializable Serialization](#1-identifieddataserializable-serialization) and [Portable Serialization](#2-portable-serialization). +However, `JSON Serialization` is not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization types, such as [`IdentifiedDataSerializable` Serialization](#1-identifieddataserializable-serialization) and [`Portable` Serialization](#2-portable-serialization). On top of all, if you want to use your own serialization type, you can use a [Custom Serialization](#3-custom-serialization). > **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, - some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** + some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** ## 4.1. IdentifiedDataSerializable Serialization -For a faster serialization of objects, Hazelcast recommends to implement IdentifiedDataSerializable interface. - -Here is an example of an object implementing IdentifiedDataSerializable interface: +For a faster serialization of objects, Hazelcast recommends to implement the `IdentifiedDataSerializable` interface. The following is an example of an object implementing this interface: ```javascript function Address(street, zipCode, city, state) { @@ -776,9 +774,9 @@ Address.prototype.readData = function (objectDataInput) { }; ``` -IdentifiedDataSerializable uses `getClassId()` and `getFactoryId()` to reconstitute the object. To complete the implementation `IdentifiedDataSerializableFactory` should also be implemented and registered into `SerializationConfig` which can be accessed from `Config.serializationConfig`. The factory's responsibility is to return an instance of the right `IdentifiedDataSerializable` object, given the class id. +The `IdentifiedDataSerializable` interface uses `getClassId()` and `getFactoryId()` to reconstitute the object. To complete the implementation, `IdentifiedDataSerializableFactory` should also be implemented and registered into `SerializationConfig` which can be accessed from `Config.serializationConfig`. The factory's responsibility is to return an instance of the right `IdentifiedDataSerializable` object, given the `classId`. -A sample `IdentifiedDataSerializableFactory` could be implemented as following: +A sample `IdentifiedDataSerializableFactory` could be implemented as follows: ```javascript function MyIdentifiedFactory() { @@ -795,12 +793,14 @@ MyIdentifiedFactory.prototype.create = function (type) { The last step is to register the `IdentifiedDataSerializableFactory` to the `SerializationConfig`. **Programmatic Configuration:** + ```javascript var config = new Config.ClientConfig(); config.serializationConfig.dataSerializableFactories[1] = new MyIdentifiedFactory(); ``` **Declarative Configuration:** + ```json { "serialization": { @@ -815,23 +815,23 @@ config.serializationConfig.dataSerializableFactories[1] = new MyIdentifiedFactor } ``` -Note that the id that is passed to the `SerializationConfig` is same as the `factoryId` that `Address` object returns. +Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that the `Address` object returns. ## 4.2. Portable Serialization -As an alternative to the existing serialization methods, Hazelcast offers Portable serialization. To use it, you need to implement `Portable` interface. Portable serialization has the following advantages: +As an alternative to the existing serialization methods, Hazelcast offers portable serialization. To use it, you need to implement the `Portable` interface. Portable serialization has the following advantages: -- Supporting multiversion of the same object type -- Fetching individual fields without having to rely on reflection -- Querying and indexing support without de-serialization and/or reflection +- Supporting multiversion of the same object type. +- Fetching individual fields without having to rely on the reflection. +- Querying and indexing support without deserialization and/or reflection. -In order to support these features, a serialized Portable object contains meta information like the version and the concrete location of the each field in the binary data. This way Hazelcast is able to navigate in the binary data and de-serialize only the required field without actually de-serializing the whole object which improves the Query performance. +In order to support these features, a serialized `Portable` object contains meta information like the version and concrete location of the each field in the binary data. This way Hazelcast is able to navigate in the binary data and deserialize only the required field without actually deserializing the whole object which improves the query performance. -With multiversion support, you can have two nodes where each of them having different versions of the same object and Hazelcast will store both meta information and use the correct one to serialize and de-serialize Portable objects depending on the node. This is very helpful when you are doing a rolling upgrade without shutting down the cluster. +With multiversion support, you can have two members where each of them having different versions of the same object, and Hazelcast will store both meta information and use the correct one to serialize and deserialize portable objects depending on the member. This is very helpful when you are doing a rolling upgrade without shutting down the cluster. -Also note that Portable serialization is totally language independent and is used as the binary protocol between Hazelcast server and clients. +Also note that portable serialization is totally language independent and is used as the binary protocol between Hazelcast server and clients. -A sample Portable implementation of a `Foo` class will look like the following: +A sample portable implementation of a `Foo` class looks like the following: ```javascript function Foo(foo) { @@ -855,9 +855,9 @@ Foo.prototype.readPortable = function (portableReader) { }; ``` -Similar to `IdentifiedDataSerializable`, a Portable object must provide `classId` and `factoryId`. The factory object will be used to create the Portable object given the classId. +Similar to `IdentifiedDataSerializable`, a `Portable` object must provide `classId` and `factoryId`. The factory object will be used to create the `Portable` object given the `classId`. -A sample `PortableFactory` could be implemented as following: +A sample `PortableFactory` could be implemented as follows: ```javascript function MyPortableFactory() { @@ -874,12 +874,14 @@ MyPortableFactory.prototype.create = function (type) { The last step is to register the `PortableFactory` to the `SerializationConfig`. **Programmatic Configuration:** + ```javascript var config = new Config.ClientConfig(); config.serializationConfig.portableFactories[1] = new MyPortableFactory(); ``` **Declarative Configuration:** + ```json { "serialization": { @@ -894,13 +896,13 @@ config.serializationConfig.portableFactories[1] = new MyPortableFactory(); } ``` -Note that the id that is passed to the `SerializationConfig` is same as the `factoryId` that `Foo` object returns. +Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that `Foo` object returns. ## 4.3. Custom Serialization Hazelcast lets you plug a custom serializer to be used for serialization of objects. -Let's say you have an object `Musician` and you would like to customize the serialization. The reason may be you want to use an external serializer for only one object. +Let's say you have an object `Musician` and you would like to customize the serialization. The reason might be that you want to use an external serializer for only one object. ```javascript function Musician(name) { @@ -976,11 +978,10 @@ The global serializer is identical to custom serializers from the implementation By default, JSON serialization is used if the object is not `IdentifiedDataSerializable` and `Portable` or there is no custom serializer for it. When you configure a global serializer, it is used instead of JSON serialization. -**Use cases** - -- Third party serialization frameworks can be integrated using the global serializer. +You can use the global serialization for the following cases: -- For your custom objects, you can implement a single serializer to handle all of them. +* Third party serialization frameworks can be integrated using the global serializer. +* For your custom objects, you can implement a single serializer to handle all of them. A sample global serializer that integrates with a third party serializer is shown below. From 830dff1290cdc6133803ed245ef1207845227fee Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Thu, 1 Nov 2018 11:48:53 +0300 Subject: [PATCH 178/685] Copyedited Chapter 5. --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index e38a05e1a..ff70e1f82 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ * [4.3. Custom Serialization](#43-custom-serialization) * [4.4. Global Serialization](#44-global-serialization) * [5. Setting Up Client Network](#5-setting-up-client-network) - * [5.1. Providing the Member Addresses](#51-providing-the-member-addresses) + * [5.1. Providing Member Addresses](#51-providing-member-addresses) * [5.2. Setting Smart Routing](#52-setting-smart-routing) * [5.3. Enabling Redo Operation](#53-enabling-redo-operation) * [5.4. Setting Connection Timeout](#54-setting-connection-timeout) @@ -1028,11 +1028,11 @@ config.serializationConfig.globalSerializer = new GlobalSerializer(); # 5. Setting Up Client Network -All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let’s first give the examples for these two approaches. Then we will look at its sub-elements and attributes. +All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let's first give the examples for these two approaches. Then we will look at its sub-elements and attributes. ### Declarative Client Network Configuration -Here is an example of configuring network for Node.js Client declaratively. +Here is an example of configuring the network for Node.js Client declaratively. ```json { @@ -1052,7 +1052,7 @@ Here is an example of configuring network for Node.js Client declaratively. ### Programmatic Client Network Configuration -Here is an example of configuring network for Node.js Client programmatically. +Here is an example of configuring the network for Node.js Client programmatically. ```javascript var clientConfig = new Config.ClientConfig(); @@ -1064,9 +1064,9 @@ clientConfig.networkConfig.connectionAttemptPeriod = 5000; clientConfig.networkConfig.connectionAttemptLimit = 5; ``` -## 5.1. Providing the Member Addresses +## 5.1. Providing Member Addresses -Address list is the initial list of cluster addresses to which the client will connect. The client uses this +Address list is the initial list of cluster addresses which the client will connect to. The client uses this list to find an alive member. Although it may be enough to give only one address of a member in the cluster (since all members communicate with each other), it is recommended that you give the addresses for all the members. @@ -1090,9 +1090,9 @@ var clientConfig = new Config.ClientConfig(); clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); ``` -If the port part is omitted, then 5701, 5702 and 5703 will be tried in random order. +If the port part is omitted, then 5701, 5702 and 5703 will be tried in a random order. -You can specify multiple addresses with or without port information as seen above. The provided list is shuffled and tried in random order. Its default value is `localhost`. +You can specify multiple addresses with or without the port information as seen above. The provided list is shuffled and tried in a random order. Its default value is `localhost`. ## 5.2. Setting Smart Routing @@ -1122,7 +1122,7 @@ Its default value is `true` (smart client mode). ## 5.3. Enabling Redo Operation -It enables/disables redo-able operations. While sending the requests to related members, operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. +It enables/disables redo-able operations. While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. **Declarative:** @@ -1145,8 +1145,8 @@ Its default value is `false` (disabled). ## 5.4. Setting Connection Timeout -Connection timeout is the timeout value in milliseconds for members to accept client connection requests. -If server does not respond within the timeout, the client will retry to connect as many as `ClientNetworkConfig.connectionAttemptLimit` times. +Connection timeout is the timeout value in milliseconds for the members to accept the client connection requests. +If the member does not respond within the timeout, the client will retry to connect as many as `ClientNetworkConfig.connectionAttemptLimit` times. The following are the example configurations. @@ -1222,14 +1222,14 @@ Its default value is `3000` milliseconds. ## 5.7. Enabling Client TLS/SSL -You can use TLS/SSL to secure the connection between the clients and members. If you want TLS/SSL enabled +You can use TLS/SSL to secure the connection between the clients and members. If you want to enable TLS/SSL for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#1-tlsssl). -As explained in the [TLS/SSL section](#1-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates and members to have their certificate authorities so that the members can know which clients they can trust. Please see the [Mutual Authentication section](#13-mutual-authentication). +As explained in the [TLS/SSL section](#1-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#13-mutual-authentication). ## 5.8. Enabling Hazelcast Cloud Discovery -The purpose of Hazelcast Cloud Discovery is to provide clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. +The purpose of Hazelcast Cloud Discovery is to provide the clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. The following are example configurations. From a205e1082d65e1be560ed733dc8c3faa7dca7511 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Thu, 1 Nov 2018 11:59:19 +0300 Subject: [PATCH 179/685] Copyedited Chapter 6. --- README.md | 55 ++++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index ff70e1f82..e90887890 100644 --- a/README.md +++ b/README.md @@ -1267,26 +1267,25 @@ To be able to connect to the provided IP addresses, you should use secure TLS/SS # 6. Securing Client Connection -This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members and mutual authentication. These security features require **Hazelcast IMDG Enterprise** edition. +This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members, and mutual authentication. These security features require **Hazelcast IMDG Enterprise** edition. ### 6.1. TLS/SSL One of the offers of Hazelcast is the TLS/SSL protocol which you can use to establish an encrypted communication across your cluster with key stores and trust stores. -- A Java `keyStore` is a file that includes a private key and a public certificate. The equivalent of a key store is the combination of `key` and `cert` files at the Node.js client side. +* A Java `keyStore` is a file that includes a private key and a public certificate. The equivalent of a key store is the combination of `key` and `cert` files at the Node.js client side. +* A Java `trustStore` is a file that includes a list of certificates trusted by your application which is named as "certificate authority". The equivalent of a trust store is a `ca` file at the Node.js client side. -- A Java `trustStore` is a file that includes a list of certificates trusted by your application which is named certificate authority. The equivalent of a trust store is a `ca` file at the Node.js client side. - -You should set `keyStore` and `trustStore` before starting the members. See the next section how to set `keyStore` and `trustStore` on the server side. +You should set `keyStore` and `trustStore` before starting the members. See the next section on setting `keyStore` and `trustStore` on the server side. #### 6.1.1. TLS/SSL for Hazelcast Members -Hazelcast allows you to encrypt socket level communication between Hazelcast members and between Hazelcast clients and members, for end to end encryption. To use it, see [TLS/SSL for Hazelcast Members section](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#tls-ssl-for-hazelcast-members). +Hazelcast allows you to encrypt socket level communication between Hazelcast members and between Hazelcast clients and members, for end to end encryption. To use it, see the [TLS/SSL for Hazelcast Members section](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#tls-ssl-for-hazelcast-members). #### 6.1.2. TLS/SSL for Hazelcast Node.js Clients Hazelcast Node.js clients which support TLS/SSL should have the following user supplied SSL `options` object, to pass to -[`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback): +[`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js: ```javascript var fs = require('fs'); @@ -1305,7 +1304,7 @@ As explained above, Hazelcast members have key stores used to identify themselve Using mutual authentication, the clients also have their key stores and members have their trust stores so that the members can know which clients they can trust. -To enable mutual authentication, firstly, you need to set the following property at server side by configuring `hazelcast.xml`: +To enable mutual authentication, firstly, you need to set the following property at the server side in the `hazelcast.xml` file: ```xml @@ -1317,34 +1316,33 @@ To enable mutual authentication, firstly, you need to set the following property ``` -You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#mutual-authentication) of the Reference Manual. - -And at the Node.js client side, you need to supply SSL `options` object to pass to -[`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). +You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#mutual-authentication) of the Hazelcast IMDG Reference Manual. +At the Node.js client side, you need to supply an SSL `options` object to pass to +[`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js. There are two ways to provide this object to the client: 1. Using the built-in `BasicSSLOptionsFactory` bundled with the client. -2. Writing an SSLOptionsFactory. +2. Writing an `SSLOptionsFactory`. Below subsections describe each way. -**Using Built-in BasicSSLOptionsFactory** +**Using the Built-in `BasicSSLOptionsFactory`** Hazelcast Node.js client includes a utility factory class that creates the necessary `options` object out of the supplied -properties. All you need to do is specifying your factory as `BasicSSLOptionsFactory` and provide the following options: +properties. All you need to do is to specify your factory as `BasicSSLOptionsFactory` and provide the following options: -- caPath -- keyPath -- certPath -- servername -- rejectUnauthorized -- ciphers +- `caPath` +- `keyPath` +- `certPath` +- `servername` +- `rejectUnauthorized` +- `ciphers` -Please refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) for the descriptions of each option. +See [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js for the descriptions of each option. -> `caPath`, `keyPath` and `certPath` define file path to respective file that stores such information. +> `caPath`, `keyPath` and `certPath` define the file path to the respective file that stores such information. ```json { @@ -1368,12 +1366,11 @@ Please refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_t If these options are not enough for your application, you may write your own options factory and instruct the client to get the options from it, as explained below. -**Writing an SSL Options Factory** +**Writing an `SSLOptionsFactory`** -In order to use the full range of options provided to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback), -you may write your own factory object. +In order to use the full range of options provided to [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js, you may write your own factory object. -An example configuration: +An example configuration is shown below. ```json { @@ -1396,7 +1393,7 @@ An example configuration: ``` -And your own factory, `My_Factory.js`: +An example of a factory, `My_Factory.js`, is shown below. ```javascript @@ -1429,7 +1426,7 @@ exports.SSLFactory = SSLFactory; The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. -For information about the path resolution, please refer to the [Loading Objects and Path Resolution](#3-loading-objects-and-path-resolution) section. +For information about the path resolution, see the [Loading Objects and Path Resolution section](#3-loading-objects-and-path-resolution). # 7. Using Node.js Client with Hazelcast IMDG From e5d3244e8627088da604fb04dcb1e40b7a164475 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Thu, 1 Nov 2018 13:52:12 +0300 Subject: [PATCH 180/685] Copyedited Chapter 7. --- README.md | 259 +++++++++++++++++++++++++----------------------------- 1 file changed, 120 insertions(+), 139 deletions(-) diff --git a/README.md b/README.md index e90887890..f6d63dd3b 100644 --- a/README.md +++ b/README.md @@ -1431,15 +1431,19 @@ For information about the path resolution, see the [Loading Objects and Path Res # 7. Using Node.js Client with Hazelcast IMDG +This chapter provides information on how you can use Hazelcast IMDG's data structures in the Node.js client, after giving some basic information including an overview to the client API, operation modes of the client and how it handles the failures. + ## 7.1. Node.js Client API Overview -Most of the functions in the API return `Promise`. Therefore, you need to be familiar with the concept of promises to use the Node.js client. If not, you can learn about them using various online resources. +Most of the functions in the API return `Promise`. Therefore, you need to be familiar with the concept of promises to use the Node.js client. If not, you can learn about them using various online resources, e.g., the [Promise JS](https://www.promisejs.org/) website. + +Promises provide a better way of working with callbacks. You can chain asynchronous functions by the `then()` function of promise. Also, you can use `async/await`, if you use Node.js 8 and higher versions. -Promises provide a better way of working with callbacks. You can chain asynchronous functions by `then()` function of promise. Also, you can use `async/await`, if you use Node.js 8 and higher versions. +If you are ready to go, let's start to use Hazelcast Node.js client. -If you are ready to go, let's start to use Hazelcast Node.js client! +The first step is the configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. See the [Programmatic Configuration section](#programmatic-configuration) for details. -The first step is configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. Please refer to the [Node.js Client Declarative Configuration section](#declarative-configuration) for details. +The following is an example on how to create a `ClientConfig` object and configure it programmatically: ```javascript var clientConfig = new Config.ClientConfig(); @@ -1447,7 +1451,7 @@ clientConfig.groupConfig.name = 'dev'; clientConfig.networkConfig.addresses.push('10.90.0.1', '10.90.0.2:5702'); ``` -The second step is initializing the `HazelcastClient` to be connected to the cluster. +The second step is initializing the `HazelcastClient` to be connected to the cluster: ```javascript Client.newHazelcastClient(clientConfig).then(function (client) { @@ -1455,9 +1459,9 @@ Client.newHazelcastClient(clientConfig).then(function (client) { }); ``` -**This client object is your gateway to access all Hazelcast distributed objects.** +**This client object is your gateway to access all the Hazelcast distributed objects.** -Let’s create a map and populate it with some data. +Let's create a map and populate it with some data, as shown below. ```javascript var client; @@ -1473,7 +1477,7 @@ Client.newHazelcastClient(clientConfig).then(function (res) { }); ``` -As a final step, if you are done with your client, you can shut it down as shown below. This will release all the used resources and will close connections to the cluster. +As the final step, if you are done with your client, you can shut it down as shown below. This will release all the used resources and close connections to the cluster. ```javascript ... @@ -1484,53 +1488,50 @@ As a final step, if you are done with your client, you can shut it down as shown ## 7.2. Node.js Client Operation Modes -The client has two operation modes because of the distributed nature of the data and cluster. +The client has two operation modes because of the distributed nature of the data and cluster: smart and unisocket. ### 7.2.1. Smart Client -In the smart mode, clients connect to each cluster member. Since each data partition uses the well known and consistent hashing algorithm, each client can send an operation to the relevant cluster member, which increases the overall throughput and efficiency. Smart mode is the default mode. - +In the smart mode, the clients connect to each cluster member. Since each data partition uses the well known and consistent hashing algorithm, each client can send an operation to the relevant cluster member, which increases the overall throughput and efficiency. Smart mode is the default mode. ### 7.2.2. Unisocket Client -For some cases, the clients can be required to connect to a single member instead of each member in the cluster. Firewalls, security, or some custom networking issues can be the reason for these cases. +For some cases, the clients can be required to connect to a single member instead of each member in the cluster. Firewalls, security or some custom networking issues can be the reason for these cases. In the unisocket client mode, the client will only connect to one of the configured addresses. This single member will behave as a gateway to the other members. For any operation requested from the client, it will redirect the request to the relevant member and return the response back to the client returned from this member. ## 7.3. Handling Failures -There are two main failure cases you should be aware of, and configurations you can perform to achieve proper behavior. +There are two main failure cases you should be aware of. Below sections explain these and the configurations you can perform to achieve proper behavior. ### 7.3.1. Handling Client Connection Failure -While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might be not available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. +While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might not be available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. -You can configure `connectionAttemptLimit` for the number of times you want the client to retry connecting. Please see [Setting Connection Attempt Limit](#5-setting-connection-attempt-limit). +You can configure `connectionAttemptLimit` for the number of times you want the client to retry connecting. See the [Setting Connection Attempt Limit section](#5-setting-connection-attempt-limit). The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. ### 7.3.2. Handling Retry-able Operation Failure -While sending the requests to related members, operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. Please see [Enabling Redo Operation](#3-enabling-redo-operation). +While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retrying for the other operations, you can set the `redoOperation` to `true`. See the [Enabling Redo Operation section](#3-enabling-redo-operation). You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in `ClientConfig.properties`. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: -- Member throws an exception. - -- Connection between the client and member is closed. +* Member throws an exception. +* Connection between the client and member is closed. +* Client’s heartbeat requests are timed out. -- Client’s heartbeat requests are timed out. - -When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member, and then the connection is lost. Since there will be no response for this operation, you will not now whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. +When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all the client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member and then the connection is lost. Since there will be no response for this operation, you will not know whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. ## 7.4. Using Distributed Data Structures -Most of the Distributed Data Structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. +Most of the distributed data structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. ### 7.4.1. Using Map -Hazelcast Map (`IMap`) is a distributed map. Through Node.js client, you can perform operations like reading and writing from/to a Hazelcast Map with the well known get and put methods. For details refer to [Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#map) in the Hazelcast IMDG Reference Manual. +Hazelcast Map (`IMap`) is a distributed map. Through the Node.js client, you can perform operations like reading and writing from/to a Hazelcast Map with the well known get and put methods. For details, see the [Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#map) in the Hazelcast IMDG Reference Manual. A Map usage example is shown below. @@ -1547,7 +1548,7 @@ map.put(1, 'Furkan').then(function (oldValue) { ### 7.4.2. Using MultiMap -Hazelcast `MultiMap` is a distributed and specialized map where you can store multiple values under a single key. For details refer to [MultiMap section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#multimap) in the Hazelcast IMDG Reference Manual. +Hazelcast `MultiMap` is a distributed and specialized map where you can store multiple values under a single key. For details, see the [MultiMap section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#multimap) in the Hazelcast IMDG Reference Manual. A MultiMap usage example is shown below. @@ -1565,7 +1566,7 @@ multiMap.put(1, 'Furkan').then(function () { ### 7.4.3. Using Replicated Map -Hazelcast `ReplicatedMap` is a distributed key-value data structure where the data is replicated to all members in the cluster. It provides full replication of entries to all members for high speed access. For details refer to [Replicated Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#replicated-map) in the Hazelcast IMDG Reference Manual. +Hazelcast `ReplicatedMap` is a distributed key-value data structure where the data is replicated to all members in the cluster. It provides full replication of entries to all members for high speed access. For details, see the [Replicated Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#replicated-map) in the Hazelcast IMDG Reference Manual. A Replicated Map usage example is shown below. @@ -1583,7 +1584,7 @@ replicatedMap.put(1, 'Furkan').then(function () { ### 7.4.4. Using Queue -Hazelcast Queue(`IQueue`) is a distributed queue which enables all cluster members to interact with it. For details refer to [Queue section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#queue) in the Hazelcast IMDG Reference Manual. +Hazelcast Queue (`IQueue`) is a distributed queue which enables all cluster members to interact with it. For details, see the [Queue section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#queue) in the Hazelcast IMDG Reference Manual. A Queue usage example is shown below. @@ -1599,7 +1600,7 @@ queue.offer('Furkan').then(function () { ## 7.4.5. Using Set -Hazelcast Set(`ISet`) is a distributed set which does not allow duplicate elements. For details refer to [Set section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#set) in the Hazelcast IMDG Reference Manual. +Hazelcast Set (`ISet`) is a distributed set which does not allow duplicate elements. For details, see the [Set section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#set) in the Hazelcast IMDG Reference Manual. A Set usage example is shown below. @@ -1617,7 +1618,7 @@ hazelcastClient.getSet('mySet').then(function (s) { ## 7.4.6. Using List -Hazelcast List(`IList`) is distributed list which allows duplicate elements and preserves the order of elements. For details refer to [List section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#list) in the Hazelcast IMDG Reference Manual. +Hazelcast List (`IList`) is a distributed list which allows duplicate elements and preserves the order of elements. For details, see the [List section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#list) in the Hazelcast IMDG Reference Manual. A List usage example is shown below. @@ -1639,7 +1640,7 @@ hazelcastClient.getList('myList').then(function (l) { ## 7.4.7. Using Ringbuffer -Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that stores its data in a ring-like structure. You can think of it as a circular array with a given capacity. Each Ringbuffer has a tail and a head. The tail is where the items are added and the head is where the items are overwritten or expired. You can reach each element in a Ringbuffer using a sequence ID, which is mapped to the elements between the head and tail (inclusive) of the Ringbuffer. For details refer to [Ringbuffer section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#ringbuffer) in the Hazelcast IMDG Reference Manual. +Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that stores its data in a ring-like structure. You can think of it as a circular array with a given capacity. Each Ringbuffer has a tail and a head. The tail is where the items are added and the head is where the items are overwritten or expired. You can reach each element in a Ringbuffer using a sequence ID, which is mapped to the elements between the head and tail (inclusive) of the Ringbuffer. For details, see the [Ringbuffer section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#ringbuffer) in the Hazelcast IMDG Reference Manual. A Ringbuffer usage example is shown below. @@ -1659,7 +1660,7 @@ hazelcastClient.getRingbuffer('myRingbuffer').then(function (buffer) { ## 7.4.8. Using Reliable Topic -Hazelcast `ReliableTopic` is a distributed topic implementation backed up by the `Ringbuffer` data structure. For details refer to [Reliable Topic section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#reliable-topic) in the Hazelcast IMDG Reference Manual. +Hazelcast `ReliableTopic` is a distributed topic implementation backed up by the `Ringbuffer` data structure. For details, see the [Reliable Topic section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#reliable-topic) in the Hazelcast IMDG Reference Manual. A Reliable Topic usage example is shown below. @@ -1676,7 +1677,7 @@ hazelcastClient.getReliableTopic('myReliableTopic').then(function (t) { ## 7.4.9 Using Lock -Hazelcast Lock(`ILock`) is a distributed lock implementation. You can synchronize Hazelcast members and clients using a Lock. For details refer to [Lock section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#lock) in the Hazelcast IMDG Reference Manual. +Hazelcast Lock (`ILock`) is a distributed lock implementation. You can synchronize Hazelcast members and clients using a Lock. For details, see the [Lock section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#lock) in the Hazelcast IMDG Reference Manual. A Lock usage example is shown below. @@ -1694,7 +1695,7 @@ hazelcastClient.getLock('myLock').then(function (l) { ## 7.4.10 Using Atomic Long -Hazelcast Atomic Long(`IAtomicLong`) is the distributed long which offers most of the operations such as `get`, `set`, `getAndSet`, `compareAndSet` and `incrementAndGet`. For details refer to [Atomic Long section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#iatomiclong) in the Hazelcast IMDG Reference Manual. +Hazelcast Atomic Long (`IAtomicLong`) is the distributed long which offers most of the operations such as `get`, `set`, `getAndSet`, `compareAndSet` and `incrementAndGet`. For details, see the [Atomic Long section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#iatomiclong) in the Hazelcast IMDG Reference Manual. An Atomic Long usage example is shown below. @@ -1712,7 +1713,7 @@ hazelcastClient.getAtomicLong('myAtomicLong').then(function (counter) { ## 7.4.11 Using Semaphore -Hazelcast Semaphore(`ISemaphore`) is a distributed semaphore implementation. For details refer to [Semaphore section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#isemaphore) in the Hazelcast IMDG Reference Manual. +Hazelcast Semaphore (`ISemaphore`) is a distributed semaphore implementation. For details, see the [Semaphore section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#isemaphore) in the Hazelcast IMDG Reference Manual. A Semaphore usage example is shown below. @@ -1732,7 +1733,7 @@ hazelcastClient.getSemaphore('mySemaphore').then(function (s) { ## 7.4.12 Using PN Counter -Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative counter implementation. It is an eventually consistent counter given there is no member failure. For details refer to [PN Counter section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#pn-counter) in the Hazelcast IMDG Reference Manual. +Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative counter implementation. It is an eventually consistent counter given there is no member failure. For details, see the [PN Counter section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#pn-counter) in the Hazelcast IMDG Reference Manual. A PN Counter usage example is shown below. @@ -1751,7 +1752,7 @@ hazelcastClient.getPNCounter('myPNCounter').then(function (counter) { ## 7.4.13 Using Flake ID Generator -Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers. Generated identifiers are long primitive values and are k-ordered (roughly ordered). IDs are in the range from 0 to `2^63-1 (maximum signed long value)`. For details refer to [FlakeIdGenerator section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#flakeidgenerator) in the Hazelcast IMDG Reference Manual. +Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers. Generated identifiers are long primitive values and are k-ordered (roughly ordered). IDs are in the range from 0 to `2^63-1` (maximum signed long value). For details, see the [FlakeIdGenerator section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#flakeidgenerator) in the Hazelcast IMDG Reference Manual. A Flake ID Generator usage example is shown below. @@ -1767,30 +1768,27 @@ hazelcastClient.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { ## 7.5. Distributed Events - This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. ### 7.5.1. Cluster Events -You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side. - -`Membership Listener`: Notifies when a member joins to/leaves the cluster, or when an attribute is changed in a member. +You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side: -`Distributed Object Listener`: Notifies when a distributed object is created or destroyed throughout the cluster. - -`Lifecycle Listener`: Notifies when the client is starting, started, shutting down, and shutdown. +* Membership Listener: Notifies when a member joins to/leaves the cluster, or when an attribute is changed in a member. +* Distributed Object Listener: Notifies when a distributed object is created or destroyed throughout the cluster. +* Lifecycle Listener: Notifies when the client is starting, started, shutting down and shutdown. #### 7.5.1.1. Listening for Member Events You can add the following types of member events to the `ClusterService`. -- `memberAdded`: A new member is added to the cluster. -- `memberRemoved`: An existing member leaves the cluster. -- `memberAttributeChanged`: An attribute of a member is changed. Please refer to [Defining Member Attributes](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#defining-member-attributes) section in the Hazelcast IMDG Reference Manual to learn about member attributes. +* `memberAdded`: A new member is added to the cluster. +* `memberRemoved`: An existing member leaves the cluster. +* `memberAttributeChanged`: An attribute of a member is changed. See the [Defining Member Attributes section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#defining-member-attributes) in the Hazelcast IMDG Reference Manual to learn about member attributes. -The `ClusterService` object exposes an `ClusterService.on()` function that allows one or more functions to be attached to member events emitted by the object. +The `ClusterService` object exposes an `ClusterService.on()` function that allows one or more functions to be attached to the member events emitted by the object. -The following is a membership listener registration by using `ClusterService.on()` function. +The following is a membership listener registration by using the `ClusterService.on()` function. ```javascript client.clusterService.on('memberAdded', function (member) { @@ -1798,9 +1796,9 @@ client.clusterService.on('memberAdded', function (member) { }); ``` -The `memberAttributeChanged` has its own type of event named `MemberAttributeEvent`. When there is an attribute change on the member, this event is fired. +The `memberAttributeChanged` has its own type of event named as `MemberAttributeEvent`. When there is an attribute change on the member, this event is fired. -Let’s take a look at the following example. +See the following example. ```javascript client.clusterService.on('memberAttributeChanged', function (memberAttributeEvent) { @@ -1812,13 +1810,11 @@ client.clusterService.on('memberAttributeChanged', function (memberAttributeEven The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: -`serviceName`: Service name of the distributed object. - -`objectName`: Name of the distributed object. +* `serviceName`: Service name of the distributed object. +* `objectName`: Name of the distributed object. +* `eventType`: Type of the invoked event. It can be `created` or `destroyed`. -`eventType`: Type of the invoked event. It can be `created` or `destroyed`. - -The following is an example of adding a Distributed Object Listener. +The following is an example of adding a `DistributedObjectListener`. ```javascript client.addDistributedObjectListener(function (distributedObjectEvent) { @@ -1838,13 +1834,14 @@ client.addDistributedObjectListener(function (distributedObjectEvent) { #### 7.5.1.3. Listening for Lifecycle Events -The Lifecycle Listener notifies for the following events: -- `starting`: A client is starting. -- `started`: A client has started. -- `shuttingDown`: A client is shutting down. -- `shutdown`: A client’s shutdown has completed. +The `LifecycleListener` interface notifies for the following events: + +* `starting`: A client is starting. +* `started`: A client has started. +* `shuttingDown`: A client is shutting down. +* `shutdown`: A client’s shutdown has completed. -The following is an example of Lifecycle Listener that is added to config and its output. +The following is an example of the `LifecycleListener` that is added to the `ClientConfig` object and its output. ```javascript var clientConfig = new Config.ClientConfig(); @@ -1878,18 +1875,18 @@ Process finished with exit code 0 ### 7.5.2. Distributed Data Structure Events -You can add event listeners to the Distributed Data Structures. +You can add event listeners to the distributed data structures. > **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, - some interfaces are given to user by using the TypeScript files that have `.ts` extension. In the documentation, implementing an interface means an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or Github repository for a required interface.** + some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** #### 7.5.2.1. Listening for Map Events You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. -- An entry-based event is fired after the operations that affect a specific entry. For example, `IMap.put()`, `IMap.remove()` or `IMap.evict()`. You should use the `EntryEventListener` type to listen these events. An `EntryEvent` object is passed to the listener function. +An entry-based event is fired after the operations that affect a specific entry. For example, `IMap.put()`, `IMap.remove()` or `IMap.evict()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. -Let’s take a look at the following example. +See the following example. ```javascript var entryEventListener = { @@ -1902,10 +1899,9 @@ map.addEntryListener(entryEventListener, undefined, true).then(function () { }); ``` +A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. -- A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen these events. A `MapEvent` object is passed to the listener function. - -Let’s take a look at the following example. +See the following example. ```javascript var mapEventListener = { @@ -1926,13 +1922,13 @@ map.addEntryListener(mapEventListener).then(function () { ## 7.6. Distributed Computing -This chapter explains Hazelcast’s entry processor implementation. +This chapter explains how you can use Hazelcast IMDG's entry processor implementation in the Node.js client. ### 7.6.1. Using EntryProcessor Hazelcast supports entry processing. An entry processor is a function that executes your code on a map entry in an atomic way. -An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys-- executing `IMap.get(key)`, mutating the value, and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. +An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys -- executing `IMap.get(key)`, mutating the value and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. If you are doing the process described above, you should consider using entry processors. An entry processor executes a read and updates upon the member where the data resides. This eliminates the costly network hops described above. @@ -1944,11 +1940,9 @@ Hazelcast sends the entry processor to each cluster member and these members app The `IMap` interface provides the following functions for entry processing: -- `executeOnKey` processes an entry mapped by a key. - -- `executeOnKeys` processes entries mapped by a list of keys. - -- `executeOnEntries` can process all entries in a map with a defined predicate. Predicate is optional. +* `executeOnKey` processes an entry mapped by a key. +* `executeOnKeys` processes entries mapped by a list of keys. +* `executeOnEntries` can process all entries in a map with a defined predicate. Predicate is optional. In the Node.js client, an `EntryProcessor` should be `IdentifiedDataSerializable` or `Portable` because the server should be able to deserialize it to process. @@ -1976,9 +1970,9 @@ IdentifiedEntryProcessor.prototype.getClassId = function () { }; ``` -Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, please see [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). +Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). -The following is an example code which can be the Java equivalent of entry processor in Node.js client: +The following is the Java equivalent of the entry processor in Node.js client given above: ```java import com.hazelcast.map.AbstractEntryProcessor; @@ -2042,7 +2036,7 @@ public class IdentifiedFactory implements DataSerializableFactory { } ``` -Note that you need to configure the `hazelcast.xml` to add your factory. And the following is the configuration for the above factory: +Now you need to configure the `hazelcast.xml` to add your factory as shown below. ```xml @@ -2056,9 +2050,9 @@ Note that you need to configure the `hazelcast.xml` to add your factory. And the ``` -The code that runs on the entries is implemented in Java on the server side. Client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, please see [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. +The code that runs on the entries is implemented in Java on the server side. The client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, see the [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. -After all implementation and starting the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. Let's take a look at the following example. +After the above implementations and configuration are done and you start the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. See the following example. ```javascript var map; @@ -2081,48 +2075,36 @@ Hazelcast partitions your data and spreads it across cluster of members. You can ### 7.7.1. How Distributed Query Works 1. The requested predicate is sent to each member in the cluster. -2. Each member looks at its own local entries and filters them according to the predicate. At this stage, key/value pairs of the entries are deserialized and then passed to the predicate. +2. Each member looks at its own local entries and filters them according to the predicate. At this stage, key-value pairs of the entries are deserialized and then passed to the predicate. 3. The predicate requester merges all the results coming from each member into a single set. Distributed query is highly scalable. If you add new members to the cluster, the partition count for each member is reduced and thus the time spent by each member on iterating its entries is reduced. In addition, the pool of partition threads evaluates the entries concurrently in each member, and the network traffic is also reduced since only filtered data is sent to the requester. **Predicates Object Operators** -The `Predicates` object offered by the client includes many operators for your query requirements. Some of them are explained below. - -- `equal`: Checks if the result of an expression is equal to a given value. - -- `notEqual`: Checks if the result of an expression is not equal to a given value. - -- `instanceOf`: Checks if the result of an expression has a certain type. - -- `like`: Checks if the result of an expression matches some string pattern. `%` (percentage sign) is the placeholder for many characters, `_` (underscore) is placeholder for only one character. - -- `greaterThan`: Checks if the result of an expression is greater than a certain value. - -- `greaterEqual`: Checks if the result of an expression is greater than or equal to a certain value. - -- `lessThan`: Checks if the result of an expression is less than a certain value. - -- `lessEqual`: Checks if the result of an expression is less than or equal to a certain value. - -- `between`: Checks if the result of an expression is between two values (this is inclusive). - -- `inPredicate`: Checks if the result of an expression is an element of a certain list. - -- `not`: Checks if the result of an expression is false. - -- `regex`: Checks if the result of an expression matches some regular expression. +The `Predicates` object offered by the Node.js client includes many operators for your query requirements. Some of them are described below. + +* `equal`: Checks if the result of an expression is equal to a given value. +* `notEqual`: Checks if the result of an expression is not equal to a given value. +* `instanceOf`: Checks if the result of an expression has a certain type. +* `like`: Checks if the result of an expression matches some string pattern. `%` (percentage sign) is the placeholder for many characters, `_` (underscore) is the placeholder for only one character. +* `greaterThan`: Checks if the result of an expression is greater than a certain value. +* `greaterEqual`: Checks if the result of an expression is greater than or equal to a certain value. +* `lessThan`: Checks if the result of an expression is less than a certain value. +* `lessEqual`: Checks if the result of an expression is less than or equal to a certain value. +* `between`: Checks if the result of an expression is between two values, inclusively. +* `inPredicate`: Checks if the result of an expression is an element of a certain list. +* `not`: Checks if the result of an expression is false. +* `regex`: Checks if the result of an expression matches some regular expression. Hazelcast offers the following ways for distributed query purposes: -- Combining Predicates with AND, OR, NOT - -- Distributed SQL Query +* Combining Predicates with AND, OR, NOT +* Distributed SQL Query #### 7.7.1.1. Employee Map Query Example -Assume that you have an `employee` map containing values of `Employee` objects, as coded below. +Assume that you have an `employee` map containing the values of `Employee` objects, as coded below. ```javascript function Employee(name, age, active, salary) { @@ -2155,7 +2137,7 @@ Employee.prototype.writeData = function (objectDataOutput) { } ``` -Note that `Employee` is an `IdentifiedDataSerializable` object. If you just want to save the `Employee` objects as byte arrays on the map, you don't need to implement its equivalent on the server-side. However, if you want to query on the `employee` map, server needs the `Employee` objects rather than byte array formats. Therefore, you need to implement its Java equivalent and its data serializable factory on server side for server to reconstitute the objects from binary formats. After implementing the Java class and its factory, you need to add the factory to the data serializable factories or the portable factories by giving a factory `id`. Here is the example XML configuration of the server. +Note that `Employee` is an `IdentifiedDataSerializable` object. If you just want to save the `Employee` objects as byte arrays on the map, you don't need to implement its equivalent on the server-side. However, if you want to query on the `employee` map, the server needs the `Employee` objects rather than byte array formats. Therefore, you need to implement its Java equivalent and its data serializable factory on the server side for server to reconstitute the objects from binary formats. After implementing the Java class and its factory, you need to add the factory to the data serializable factories or the portable factories by giving a factory `id`. The following is an example declarative configuration on the server. ```xml @@ -2171,13 +2153,13 @@ Note that `Employee` is an `IdentifiedDataSerializable` object. If you just want ``` -Note that before starting the server, you need to compile the `Employee` and `MyIdentifiedFactory` classes with server's `CLASSPATH` and add them to the `user-lib` folder in the extracted `hazelcast-.zip`. See [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). +Note that before starting the server, you need to compile the `Employee` and `MyIdentifiedFactory` classes with server's `CLASSPATH` and add them to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). See the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). -> **NOTE: You can also make this object `Portable` and implement its Java equivalent and its portable factory on the server side. Note that querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** +> **NOTE: You can also make this object `Portable` and implement its Java equivalent and portable factory on the server side. Note that querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** #### 7.7.1.2. Querying by Combining Predicates with AND, OR, NOT -You can combine predicates by using the `and`, `or`, and `not` operators, as shown in the below example. +You can combine predicates by using the `and`, `or` and `not` operators, as shown in the below example. ```javascript var map; @@ -2192,11 +2174,11 @@ client.getMap('employee').then(function (mp) { In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than 30. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. -> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast distributed map.** +> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast IMDG's distributed map.** #### 7.7.1.3. Querying with SQL -`SqlPredicate` takes the regular SQL `where` clause. Here is an example: +`SqlPredicate` takes the regular SQL `where` clause. See the following example: ```javascript var map; @@ -2237,7 +2219,7 @@ client.getMap('employee').then(function (mp) { **LIKE:** ` [NOT] LIKE 'expression'` -The `%` (percentage sign) is placeholder for multiple characters, an `_` (underscore) is placeholder for only one character. +The `%` (percentage sign) is the placeholder for multiple characters, an `_` (underscore) is the placeholder for only one character. - `name LIKE 'Jo%'` (true for 'Joe', 'Josh', 'Joseph' etc.) - `name LIKE 'Jo_'` (true for 'Joe'; false for 'Josh') @@ -2246,7 +2228,7 @@ The `%` (percentage sign) is placeholder for multiple characters, an `_` (unders **ILIKE:** ` [NOT] ILIKE 'expression'` -Similar to LIKE predicate but in a case-insensitive manner. +ILIKE is similar to the LIKE predicate but in a case-insensitive manner. - `name ILIKE 'Jo%'` (true for 'Joe', 'joe', 'jOe','Josh','joSH', etc.) - `name ILIKE 'Jo_'` (true for 'Joe' or 'jOE'; false for 'Josh') @@ -2257,7 +2239,7 @@ Similar to LIKE predicate but in a case-insensitive manner. ##### Querying Examples with Predicates -You can use `__key` attribute to perform a predicated search for entry keys. Please see the following example: +You can use the `__key` attribute to perform a predicated search for the entry keys. See the following example: ```javascript var personMap; @@ -2278,7 +2260,7 @@ client.getMap('persons').then(function (mp) { In this example, the code creates a list with the values whose keys start with the letter "F”. -You can use `this` attribute to perform a predicated search for entry values. Please see the following example: +You can use the `this` attribute to perform a predicated search for entry values. See the following example: ```javascript var personMap; @@ -2301,7 +2283,7 @@ In this example, the code creates a list with the values greater than or equal t #### 7.7.1.4. Filtering with Paging Predicates -The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values, or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. +The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. ```javascript var map; @@ -2330,32 +2312,32 @@ hazelcastClient.getMap('students').then(function (mp) { }); ``` -If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing the Node.js version, you need to implement the Java equivalent of the comparator and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that `compare` function of the `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). +If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). -Also, You can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the hundredth page, for example, it will get all 100 pages at once instead of reaching the hundredth page one by one using the `nextPage` function. +Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. ### 7.7.2. Fast-Aggregations -Fast-Aggregations provides some aggregate functions (such as sum, average, max, min) on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. +Fast-Aggregations feature provides some aggregate functions, such as `sum`, `average`, `max`, and `min`, on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. The `Aggregators` object provides a wide variety of built-in aggregators. The full list is presented below: -- count -- doubleAvg -- doubleSum -- numberAvg -- fixedPointSum -- floatingPointSum -- max -- min -- integerAvg -- integerSum -- longAvg -- longSum +- `count` +- `doubleAvg` +- `doubleSum` +- `numberAvg` +- `fixedPointSum` +- `floatingPointSum` +- `max` +- `min` +- `integerAvg` +- `integerSum` +- `longAvg` +- `longSum` You can use these aggregators with the `IMap.aggregate()` and `IMap.aggregateWithPredicate()` functions. -Let's look at the following example. +See the following example. ```javascript var map; @@ -2379,7 +2361,6 @@ hazelcastClient.getMap('brothersMap').then(function (mp) { }); ``` - # 8. Development and Testing Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or From bcda0509ece4106a0d11c476cdfb11080b9cee50 Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Thu, 1 Nov 2018 13:55:55 +0300 Subject: [PATCH 181/685] Finished copyediting the current Node.js client documentation. --- README.md | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f6d63dd3b..c0f597475 100644 --- a/README.md +++ b/README.md @@ -2371,21 +2371,33 @@ tweak the implementation to your application's needs, you can follow the steps i Follow the below steps to build and install Hazelcast Node.js client from its source: 1. Clone the GitHub repository (https://github.com/hazelcast/hazelcast-nodejs-client.git). -2. Run `npm install` to automatically download and install all required modules under `node_modules' directory. -3. Run `npm run compile` to compile TypeScript files to JavaScript. +2. Run `npm install` to automatically download and install all the required modules under `node_modules` directory. +3. Run `npm run compile` to compile TypeScript files to JavaScript. + +At this point you have all the runnable code (`.js`) and type declarations (`.d.ts`) in the `lib` directory. You may create a link to this module so that your local +applications can depend on your local copy of Hazelcast Node.js client. In order to create a link, run the below command: + +``` +npm link +``` -At this point you have all the runnable code(`.js`) and type declarations(`.d.ts`) in `lib` directory. You may create a link to this module so that your local -applications can depend on your local copy of Hazelcast Node.js client. In order to create a link, run: -- `npm link`. This will create a global link to this module in your computer. Whenever you need to depend on this module from another -local project, run: -- `npm link hazelcast-client` +local project, run the below command: + +``` +npm link hazelcast-client +``` + +If you are planning to contribute, please run the style checker, as shown below, and fix the reported issues before sending a pull request: -If you are planning to contribute, please run the style checker, as shown below, and fix the reported issues before sending a pull request. -- `npm run lint` +``` +npm run lint +``` ## 8.2. Testing + In order to test Hazelcast Node.js client locally, you will need the following: + * Java 6 or newer * Maven From 3001245cb11fa76a284fab442ad8b0cc5a86eb8a Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Mon, 5 Nov 2018 16:32:26 +0300 Subject: [PATCH 182/685] refactor getter functions in documentation (#399) --- README.md | 54 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index c0f597475..861547c69 100644 --- a/README.md +++ b/README.md @@ -439,9 +439,12 @@ let Client = require('hazelcast-client').Client; let Config = require('hazelcast-client').Config; let config = new Config.ClientConfig(); -Client.newHazelcastClient(config).then(function(client) { - let personnelMap = client.getMap('personnelMap'); - return personnelMap.put('Alice', 'IT').then(function () { +Client.newHazelcastClient(config).then(function (client) { + var personnelMap; + return client.getMap('personnelMap').then(function (mp) { + personnelMap = mp; + return personnelMap.put('Alice', 'IT'); + }).then(function () { return personnelMap.put('Bob', 'IT'); }).then(function () { return personnelMap.put('Clark', 'IT'); @@ -478,9 +481,12 @@ let Client = require('hazelcast-client').Client; let Config = require('hazelcast-client').Config; let config = new Config.ClientConfig(); -Client.newHazelcastClient(config).then(function(client) { - let personnelMap = client.getMap('personnelMap'); - return personnelMap.put('Denise', 'Sales').then(function () { +Client.newHazelcastClient(config).then(function (client) { + var personnelMap; + return client.getMap('personnelMap').then(function (mp) { + personnelMap = mp; + return personnelMap.put('Denise', 'Sales'); + }).then(function () { return personnelMap.put('Erwing', 'Sales'); }).then(function () { return personnelMap.put('Faith', 'Sales'); @@ -1468,7 +1474,9 @@ var client; var mapCustomers; Client.newHazelcastClient(clientConfig).then(function (res) { client = res; - mapCustomers = client.getMap('customers'); // creates the map proxy + return client.getMap('customers'); +}).then(function (mp) { + mapCustomers = mp; return mapCustomers.put('1', new Customer('Furkan', 'Senharputlu')); }).then(function () { return mapCustomers.put('2', new Customer("Joe", "Smith")); @@ -1536,9 +1544,11 @@ Hazelcast Map (`IMap`) is a distributed map. Through the Node.js client, you can A Map usage example is shown below. ```javascript -var map = client.getMap('myMap'); - -map.put(1, 'Furkan').then(function (oldValue) { +var map; +client.getMap('myMap').then(function (mp) { + map = mp; + return map.put(1, 'Furkan'); +}).then(function (oldValue) { return map.get(1); }).then(function (value) { console.log(value); // Furkan @@ -1553,9 +1563,11 @@ Hazelcast `MultiMap` is a distributed and specialized map where you can store mu A MultiMap usage example is shown below. ```javascript -var multiMap = client.getMultiMap('myMultiMap'); - -multiMap.put(1, 'Furkan').then(function () { +var multiMap; +client.getMultiMap('myMultiMap').then(function (mmp) { + multiMap = mmp; + return multiMap.put(1, 'Furkan') +}).then(function () { return multiMap.put(1, 'Mustafa'); }).then(function () { return multiMap.get(1); @@ -1571,9 +1583,11 @@ Hazelcast `ReplicatedMap` is a distributed key-value data structure where the da A Replicated Map usage example is shown below. ```javascript -var replicatedMap = client.getReplicatedMap('myReplicatedMap'); - -replicatedMap.put(1, 'Furkan').then(function () { +var replicatedMap; +client.getReplicatedMap('myReplicatedMap').then(function (rmp) { + replicatedMap = rmp; + return replicatedMap.put(1, 'Furkan') +}).then(function () { return replicatedMap.put(2, 'Ahmet'); }).then(function () { return replicatedMap.get(2); @@ -1589,9 +1603,11 @@ Hazelcast Queue (`IQueue`) is a distributed queue which enables all cluster memb A Queue usage example is shown below. ```javascript -var queue = client.getQueue('myQueue'); - -queue.offer('Furkan').then(function () { +var queue; +client.getQueue('myQueue').then(function (q) { + queue = q; + return queue.offer('Furkan'); +}).then(function () { return queue.peek(); }).then(function (head) { console.log(head); // Furkan From 4a2c6c767ab60c1520c8e3a2c3fd092e6027436c Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 7 Nov 2018 12:45:06 +0300 Subject: [PATCH 183/685] refactor item listeners (#396) * refactor item listeners * export listener events --- src/core/ItemListener.ts | 41 ++++++++++++++++++- src/index.ts | 7 ++++ src/proxy/ListProxy.ts | 18 ++++---- src/proxy/QueueProxy.ts | 15 ++++--- src/proxy/SetProxy.ts | 19 ++++----- test/list/ListProxyTest.js | 79 +++++++++++++++++++++++++----------- test/queue/QueueProxyTest.js | 34 ++++++++-------- test/set/SetProxyTest.js | 65 ++++++++++++++++++++--------- 8 files changed, 194 insertions(+), 84 deletions(-) diff --git a/src/core/ItemListener.ts b/src/core/ItemListener.ts index cd609ffa3..29f00c8ce 100644 --- a/src/core/ItemListener.ts +++ b/src/core/ItemListener.ts @@ -16,12 +16,51 @@ import {Member} from './Member'; +/** + * Item listener for IQueue, ISet, IList. + */ export interface ItemListener { itemAdded?: ItemEventListener; itemRemoved?: ItemEventListener; } -export type ItemEventListener = (item: E, member: Member, eventType: ItemEventType) => void; +/** + * A type which is used for item events. + */ +export type ItemEventListener = (itemEvent: ItemEvent) => void; + +/** + * IQueue, ISet, IList item event. + */ +export class ItemEvent { + + /** + * The name of the data structure for this event. + */ + name: string; + + /** + * The value of the item event. + */ + item: E; + /** + * The event type. + */ + eventType: ItemEventType; + + /** + * The member that fired this event. + */ + member: Member; + + constructor(name: string, itemEventType: ItemEventType, item: E, member: Member) { + this.name = name; + this.eventType = itemEventType; + this.item = item; + this.member = member; + } + +} export enum ItemEventType { ADDED = 1, diff --git a/src/index.ts b/src/index.ts index c30b112ed..2ebd78c1b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -32,6 +32,9 @@ import {ClassDefinition, FieldDefinition} from './serialization/portable/ClassDe import {MemberAttributeEvent, MemberAttributeOperationType} from './core/MemberAttributeEvent'; import {EvictionPolicy} from './config/EvictionPolicy'; import {InMemoryFormat} from './config/InMemoryFormat'; +import {ItemEvent, ItemEventType} from './core/ItemListener'; +import {MapEvent} from './core/MapListener'; +import {EntryEvent} from './core/EntryListener'; export { HazelcastClient as Client, @@ -54,4 +57,8 @@ export { MemberAttributeOperationType, EvictionPolicy, InMemoryFormat, + ItemEvent, + ItemEventType, + MapEvent, + EntryEvent, }; diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index 2d1c73159..9a1ba66fd 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -36,7 +36,7 @@ import {ListRemoveWithIndexCodec} from '../codec/ListRemoveWithIndexCodec'; import {ListSetCodec} from '../codec/ListSetCodec'; import {ListSizeCodec} from '../codec/ListSizeCodec'; import {ListSubCodec} from '../codec/ListSubCodec'; -import {ItemListener} from '../core/ItemListener'; +import {ItemEvent, ItemEventType, ItemListener} from '../core/ItemListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; @@ -132,15 +132,15 @@ export class ListProxy extends PartitionSpecificProxy implements IList { const listenerHandler = (message: ClientMessage) => { ListAddListenerCodec.handle(message, (element: Data, uuid: string, eventType: number) => { const responseObject = element ? this.toObject(element) : null; - let listenerFunction: Function; - if (eventType === 1) { - listenerFunction = listener.itemAdded; - } else if (eventType === 2) { - listenerFunction = listener.itemRemoved; - } - if (listenerFunction) { - listenerFunction.call(responseObject, responseObject); + const member = this.client.getClusterService().getMember(uuid); + const name = this.name; + const itemEvent = new ItemEvent(name, eventType, responseObject, member); + + if (eventType === ItemEventType.ADDED && listener.itemAdded) { + listener.itemAdded.apply(null, [itemEvent]); + } else if (eventType === ItemEventType.REMOVED && listener.itemRemoved) { + listener.itemRemoved.apply(null, [itemEvent]); } }); }; diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index c3faa35ab..972667eef 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -35,7 +35,7 @@ import {QueueRemoveCodec} from '../codec/QueueRemoveCodec'; import {QueueRemoveListenerCodec} from '../codec/QueueRemoveListenerCodec'; import {QueueSizeCodec} from '../codec/QueueSizeCodec'; import {QueueTakeCodec} from '../codec/QueueTakeCodec'; -import {ItemEventType, ItemListener} from '../core/ItemListener'; +import {ItemEvent, ItemEventType, ItemListener} from '../core/ItemListener'; import {IllegalStateError} from '../HazelcastError'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; @@ -73,10 +73,15 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } else { responseObject = this.toObject(item); } - if (eventType === ItemEventType.ADDED) { - listener.itemAdded(responseObject, null, eventType); - } else if (eventType === ItemEventType.REMOVED) { - listener.itemRemoved(responseObject, null, eventType); + + const member = this.client.getClusterService().getMember(uuid); + const name = this.name; + const itemEvent = new ItemEvent(name, eventType, responseObject, member); + + if (eventType === ItemEventType.ADDED && listener.itemAdded) { + listener.itemAdded.apply(null, [itemEvent]); + } else if (eventType === ItemEventType.REMOVED && listener.itemRemoved) { + listener.itemRemoved.apply(null, [itemEvent]); } }); }; diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index bb199685a..3b11144fe 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -28,7 +28,7 @@ import {SetIsEmptyCodec} from '../codec/SetIsEmptyCodec'; import {SetRemoveCodec} from '../codec/SetRemoveCodec'; import {SetRemoveListenerCodec} from '../codec/SetRemoveListenerCodec'; import {SetSizeCodec} from '../codec/SetSizeCodec'; -import {ItemListener} from '../core/ItemListener'; +import {ItemEvent, ItemEventType, ItemListener} from '../core/ItemListener'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {ISet} from './ISet'; @@ -89,15 +89,14 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { const handler = (message: ClientMessage) => { SetAddListenerCodec.handle(message, (item: Data, uuid: string, eventType: number) => { const responseObject = this.toObject(item); - let listenerFunction: Function; - if (eventType === 1) { - listenerFunction = listener.itemAdded; - } else if (eventType === 2) { - listenerFunction = listener.itemRemoved; - } - - if (listenerFunction) { - listenerFunction.call(responseObject, responseObject); + const member = this.client.getClusterService().getMember(uuid); + const name = this.name; + const itemEvent = new ItemEvent(name, eventType, responseObject, member); + + if (eventType === ItemEventType.ADDED && listener.itemAdded) { + listener.itemAdded.apply(null, [itemEvent]); + } else if (eventType === ItemEventType.REMOVED && listener.itemRemoved) { + listener.itemRemoved.apply(null, [itemEvent]); } }); }; diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index e8a82f8ee..512117d58 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -18,6 +18,7 @@ var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); var Util = require('./../Util'); +var ItemEventType = require('../../lib/core/ItemListener').ItemEventType; describe("List Proxy", function () { @@ -244,12 +245,12 @@ describe("List Proxy", function () { it("listens for added entry", function (done) { this.timeout(5000); var listener = { - "itemAdded": function (item) { - if (item == 1) { - done() - } else { - done(new Error("Expected 1, got " + item)) - } + itemAdded: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(1); + expect(itemEvent.eventType).to.be.equal(ItemEventType.ADDED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }; listInstance.addItemListener(listener, true).then(function () { @@ -259,15 +260,44 @@ describe("List Proxy", function () { }) }); + it("listens for added and removed entry", function (done) { + this.timeout(5000); + var added = false; + var listener = { + itemAdded: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(2); + expect(itemEvent.eventType).to.be.equal(ItemEventType.ADDED); + expect(itemEvent.member).to.not.be.equal(null); + added = true; + }, + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(2); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + expect(added).to.be.true; + done(); + } + }; + listInstance.addItemListener(listener, true).then(function () { + return listInstance.add(2); + }).then(function () { + return listInstance.remove(2); + }).catch(function (e) { + done(e); + }) + }); + it("listens for removed entry with value included", function (done) { this.timeout(5000); var listener = { - "itemRemoved": function (item) { - if (item == 1) { - done() - } else { - done(new Error("Expected 1, got " + item)) - } + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(1); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }; listInstance.addItemListener(listener, true).then(function () { @@ -282,12 +312,12 @@ describe("List Proxy", function () { it("listens for removed entry with value not included", function (done) { this.timeout(5000); var listener = { - "itemRemoved": function (item) { - if (item == null) { - done() - } else { - done(new Error("Expected 1, got " + item)) - } + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(null); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }; listInstance.addItemListener(listener, false).then(function () { @@ -303,12 +333,13 @@ describe("List Proxy", function () { it("remove entry listener", function () { this.timeout(5000); return listInstance.addItemListener({ - "itemRemoved": function (item) { - if (item == 1) { - done() - } else { - done(new Error("Expected 1, got " + item)) - } + + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(1); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }).then(function (registrationId) { return listInstance.removeItemListener(registrationId); diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index 75fbd7715..8e1028537 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -14,16 +14,18 @@ * limitations under the License. */ -var chai = require("chai"); +var chai = require('chai'); var expect = chai.expect; -var chaiAsPromised = require("chai-as-promised"); +var chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); -var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); var Util = require('./../Util'); var Promise = require('bluebird'); var fs = require('fs'); +var HazelcastClient = require('../../').Client; +var ItemEventType = require('../../').ItemEventType; + describe("Queue Proxy", function () { var cluster; @@ -316,12 +318,12 @@ describe("Queue Proxy", function () { it('addItemListener itemAdded', function (done) { queue.addItemListener({ - itemAdded: function (item) { - if (item === 'item_new') { - done(); - } else { - done(new Error('Expected item_new, got ' + item)); - } + itemAdded: function (itemEvent) { + expect(itemEvent.name).to.be.equal('ClientQueueTest'); + expect(itemEvent.item).to.be.equal('item_new'); + expect(itemEvent.eventType).to.be.equal(ItemEventType.ADDED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }, true).then(function () { queue.add('item_new'); @@ -330,7 +332,7 @@ describe("Queue Proxy", function () { it('addItemListener itemAdded with includeValue=false', function (done) { queue.addItemListener({ - itemAdded: function (item) { + itemAdded: function (itemEvent) { done(); } }, false).then(function () { @@ -341,12 +343,12 @@ describe("Queue Proxy", function () { it('addItemListener itemRemoved', function (done) { queue.addItemListener({ - itemRemoved: function (item) { - if (item === 'item0') { - done(); - } else { - done(new Error('Expected item_new, got ' + item)); - } + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('ClientQueueTest'); + expect(itemEvent.item).to.be.equal('item0'); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }, true).then(function () { queue.remove('item0'); diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index 69dbde121..0de71353d 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -15,10 +15,12 @@ */ var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; var Controller = require('./../RC'); var Util = require('./../Util'); +var HazelcastClient = require("../../lib/index.js").Client; +var ItemEventType = require('../../lib/core/ItemListener').ItemEventType; + describe("Set Proxy", function () { var cluster; @@ -158,12 +160,12 @@ describe("Set Proxy", function () { it("listens for added entry", function (done) { this.timeout(5000); setInstance.addItemListener({ - "itemAdded": function (item) { - if (item == 1) { - done() - } else { - done(new Error("Expected 1, got " + item)) - } + itemAdded: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(1); + expect(itemEvent.eventType).to.be.equal(ItemEventType.ADDED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }).then(function () { setInstance.add(1); @@ -172,15 +174,40 @@ describe("Set Proxy", function () { }); }); + it("listens for added and removed entry", function (done) { + this.timeout(5000); + setInstance.addItemListener({ + itemAdded: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(2); + expect(itemEvent.eventType).to.be.equal(ItemEventType.ADDED); + expect(itemEvent.member).to.not.be.equal(null); + }, + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(2); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + done(); + }, + }).then(function () { + return setInstance.add(2); + }).then(function () { + return setInstance.remove(2); + }).catch(function (e) { + done(e); + }); + }); + it("listens for removed entry", function (done) { this.timeout(5000); setInstance.addItemListener({ - "itemRemoved": function (item) { - if (item == 1) { - done() - } else { - done(new Error("Expected 1, got " + item)) - } + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(1); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }).then(function () { return setInstance.add(1); @@ -195,12 +222,12 @@ describe("Set Proxy", function () { it("remove entry listener", function () { this.timeout(5000); return setInstance.addItemListener({ - "itemRemoved": function (item) { - if (item == 1) { - done() - } else { - done(new Error("Expected 1, got " + item)) - } + itemRemoved: function (itemEvent) { + expect(itemEvent.name).to.be.equal('test'); + expect(itemEvent.item).to.be.equal(1); + expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); + expect(itemEvent.member).to.not.be.equal(null); + done(); } }).then(function (registrationId) { return setInstance.removeItemListener(registrationId); From 3fa27ecb0f9cb60acf4e1dfc342cc8f661360151 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 7 Nov 2018 13:11:36 +0300 Subject: [PATCH 184/685] add serialization priority to serialization chapter (#398) * add serialization priority to serialization chapter * fix language on serialization priority --- README.md | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 861547c69..88e52dbbb 100644 --- a/README.md +++ b/README.md @@ -736,11 +736,27 @@ Hazelcast serializes all your objects before sending them to the server. The `bo Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for the Java server side, respectively. -Note that if the object is not one of the above-mentioned types, the Node.js client uses `JSON Serialization` by default. +**Serialization Priority** -However, `JSON Serialization` is not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization types, such as [`IdentifiedDataSerializable` Serialization](#1-identifieddataserializable-serialization) and [`Portable` Serialization](#2-portable-serialization). +When Hazelcast Node.js client serializes an object: -On top of all, if you want to use your own serialization type, you can use a [Custom Serialization](#3-custom-serialization). +1. It first checks whether the object is null. + +2. If the above check fails, then it checks if it is an instance of `IdentifiedDataSerializable`. + +3. If the above check fails, then it checks if it is an instance of `Portable`. + +4. If the above check fails, then it checks if it is an instance of one of the default types (see above default types). + +5. If the above check fails, then it looks for a user-specified [Custom Serialization](#43-custom-serialization). + +6. If the above check fails, it will use the registered [Global Serialization](#44-global-serialization) if one exists. + +7. If the above check fails, then the Node.js client uses `JSON Serialization` by default. + +However, `JSON Serialization` is not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization methods, such as [`IdentifiedDataSerializable` Serialization](#41-identifieddataserializable-serialization) and [`Portable` Serialization](#42-portable-serialization). + +Or, if you want to use your own serialization method, you can use a [Custom Serialization](#43-custom-serialization). > **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** From c1874ddfd41d5ac0744a48fff79638f6c19d503f Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 7 Nov 2018 15:59:47 +0300 Subject: [PATCH 185/685] fix wrong word (#401) * fix wrong word * fix code snippet in doc --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 88e52dbbb..e88aae838 100644 --- a/README.md +++ b/README.md @@ -324,8 +324,10 @@ You need to create a `ClientConfig` object and adjust its properties. Then you c ```javascript let Client = require('hazelcast-client').Client; let Config = require('hazelcast-client').Config; -let cfg = new Config.ClientConfig(); -Client.newHazelcastClient(cfg) +let config = new Config.ClientConfig(); +Client.newHazelcastClient(config).then(function(client) { + // some operations +}); ``` **Declarative configuration** @@ -998,7 +1000,7 @@ From now on, Hazelcast will use `MusicianSerializer` to serialize `Musician` obj The global serializer is identical to custom serializers from the implementation perspective. The global serializer is registered as a fallback serializer to handle all other objects if a serializer cannot be located for them. -By default, JSON serialization is used if the object is not `IdentifiedDataSerializable` and `Portable` or there is no custom serializer for it. When you configure a global serializer, it is used instead of JSON serialization. +By default, JSON serialization is used if the object is not `IdentifiedDataSerializable` or `Portable` or there is no custom serializer for it. When you configure a global serializer, it is used instead of JSON serialization. You can use the global serialization for the following cases: @@ -1219,7 +1221,7 @@ Its default value is `2`. ## 5.6. Setting Connection Attempt Period -Connection timeout period is the duration in milliseconds between the connection attempts defined by `ClientNetworkConfig.connectionAttemptLimit`. +Connection attempt period is the duration in milliseconds between the connection attempts defined by `ClientNetworkConfig.connectionAttemptLimit`. The following are example configurations. From 62a955a9cdb907963f1a879bafd182ac2eeafa04 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 7 Nov 2018 16:17:13 +0300 Subject: [PATCH 186/685] add Enabling Client Statistics doc (#394) --- README.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/README.md b/README.md index e88aae838..a836d8720 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,9 @@ * [7.7.1.3. Querying with SQL](#7713-querying-with-sql) * [7.7.1.4. Filtering with Paging Predicates](#7714-filtering-with-paging-predicates) * [7.7.2. Fast-Aggregations](#772-fast-aggregations) + * [7.9. Monitoring and Logging](#79-monitoring-and-logging) + * [7.9.1. Enabling Client Statistics](#791-enabling-client-statistics) + * [7.9.2. Logging Configuration](#792-logging-configuration) * [8. Development and Testing](#8-development-and-testing) * [8.1. Building and Using Client From Sources](#81-building-and-using-client-from-sources) * [8.2. Testing](#82-testing) @@ -2395,6 +2398,40 @@ hazelcastClient.getMap('brothersMap').then(function (mp) { }); ``` +## 7.9. Monitoring and Logging + + +### 7.9.1. Enabling Client Statistics + +You can enable the client statistics before starting your clients. There are two properties related to client statistics: + +- `hazelcast.client.statistics.enabled`: If set to `true`, it enables collecting the client statistics and sending them to the cluster. When it is `true` you can monitor the clients that are connected to your Hazelcast cluster, using Hazelcast Management Center. Its default value is `false`. + +- `hazelcast.client.statistics.period.seconds`: Period in seconds the client statistics are collected and sent to the cluster. Its default value is `3`. + +You can enable client statistics and set a non-default period in seconds as follows: + +**Declarative:** + +```json +{ + "properties": { + "hazelcast.client.statistics.enabled": true, + "hazelcast.client.statistics.period.seconds": 4, + } +} +``` + +**Programmatic:** + +```javascript +var config = new Config.ClientConfig(); +config.properties['hazelcast.client.statistics.enabled'] = true; +config.properties['hazelcast.client.statistics.period.seconds'] = 4; +``` + +After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. + # 8. Development and Testing Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or From f142032bf973c031d54e6b465cb81bb6c2360518 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 9 Nov 2018 18:32:39 +0300 Subject: [PATCH 187/685] refactor interface names as Java (#402) --- src/HazelcastClient.ts | 16 ++++++++-------- .../{IReplicatedMap.ts => ReplicatedMap.ts} | 2 +- src/proxy/ReplicatedMapProxy.ts | 4 ++-- src/proxy/{IRingbuffer.ts => Ringbuffer.ts} | 2 +- src/proxy/ringbuffer/RingbufferProxy.ts | 4 ++-- src/proxy/topic/ReliableTopicListenerRunner.ts | 6 +++--- src/proxy/topic/ReliableTopicProxy.ts | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) rename src/proxy/{IReplicatedMap.ts => ReplicatedMap.ts} (99%) rename src/proxy/{IRingbuffer.ts => Ringbuffer.ts} (98%) diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 8c57f221d..c838ed7ee 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -37,8 +37,8 @@ import {IList} from './proxy/IList'; import {ILock} from './proxy/ILock'; import {IMap} from './proxy/IMap'; import {IQueue} from './proxy/IQueue'; -import {IReplicatedMap} from './proxy/IReplicatedMap'; -import {IRingbuffer} from './proxy/IRingbuffer'; +import {ReplicatedMap} from './proxy/ReplicatedMap'; +import {Ringbuffer} from './proxy/Ringbuffer'; import {ISemaphore} from './proxy/ISemaphore'; import {ISet} from './proxy/ISet'; import {MultiMap} from './proxy/MultiMap'; @@ -218,10 +218,10 @@ export default class HazelcastClient { /** * Returns a distributed ringbuffer instance with the given name. * @param name - * @returns {Promise>} + * @returns {Promise>} */ - getRingbuffer(name: string): Promise> { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE) as Promise>; + getRingbuffer(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE) as Promise>; } /** @@ -236,10 +236,10 @@ export default class HazelcastClient { /** * Returns the distributed replicated-map instance with given name. * @param name - * @returns {Promise>} + * @returns {Promise>} */ - getReplicatedMap(name: string): Promise> { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE) as Promise>; + getReplicatedMap(name: string): Promise> { + return this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE) as Promise>; } /** diff --git a/src/proxy/IReplicatedMap.ts b/src/proxy/ReplicatedMap.ts similarity index 99% rename from src/proxy/IReplicatedMap.ts rename to src/proxy/ReplicatedMap.ts index c4c6e7112..fb691fca8 100644 --- a/src/proxy/IReplicatedMap.ts +++ b/src/proxy/ReplicatedMap.ts @@ -22,7 +22,7 @@ import {DistributedObject} from '../DistributedObject'; import {ArrayComparator} from '../util/ArrayComparator'; import Long = require('long'); -export interface IReplicatedMap extends DistributedObject { +export interface ReplicatedMap extends DistributedObject { /** * Associates a given value to the specified key and replicates it to the * cluster. If there is an old value, it will be replaced by the specified diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index c430aaa8f..24bb28a9f 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -41,14 +41,14 @@ import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {assertNotNull} from '../Util'; import {ArrayComparator} from '../util/ArrayComparator'; -import {IReplicatedMap} from './IReplicatedMap'; +import {ReplicatedMap} from './ReplicatedMap'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {MapEvent} from '../core/MapListener'; /* tslint:enable:max-line-length */ import Long = require('long'); import ClientMessage = require('../ClientMessage'); -export class ReplicatedMapProxy extends PartitionSpecificProxy implements IReplicatedMap { +export class ReplicatedMapProxy extends PartitionSpecificProxy implements ReplicatedMap { put(key: K, value: V, ttl: Long | number = 0): Promise { assertNotNull(key); diff --git a/src/proxy/IRingbuffer.ts b/src/proxy/Ringbuffer.ts similarity index 98% rename from src/proxy/IRingbuffer.ts rename to src/proxy/Ringbuffer.ts index f843ff524..5d461df6c 100644 --- a/src/proxy/IRingbuffer.ts +++ b/src/proxy/Ringbuffer.ts @@ -20,7 +20,7 @@ import {OverflowPolicy} from '../core/OverflowPolicy'; import {DistributedObject} from '../DistributedObject'; import {ReadResultSet} from './ringbuffer/ReadResultSet'; -export interface IRingbuffer extends DistributedObject { +export interface Ringbuffer extends DistributedObject { /** * @return capacity of this ringbuffer. diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index 71484131e..80c60b11c 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -25,13 +25,13 @@ import {RingbufferRemainingCapacityCodec} from '../../codec/RingbufferRemainingC import {RingbufferSizeCodec} from '../../codec/RingbufferSizeCodec'; import {RingbufferTailSequenceCodec} from '../../codec/RingbufferTailSequenceCodec'; import {OverflowPolicy} from '../../core/OverflowPolicy'; -import {IRingbuffer} from '../IRingbuffer'; +import {Ringbuffer} from '../Ringbuffer'; import {PartitionSpecificProxy} from '../PartitionSpecificProxy'; import {LazyReadResultSet} from './LazyReadResultSet'; import {ReadResultSet} from './ReadResultSet'; import Long = require('long'); -export class RingbufferProxy extends PartitionSpecificProxy implements IRingbuffer { +export class RingbufferProxy extends PartitionSpecificProxy implements Ringbuffer { capacity(): Promise { return this.encodeInvoke(RingbufferCapacityCodec); diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index a27dce38c..82fdcbb1b 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -18,7 +18,7 @@ import {ReadResultSet} from '../../'; import {StaleSequenceError} from '../../HazelcastError'; import {LoggingService} from '../../logging/LoggingService'; import {SerializationService} from '../../serialization/SerializationService'; -import {IRingbuffer} from '../IRingbuffer'; +import {Ringbuffer} from '../Ringbuffer'; import {RawTopicMessage} from './RawTopicMessage'; import {ReliableTopicProxy} from './ReliableTopicProxy'; import {TopicMessage} from './TopicMessage'; @@ -28,7 +28,7 @@ export class ReliableTopicListenerRunner { public sequenceNumber: number = 0; private listener: TopicMessageListener; - private ringbuffer: IRingbuffer; + private ringbuffer: Ringbuffer; private batchSize: number; private serializationService: SerializationService; private cancelled: boolean = false; @@ -36,7 +36,7 @@ export class ReliableTopicListenerRunner { private proxy: ReliableTopicProxy; private listenerId: string; - constructor(listenerId: string, listener: TopicMessageListener, ringbuffer: IRingbuffer, + constructor(listenerId: string, listener: TopicMessageListener, ringbuffer: Ringbuffer, batchSize: number, serializationService: SerializationService, proxy: ReliableTopicProxy) { this.listenerId = listenerId; this.listener = listener; diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index b69dfff31..35ac25e2f 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -22,7 +22,7 @@ import {Address} from '../../index'; import {SerializationService} from '../../serialization/SerializationService'; import {UuidUtil} from '../../util/UuidUtil'; import {BaseProxy} from '../BaseProxy'; -import {IRingbuffer} from '../IRingbuffer'; +import {Ringbuffer} from '../Ringbuffer'; import {ITopic} from './ITopic'; import {RawTopicMessage} from './RawTopicMessage'; import {ReliableTopicListenerRunner} from './ReliableTopicListenerRunner'; @@ -35,7 +35,7 @@ export const TOPIC_INITIAL_BACKOFF = 100; export const TOPIC_MAX_BACKOFF = 2000; export class ReliableTopicProxy extends BaseProxy implements ITopic { - private ringbuffer: IRingbuffer; + private ringbuffer: Ringbuffer; private readonly localAddress: Address; private readonly batchSize: number; private readonly runners: { [key: string]: ReliableTopicListenerRunner } = {}; @@ -108,7 +108,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } } - public getRingbuffer(): IRingbuffer { + public getRingbuffer(): Ringbuffer { return this.ringbuffer; } From 7751027e5e74942f424902c4e61c14b4f62c4af9 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 14 Nov 2018 12:14:06 +0300 Subject: [PATCH 188/685] Fix enumeration of 1.2.2 - 1.2.4 (#407) --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a836d8720..2eaec0701 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ * [1.1. Requirements](#11-requirements) * [1.2. Working with Hazelcast IMDG Clusters](#12-working-with-hazelcast-imdg-clusters) * [1.2.1. Setting Up a Hazelcast IMDG Cluster](#121-setting-up-a-hazelcast-imdg-cluster) - * [1.2.2. Running Standalone Jars](#122-running-standalone-jars) - * [1.2.3. Adding User Library to CLASSPATH](#123-adding-user-library-to-classpath) - * [1.2.4. Using hazelcast-member Tool](#124-using-hazelcast-member-tool) + * [1.2.1.1. Running Standalone Jars](#1211-running-standalone-jars) + * [1.2.1.2. Adding User Library to CLASSPATH](#1212-adding-user-library-to-classpath) + * [1.2.1.3. Using hazelcast-member Tool](#1213-using-hazelcast-member-tool) * [1.3. Downloading and Installing](#13-downloading-and-installing) * [1.4. Basic Configuration](#14-basic-configuration) * [1.4.1. Configuring Hazelcast IMDG](#141-configuring-hazelcast-imdg) @@ -144,7 +144,7 @@ There are following options to start a Hazelcast IMDG cluster easily: We are going to download JARs from the website and run a standalone member for this guide. -#### 1.2.2. Running Standalone JARs +#### 1.2.1.1. Running Standalone JARs Follow the instructions below to create a Hazelcast IMDG cluster: @@ -167,7 +167,7 @@ Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED ``` -#### 1.2.3. Adding User Library to CLASSPATH +#### 1.2.1.2. Adding User Library to CLASSPATH When you want to use features such as querying and language interoperability, you might need to add your own Java classes to the Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). Then, you can start your Hazelcast member by using the start scripts in the `bin` directory. The start scripts will automatically add your compiled classes to the `CLASSPATH`. @@ -190,7 +190,7 @@ The following is an example configuration when you are adding an `IdentifiedData ``` If you want to add a `Portable` class, you should use `` instead of `` in the above configuration. -#### 1.2.4. Using hazelcast-member Tool +#### 1.2.1.3. Using hazelcast-member Tool `hazelcast-member` is a tool to download and run Hazelcast IMDG members easily. If you have brew installed, run the following commands to instal this tool: From 1c3c2fb50e3c639bde0c96c7dc94fa686dff41c9 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 14 Nov 2018 16:26:52 +0300 Subject: [PATCH 189/685] add Partition Aware documentation (#400) * add Partition Aware documentation * fix language in Partition Aware documentation --- README.md | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eaec0701..8b77ec647 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,8 @@ * [7.7.1.3. Querying with SQL](#7713-querying-with-sql) * [7.7.1.4. Filtering with Paging Predicates](#7714-filtering-with-paging-predicates) * [7.7.2. Fast-Aggregations](#772-fast-aggregations) + * [7.8. Performance](#78-performance) + * [7.8.1. Partition Aware](#781-partition-aware) * [7.9. Monitoring and Logging](#79-monitoring-and-logging) * [7.9.1. Enabling Client Statistics](#791-enabling-client-statistics) * [7.9.2. Logging Configuration](#792-logging-configuration) @@ -2398,8 +2400,89 @@ hazelcastClient.getMap('brothersMap').then(function (mp) { }); ``` -## 7.9. Monitoring and Logging +## 7.8. Performance + +### 7.8.1. Partition Aware + +Partition Aware ensures that the related entries exist on the same member. If the related data is on the same member, operations can be executed without the cost of extra network calls and extra wire data, and this improves the performance. This feature is provided by using the same partition keys for related data. + +Hazelcast has a standard way of finding out which member owns/manages each key object. The following operations are routed to the same member, since all of them are operating based on the same key `'key1'`. + +```javascript +Client.newHazelcastClient().then(function (client) { + hazelcastClient = client; + return hazelcastClient.getMap('mapA') +}).then(function (mp) { + mapA = mp; + return hazelcastClient.getMap('mapB'); +}).then(function (mp) { + mapB = mp; + return hazelcastClient.getMap('mapC'); +}).then(function (mp) { + mapC = mp; + + // since map names are different, operation is manipulating + // different entries, but the operation takes place on the + // same member since the keys ('key1') are the same + return mapA.put('key1', 'Furkan'); +}).then(function () { + return mapB.get('key1'); +}).then(function (res) { + return mapC.remove('key1'); +}).then(function () { + // lock operation is still execute on the same member + // of the cluster since the key ("key1") is same + return hazelcastClient.getLock('key1'); +}).then(function (l) { + lock = l; + return lock.lock(); +}); +``` + +When the keys are the same, entries are stored on the same member. However, we sometimes want to have the related entries stored on the same member, such as a customer and his/her order entries. We would have a customers map with `customerId` as the key and an orders map with `orderId` as the key. Since `customerId` and `orderId` are different keys, a customer and his/her orders may fall into different members in your cluster. So how can we have them stored on the same member? We create an affinity between the customer and orders. If we make them part of the same partition then these entries will be co-located. We achieve this by making `OrderKey`s `PartitionAware`. + +```javascript +function OrderKey(orderId, customerId) { + this.orderId = orderId; + this.customerId = customerId; +} + +OrderKey.prototype.getPartitionKey = function () { + return this.customerId; +}; +``` +Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. + +```javascript +var hazelcastClient; +var mapCustomers; +var mapOrders; + +Client.newHazelcastClient().then(function (client) { + hazelcastClient = client; + return hazelcastClient.getMap('customers') +}).then(function (mp) { + mapCustomers = mp; + return hazelcastClient.getMap('orders'); +}).then(function (mp) { + mapOrders = mp; + + // create the customer entry with customer id = 1 + return mapCustomers.put(1, customer); +}).then(function () { + // now create the orders for this customer + return mapOrders.putAll([ + [new OrderKey(21, 1), order], + [new OrderKey(22, 1), order], + [new OrderKey(23, 1), order] + ]); +}); +``` + +For more details, see the [PartitionAware section](https://docs.hazelcast.org/docs/latest/manual/html-single/#partitionaware) in the Hazelcast IMDG Reference Manual. + +## 7.9. Monitoring and Logging ### 7.9.1. Enabling Client Statistics From 8b2bd2bf63f544545d4982f700171d07d66a71c4 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Thu, 15 Nov 2018 13:53:46 +0300 Subject: [PATCH 190/685] Add documentation logging configuration (#406) --- README.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/README.md b/README.md index 8b77ec647..e14297592 100644 --- a/README.md +++ b/README.md @@ -2515,6 +2515,39 @@ config.properties['hazelcast.client.statistics.period.seconds'] = 4; After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. +### 7.9.2. Logging Configuration + + To configure a logger, you need to use the `ClientConfig.properties['hazelcast.logging']` property. If you set it to `'off'`, it does not log anything. + +By default, there is a `Default Logger`. Also, it is possible to connect a custom logging library to Hazelcast Node.js client through adapters. + +See the following `winston` logging library example. + +```javascript +var winstonAdapter = { + logger: new (winston.Logger)({ + transports: [ + new (winston.transports.Console)() + ] + }), + + levels: [ + 'error', + 'warn', + 'info', + 'debug', + 'silly' + ], + + log: function (level, className, message, furtherInfo) { + this.logger.log(this.levels[level], className + ' ' + message); + } +}; +config.properties['hazelcast.logging'] = winstonAdapter; +``` + +Note that it is not possible to configure custom logging via declarative configuration. + # 8. Development and Testing Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or From f309d18291debafb23fa2a77953d54deb10fe7da Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 16 Nov 2018 14:52:32 +0300 Subject: [PATCH 191/685] Mention hazelcast.client.invocation.retry.pause.millis property (#408) * mention hazelcast.client.invocation.retry.pause.millis property * fix lifecycle events explanations: A->The --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e14297592..6457e416a 100644 --- a/README.md +++ b/README.md @@ -1555,6 +1555,13 @@ You can set a timeout for retrying the operations sent to a member. This can be When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all the client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member and then the connection is lost. Since there will be no response for this operation, you will not know whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. +When invocation is being retried, the client may wait some time before it retries again. You can configure this duration for waiting using the following property: + +```javascript +config.properties['hazelcast.client.invocation.retry.pause.millis'] = 500; +``` + +The default retry wait time is `1` second. ## 7.4. Using Distributed Data Structures @@ -1875,10 +1882,10 @@ client.addDistributedObjectListener(function (distributedObjectEvent) { The `LifecycleListener` interface notifies for the following events: -* `starting`: A client is starting. -* `started`: A client has started. -* `shuttingDown`: A client is shutting down. -* `shutdown`: A client’s shutdown has completed. +* `starting`: The client is starting. +* `started`: The client has started. +* `shuttingDown`: The client is shutting down. +* `shutdown`: The client’s shutdown has completed. The following is an example of the `LifecycleListener` that is added to the `ClientConfig` object and its output. From c4e518a01ab57baa13e0416e0d029d6f09dd30fd Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Fri, 16 Nov 2018 16:34:11 +0300 Subject: [PATCH 192/685] Adding improved hazelcast-member tool content. --- README.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6457e416a..e462cad05 100644 --- a/README.md +++ b/README.md @@ -194,14 +194,66 @@ If you want to add a `Portable` class, you should use `` ins #### 1.2.1.3. Using hazelcast-member Tool -`hazelcast-member` is a tool to download and run Hazelcast IMDG members easily. If you have brew installed, run the following commands to instal this tool: +`hazelcast-member` is a tool to download and run Hazelcast IMDG members easily. You can find the installation instructions for various platforms in the following sections. + +##### Installing on Mac OS X + +If you have brew installed, run the following commands to install this tool: ``` brew tap hazelcast/homebrew-hazelcast brew install hazelcast-member ``` -Now, you can start a member by running the following command: +##### Installing on Ubuntu and Debian + +To resolve the `.deb` artifacts from Bintray, follow the below instructions. + +First, you need to import the Bintray's GPG key using the following command: + +``` +sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 379CE192D401AB61 +``` + +Then, run the following commands to add the `.deb` artifact to your system configuration file and update the lists of packages: + +``` +echo "deb https://dl.bintray.com/hazelcast/deb stable main" | sudo tee -a /etc/apt/sources.list +sudo apt-get update +``` + +Finally, run the following command to install the `hazelcast-member` tool: + +``` +sudo apt-get install hazelcast-member +``` + +##### Installing on Red Hat and CentOS + +To resolve the `RPM` artifacts from Bintray, follow the below instructions. + +First, run the following command to get a generated `.repo` file: + +``` +wget https://bintray.com/hazelcast/rpm/rpm -O bintray-hazelcast-rpm.repo +``` + +Then, install the `.repo` file using the following command: + + +``` +sudo mv bintray-hazelcast-rpm.repo /etc/yum.repos.d/ +``` + +Finally, run the following command to install the `hazelcast-member` tool: + +``` +sudo yum install hazelcast-member +``` + +--- + +After successfully installing the `hazelcast-member` tool, you can start a member by running the following command: ``` hazelcast-member start From 3c622edd1eb41294ad8ddf2753bc5fada972b708 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 16 Nov 2018 17:10:12 +0300 Subject: [PATCH 193/685] refactor 1.2.1. Setting Up a Hazelcast IMDG Cluster starting options (#411) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e462cad05..a929b3e45 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,8 @@ In order to use Hazelcast Node.js client, we first need to setup a Hazelcast IMD There are following options to start a Hazelcast IMDG cluster easily: * You can run standalone members by downloading and running JAR files from the website. -* You can embed members to your Java projects. The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) if you have brew installed in your computer. +* You can embed members to your Java projects. +* The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) if you have brew installed in your computer. We are going to download JARs from the website and run a standalone member for this guide. From fd8ea7a0d8b4e70c7cd9f40d5478ff273490e735 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Mon, 19 Nov 2018 13:26:11 +0300 Subject: [PATCH 194/685] refactor code samples as in org-website samples (#410) * refactor code samples as in org-website samples * make query example Portable --- README.md | 467 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 261 insertions(+), 206 deletions(-) diff --git a/README.md b/README.md index a929b3e45..fd5c10b52 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ * [1.4. Basic Configuration](#14-basic-configuration) * [1.4.1. Configuring Hazelcast IMDG](#141-configuring-hazelcast-imdg) * [1.4.2. Configuring Hazelcast Node.js Client](#142-configuring-hazelcast-nodejs-client) + * [1.4.2.1. Group Settings](#1421-group-settings) + * [1.4.2.2. Network Settings](#1422-network-settings) * [1.5. Basic Usage](#15-basic-usage) * [1.6. Code Samples](#16-code-samples) * [2. Features](#2-features) @@ -406,13 +408,13 @@ part that you do not explicitly set in the `hazelcast-client.json` file. If you run the Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster names as explained in the previous section. If you did, then you need to make certain changes to the network settings of your client. -### Group Settings +#### 1.4.2.1. Group Settings **Programmatic:** ```javascript let cfg = new Config.ClientConfig(); -cfg.group.name = //group name of you cluster +cfg.group.name = 'group name of your cluster' ``` **Declarative:** @@ -420,14 +422,14 @@ cfg.group.name = //group name of you cluster ```json { "group": { - "name": "group name of you cluster" + "name": "group name of your cluster" } } ``` > **NOTE: If you have a Hazelcast IMDG release older than 3.11, you need to provide also a group password along with the group name.** -### Network Settings +#### 1.4.2.2. Network Settings You need to provide the IP address and port of at least one member in your cluster so the client can find it. @@ -645,7 +647,9 @@ desired aspects. An example is shown below. var Config = require('hazelcast-client').Config; var cfg = new Config.ClientConfig(); cfg.networkConfig.addresses.push('127.0.0.1:5701'); -return HazelcastClient.newHazelcastClient(cfg); +HazelcastClient.newHazelcastClient(cfg).then(function (client) { + // some operations +}); ``` See the `ClientConfig` class documentation at [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. @@ -826,33 +830,31 @@ Or, if you want to use your own serialization method, you can use a [Custom Seri For a faster serialization of objects, Hazelcast recommends to implement the `IdentifiedDataSerializable` interface. The following is an example of an object implementing this interface: ```javascript -function Address(street, zipCode, city, state) { - this.street = street; - this.zipCode = zipCode; - this.city = city; - this.state = state; +function Employee(id, name) { + this.id = id; + this.name = name; } -Address.prototype.getClassId = function () { - return 1; +Employee.prototype.readData = function (input) { + this.id = input.readInt(); + this.name = input.readUTF(); }; -Address.prototype.getFactoryId = function () { - return 1; +Employee.prototype.writeData = function (output) { + output.writeInt(this.id); + output.writeUTF(this.name); }; -Address.prototype.writeData = function (objectDataOutput) { - objectDataOutput.writeUTF(this.street); - objectDataOutput.writeInt(this.zipCode); - objectDataOutput.writeUTF(this.city); - objectDataOutput.writeUTF(this.state); +Employee.prototype.getFactoryId = function () { + return 1000; }; -Address.prototype.readData = function (objectDataInput) { - this.street = objectDataInput.readUTF(); - this.zipCode = objectDataInput.readInt(); - this.city = objectDataInput.readUTF(); - this.state = objectDataInput.readUTF(); +Employee.prototype.getClassId = function () { + return 100; +}; + +Employee.prototype.getClassId = function () { + return this.classId; }; ``` @@ -861,14 +863,15 @@ The `IdentifiedDataSerializable` interface uses `getClassId()` and `getFactoryId A sample `IdentifiedDataSerializableFactory` could be implemented as follows: ```javascript -function MyIdentifiedFactory() { - +function SampleDataSerializableFactory() { + // Constructor function } -MyIdentifiedFactory.prototype.create = function (type) { - if (type === 1) { - return new Address(); +SampleDataSerializableFactory.prototype.create = function (type) { + if (type === 100) { + return new Employee(); } + return null; }; ``` @@ -878,7 +881,7 @@ The last step is to register the `IdentifiedDataSerializableFactory` to the `Ser ```javascript var config = new Config.ClientConfig(); -config.serializationConfig.dataSerializableFactories[1] = new MyIdentifiedFactory(); +config.serializationConfig.dataSerializableFactories[1000] = new SampleDataSerializableFactory(); ``` **Declarative Configuration:** @@ -888,16 +891,16 @@ config.serializationConfig.dataSerializableFactories[1] = new MyIdentifiedFactor "serialization": { "dataSerializableFactories": [ { - "path": "address.js", - "exportedName": "MyIdentifiedFactory", - "factoryId": 1 + "path": "factory.js", + "exportedName": "SampleDataSerializableFactory", + "factoryId": 1000 } ] } } ``` -Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that the `Address` object returns. +Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that the `Employee` object returns. ## 4.2. Portable Serialization @@ -913,27 +916,34 @@ With multiversion support, you can have two members where each of them having di Also note that portable serialization is totally language independent and is used as the binary protocol between Hazelcast server and clients. -A sample portable implementation of a `Foo` class looks like the following: +A sample portable implementation of a `Customer` class looks like the following: ```javascript -function Foo(foo) { - this.foo = foo; +function Customer(name, id, lastOrder) { + this.name = name; + this.id = id; + this.lastOrder = lastOrder; + this.classId = 1; } -Foo.prototype.getClassId = function () { - return 1; +Customer.prototype.readPortable = function (reader) { + this.name = reader.readUTF('name'); + this.id = reader.readInt('id'); + this.lastOrder = reader.readLong('lastOrder').toNumber(); }; -Foo.prototype.getFactoryId = function () { - return 1; +Customer.prototype.writePortable = function (writer) { + writer.writeUTF('name', this.name); + writer.writeInt('id', this.id); + writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); }; -Foo.prototype.writePortable = function (portableWriter) { - portableWriter.writeUTF('foo', this.foo); +Customer.prototype.getFactoryId = function () { + return PortableFactory.factoryId; }; -Foo.prototype.readPortable = function (portableReader) { - this.foo = portableReader.readUTF('foo'); +Customer.prototype.getClassId = function () { + return this.classId; }; ``` @@ -942,14 +952,15 @@ Similar to `IdentifiedDataSerializable`, a `Portable` object must provide `class A sample `PortableFactory` could be implemented as follows: ```javascript -function MyPortableFactory() { - +function PortableFactory() { + // Constructor function } -MyPortableFactory.prototype.create = function (type) { - if (type === 1) { - return new Foo(); +PortableFactory.prototype.create = function (classId) { + if (classId === 1) { + return new Customer(); } + return null; }; ``` @@ -959,7 +970,7 @@ The last step is to register the `PortableFactory` to the `SerializationConfig`. ```javascript var config = new Config.ClientConfig(); -config.serializationConfig.portableFactories[1] = new MyPortableFactory(); +config.serializationConfig.portableFactories[1] = new PortableFactory(); ``` **Declarative Configuration:** @@ -969,8 +980,8 @@ config.serializationConfig.portableFactories[1] = new MyPortableFactory(); "serialization": { "portableFactories": [ { - "path": "foo.js", - "exportedName": "MyPortableFactory", + "path": "factory.js", + "exportedName": "PortableFactory", "factoryId": 1 } ] @@ -978,60 +989,59 @@ config.serializationConfig.portableFactories[1] = new MyPortableFactory(); } ``` -Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that `Foo` object returns. +Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that `Customer` object returns. ## 4.3. Custom Serialization Hazelcast lets you plug a custom serializer to be used for serialization of objects. -Let's say you have an object `Musician` and you would like to customize the serialization. The reason might be that you want to use an external serializer for only one object. +Let's say you have an object `CustomSerializable` and you would like to customize the serialization. The reason might be that you want to use an external serializer for only one object. ```javascript -function Musician(name) { - this.name = name; +function CustomSerializable(value) { + this.value = value; } -Musician.prototype.hzGetCustomId = function () { +CustomSerializable.prototype.hzGetCustomId = function () { return 10; }; ``` -Let's say your custom `MusicianSerializer` will serialize `Musician`. +Let's say your custom `CustomSerializer` will serialize `CustomSerializable`. ```javascript -function MusicianSerializer() { - +function CustomSerializer() { + // Constructor function } -MusicianSerializer.prototype.getId = function () { +CustomSerializer.prototype.getId = function () { return 10; -} - +}; -MusicianSerializer.prototype.write = function (objectDataOutput, object) { - objectDataOutput.writeInt(object.name.length); - for (var i = 0; i < object.name.length; i++) { - objectDataOutput.writeInt(object.name.charCodeAt(i)); +CustomSerializer.prototype.write = function (output, t) { + output.writeInt(t.value.length); + for (var i = 0; i < t.value.length; i++) { + output.writeInt(t.value.charCodeAt(i)); } -} +}; -MusicianSerializer.prototype.read = function (objectDataInput) { - var len = objectDataInput.readInt(); - var name = ''; +CustomSerializer.prototype.read = function (reader) { + var len = reader.readInt(); + var str = ''; for (var i = 0; i < len; i++) { - name = name + String.fromCharCode(objectDataInput.readInt()); + str = str + String.fromCharCode(reader.readInt()); } - return new Musician(name); -} + return new CustomSerializable(str); +}; ``` -Note that the serializer `id` must be unique as Hazelcast will use it to lookup the `MusicianSerializer` while it deserializes the object. Now the last required step is to register the `MusicianSerializer` to the configuration. +Note that the serializer `id` must be unique as Hazelcast will use it to lookup the `CustomSerializer` while it deserializes the object. Now the last required step is to register the `CustomSerializer` to the configuration. **Programmatic Configuration:** ```javascript var config = new Config.ClientConfig(); -config.serializationConfig.customSerializers.push(new MusicianSerializer()); +config.serializationConfig.customSerializers.push(new CustomSerializer()); ``` **Declarative Configuration:** @@ -1043,8 +1053,8 @@ config.serializationConfig.customSerializers.push(new MusicianSerializer()); "isBigEndian": false, "serializers": [ { - "path": "Musician.js", - "exportedName": "MusicianSerializer", + "path": "custom.js", + "exportedName": "CustomSerializer", "typeId": 10 } ] @@ -1052,7 +1062,7 @@ config.serializationConfig.customSerializers.push(new MusicianSerializer()); } ``` -From now on, Hazelcast will use `MusicianSerializer` to serialize `Musician` objects. +From now on, Hazelcast will use `CustomSerializer` to serialize `CustomSerializable` objects. ## 4.4. Global Serialization @@ -1069,19 +1079,19 @@ A sample global serializer that integrates with a third party serializer is show ```javascript function GlobalSerializer() { - + // Constructor function } GlobalSerializer.prototype.getId = function () { return 20; }; -GlobalSerializer.prototype.write = function (objectDataOutput, object) { - objectDataOutput.writeByteArray(SomeThirdPartySerializer.serialize(object)) +GlobalSerializer.prototype.read = function (input) { + return MyFavoriteSerializer.deserialize(input.readByteArray()); }; -GlobalSerializer.prototype.read = function (objectDataInput) { - return SomeThirdPartySerializer.deserialize(objectDataInput.readByteArray()); +GlobalSerializer.prototype.write = function (output, obj) { + output.writeByteArray(MyFavoriteSerializer.serialize(obj)) }; ``` @@ -1101,8 +1111,8 @@ config.serializationConfig.globalSerializer = new GlobalSerializer(); "defaultNumberType": "integer", "isBigEndian": false, "globalSerializer": { - "path": "SomeThirdPartySerializer.js", - "exportedName": "SomeThirdPartySerializer" + "path": "global_serializer.js", + "exportedName": "MyFavoriteSerializer" }, } } @@ -1546,18 +1556,19 @@ Client.newHazelcastClient(clientConfig).then(function (client) { Let's create a map and populate it with some data, as shown below. ```javascript -var client; -var mapCustomers; -Client.newHazelcastClient(clientConfig).then(function (res) { - client = res; - return client.getMap('customers'); -}).then(function (mp) { - mapCustomers = mp; - return mapCustomers.put('1', new Customer('Furkan', 'Senharputlu')); +var map; +// Get the Distributed Map from Cluster. +client.getMap('my-distributed-map').then(function (mp) { + map = mp; + // Standard Put and Get. + return map.put('key', 'value'); }).then(function () { - return mapCustomers.put('2', new Customer("Joe", "Smith")); + return map.get('key'); +}).then(function (val) { + // Concurrent Map methods, optimistic updating + return map.putIfAbsent('somekey', 'somevalue'); }).then(function () { - return mapCustomers.put('3', new Customer("Muhammet", "Ali")); + return map.replace('key', 'value', 'newvalue'); }); ``` @@ -1608,13 +1619,6 @@ You can set a timeout for retrying the operations sent to a member. This can be When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all the client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member and then the connection is lost. Since there will be no response for this operation, you will not know whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. -When invocation is being retried, the client may wait some time before it retries again. You can configure this duration for waiting using the following property: - -```javascript -config.properties['hazelcast.client.invocation.retry.pause.millis'] = 500; -``` - -The default retry wait time is `1` second. ## 7.4. Using Distributed Data Structures @@ -1628,14 +1632,18 @@ A Map usage example is shown below. ```javascript var map; -client.getMap('myMap').then(function (mp) { +// Get the Distributed Map from Cluster. +client.getMap('my-distributed-map').then(function (mp) { map = mp; - return map.put(1, 'Furkan'); -}).then(function (oldValue) { - return map.get(1); -}).then(function (value) { - console.log(value); // Furkan - return map.remove(1); + // Standard Put and Get. + return map.put('key', 'value'); +}).then(function () { + return map.get('key'); +}).then(function (val) { + // Concurrent Map methods, optimistic updating + return map.putIfAbsent('somekey', 'somevalue'); +}).then(function () { + return map.replace('key', 'value', 'newvalue'); }); ``` @@ -1647,15 +1655,24 @@ A MultiMap usage example is shown below. ```javascript var multiMap; -client.getMultiMap('myMultiMap').then(function (mmp) { +// Get the Distributed MultiMap from Cluster. +hz.getMultiMap('my-distributed-multimap').then(function (mmp) { multiMap = mmp; - return multiMap.put(1, 'Furkan') + // Put values in the map against the same key + return multiMap.put('my-key', 'value1'); }).then(function () { - return multiMap.put(1, 'Mustafa'); + return multiMap.put('my-key', 'value2'); }).then(function () { - return multiMap.get(1); + return multiMap.put('my-key', 'value3'); +}).then(function () { + // Print out all the values for associated with key called "my-key" + return multiMap.get('my-key') }).then(function (values) { - console.log(values.get(0), values.get(1)); // Furkan Mustafa + for (value of values) { + console.log(value); + } + // remove specific key/value pair + return multiMap.remove('my-key', 'value2'); }); ``` @@ -1666,16 +1683,19 @@ Hazelcast `ReplicatedMap` is a distributed key-value data structure where the da A Replicated Map usage example is shown below. ```javascript -var replicatedMap; -client.getReplicatedMap('myReplicatedMap').then(function (rmp) { - replicatedMap = rmp; - return replicatedMap.put(1, 'Furkan') -}).then(function () { - return replicatedMap.put(2, 'Ahmet'); -}).then(function () { - return replicatedMap.get(2); +var map; +// Get a Replicated Map called "my-replicated-map" +hz.getReplicatedMap('my-replicated-map').then(function (rmp) { + map = rmp; + // Put and Get a value from the Replicated Map + // key/value replicated to all members + return map.put('key', 'value'); +}).then(function (replacedValue) { + console.log('replaced value = ' + replacedValue); // Will be null as its first update + return map.get('key'); }).then(function (value) { - console.log(value); // Ahmet + // The value is retrieved from a random member in the cluster + console.log('value for key = ' + value); }); ``` @@ -1687,13 +1707,26 @@ A Queue usage example is shown below. ```javascript var queue; -client.getQueue('myQueue').then(function (q) { +// Get a Blocking Queue called "my-distributed-queue" +hz.getQueue('my-distributed-queue').then(function (q) { queue = q; - return queue.offer('Furkan'); + // Offer a String into the Distributed Queue + return queue.offer('item'); +}).then(function () { + // Poll the Distributed Queue and return the String + return queue.poll(); }).then(function () { - return queue.peek(); -}).then(function (head) { - console.log(head); // Furkan + // Timed blocking Operations + return queue.offer('anotheritem', 500); +}).then(function () { + return queue.poll(5000); +}).then(function () { + // Indefinitely blocking Operations + return queue.put('yetanotheritem'); +}).then(function () { + return queue.take(); +}).then(function (value) { + console.log(value); }); ``` @@ -1705,13 +1738,26 @@ A Set usage example is shown below. ```javascript var set; -hazelcastClient.getSet('mySet').then(function (s) { +// Get the Distributed Set from Cluster. +hz.getSet('my-distributed-set').then(function (s) { set = s; - return set.add('Furkan'); + // Add items to the set with duplicates + return set.add('item1'); }).then(function () { - return set.contains('Furkan'); -}).then(function (val) { - console.log(val); // true + return set.add('item1'); +}).then(function () { + return set.add('item2'); +}).then(function () { + return set.add('item2'); +}).then(function () { + return set.add('item2'); +}).then(function () { + return set.add('item3'); +}).then(function () { + // Get the items. Note that there are no duplicates + return set.toArray(); +}).then(function (values) { + console.log(values); }); ``` @@ -1723,17 +1769,24 @@ A List usage example is shown below. ```javascript var list; -hazelcastClient.getList('myList').then(function (l) { +// Get the Distributed List from Cluster. +hz.getList('my-distributed-list').then(function (l) { list = l; - return list.add('Muhammet Ali'); -}).then(function () { - return list.add('Ahmet'); + // Add elements to the list + return list.add('item1'); }).then(function () { - return list.add('Furkan'); + return list.add('item2'); }).then(function () { + //Remove the first element + return list.removeAt(0); +}).then(function (value) { + console.log(value); + // There is only one element left return list.size(); -}).then(function (size) { - console.log(size); // 3 +}).then(function (len) { + console.log(len); + // Clear the list + return list.clear(); }); ``` @@ -1744,16 +1797,24 @@ Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that s A Ringbuffer usage example is shown below. ```javascript -var ringbuffer; -hazelcastClient.getRingbuffer('myRingbuffer').then(function (buffer) { - ringbuffer = buffer; - return ringbuffer.addAll(['Muhammet Ali', 'Ahmet', 'Furkan']); +var rb; +// Get a Ringbuffer called "rb" +hz.getRingbuffer('rb').then(function (buffer) { + rb = buffer; + return rb.add(100); }).then(function () { - return Promise.all([ - ringbuffer.readOne(0), ringbuffer.readOne(1), ringbuffer.readOne(2) - ]); -}).then(function (brothers) { - console.log(brothers); // [ 'Muhammet Ali', 'Ahmet', 'Furkan' ] + return rb.add(200); +}).then(function (value) { + // we start from the oldest item. + // if you want to start from the next item, call rb.tailSequence()+1 + return rb.headSequence(); +}).then(function (sequence) { + return rb.readOne(sequence).then(function (value) { + console.log(value); + return rb.readOne(sequence.add(1)); + }).then(function (value) { + console.log(value); + }); }); ``` @@ -1765,12 +1826,15 @@ A Reliable Topic usage example is shown below. ```javascript var topic; -hazelcastClient.getReliableTopic('myReliableTopic').then(function (t) { +// Get a Topic called "my-distributed-topic" +hz.getReliableTopic("my-distributed-topic").then(function (t) { topic = t; + // Add a Listener to the Topic topic.addMessageListener(function (message) { - console.log(message.messageObject); + console.log(message); }); - return topic.publish('Hello to distributed world!'); + // Publish a message to the Topic + return topic.publish('Hello to distributed world'); }); ``` @@ -1782,11 +1846,13 @@ A Lock usage example is shown below. ```javascript var lock; -hazelcastClient.getLock('myLock').then(function (l) { +// Get a distributed lock called "my-distributed-lock" +hz.getLock("my-distributed-lock").then(function (l) { lock = l; + // Now create a lock and execute some guarded code. return lock.lock(); }).then(function () { - // cluster wide critical section + // do something here }).finally(function () { return lock.unlock(); }); @@ -1799,14 +1865,17 @@ Hazelcast Atomic Long (`IAtomicLong`) is the distributed long which offers most An Atomic Long usage example is shown below. ```javascript -var atomicLong; -hazelcastClient.getAtomicLong('myAtomicLong').then(function (counter) { - atomicLong = counter; - return atomicLong.addAndGet(3); +var counter; +// Get an Atomic Counter, we'll call it "counter" +hz.getAtomicLong("counter").then(function (c) { + counter = c; + // Add and Get the "counter" + return counter.addAndGet(3); }).then(function (value) { - return atomicLong.get(); + return counter.get(); }).then(function (value) { - console.log('counter: ' + value); // counter: 3 + // Display the "counter" value + console.log("counter: " + value); }); ``` @@ -1924,9 +1993,9 @@ client.addDistributedObjectListener(function (distributedObjectEvent) { ); }).then(function () { var mapname = 'test'; - //this causes a created event + // this causes a created event client.getMap(mapname); - //this causes no event because map was already created + // this causes no event because map was already created client.getMap(mapname); }); ``` @@ -1935,10 +2004,10 @@ client.addDistributedObjectListener(function (distributedObjectEvent) { The `LifecycleListener` interface notifies for the following events: -* `starting`: The client is starting. -* `started`: The client has started. -* `shuttingDown`: The client is shutting down. -* `shutdown`: The client’s shutdown has completed. +* `starting`: A client is starting. +* `started`: A client has started. +* `shuttingDown`: A client is shutting down. +* `shutdown`: A client’s shutdown has completed. The following is an example of the `LifecycleListener` that is added to the `ClientConfig` object and its output. @@ -2221,40 +2290,26 @@ Employee.prototype.getFactoryId = function () { return 1; } -Employee.prototype.readData = function (objectDataInput) { - this.name = objectDataInput.readUTF(); - this.age = objectDataInput.readInt(); - this.active = objectDataInput.readBoolean(); - this.salary = objectDataInput.readDouble(); +Employee.prototype.readPortable = function (reader) { + this.name = reader.readUTF(); + this.age = reader.readInt(); + this.active = reader.readBoolean(); + this.salary = reader.readDouble(); } -Employee.prototype.writeData = function (objectDataOutput) { - objectDataOutput.writeUTF(this.name); - objectDataOutput.writeInt(this.age); - objectDataOutput.writeBoolean(this.active); - objectDataOutput.writeDouble(this.salary); +Employee.prototype.writePortable = function (writer) { + writer.writeUTF(this.name); + writer.writeInt(this.age); + writer.writeBoolean(this.active); + writer.writeDouble(this.salary); } ``` -Note that `Employee` is an `IdentifiedDataSerializable` object. If you just want to save the `Employee` objects as byte arrays on the map, you don't need to implement its equivalent on the server-side. However, if you want to query on the `employee` map, the server needs the `Employee` objects rather than byte array formats. Therefore, you need to implement its Java equivalent and its data serializable factory on the server side for server to reconstitute the objects from binary formats. After implementing the Java class and its factory, you need to add the factory to the data serializable factories or the portable factories by giving a factory `id`. The following is an example declarative configuration on the server. +Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. -```xml - - ... - - - - mypackage.MyIdentifiedFactory - - - - ... - -``` +For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). -Note that before starting the server, you need to compile the `Employee` and `MyIdentifiedFactory` classes with server's `CLASSPATH` and add them to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). See the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). - -> **NOTE: You can also make this object `Portable` and implement its Java equivalent and portable factory on the server side. Note that querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** +> **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** #### 7.7.1.2. Querying by Combining Predicates with AND, OR, NOT @@ -2344,37 +2399,37 @@ You can use the `__key` attribute to perform a predicated search for the entry k var personMap; client.getMap('persons').then(function (mp) { personMap = mp; - return personMap.put('Ahmet', 28); + return personMap.put('Alice', 35); }).then(function () { - return personMap.put('Ali', 30); + return personMap.put('Andy', 37); }).then(function () { - return personMap.put('Furkan', 23); + return personMap.put('Bob', 22); }).then(function () { - var predicate = new Predicates.sql('__key like F%'); + var predicate = new Predicates.sql('__key like A%'); return personMap.valuesWithPredicate(predicate); }).then(function (startingWithA) { - console.log(startingWithA.get(0)); // 23 + console.log(startingWithA.get(0)); // 35 }); ``` -In this example, the code creates a list with the values whose keys start with the letter "F”. +In this example, the code creates a list with the values whose keys start with the letter "A”. You can use the `this` attribute to perform a predicated search for entry values. See the following example: ```javascript var personMap; -client.getMap('persons').then(function (mp) { +return client.getMap('persons').then(function (mp) { personMap = mp; - return personMap.put('Ahmet', 28); + return personMap.put('Alice', 35); }).then(function () { - return personMap.put('Ali', 30); + return personMap.put('Andy', 37); }).then(function () { - return personMap.put('Furkan', 23); + return personMap.put('Bob', 22); }).then(function () { var predicate = new Predicates.greaterEqual('this', 27); return personMap.valuesWithPredicate(predicate); }).then(function (olderThan27) { - console.log(olderThan27.get(0), olderThan27.get(1)); // 28 30 + console.log(olderThan27.get(0), olderThan27.get(1)); // 35 37 }); ``` From 533d3cd8b9e849d4d8747ca50e9084ff1c53b8d5 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 21 Nov 2018 12:20:02 +0300 Subject: [PATCH 195/685] Migrate Promise.defer to new Promise (#414) * Migrate Promise.defer to new Promise * Use compiled DeferredPromise in tests --- src/ListenerService.ts | 8 ++++---- src/Util.ts | 15 +++++++++++++++ src/config/JsonConfigLocator.ts | 5 +++-- src/discovery/HazelcastCloudDiscovery.ts | 4 ++-- src/invocation/ClientConnection.ts | 3 ++- src/invocation/ClientConnectionManager.ts | 8 ++++---- src/invocation/ClusterService.ts | 4 ++-- src/invocation/InvocationService.ts | 3 ++- src/nearcache/NearCache.ts | 4 ++-- src/proxy/ProxyManager.ts | 5 +++-- src/proxy/flakeid/AutoBatcher.ts | 3 ++- test/HazelcastClientTest.js | 4 ++-- test/MembershipListenerTest.js | 9 +++++---- test/RC.js | 18 +++++++++--------- test/flakeid/FlakeIdGeneratorProxyTest.js | 9 +++++---- test/map/NearCachedMapStressTest.js | 12 +++++++----- test/nearcache/LostInvalidationsTest.js | 4 ++-- test/nearcache/MigratedDataTest.js | 4 ++-- .../config/CustomSerializerTest.js | 2 +- test/statistics/StatisticsTest.js | 4 ++-- 20 files changed, 76 insertions(+), 52 deletions(-) diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 2b780a971..b2d105cf3 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -27,7 +27,7 @@ import {Invocation} from './invocation/InvocationService'; import {RegistrationKey} from './invocation/RegistrationKey'; import {ListenerMessageCodec} from './ListenerMessageCodec'; import {LoggingService} from './logging/LoggingService'; -import {copyObjectShallow} from './Util'; +import {copyObjectShallow, DeferredPromise} from './Util'; import {UuidUtil} from './util/UuidUtil'; export class ListenerService implements ConnectionHeartbeatListener { @@ -110,7 +110,7 @@ export class ListenerService implements ConnectionHeartbeatListener { } invokeRegistrationFromRecord(userRegistrationKey: string, connection: ClientConnection): Promise { - const deferred = Promise.defer(); + const deferred = DeferredPromise(); const activeRegsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (activeRegsOnUserKey !== undefined && activeRegsOnUserKey.has(connection)) { deferred.resolve(activeRegsOnUserKey.get(connection)); @@ -159,7 +159,7 @@ export class ListenerService implements ConnectionHeartbeatListener { } deregisterListener(userRegistrationKey: string): Promise { - const deferred = Promise.defer(); + const deferred = DeferredPromise(); const registrationsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (registrationsOnUserKey === undefined) { deferred.resolve(false); @@ -207,7 +207,7 @@ export class ListenerService implements ConnectionHeartbeatListener { const activeConnections = copyObjectShallow(this.client.getConnectionManager().getActiveConnections()); const userRegistrationKey: string = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; - const deferred = Promise.defer(); + const deferred = DeferredPromise(); const registerRequest = codec.encodeAddRequest(this.isSmart()); connectionsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (connectionsOnUserKey === undefined) { diff --git a/src/Util.ts b/src/Util.ts index 221c0153f..bfb565353 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -16,6 +16,7 @@ import * as assert from 'assert'; import * as Long from 'long'; +import * as Promise from 'bluebird'; import * as Path from 'path'; import {JsonConfigLocator} from './config/JsonConfigLocator'; import {Comparator} from './core/Comparator'; @@ -315,3 +316,17 @@ export function cancelRepetitionTask(task: Task): void { clearTimeout(task.timeoutId); } } + +export function DeferredPromise(): Promise.Resolver { + let resolve: any; + let reject: any; + const promise = new Promise(function (): void { + resolve = arguments[0]; + reject = arguments[1]; + }); + return { + resolve, + reject, + promise, + } as Promise.Resolver; +} diff --git a/src/config/JsonConfigLocator.ts b/src/config/JsonConfigLocator.ts index 9b2c8cf9a..2c0d5b7fe 100644 --- a/src/config/JsonConfigLocator.ts +++ b/src/config/JsonConfigLocator.ts @@ -19,6 +19,7 @@ import * as fs from 'fs'; import * as Path from 'path'; import {LoggingService} from '../logging/LoggingService'; import {ConfigBuilder} from './ConfigBuilder'; +import {DeferredPromise} from '../Util'; export class JsonConfigLocator { static readonly ENV_VARIABLE_NAME = 'HAZELCAST_CLIENT_CONFIG'; @@ -60,7 +61,7 @@ export class JsonConfigLocator { loadFromWorkingDirectory(): Promise { const cwd = process.cwd(); const jsonPath = Path.resolve(cwd, JsonConfigLocator.DEFAULT_FILE_NAME); - const deferred = Promise.defer(); + const deferred = DeferredPromise(); fs.access(jsonPath, (err) => { if (err) { deferred.resolve(false); @@ -82,7 +83,7 @@ export class JsonConfigLocator { } loadPath(path: string): Promise { - const deferred = Promise.defer(); + const deferred = DeferredPromise(); fs.readFile(path, (err, data: Buffer) => { if (err) { this.logger.trace('JsonConfigLocator', 'Cannot read from ' + path.toString()); diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index 8c123ade6..f86a5c77f 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -1,5 +1,5 @@ import Address = require('../Address'); -import {AddressHelper} from '../Util'; +import {AddressHelper, DeferredPromise} from '../Util'; import {get} from 'https'; import {IncomingMessage} from 'http'; import * as Promise from 'bluebird'; @@ -40,7 +40,7 @@ export class HazelcastCloudDiscovery { } callService(): Promise> { - const deferred = Promise.defer>(); + const deferred = DeferredPromise>(); const url = URL.parse(this.endpointUrl); const endpointUrlOptions = { diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 3bfd3efcf..21e0c55e0 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -21,6 +21,7 @@ import {BuildMetadata} from '../BuildMetadata'; import HazelcastClient from '../HazelcastClient'; import {IOError} from '../HazelcastError'; import Address = require('../Address'); +import {DeferredPromise} from '../Util'; export class ClientConnection { private address: Address; @@ -69,7 +70,7 @@ export class ClientConnection { } write(buffer: Buffer): Promise { - const deferred = Promise.defer(); + const deferred = DeferredPromise(); try { this.socket.write(buffer, (err: any) => { if (err) { diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 71bc31a1f..9f4dfc400 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -23,7 +23,7 @@ import {ClientConnection} from './ClientConnection'; import {ConnectionAuthenticator} from './ConnectionAuthenticator'; import * as net from 'net'; import * as tls from 'tls'; -import {loadNameFromPath} from '../Util'; +import {DeferredPromise, loadNameFromPath} from '../Util'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {AddressTranslator} from '../connection/AddressTranslator'; import {AddressProvider} from '../connection/AddressProvider'; @@ -63,7 +63,7 @@ export class ClientConnectionManager extends EventEmitter { */ getOrConnect(address: Address, asOwner: boolean = false): Promise { const addressIndex = address.toString(); - const connectionResolver: Promise.Resolver = Promise.defer(); + const connectionResolver: Promise.Resolver = DeferredPromise(); const establishedConnection = this.establishedConnections[addressIndex]; if (establishedConnection) { @@ -170,7 +170,7 @@ export class ClientConnectionManager extends EventEmitter { } private connectTLSSocket(address: Address, configOpts: any): Promise { - const connectionResolver = Promise.defer(); + const connectionResolver = DeferredPromise(); const socket = tls.connect(address.port, address.host, configOpts); socket.once('secureConnect', () => { connectionResolver.resolve(socket); @@ -186,7 +186,7 @@ export class ClientConnectionManager extends EventEmitter { } private connectNetSocket(address: Address): Promise { - const connectionResolver = Promise.defer(); + const connectionResolver = DeferredPromise(); const socket = net.connect(address.port, address.host); socket.once('connect', () => { connectionResolver.resolve(socket); diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index c245f8ffa..82bc15783 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -25,7 +25,7 @@ import HazelcastClient from '../HazelcastClient'; import {IllegalStateError} from '../HazelcastError'; import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; -import {AddressHelper} from '../Util'; +import {AddressHelper, DeferredPromise} from '../Util'; import {MemberAttributeEvent, MemberAttributeOperationType} from '../core/MemberAttributeEvent'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); @@ -223,7 +223,7 @@ export class ClusterService extends EventEmitter { const error = new IllegalStateError(errorMessage, cause); return Promise.reject(error); } else { - const deferred = Promise.defer(); + const deferred = DeferredPromise(); setTimeout( () => { this.tryConnectingToAddresses(0, remainingAttemptLimit, attemptPeriod).then(() => { diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 1ac5297d7..7ce70ec2e 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -30,6 +30,7 @@ import {LoggingService} from '../logging/LoggingService'; import {ClientConnection} from './ClientConnection'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); +import {DeferredPromise} from '../Util'; const EXCEPTION_MESSAGE_TYPE = 109; const MAX_FAST_INVOCATION_COUNT = 5; @@ -131,7 +132,7 @@ export class InvocationService { invoke(invocation: Invocation): Promise { const newCorrelationId = Long.fromNumber(this.correlationCounter++); - invocation.deferred = Promise.defer(); + invocation.deferred = DeferredPromise(); invocation.request.setCorrelationId(newCorrelationId); this.doInvoke(invocation); return invocation.deferred.promise; diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index eef4d1d62..e61aec320 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -21,7 +21,7 @@ import {NearCacheConfig} from '../config/NearCacheConfig'; import {DataKeyedHashMap} from '../DataStoreHashMap'; import {Data} from '../serialization/Data'; import {SerializationService} from '../serialization/SerializationService'; -import {shuffleArray} from '../Util'; +import {DeferredPromise, shuffleArray} from '../Util'; import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; import {DataRecord} from './DataRecord'; import {StaleReadDetector} from './StaleReadDetector'; @@ -108,7 +108,7 @@ export class NearCacheImpl implements NearCache { this.evictionCandidatePool = []; this.internalStore = new DataKeyedHashMap(); - this.ready = Promise.defer(); + this.ready = DeferredPromise(); } setReady(): void { diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index f8b261538..02fcd95cc 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -43,6 +43,7 @@ import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; import {DistributedObjectEvent, DistributedObjectListener} from '../core/DistributedObjectListener'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); +import {DeferredPromise} from '../Util'; export class ProxyManager { public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; @@ -92,7 +93,7 @@ export class ProxyManager { if (this.proxies[serviceName + name]) { return Promise.resolve(this.proxies[serviceName + name]); } else { - const deferred = Promise.defer (); + const deferred = DeferredPromise(); let newProxy: DistributedObject; if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().getNearCacheConfig(name)) { newProxy = new NearCachedMapProxy(this.client, serviceName, name); @@ -154,7 +155,7 @@ export class ProxyManager { } private createProxy(proxyObject: DistributedObject): Promise { - const promise = Promise.defer(); + const promise = DeferredPromise(); this.initializeProxy(proxyObject, promise, Date.now() + this.invocationTimeoutMillis); return promise.promise; } diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index 32875294c..a9d747f64 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -17,6 +17,7 @@ import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import * as Long from 'long'; +import {DeferredPromise} from '../../Util'; export class Batch { private nextIdLong: Long; @@ -85,7 +86,7 @@ export class AutoBatcher { } nextId(): Promise { - const deferred = Promise.defer(); + const deferred = DeferredPromise(); this.queue.push(deferred); this.processIdRequests(); return deferred.promise; diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 82cc57c4a..2f0534dd7 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -18,7 +18,7 @@ var expect = require('chai').expect; var Config = require('../.').Config; var Controller = require('./RC'); var HazelcastClient = require('../.').Client; -var Promise = require('bluebird'); +var DeferredPromise = require('../lib/Util').DeferredPromise; var dummyConfig = new Config.ClientConfig(); dummyConfig.networkConfig.smartRouting = false; @@ -52,7 +52,7 @@ ManagedObjects.prototype.destroyAll = function () { }; ManagedObjects.prototype.destroy = function (name) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); this.managedObjects.filter((el) => { if (el.getName() === name) { el.destroy().then(function () { diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index 1abbcbcce..31ff22fa1 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -17,8 +17,9 @@ var HazelcastClient = require('../.').Client; var Controller = require('./RC'); var expect = require('chai').expect; -var Promise = require('bluebird'); -var MemberAttributeOperationType = require('../.').MemberAttributeOperationType +var DeferredPromise = require('../lib/Util').DeferredPromise; +var MemberAttributeOperationType = require('../.').MemberAttributeOperationType; + describe('MembershipListener', function () { this.timeout(10000); var cluster; @@ -49,7 +50,7 @@ describe('MembershipListener', function () { it('sees member added event', function (done) { var newMember; var err = undefined; - var listenerCalledResolver = Promise.defer(); + var listenerCalledResolver = DeferredPromise(); client.clusterService.on('memberAdded', function (member) { listenerCalledResolver.resolve(member); @@ -73,7 +74,7 @@ describe('MembershipListener', function () { it('sees member removed event', function (done) { var newMember; - var listenerCalledResolver = Promise.defer(); + var listenerCalledResolver = DeferredPromise(); client.clusterService.on('memberRemoved', function (member) { listenerCalledResolver.resolve(member); diff --git a/test/RC.js b/test/RC.js index f8d89874f..835c7c746 100644 --- a/test/RC.js +++ b/test/RC.js @@ -15,12 +15,12 @@ */ var RemoteController = require('hazelcast-remote-controller'); -var Promise = require('bluebird'); +var DeferredPromise = require('../lib/Util').DeferredPromise; var controller = new RemoteController('localhost', 9701); function createCluster(hzVersion, config) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.createCluster(hzVersion, config, function (err, cluster) { if (err) return deferred.reject(err); return deferred.resolve(cluster); @@ -29,7 +29,7 @@ function createCluster(hzVersion, config) { } function startMember(clusterId) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.startMember(clusterId, function (err, member) { if (err) return deferred.reject(err); return deferred.resolve(member); @@ -38,7 +38,7 @@ function startMember(clusterId) { } function exit() { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.exit(function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -47,7 +47,7 @@ function exit() { } function shutdownMember(clusterId, memberUuid) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.shutdownMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -56,7 +56,7 @@ function shutdownMember(clusterId, memberUuid) { } function shutdownCluster(clusterId) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.shutdownCluster(clusterId, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -65,7 +65,7 @@ function shutdownCluster(clusterId) { } function terminateMember(clusterId, memberUuid) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.terminateMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -74,7 +74,7 @@ function terminateMember(clusterId, memberUuid) { } function terminateCluster(clusterId) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.terminateCluster(clusterId, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -83,7 +83,7 @@ function terminateCluster(clusterId) { } function executeOnController(clusterId, script, lang) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); controller.executeOnController(clusterId, script, lang, function (err, res) { if (err) return deferred.reject(err); if (res.success === false) return deferred.reject(res.message); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index a26433a68..96712a234 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -111,7 +111,7 @@ describe("FlakeIdGeneratorProxyTest", function () { flakeIdGenerator = idGenerator; return flakeIdGenerator.newId() }).then(function (id) { - firstId=id; + firstId = id; return flakeIdGenerator.newId(); }).then(function (secondId) { return expect(secondId.equals(firstId.add(FLAKE_ID_STEP))).to.be.true; @@ -124,7 +124,7 @@ describe("FlakeIdGeneratorProxyTest", function () { flakeIdGenerator = idGenerator; return flakeIdGenerator.newId() }).then(function (id) { - firstId=id; + firstId = id; return Util.promiseWaitMilliseconds(SHORT_TERM_VALIDITY_MILLIS + 1000); }).then(function () { return flakeIdGenerator.newId(); @@ -140,7 +140,7 @@ describe("FlakeIdGeneratorProxyTest", function () { flakeIdGenerator = idGenerator; return flakeIdGenerator.newId() }).then(function (id) { - firstId=id; + firstId = id; return flakeIdGenerator.newId(); }).then(function () { //after this we exhausted the batch at hand @@ -152,6 +152,7 @@ describe("FlakeIdGeneratorProxyTest", function () { }).then(function (secondId) { var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; - });; + }); + ; }); }); diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index 3384b1c15..e06b3865e 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -15,12 +15,14 @@ */ var expect = require('chai').expect; -var Promise = require('bluebird'); -var Config = require('../../.').Config; -var HazelcastClient = require('../../.').Client; -var Controller = require('../RC'); var fs = require('fs'); + +var DeferredPromise = require('../../lib/Util').DeferredPromise; var getRandomInt = require('../Util').getRandomInt; +var Controller = require('../RC'); + +var Config = require('../../.').Config; +var HazelcastClient = require('../../.').Client; describe('NearCachedMapStress', function () { @@ -33,7 +35,7 @@ describe('NearCachedMapStress', function () { var completedOperations = 0; var concurrencyLevel = 32; var totalNumOperations = 100000; - var completedDeferred = Promise.defer(); + var completedDeferred = DeferredPromise(); var putPercent = 15; var removePercent = 20; var getPercent = 100 - putPercent - removePercent; diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index 5b9214e7d..32bddeb9b 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -21,7 +21,7 @@ var Config = require('../../').Config; var fs = require('fs'); var Long = require('long'); var Util = require('../Util'); -var Promise = require('bluebird'); +var DeferredPromise = require('../../lib/Util').DeferredPromise; describe('LostInvalidation', function () { this.timeout(30000); @@ -159,7 +159,7 @@ describe('LostInvalidation', function () { var correlationId = clientRegistrationKey.correlationId; var handler = client.getInvocationService().eventHandlers[correlationId.toNumber()].handler; var numberOfBlockedInvalidations = 0; - var deferred = Promise.defer(); + var deferred = DeferredPromise(); client.getInvocationService().eventHandlers[correlationId.toNumber()].handler = function () { numberOfBlockedInvalidations++; if (notifyAfterNumberOfEvents !== undefined && notifyAfterNumberOfEvents === numberOfBlockedInvalidations) { diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index 63cb8871b..72f6bf242 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -21,7 +21,7 @@ var Config = require('../../').Config; var fs = require('fs'); var Long = require('long'); var Util = require('../Util'); -var Promise = require('bluebird'); +var DeferredPromise = require('../../lib/Util').DeferredPromise; var Address = require('../../.').Address; describe('MigratedData', function () { @@ -110,7 +110,7 @@ describe('MigratedData', function () { }); function waitUntilPartitionMovesTo(partitionService, partitionId, address) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); (function resolveOrTimeout(remainingTries) { if (partitionService.getAddressForPartition(partitionId).equals(address)) { deferred.resolve(); diff --git a/test/serialization/config/CustomSerializerTest.js b/test/serialization/config/CustomSerializerTest.js index 471abdd97..96eabfbb2 100644 --- a/test/serialization/config/CustomSerializerTest.js +++ b/test/serialization/config/CustomSerializerTest.js @@ -43,7 +43,7 @@ describe('CustomSerializer', function () { var map; return client.getMap('musicians').then(function (mp) { map = mp; - return map.put('neyzen',m); + return map.put('neyzen', m); }).then(function () { return map.get('neyzen'); }).then(function (res) { diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index 51795f3c4..e0dba3cfe 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -15,7 +15,7 @@ */ var expect = require('chai').expect; -var Promise = require('bluebird'); +var DeferredPromise = require('../../lib/Util').DeferredPromise; var RC = require('../RC'); var Client = require('../../').Client; @@ -211,7 +211,7 @@ describe('Statistics with negative period', function () { }); function getClientStatisticsFromServer(cluster) { - var deferred = Promise.defer(); + var deferred = DeferredPromise(); var script = 'client0=instance_0.getClientService().getConnectedClients().' + 'toArray()[0]\nresult=client0.getClientStatistics();'; RC.executeOnController(cluster.id, script, 1).then(function (response) { From b41d72e73c7fa1018c4a96f02e3cf09e57a7edb1 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 21 Nov 2018 12:20:40 +0300 Subject: [PATCH 196/685] Update benchmark (#416) --- benchmark/SimpleMapBenchmark.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/benchmark/SimpleMapBenchmark.js b/benchmark/SimpleMapBenchmark.js index ddebf4033..17e90f01c 100644 --- a/benchmark/SimpleMapBenchmark.js +++ b/benchmark/SimpleMapBenchmark.js @@ -35,13 +35,21 @@ var Test = { } }; var Client = require('../.').Client; -Client.newHazelcastClient().then(function (hazelcastClient) { - Test.map = hazelcastClient.getMap('default'); +var hazelcastClient; + +Client.newHazelcastClient().then(function (client) { + hazelcastClient = client; + return hazelcastClient.getMap('default'); +}).then(function (mp) { + Test.map = mp; + var start; Test.finishCallback = function (finish) { console.log('Took ' + (finish - start) / 1000 + ' seconds for ' + REQ_COUNT + ' requests'); console.log('Ops/s: ' + REQ_COUNT / ((finish - start) / 1000)); - hazelcastClient.shutdown(); + Test.map.destroy().then(function () { + hazelcastClient.shutdown(); + }); }; start = new Date(); Test.run(); From 2ad86282cd2cd3282a91af5dcfb0fa76b82cf615 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 21 Nov 2018 13:21:41 +0300 Subject: [PATCH 197/685] add Near Cache documentation (#405) * add Near Cache documentation * fix language in near cache documentation --- README.md | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/README.md b/README.md index fd5c10b52..a7c8d78ff 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,13 @@ * [7.7.2. Fast-Aggregations](#772-fast-aggregations) * [7.8. Performance](#78-performance) * [7.8.1. Partition Aware](#781-partition-aware) + * [7.8.2. Near Cache](#782-near-cache) + * [7.8.2.1. Configuring Near Cache](#7821-configuring-near-cache) + * [7.8.2.2. Near Cache Example for Map](#7822-near-cache-example-for-map) + * [7.8.2.3. Near Cache Eviction](#7823-near-cache-eviction) + * [7.8.2.4. Near Cache Expiration](#7824-near-cache-expiration) + * [7.8.2.5. Near Cache Invalidation](#7825-near-cache-invalidation) + * [7.8.2.6. Near Cache Eventual Consistency](#7826-near-cache-eventual-consistency) * [7.9. Monitoring and Logging](#79-monitoring-and-logging) * [7.9.1. Enabling Client Statistics](#791-enabling-client-statistics) * [7.9.2. Logging Configuration](#792-logging-configuration) @@ -2597,6 +2604,151 @@ Client.newHazelcastClient().then(function (client) { For more details, see the [PartitionAware section](https://docs.hazelcast.org/docs/latest/manual/html-single/#partitionaware) in the Hazelcast IMDG Reference Manual. +### 7.8.2. Near Cache + +Map entries in Hazelcast are partitioned across the cluster members. Hazelcast clients do not have local data at all. Suppose you read the key `k` a number of times from a Hazelcast client and `k` is owned by a member in your cluster. Then each `map.get(k)` will be a remote operation, which creates a lot of network trips. If you have a map that is mostly read, then you should consider creating a local Near Cache, so that reads are sped up and less network traffic is created. + +These benefits do not come for free, please consider the following trade-offs: + +- If invalidation is enabled and entries are updated frequently, then invalidations will be costly. + +- Near Cache breaks the strong consistency guarantees; you might be reading stale data. + +- Clients with a Near Cache will have to hold the extra cached data, which increases memory consumption. + +Near Cache is highly recommended for maps that are mostly read. + +#### 7.8.2.1. Configuring Near Cache + +The following snippets show how a Near Cache is configured in the Node.js client, presenting all available values for each element: + +**Declarative:** + +``` +{ + "nearCaches": [ + { + "name": "mostlyReadMap", + "invalidateOnChange": (false|true), + "timeToLiveSeconds": (0..Number.MAX_SAFE_INTEGER), + "maxIdleSeconds": (0..Number.MAX_SAFE_INTEGER), + "inMemoryFormat": "(object|binary)", + "evictionPolicy": "lru|lfu|random|none", + "evictionMaxSize": (0..Number.MAX_SAFE_INTEGER), + "evictionSamplingCount": (0..Number.MAX_SAFE_INTEGER), + "evictionSamplingPoolSize": (0..Number.MAX_SAFE_INTEGER), + } + ] +} +``` + +**Programmatic:** + +```javascript +var nearCacheConfig = new Config.NearCacheConfig(); +nearCacheConfig.name = 'mostlyReadMap'; +nearCacheConfig.invalidateOnChange = (false|true); +nearCacheConfig.timeToLiveSeconds = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.maxIdleSeconds = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.inMemoryFormat= (InMemoryFormat.OBJECT|InMemoryFormat.BINARY); +nearCacheConfig.evictionPolicy = (EvictionPolicy.LRU|EvictionPolicy.LFU|EvictionPolicy.RANDOM|EvictionPolicy.NONE); +nearCacheConfig.evictionMaxSize = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.evictionSamplingCount = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.evictionSamplingPoolSize = (0..Number.MAX_SAFE_INTEGER); + +cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +``` + +Following are the descriptions of all configuration elements: + +- `inMemoryFormat`: Specifies in which format data will be stored in your Near Cache. Note that a map’s in-memory format can be different from that of its Near Cache. Available values are as follows: + - `BINARY`: Data will be stored in serialized binary format (default value). + - `OBJECT`: Data will be stored in deserialized form. + +- `invalidateOnChange`: Specifies whether the cached entries are evicted when the entries are updated or removed in members. Its default value is true. + +- `timeToLiveSeconds`: Maximum number of seconds for each entry to stay in the Near Cache. Entries that are older than this period are automatically evicted from the Near Cache. Regardless of the eviction policy used, `timeToLiveSeconds` still applies. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. + +- `maxIdleSeconds`: Maximum number of seconds each entry can stay in the Near Cache as untouched (not read). Entries that are not read more than this period are removed from the Near Cache. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. + +- `evictionPolicy`: Eviction policy configuration. Available values are as follows: + - `LRU`: Least Recently Used (default value). + - `LFU`: Least Frequently Used. + - `NONE`: No items are evicted and the `evictionMaxSize` property is ignored. You still can combine it with `timeToLiveSeconds` and `maxIdleSeconds` to evict items from the Near Cache. + - `RANDOM`: A random item is evicted. + +- `evictionMaxSize`: Maximum number of entries kept in the memory before eviction kicks in. +- `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. +- `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. + +#### 7.8.2.2. Near Cache Example for Map + +The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. + +**Declarative:** + +``` +{ + "nearCaches": [ + { + "name": "mostlyReadMap", + "inMemoryFormat": "object", + "invalidateOnChange": true, + "evictionPolicy": "lru", + "evictionMaxSize": 5000, + } + ] +} +``` + +**Programmatic:** + +```javascript +var nearCacheConfig = new Config.NearCacheConfig(); +nearCacheConfig.name = "mostlyReadMap"; +nearCacheConfig.inMemoryFormat= InMemoryFormat.OBJECT; +nearCacheConfig.invalidateOnChange = true; +nearCacheConfig.evictionPolicy = EvictionPolicy.LRU; +nearCacheConfig.evictionMaxSize = 5000; + +cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +``` + +#### 7.8.2.3. Near Cache Eviction + +In the scope of Near Cache, eviction means evicting (clearing) the entries selected according to the given `evictionPolicy` when the specified `evictionMaxSize` has been reached. + +The `evictionMaxSize` defines the entry count when the Near Cache is full and determines whether the eviction should be triggered. + +Once the eviction is triggered the configured `evictionPolicy` determines which, if any, entries must be evicted. + +#### 7.8.2.4. Near Cache Expiration + +Expiration means the eviction of expired records. A record is expired: + +- if it is not touched (accessed/read) for `maxIdleSeconds` + +- `timeToLiveSeconds` passed since it is put to Near Cache + +The actual expiration is performed when a record is accessed: it is checked if the record is expired or not. If it is expired, it is evicted and `undefined` is returned as the value to the caller. + + +#### 7.8.2.5. Near Cache Invalidation + +Invalidation is the process of removing an entry from the Near Cache when its value is updated or it is removed from the original map (to prevent stale reads). See the [Near Cache Invalidation section](https://docs.hazelcast.org/docs/latest/manual/html-single/#near-cache-invalidation) in the Hazelcast IMDG Reference Manual. + +#### 7.8.2.6. Near Cache Eventual Consistency + +Near Caches are invalidated by invalidation events. Invalidation events can be lost due to the fire-and-forget fashion of eventing system. If an event is lost, reads from Near Cache can indefinitely be stale. + +To solve this problem, Hazelcast provides eventually consistent behavior for Map Near Caches by detecting invalidation losses. After detection of an invalidation loss, stale data will be made unreachable and Near Cache’s `get` calls to that data will be directed to underlying Map to fetch the fresh data. + +You can configure eventual consistency with the `ClientConfig.properties` below: + +- `hazelcast.invalidation.max.tolerated.miss.count`: Default value is `10`. If missed invalidation count is bigger than this value, relevant cached data will be made unreachable. + +- `hazelcast.invalidation.reconciliation.interval.seconds`: Default value is `60` seconds. This is a periodic task that scans cluster members periodically to compare generated invalidation events with the received ones from the client Near Cache. + ## 7.9. Monitoring and Logging ### 7.9.1. Enabling Client Statistics From 4ff9d8bbd97d9d7e009f5c364f4eed71f1fed74b Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 23 Nov 2018 14:59:16 +0300 Subject: [PATCH 198/685] add documentation for map, entry, item, message listeners (#397) --- README.md | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a7c8d78ff..eb59bcc10 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,10 @@ * [7.5.1.2. Listening for Distributed Object Events](#7512-listening-for-distributed-object-events) * [7.5.1.3. Listening for Lifecycle Events](#7513-listening-for-lifecycle-events) * [7.5.2. Distributed Data Structure Events](#752-distributed-data-structure-events) - * [7.5.2.1. Listening for Map Events](#7521-listening-for-map-events) + * [7.5.2.1. Map Listener](#7521-map-listener) + * [7.5.2.2. Entry Listener](#7522-entry-listener) + * [7.5.2.3. Item Listener](#7523-item-listener) + * [7.5.2.4. Message Listener](#7524-message-listener) * [7.6. Distributed Computing](#76-distributed-computing) * [7.6.1. Using EntryProcessor](#761-using-entryprocessor) * [7.7. Distributed Query](#77-distributed-query) @@ -2055,7 +2058,9 @@ You can add event listeners to the distributed data structures. > **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** -#### 7.5.2.1. Listening for Map Events +#### 7.5.2.1. Map Listener + +The Map Listener is used by the Hazelcast `Map`. You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. @@ -2095,6 +2100,114 @@ map.addEntryListener(mapEventListener).then(function () { }); ``` +As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. + +#### 7.5.2.2. Entry Listener + +The Entry Listener is used by the Hazelcast `MultiMap` and `ReplicatedMap`. + +You can listen to map-wide or entry-based events by using the functions in the `EntryListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `EntryListener` interface. + +An entry-based event is fired after the operations that affect a specific entry. For example, `MultiMap.put()`, `MultiMap.remove()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. + +```javascript +var entryEventListener = { + added: function (entryEvent) { + console.log('Entry Added:', entryEvent.key, entryEvent.value); // Entry Added: 1 Furkan + } +}; +return mmp.addEntryListener(entryEventListener, undefined, true).then(function () { + return mmp.put('1', 'Furkan'); +}); +``` + +A map-wide event is fired as a result of a map-wide operation. For example, `MultiMap.clear()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. + +See the following example. + +```javascript +var mapEventListener = { + mapCleared: function (mapEvent) { + console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 1 + } +}; +mmp.addEntryListener(mapEventListener).then(function () { + return mmp.put('1', 'Muhammet Ali'); +}).then(function () { + return mmp.put('1', 'Ahmet'); +}).then(function () { + return mmp.put('1', 'Furkan'); +}).then(function () { + return mmp.clear(); +}); +``` + +Note that all functions in the `EntryListener` interface is not supported by MultiMap and Replicated Map. See the following headings to see supported listener functions for each data structure. + +**Supported MultiMap Listener Functions** + +- `added` +- `removed` +- `mapCleared` + +**Supported Replicated Map Functions** + +- `added` +- `removed` +- `updated` +- `evicted` +- `mapCleared` + +As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. + +#### 7.5.2.3. Item Listener + +The Item Listener is used by the Hazelcast `Queue`, `Set` and `List`. + +You can listen to item events by implementing the functions in the `ItemListener` interface including `itemAdded` and `itemRemoved`. These functions are invoked when an item is added or removed. + +The following is an example of item listener object and its registration to the `Set`. It also applies to `Queue` and `List`. + +```javascript +var itemListener = { + itemAdded: function (itemEvent) { + console.log('Item Added:', itemEvent.item); // Item Added: Furkan + }, + itemRemoved: function (itemEvent) { + console.log('Item Removed:', itemEvent.item); // Item Removed: Furkan + } +}; +return set.addItemListener(itemListener, true).then(function () { + return set.add('Furkan'); +}).then(function () { + return set.remove('Furkan'); +}); +``` + +As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the item event contains the item value. + +#### 7.5.2.4. Message Listener + +The Message Listener is used by the Hazelcast `Reliable Topic`. + +You can listen to message events. To listen to these events, you need to implement the `TopicMessageListener` function that is a `TopicMessage` object is passed to. + +See the following example. + +```javascript +topic.addMessageListener(function (topicMessage) { + console.log(topicMessage.messageObject); +}); + +var engineer = { + name: 'Furkan Senharputlu', + age: 23, + field: 'Computer Engineering', + university: 'Bogazici University' +} +topic.publish(engineer); +``` + ## 7.6. Distributed Computing This chapter explains how you can use Hazelcast IMDG's entry processor implementation in the Node.js client. From f85ecd49073f40e052b5fa2c6862e01c830da766 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 23 Nov 2018 16:03:06 +0300 Subject: [PATCH 199/685] make more clear the usage of client statistics (#413) --- README.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eb59bcc10..687436a3c 100644 --- a/README.md +++ b/README.md @@ -2866,7 +2866,21 @@ You can configure eventual consistency with the `ClientConfig.properties` below: ### 7.9.1. Enabling Client Statistics -You can enable the client statistics before starting your clients. There are two properties related to client statistics: +You can monitor your clients using Hazelcast Management Center. + +As a prerequisite, you need to enable the client statistics before starting your clients. This can be done by setting the `hazelcast.client.statistics.enabled` system property to `true` on the **member** as the following: + +```xml + + ... + + true + + ... + +``` + +Also, you need to enable the client statistics in the Node.js client. There are two properties related to client statistics: - `hazelcast.client.statistics.enabled`: If set to `true`, it enables collecting the client statistics and sending them to the cluster. When it is `true` you can monitor the clients that are connected to your Hazelcast cluster, using Hazelcast Management Center. Its default value is `false`. From f59d80ab173035d3be3ea48bf21cbba295951bda Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Mon, 26 Nov 2018 10:12:10 +0300 Subject: [PATCH 200/685] Fix wrong word (#420) --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 687436a3c..6b86ed533 100644 --- a/README.md +++ b/README.md @@ -2100,7 +2100,7 @@ map.addEntryListener(mapEventListener).then(function () { }); ``` -As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. +As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. #### 7.5.2.2. Entry Listener @@ -2144,13 +2144,13 @@ mmp.addEntryListener(mapEventListener).then(function () { Note that all functions in the `EntryListener` interface is not supported by MultiMap and Replicated Map. See the following headings to see supported listener functions for each data structure. -**Supported MultiMap Listener Functions** +**Entry Listener Functions Supported by MultiMap** - `added` - `removed` - `mapCleared` -**Supported Replicated Map Functions** +**Entry Listener Functions Supported by Replicated Map** - `added` - `removed` @@ -2158,7 +2158,7 @@ Note that all functions in the `EntryListener` interface is not supported by Mul - `evicted` - `mapCleared` -As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. +As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. #### 7.5.2.3. Item Listener @@ -2190,7 +2190,7 @@ As you see, there is a parameter in the `addItemListener` function: `includeValu The Message Listener is used by the Hazelcast `Reliable Topic`. -You can listen to message events. To listen to these events, you need to implement the `TopicMessageListener` function that is a `TopicMessage` object is passed to. +You can listen to message events. To listen to these events, you need to implement the `TopicMessageListener` function to which a `TopicMessage` object is passed. See the following example. From 8e185e86dc3639ef48da1f22bc2b763848b9badd Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Tue, 27 Nov 2018 11:46:06 +0300 Subject: [PATCH 201/685] Refactor TopicMessageLister naming as Java (#421) --- README.md | 6 ++--- src/proxy/topic/ITopic.ts | 4 ++-- .../topic/{TopicMessage.ts => Message.ts} | 2 +- ...cMessageListener.ts => MessageListener.ts} | 4 ++-- .../topic/ReliableTopicListenerRunner.ts | 16 ++++++------- ...opicMessage.ts => ReliableTopicMessage.ts} | 4 ++-- src/proxy/topic/ReliableTopicProxy.ts | 24 +++++++++---------- src/serialization/SerializationService.ts | 2 +- test/topic/TopicTest.js | 4 ++-- 9 files changed, 33 insertions(+), 33 deletions(-) rename src/proxy/topic/{TopicMessage.ts => Message.ts} (96%) rename src/proxy/topic/{TopicMessageListener.ts => MessageListener.ts} (84%) rename src/proxy/topic/{RawTopicMessage.ts => ReliableTopicMessage.ts} (93%) diff --git a/README.md b/README.md index 6b86ed533..4a5d2d5a7 100644 --- a/README.md +++ b/README.md @@ -2190,13 +2190,13 @@ As you see, there is a parameter in the `addItemListener` function: `includeValu The Message Listener is used by the Hazelcast `Reliable Topic`. -You can listen to message events. To listen to these events, you need to implement the `TopicMessageListener` function to which a `TopicMessage` object is passed. +You can listen to message events. To listen to these events, you need to implement the `MessageListener` function to which a `Message` object is passed. See the following example. ```javascript -topic.addMessageListener(function (topicMessage) { - console.log(topicMessage.messageObject); +topic.addMessageListener(function (message) { + console.log(message.messageObject); }); var engineer = { diff --git a/src/proxy/topic/ITopic.ts b/src/proxy/topic/ITopic.ts index 0f93fe692..afa305765 100644 --- a/src/proxy/topic/ITopic.ts +++ b/src/proxy/topic/ITopic.ts @@ -16,10 +16,10 @@ import * as Promise from 'bluebird'; import {DistributedObject} from '../../DistributedObject'; -import {TopicMessageListener} from './TopicMessageListener'; +import {MessageListener} from './MessageListener'; export interface ITopic extends DistributedObject { - addMessageListener(listener: TopicMessageListener): string; + addMessageListener(listener: MessageListener): string; removeMessageListener(id: string): boolean; diff --git a/src/proxy/topic/TopicMessage.ts b/src/proxy/topic/Message.ts similarity index 96% rename from src/proxy/topic/TopicMessage.ts rename to src/proxy/topic/Message.ts index 2168ae1dd..3bf7c3e7e 100644 --- a/src/proxy/topic/TopicMessage.ts +++ b/src/proxy/topic/Message.ts @@ -17,7 +17,7 @@ import Long = require('long'); import Address = require('../../Address'); -export class TopicMessage { +export class Message { messageObject: T; publisher: Address; publishingTime: Long; diff --git a/src/proxy/topic/TopicMessageListener.ts b/src/proxy/topic/MessageListener.ts similarity index 84% rename from src/proxy/topic/TopicMessageListener.ts rename to src/proxy/topic/MessageListener.ts index 994f19cd9..a8ac3f678 100644 --- a/src/proxy/topic/TopicMessageListener.ts +++ b/src/proxy/topic/MessageListener.ts @@ -13,6 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {TopicMessage} from './TopicMessage'; +import {Message} from './Message'; -export type TopicMessageListener = (message: TopicMessage) => void; +export type MessageListener = (message: Message) => void; diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 82fdcbb1b..63feee1b9 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -19,16 +19,16 @@ import {StaleSequenceError} from '../../HazelcastError'; import {LoggingService} from '../../logging/LoggingService'; import {SerializationService} from '../../serialization/SerializationService'; import {Ringbuffer} from '../Ringbuffer'; -import {RawTopicMessage} from './RawTopicMessage'; +import {ReliableTopicMessage} from './ReliableTopicMessage'; import {ReliableTopicProxy} from './ReliableTopicProxy'; -import {TopicMessage} from './TopicMessage'; -import {TopicMessageListener} from './TopicMessageListener'; +import {Message} from './Message'; +import {MessageListener} from './MessageListener'; export class ReliableTopicListenerRunner { public sequenceNumber: number = 0; - private listener: TopicMessageListener; - private ringbuffer: Ringbuffer; + private listener: MessageListener; + private ringbuffer: Ringbuffer; private batchSize: number; private serializationService: SerializationService; private cancelled: boolean = false; @@ -36,7 +36,7 @@ export class ReliableTopicListenerRunner { private proxy: ReliableTopicProxy; private listenerId: string; - constructor(listenerId: string, listener: TopicMessageListener, ringbuffer: Ringbuffer, + constructor(listenerId: string, listener: MessageListener, ringbuffer: Ringbuffer, batchSize: number, serializationService: SerializationService, proxy: ReliableTopicProxy) { this.listenerId = listenerId; this.listener = listener; @@ -52,10 +52,10 @@ export class ReliableTopicListenerRunner { return; } - this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize).then((result: ReadResultSet) => { + this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize).then((result: ReadResultSet) => { if (!this.cancelled) { for (let i = 0; i < result.size(); i++) { - const msg = new TopicMessage(); + const msg = new Message(); const item = result.get(i); msg.messageObject = this.serializationService.toObject(item.payload); msg.publisher = item.publisherAddress; diff --git a/src/proxy/topic/RawTopicMessage.ts b/src/proxy/topic/ReliableTopicMessage.ts similarity index 93% rename from src/proxy/topic/RawTopicMessage.ts rename to src/proxy/topic/ReliableTopicMessage.ts index ef32cfee7..3654cb953 100644 --- a/src/proxy/topic/RawTopicMessage.ts +++ b/src/proxy/topic/ReliableTopicMessage.ts @@ -22,7 +22,7 @@ import Address = require('../../Address'); export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -18; export const RELIABLE_TOPIC_CLASS_ID = 2; -export class RawTopicMessage implements IdentifiedDataSerializable { +export class ReliableTopicMessage implements IdentifiedDataSerializable { publishTime: Long; publisherAddress: Address; payload: Data; @@ -51,7 +51,7 @@ export class RawTopicMessage implements IdentifiedDataSerializable { export class ReliableTopicMessageFactory implements IdentifiedDataSerializableFactory { create(type: number): IdentifiedDataSerializable { if (type === RELIABLE_TOPIC_CLASS_ID) { - return new RawTopicMessage(); + return new ReliableTopicMessage(); } return null; } diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 35ac25e2f..cdd7bfa03 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -24,9 +24,9 @@ import {UuidUtil} from '../../util/UuidUtil'; import {BaseProxy} from '../BaseProxy'; import {Ringbuffer} from '../Ringbuffer'; import {ITopic} from './ITopic'; -import {RawTopicMessage} from './RawTopicMessage'; +import {ReliableTopicMessage} from './ReliableTopicMessage'; import {ReliableTopicListenerRunner} from './ReliableTopicListenerRunner'; -import {TopicMessageListener} from './TopicMessageListener'; +import {MessageListener} from './MessageListener'; import {TopicOverloadPolicy} from './TopicOverloadPolicy'; import Long = require('long'); @@ -35,7 +35,7 @@ export const TOPIC_INITIAL_BACKOFF = 100; export const TOPIC_MAX_BACKOFF = 2000; export class ReliableTopicProxy extends BaseProxy implements ITopic { - private ringbuffer: Ringbuffer; + private ringbuffer: Ringbuffer; private readonly localAddress: Address; private readonly batchSize: number; private readonly runners: { [key: string]: ReliableTopicListenerRunner } = {}; @@ -53,12 +53,12 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } setRingbuffer(): Promise { - return this.client.getRingbuffer(RINGBUFFER_PREFIX + this.name).then((buffer) => { + return this.client.getRingbuffer(RINGBUFFER_PREFIX + this.name).then((buffer) => { this.ringbuffer = buffer; }); } - addMessageListener(listener: TopicMessageListener): string { + addMessageListener(listener: MessageListener): string { const listenerId = UuidUtil.generate().toString(); const runner = new ReliableTopicListenerRunner(listenerId, listener, this.ringbuffer, @@ -89,7 +89,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } publish(message: E): Promise { - const reliableTopicMessage = new RawTopicMessage(); + const reliableTopicMessage = new ReliableTopicMessage(); reliableTopicMessage.payload = this.serializationService.toData(message); reliableTopicMessage.publishTime = Long.fromNumber(new Date().getTime()); reliableTopicMessage.publisherAddress = this.localAddress; @@ -108,7 +108,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } } - public getRingbuffer(): Ringbuffer { + public getRingbuffer(): Ringbuffer { return this.ringbuffer; } @@ -121,13 +121,13 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { return this.ringbuffer.destroy(); } - private addOrDiscard(reliableTopicMessage: RawTopicMessage): Promise { + private addOrDiscard(reliableTopicMessage: ReliableTopicMessage): Promise { return this.ringbuffer.add(reliableTopicMessage, OverflowPolicy.FAIL).then(() => { return null; }); } - private addWithError(reliableTopicMessage: RawTopicMessage): Promise { + private addWithError(reliableTopicMessage: ReliableTopicMessage): Promise { return this.ringbuffer.add(reliableTopicMessage, OverflowPolicy.FAIL).then((seq: Long) => { if (seq.toNumber() === -1) { throw new TopicOverloadError('Failed to publish message: ' + reliableTopicMessage + @@ -138,13 +138,13 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { }); } - private addOrOverwrite(reliableTopicMessage: RawTopicMessage): Promise { + private addOrOverwrite(reliableTopicMessage: ReliableTopicMessage): Promise { return this.ringbuffer.add(reliableTopicMessage, OverflowPolicy.OVERWRITE).then(() => { return null; }); } - private addWithBackoff(reliableTopicMessage: RawTopicMessage): Promise { + private addWithBackoff(reliableTopicMessage: ReliableTopicMessage): Promise { let resolve: Function; @@ -157,7 +157,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { return promise; } - private trySendMessage(message: RawTopicMessage, delay: number, resolve: Function): void { + private trySendMessage(message: ReliableTopicMessage, delay: number, resolve: Function): void { this.ringbuffer.add(message, OverflowPolicy.FAIL).then((seq: Long) => { if (seq.toNumber() === -1) { let newDelay = delay *= 2; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 5284613e4..9910b4451 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -18,7 +18,7 @@ import {AggregatorFactory} from '../aggregation/AggregatorFactory'; import {ClusterDataFactory} from '../ClusterDataFactory'; import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; import {SerializationConfig} from '../config/SerializationConfig'; -import {RELIABLE_TOPIC_MESSAGE_FACTORY_ID, ReliableTopicMessageFactory} from '../proxy/topic/RawTopicMessage'; +import {RELIABLE_TOPIC_MESSAGE_FACTORY_ID, ReliableTopicMessageFactory} from '../proxy/topic/ReliableTopicMessage'; import * as Util from '../Util'; import {Data, DataInput, DataOutput} from './Data'; import * as DefaultPredicates from './DefaultPredicates'; diff --git a/test/topic/TopicTest.js b/test/topic/TopicTest.js index d45345d59..3564c28b6 100644 --- a/test/topic/TopicTest.js +++ b/test/topic/TopicTest.js @@ -21,7 +21,7 @@ var HazelcastClient = index.Client; var Config = index.Config; var TopicOverloadPolicy = index.TopicOverloadPolicy.TopicOverloadPolicy; var Controller = require('./../RC'); -var RawTopicMessage = require('../../lib/proxy/topic/RawTopicMessage').RawTopicMessage; +var ReliableTopicMessage = require('../../lib/proxy/topic/ReliableTopicMessage').ReliableTopicMessage; var fs = require('fs'); var Long = require('long'); var Promise = require('bluebird'); @@ -44,7 +44,7 @@ var generateItems = function (client, howMany) { var all = []; for (var i = 1; i <= howMany; i++) { - var reliableTopicMessage = new RawTopicMessage(); + var reliableTopicMessage = new ReliableTopicMessage(); reliableTopicMessage.payload = client.getSerializationService().toData(i); reliableTopicMessage.publishTime = Long.fromNumber(new Date().getTime()); reliableTopicMessage.publisherAddress = client.getClusterService().getClientInfo().localAddress; From 47b1805c46e6296b4adb985de068ad0de3969365 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Tue, 27 Nov 2018 11:47:01 +0300 Subject: [PATCH 202/685] remove unnecessary precompile (#419) --- create-build-info.js | 20 ----------- package.json | 1 - src/{BuildMetadata.ts => BuildInfo.ts} | 20 +++++++---- src/BuildInfoLoader.ts | 23 ------------ src/invocation/ClientConnection.ts | 6 ++-- src/invocation/ConnectionAuthenticator.ts | 4 +-- src/proxy/BaseProxy.ts | 4 +-- src/proxy/NearCachedMapProxy.ts | 4 +-- src/statistics/Statistics.ts | 7 ++-- test/BuildInfoTest.js | 43 +++++++++++++++++++++++ test/BuildMetadataTest.js | 43 ----------------------- test/Util.js | 8 ++--- test/statistics/StatisticsTest.js | 4 +-- 13 files changed, 74 insertions(+), 113 deletions(-) delete mode 100644 create-build-info.js rename src/{BuildMetadata.ts => BuildInfo.ts} (66%) delete mode 100644 src/BuildInfoLoader.ts create mode 100644 test/BuildInfoTest.js delete mode 100644 test/BuildMetadataTest.js diff --git a/create-build-info.js b/create-build-info.js deleted file mode 100644 index e00aebdef..000000000 --- a/create-build-info.js +++ /dev/null @@ -1,20 +0,0 @@ -var fs = require('fs'); -var path = require('path'); -var pjson = require('./package.json'); -var tsjon = require('./tsconfig.json'); - -var version = pjson.version; -var libDir = tsjon.compilerOptions.outDir; - - -var buildInfo = { - 'version': version -}; - -var infoExport = 'module.exports = ' + JSON.stringify(buildInfo) + ';'; - - -if (!fs.existsSync(libDir)) { - fs.mkdirSync(libDir); -} -fs.writeFileSync(path.join(libDir, 'BuildInfo.js'), infoExport); diff --git a/package.json b/package.json index 72ea7a8d1..c8fdbf32b 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ }, "scripts": { "clean": "rimraf lib typings *.jar *.log", - "precompile": "node create-build-info.js", "compile": "tsc", "pretest": "node download-remote-controller.js", "test": "mocha --recursive", diff --git a/src/BuildMetadata.ts b/src/BuildInfo.ts similarity index 66% rename from src/BuildMetadata.ts rename to src/BuildInfo.ts index 2f1a2c807..3ff6c53d2 100644 --- a/src/BuildMetadata.ts +++ b/src/BuildInfo.ts @@ -14,18 +14,20 @@ * limitations under the License. */ -export class BuildMetadata { +const clientVersion = require('../package.json').version; + +export class BuildInfo { public static readonly UNKNOWN_VERSION_ID = -1; private static readonly MAJOR_VERSION_MULTIPLIER = 10000; private static readonly MINOR_VERSION_MULTIPLIER = 100; private static readonly PATTERN = /^([\d]+)\.([\d]+)(?:\.([\d]+))?(-[\w]+)?(-SNAPSHOT)?(-BETA-.)?$/; - public static calculateVersionFromString(versionString: string): number { + public static calculateServerVersionFromString(versionString: string): number { if (versionString == null) { - return BuildMetadata.UNKNOWN_VERSION_ID; + return BuildInfo.UNKNOWN_VERSION_ID; } - const info = BuildMetadata.PATTERN.exec(versionString); + const info = BuildInfo.PATTERN.exec(versionString); if (info == null) { return -1; } @@ -37,11 +39,15 @@ export class BuildMetadata { } else { patch = Number.parseInt(info[3]); } - return this.calculateVersion(major, minor, patch); + return this.calculateServerVersion(major, minor, patch); + } + + public static calculateServerVersion(major: number, minor: number, patch: number): number { + return BuildInfo.MAJOR_VERSION_MULTIPLIER * major + BuildInfo.MINOR_VERSION_MULTIPLIER * minor + patch; } - public static calculateVersion(major: number, minor: number, patch: number): number { - return BuildMetadata.MAJOR_VERSION_MULTIPLIER * major + BuildMetadata.MINOR_VERSION_MULTIPLIER * minor + patch; + public static getClientVersion(): string { + return clientVersion; } } diff --git a/src/BuildInfoLoader.ts b/src/BuildInfoLoader.ts deleted file mode 100644 index 2acc560ff..000000000 --- a/src/BuildInfoLoader.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -const BuildInfo = require('./BuildInfo'); - -export class BuildInfoLoader { - static getClientVersion(): string { - return BuildInfo.version; - } -} diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 21e0c55e0..c42afeeb9 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -17,7 +17,7 @@ import * as Promise from 'bluebird'; import * as net from 'net'; import {BitsUtil} from '../BitsUtil'; -import {BuildMetadata} from '../BuildMetadata'; +import {BuildInfo} from '../BuildInfo'; import HazelcastClient from '../HazelcastClient'; import {IOError} from '../HazelcastError'; import Address = require('../Address'); @@ -46,7 +46,7 @@ export class ClientConnection { this.lastRead = 0; this.closedTime = 0; this.connectedServerVersionString = null; - this.connectedServerVersion = BuildMetadata.UNKNOWN_VERSION_ID; + this.connectedServerVersion = BuildInfo.UNKNOWN_VERSION_ID; } /** @@ -87,7 +87,7 @@ export class ClientConnection { setConnectedServerVersion(versionString: string): void { this.connectedServerVersionString = versionString; - this.connectedServerVersion = BuildMetadata.calculateVersionFromString(versionString); + this.connectedServerVersion = BuildInfo.calculateServerVersionFromString(versionString); } getConnectedServerVersion(): number { diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts index a3453fe3e..8705bb100 100644 --- a/src/invocation/ConnectionAuthenticator.ts +++ b/src/invocation/ConnectionAuthenticator.ts @@ -20,10 +20,10 @@ import HazelcastClient from '../HazelcastClient'; import {ClientAuthenticationCustomCodec} from '../codec/ClientAuthenticationCustomCodec'; import {ClientConnection} from './ClientConnection'; import {ClusterService} from './ClusterService'; -import {BuildInfoLoader} from '../BuildInfoLoader'; import {LoggingService} from '../logging/LoggingService'; import {AuthenticationError} from '../HazelcastError'; import ClientMessage = require('../ClientMessage'); +import {BuildInfo} from '../BuildInfo'; const enum AuthenticationStatus { AUTHENTICATED = 0, @@ -90,7 +90,7 @@ export class ConnectionAuthenticator { let clientMessage: ClientMessage; - const clientVersion = BuildInfoLoader.getClientVersion(); + const clientVersion = BuildInfo.getClientVersion(); if (customCredentials != null) { const credentialsPayload = this.client.getSerializationService().toData(customCredentials); diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 5a7220936..a7b0b74e5 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -15,7 +15,7 @@ */ import * as Promise from 'bluebird'; -import {BuildMetadata} from '../BuildMetadata'; +import {BuildInfo} from '../BuildInfo'; import HazelcastClient from '../HazelcastClient'; import {Data} from '../serialization/Data'; import Address = require('../Address'); @@ -139,7 +139,7 @@ export class BaseProxy { for (const address in activeConnections) { return activeConnections[address].getConnectedServerVersion(); } - return BuildMetadata.UNKNOWN_VERSION_ID; + return BuildInfo.UNKNOWN_VERSION_ID; } private createPromise(codec: any, promise: Promise): Promise { diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 72c3c6912..c9143fbe0 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -26,7 +26,7 @@ import {NearCache} from '../nearcache/NearCache'; import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetectorImpl'; import {Data} from '../serialization/Data'; import {MapProxy} from './MapProxy'; -import {BuildMetadata} from '../BuildMetadata'; +import {BuildInfo} from '../BuildInfo'; import ClientMessage = require('../ClientMessage'); export class NearCachedMapProxy extends MapProxy { @@ -247,7 +247,7 @@ export class NearCachedMapProxy extends MapProxy { } private supportsRepairableNearCache(): boolean { - return this.getConnectedServerVersion() >= BuildMetadata.calculateVersion(3, 8, 0); + return this.getConnectedServerVersion() >= BuildInfo.calculateServerVersion(3, 8, 0); } private createPre38NearCacheEventHandler(): Function { diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts index 0849a2ec0..386bf14ed 100644 --- a/src/statistics/Statistics.ts +++ b/src/statistics/Statistics.ts @@ -21,9 +21,8 @@ import {Properties} from '../config/Properties'; import {ClientStatisticsCodec} from '../codec/ClientStatisticsCodec'; import * as Util from '../Util'; import {Task} from '../Util'; -import {BuildInfoLoader} from '../BuildInfoLoader'; import * as os from 'os'; -import {BuildMetadata} from '../BuildMetadata'; +import {BuildInfo} from '../BuildInfo'; import Address = require('../Address'); /** @@ -39,7 +38,7 @@ export class Statistics { private static readonly NEAR_CACHE_CATEGORY_PREFIX: string = 'nc.'; private static readonly FEATURE_SUPPORTED_SINCE_VERSION_STRING: string = '3.9'; - private static readonly FEATURE_SUPPORTED_SINCE_VERSION: number = BuildMetadata.calculateVersionFromString( + private static readonly FEATURE_SUPPORTED_SINCE_VERSION: number = BuildInfo.calculateServerVersionFromString( Statistics.FEATURE_SUPPORTED_SINCE_VERSION_STRING); private static readonly STAT_SEPARATOR: string = ','; private static readonly KEY_VALUE_SEPARATOR: string = '='; @@ -198,7 +197,7 @@ export class Statistics { this.addStat(stats, 'lastStatisticsCollectionTime', new Date().getTime()); this.addStat(stats, 'enterprise', 'false'); this.addStat(stats, 'clientType', this.client.getClusterService().getClientInfo().type); - this.addStat(stats, 'clientVersion', BuildInfoLoader.getClientVersion()); + this.addStat(stats, 'clientVersion', BuildInfo.getClientVersion()); this.addStat(stats, 'clusterConnectionTimestamp', ownerConnection.getStartTime()); this.addStat(stats, 'clientAddress', ownerConnection.getLocalAddress().toString()); this.addStat(stats, 'clientName', this.client.getName()); diff --git a/test/BuildInfoTest.js b/test/BuildInfoTest.js new file mode 100644 index 000000000..de2907d84 --- /dev/null +++ b/test/BuildInfoTest.js @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var BuildInfo = require('../lib/BuildInfo').BuildInfo; +var assert = require('chai').assert; + +describe('BuildInfo', function () { + it('version calculation test', function () { + assert.equal(-1, BuildInfo.calculateServerVersionFromString(null)); + assert.equal(-1, BuildInfo.calculateServerVersionFromString("")); + assert.equal(-1, BuildInfo.calculateServerVersionFromString("a.3.7.5")); + assert.equal(-1, BuildInfo.calculateServerVersionFromString("3.a.5")); + assert.equal(-1, BuildInfo.calculateServerVersionFromString("3,7.5")); + assert.equal(-1, BuildInfo.calculateServerVersionFromString("3.7,5")); + assert.equal(-1, BuildInfo.calculateServerVersionFromString("10.99.RC1")); + + assert.equal(30700, BuildInfo.calculateServerVersion(3, 7, 0)); + assert.equal(30702, BuildInfo.calculateServerVersion(3, 7, 2)); + assert.equal(19930, BuildInfo.calculateServerVersion(1, 99, 30)); + + assert.equal(30700, BuildInfo.calculateServerVersionFromString("3.7")); + assert.equal(30700, BuildInfo.calculateServerVersionFromString("3.7-SNAPSHOT")); + assert.equal(30702, BuildInfo.calculateServerVersionFromString("3.7.2")); + assert.equal(30702, BuildInfo.calculateServerVersionFromString("3.7.2-SNAPSHOT")); + assert.equal(109902, BuildInfo.calculateServerVersionFromString("10.99.2-SNAPSHOT")); + assert.equal(19930, BuildInfo.calculateServerVersionFromString("1.99.30")); + assert.equal(109930, BuildInfo.calculateServerVersionFromString("10.99.30-SNAPSHOT")); + assert.equal(109900, BuildInfo.calculateServerVersionFromString("10.99-RC1")); + }); +}); diff --git a/test/BuildMetadataTest.js b/test/BuildMetadataTest.js deleted file mode 100644 index 4d93ff8b8..000000000 --- a/test/BuildMetadataTest.js +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var BuildMetadata = require('../lib/BuildMetadata').BuildMetadata; -var assert = require('chai').assert; - -describe('BuildMetadata', function () { - it('version calculation test', function () { - assert.equal(-1, BuildMetadata.calculateVersionFromString(null)); - assert.equal(-1, BuildMetadata.calculateVersionFromString("")); - assert.equal(-1, BuildMetadata.calculateVersionFromString("a.3.7.5")); - assert.equal(-1, BuildMetadata.calculateVersionFromString("3.a.5")); - assert.equal(-1, BuildMetadata.calculateVersionFromString("3,7.5")); - assert.equal(-1, BuildMetadata.calculateVersionFromString("3.7,5")); - assert.equal(-1, BuildMetadata.calculateVersionFromString("10.99.RC1")); - - assert.equal(30700, BuildMetadata.calculateVersion(3, 7, 0)); - assert.equal(30702, BuildMetadata.calculateVersion(3, 7, 2)); - assert.equal(19930, BuildMetadata.calculateVersion(1, 99, 30)); - - assert.equal(30700, BuildMetadata.calculateVersionFromString("3.7")); - assert.equal(30700, BuildMetadata.calculateVersionFromString("3.7-SNAPSHOT")); - assert.equal(30702, BuildMetadata.calculateVersionFromString("3.7.2")); - assert.equal(30702, BuildMetadata.calculateVersionFromString("3.7.2-SNAPSHOT")); - assert.equal(109902, BuildMetadata.calculateVersionFromString("10.99.2-SNAPSHOT")); - assert.equal(19930, BuildMetadata.calculateVersionFromString("1.99.30")); - assert.equal(109930, BuildMetadata.calculateVersionFromString("10.99.30-SNAPSHOT")); - assert.equal(109900, BuildMetadata.calculateVersionFromString("10.99-RC1")); - }); -}); diff --git a/test/Util.js b/test/Util.js index 98c0d1429..e16517249 100644 --- a/test/Util.js +++ b/test/Util.js @@ -15,7 +15,7 @@ */ var expect = require('chai').expect; -var BuildMetadata = require('../lib/BuildMetadata').BuildMetadata; +var BuildInfo = require('../lib/BuildInfo').BuildInfo; var promiseLater = function (time, func) { if (func === undefined) { func = function () { @@ -79,14 +79,14 @@ exports.markEnterprise = function (_this) { exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { if (process.env['SERVER_VERSION']) { - var actNumber = BuildMetadata.calculateVersion(process.env['SERVER_VERSION']); + var actNumber = BuildInfo.calculateServerVersion(process.env['SERVER_VERSION']); } else if (client != null) { var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion(); } else { return; } - var expNumber = BuildMetadata.calculateVersion(expectedVersion); - if (actNumber === BuildMetadata.UNKNOWN_VERSION_ID || actNumber < expNumber) { + var expNumber = BuildInfo.calculateServerVersion(expectedVersion); + if (actNumber === BuildInfo.UNKNOWN_VERSION_ID || actNumber < expNumber) { _this.skip(); } }; diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index e0dba3cfe..b10400aed 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -16,12 +16,12 @@ var expect = require('chai').expect; var DeferredPromise = require('../../lib/Util').DeferredPromise; +var BuildInfo = require('../../lib/BuildInfo').BuildInfo; var RC = require('../RC'); var Client = require('../../').Client; var Util = require('../Util'); var Config = require('../../').Config; -var BuildInfoLoader = require('../../lib/BuildInfoLoader').BuildInfoLoader; describe('Statistics with default period', function () { @@ -76,7 +76,7 @@ describe('Statistics with default period', function () { expect(contains(stats, 'lastStatisticsCollectionTime=')).to.be.true; expect(contains(stats, 'enterprise=false')).to.be.true; expect(contains(stats, 'clientType=NodeJS')).to.be.true; - expect(contains(stats, 'clientVersion=' + BuildInfoLoader.getClientVersion())).to.be.true; + expect(contains(stats, 'clientVersion=' + BuildInfo.getClientVersion())).to.be.true; var ownerConnection = client.getClusterService().getOwnerConnection(); expect(contains(stats, 'clusterConnectionTimestamp=' + ownerConnection.getStartTime())).to.be.true; From 8ef8b56fb95fbeb35ea0715067820943db2ddace Mon Sep 17 00:00:00 2001 From: Serdar Ozmen Date: Wed, 28 Nov 2018 15:16:58 +0300 Subject: [PATCH 203/685] Final retouches to the current readme. --- README.md | 179 +++++++++++++++++++++++++++--------------------------- 1 file changed, 91 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 4a5d2d5a7..d78834193 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ * [1.1. Requirements](#11-requirements) * [1.2. Working with Hazelcast IMDG Clusters](#12-working-with-hazelcast-imdg-clusters) * [1.2.1. Setting Up a Hazelcast IMDG Cluster](#121-setting-up-a-hazelcast-imdg-cluster) - * [1.2.1.1. Running Standalone Jars](#1211-running-standalone-jars) - * [1.2.1.2. Adding User Library to CLASSPATH](#1212-adding-user-library-to-classpath) - * [1.2.1.3. Using hazelcast-member Tool](#1213-using-hazelcast-member-tool) + * [1.2.1.1. Using hazelcast-member Tool](#1211-using-hazelcast-member-tool) + * [1.2.1.2. Running Standalone JARs](#1212-running-standalone-jars) + * [1.2.1.3. Adding User Library to CLASSPATH](#1213-adding-user-library-to-classpath) * [1.3. Downloading and Installing](#13-downloading-and-installing) * [1.4. Basic Configuration](#14-basic-configuration) * [1.4.1. Configuring Hazelcast IMDG](#141-configuring-hazelcast-imdg) @@ -159,53 +159,7 @@ There are following options to start a Hazelcast IMDG cluster easily: We are going to download JARs from the website and run a standalone member for this guide. -#### 1.2.1.1. Running Standalone JARs - -Follow the instructions below to create a Hazelcast IMDG cluster: - -1. Go to Hazelcast's download [page](https://hazelcast.org/download/) and download either the `.zip` or `.tar` distribution of Hazelcast IMDG. -2. Decompress the contents into any directory that you -want to run members from. -3. Change into the directory that you decompressed the Hazelcast content and then into the `bin` directory. -4. Use either `start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see the Hazelcast IMDG logs in the terminal. - -You should see a log similar to the following, which means that your 1-member cluster is ready to be used: - -``` -INFO: [192.168.0.3]:5701 [dev] [3.10.4] - -Members {size:1, ver:1} [ - Member [192.168.0.3]:5701 - 65dac4d1-2559-44bb-ba2e-ca41c56eedd6 this -] - -Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService -INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED -``` - -#### 1.2.1.2. Adding User Library to CLASSPATH - -When you want to use features such as querying and language interoperability, you might need to add your own Java classes to the Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). Then, you can start your Hazelcast member by using the start scripts in the `bin` directory. The start scripts will automatically add your compiled classes to the `CLASSPATH`. - -Note that if you are adding an `IdentifiedDataSerializable` or a `Portable` class, you need to add its factory too. Then, you should configure the factory in the `hazelcast.xml` configuration file. This file resides in the `bin` directory where you extracted the `hazelcast-.zip` (or `tar`). - -The following is an example configuration when you are adding an `IdentifiedDataSerializable` class: - -```xml - - ... - - - > - IdentifiedFactoryClassName - - - - ... - -``` -If you want to add a `Portable` class, you should use `` instead of `` in the above configuration. - -#### 1.2.1.3. Using hazelcast-member Tool +#### 1.2.1.1. Using hazelcast-member Tool `hazelcast-member` is a tool to download and run Hazelcast IMDG members easily. You can find the installation instructions for various platforms in the following sections. @@ -282,6 +236,53 @@ You can find more information about the `hazelcast-member` tool at its GitHub [r See the [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#getting-started) for more information on setting up the clusters. + +#### 1.2.1.2. Running Standalone JARs + +Follow the instructions below to create a Hazelcast IMDG cluster: + +1. Go to Hazelcast's download [page](https://hazelcast.org/download/) and download either the `.zip` or `.tar` distribution of Hazelcast IMDG. +2. Decompress the contents into any directory that you +want to run members from. +3. Change into the directory that you decompressed the Hazelcast content and then into the `bin` directory. +4. Use either `start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see the Hazelcast IMDG logs in the terminal. + +You should see a log similar to the following, which means that your 1-member cluster is ready to be used: + +``` +INFO: [192.168.0.3]:5701 [dev] [3.10.4] + +Members {size:1, ver:1} [ + Member [192.168.0.3]:5701 - 65dac4d1-2559-44bb-ba2e-ca41c56eedd6 this +] + +Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService +INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED +``` + +#### 1.2.1.3. Adding User Library to CLASSPATH + +When you want to use features such as querying and language interoperability, you might need to add your own Java classes to the Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). Then, you can start your Hazelcast member by using the start scripts in the `bin` directory. The start scripts will automatically add your compiled classes to the `CLASSPATH`. + +Note that if you are adding an `IdentifiedDataSerializable` or a `Portable` class, you need to add its factory too. Then, you should configure the factory in the `hazelcast.xml` configuration file. This file resides in the `bin` directory where you extracted the `hazelcast-.zip` (or `tar`). + +The following is an example configuration when you are adding an `IdentifiedDataSerializable` class: + +```xml + + ... + + + > + IdentifiedFactoryClassName + + + + ... + +``` +If you want to add a `Portable` class, you should use `` instead of `` in the above configuration. + ## 1.3. Downloading and Installing Hazelcast Node.js client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. @@ -309,7 +310,7 @@ See the [Hazelcast IMDG Reference Manual](https://docs.hazelcast.org/docs/latest Hazelcast IMDG aims to run out-of-the-box for most common scenarios. However if you have limitations on your network such as multicast being disabled, you may have to configure your Hazelcast IMDG members so that they can find each other on the network. Also, since most of the distributed data structures are configurable, you may want to configure them according to your needs. We will show you the basics about network configuration here. -There are two ways to configure Hazelcast IMDG: +You can use the following options to configure Hazelcast IMDG: * Using the `hazelcast.xml` configuration file. * Programmatically configuring the member before starting it from the Java code. @@ -387,7 +388,7 @@ It is done this way to make it easier to transfer Hazelcast skills to multiple p Once you embedded `hazelcast-client` to your Node.js project, you may follow any of programmatic or declarative configuration approaches. We will provide both ways for each configuration option in this section. Pick one way and stick to it. -**Programmatic configuration** +**Programmatic Configuration:** You need to create a `ClientConfig` object and adjust its properties. Then you can pass this object to the client when starting it. @@ -400,7 +401,7 @@ Client.newHazelcastClient(config).then(function(client) { }); ``` -**Declarative configuration** +**Declarative Configuration:** Hazelcast Node.js client looks for a `hazelcast-client.json` in the current working directory unless you provide a configuration object at the startup. If you intend to configure your client using a configuration file, then place a `hazelcast-client.json` in the directory @@ -420,14 +421,16 @@ names as explained in the previous section. If you did, then you need to make ce #### 1.4.2.1. Group Settings -**Programmatic:** +You need to provide the group name of the cluster, if it is defined on the server side, to which you want the client to connect. + +**Programmatic Configuration:** ```javascript let cfg = new Config.ClientConfig(); cfg.group.name = 'group name of your cluster' ``` -**Declarative:** +**Declarative Configuration:** ```json { @@ -443,14 +446,14 @@ cfg.group.name = 'group name of your cluster' You need to provide the IP address and port of at least one member in your cluster so the client can find it. -**Programmatic:** +**Programmatic Configuration:** ```javascript let cfg = new Config.ClientConfig(); cfg.network.addresses.push('some-ip-address:port'); ``` -**Declarative:** +**Declarative Configuration:** ```json { @@ -1005,7 +1008,7 @@ Note that the ID that is passed to the `SerializationConfig` is same as the `fac Hazelcast lets you plug a custom serializer to be used for serialization of objects. -Let's say you have an object `CustomSerializable` and you would like to customize the serialization. The reason might be that you want to use an external serializer for only one object. +Let's say you have an object `CustomSerializable` and you would like to customize the serialization, since you may want to use an external serializer for only one object. ```javascript function CustomSerializable(value) { @@ -1080,7 +1083,7 @@ The global serializer is identical to custom serializers from the implementation By default, JSON serialization is used if the object is not `IdentifiedDataSerializable` or `Portable` or there is no custom serializer for it. When you configure a global serializer, it is used instead of JSON serialization. -You can use the global serialization for the following cases: +**Use cases:** * Third party serialization frameworks can be integrated using the global serializer. * For your custom objects, you can implement a single serializer to handle all of them. @@ -1132,7 +1135,7 @@ config.serializationConfig.globalSerializer = new GlobalSerializer(); All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let's first give the examples for these two approaches. Then we will look at its sub-elements and attributes. -### Declarative Client Network Configuration +**Declarative Configuration:** Here is an example of configuring the network for Node.js Client declaratively. @@ -1152,7 +1155,7 @@ Here is an example of configuring the network for Node.js Client declaratively. } ``` -### Programmatic Client Network Configuration +**Programmatic Configuration:** Here is an example of configuring the network for Node.js Client programmatically. @@ -1172,7 +1175,7 @@ Address list is the initial list of cluster addresses which the client will conn list to find an alive member. Although it may be enough to give only one address of a member in the cluster (since all members communicate with each other), it is recommended that you give the addresses for all the members. -**Declarative:** +**Declarative Configuration:** ```json { @@ -1185,7 +1188,7 @@ list to find an alive member. Although it may be enough to give only one address } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); @@ -1198,12 +1201,12 @@ You can specify multiple addresses with or without the port information as seen ## 5.2. Setting Smart Routing -Smart routing defines whether the client mode is smart or unisocket. See [Node.js Client Operation Modes section](#nodejs-client-operation-modes) +Smart routing defines whether the client mode is smart or unisocket. See the [Node.js Client Operation Modes section](#72-nodejs-client-operation-modes) for the description of smart and unisocket modes. The following are example configurations. -**Declarative:** +**Declarative Configuration:** ```json { @@ -1213,7 +1216,7 @@ The following are example configurations. } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); @@ -1226,7 +1229,7 @@ Its default value is `true` (smart client mode). It enables/disables redo-able operations. While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. -**Declarative:** +**Declarative Configuration:** ```json { @@ -1236,7 +1239,7 @@ It enables/disables redo-able operations. While sending the requests to the rela } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); @@ -1253,7 +1256,7 @@ If the member does not respond within the timeout, the client will retry to conn The following are the example configurations. -**Declarative:** +**Declarative Configuration:** ```json { @@ -1263,7 +1266,7 @@ The following are the example configurations. } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); @@ -1278,7 +1281,7 @@ While the client is trying to connect initially to one of the members in the `Cl The following are example configurations. -**Declarative:** +**Declarative Configuration:** ```json { @@ -1288,7 +1291,7 @@ The following are example configurations. } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); @@ -1303,7 +1306,7 @@ Connection attempt period is the duration in milliseconds between the connection The following are example configurations. -**Declarative:** +**Declarative Configuration:** ```json { @@ -1313,7 +1316,7 @@ The following are example configurations. } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); @@ -1325,9 +1328,9 @@ Its default value is `3000` milliseconds. ## 5.7. Enabling Client TLS/SSL You can use TLS/SSL to secure the connection between the clients and members. If you want to enable TLS/SSL -for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#1-tlsssl). +for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#61-tlsssl). -As explained in the [TLS/SSL section](#1-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#13-mutual-authentication). +As explained in the [TLS/SSL section](#61-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#13-mutual-authentication). ## 5.8. Enabling Hazelcast Cloud Discovery @@ -1335,7 +1338,7 @@ The purpose of Hazelcast Cloud Discovery is to provide the clients to use IP add The following are example configurations. -**Declarative:** +**Declarative Configuration:** ```json { @@ -1354,7 +1357,7 @@ The following are example configurations. ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); @@ -1406,7 +1409,7 @@ As explained above, Hazelcast members have key stores used to identify themselve Using mutual authentication, the clients also have their key stores and members have their trust stores so that the members can know which clients they can trust. -To enable mutual authentication, firstly, you need to set the following property at the server side in the `hazelcast.xml` file: +To enable mutual authentication, firstly, you need to set the following property on the server side in the `hazelcast.xml` file: ```xml @@ -2258,7 +2261,7 @@ IdentifiedEntryProcessor.prototype.getClassId = function () { }; ``` -Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). +Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1213-adding-user-library-to-classpath). The following is the Java equivalent of the entry processor in Node.js client given above: @@ -2427,7 +2430,7 @@ Employee.prototype.writePortable = function (writer) { Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. -For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). +For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1213-adding-user-library-to-classpath). > **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** @@ -2586,7 +2589,7 @@ hazelcastClient.getMap('students').then(function (mp) { }); ``` -If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#adding-user-library-to-classpath). +If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1213-adding-user-library-to-classpath). Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. @@ -2735,7 +2738,7 @@ Near Cache is highly recommended for maps that are mostly read. The following snippets show how a Near Cache is configured in the Node.js client, presenting all available values for each element: -**Declarative:** +**Declarative Configuration:** ``` { @@ -2755,7 +2758,7 @@ The following snippets show how a Near Cache is configured in the Node.js client } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var nearCacheConfig = new Config.NearCacheConfig(); @@ -2798,7 +2801,7 @@ Following are the descriptions of all configuration elements: The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. -**Declarative:** +**Declarative Configuration:** ``` { @@ -2814,7 +2817,7 @@ The following is an example configuration for a Near Cache defined in the `mostl } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var nearCacheConfig = new Config.NearCacheConfig(); @@ -2888,7 +2891,7 @@ Also, you need to enable the client statistics in the Node.js client. There are You can enable client statistics and set a non-default period in seconds as follows: -**Declarative:** +**Declarative Configuration:** ```json { @@ -2899,7 +2902,7 @@ You can enable client statistics and set a non-default period in seconds as foll } ``` -**Programmatic:** +**Programmatic Configuration:** ```javascript var config = new Config.ClientConfig(); From 627ed733f74ef0ac5d50d0d46f9f063cdcc97084 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Wed, 28 Nov 2018 16:06:15 +0300 Subject: [PATCH 204/685] refactor membership listener (#424) * refactor membership listener * Add more tests for membership listener --- code_samples/membership_listener.js | 35 ++++++++ src/core/MembershipEvent.ts | 45 ++++++++++ src/core/MembershipListener.ts | 41 +++++++++ src/invocation/ClusterService.ts | 76 ++++++++++++---- test/ClusterServiceTest.js | 38 +++++--- test/HeartbeatTest.js | 26 ++++-- test/LostConnectionTest.js | 30 ++++--- test/MembershipListenerTest.js | 134 ++++++++++++++++++++++------ 8 files changed, 345 insertions(+), 80 deletions(-) create mode 100644 code_samples/membership_listener.js create mode 100644 src/core/MembershipEvent.ts create mode 100644 src/core/MembershipListener.ts diff --git a/code_samples/membership_listener.js b/code_samples/membership_listener.js new file mode 100644 index 000000000..d38349c44 --- /dev/null +++ b/code_samples/membership_listener.js @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Client = require('hazelcast-client').Client; + +Client.newHazelcastClient().then(function (client) { + + // when a member is added and removed or its attribute is changed, member events are invoked. + var membershipListener = { + memberAdded: function (membershipEvent) { + console.log('Member Added:', membershipEvent.member.address); + }, + memberRemoved: function (membershipEvent) { + console.log('Member Removed:', membershipEvent.member.address); + }, + memberAttributeChanged: function (memberAttributeEvent) { + console.log('Member Attribute Changed:', memberAttributeEvent.member.address); + } + } + + client.clusterService.addMembershipListener(membershipListener); +}); diff --git a/src/core/MembershipEvent.ts b/src/core/MembershipEvent.ts new file mode 100644 index 000000000..99db28b72 --- /dev/null +++ b/src/core/MembershipEvent.ts @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Member} from './Member'; + +/** + * Membership event fired when a new member is added to the cluster and/or when a member leaves the cluster + * or when there is a member attribute change. + */ +export class MembershipEvent { + /** + * the removed or added member. + */ + private member: Member; + + /** + * the membership event type. + */ + private eventType: number; + + /** + * the members at the moment after this event. + */ + private members: Member[]; + + constructor(member: Member, eventType: number, members: Member[]) { + this.member = member; + this.eventType = eventType; + this.members = members; + } + +} diff --git a/src/core/MembershipListener.ts b/src/core/MembershipListener.ts new file mode 100644 index 000000000..be5103138 --- /dev/null +++ b/src/core/MembershipListener.ts @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {MemberAttributeEvent} from './MemberAttributeEvent'; +import {MembershipEvent} from './MembershipEvent'; + +/** + * Cluster membership listener. + */ +export interface MembershipListener { + /** + * Invoked when a new member is added to the cluster. + * @param {MembershipEvent} membership event + */ + memberAdded(membership: MembershipEvent): void; + + /** + * Invoked when an existing member leaves the cluster. + * @param {MembershipEvent} membership event when an existing member leaves the cluster + */ + memberRemoved(membership: MembershipEvent): void; + + /** + * Invoked when an attribute of a member was changed. + * @param {MemberAttributeEvent} member attribute event when an attribute of a member was changed + */ + memberAttributeChanged(memberAttributeEvent: MemberAttributeEvent): void; +} diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 82bc15783..399273f74 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -19,7 +19,6 @@ import * as Promise from 'bluebird'; import {ClientAddMembershipListenerCodec} from '../codec/ClientAddMembershipListenerCodec'; import {Member} from '../core/Member'; import {LoggingService} from '../logging/LoggingService'; -import {EventEmitter} from 'events'; import {ClientInfo} from '../ClientInfo'; import HazelcastClient from '../HazelcastClient'; import {IllegalStateError} from '../HazelcastError'; @@ -27,20 +26,21 @@ import * as assert from 'assert'; import {MemberSelector} from '../core/MemberSelector'; import {AddressHelper, DeferredPromise} from '../Util'; import {MemberAttributeEvent, MemberAttributeOperationType} from '../core/MemberAttributeEvent'; +import {MembershipListener} from '../core/MembershipListener'; +import {MembershipEvent} from '../core/MembershipEvent'; +import {UuidUtil} from '../util/UuidUtil'; import Address = require('../Address'); import ClientMessage = require('../ClientMessage'); -const MEMBER_ADDED = 1; -const MEMBER_REMOVED = 2; - -const EMIT_MEMBER_ADDED = 'memberAdded'; -const EMIT_MEMBER_REMOVED = 'memberRemoved'; -const EMIT_ATTRIBUTE_CHANGE = 'memberAttributeChange'; +export enum MemberEvent { + ADDED = 1, + REMOVED = 2, +} /** * Manages the relationship of this client with the cluster. */ -export class ClusterService extends EventEmitter { +export class ClusterService { /** * The unique identifier of the owner server node. This node is responsible for resource cleanup @@ -54,13 +54,12 @@ export class ClusterService extends EventEmitter { private knownAddresses: Address[] = []; private members: Member[] = []; - private client: HazelcastClient; private ownerConnection: ClientConnection; private logger = LoggingService.getLoggingService(); + private membershipListeners: Map = new Map(); constructor(client: HazelcastClient) { - super(); this.client = client; this.members = []; } @@ -167,7 +166,31 @@ export class ClusterService extends EventEmitter { return this.ownerConnection; } - initMemberShipListener(): Promise { + /** + * Adds MembershipListener to listen for membership updates. There is no check for duplicate registrations, + * so if you register the listener twice, it will get events twice. + * @param {MembershipListener} The listener to be registered + * @return The registration ID + */ + addMembershipListener(membershipListener: MembershipListener): string { + const registrationId = UuidUtil.generate().toString(); + this.membershipListeners.set(registrationId, membershipListener); + return registrationId; + } + + /** + * Removes registered MembershipListener. + * @param {string} The registration ID + * @return {boolean} true if successfully removed, false otherwise + */ + removeMembershipListener(registrationId: string): boolean { + if (registrationId === null) { + throw new RangeError('registrationId cannot be null'); + } + return this.membershipListeners.delete(registrationId); + } + + initMembershipListener(): Promise { const request = ClientAddMembershipListenerCodec.encodeRequest(false); const handler = (m: ClientMessage) => { @@ -241,7 +264,7 @@ export class ClusterService extends EventEmitter { return this.client.getConnectionManager().getOrConnect(currentAddress, true).then((connection: ClientConnection) => { connection.setAuthenticatedAsOwner(true); this.ownerConnection = connection; - return this.initMemberShipListener(); + return this.initMembershipListener(); }).catch((e) => { this.logger.warn('ClusterService', e); return this.tryConnectingToAddresses(index + 1, remainingAttemptLimit, attemptPeriod, e); @@ -250,10 +273,10 @@ export class ClusterService extends EventEmitter { } private handleMember(member: Member, eventType: number): void { - if (eventType === MEMBER_ADDED) { + if (eventType === MemberEvent.ADDED) { this.logger.info('ClusterService', member.toString() + ' added to cluster'); this.memberAdded(member); - } else if (eventType === MEMBER_REMOVED) { + } else if (eventType === MemberEvent.REMOVED) { this.logger.info('ClusterService', member.toString() + ' removed from cluster'); this.memberRemoved(member); } @@ -268,14 +291,24 @@ export class ClusterService extends EventEmitter { private handleMemberAttributeChange( uuid: string, key: string, operationType: MemberAttributeOperationType, value: string): void { - const member = this.getMember(uuid); - const memberAttributeEvent = new MemberAttributeEvent(member, key, operationType, value); - this.emit(EMIT_ATTRIBUTE_CHANGE, memberAttributeEvent); + + this.membershipListeners.forEach((membershipListener, registrationId) => { + if (membershipListener && membershipListener.memberAttributeChanged) { + const member = this.getMember(uuid); + const memberAttributeEvent = new MemberAttributeEvent(member, key, operationType, value); + membershipListener.memberAttributeChanged(memberAttributeEvent); + } + }); } private memberAdded(member: Member): void { this.members.push(member); - this.emit(EMIT_MEMBER_ADDED, member); + this.membershipListeners.forEach((membershipListener, registrationId) => { + if (membershipListener && membershipListener.memberAdded) { + const membershipEvent = new MembershipEvent(member, MemberEvent.ADDED, this.members); + membershipListener.memberAdded(membershipEvent); + } + }); } private memberRemoved(member: Member): void { @@ -285,6 +318,11 @@ export class ClusterService extends EventEmitter { assert(removedMemberList.length === 1); } this.client.getConnectionManager().destroyConnection(member.address); - this.emit(EMIT_MEMBER_REMOVED, member); + this.membershipListeners.forEach((membershipListener, registrationId) => { + if (membershipListener && membershipListener.memberRemoved) { + const membershipEvent = new MembershipEvent(member, MemberEvent.REMOVED, this.members); + membershipListener.memberRemoved(membershipEvent); + } + }); } } diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 3b2811da6..839ce5674 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -56,10 +56,14 @@ describe('ClusterService', function () { it('should know when a new member joins to cluster', function (done) { var member2; - client.getClusterService().once('memberAdded', function () { - expect(client.clusterService.getSize()).to.be.eq(2); - done(); - }); + var membershipListener = { + memberAdded: function (membershipEvent) { + expect(client.clusterService.getSize()).to.be.eq(2); + done(); + } + } + + client.clusterService.addMembershipListener(membershipListener); Controller.startMember(cluster.id).then(function (res) { member2 = res; @@ -69,10 +73,14 @@ describe('ClusterService', function () { it('should know when a member leaves cluster', function (done) { var member2; - client.getClusterService().once('memberRemoved', function () { - expect(client.getClusterService().getSize()).to.be.eq(1); - done(); - }); + var membershipListener = { + memberRemoved: function (membershipEvent) { + expect(client.getClusterService().getSize()).to.be.eq(1); + done(); + } + } + + client.clusterService.addMembershipListener(membershipListener); Controller.startMember(cluster.id).then(function (res) { member2 = res; @@ -84,17 +92,19 @@ describe('ClusterService', function () { this.timeout(20000); var member2; var member3; - client.getClusterService().once('memberRemoved', function () { - var remainingMemberList = client.getClusterService().getMembers(); - try { + + var membershipListener = { + memberRemoved: function (membershipEvent) { + var remainingMemberList = client.getClusterService().getMembers(); expect(remainingMemberList).to.have.length(2); expect(remainingMemberList[0].address.port).to.equal(ownerMember.port); expect(remainingMemberList[1].address.port).to.equal(member3.port); done(); - } catch (e) { - done(e); } - }); + } + + client.clusterService.addMembershipListener(membershipListener); + Controller.startMember(cluster.id).then(function (res) { member2 = res; return Controller.startMember(cluster.id); diff --git a/test/HeartbeatTest.js b/test/HeartbeatTest.js index ef047fd67..146c7bfca 100644 --- a/test/HeartbeatTest.js +++ b/test/HeartbeatTest.js @@ -46,10 +46,14 @@ describe('Heartbeat', function () { }).then(function (resp) { client = resp; }).then(function () { - client.clusterService.on('memberAdded', function (member) { - var address = new Address(member.address.host, member.address.port); - warmUpConnectionToAddressWithRetry(client, address); - }); + var membershipListener = { + memberAdded: function (membershipEvent) { + var address = new Address(membershipEvent.member.address.host, membershipEvent.member.address.port); + warmUpConnectionToAddressWithRetry(client, address); + } + } + + client.clusterService.addMembershipListener(membershipListener); client.heartbeat.addListener({ onHeartbeatStopped: function (connection) { client.shutdown(); @@ -75,11 +79,15 @@ describe('Heartbeat', function () { return HazelcastClient.newHazelcastClient(cfg); }).then(function (resp) { client = resp; - client.clusterService.on('memberAdded', function (member) { - warmUpConnectionToAddressWithRetry(client, member.address, 3).then(function () { - simulateHeartbeatLost(client, member.address, 2000); - }).catch(done); - }); + var membershipListener = { + memberAdded: function (membershipEvent) { + warmUpConnectionToAddressWithRetry(client, membershipEvent.member.address, 3).then(function () { + simulateHeartbeatLost(client, membershipEvent.member.address, 2000); + }).catch(done); + } + } + + client.clusterService.addMembershipListener(membershipListener); client.heartbeat.addListener({ onHeartbeatRestored: function (connection) { client.shutdown(); diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index 231ad546c..1b2449323 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -49,19 +49,23 @@ describe('Lost connection', function () { it('M2 starts, M1 goes down, client sets M2 as owner', function (done) { this.timeout(12000); var newMember; - client.clusterService.on('memberAdded', function () { - Controller.shutdownMember(cluster.id, oldMember.uuid).then(function () { - return Util.promiseWaitMilliseconds(4000); - }).then(function () { - try { - expect(client.clusterService.getOwnerConnection().address.host).to.be.eq(newMember.host); - expect(client.clusterService.getOwnerConnection().address.port).to.be.eq(newMember.port); - done(); - } catch (e) { - done(e); - } - }); - }); + var membershipListener = { + memberAdded: function (membershipEvent) { + Controller.shutdownMember(cluster.id, oldMember.uuid).then(function () { + return Util.promiseWaitMilliseconds(4000); + }).then(function () { + try { + expect(client.clusterService.getOwnerConnection().address.host).to.be.eq(newMember.host); + expect(client.clusterService.getOwnerConnection().address.port).to.be.eq(newMember.port); + done(); + } catch (e) { + done(e); + } + }); + } + } + + client.clusterService.addMembershipListener(membershipListener); Controller.startMember(cluster.id).then(function (m) { newMember = m; }); diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index 31ff22fa1..941588ee5 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -14,11 +14,13 @@ * limitations under the License. */ + var HazelcastClient = require('../.').Client; var Controller = require('./RC'); var expect = require('chai').expect; var DeferredPromise = require('../lib/Util').DeferredPromise; var MemberAttributeOperationType = require('../.').MemberAttributeOperationType; +var MemberEvent = require('../lib/invocation/ClusterService').MemberEvent; describe('MembershipListener', function () { this.timeout(10000); @@ -52,16 +54,60 @@ describe('MembershipListener', function () { var err = undefined; var listenerCalledResolver = DeferredPromise(); - client.clusterService.on('memberAdded', function (member) { - listenerCalledResolver.resolve(member); + var membershipListener = { + memberAdded: function (membershipEvent) { + listenerCalledResolver.resolve(membershipEvent); + } + } + client.clusterService.addMembershipListener(membershipListener); + + Controller.startMember(cluster.id).then(function (res) { + newMember = res; + return listenerCalledResolver.promise; + }).then(function (membershipEvent) { + expect(membershipEvent.member.address.host).to.equal(newMember.host); + expect(membershipEvent.member.address.port).to.equal(newMember.port); + expect(membershipEvent.eventType).to.equal(MemberEvent.ADDED); + expect(membershipEvent.members).to.equal(client.clusterService.getMembers()); + }).catch(function (e) { + err = e; + }).finally(function (e) { + Controller.shutdownMember(cluster.id, newMember.uuid).then(function () { + done(err); + }); }); + }); + + it('sees member added event and other listener\'s event ', function (done) { + var newMember; + var err = undefined; + var listenerCalledResolver = DeferredPromise(); + var listenedSecondListener = false; + + var membershipListener = { + memberAdded: function (membershipEvent) { + listenerCalledResolver.resolve(membershipEvent); + } + } + + var membershipListener2 = { + memberAdded: function (membershipEvent) { + listenedSecondListener = true; + } + } + client.clusterService.addMembershipListener(membershipListener); + client.clusterService.addMembershipListener(membershipListener2); + Controller.startMember(cluster.id).then(function (res) { newMember = res; return listenerCalledResolver.promise; - }).then(function (addedMember) { - expect(addedMember.address.host).to.equal(newMember.host); - expect(addedMember.address.port).to.equal(newMember.port); + }).then(function (membershipEvent) { + expect(membershipEvent.member.address.host).to.equal(newMember.host); + expect(membershipEvent.member.address.port).to.equal(newMember.port); + expect(membershipEvent.eventType).to.equal(MemberEvent.ADDED); + expect(membershipEvent.members).to.equal(client.clusterService.getMembers()); + expect(listenedSecondListener).to.be.true; }).catch(function (e) { err = e; }).finally(function (e) { @@ -72,23 +118,51 @@ describe('MembershipListener', function () { }); + it('if same listener is added twice, gets same event twice', function (done) { + var newMember; + var counter = 0; + + var membershipListener = { + memberAdded: function (membershipEvent) { + counter++; + } + } + client.clusterService.addMembershipListener(membershipListener); + client.clusterService.addMembershipListener(membershipListener); + + Controller.startMember(cluster.id).then(function (m) { + newMember = m; + expect(counter).to.equal(2); + }).finally(function (e) { + Controller.shutdownMember(cluster.id, newMember.uuid).then(function () { + done(); + }); + }); + }); + it('sees member removed event', function (done) { var newMember; var listenerCalledResolver = DeferredPromise(); - client.clusterService.on('memberRemoved', function (member) { - listenerCalledResolver.resolve(member); - }); + var membershipListener = { + memberRemoved: function (membershipEvent) { + listenerCalledResolver.resolve(membershipEvent); + } + } + + client.clusterService.addMembershipListener(membershipListener); Controller.startMember(cluster.id).then(function (res) { newMember = res; return Controller.shutdownMember(cluster.id, newMember.uuid); }).then(function () { return listenerCalledResolver.promise; - }).then(function (removedMember) { + }).then(function (membershipEvent) { try { - expect(removedMember.address.host).to.equal(newMember.host); - expect(removedMember.address.port).to.equal(newMember.port); + expect(membershipEvent.member.address.host).to.equal(newMember.host); + expect(membershipEvent.member.address.port).to.equal(newMember.port); + expect(membershipEvent.eventType).to.equal(MemberEvent.REMOVED); + expect(membershipEvent.members).to.equal(client.clusterService.getMembers()); done(); } catch (e) { done(e); @@ -97,27 +171,37 @@ describe('MembershipListener', function () { }); it('sees member attribute change put event', function (done) { - client.clusterService.on('memberAttributeChange', function (memberAttributeEvent) { - if (memberAttributeEvent.operationType === MemberAttributeOperationType.PUT) { - expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); - expect(memberAttributeEvent.key).to.equal('test'); - expect(memberAttributeEvent.value).to.equal('123'); - done(); - } - }); + + var membershipListener = { + memberAttributeChanged: function (memberAttributeEvent) { + if (memberAttributeEvent.operationType === MemberAttributeOperationType.PUT) { + expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); + expect(memberAttributeEvent.key).to.equal('test'); + expect(memberAttributeEvent.value).to.equal('123'); + done(); + } + }, + }; + client.clusterService.addMembershipListener(membershipListener) + + var script = 'function attrs() { ' + 'return instance_0.getCluster().getLocalMember().setIntAttribute("test", 123); }; result=attrs();'; Controller.executeOnController(cluster.id, script, 1); }); it('sees member attribute change remove event', function (done) { - client.clusterService.on('memberAttributeChange', function (memberAttributeEvent) { - if (memberAttributeEvent.operationType === MemberAttributeOperationType.REMOVE) { - expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); - expect(memberAttributeEvent.key, 'test'); - done(); + var membershipListener = { + memberAttributeChanged: function (memberAttributeEvent) { + if (memberAttributeEvent.operationType === MemberAttributeOperationType.REMOVE) { + expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); + expect(memberAttributeEvent.key, 'test'); + done(); + } } - }); + } + client.clusterService.addMembershipListener(membershipListener) + var addScript = 'function attrs() { ' + 'return instance_0.getCluster().getLocalMember().setIntAttribute("test", 123); }; result=attrs();'; var removeScript = 'function attrs() { ' + From 81de8735e2b5ccbcb844c09ed86c143313b5b8e4 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 30 Nov 2018 12:22:35 +0300 Subject: [PATCH 205/685] Refactor distributed events (#427) --- README.md | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index d78834193..d904b55ce 100644 --- a/README.md +++ b/README.md @@ -67,11 +67,11 @@ * [7.4.12. Using PN Counter](#7412-using-pn-counter) * [7.4.13. Using Flake ID Generator](#7413-using-flake-id-generator) * [7.5. Distributed Events](#75-distributed-events) - * [7.5.1. Cluster Events](#751-cluster-events) - * [7.5.1.1. Listening for Member Events](#7511-listening-for-member-events) - * [7.5.1.2. Listening for Distributed Object Events](#7512-listening-for-distributed-object-events) - * [7.5.1.3. Listening for Lifecycle Events](#7513-listening-for-lifecycle-events) - * [7.5.2. Distributed Data Structure Events](#752-distributed-data-structure-events) + * [7.5.1. Listening for Cluster Events](#751-listening-for-cluster-events) + * [7.5.1.1. Membership Listener](#7511-membership-listener) + * [7.5.1.2. Distributed Object Listener](#7512-distributed-object-listener) + * [7.5.1.3. Lifecycle Listener](#7513-lifecycle-listener) + * [7.5.2. Listening for Distributed Data Structure Events](#752-listening-for-distributed-data-structure-events) * [7.5.2.1. Map Listener](#7521-map-listener) * [7.5.2.2. Entry Listener](#7522-entry-listener) * [7.5.2.3. Item Listener](#7523-item-listener) @@ -1951,7 +1951,7 @@ hazelcastClient.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. -### 7.5.1. Cluster Events +### 7.5.1. Listening for Cluster Events You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side: @@ -1959,22 +1959,27 @@ You can add event listeners to a Hazelcast Node.js client. You can configure the * Distributed Object Listener: Notifies when a distributed object is created or destroyed throughout the cluster. * Lifecycle Listener: Notifies when the client is starting, started, shutting down and shutdown. -#### 7.5.1.1. Listening for Member Events +#### 7.5.1.1. Membership Listener -You can add the following types of member events to the `ClusterService`. +The Membership Listener interface has functions that are invoked for the following events. * `memberAdded`: A new member is added to the cluster. * `memberRemoved`: An existing member leaves the cluster. * `memberAttributeChanged`: An attribute of a member is changed. See the [Defining Member Attributes section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#defining-member-attributes) in the Hazelcast IMDG Reference Manual to learn about member attributes. -The `ClusterService` object exposes an `ClusterService.on()` function that allows one or more functions to be attached to the member events emitted by the object. +For `memberAdded` and `memberRemoved` events, a `MembershipEvent` object is passed to the listener function. -The following is a membership listener registration by using the `ClusterService.on()` function. +After you create the listener object, you can configure your cluster to include the membership listener. You can also add one or more membership listeners. + +The following is a membership listener registration by using the `ClusterService.addMembershipListener()` function. ```javascript -client.clusterService.on('memberAdded', function (member) { - console.log('Member Added: The address is', member.address.toString()); -}); +var membershipListener = { + memberAdded: function (membershipEvent) { + console.log('Member Added: The address is', member.address.toString()); + }, +}; +client.clusterService.addMembershipListener(membershipListener); ``` The `memberAttributeChanged` has its own type of event named as `MemberAttributeEvent`. When there is an attribute change on the member, this event is fired. @@ -1982,12 +1987,16 @@ The `memberAttributeChanged` has its own type of event named as `MemberAttribute See the following example. ```javascript -client.clusterService.on('memberAttributeChanged', function (memberAttributeEvent) { - console.log('Member Attribute Changed: The address is', memberAttributeEvent.member.address.toString()); -}); + +var membershipListener = { + memberAttributeChanged: function (memberAttributeEvent) { + console.log('Member Attribute Changed: The address is', memberAttributeEvent.member.address.toString()); + }, +}; +client.clusterService.addMembershipListener(membershipListener); ``` -#### 7.5.1.2. Listening for Distributed Object Events +#### 7.5.1.2. Distributed Object Listener The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: @@ -2013,7 +2022,7 @@ client.addDistributedObjectListener(function (distributedObjectEvent) { }); ``` -#### 7.5.1.3. Listening for Lifecycle Events +#### 7.5.1.3. Lifecycle Listener The `LifecycleListener` interface notifies for the following events: @@ -2054,7 +2063,7 @@ Lifecycle Event >>> shutdown Process finished with exit code 0 ``` -### 7.5.2. Distributed Data Structure Events +### 7.5.2. Listening for Distributed Data Structure Events You can add event listeners to the distributed data structures. From 97d3431f79ea00ce4cdeaffd741118c620cf408d Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Fri, 30 Nov 2018 12:33:17 +0300 Subject: [PATCH 206/685] Fix broken links in documentation (#425) --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d904b55ce..8c750fecd 100644 --- a/README.md +++ b/README.md @@ -376,7 +376,7 @@ There are two ways to configure a Hazelcast Node.js client: * Programmatically * Declaratively (JSON) -This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. See the [Configuration Overview section](#configuration-overview) +This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. See the [Configuration Overview section](#3-configuration-overview) and the following sections for information about detailed network configurations and/or additional features of Hazelcast Node.js client configuration. An easy way to configure your Hazelcast Node.js client is to create a `ClientConfig` object and set the appropriate options. Then you can @@ -1330,7 +1330,7 @@ Its default value is `3000` milliseconds. You can use TLS/SSL to secure the connection between the clients and members. If you want to enable TLS/SSL for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#61-tlsssl). -As explained in the [TLS/SSL section](#61-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#13-mutual-authentication). +As explained in the [TLS/SSL section](#61-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#613-mutual-authentication). ## 5.8. Enabling Hazelcast Cloud Discovery @@ -1531,7 +1531,7 @@ exports.SSLFactory = SSLFactory; The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. -For information about the path resolution, see the [Loading Objects and Path Resolution section](#3-loading-objects-and-path-resolution). +For information about the path resolution, see the [Loading Objects and Path Resolution section](#33-loading-objects-and-path-resolution). # 7. Using Node.js Client with Hazelcast IMDG @@ -1546,7 +1546,7 @@ Promises provide a better way of working with callbacks. You can chain asynchron If you are ready to go, let's start to use Hazelcast Node.js client. -The first step is the configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. See the [Programmatic Configuration section](#programmatic-configuration) for details. +The first step is the configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. See the [Programmatic Configuration section](#311-programmatic-configuration) for details. The following is an example on how to create a `ClientConfig` object and configure it programmatically: @@ -1616,13 +1616,13 @@ There are two main failure cases you should be aware of. Below sections explain While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might not be available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. -You can configure `connectionAttemptLimit` for the number of times you want the client to retry connecting. See the [Setting Connection Attempt Limit section](#5-setting-connection-attempt-limit). +You can configure `connectionAttemptLimit` for the number of times you want the client to retry connecting. See the [Setting Connection Attempt Limit section](#55-setting-connection-attempt-limit). The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. ### 7.3.2. Handling Retry-able Operation Failure -While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retrying for the other operations, you can set the `redoOperation` to `true`. See the [Enabling Redo Operation section](#3-enabling-redo-operation). +While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retrying for the other operations, you can set the `redoOperation` to `true`. See the [Enabling Redo Operation section](#53-enabling-redo-operation). You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in `ClientConfig.properties`. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: From 5930a318c8405591adfb7bde948e4c9be0c05a34 Mon Sep 17 00:00:00 2001 From: Furkan Senharputlu Date: Tue, 4 Dec 2018 14:10:49 +0300 Subject: [PATCH 207/685] Give reference to Near Cache in Using Map section (#432) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8c750fecd..188a0b661 100644 --- a/README.md +++ b/README.md @@ -1660,6 +1660,8 @@ client.getMap('my-distributed-map').then(function (mp) { }); ``` +Hazelcast Map supports a Near Cache for remotely stored entries to increase the performance of read operations. See the [Near Cache section](#782-near-cache) for a detailed explanation of the Near Cache feature and its configuration. + ### 7.4.2. Using MultiMap Hazelcast `MultiMap` is a distributed and specialized map where you can store multiple values under a single key. For details, see the [MultiMap section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#multimap) in the Hazelcast IMDG Reference Manual. From e8c44d51e47738390ba87d00fd35ddfcf6070883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20=C5=9Eenharputlu?= Date: Mon, 12 Nov 2018 12:51:53 +0300 Subject: [PATCH 208/685] refactor ssl behavior and add tests --- code_samples/ssl_authentication.js | 15 +-- src/config/ClientNetworkConfig.ts | 15 +-- src/config/ConfigBuilder.ts | 32 +++--- src/config/SSLConfig.ts | 54 +++++++++ src/config/SSLOptions.ts | 54 --------- src/invocation/ClientConnectionManager.ts | 37 +++--- test/config/ConfigBuilderSSLTest.js | 50 --------- test/config/hazelcast-client-ssl-false.json | 14 --- .../ConfigBuilderHazelcastCloudTest.js | 6 +- .../ConfigBuilderSSLTest.js | 74 ++++++++++++ .../ConfigBuilderTest.js | 10 +- .../ConfigLocationTest.js | 2 +- .../ConfigPatternMatcherTest.js | 0 .../SchemaValidationTest.js | 4 +- .../configurations/cloud-enabled.json} | 0 .../configurations/full.json} | 3 +- .../configurations/invalid-cloud.json} | 0 .../configurations/invalid-ssl-disabled.json | 9 ++ .../configurations/invalid-ssl-enabled.json | 9 ++ .../configurations/invalid-ssl-factory.json} | 2 +- .../configurations/invalid.json} | 0 .../configurations/near-cache.json} | 0 .../ssl-disabled-factory-set.json | 15 +++ .../ssl-disabled-options-set.json | 14 +++ test/ssl/BasicSSLOptionsFactoryTest.js | 3 +- test/ssl/ClientSSLAuthenticationTest.js | 8 +- test/ssl/ClientSSLTest.js | 105 ++++++++---------- test/ssl/cert.pem | 35 ++++++ test/ssl/hazelcast-ssl.xml | 6 +- test/ssl/letsencrypt.jks | Bin 0 -> 5323 bytes test/ssl/server1.keystore | Bin 0 -> 2209 bytes 31 files changed, 331 insertions(+), 245 deletions(-) create mode 100644 src/config/SSLConfig.ts delete mode 100644 src/config/SSLOptions.ts delete mode 100644 test/config/ConfigBuilderSSLTest.js delete mode 100644 test/config/hazelcast-client-ssl-false.json rename test/{config => declarative_config}/ConfigBuilderHazelcastCloudTest.js (89%) create mode 100644 test/declarative_config/ConfigBuilderSSLTest.js rename test/{config => declarative_config}/ConfigBuilderTest.js (94%) rename test/{config => declarative_config}/ConfigLocationTest.js (97%) rename test/{config => declarative_config}/ConfigPatternMatcherTest.js (100%) rename test/{config => declarative_config}/SchemaValidationTest.js (95%) rename test/{config/hazelcast-client-cloud-config-enabled.json => declarative_config/configurations/cloud-enabled.json} (100%) rename test/{config/hazelcast-client-full.json => declarative_config/configurations/full.json} (98%) rename test/{config/hazelcast-client-invalid-cloud-config.json => declarative_config/configurations/invalid-cloud.json} (100%) create mode 100644 test/declarative_config/configurations/invalid-ssl-disabled.json create mode 100644 test/declarative_config/configurations/invalid-ssl-enabled.json rename test/{config/hazelcast-client-ssl-basicssloptions.json => declarative_config/configurations/invalid-ssl-factory.json} (82%) rename test/{config/hazelcast-client-invalid.json => declarative_config/configurations/invalid.json} (100%) rename test/{config/hazelcast-client-near-cache.json => declarative_config/configurations/near-cache.json} (100%) create mode 100644 test/declarative_config/configurations/ssl-disabled-factory-set.json create mode 100644 test/declarative_config/configurations/ssl-disabled-options-set.json create mode 100644 test/ssl/cert.pem create mode 100644 test/ssl/letsencrypt.jks create mode 100644 test/ssl/server1.keystore diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js index 09acad738..136f4e94f 100644 --- a/code_samples/ssl_authentication.js +++ b/code_samples/ssl_authentication.js @@ -17,22 +17,11 @@ var Config = require('hazelcast-client').Config; var HazelcastClient = require('hazelcast-client').Client; -if (process.argv.length < 5) { - console.log('Usage: \n' + - 'node ssl_authentication.js [servername] [trusted-ca] [private-key] [certificate-file] '); - return -} var cfg = new Config.ClientConfig(); -cfg.networkConfig.sslOptions = { - servername: process.argv[2], - ca: process.argv[3], - key: process.argv[4], - cert: process.argv[5], - -}; +cfg.networkConfig.sslConfig.enabled = true; HazelcastClient.newHazelcastClient(cfg).then(function (client) { - console.log('This client is authenticated using ssl.'); + console.log('This client is authenticated using SSL.'); client.shutdown(); }); diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index a398ae8f6..5b7b385b8 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -14,13 +14,11 @@ * limitations under the License. */ -import {ImportConfig} from './ImportConfig'; -import {Properties} from './Properties'; -import {SSLOptions} from './SSLOptions'; import {ClientCloudConfig} from './ClientCloudConfig'; +import {SSLConfig} from './SSLConfig'; /** - * Network configuration + * Network configuration. */ export class ClientNetworkConfig { /** @@ -59,12 +57,7 @@ export class ClientNetworkConfig { smartRouting: boolean = true; /** - * sslOptions is by default null which disables Ssl. A none null {@link SSLOptions} value enables Ssl. - * @type {SSLOptions} + * SSL configuration. */ - sslOptions: SSLOptions = null; - - sslOptionsFactoryConfig: ImportConfig = null; - - sslOptionsFactoryProperties: Properties = null; + sslConfig: SSLConfig = new SSLConfig(); } diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 461a20349..36bc05377 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -49,7 +49,7 @@ export class ConfigBuilder { this.handleConfig(this.loadedJson); return this.clientConfig; } catch (e) { - throw new HazelcastError('Error parsing config.', e); + throw new HazelcastError('Error parsing config: ' + e.message, e); } } @@ -99,7 +99,7 @@ export class ConfigBuilder { } else if (key === 'connectionAttemptLimit') { this.clientConfig.networkConfig.connectionAttemptLimit = tryGetNumber(jsonObject[key]); } else if (key === 'ssl') { - this.handleSsl(jsonObject[key]); + this.handleSSL(jsonObject[key]); } else if (key === 'hazelcastCloud') { this.handleHazelcastCloud(jsonObject[key]); } @@ -133,19 +133,25 @@ export class ConfigBuilder { return importConfig; } - private handleSsl(jsonObject: any): void { + private handleSSL(jsonObject: any): void { const sslEnabled = tryGetBoolean(jsonObject.enabled); - if (sslEnabled) { + this.clientConfig.networkConfig.sslConfig.enabled = sslEnabled; + + if (jsonObject.sslOptions) { if (jsonObject.factory) { - const factory = jsonObject.factory; - const importConfig = this.parseImportConfig(factory); - if (importConfig.path == null && importConfig.exportedName !== BasicSSLOptionsFactory.name) { - throw new RangeError('Invalid configuration. Either ssl factory path should be set or exportedName ' + - ' should be ' + BasicSSLOptionsFactory.name); - } else { - this.clientConfig.networkConfig.sslOptionsFactoryConfig = this.parseImportConfig(factory); - this.clientConfig.networkConfig.sslOptionsFactoryProperties = this.parseProperties(factory.properties); - } + throw new RangeError('Invalid configuration. Either SSL options should be set manually or SSL factory' + + ' should be used.'); + } + this.clientConfig.networkConfig.sslConfig.sslOptions = jsonObject.sslOptions; + } else if (jsonObject.factory) { + const factory = jsonObject.factory; + const importConfig = this.parseImportConfig(factory); + if (importConfig.path == null && importConfig.exportedName !== BasicSSLOptionsFactory.name) { + throw new RangeError('Invalid configuration. Either SSL factory path should be set or exportedName' + + ' should be ' + BasicSSLOptionsFactory.name + '.'); + } else { + this.clientConfig.networkConfig.sslConfig.sslOptionsFactoryConfig = this.parseImportConfig(factory); + this.clientConfig.networkConfig.sslConfig.sslOptionsFactoryProperties = this.parseProperties(factory.properties); } } } diff --git a/src/config/SSLConfig.ts b/src/config/SSLConfig.ts new file mode 100644 index 000000000..a2f3ed45b --- /dev/null +++ b/src/config/SSLConfig.ts @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ConnectionOptions} from 'tls'; +import {Properties} from './Properties'; +import {ImportConfig} from './ImportConfig'; + +/** + * SSL configuration. + */ +export class SSLConfig { + + /** + * If it is true, SSL is enabled. + */ + enabled: boolean = false; + + /** + * sslOptions is by default null which means the following default configuration + * is used while connecting to the server. + * + * { + * checkServerIdentity: (): any => null, + * rejectUnauthorized: true, + * }; + * + * If you want to override the default behavior, you can write your own connection sslOptions. + */ + sslOptions: ConnectionOptions = null; + + /** + * sslOptionsFactoryConfig is config for ssl options factory. If you don't specify the path, BasicSSLOptionsFactory is used + * by default. + */ + sslOptionsFactoryConfig: ImportConfig = null; + + /** + * sslOptionsFactoryProperties is the properties to be set for ssl options. + */ + sslOptionsFactoryProperties: Properties = null; +} diff --git a/src/config/SSLOptions.ts b/src/config/SSLOptions.ts deleted file mode 100644 index 86b2131a9..000000000 --- a/src/config/SSLOptions.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -export interface SSLOptions { - /** - * A string or Buffer containing the private key, certificate and CA certs of the client in PFX or PKCS12 format. - */ - pfx?: any; // string | Buffer - - /** - * A string or Buffer containing the private key of the client in PEM format. (Could be an array of keys). - */ - key?: any; // string | Buffer - - /** - * A string of passphrase for the private key or pfx. - */ - passphrase?: string; - - /** - * A string or Buffer containing the certificate key of the client in PEM format. (Could be an array of certs). - */ - cert?: any; // string | Buffer - - /** - * An array of strings or Buffers of trusted certificates in PEM format. If this is omitted several well known "root" - * CAs will be used, like VeriSign. These are used to authorize connections. - */ - ca?: any; // Array of string | Buffer - - /** - * If true, the server certificate is verified against the list of supplied CAs. An 'error' event is emitted if verification - * fails; err.code contains the OpenSSL error code. Default: true. - */ - rejectUnauthorized?: boolean; - - /** - * Servername for SNI (Server Name Indication) TLS extension. - */ - servername?: string; -} diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index 9f4dfc400..8c07c16a7 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -28,6 +28,7 @@ import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {AddressTranslator} from '../connection/AddressTranslator'; import {AddressProvider} from '../connection/AddressProvider'; import Address = require('../Address'); +import {SSLOptionsFactory} from '../connection/SSLOptionsFactory'; const EMIT_CONNECTION_CLOSED = 'connectionClosed'; const EMIT_CONNECTION_OPENED = 'connectionOpened'; @@ -149,21 +150,31 @@ export class ClientConnectionManager extends EventEmitter { return Promise.reject(error); } } - if (this.client.getConfig().networkConfig.sslOptions) { - const opts = this.client.getConfig().networkConfig.sslOptions; - return this.connectTLSSocket(address, opts); - } else if (this.client.getConfig().networkConfig.sslOptionsFactoryConfig) { - const factoryConfig = this.client.getConfig().networkConfig.sslOptionsFactoryConfig; - const factoryProperties = this.client.getConfig().networkConfig.sslOptionsFactoryProperties; - let factory: any; - if (factoryConfig.path) { - factory = new (loadNameFromPath(factoryConfig.path, factoryConfig.exportedName))(); + + if (this.client.getConfig().networkConfig.sslConfig.enabled) { + if (this.client.getConfig().networkConfig.sslConfig.sslOptions) { + const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions; + return this.connectTLSSocket(address, opts); + } else if (this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig) { + const factoryConfig = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig; + const factoryProperties = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryProperties; + let factory: SSLOptionsFactory; + if (factoryConfig.path) { + factory = new (loadNameFromPath(factoryConfig.path, factoryConfig.exportedName))(); + } else { + factory = new BasicSSLOptionsFactory(); + } + return factory.init(factoryProperties).then(() => { + return this.connectTLSSocket(address, factory.getSSLOptions()); + }); } else { - factory = new BasicSSLOptionsFactory(); + // the default behavior when ssl is enabled + const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions = { + checkServerIdentity: (): any => null, + rejectUnauthorized: true, + }; + return this.connectTLSSocket(address, opts); } - return factory.init(factoryProperties).then(() => { - return this.connectTLSSocket(address, factory.getSSLOptions()); - }); } else { return this.connectNetSocket(address); } diff --git a/test/config/ConfigBuilderSSLTest.js b/test/config/ConfigBuilderSSLTest.js deleted file mode 100644 index fb0f5749a..000000000 --- a/test/config/ConfigBuilderSSLTest.js +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -require('chai').use(require('chai-as-promised')); -var expect = require('chai').expect; - -var path = require('path'); -var ConfigBuilder = require('../../').ConfigBuilder; -var Config = require('../../lib/index').Config; - -describe('ConfigBuilderSSLTest', function () { - var configFull; - - afterEach(function () { - delete process.env['HAZELCAST_CLIENT_CONFIG']; - }); - - function loadJson(jsonPath) { - var configBuilder = new ConfigBuilder(); - process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, jsonPath); - return configBuilder.loadConfig().then(function () { - configFull = configBuilder.build(); - }); - } - - it('ssl-false', function () { - return loadJson('hazelcast-client-ssl-false.json').then(function () { - var networkConfig = configFull.networkConfig; - expect(networkConfig.sslOptionsFactoryConfig).to.be.null; - expect(networkConfig.sslOptionsFactoryProperties).to.be.null; - }); - }); - - it('when path is undefined, if exportedName should is not BasicSSLOptionsFactory shoul throw', function () { - return expect(loadJson('hazelcast-client-ssl-basicssloptions.json')).to.be.rejected; - }); -}); diff --git a/test/config/hazelcast-client-ssl-false.json b/test/config/hazelcast-client-ssl-false.json deleted file mode 100644 index 0956a3e5f..000000000 --- a/test/config/hazelcast-client-ssl-false.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": { - "ssl": { - "enabled": false, - "factory": { - "path": "should not be parsed", - "exportedName": "should not be parsed", - "properties": { - "userDefinedProperty1": "should not be parsed" - } - } - } - } -} diff --git a/test/config/ConfigBuilderHazelcastCloudTest.js b/test/declarative_config/ConfigBuilderHazelcastCloudTest.js similarity index 89% rename from test/config/ConfigBuilderHazelcastCloudTest.js rename to test/declarative_config/ConfigBuilderHazelcastCloudTest.js index 70daa4e05..b8b00216a 100644 --- a/test/config/ConfigBuilderHazelcastCloudTest.js +++ b/test/declarative_config/ConfigBuilderHazelcastCloudTest.js @@ -37,7 +37,7 @@ describe('ConfigBuilderHazelcastCloud Test', function () { } it('cloudConfig', function () { - return loadJson('hazelcast-client-full.json').then(function () { + return loadJson('configurations/full.json').then(function () { var networkConfig = configFull.networkConfig; expect(networkConfig.cloudConfig.enabled).to.be.false; expect(networkConfig.cloudConfig.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); @@ -45,7 +45,7 @@ describe('ConfigBuilderHazelcastCloud Test', function () { }); it('cloudConfig_enabled_nullToken', function () { - return expect(loadJson('hazelcast-client-invalid-cloud-config.json')).to.be.rejectedWith(Error); + return expect(loadJson('configurations/invalid-cloud.json')).to.be.rejectedWith(Error); }); it('cloudConfig_defaults', function () { @@ -56,7 +56,7 @@ describe('ConfigBuilderHazelcastCloud Test', function () { }); it('cloudConfig_enabled', function () { - return loadJson('hazelcast-client-cloud-config-enabled.json').then(function () { + return loadJson('configurations/cloud-enabled.json').then(function () { var networkConfig = configFull.networkConfig; expect(networkConfig.cloudConfig.enabled).to.be.true; expect(networkConfig.cloudConfig.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); diff --git a/test/declarative_config/ConfigBuilderSSLTest.js b/test/declarative_config/ConfigBuilderSSLTest.js new file mode 100644 index 000000000..57efc1453 --- /dev/null +++ b/test/declarative_config/ConfigBuilderSSLTest.js @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var chai = require('chai'); +chai.use(require('chai-as-promised')); +var expect = chai.expect; +var path = require('path'); + +var ConfigBuilder = require('../../').ConfigBuilder; +var Config = require('../../lib/index').Config; +var Errors = require('../..').HazelcastErrors; + +describe('ConfigBuilderSSLTest', function () { + var configFull; + + afterEach(function () { + delete process.env['HAZELCAST_CLIENT_CONFIG']; + }); + + function loadJson(jsonPath) { + var configBuilder = new ConfigBuilder(); + process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, jsonPath); + return configBuilder.loadConfig().then(function () { + configFull = configBuilder.build(); + }); + } + + it('if both sslOptions and factory are set, should throw error', function () { + expect(loadJson('configurations/invalid-ssl-enabled.json')).to.be.rejectedWith(Errors.HazelcastError); + expect(loadJson('configurations/invalid-ssl-disabled.json')).to.be.rejectedWith(Errors.HazelcastError); + }); + + it('when path is undefined, exportedName should be BasicSSLOptionsFactory, otherwise should throw error', function () { + return expect(loadJson('configurations/invalid-ssl-factory.json')).to.be.rejectedWith(Errors.HazelcastError); + }); + + it('ssl is disabled but factory is set', function () { + return loadJson('configurations/ssl-disabled-factory-set.json').then(function () { + var networkCfg = configFull.networkConfig; + + expect(networkCfg.sslConfig.enabled).to.be.false; + expect(networkCfg.sslConfig.sslOptions).to.be.null; + expect(networkCfg.sslConfig.sslOptionsFactoryConfig.path).to.be.equal('path/to/file'); + expect(networkCfg.sslConfig.sslOptionsFactoryConfig.exportedName).to.be.equal('exportedName'); + expect(networkCfg.sslConfig.sslOptionsFactoryProperties['userDefinedProperty1']).to.equal('userDefinedValue'); + }) + }); + + it('ssl is disabled but options are set', function () { + return loadJson('configurations/ssl-disabled-options-set.json').then(function () { + var networkCfg = configFull.networkConfig; + + expect(networkCfg.sslConfig.enabled).to.be.false; + expect(networkCfg.sslConfig.sslOptions.ca).to.be.equal('ca.pem'); + expect(networkCfg.sslConfig.sslOptions.cert).to.be.equal('cert.pem'); + expect(networkCfg.sslConfig.sslOptions.key).to.be.equal('key.pem'); + expect(networkCfg.sslConfig.sslOptionsFactoryConfig).to.be.null; + }) + }); +}); + diff --git a/test/config/ConfigBuilderTest.js b/test/declarative_config/ConfigBuilderTest.js similarity index 94% rename from test/config/ConfigBuilderTest.js rename to test/declarative_config/ConfigBuilderTest.js index 59511911d..ea85ab0bf 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/declarative_config/ConfigBuilderTest.js @@ -26,7 +26,7 @@ describe('ConfigBuilder Test', function () { before(function () { var configBuilder = new ConfigBuilder(); - process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, 'hazelcast-client-full.json'); + process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, 'configurations/full.json'); return configBuilder.loadConfig().then(function () { configFull = configBuilder.build(); }); @@ -64,9 +64,11 @@ describe('ConfigBuilder Test', function () { expect(networkCfg.connectionTimeout).to.equal(6000); expect(networkCfg.connectionAttemptPeriod).to.equal(4000); expect(networkCfg.connectionAttemptLimit).to.equal(3); - expect(networkCfg.sslOptionsFactoryConfig.path).to.equal('path/to/file'); - expect(networkCfg.sslOptionsFactoryConfig.exportedName).to.equal('exportedName'); - expect(networkCfg.sslOptionsFactoryProperties['userDefinedProperty1']).to.equal('userDefinedValue'); + expect(networkCfg.sslConfig.enabled).to.be.true; + expect(networkCfg.sslConfig.sslOptions).to.be.null; + expect(networkCfg.sslConfig.sslOptionsFactoryConfig.path).to.equal('path/to/file'); + expect(networkCfg.sslConfig.sslOptionsFactoryConfig.exportedName).to.equal('exportedName'); + expect(networkCfg.sslConfig.sslOptionsFactoryProperties['userDefinedProperty1']).to.equal('userDefinedValue'); }); it('group', function () { diff --git a/test/config/ConfigLocationTest.js b/test/declarative_config/ConfigLocationTest.js similarity index 97% rename from test/config/ConfigLocationTest.js rename to test/declarative_config/ConfigLocationTest.js index 4f40baabe..1c19d1bbd 100644 --- a/test/config/ConfigLocationTest.js +++ b/test/declarative_config/ConfigLocationTest.js @@ -43,7 +43,7 @@ describe('ConfigLocationTest', function () { ' "name": "wrongName"' + ' }' + '}'); - process.env[ENV_VARIABLE_NAME] = path.join(__dirname, 'hazelcast-client-full.json'); + process.env[ENV_VARIABLE_NAME] = path.join(__dirname, 'configurations/full.json'); var configBuilder = new ConfigBuilder(); return configBuilder.loadConfig().then(function () { return expect(configBuilder.build().groupConfig.name).equals('hazel'); diff --git a/test/config/ConfigPatternMatcherTest.js b/test/declarative_config/ConfigPatternMatcherTest.js similarity index 100% rename from test/config/ConfigPatternMatcherTest.js rename to test/declarative_config/ConfigPatternMatcherTest.js diff --git a/test/config/SchemaValidationTest.js b/test/declarative_config/SchemaValidationTest.js similarity index 95% rename from test/config/SchemaValidationTest.js rename to test/declarative_config/SchemaValidationTest.js index 3cad5a78b..7dac115b8 100644 --- a/test/config/SchemaValidationTest.js +++ b/test/declarative_config/SchemaValidationTest.js @@ -33,12 +33,12 @@ describe('SchemaValidationTest', function () { } it('hazelcast-client-full.json passes validation', function () { - var fulljson = fs.readFileSync(path.resolve(__dirname, 'hazelcast-client-full.json'), 'utf8'); + var fulljson = fs.readFileSync(path.resolve(__dirname, 'configurations/full.json'), 'utf8'); expect(validateCandidate(fulljson).valid).to.be.true; }); it('invalid configuration is caught by the validator', function () { - var invalidJson = fs.readFileSync(path.resolve(__dirname, 'hazelcast-client-invalid.json'), 'utf8'); + var invalidJson = fs.readFileSync(path.resolve(__dirname, 'configurations/invalid.json'), 'utf8'); expect(validateCandidate(invalidJson).errors[0]).to.exist.with.property('message', 'must have a minimum value of 1000'); }); }); diff --git a/test/config/hazelcast-client-cloud-config-enabled.json b/test/declarative_config/configurations/cloud-enabled.json similarity index 100% rename from test/config/hazelcast-client-cloud-config-enabled.json rename to test/declarative_config/configurations/cloud-enabled.json diff --git a/test/config/hazelcast-client-full.json b/test/declarative_config/configurations/full.json similarity index 98% rename from test/config/hazelcast-client-full.json rename to test/declarative_config/configurations/full.json index 960654e3d..ebfae9864 100644 --- a/test/config/hazelcast-client-full.json +++ b/test/declarative_config/configurations/full.json @@ -22,6 +22,7 @@ "connectionAttemptLimit": 3, "ssl": { "enabled": true, + "sslOptions": null, "factory": { "path": "path/to/file", "exportedName": "exportedName", @@ -120,6 +121,6 @@ } ], "import": [ - "hazelcast-client-near-cache.json" + "near-cache.json" ] } diff --git a/test/config/hazelcast-client-invalid-cloud-config.json b/test/declarative_config/configurations/invalid-cloud.json similarity index 100% rename from test/config/hazelcast-client-invalid-cloud-config.json rename to test/declarative_config/configurations/invalid-cloud.json diff --git a/test/declarative_config/configurations/invalid-ssl-disabled.json b/test/declarative_config/configurations/invalid-ssl-disabled.json new file mode 100644 index 000000000..89ae97c22 --- /dev/null +++ b/test/declarative_config/configurations/invalid-ssl-disabled.json @@ -0,0 +1,9 @@ +{ + "network": { + "ssl": { + "enabled": false, + "sslOptions": {}, + "factory": {} + } + } +} diff --git a/test/declarative_config/configurations/invalid-ssl-enabled.json b/test/declarative_config/configurations/invalid-ssl-enabled.json new file mode 100644 index 000000000..e1653c5fd --- /dev/null +++ b/test/declarative_config/configurations/invalid-ssl-enabled.json @@ -0,0 +1,9 @@ +{ + "network": { + "ssl": { + "enabled": true, + "sslOptions": {}, + "factory": {} + } + } +} diff --git a/test/config/hazelcast-client-ssl-basicssloptions.json b/test/declarative_config/configurations/invalid-ssl-factory.json similarity index 82% rename from test/config/hazelcast-client-ssl-basicssloptions.json rename to test/declarative_config/configurations/invalid-ssl-factory.json index 40a93c370..d1dfada33 100644 --- a/test/config/hazelcast-client-ssl-basicssloptions.json +++ b/test/declarative_config/configurations/invalid-ssl-factory.json @@ -3,7 +3,7 @@ "ssl": { "enabled": true, "factory": { - "exportedName": "BsicSSLOponsFary", + "exportedName": "MySSLOptionsFactory", "properties": { "caPath": "ca.pem", "certPath": "cert.pem" diff --git a/test/config/hazelcast-client-invalid.json b/test/declarative_config/configurations/invalid.json similarity index 100% rename from test/config/hazelcast-client-invalid.json rename to test/declarative_config/configurations/invalid.json diff --git a/test/config/hazelcast-client-near-cache.json b/test/declarative_config/configurations/near-cache.json similarity index 100% rename from test/config/hazelcast-client-near-cache.json rename to test/declarative_config/configurations/near-cache.json diff --git a/test/declarative_config/configurations/ssl-disabled-factory-set.json b/test/declarative_config/configurations/ssl-disabled-factory-set.json new file mode 100644 index 000000000..66b715c37 --- /dev/null +++ b/test/declarative_config/configurations/ssl-disabled-factory-set.json @@ -0,0 +1,15 @@ +{ + "network": { + "ssl": { + "enabled": false, + "sslOptions": null, + "factory": { + "path": "path/to/file", + "exportedName": "exportedName", + "properties": { + "userDefinedProperty1": "userDefinedValue" + } + } + } + } +} diff --git a/test/declarative_config/configurations/ssl-disabled-options-set.json b/test/declarative_config/configurations/ssl-disabled-options-set.json new file mode 100644 index 000000000..f58e1367a --- /dev/null +++ b/test/declarative_config/configurations/ssl-disabled-options-set.json @@ -0,0 +1,14 @@ +{ + "network": { + "ssl": { + "enabled": false, + "sslOptions": { + "ca": "ca.pem", + "cert": "cert.pem", + "key": "key.pem", + "servername": "foo.bar.com" + }, + "factory": null + } + } +} diff --git a/test/ssl/BasicSSLOptionsFactoryTest.js b/test/ssl/BasicSSLOptionsFactoryTest.js index f974d8726..e08514b05 100644 --- a/test/ssl/BasicSSLOptionsFactoryTest.js +++ b/test/ssl/BasicSSLOptionsFactoryTest.js @@ -21,7 +21,8 @@ var HazelcastError = require('../..').HazelcastErrors.HazelcastError; var BasicSSLOptionsFactory = require('../../lib/connection/BasicSSLOptionsFactory').BasicSSLOptionsFactory; describe('BasicSSLOptionsFactoryTest', function () { - it('factory creates options object with all supported fields', function () { + + it('factory creates sslOptions object with all supported fields', function () { var options = { servername: 'foo.bar.com', rejectUnauthorized: true, diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index dd0b99da8..68491e58f 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -56,7 +56,8 @@ describe('SSL Client Authentication Test', function () { cert: fs.readFileSync(Path.join(__dirname, cert)) }; var cfg = new Config.ClientConfig(); - cfg.networkConfig.sslOptions = sslOpts; + cfg.networkConfig.sslConfig.enabled = true; + cfg.networkConfig.sslConfig.sslOptions = sslOpts; cfg.networkConfig.connectionAttemptLimit = 1; cfg.networkConfig.connectionTimeout = 1000; return cfg; @@ -64,10 +65,11 @@ describe('SSL Client Authentication Test', function () { function createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory(key, cert, ca) { var cfg = new Config.ClientConfig(); - cfg.networkConfig.sslOptionsFactoryConfig = { + cfg.networkConfig.sslConfig.enabled = true; + cfg.networkConfig.sslConfig.sslOptionsFactoryConfig = { exportedName: 'BasicSSLOptionsFactory' }; - cfg.networkConfig.sslOptionsFactoryProperties = { + cfg.networkConfig.sslConfig.sslOptionsFactoryProperties = { caPath: Path.resolve(__dirname, ca), keyPath: Path.resolve(__dirname, key), certPath: Path.resolve(__dirname, cert), diff --git a/test/ssl/ClientSSLTest.js b/test/ssl/ClientSSLTest.js index d7c87fc5a..2c923c2d8 100644 --- a/test/ssl/ClientSSLTest.js +++ b/test/ssl/ClientSSLTest.js @@ -14,77 +14,66 @@ * limitations under the License. */ -var chai = require("chai"); +var chai = require('chai'); +chai.use(require('chai-as-promised')); var expect = chai.expect; -var chaiAsPromised = require("chai-as-promised"); -chai.use(chaiAsPromised); -var HazelcastClient = require("../../lib/index.js").Client; -var Controller = require('./../RC'); -var Config = require('../..').Config; -var Util = require('./../Util'); -var Promise = require('bluebird'); var fs = require('fs'); -var _fillMap = require('../Util').fillMap; -var markEnterprise = require('../Util').markEnterprise; - - -var authorizedSslConfig = new Config.ClientConfig(); -authorizedSslConfig.networkConfig.sslOptions = { - rejectUnauthorized: true, - ca: [fs.readFileSync(__dirname + '/server1-cert.pem')], - servername: 'foo.bar.com' -}; - -var unauthorizedSslConfig = new Config.ClientConfig(); -unauthorizedSslConfig.networkConfig.sslOptions = {rejectUnauthorized: false}; - -var configParams = [ - authorizedSslConfig, - unauthorizedSslConfig -]; - -configParams.forEach(function (cfg) { +var Promise = require('bluebird'); +var path = require('path'); - describe("SSL rejectUnauthorized:" + cfg.networkConfig.sslOptions.rejectUnauthorized, function () { +var markEnterprise = require('../Util').markEnterprise; +var Controller = require('./../RC'); - var cluster; - var client; +var HazelcastClient = require("../../lib/index.js").Client; +var Errors = require('../..').HazelcastErrors; +var Config = require('../..').Config; - before(function () { - markEnterprise(this); +describe("Client with SSL enabled", function () { - this.timeout(10000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8')).then(function (response) { - cluster = response; - return Controller.startMember(cluster.id); - }).then(function (member) { - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client = hazelcastClient; - }); - }); - }); + var cluster; + var client; + var serverConfig; - after(function () { - markEnterprise(this); + beforeEach(function () { + this.timeout(10000); + markEnterprise(this); + serverConfig = fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8'); + }); + afterEach(function () { + markEnterprise(this); + if (client) { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + client = null; + } + return Controller.shutdownCluster(cluster.id); + }); + + function createClusterAndConnect() { + return Controller.createCluster(null, serverConfig).then(function (response) { + cluster = response; + return Controller.startMember(cluster.id); + }).then(function (member) { + var clientConfig = new Config.ClientConfig(); + clientConfig.networkConfig.sslConfig.enabled = true; + return HazelcastClient.newHazelcastClient(clientConfig); + }).then(function (hazelcastClient) { + client = hazelcastClient; }); + } - it('isRunning', function () { + it('should be able to connect to the server with valid certificate', function () { + serverConfig = serverConfig.replace('[serverCertificate]', __dirname + '/letsencrypt.jks'); + serverConfig = serverConfig.replace('[password]', '123456'); + return createClusterAndConnect().then(function () { return expect(client.lifecycleService.isRunning()).to.be.true; }); + }); - it('basic map size', function () { - var map; - return client.getMap('test').then(function (mp) { - map = mp; - return _fillMap(map); - }).then(function () { - return map.size().then(function (size) { - expect(size).to.equal(10); - }); - }) - }); + it('should not be able to connect to the server with invalid certificate', function () { + serverConfig = serverConfig.replace('[serverCertificate]', __dirname + '/server1.keystore'); + serverConfig = serverConfig.replace('[password]', 'password'); + return expect(createClusterAndConnect()).to.be.rejectedWith(Errors.IllegalStateError); }); }); + diff --git a/test/ssl/cert.pem b/test/ssl/cert.pem new file mode 100644 index 000000000..67af39e57 --- /dev/null +++ b/test/ssl/cert.pem @@ -0,0 +1,35 @@ +-----BEGIN CERTIFICATE----- +MIIGKTCCBRGgAwIBAgISAwgLFtaidAFXeO5yCb+61njtMA0GCSqGSIb3DQEBCwUA +MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA4MjExNDM4MDNaFw0x +ODExMTkxNDM4MDNaMCoxKDAmBgNVBAMTH21lbWJlcjEuaGF6ZWxjYXN0LXRlc3Qu +ZG93bmxvYWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNgNhrtRkq +yBY9iBK312en6Hbf112nj7uj4uEa59bHmvOzQ6Wte5kYGaI9G0OSEV+K1mA6mFEk +t+LzHUch2xaS+1SvFXZrC6SlPPxmTXKV+e8mgq1j+K5xjuxzkMjn/lXduUAFqOId +P7kW57Tj+cOlQQ3LQ8rVWBchsdBHM7tmYcHB7ZtG8+0CNcumH09A65IOH/GVpVbF +U4/fePeXWJM/P2ol+vbwq1bTfHneVut5tKDIfKMLvV1yh8ZxxvPVBxcXlb0QTsZe +h+XcGVfySym5E2UvYH07FjBtjtbgj/fKgtCPqvocu4ZVqyOSs2VMkdZxTyaf53ht +0acbvSOKtAgfAgMBAAGjggMnMIIDIzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw +FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFEpz +nuKNW9boHeQgkoqAawxo/y3eMB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/z +qOyhMG8GCCsGAQUFBwEBBGMwYTAuBggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50 +LXgzLmxldHNlbmNyeXB0Lm9yZzAvBggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50 +LXgzLmxldHNlbmNyeXB0Lm9yZy8wKgYDVR0RBCMwIYIfbWVtYmVyMS5oYXplbGNh +c3QtdGVzdC5kb3dubG9hZDCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYB +BAGC3xMBAQEwgdYwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQu +b3JnMIGrBggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkg +YmUgcmVsaWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFj +Y29yZGFuY2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0 +dHBzOi8vbGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMIIBBAYKKwYBBAHWeQIE +AgSB9QSB8gDwAHcAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAFl +XSLCqwAABAMASDBGAiEA8MTA4EU2tvLEKcGgW04HVp7wFPFtziAkgXJcAoDtpsYC +IQCVWxSgNjBRKnqPWk5p/fbFwEDov7MK51GqRL3wwVn+4QB1AKRQEmkFWhVUXmIR +qze8ED9irlV2pF5LFxRFPhsiEGolAAABZV0iwkwAAAQDAEYwRAIgJc4SL3RTEDCN +V3qR4O4WPNy27eQ9oZ9SbEelucgjZ/ICIBP0nvhQ9ECV7cZraFkbOITwOxu7NQQX +ofba3/Gq1bfaMA0GCSqGSIb3DQEBCwUAA4IBAQA2vCF50h/ynROM7oBgjptt6N79 +6E8jDF4m2dqModyt4f5f3tnTdGNtXEGGHr5+PbJgYUumjoiG+Rt0ezJq6rc/KFWE +LAI71LjJ6esEhMesOWWtq/XwHnPFb92rQs/NK/NTq0yz/mYVmeMFsOfyhRh9zC5H +71HwBeWWqavoHn3Q8XnDEZIxBjt92PCL6SEejde8MU5XPEuCCoYzUijUDmN/YE5y +BTqGB9dkKRa0nY/43aswY7PPCKTeIyYET2P+nI8/dKcAK+vGSFQ61tS3trXdRuTr +8/W7aqipRddq849mEicUNLWA3Pg671eC36w0QqAaBc+xk2XD7iPRVys7X/cW +-----END CERTIFICATE----- diff --git a/test/ssl/hazelcast-ssl.xml b/test/ssl/hazelcast-ssl.xml index 97f57114f..6248c4839 100644 --- a/test/ssl/hazelcast-ssl.xml +++ b/test/ssl/hazelcast-ssl.xml @@ -44,11 +44,11 @@ 127.0.0.1 - com.hazelcast.nio.ssl.ClasspathSSLContextFactory + com.hazelcast.nio.ssl.BasicSSLContextFactory - com/hazelcast/nio/ssl-mutual-auth/server1.keystore - password + [serverCertificate] + [password] + + + + 8 + + From 5a4426c935b34f3d0b6670ec41adad334aa1ea84 Mon Sep 17 00:00:00 2001 From: Mustafa Iman Date: Mon, 31 Dec 2018 16:27:54 -0500 Subject: [PATCH 230/685] Adds missing os.systemLoadAverage os.systemLoadAverage statistic is an array of 1, 5 and 15 minute averages in Node.js. However client statistics prd defines this as a single value coverring only last minute. This also adds missing os.processCpuTime statistic which was missing. This metric is not supported in Node.js 4 so we silently ignore it in that case. Fixes #446 --- src/Util.ts | 6 ++ src/statistics/Statistics.ts | 13 +++- test/statistics/StatisticsTest.js | 99 +++++++++++++++++++------------ 3 files changed, 78 insertions(+), 40 deletions(-) diff --git a/src/Util.ts b/src/Util.ts index bfb565353..2a94d4f93 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -330,3 +330,9 @@ export function DeferredPromise(): Promise.Resolver { promise, } as Promise.Resolver; } + +export function getNodejsMajorVersion(): number { + const versionString = process.version; + const versions = versionString.split('.'); + return Number.parseInt(versions[0].substr(1)); +} diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts index e39d3720d..fdd457b50 100644 --- a/src/statistics/Statistics.ts +++ b/src/statistics/Statistics.ts @@ -153,15 +153,22 @@ export class Statistics { this.registerGauge('os.freeSwapSpaceSize', () => Statistics.EMPTY_STAT_VALUE); this.registerGauge('os.maxFileDescriptorCount', () => Statistics.EMPTY_STAT_VALUE); this.registerGauge('os.openFileDescriptorCount', () => Statistics.EMPTY_STAT_VALUE); - this.registerGauge('os.processCpuTime', () => Statistics.EMPTY_STAT_VALUE); - this.registerGauge('os.systemLoadAverage', () => '[' + os.loadavg().toString() + ']'); + this.registerGauge('os.processCpuTime', () => { + // Nodejs 4 does not support this metric. So we do not print an ugly warning for that. + if (Util.getNodejsMajorVersion() >= 6) { + return process.cpuUsage().user * 1000; // process.cpuUsage returns micoseconds. We convert to nanoseconds. + } else { + return Statistics.EMPTY_STAT_VALUE; + } + }); + this.registerGauge('os.systemLoadAverage', () => os.loadavg()[0]); this.registerGauge('os.totalPhysicalMemorySize', () => os.totalmem()); this.registerGauge('os.totalSwapSpaceSize', () => Statistics.EMPTY_STAT_VALUE); this.registerGauge('runtime.availableProcessors', () => os.cpus().length); this.registerGauge('runtime.freeMemory', () => Statistics.EMPTY_STAT_VALUE); this.registerGauge('runtime.maxMemory', () => Statistics.EMPTY_STAT_VALUE); this.registerGauge('runtime.totalMemory', () => process.memoryUsage().heapTotal); - this.registerGauge('runtime.uptime', () => process.uptime()); + this.registerGauge('runtime.uptime', () => process.uptime() * 1000); this.registerGauge('runtime.usedMemory', () => process.memoryUsage().heapUsed); this.registerGauge('executionService.userExecutorQueueSize', () => Statistics.EMPTY_STAT_VALUE); } diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index 60ea7b614..2fc4f79b9 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -14,13 +14,16 @@ * limitations under the License. */ +var Statistics = require("../../lib/statistics/Statistics").Statistics; var expect = require('chai').expect; var BuildInfo = require('../../lib/BuildInfo').BuildInfo; var RC = require('../RC'); var Client = require('../../').Client; -var Util = require('../Util'); +var TestUtil = require('../Util'); +var Util = require('../../lib/Util'); var Config = require('../../').Config; +var os = require('os'); describe('Statistics with default period', function () { @@ -29,7 +32,7 @@ describe('Statistics with default period', function () { var map; before(function () { - Util.markServerVersionAtLeast(this, null, '3.9.0'); + TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { @@ -48,7 +51,7 @@ describe('Statistics with default period', function () { }); after(function () { - Util.markServerVersionAtLeast(this, null, '3.9.0'); + TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); client.shutdown(); return RC.shutdownCluster(cluster.id); }); @@ -64,7 +67,7 @@ describe('Statistics with default period', function () { }); it('should be enabled via configuration', function () { - return Util.promiseWaitMilliseconds(1000).then(function () { + return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (stats) { expect(stats).to.not.null; @@ -73,34 +76,38 @@ describe('Statistics with default period', function () { }); it('should contain statistics content', function () { - return Util.promiseWaitMilliseconds(1000).then(function () { + return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (stats) { expect(stats).to.not.be.null; - expect(contains(stats, 'clientName=' + client.getName())).to.be.true; - expect(contains(stats, 'lastStatisticsCollectionTime=')).to.be.true; - expect(contains(stats, 'enterprise=false')).to.be.true; - expect(contains(stats, 'clientType=NodeJS')).to.be.true; - expect(contains(stats, 'clientVersion=' + BuildInfo.getClientVersion())).to.be.true; - + expect(extractStringStatValue(stats, 'clientName')).to.equal(client.getName()); + expect(extractIntStatValue(stats, 'lastStatisticsCollectionTime')).to.be + .within(Date.now() - Statistics.PERIOD_SECONDS_DEFAULT_VALUE * 2000, Date.now()); + expect(extractBooleanStatValue(stats, 'enterprise')).to.be.false; + expect(extractStringStatValue(stats, 'clientType')).to.equal('NodeJS'); + expect(extractStringStatValue(stats, 'clientVersion')).to.equal(BuildInfo.getClientVersion()); var ownerConnection = client.getClusterService().getOwnerConnection(); - expect(contains(stats, 'clusterConnectionTimestamp=' + ownerConnection.getStartTime())).to.be.true; - expect(contains(stats, 'clientAddress=' + ownerConnection.getLocalAddress().toString())).to.be.true; - expect(contains(stats, 'os.committedVirtualMemorySize=')).to.be.true; - expect(contains(stats, 'os.freeSwapSpaceSize=')).to.be.true; - expect(contains(stats, 'os.maxFileDescriptorCount=')).to.be.true; - expect(contains(stats, 'os.openFileDescriptorCount=')).to.be.true; - expect(contains(stats, 'os.processCpuTime=')).to.be.true; - expect(contains(stats, 'os.systemLoadAverage=')).to.be.true; - expect(contains(stats, 'os.totalPhysicalMemorySize=')).to.be.true; - expect(contains(stats, 'os.totalSwapSpaceSize=')).to.be.true; - expect(contains(stats, 'runtime.availableProcessors=')).to.be.true; - expect(contains(stats, 'runtime.freeMemory=')).to.be.true; - expect(contains(stats, 'runtime.maxMemory=')).to.be.true; - expect(contains(stats, 'runtime.totalMemory=')).to.be.true; - expect(contains(stats, 'runtime.uptime=')).to.be.true; - expect(contains(stats, 'runtime.usedMemory=')).to.be.true; - expect(contains(stats, 'executionService.userExecutorQueueSize=')).to.be.true; + expect(extractIntStatValue(stats, 'clusterConnectionTimestamp')).to.equal(ownerConnection.getStartTime()); + expect(extractStringStatValue(stats, 'clientAddress')).to.equal(ownerConnection.getLocalAddress().toString()); + expect(extractStringStatValue(stats, 'os.committedVirtualMemorySize')).to.equal(''); + expect(extractStringStatValue(stats, 'os.freeSwapSpaceSize')).to.equal(''); + expect(extractStringStatValue(stats, 'os.maxFileDescriptorCount')).to.equal(''); + expect(extractStringStatValue(stats, 'os.openFileDescriptorCount')).to.equal(''); + if (Util.getNodejsMajorVersion() >= 6) { + expect(extractIntStatValue(stats, 'os.processCpuTime')).to.greaterThan(1000); + } else { + expect(extractStringStatValue(stats, 'os.processCpuTime')).to.equal(''); + } + expect(extractFloatStatValue(stats, 'os.systemLoadAverage')).to.be.greaterThan(0); + expect(extractIntStatValue(stats, 'os.totalPhysicalMemorySize')).to.equal(os.totalmem()); + expect(extractStringStatValue(stats, 'os.totalSwapSpaceSize')).to.equal(''); + expect(extractIntStatValue(stats, 'runtime.availableProcessors')).to.equal(os.cpus().length); + expect(extractStringStatValue(stats, 'runtime.freeMemory')).to.equal(''); + expect(extractStringStatValue(stats, 'runtime.maxMemory')).to.equal(''); + expect(extractIntStatValue(stats, 'runtime.totalMemory')).to.greaterThan(0); + expect(extractIntStatValue(stats, 'runtime.uptime')).to.greaterThan(0); + expect(extractIntStatValue(stats, 'runtime.usedMemory')).to.greaterThan(0); + expect(extractStringStatValue(stats, 'executionService.userExecutorQueueSize')).to.equal(''); }); }); @@ -110,7 +117,7 @@ describe('Statistics with default period', function () { }).then(function () { return map.get('key'); }).then(function () { - return Util.promiseWaitMilliseconds(5000); + return TestUtil.promiseWaitMilliseconds(5000); }).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (stats) { @@ -133,7 +140,7 @@ describe('Statistics with non-default period', function () { var client; before(function () { - Util.markServerVersionAtLeast(this, null, '3.9.0'); + TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { @@ -149,14 +156,14 @@ describe('Statistics with non-default period', function () { }); after(function () { - Util.markServerVersionAtLeast(this, null, '3.9.0'); + TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); client.shutdown(); return RC.shutdownCluster(cluster.id); }); it('should not change before period', function () { var stats1; - return Util.promiseWaitMilliseconds(1000).then(function () { + return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (st) { stats1 = st; @@ -168,11 +175,11 @@ describe('Statistics with non-default period', function () { it('should change after period', function () { var stats1; - return Util.promiseWaitMilliseconds(1000).then(function () { + return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (st) { stats1 = st; - return Util.promiseWaitMilliseconds(2000) + return TestUtil.promiseWaitMilliseconds(2000) }).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (stats2) { @@ -186,7 +193,7 @@ describe('Statistics with negative period', function () { var cluster; before(function () { - Util.markServerVersionAtLeast(this, null, '3.9.0'); + TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { @@ -202,13 +209,13 @@ describe('Statistics with negative period', function () { }); after(function () { - Util.markServerVersionAtLeast(this, null, '3.9.0'); + TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); client.shutdown(); return RC.shutdownCluster(cluster.id); }); it('should be enabled via configuration', function () { - return Util.promiseWaitMilliseconds(1000).then(function () { + return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (stats) { expect(stats).to.not.equal(''); @@ -233,3 +240,21 @@ function getClientStatisticsFromServer(cluster, client) { return null; }); } + +function extractStringStatValue(stats, statName) { + var re = new RegExp(statName + '=(.*?)(?:,|$)'); + var matches = stats.match(re); + return matches[1]; +} + +function extractFloatStatValue(stats, statName) { + return Number.parseFloat(extractStringStatValue(stats, statName)); +} + +function extractBooleanStatValue(stats, statName) { + return 'true' === extractStringStatValue(stats, statName); +} + +function extractIntStatValue(stats, statName) { + return Number.parseInt(extractStringStatValue(stats, statName)); +} From 946ff51a487958b666e6f6a198c25f83203a73a6 Mon Sep 17 00:00:00 2001 From: Ondrej Lukas Date: Fri, 30 Nov 2018 11:21:57 +0100 Subject: [PATCH 231/685] Use mocha-junit-reporter --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a0dc5be96..1a6dad026 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "istanbul": "0.4.5", "jsonschema": "1.2.4", "mocha": "3.5.3", + "mocha-junit-reporter": "1.18.0", "mousse": "0.3.1", "remap-istanbul": "0.9.6", "rimraf": "2.6.2", @@ -29,9 +30,9 @@ "clean": "rimraf lib typings *.jar *.log", "compile": "tsc", "pretest": "node download-remote-controller.js", - "test": "mocha --recursive", + "test": "mocha --recursive --reporter-options mochaFile=report.xml --reporter mocha-junit-reporter", "precoverage": "node download-remote-controller.js", - "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", + "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter-options mochaFile=report.xml --reporter mocha-junit-reporter", "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", "pregenerate-docs": "rimraf docs", From cdb435464bfeb9caf5c661cd1577a7392632477a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Tue, 22 Jan 2019 10:00:21 +0300 Subject: [PATCH 232/685] update hazelcast version to use the renewed certificates (#456) --- scripts/dev-test-rc.sh | 4 ++-- scripts/download-rc.bat | 4 ++-- scripts/download-rc.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index ae325ccda..1a882f5cd 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="3.11.1-SNAPSHOT" -HAZELCAST_TEST_VERSION="3.11.1-SNAPSHOT" +HZ_VERSION="3.11.2-SNAPSHOT" +HAZELCAST_TEST_VERSION="3.11.2-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.4-SNAPSHOT" diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 87053d909..72f4d8c33 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,5 +1,5 @@ -set HZ_VERSION="3.11.1-SNAPSHOT" -set HZ_TEST_VERSION="3.11.1-SNAPSHOT" +set HZ_VERSION="3.11.2-SNAPSHOT" +set HZ_TEST_VERSION="3.11.2-SNAPSHOT" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 349a3219c..34a0d13ca 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="3.11.1-SNAPSHOT" -HZ_TEST_VERSION="3.11.1-SNAPSHOT" +HZ_VERSION="3.11.2-SNAPSHOT" +HZ_TEST_VERSION="3.11.2-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} From e37f4a8da3dd19856d0901d40f353a228facc4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Holu=C5=A1a?= Date: Tue, 22 Jan 2019 16:16:57 +0100 Subject: [PATCH 233/685] Maven repository update --- scripts/dev-test-rc.sh | 4 ++-- scripts/download-rc.bat | 4 ++-- scripts/download-rc.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 1a882f5cd..9fe85deef 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -6,8 +6,8 @@ HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.4-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" -ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" -ENTERPRISE_SNAPSHOT_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/snapshot/" +ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" +ENTERPRISE_SNAPSHOT_REPO="https://repository.hazelcast.com/snapshot/" if [[ ${HZ_VERSION} == *-SNAPSHOT ]] then diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 72f4d8c33..2aa586f6c 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -6,8 +6,8 @@ set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% set HAZELCAST_RC_VERSION="0.4-SNAPSHOT" set SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" set RELEASE_REPO="http://repo1.maven.apache.org/maven2" -set ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" -set ENTERPRISE_SNAPSHOT_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/snapshot/" +set ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" +set ENTERPRISE_SNAPSHOT_REPO="https://repository.hazelcast.com/snapshot/" echo %HZ_VERSION% | findstr /r ".*-SNAPSHOT" >nul 2>&1 if errorlevel 1 ( diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 34a0d13ca..67db7d4bc 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -8,8 +8,8 @@ HAZELCAST_ENTERPRISE_TEST_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.4-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" -ENTERPRISE_RELEASE_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/release/" -ENTERPRISE_SNAPSHOT_REPO="https://repository-hazelcast-l337.forge.cloudbees.com/snapshot/" +ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" +ENTERPRISE_SNAPSHOT_REPO="https://repository.hazelcast.com/snapshot/" if [[ ${HZ_VERSION} == *-SNAPSHOT ]] then From f7aa636ddbd0803f5611b352832465342684995f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Tue, 29 Jan 2019 11:37:49 +0300 Subject: [PATCH 234/685] remove member tool section from the documentation (#458) --- README.md | 91 +++---------------------------------------------------- 1 file changed, 4 insertions(+), 87 deletions(-) diff --git a/README.md b/README.md index ad5d1b1ce..31a066f50 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,8 @@ * [1.1. Requirements](#11-requirements) * [1.2. Working with Hazelcast IMDG Clusters](#12-working-with-hazelcast-imdg-clusters) * [1.2.1. Setting Up a Hazelcast IMDG Cluster](#121-setting-up-a-hazelcast-imdg-cluster) - * [1.2.1.1. Using hazelcast-member Tool](#1211-using-hazelcast-member-tool) - * [Installing on Mac OS X](#installing-on-mac-os-x) - * [Installing on Ubuntu and Debian](#installing-on-ubuntu-and-debian) - * [Installing on Red Hat and CentOS](#installing-on-red-hat-and-centos) - * [1.2.1.2. Running Standalone JARs](#1212-running-standalone-jars) - * [1.2.1.3. Adding User Library to CLASSPATH](#1213-adding-user-library-to-classpath) + * [1.2.1.1. Running Standalone JARs](#1211-running-standalone-jars) + * [1.2.1.2. Adding User Library to CLASSPATH](#1212-adding-user-library-to-classpath) * [1.3. Downloading and Installing](#13-downloading-and-installing) * [1.4. Basic Configuration](#14-basic-configuration) * [1.4.1. Configuring Hazelcast IMDG](#141-configuring-hazelcast-imdg) @@ -161,89 +157,10 @@ There are following options to start a Hazelcast IMDG cluster easily: * You can run standalone members by downloading and running JAR files from the website. * You can embed members to your Java projects. -* The easiest way is to use [hazelcast-member tool](https://github.com/hazelcast/hazelcast-member-tool) if you have brew installed in your computer. We are going to download JARs from the website and run a standalone member for this guide. -#### 1.2.1.1. Using hazelcast-member Tool - -`hazelcast-member` is a tool to download and run Hazelcast IMDG members easily. You can find the installation instructions for various platforms in the following sections. - -##### Installing on Mac OS X - -If you have brew installed, run the following commands to install this tool: - -``` -brew tap hazelcast/homebrew-hazelcast -brew install hazelcast-member -``` - -##### Installing on Ubuntu and Debian - -To resolve the `.deb` artifacts from Bintray, follow the below instructions. - -First, you need to import the Bintray's GPG key using the following command: - -``` -sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 379CE192D401AB61 -``` - -Then, run the following commands to add the `.deb` artifact to your system configuration file and update the lists of packages: - -``` -echo "deb https://dl.bintray.com/hazelcast/deb stable main" | sudo tee -a /etc/apt/sources.list -sudo apt-get update -``` - -Finally, run the following command to install the `hazelcast-member` tool: - -``` -sudo apt-get install hazelcast-member -``` - -##### Installing on Red Hat and CentOS - -To resolve the `RPM` artifacts from Bintray, follow the below instructions. - -First, run the following command to get a generated `.repo` file: - -``` -wget https://bintray.com/hazelcast/rpm/rpm -O bintray-hazelcast-rpm.repo -``` - -Then, install the `.repo` file using the following command: - - -``` -sudo mv bintray-hazelcast-rpm.repo /etc/yum.repos.d/ -``` - -Finally, run the following command to install the `hazelcast-member` tool: - -``` -sudo yum install hazelcast-member -``` - ---- - -After successfully installing the `hazelcast-member` tool, you can start a member by running the following command: - -``` -hazelcast-member start -``` - -To stop a member, run the following command: - -``` -hazelcast-member stop -``` - -You can find more information about the `hazelcast-member` tool at its GitHub [repo](https://github.com/hazelcast/hazelcast-member-tool). - -See the [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#getting-started) for more information on setting up the clusters. - - -#### 1.2.1.2. Running Standalone JARs +#### 1.2.1.1. Running Standalone JARs Follow the instructions below to create a Hazelcast IMDG cluster: @@ -266,7 +183,7 @@ Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED ``` -#### 1.2.1.3. Adding User Library to CLASSPATH +#### 1.2.1.2. Adding User Library to CLASSPATH When you want to use features such as querying and language interoperability, you might need to add your own Java classes to the Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). Then, you can start your Hazelcast member by using the start scripts in the `bin` directory. The start scripts will automatically add your compiled classes to the `CLASSPATH`. From 1b9ff92d88fbcc756fb1a642076b1f7c363ac4de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Tue, 29 Jan 2019 12:38:53 +0300 Subject: [PATCH 235/685] add missing line to the cluster section (#459) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 31a066f50..b311f0352 100644 --- a/README.md +++ b/README.md @@ -206,6 +206,8 @@ The following is an example configuration when you are adding an `IdentifiedData ``` If you want to add a `Portable` class, you should use `` instead of `` in the above configuration. +See the [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#getting-started) for more information on setting up the clusters. + ## 1.3. Downloading and Installing Hazelcast Node.js client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. From 63dea03802faee007028e77f310994111be1da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Tue, 5 Mar 2019 19:00:46 +0300 Subject: [PATCH 236/685] add jaas code samples (#466) * add jaas code samples * fix typos * fixes for the reviews * add a note about starting bootstrap.java --- README.md | 180 +++++++++++++++++- code_samples/jaas_sample/README.md | 39 ++++ code_samples/jaas_sample/admin_client.js | 29 +++ .../jaas_sample/hazelcast-member/README.md | 17 ++ .../src/main/java/com/company/Bootstrap.java | 10 + .../company/security/ClientLoginModule.java | 95 +++++++++ .../company/security/DummyAuthenticator.java | 34 ++++ .../security/UserGroupCredentials.java | 48 +++++ .../security/UsernamePasswordCredentials.java | 71 +++++++ .../UsernamePasswordCredentialsFactory.java | 17 ++ .../src/main/resources/hazelcast.xml | 52 +++++ code_samples/jaas_sample/reader_client.js | 26 +++ code_samples/jaas_sample/user_pass_cred.js | 27 +++ .../jaas_sample/user_pass_cred_factory.js | 13 ++ 14 files changed, 654 insertions(+), 4 deletions(-) create mode 100644 code_samples/jaas_sample/README.md create mode 100644 code_samples/jaas_sample/admin_client.js create mode 100644 code_samples/jaas_sample/hazelcast-member/README.md create mode 100644 code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/Bootstrap.java create mode 100644 code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/ClientLoginModule.java create mode 100644 code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/DummyAuthenticator.java create mode 100644 code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UserGroupCredentials.java create mode 100644 code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentials.java create mode 100644 code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentialsFactory.java create mode 100644 code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml create mode 100644 code_samples/jaas_sample/reader_client.js create mode 100644 code_samples/jaas_sample/user_pass_cred.js create mode 100644 code_samples/jaas_sample/user_pass_cred_factory.js diff --git a/README.md b/README.md index b311f0352..f83b1d908 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ * [6.1.1. TLS/SSL for Hazelcast Members](#611-tlsssl-for-hazelcast-members) * [6.1.2. TLS/SSL for Hazelcast Node.js Clients](#612-tlsssl-for-hazelcast-nodejs-clients) * [6.1.3. Mutual Authentication](#613-mutual-authentication) + * [6.2. Credentials](#62-credentials) * [7. Using Node.js Client with Hazelcast IMDG](#7-using-nodejs-client-with-hazelcast-imdg) * [7.1. Node.js Client API Overview](#71-nodejs-client-api-overview) * [7.2. Node.js Client Operation Modes](#72-nodejs-client-operation-modes) @@ -1297,7 +1298,7 @@ To be able to connect to the provided IP addresses, you should use secure TLS/SS # 6. Securing Client Connection -This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members, and mutual authentication. These security features require **Hazelcast IMDG Enterprise** edition. +This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members, mutual authentication and credentials. These security features require **Hazelcast IMDG Enterprise** edition. ### 6.1. TLS/SSL @@ -1458,6 +1459,177 @@ the properties section in the JSON configuration file. Lastly, the client calls For information about the path resolution, see the [Loading Objects and Path Resolution section](#33-loading-objects-and-path-resolution). +## 6.2. Credentials + +One of the key elements in Hazelcast security is the `Credentials` object, which can be used to carry all security attributes of the +Hazelcast Node.js client to Hazelcast members. Then, Hazelcast members can authenticate the clients and perform access control +checks on the client operations using this `Credentials` object. + +To use this feature, you need to +* have a class implementing the [`Credentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/Credentials.html) interface which contains the security attributes of your client +* have a class implementing the [`LoginModule`](https://docs.oracle.com/javase/6/docs/api/javax/security/auth/spi/LoginModule.html?is-external=true) interface which uses the `Credentials` object during the authentication process +* configure your Hazelcast member's security properties with respect to these classes before starting it. If you have started your member as described in the [Running Standalone JARs section](#1211-running-standalone-jars), see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). + +[`UsernamePasswordCredentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/UsernamePasswordCredentials.html), a basic implementation of the `Credentials` interface, is available in the Hazelcast `com.hazelcast.security` package. +`UsernamePasswordCredentials` is used for default configuration during the authentication process of both members and clients. You can also use this class to carry the security attributes of your client. + +Hazelcast also has an abstract implementation of the `LoginModule` interface which is the `ClusterLoginModule` class in the `com.hazelcast.security` package. +You can extend this class and do the authentication on the `onLogin()` method. + +Below is an example for the extension of abstract `ClusterLoginModule` class. +On the `ClientLoginModule#onLogin()` method, we are doing a simple authentication against a hardcoded username and password just for illustrative purposes. You should carry out the authentication against a security service of your choice. + +```java +import com.hazelcast.security.ClusterLoginModule; +import com.hazelcast.security.UsernamePasswordCredentials; + +import javax.security.auth.login.FailedLoginException; +import javax.security.auth.login.LoginException; + +public class ClientLoginModule extends ClusterLoginModule { + + @Override + protected boolean onLogin() throws LoginException { + if (credentials instanceof UsernamePasswordCredentials) { + UsernamePasswordCredentials usernamePasswordCredentials = (UsernamePasswordCredentials) credentials; + String username = usernamePasswordCredentials.getUsername(); + String password = usernamePasswordCredentials.getPassword(); + + if (username.equals("admin") && password.equals("password")) { + return true; + } + throw new FailedLoginException("Username or password doesn't match expected value."); + } + return false; + } + + @Override + public boolean onCommit() { + return loginSucceeded; + } + + @Override + protected boolean onAbort() { + return true; + } + + @Override + protected boolean onLogout() { + return true; + } +} +``` + +Finally, you can configure `hazelcast.xml` as follows to enable Hazelcast security, do mandatory authentication with `ClientLoginModule` +and give the user with the name `admin` all the permissions over the map named `importantMap`. + +```xml + + + + + + + + + all + + + + + +``` + +After successfully starting a Hazelcast member as described above, you need to implement `Portable` equivalent of the `UsernamePasswordCredentials` +and register it to your client configuration. + +Below is the code for that. + +**user_pass_cred.js** +```javascript +function UsernamePasswordCredentials(username, password, endpoint) { + this.username = username; + this.password = Buffer.from(password, 'utf8'); + this.endpoint = endpoint; +} + +UsernamePasswordCredentials.prototype.readPortable = function (reader) { + this.username = reader.readUTF('principal'); + this.endpoint = reader.readUTF('endpoint'); + this.password = reader.readByteArray('pwd'); +}; + +UsernamePasswordCredentials.prototype.writePortable = function (writer) { + writer.writeUTF('principal', this.username); + writer.writeUTF('endpoint', this.endpoint); + writer.writeByteArray('pwd', this.password); +}; + +UsernamePasswordCredentials.prototype.getFactoryId = function () { + return -1; +}; + +UsernamePasswordCredentials.prototype.getClassId = function () { + return 1; +}; + +exports.UsernamePasswordCredentials = UsernamePasswordCredentials; +``` + +And below is the `Factory` implementation for the `Portable` implementation of `UsernamePasswordCredentials`. + +**user_pass_cred_factory.js** +```javascript +var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; + +function UsernamePasswordCredentialsFactory() { +} + +UsernamePasswordCredentialsFactory.prototype.create = function (classId) { + if(classId === 1){ + return new UsernamePasswordCredentials(); + } + return null; +}; + +exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; +``` + +Now, you can start your client by registering the `Portable` factory and giving the credentials as follows. + +```javascript +var Client = require('hazelcast-client').Client; +var ClientConfig = require('hazelcast-client').Config.ClientConfig; + +var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; +var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; + +var config = new ClientConfig(); +config.serializationConfig.portableVersion = 1; +config.serializationConfig.portableFactories[-1] = new UsernamePasswordCredentialsFactory(); +config.customCredentials = new UsernamePasswordCredentials('admin', 'password', '127.0.0.1'); + +Client.newHazelcastClient(config).then(function (client) { + var map; + return client.getMap('importantMap').then(function (mp) { + map = mp; + return map.put('key', 'value'); + }).then(function () { + return map.get('key'); + }).then(function (value) { + console.log(value); + return client.shutdown(); + }); +}); +``` + +> NOTE: It is almost always a bad idea to write the credentials to wire in a clear-text format. Therefore, using TLS/SSL encryption is highly recommended while using the custom credentials as described in [TLS/SSL section]((#61-tlsssl)). + +With Hazelcast's extensible, `JAAS` based security features you can do much more than just authentication. +See the [JAAS code sample](code_samples/jaas_sample) to learn how to perform access control checks on the client operations based on user groups. + +Also, see the [Security section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#security) of Hazelcast IMDG Reference Manual for more information. + # 7. Using Node.js Client with Hazelcast IMDG @@ -2211,7 +2383,7 @@ IdentifiedEntryProcessor.prototype.getClassId = function () { }; ``` -Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1213-adding-user-library-to-classpath). +Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). The following is the Java equivalent of the entry processor in Node.js client given above: @@ -2380,7 +2552,7 @@ Employee.prototype.writePortable = function (writer) { Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. -For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1213-adding-user-library-to-classpath). +For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). > **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** @@ -2539,7 +2711,7 @@ hazelcastClient.getMap('students').then(function (mp) { }); ``` -If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1213-adding-user-library-to-classpath). +If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. diff --git a/code_samples/jaas_sample/README.md b/code_samples/jaas_sample/README.md new file mode 100644 index 000000000..36abdecb9 --- /dev/null +++ b/code_samples/jaas_sample/README.md @@ -0,0 +1,39 @@ +# JAAS Code Sample + +This code sample demonstrates how to assign different permission policies for different user groups with the Hazelcast's JAAS based security features. +Security features used in this code sample requires **Hazelcast IMDG Enterprise** edition. + +--- + +Users within the `adminGroup` have create, destroy, read and put permissions over the `importantAdminMap`. + +Users within the `readerGroup` have just create and read permissions over the `importantReaderMap`. + +To test the code sample, + +* Make sure [hazelcast.xml](hazelcast-member/src/main/resources/hazelcast.xml) is in your class path. + +* Start the Hazelcast member with [Bootstrap.java](hazelcast-member/src/main/java/com/company/Bootstrap.java). If you are unsure about how to do that, see [the notes on starting `Bootstrap.java`](hazelcast-member/README.md). + +* Run the [admin_client.js](admin_client.js) with the command `node admin_client.js` to see what can the users within the `adminGroup` do. + +* Run the [reader_client.js](reader_client.js) with the command `node reader_client.js` to see what can the users within the `readerGroup` do. + +You should see an output similar to below for the `admin_client.js`. + +``` +Admin client connected +Admin can create a map +Admin can read from map: null +Admin can put to map +Value for the "anotherKey" is anotherValue +``` + +And, for the `reader_client.js` you should see an output similar to below. + +``` +Reader client connected +Reader can create a map +Reader can read from map: null +Reader cannot put to map. Reason: Error: Class name: java.security.AccessControlException , Message: Permission ("com.hazelcast.security.permission.MapPermission" "importantReaderMap" "put") denied! +``` diff --git a/code_samples/jaas_sample/admin_client.js b/code_samples/jaas_sample/admin_client.js new file mode 100644 index 000000000..b71ed7bb4 --- /dev/null +++ b/code_samples/jaas_sample/admin_client.js @@ -0,0 +1,29 @@ +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config.ClientConfig; + +var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; +var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; + +var adminClientConfig = new Config(); + +adminClientConfig.serializationConfig.portableFactories[1] = new UsernamePasswordCredentialsFactory(); +adminClientConfig.customCredentials = new UsernamePasswordCredentials('admin', 'password1', '127.0.0.1'); + +Client.newHazelcastClient(adminClientConfig).then(function (adminClient) { + console.log('Admin client connected'); + var adminMap; + return adminClient.getMap('importantAdminMap').then(function (map) { + console.log('Admin can create a map'); + adminMap = map; + return adminMap.get('someKey'); + }).then(function (value) { + console.log('Admin can read from map: ' + value); + return adminMap.put('anotherKey', 'anotherValue'); // Should resolve + }).then(function () { + console.log('Admin can put to map'); + return adminMap.get('anotherKey'); + }).then(function (value) { + console.log('Value for the "anotherKey" is ' + value); + return adminClient.shutdown(); + }); +}); diff --git a/code_samples/jaas_sample/hazelcast-member/README.md b/code_samples/jaas_sample/hazelcast-member/README.md new file mode 100644 index 000000000..296d9f53b --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/README.md @@ -0,0 +1,17 @@ +Make sure you have +* [Java 6+](https://www.java.com/en/download/) installed on your system. +* [Hazelcast IMDG Enterprise JAR](https://hazelcast.com/download/) available in your system. + +Then, put your Hazelcast IMDG Enterprise license key into the [hazelcast.xml](src/main/resources/hazelcast.xml). + +Compile the Java files with the following command: + +``` +javac -cp /path/to/enterprise/hazelcast-enterprise.jar src/main/java/com/company/security/*.java src/main/java/com/company/Bootstrap.java +``` + +Finally, run the `Bootstrap` with the following command: + +``` +java -cp /path/to/enterprise/hazelcast-enterprise.jar:src/main/resources:src/main/java com.company.Bootstrap +``` diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/Bootstrap.java b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/Bootstrap.java new file mode 100644 index 000000000..51d7dccc7 --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/Bootstrap.java @@ -0,0 +1,10 @@ +package com.company; + +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; + +public class Bootstrap { + public static void main(String[] args){ + HazelcastInstance member = Hazelcast.newHazelcastInstance(); + } +} diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/ClientLoginModule.java b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/ClientLoginModule.java new file mode 100644 index 000000000..7f827c2a7 --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/ClientLoginModule.java @@ -0,0 +1,95 @@ +package com.company.security; + +import com.hazelcast.security.ClusterPrincipal; +import com.hazelcast.security.Credentials; +import com.hazelcast.security.CredentialsCallback; + +import javax.security.auth.Subject; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.login.LoginException; +import javax.security.auth.spi.LoginModule; +import java.security.Principal; +import java.util.List; +import java.util.Map; + +public class ClientLoginModule implements LoginModule { + private UsernamePasswordCredentials usernamePasswordCredentials; + private Subject subject; + private CallbackHandler callbackHandler; + private DummyAuthenticator authenticator; + + public void initialize(Subject subject, + CallbackHandler callbackHandler, + Map sharedState, + Map options) { + this.subject = subject; + this.callbackHandler = callbackHandler; + this.authenticator = new DummyAuthenticator(); + } + + public boolean login() throws LoginException { + return authenticateUser(getCredentials()); + } + + public boolean commit() throws LoginException { + storeRolesOnPrincipal(); + return true; + } + + public boolean abort() throws LoginException { + clearSubject(); + return true; + } + + @Override + public boolean logout() throws LoginException { + clearSubject(); + return true; + } + + private UsernamePasswordCredentials getCredentials() throws LoginException { + final CredentialsCallback cb = new CredentialsCallback(); + Credentials credentials; + try { + callbackHandler.handle(new Callback[]{cb}); + credentials = cb.getCredentials(); + } catch (Exception e) { + throw new LoginException(e.getClass().getName() + ":" + e.getMessage()); + } + if (credentials == null) { + throw new LoginException("Credentials could not be retrieved!"); + } + + if (credentials instanceof UsernamePasswordCredentials) { + usernamePasswordCredentials = (UsernamePasswordCredentials) credentials; + return usernamePasswordCredentials; + } else { + throw new LoginException("Credentials is not an instance of UsernamePasswordCredentials!"); + } + } + + private boolean authenticateUser(UsernamePasswordCredentials credentials) { + String username = credentials.getUsername(); + String password = credentials.getPassword(); + return authenticator.authenticate(username, password); + } + + private void storeRolesOnPrincipal() throws LoginException { + List userGroups = authenticator.getRoles(usernamePasswordCredentials.getUsername()); + if (userGroups != null) { + for (String userGroup : userGroups) { + Principal principal = new ClusterPrincipal(new UserGroupCredentials(usernamePasswordCredentials.getEndpoint(), userGroup)); + subject.getPrincipals().add(principal); + } + } else { + throw new LoginException("User Group(s) not found for user " + usernamePasswordCredentials.getUsername()); + } + } + + private void clearSubject() { + subject.getPrincipals().clear(); + subject.getPrivateCredentials().clear(); + subject.getPublicCredentials().clear(); + } +} diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/DummyAuthenticator.java b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/DummyAuthenticator.java new file mode 100644 index 000000000..6ce9f457d --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/DummyAuthenticator.java @@ -0,0 +1,34 @@ +package com.company.security; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DummyAuthenticator { + private Map users; + private Map> userGrous; + + public DummyAuthenticator(){ + userGrous = new HashMap<>(); + users = new HashMap<>(); + + users.put("admin", "password1"); + users.put("reader", "password2"); + + userGrous.put("admin", Arrays.asList("adminGroup")); + userGrous.put("reader", Arrays.asList("readerGroup")); + } + + public boolean authenticate(String username, String password){ + String userPassword = users.get(username); + if (userPassword != null){ + return userPassword.equals(password); + } + return false; + } + + public List getRoles(String username){ + return userGrous.get(username); + } +} diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UserGroupCredentials.java b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UserGroupCredentials.java new file mode 100644 index 000000000..5b4031d78 --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UserGroupCredentials.java @@ -0,0 +1,48 @@ +package com.company.security; + +import com.hazelcast.nio.ObjectDataInput; +import com.hazelcast.nio.ObjectDataOutput; +import com.hazelcast.nio.serialization.DataSerializable; +import com.hazelcast.security.Credentials; + +import java.io.IOException; + +public class UserGroupCredentials implements Credentials, DataSerializable { + private String endpoint; + private String userGroup; + + public UserGroupCredentials(){ + } + + public UserGroupCredentials(String endpoint, String userGroup){ + this.endpoint = endpoint; + this.userGroup = userGroup; + } + + @Override + public String getEndpoint() { + return endpoint; + } + + @Override + public void setEndpoint(String endpoint) { + this.endpoint = endpoint; + } + + @Override + public String getPrincipal() { + return userGroup; + } + + @Override + public void writeData(ObjectDataOutput objectDataOutput) throws IOException { + objectDataOutput.writeUTF(endpoint); + objectDataOutput.writeUTF(userGroup); + } + + @Override + public void readData(ObjectDataInput objectDataInput) throws IOException { + endpoint = objectDataInput.readUTF(); + userGroup = objectDataInput.readUTF(); + } +} diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentials.java b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentials.java new file mode 100644 index 000000000..95d0b9f73 --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentials.java @@ -0,0 +1,71 @@ +package com.company.security; + +import com.hazelcast.nio.serialization.Portable; +import com.hazelcast.nio.serialization.PortableReader; +import com.hazelcast.nio.serialization.PortableWriter; +import com.hazelcast.security.Credentials; + +import java.io.IOException; + +public class UsernamePasswordCredentials implements Credentials, Portable { + public static final int CLASS_ID = 1; + + private String username; + private String password; + private String endpoint; + + public UsernamePasswordCredentials() { + } + + public UsernamePasswordCredentials(String username, String password, String endpoint) { + this.username = username; + this.password = password; + this.endpoint = endpoint; + } + + @Override + public String getEndpoint() { + return endpoint; + } + + @Override + public void setEndpoint(String endpoint) { + this.endpoint = endpoint; + } + + @Override + public String getPrincipal() { + return getUsername(); + } + + public String getUsername(){ + return username; + } + public String getPassword() { + return password; + } + + @Override + public void readPortable(PortableReader portableReader) throws IOException { + username = portableReader.readUTF("username"); + password = portableReader.readUTF("password"); + endpoint = portableReader.readUTF("endpoint"); + } + + @Override + public void writePortable(PortableWriter portableWriter) throws IOException { + portableWriter.writeUTF("username", username); + portableWriter.writeUTF("password", password); + portableWriter.writeUTF("endpoint", endpoint); + } + + @Override + public int getClassId() { + return UsernamePasswordCredentials.CLASS_ID; + } + + @Override + public int getFactoryId() { + return UsernamePasswordCredentialsFactory.FACTORY_ID; + } +} diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentialsFactory.java b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentialsFactory.java new file mode 100644 index 000000000..8ab2e4de4 --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/src/main/java/com/company/security/UsernamePasswordCredentialsFactory.java @@ -0,0 +1,17 @@ +package com.company.security; + +import com.hazelcast.nio.serialization.Portable; +import com.hazelcast.nio.serialization.PortableFactory; + +public class UsernamePasswordCredentialsFactory implements PortableFactory { + + public static final int FACTORY_ID = 1; + + @Override + public Portable create(int id) { + if(UsernamePasswordCredentials.CLASS_ID == id){ + return new UsernamePasswordCredentials(); + } + return null; + } +} diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml b/code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml new file mode 100644 index 000000000..c86c6d0ab --- /dev/null +++ b/code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml @@ -0,0 +1,52 @@ + + + + + + YOUR-LICENSE-KEY + + + + + + + + + create + read + + + + + create + destroy + put + read + + + + + + + + com.company.security.UsernamePasswordCredentialsFactory + + + diff --git a/code_samples/jaas_sample/reader_client.js b/code_samples/jaas_sample/reader_client.js new file mode 100644 index 000000000..d8566f882 --- /dev/null +++ b/code_samples/jaas_sample/reader_client.js @@ -0,0 +1,26 @@ +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config.ClientConfig; + +var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; +var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; + +var readerClientConfig = new Config(); + +readerClientConfig.serializationConfig.portableFactories[1] = new UsernamePasswordCredentialsFactory(); +readerClientConfig.customCredentials = new UsernamePasswordCredentials('reader', 'password2', '127.0.0.1'); + +Client.newHazelcastClient(readerClientConfig).then(function (readerClient) { + console.log('Reader client connected'); + var readerMap; + return readerClient.getMap('importantReaderMap').then(function (map) { + console.log('Reader can create a map'); + readerMap = map; + return readerMap.get('someKey'); + }).then(function (value) { + console.log('Reader can read from map: ' + value); + return readerMap.put('anotherKey', 'anotherValue'); // Should reject + }).catch(function (err) { + console.log('Reader cannot put to map. Reason: ' + err); + return readerClient.shutdown(); + }); +}); diff --git a/code_samples/jaas_sample/user_pass_cred.js b/code_samples/jaas_sample/user_pass_cred.js new file mode 100644 index 000000000..953397f65 --- /dev/null +++ b/code_samples/jaas_sample/user_pass_cred.js @@ -0,0 +1,27 @@ +function UsernamePasswordCredentials(username, password, endpoint) { + this.username = username; + this.password = password; + this.endpoint = endpoint; +} + +UsernamePasswordCredentials.prototype.readPortable = function (reader) { + this.username = reader.readUTF('username'); + this.endpoint = reader.readUTF('password'); + this.password = reader.readUTF('endpoint'); +}; + +UsernamePasswordCredentials.prototype.writePortable = function (writer) { + writer.writeUTF('username', this.username); + writer.writeUTF('password', this.password); + writer.writeUTF('endpoint', this.endpoint); +}; + +UsernamePasswordCredentials.prototype.getFactoryId = function () { + return 1; +}; + +UsernamePasswordCredentials.prototype.getClassId = function () { + return 1; +}; + +exports.UsernamePasswordCredentials = UsernamePasswordCredentials; diff --git a/code_samples/jaas_sample/user_pass_cred_factory.js b/code_samples/jaas_sample/user_pass_cred_factory.js new file mode 100644 index 000000000..3ec31c6b3 --- /dev/null +++ b/code_samples/jaas_sample/user_pass_cred_factory.js @@ -0,0 +1,13 @@ +var UsernamePasswordCredentials = require('./user_pass_cred'); + +function UsernamePasswordCredentialsFactory() { +} + +UsernamePasswordCredentialsFactory.prototype.create = function (classId) { + if(classId === 1){ + return new UsernamePasswordCredentials(); + } + return null; +}; + +exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; From 2832fd5263adb3038386621d18aabc630694601a Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 12 Mar 2019 18:01:27 +0300 Subject: [PATCH 237/685] Improve simple map benchmark (#467) Also added a readme for the benchmark --- benchmark/MapPutRunner.js | 21 +++++++++++++ benchmark/MapRandomOpRunner.js | 42 +++++++++++++++++++++++++ benchmark/README.md | 42 +++++++++++++++++++++++++ benchmark/SimpleBenchmark.js | 37 ++++++++++++++++++++++ benchmark/SimpleMapBenchmark.js | 56 --------------------------------- 5 files changed, 142 insertions(+), 56 deletions(-) create mode 100644 benchmark/MapPutRunner.js create mode 100644 benchmark/MapRandomOpRunner.js create mode 100644 benchmark/README.md create mode 100644 benchmark/SimpleBenchmark.js delete mode 100644 benchmark/SimpleMapBenchmark.js diff --git a/benchmark/MapPutRunner.js b/benchmark/MapPutRunner.js new file mode 100644 index 000000000..8d8ea8fbb --- /dev/null +++ b/benchmark/MapPutRunner.js @@ -0,0 +1,21 @@ +'use strict'; + +const REQ_COUNT = 50000; +const BATCH_SIZE = 100; + +const Benchmark = require('./SimpleBenchmark'); +const Client = require('../.').Client; + +Client.newHazelcastClient() + .then((client) => client.getMap('default')) + .then((map) => { + const benchmark = new Benchmark({ + nextOp: () => map.put('foo', 'bar'), + totalOpsCount: REQ_COUNT, + batchSize: BATCH_SIZE + }); + return benchmark.run() + .then(() => map.destroy()) + .then(() => map.client.shutdown()); + }) + .then(() => console.log('Benchmark finished')); diff --git a/benchmark/MapRandomOpRunner.js b/benchmark/MapRandomOpRunner.js new file mode 100644 index 000000000..898764305 --- /dev/null +++ b/benchmark/MapRandomOpRunner.js @@ -0,0 +1,42 @@ +'use strict'; + +const REQ_COUNT = 50000; +const BATCH_SIZE = 100; + +const ENTRY_COUNT = 10 * 1000; +const VALUE_SIZE = 10000; +const GET_PERCENTAGE = 40; +const PUT_PERCENTAGE = 40; + +let value_string = ''; +for (let i = 0; i < VALUE_SIZE; i++) { + value_string = value_string + 'x'; +} + +function randomOp(map) { + const key = Math.random() * ENTRY_COUNT; + const opType = Math.floor(Math.random() * 100); + if (opType < GET_PERCENTAGE) { + return map.get(key); + } else if (opType < GET_PERCENTAGE + PUT_PERCENTAGE) { + return map.put(key, value_string); + } + return map.remove(key); +} + +const Benchmark = require('./SimpleBenchmark'); +const Client = require('../.').Client; + +Client.newHazelcastClient() + .then((client) => client.getMap('default')) + .then((map) => { + const benchmark = new Benchmark({ + nextOp: () => randomOp(map), + totalOpsCount: REQ_COUNT, + batchSize: BATCH_SIZE + }); + return benchmark.run() + .then(() => map.destroy()) + .then(() => map.client.shutdown()); + }) + .then(() => console.log('Benchmark finished')); diff --git a/benchmark/README.md b/benchmark/README.md new file mode 100644 index 000000000..98fa96690 --- /dev/null +++ b/benchmark/README.md @@ -0,0 +1,42 @@ +# Simple benchmark for Hazelcast IMDG Node.js Client + +A collection of simple benchmarks that run operations on Map in parallel, measure execution time and calculate throughput: +* `MapPutRunner` - runs `map.put('foo', 'bar')` operations. +* `MapRandomOpRunner` - runs randomly selected operations (`get`, `put`, `remove`). + +## Running the benchmark + +First, install dependencies and build the client: +```bash +npm install +``` + +Then, build the client (compile TypeScript): +```bash +npm run compile +``` + +Next, run at least one instance of IMDG. The most simple way to do it would be to use the [official Docker image](https://hub.docker.com/r/hazelcast/hazelcast/): +```bash +docker run -p 5701:5701 hazelcast/hazelcast:3.11.2 +``` + +Finally, run the benchmark: +```bash +node benchmark/MapPutRunner.js +``` + +The benchmark will run and produce its results into the console: +```bash +[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 172.17.0.2:5701 authenticated +[DefaultLogger] INFO at ClusterService: Members received. +[ Member { + address: Address { host: '172.17.0.2', port: 5701, type: 4 }, + uuid: 'ea5ae364-9b0e-438d-bde6-e7592ca21c14', + isLiteMember: false, + attributes: {} } ] +[DefaultLogger] INFO at HazelcastClient: Client started +Took 1.058 seconds for 50000 requests +Ops/s: 47258.979206049145 +Benchmark finished +``` diff --git a/benchmark/SimpleBenchmark.js b/benchmark/SimpleBenchmark.js new file mode 100644 index 000000000..621a9a075 --- /dev/null +++ b/benchmark/SimpleBenchmark.js @@ -0,0 +1,37 @@ +'use strict'; + +class Benchmark { + constructor(config) { + this._nextOp = config.nextOp; + this.totalOpsCount = config.totalOpsCount; + this.batchSize = config.batchSize; + this.opsCount = 0; + } + // increments ops counter, starts a new op and returns its promise + nextOp() { + this.opsCount++; + return this._nextOp(); + } + // chains next op once one of ops finishes to keep constant concurrency of ops + chainNext(op) { + return op.then(() => { + if (this.opsCount < this.totalOpsCount) { + return this.chainNext(this.nextOp()); + } + }); + } + run() { + // initial batch of ops (no-op promises) + const batch = new Array(this.batchSize).fill(Promise.resolve()); + const start = new Date(); + return Promise.all(batch.map(this.chainNext.bind(this))) + .then(() => { + const finish = new Date(); + const tookSec = (finish - start) / 1000; + console.log(`Took ${tookSec} seconds for ${this.opsCount} requests`); + console.log(`Ops/s: ${this.opsCount / tookSec}`); + }); + } +}; + +module.exports = Benchmark; diff --git a/benchmark/SimpleMapBenchmark.js b/benchmark/SimpleMapBenchmark.js deleted file mode 100644 index 17e90f01c..000000000 --- a/benchmark/SimpleMapBenchmark.js +++ /dev/null @@ -1,56 +0,0 @@ -var REQ_COUNT = 50000; -var ENTRY_COUNT = 10 * 1000; -var VALUE_SIZE = 10000; -var GET_PERCENTAGE = 40; -var PUT_PERCENTAGE = 40; -var value_string = ''; -for (var i = 0; i < VALUE_SIZE; i++) { - value_string = value_string + 'x'; -} -var Test = { - map: undefined, - finishCallback: undefined, - ops: 0, - increment: function () { - this.ops = this.ops + 1; - if (this.ops === REQ_COUNT) { - var date = new Date(); - this.run = function () { - }; - this.finishCallback(date); - } - }, - run: function () { - var key = Math.random() * ENTRY_COUNT; - var opType = Math.floor(Math.random() * 100); - if (opType < GET_PERCENTAGE) { - this.map.get(key).then(this.increment.bind(this)); - } else if (opType < GET_PERCENTAGE + PUT_PERCENTAGE) { - this.map.put(key, value_string).then(this.increment.bind(this)); - } else { - this.map.remove(key) - .then(this.increment.bind(this)); - } - setImmediate(this.run.bind(this)); - } -}; -var Client = require('../.').Client; -var hazelcastClient; - -Client.newHazelcastClient().then(function (client) { - hazelcastClient = client; - return hazelcastClient.getMap('default'); -}).then(function (mp) { - Test.map = mp; - - var start; - Test.finishCallback = function (finish) { - console.log('Took ' + (finish - start) / 1000 + ' seconds for ' + REQ_COUNT + ' requests'); - console.log('Ops/s: ' + REQ_COUNT / ((finish - start) / 1000)); - Test.map.destroy().then(function () { - hazelcastClient.shutdown(); - }); - }; - start = new Date(); - Test.run(); -}); From a8b1df903d3d2941813871b5a995f9e678048c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Tue, 19 Mar 2019 17:13:13 +0300 Subject: [PATCH 238/685] implement Json serializer (#468) * implement json serializer * json serializer implementation updates * remove the static constructor methods for the HazelcastJsonValue * rename JsonDeserializationType as JsonStringDeserializationPolicy * test enhancements * remove parse method * remove object constructor * update readme according to reviews * increase timeout for the failing test --- README.md | 183 +++++++++++++++++- code_samples/hazelcast_json_value.js | 49 +++++ scripts/dev-test-rc.sh | 4 +- scripts/download-rc.bat | 4 +- scripts/download-rc.sh | 4 +- src/Util.ts | 4 + src/config/Config.ts | 3 + src/config/ConfigBuilder.ts | 4 + src/config/JsonStringDeserializationPolicy.ts | 34 ++++ src/config/SerializationConfig.ts | 2 + src/core/HazelcastJsonValue.ts | 58 ++++++ src/index.ts | 4 + src/serialization/DefaultSerializer.ts | 14 +- src/serialization/SerializationService.ts | 8 +- test/MembershipListenerTest.js | 2 +- test/declarative_config/ConfigBuilderTest.js | 2 + .../configurations/full.json | 3 +- .../HJVHazelcastJsonValueSerializerTest.js | 93 +++++++++ .../HJVJsonSerializerTest.js | 156 +++++++++++++++ .../HazelcastJsonValueTest.js | 37 ++++ test/serialization/JsonSerializersTest.js | 45 +++++ 21 files changed, 700 insertions(+), 13 deletions(-) create mode 100644 code_samples/hazelcast_json_value.js create mode 100644 src/config/JsonStringDeserializationPolicy.ts create mode 100644 src/core/HazelcastJsonValue.ts create mode 100644 test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js create mode 100644 test/hazelcast_json_value/HJVJsonSerializerTest.js create mode 100644 test/hazelcast_json_value/HazelcastJsonValueTest.js create mode 100644 test/serialization/JsonSerializersTest.js diff --git a/README.md b/README.md index f83b1d908..f15bbcd0e 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ * [4.2. Portable Serialization](#42-portable-serialization) * [4.3. Custom Serialization](#43-custom-serialization) * [4.4. Global Serialization](#44-global-serialization) + * [4.5. JSON Serialization](#45-json-serialization) * [5. Setting Up Client Network](#5-setting-up-client-network) * [5.1. Providing Member Addresses](#51-providing-member-addresses) * [5.2. Setting Smart Routing](#52-setting-smart-routing) @@ -86,7 +87,8 @@ * [7.7.1.3. Querying with SQL](#7713-querying-with-sql) * [Supported SQL Syntax](#supported-sql-syntax) * [Querying Examples with Predicates](#querying-examples-with-predicates) - * [7.7.1.4. Filtering with Paging Predicates](#7714-filtering-with-paging-predicates) + * [7.7.1.4. Querying with JSON Strings](#7714-querying-with-json-strings) + * [7.7.1.5. Filtering with Paging Predicates](#7715-filtering-with-paging-predicates) * [7.7.2. Fast-Aggregations](#772-fast-aggregations) * [7.8. Performance](#78-performance) * [7.8.1. Partition Aware](#781-partition-aware) @@ -1052,7 +1054,37 @@ config.serializationConfig.globalSerializer = new GlobalSerializer(); "globalSerializer": { "path": "global_serializer.js", "exportedName": "MyFavoriteSerializer" - }, + } + } +} +``` + +## 4.5. JSON Serialization + +If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization` by default. With `JSON Serialization`, objects +are converted to JSON strings and transmitted to the Hazelcast members as such. + +When the Hazelcast Node.js client retrieves a JSON serialized data from a member, it parses the JSON string and returns the object represented by that +string to the user. However, you may want to defer the string parsing and work with the raw JSON strings. + +For this purpose, you can configure your client to return `HazelcastJsonValue` objects when it retrieves a JSON serialized data from a member. + +`HazelcastJsonValue` is a lightweight wrapper around the JSON strings. You may get the JSON string representation of the object using the `toString` method. + +Below is the configuration required to return `HazelcastJsonValue` objects instead of JavaScript objects. + +**Programmatic Configuration:** + +```javascript +config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; +``` + +**Declarative Configuration:** + +```json +{ + "serialization": { + "jsonStringDeserializationPolicy": "no_deserialization" } } ``` @@ -2680,7 +2712,152 @@ return client.getMap('persons').then(function (mp) { In this example, the code creates a list with the values greater than or equal to "27". -#### 7.7.1.4. Filtering with Paging Predicates +#### 7.7.1.4. Querying with JSON Strings + +You can query the JSON strings stored inside your Hazelcast clusters. To query a JSON string, you can +use `HazelcastJsonValue` or JavaScript objects. + +`HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. +Then, it is possible to query these objects using the query methods explained in this section. + +```javascript +var personMap; +var person1 = '{ "name": "John", "age": 35 }'; +var person2 = '{ "name": "Jane", "age": 24 }'; +var person3 = '{ "name": "Trey", "age": 17 }'; + +return hz.getMap('personsMap').then(function (map) { + personMap = map; + return personMap.put(1, new HazelcastJsonValue(person1)); +}).then(function () { + return personMap.put(2, new HazelcastJsonValue(person2)); +}).then(function () { + return personMap.put(3, new HazelcastJsonValue(person3)); +}).then(function () { + return personMap.valuesWithPredicate(Predicates.lessThan('age', 21)); +}).then(function (personsUnder21) { + personsUnder21.toArray().forEach(function (person) { + console.log(person); + }); +}); +``` + +When running the queries, Hazelcast treats values extracted from the JSON documents as Java types so they can be compared with the query attribute. +JSON specification defines five primitive types to be used in the JSON documents: `number`, `string`, `true`, `false` and `null`. +The `string`, `true`/`false` and `null` types are treated as `String`, `boolean` and `null`, respectively. `Number` values treated as `long`s if they can be represented by a `long`. +Otherwise, `number`s are treated as `double`s. + +It is possible to query nested attributes and arrays in JSON documents. The query syntax is the same as querying other Hazelcast objects using the `Predicate`s. + +```javascript +var departmentsMap; +var departments = [ + { + departmentId: 1, + room: 'alpha', + people: [ + { + name: 'Peter', + age: 26, + salary: 50000 + + }, + { + name: 'Jonah', + age: 50, + salary: 140000 + } + ] + }, + { + departmentId: 2, + room: 'beta', + people: [ + { + name: 'Terry', + age: 44, + salary: 100000 + } + ] + } +]; +return hz.getMap('departmentsMap').then(function (map) { + departmentsMap = map; + return departmentsMap.putAll(departments.map(function (department, index) { + return [index, department]; + })); +}).then(function () { + // The following query finds all the departments that have a person named "Peter" working in them. + return departmentsMap.valuesWithPredicate(Predicates.equal('people[any].name', 'Peter')) +}).then(function (departmentWithPeter) { + departmentWithPeter.toArray().forEach(function (department) { + console.log(department); + }); +}); +``` + +`HazelcastJsonValue` is a lightweight wrapper around your JSON strings. It is used merely as a way to indicate that the contained string should be treated as a valid JSON value. +Hazelcast does not check the validity of JSON strings put into to maps. Putting an invalid JSON string in a map is permissible. +However, in that case whether such an entry is going to be returned or not from a query is not defined. + +##### Querying with HazelcastJsonValue Objects + +If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization`. + +This means that, you can run queries over your JavaScript objects if they are serialized as JSON strings. However, when the results +of your query are ready, they are parsed from JSON strings and returned to you as JavaScript objects. + +For the purposes of your application, you may want to get rid of the parsing and just work with the raw JSON strings using `HazelcastJsonValue` objects. Then, you can configure your client to do so +as described in the [JSON Serialization](#45-json-serialization) section. + +```javascript +var config = new Config(); +config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; + +Client.newHazelcastClient(config).then(function (hz) { + var moviesMap; + var movies = [ + [1, new HazelcastJsonValue('{ "name": "The Dark Knight", "rating": 9.1 }')], + [2, new HazelcastJsonValue('{ "name": "Inception", "rating": 8.8 }')], + [3, new HazelcastJsonValue('{ "name": "The Prestige", "rating": 8.5 }')] + ]; + return hz.getMap('moviesMap').then(function (map) { + moviesMap = map; + return moviesMap.putAll(movies); + }).then(function () { + return moviesMap.valuesWithPredicate(Predicates.greaterEqual('rating', 8.8)); + }).then(function (highRatedMovies) { + highRatedMovies.toArray().forEach(function (movie) { + console.log(movie.toString()); + }); + return hz.shutdown(); + }); +}); +``` + +##### Metadata Creation for JSON Querying + +Hazelcast stores a metadata object per JSON serialized object stored. This metadata object is created every time a JSON serialized object is put into an `IMap`. +Metadata is later used to speed up the query operations. Metadata creation is on by default. Depending on your application’s needs, you may want to turn off the metadata creation to decrease the put latency and increase the throughput. + +You can configure this using `metadata-policy` element for the map configuration on the member side as follows: + +```xml + + ... + + + OFF + + ... + +``` + +#### 7.7.1.5. Filtering with Paging Predicates The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. diff --git a/code_samples/hazelcast_json_value.js b/code_samples/hazelcast_json_value.js new file mode 100644 index 000000000..9bdd7f048 --- /dev/null +++ b/code_samples/hazelcast_json_value.js @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var Client = require('hazelcast-client').Client; +var Config = require('hazelcast-client').Config; +var Predicates = require('hazelcast-client').Predicates; +var HazelcastJsonValue = require('hazelcast-client').HazelcastJsonValue; +var JsonStringDeserializationPolicy = require('hazelcast-client').JsonStringDeserializationPolicy; + +var config = new Config.ClientConfig(); +config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; + +Client.newHazelcastClient(config).then(function(hz) { + var map; + return hz.getMap('employees').then(function(mp) { + map = mp; + var employees = [ + { name: 'Alice', age: 35 }, + { name: 'Andy', age: 22}, + { name: 'Bob', age: 37 } + ]; + + return map.putAll(employees.map(function (employee, index) { + return [index, new HazelcastJsonValue(JSON.stringify(employee))]; + })); + }).then(function() { + return map.valuesWithPredicate(Predicates + .and(Predicates.sql('name like A%'), Predicates.greaterThan("age", 30))); + }).then(function(values) { + // Prints all the employees whose name starts with 'A' and age is greater than 30 + values.toArray().forEach(function(value) { + console.log(value.toString()); + }); + return hz.shutdown(); + }); +}); diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 9fe85deef..ed73eaa64 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="3.11.2-SNAPSHOT" -HAZELCAST_TEST_VERSION="3.11.2-SNAPSHOT" +HZ_VERSION="3.12-SNAPSHOT" +HAZELCAST_TEST_VERSION="3.12-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.4-SNAPSHOT" diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 2aa586f6c..a09ddf384 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,5 +1,5 @@ -set HZ_VERSION="3.11.2-SNAPSHOT" -set HZ_TEST_VERSION="3.11.2-SNAPSHOT" +set HZ_VERSION="3.12-SNAPSHOT" +set HZ_TEST_VERSION="3.12-SNAPSHOT" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 67db7d4bc..771de11c4 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="3.11.2-SNAPSHOT" -HZ_TEST_VERSION="3.11.2-SNAPSHOT" +HZ_VERSION="3.12-SNAPSHOT" +HZ_TEST_VERSION="3.12-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} diff --git a/src/Util.ts b/src/Util.ts index 2a94d4f93..b3568b8a6 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -32,6 +32,10 @@ export function assertArray(x: any): void { assert(Array.isArray(x), 'Should be array.'); } +export function assertString(v: any): void { + assert(typeof v === 'string', 'String value expected.'); +} + export function shuffleArray(array: T[]): void { let randomIndex: number; let temp: T; diff --git a/src/config/Config.ts b/src/config/Config.ts index fa81838f5..c6fcf1fec 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -31,6 +31,7 @@ import {SerializationConfig} from './SerializationConfig'; import {Statistics} from '../statistics/Statistics'; import {LogLevel} from '..'; import {ILogger} from '../logging/ILogger'; +import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; /** * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. @@ -142,3 +143,5 @@ export {ImportConfig}; export {FlakeIdGeneratorConfig}; export {SSLConfig}; + +export {JsonStringDeserializationPolicy}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 36bc05377..2974a29ba 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -28,6 +28,7 @@ import {JsonConfigLocator} from './JsonConfigLocator'; import {NearCacheConfig} from './NearCacheConfig'; import {Properties} from './Properties'; import {ReliableTopicConfig} from './ReliableTopicConfig'; +import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; export class ConfigBuilder { private clientConfig: ClientConfig = new ClientConfig(); @@ -213,6 +214,9 @@ export class ConfigBuilder { this.clientConfig.serializationConfig.globalSerializerConfig = this.parseImportConfig(globalSerializer); } else if (key === 'serializers') { this.handleSerializers(jsonObject[key]); + } else if (key === 'jsonStringDeserializationPolicy') { + this.clientConfig.serializationConfig + .jsonStringDeserializationPolicy = tryGetEnum(JsonStringDeserializationPolicy, jsonObject[key]); } } } diff --git a/src/config/JsonStringDeserializationPolicy.ts b/src/config/JsonStringDeserializationPolicy.ts new file mode 100644 index 000000000..21452071d --- /dev/null +++ b/src/config/JsonStringDeserializationPolicy.ts @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * Using this policy, one can control the + * deserialization type of the JSON strings. + */ +export enum JsonStringDeserializationPolicy { + /** + * JSON strings are parsed and returned + * as JavaScript objects. + */ + EAGER, + + /** + * Raw JSON strings are returned around a + * lightweight {@link HazelcastJsonValue} + * wrapper. + */ + NO_DESERIALIZATION, +} diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index 3162149a3..be2f1ef60 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -16,6 +16,7 @@ import {IdentifiedDataSerializableFactory, PortableFactory} from '../serialization/Serializable'; import {ImportConfig} from './ImportConfig'; +import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; export class SerializationConfig { defaultNumberType: string = 'double'; @@ -29,4 +30,5 @@ export class SerializationConfig { customSerializerConfigs: { [id: number]: ImportConfig } = {}; globalSerializer: any = null; globalSerializerConfig: ImportConfig = null; + jsonStringDeserializationPolicy: JsonStringDeserializationPolicy = JsonStringDeserializationPolicy.EAGER; } diff --git a/src/core/HazelcastJsonValue.ts b/src/core/HazelcastJsonValue.ts new file mode 100644 index 000000000..9db1dc397 --- /dev/null +++ b/src/core/HazelcastJsonValue.ts @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {assertString} from '../Util'; + +/** + * HazelcastJsonValue is a wrapper for JSON formatted strings. It is preferred + * to store HazelcastJsonValue instead of Strings for JSON formatted strings. + * Users can run predicates and use indexes on the attributes of the underlying + * JSON strings. + * + * HazelcastJsonValue is queried using Hazelcast's querying language. + * See {@link https://github.com/hazelcast/hazelcast-nodejs-client#77-distributed-query Distributed Query section}. + * + * In terms of querying, numbers in JSON strings are treated as either + * Long or Double in the Java side. Strings, booleans and null + * are treated as their Java counterparts. + * + * HazelcastJsonValue keeps given string as it is. Strings are not + * checked for being valid. Ill-formatted json strings may cause false + * positive or false negative results in queries. + * + * Null values are not allowed. + */ +export class HazelcastJsonValue { + + private readonly jsonString: string; + + /** + * Creates a HazelcastJsonValue from given string. + * @param jsonString a non null Json string + */ + constructor(jsonString: string) { + assertString(jsonString); + this.jsonString = jsonString; + } + + /** + * Returns unaltered string that was used to create this object. + * @return original string + */ + toString(): string { + return this.jsonString; + } +} diff --git a/src/index.ts b/src/index.ts index c7af1b2fb..602fc66b3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -36,6 +36,8 @@ import {ItemEvent, ItemEventType} from './core/ItemListener'; import {MapEvent} from './core/MapListener'; import {EntryEvent} from './core/EntryListener'; import {LogLevel} from './logging/LoggingService'; +import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializationPolicy'; +import {HazelcastJsonValue} from './core/HazelcastJsonValue'; export { HazelcastClient as Client, @@ -63,4 +65,6 @@ export { MapEvent, EntryEvent, LogLevel, + JsonStringDeserializationPolicy, + HazelcastJsonValue, }; diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index d24c9ab0b..141f7857a 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -19,6 +19,7 @@ import {BitsUtil} from '../BitsUtil'; import {DataInput, DataOutput} from './Data'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; import {Serializer} from './SerializationService'; +import {HazelcastJsonValue} from '../core/HazelcastJsonValue'; export class StringSerializer implements Serializer { @@ -409,6 +410,17 @@ export class JsonSerializer implements Serializer { } write(output: DataOutput, object: any): void { - output.writeUTF(JSON.stringify(object)); + if (object instanceof HazelcastJsonValue) { + output.writeUTF(object.toString()); + } else { + output.writeUTF(JSON.stringify(object)); + } + + } +} + +export class HazelcastJsonValueSerializer extends JsonSerializer { + read(input: DataInput): HazelcastJsonValue { + return new HazelcastJsonValue(input.readUTF()); } } diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index cdb1492f0..34ff0aeb9 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -34,6 +34,7 @@ import { DoubleSerializer, FloatArraySerializer, FloatSerializer, + HazelcastJsonValueSerializer, IdentifiedDataSerializableSerializer, IntegerArraySerializer, IntegerSerializer, @@ -53,6 +54,7 @@ import {PortableSerializer} from './portable/PortableSerializer'; import {PREDICATE_FACTORY_ID, PredicateFactory} from './PredicateFactory'; import {IdentifiedDataSerializableFactory} from './Serializable'; import HazelcastClient from '../HazelcastClient'; +import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; export interface SerializationService { toData(object: any, paritioningStrategy?: any): Data; @@ -257,11 +259,15 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('javaClass', new JavaClassSerializer()); this.registerSerializer('floatArray', new FloatArraySerializer()); this.registerIdentifiedFactories(); - this.registerSerializer('!json', new JsonSerializer()); this.registerSerializer( '!portable', new PortableSerializer(this, this.serializationConfig), ); + if (this.serializationConfig.jsonStringDeserializationPolicy === JsonStringDeserializationPolicy.EAGER) { + this.registerSerializer('!json', new JsonSerializer()); + } else { + this.registerSerializer('!json', new HazelcastJsonValueSerializer()); + } } protected registerIdentifiedFactories(): void { diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index b92d22900..77549aede 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -22,7 +22,7 @@ var MemberAttributeOperationType = require('../.').MemberAttributeOperationType; var MemberEvent = require('../lib/invocation/ClusterService').MemberEvent; describe('MembershipListener', function () { - this.timeout(10000); + this.timeout(20000); var cluster; var member; var client; diff --git a/test/declarative_config/ConfigBuilderTest.js b/test/declarative_config/ConfigBuilderTest.js index 3e7de3b27..7d3216d6f 100644 --- a/test/declarative_config/ConfigBuilderTest.js +++ b/test/declarative_config/ConfigBuilderTest.js @@ -92,6 +92,8 @@ describe('ConfigBuilder Test', function () { expect(serializationCfg.defaultNumberType).to.equal('integer'); expect(serializationCfg.isBigEndian).to.equal(false); expect(serializationCfg.portableVersion).to.equal(1); + expect(serializationCfg.jsonStringDeserializationPolicy) + .to.equal(Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION); expect(serializationCfg.dataSerializableFactoryConfigs[0].path).to.equal('path/to/file'); expect(serializationCfg.dataSerializableFactoryConfigs[0].exportedName).to.equal('exportedName'); diff --git a/test/declarative_config/configurations/full.json b/test/declarative_config/configurations/full.json index ebfae9864..594b8c7cb 100644 --- a/test/declarative_config/configurations/full.json +++ b/test/declarative_config/configurations/full.json @@ -81,7 +81,8 @@ "exportedName": "CustomSerializer2", "typeId": 3 } - ] + ], + "jsonStringDeserializationPolicy": "no_deserialization" }, "nearCaches": [ { diff --git a/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js new file mode 100644 index 000000000..c68aa0f56 --- /dev/null +++ b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var Client = require('../../.').Client; +var Config = require('../../.').Config.ClientConfig; +var RC = require('./../RC'); +var HazelcastJsonValue = require('../../.').HazelcastJsonValue; +var JsonStringDeserializationPolicy = require('../../.').JsonStringDeserializationPolicy; + +describe('HazelcastJsonValue with HazelcastJsonValueSerializer', function () { + var cluster; + var client; + var map; + var object = { 'a': 1 }; + var hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); + + before(function () { + return RC.createCluster().then(function (response) { + cluster = response; + return RC.startMember(cluster.id); + }).then(function () { + var config = new Config(); + config.serializationConfig + .jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; + return Client.newHazelcastClient(config).then(function (hazelcastClient) { + client = hazelcastClient; + }); + }); + }); + + beforeEach(function () { + return client.getMap('jsonTest').then(function (mp) { + map = mp; + }); + }); + + afterEach(function () { + return map.destroy(); + }); + + after(function () { + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + it('storing JavaScript objects', function () { + return map.put(1, object).then(function () { + return map.get(1); + }).then(function (value) { + expect(value).to.be.an.instanceof(HazelcastJsonValue); + expect(value).to.be.deep.equal(hzJsonValue); + expect(JSON.parse(value.toString())).to.deep.equal(object); + }); + }); + + it('storing HazelcastJsonValue objects', function () { + return map.put(1, hzJsonValue).then(function () { + return map.get(1); + }).then(function (value) { + expect(value).to.be.an.instanceof(HazelcastJsonValue); + expect(value).to.be.deep.equal(hzJsonValue); + expect(JSON.parse(value.toString())).to.deep.equal(object); + }); + }); + + it('storing invalid Json strings', function () { + var invalidString = '{a}'; + var hzJsonValueInvalid = new HazelcastJsonValue(invalidString); + return map.put(1, hzJsonValueInvalid).then(function () { + return map.get(1); + }).then(function (value) { + expect(value).to.be.an.instanceof(HazelcastJsonValue); + expect(value).to.be.deep.equal(hzJsonValueInvalid); + expect(function () { + JSON.parse(value.toString()) + }).to.throw(SyntaxError); + }); + }); +}); diff --git a/test/hazelcast_json_value/HJVJsonSerializerTest.js b/test/hazelcast_json_value/HJVJsonSerializerTest.js new file mode 100644 index 000000000..bedee13e2 --- /dev/null +++ b/test/hazelcast_json_value/HJVJsonSerializerTest.js @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var chai = require('chai'); +chai.use(require('chai-as-promised')); +var expect = require('chai').expect; +var Client = require('../../.').Client; +var RC = require('./../RC'); +var Predicates = require('../../.').Predicates; +var HazelcastJsonValue = require('../../.').HazelcastJsonValue; + +describe('HazelcastJsonValue with JsonSerializer', function () { + var cluster; + var client; + var map; + var object = { 'a': 1 }; + var hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); + + before(function () { + return RC.createCluster().then(function (response) { + cluster = response; + return RC.startMember(cluster.id); + }).then(function () { + return Client.newHazelcastClient().then(function (hazelcastClient) { + client = hazelcastClient; + }); + }); + }); + + beforeEach(function () { + return client.getMap('jsonTest').then(function (mp) { + map = mp; + }); + }); + + afterEach(function () { + return map.destroy(); + }); + + after(function () { + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + it('storing JavaScript objects', function () { + return map.put(1, object).then(function () { + return map.get(1); + }).then(function (value) { + expect(value).to.deep.equal(object); + }); + }); + + it('storing HazelcastJsonValue objects', function () { + return map.put(1, hzJsonValue).then(function () { + return map.get(1); + }).then(function (value) { + expect(value).to.deep.equal(object); + }); + }); + + it('storing invalid Json strings', function () { + var invalidString = '{a}'; + return map.put(1, new HazelcastJsonValue(invalidString)).then(function () { + return expect(map.get(1)).to.be.rejectedWith(SyntaxError); + }); + }); + + it('querying over JavaScript objects', function () { + var objects = [ + [0, {'a': 1}], + [1, {'a': 3}] + ]; + return map.putAll(objects).then(function () { + return map.valuesWithPredicate(Predicates.greaterThan('a', 2)); + }).then(function (values) { + expect(values.toArray()).to.deep.equal([objects[1][1]]); + }); + }); + + it('querying over nested attributes', function () { + var objects = [ + [0, {'a': 1, 'b': {'c': 1}}], + [1, {'a': 3, 'b': {'c': 3}}] + ]; + return map.putAll(objects).then(function () { + return map.valuesWithPredicate(Predicates.greaterThan('b.c', 2)); + }).then(function (values) { + expect(values.toArray()).to.deep.equal([objects[1][1]]); + }); + }); + + it('storing JavaScript and HazelcastJsonValue objects as keys', function () { + return map.put(object, 1).then(function () { + return map.get(object); + }).then(function (value) { + expect(value).to.equal(1); + return map.put(hzJsonValue, 2); + }).then(function () { + return map.get(hzJsonValue); + }).then(function (value) { + expect(value).to.equal(2); + return map.size(); + }).then(function (size) { + expect(size).to.equal(1); + }); + }); + + it('storing JavaScript and HazelcastJsonValue objects together', function () { + return map.put(1, object).then(function () { + return map.put(2, hzJsonValue); + }).then(function () { + return map.get(1); + }).then(function (value) { + expect(value).to.deep.equal(object); + return map.get(2); + }).then(function (value) { + expect(value).to.deep.equal(object); + }); + }); + + it('querying over keys', function () { + var hzJsonValue2 = new HazelcastJsonValue('{ "a": 3 }'); + return map.put(object, 1).then(function () { + return map.put(hzJsonValue2, 2); + }).then(function () { + return map.valuesWithPredicate(Predicates.sql('__key.a > 2')); + }).then(function (values) { + expect(values.toArray()).to.deep.equal([2]); + }); + }); + + it('querying nested attributes over keys', function () { + var object1 = {'a': 1, 'b': {'c': 1}}; + var object2 = {'a': 1, 'b': {'c': 3}}; + return map.put(object1, 1).then(function () { + return map.put(object2, 2); + }).then(function () { + return map.keySetWithPredicate(Predicates.equal('__key.b.c', 3)); + }).then(function (keySet) { + expect(keySet).to.deep.equal([object2]); + }); + }); +}); diff --git a/test/hazelcast_json_value/HazelcastJsonValueTest.js b/test/hazelcast_json_value/HazelcastJsonValueTest.js new file mode 100644 index 000000000..a0a03f5e9 --- /dev/null +++ b/test/hazelcast_json_value/HazelcastJsonValueTest.js @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var expect = require('chai').expect; +var assert = require('assert'); +var HazelcastJsonValue = require('../../.').HazelcastJsonValue; + +describe('HazelcastJsonValue', function () { + it('constructing HazelcastJsonValue with null or undefined', function () { + expect(function () { + new HazelcastJsonValue(null); + }).to.throw(assert.AssertionError); + + expect(function () { + new HazelcastJsonValue(undefined); + }).to.throw(assert.AssertionError); + }); + + it('constructing HazelcastJsonValue with non-string value', function () { + expect(function () { + new HazelcastJsonValue(123); + }).to.throw(assert.AssertionError); + }); +}); diff --git a/test/serialization/JsonSerializersTest.js b/test/serialization/JsonSerializersTest.js new file mode 100644 index 000000000..a538523fa --- /dev/null +++ b/test/serialization/JsonSerializersTest.js @@ -0,0 +1,45 @@ +var expect = require('chai').expect; +var Config = require('../../.').Config; +var SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; +var HazelcastJsonValue = require('../../.').HazelcastJsonValue; + +describe('Json serializers test', function () { + var object = { key: 'value' }; + var hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); + + it('jsonSerializer serialize-deserialize object', function () { + var serializationService = new SerializationServiceV1(undefined, new Config.ClientConfig().serializationConfig); + var serialized = serializationService.toData(object); + expect(serializationService.toObject(serialized)).to.deep.equal(object); + }); + + it('jsonSerializer serialize-deserialize HazelcastJsonValue', function () { + var serializationService = new SerializationServiceV1(undefined, new Config.ClientConfig().serializationConfig); + var serialized = serializationService.toData(hzJsonValue); + expect(serializationService.toObject(serialized)).to.deep.equal(object); + }); + + it('hazelcastJsonValueSerializer serialize-deserialize object', function () { + var serializationConfig = new Config.ClientConfig().serializationConfig; + serializationConfig + .jsonStringDeserializationPolicy = Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION; + var serializationService = new SerializationServiceV1(undefined, serializationConfig); + var serialized = serializationService.toData(object); + var deserialized = serializationService.toObject(serialized); + expect(deserialized).to.be.an.instanceof(HazelcastJsonValue); + expect(deserialized).to.deep.equal(hzJsonValue); + expect(JSON.parse(deserialized.toString())).to.deep.equal(object); + }); + + it('hazelcastJsonValueSerializer serialize-deserialize HazelcastJsonValue', function () { + var serializationConfig = new Config.ClientConfig().serializationConfig; + serializationConfig + .jsonStringDeserializationPolicy = Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION; + var serializationService = new SerializationServiceV1(undefined, serializationConfig); + var serialized = serializationService.toData(hzJsonValue); + var deserialized = serializationService.toObject(serialized); + expect(deserialized).to.be.an.instanceof(HazelcastJsonValue); + expect(deserialized).to.deep.equal(hzJsonValue); + expect(JSON.parse(deserialized.toString())).to.deep.equal(object); + }); +}); From 95402b55d2b9ad5ac5733fbcff797ef6d2fa97d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Fri, 22 Mar 2019 17:05:37 +0300 Subject: [PATCH 239/685] mention about installing only dependencies in the readme (#469) --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f15bbcd0e..72a63cb91 100644 --- a/README.md +++ b/README.md @@ -3254,7 +3254,8 @@ tweak the implementation to your application's needs, you can follow the steps i Follow the below steps to build and install Hazelcast Node.js client from its source: 1. Clone the GitHub repository (https://github.com/hazelcast/hazelcast-nodejs-client.git). -2. Run `npm install` to automatically download and install all the required modules under `node_modules` directory. +2. Run `npm install` to automatically download and install all the required modules under `node_modules` directory. Note that, +there may be vulnerabilities reported due to `devDependencies`. In that case, run `npm audit fix` to automatically install any compatible updates to vulnerable dependencies. 3. Run `npm run compile` to compile TypeScript files to JavaScript. At this point you have all the runnable code (`.js`) and type declarations (`.d.ts`) in the `lib` directory. You may create a link to this module so that your local From 0d6fd0878504bbef4b70422367b16cf90f96735c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Tue, 2 Apr 2019 16:23:42 +0300 Subject: [PATCH 240/685] update readme and code samples (#465) --- README.md | 92 ++++++++++--------- code_samples/org-website/AtomicLongSample.js | 4 +- code_samples/org-website/LockSample.js | 2 +- .../org-website/ReliableTopicSample.js | 2 +- ...-sample.json => hazelcast-client-full.json | 15 +-- 5 files changed, 62 insertions(+), 53 deletions(-) rename hazelcast-client-sample.json => hazelcast-client-full.json (91%) diff --git a/README.md b/README.md index 72a63cb91..cbc178429 100644 --- a/README.md +++ b/README.md @@ -79,14 +79,11 @@ * [7.5.2.4. Message Listener](#7524-message-listener) * [7.6. Distributed Computing](#76-distributed-computing) * [7.6.1. Using EntryProcessor](#761-using-entryprocessor) - * [Processing Entries](#processing-entries) * [7.7. Distributed Query](#77-distributed-query) * [7.7.1. How Distributed Query Works](#771-how-distributed-query-works) * [7.7.1.1. Employee Map Query Example](#7711-employee-map-query-example) * [7.7.1.2. Querying by Combining Predicates with AND, OR, NOT](#7712-querying-by-combining-predicates-with-and-or-not) * [7.7.1.3. Querying with SQL](#7713-querying-with-sql) - * [Supported SQL Syntax](#supported-sql-syntax) - * [Querying Examples with Predicates](#querying-examples-with-predicates) * [7.7.1.4. Querying with JSON Strings](#7714-querying-with-json-strings) * [7.7.1.5. Filtering with Paging Predicates](#7715-filtering-with-paging-predicates) * [7.7.2. Fast-Aggregations](#772-fast-aggregations) @@ -605,7 +602,7 @@ the client looks for the configuration file in the specified location. from the current working directory. 3. Default configuration: If all of the above methods fail, the client starts with the default configuration. The default configuration is programmatic. If you want to override the default configuration declaratively, you need to create -a `hazelcast-client.json` file in your working directory. If you want to have an example for this file, you can find `hazelcast-client-default.json` and `hazelcast-client-sample.json` files in the GitHub repository. +a `hazelcast-client.json` file in your working directory. To get an idea about the structure of this configuration file, see [hazelcast-client-default.json](hazelcast-client-default.json) and [hazelcast-client-full.json](hazelcast-client-full.json). Following is a sample JSON configuration file: @@ -1456,7 +1453,7 @@ An example configuration is shown below. ``` -An example of a factory, `My_Factory.js`, is shown below. +An example of a factory, `my_factory.js`, is shown below. ```javascript @@ -1761,7 +1758,6 @@ You can set a timeout for retrying the operations sent to a member. This can be When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all the client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member and then the connection is lost. Since there will be no response for this operation, you will not know whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. - ## 7.4. Using Distributed Data Structures Most of the distributed data structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. @@ -1775,7 +1771,7 @@ A Map usage example is shown below. ```javascript var map; // Get the Distributed Map from Cluster. -client.getMap('my-distributed-map').then(function (mp) { +hz.getMap('my-distributed-map').then(function (mp) { map = mp; // Standard Put and Get. return map.put('key', 'value'); @@ -1983,7 +1979,7 @@ A Reliable Topic usage example is shown below. ```javascript var topic; // Get a Topic called "my-distributed-topic" -hz.getReliableTopic("my-distributed-topic").then(function (t) { +hz.getReliableTopic('my-distributed-topic').then(function (t) { topic = t; // Add a Listener to the Topic topic.addMessageListener(function (message) { @@ -2005,7 +2001,7 @@ A Lock usage example is shown below. ```javascript var lock; // Get a distributed lock called "my-distributed-lock" -hz.getLock("my-distributed-lock").then(function (l) { +hz.getLock('my-distributed-lock').then(function (l) { lock = l; // Now create a lock and execute some guarded code. return lock.lock(); @@ -2025,7 +2021,7 @@ An Atomic Long usage example is shown below. ```javascript var counter; // Get an Atomic Counter, we'll call it "counter" -hz.getAtomicLong("counter").then(function (c) { +hz.getAtomicLong('counter').then(function (c) { counter = c; // Add and Get the "counter" return counter.addAndGet(3); @@ -2033,7 +2029,7 @@ hz.getAtomicLong("counter").then(function (c) { return counter.get(); }).then(function (value) { // Display the "counter" value - console.log("counter: " + value); + console.log('counter: ' + value); }); ``` @@ -2065,14 +2061,23 @@ A PN Counter usage example is shown below. ```javascript var pnCounter; -hazelcastClient.getPNCounter('myPNCounter').then(function (counter) { +hz.getPNCounter('myPNCounter').then(function (counter) { pnCounter = counter; + return pnCounter.get(); +}).then(function (value) { + console.log('Counter started with value ' + value); // 0 return pnCounter.addAndGet(5); }).then(function (value) { - console.log(value); // 5 + console.log('Value after operation is ' + value); // 5 + return pnCounter.getAndAdd(2); +}).then(function (value) { + console.log('Value before operation was ' + value); // 5 + return pnCounter.get(); +}).then(function (value) { + console.log('New value is ' + value); // 7 return pnCounter.decrementAndGet(); }).then(function (value) { - console.log(value); // 4 + console.log('Decremented counter by one. New value is ' + value); // 6 }); ``` @@ -2084,7 +2089,7 @@ A Flake ID Generator usage example is shown below. ```javascript var flakeIdGenerator; -hazelcastClient.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { +hz.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { flakeIdGenerator = gen; return flakeIdGenerator.newId(); }).then(function (value) { @@ -2228,11 +2233,11 @@ See the following example. ```javascript var entryEventListener = { added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, entryEvent.value); // Entry Added: 1 Furkan + console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry } }; map.addEntryListener(entryEventListener, undefined, true).then(function () { - return map.put('1', 'Furkan'); + return map.put('1', 'My new entry'); }); ``` @@ -2247,11 +2252,11 @@ var mapEventListener = { } }; map.addEntryListener(mapEventListener).then(function () { - return map.put('1', 'Muhammet Ali'); + return map.put('1', 'Muhammad Ali'); }).then(function () { - return map.put('2', 'Ahmet'); + return map.put('2', 'Mike Tyson'); }).then(function () { - return map.put('3', 'Furkan'); + return map.put('3', 'Joe Louis'); }).then(function () { return map.clear(); }); @@ -2270,11 +2275,11 @@ An entry-based event is fired after the operations that affect a specific entry. ```javascript var entryEventListener = { added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, entryEvent.value); // Entry Added: 1 Furkan + console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry } }; return mmp.addEntryListener(entryEventListener, undefined, true).then(function () { - return mmp.put('1', 'Furkan'); + return mmp.put('1', 'My new entry'); }); ``` @@ -2289,11 +2294,11 @@ var mapEventListener = { } }; mmp.addEntryListener(mapEventListener).then(function () { - return mmp.put('1', 'Muhammet Ali'); + return mmp.put('1', 'Muhammad Ali'); }).then(function () { - return mmp.put('1', 'Ahmet'); + return mmp.put('1', 'Mike Tyson'); }).then(function () { - return mmp.put('1', 'Furkan'); + return mmp.put('1', 'Joe Louis'); }).then(function () { return mmp.clear(); }); @@ -2328,16 +2333,16 @@ The following is an example of item listener object and its registration to the ```javascript var itemListener = { itemAdded: function (itemEvent) { - console.log('Item Added:', itemEvent.item); // Item Added: Furkan + console.log('Item Added:', itemEvent.item); // Item Added: Item1 }, itemRemoved: function (itemEvent) { - console.log('Item Removed:', itemEvent.item); // Item Removed: Furkan + console.log('Item Removed:', itemEvent.item); // Item Removed: Item1 } }; return set.addItemListener(itemListener, true).then(function () { - return set.add('Furkan'); + return set.add('Item1'); }).then(function () { - return set.remove('Furkan'); + return set.remove('Item1'); }); ``` @@ -2356,13 +2361,14 @@ topic.addMessageListener(function (message) { console.log(message.messageObject); }); -var engineer = { - name: 'Furkan Senharputlu', - age: 23, - field: 'Computer Engineering', - university: 'Bogazici University' +var movie = { + title: 'The Prestige', + year: '2006', + runtime: '130 min', + director: 'Christopher Nolan', + imdbRating: '8.5' } -topic.publish(engineer); +topic.publish(movie); ``` ## 7.6. Distributed Computing @@ -2917,23 +2923,23 @@ See the following example. ```javascript var map; -hazelcastClient.getMap('brothersMap').then(function (mp) { +hz.getMap('employees').then(function (mp) { map = mp; return map.putAll([ - ['Muhammet Ali', 30], - ['Ahmet', 27], - ['Furkan', 23], + ['John Stiles', 23], + ['Judy Doe', 29], + ['Richard Miles', 38], ]); }).then(function () { return map.aggregate(Aggregators.count()); }).then(function (count) { - console.log('There are ' + count + ' brothers.'); // There are 3 brothers. + console.log('There are ' + count + ' employees.'); // There are 3 employees. return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); }).then(function (count) { - console.log('There are ' + count + ' brothers older than 25.'); // There are 2 brothers older than 25. + console.log('There are ' + count + ' employees older than 25.'); // There are 2 employees older than 25. return map.aggregate(Aggregators.numberAvg()); }).then(function (avgAge) { - console.log('Average age is ' + avgAge); // Average age is 26.666666666666668 + console.log('Average age is ' + avgAge); // Average age is 30 }); ``` @@ -2961,7 +2967,7 @@ Client.newHazelcastClient().then(function (client) { // since map names are different, operation is manipulating // different entries, but the operation takes place on the // same member since the keys ('key1') are the same - return mapA.put('key1', 'Furkan'); + return mapA.put('key1', 'value1'); }).then(function () { return mapB.get('key1'); }).then(function (res) { diff --git a/code_samples/org-website/AtomicLongSample.js b/code_samples/org-website/AtomicLongSample.js index 2bcd82b54..7b550107b 100644 --- a/code_samples/org-website/AtomicLongSample.js +++ b/code_samples/org-website/AtomicLongSample.js @@ -3,7 +3,7 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hz) { var counter; // Get an Atomic Counter, we'll call it "counter" - hz.getAtomicLong("counter").then(function (c) { + hz.getAtomicLong('counter').then(function (c) { counter = c; // Add and Get the "counter" return counter.addAndGet(3); @@ -11,7 +11,7 @@ Client.newHazelcastClient().then(function (hz) { return counter.get(); }).then(function (value) { // Display the "counter" value - console.log("counter: " + value); + console.log('counter: ' + value); // Shutdown this Hazelcast Client hz.shutdown(); }); diff --git a/code_samples/org-website/LockSample.js b/code_samples/org-website/LockSample.js index d0f9563a3..edef52d09 100644 --- a/code_samples/org-website/LockSample.js +++ b/code_samples/org-website/LockSample.js @@ -3,7 +3,7 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hz) { var lock; // Get a distributed lock called "my-distributed-lock" - hz.getLock("my-distributed-lock").then(function (l) { + hz.getLock('my-distributed-lock').then(function (l) { lock = l; // Now create a lock and execute some guarded code. return lock.lock(); diff --git a/code_samples/org-website/ReliableTopicSample.js b/code_samples/org-website/ReliableTopicSample.js index b1facb81e..bdf035754 100644 --- a/code_samples/org-website/ReliableTopicSample.js +++ b/code_samples/org-website/ReliableTopicSample.js @@ -3,7 +3,7 @@ var Client = require('hazelcast-client').Client; Client.newHazelcastClient().then(function (hz) { var topic; // Get a Topic called "my-distributed-topic" - hz.getReliableTopic("my-distributed-topic").then(function (t) { + hz.getReliableTopic('my-distributed-topic').then(function (t) { topic = t; // Add a Listener to the Topic topic.addMessageListener(function (message) { diff --git a/hazelcast-client-sample.json b/hazelcast-client-full.json similarity index 91% rename from hazelcast-client-sample.json rename to hazelcast-client-full.json index e3a63b92d..c3da76e01 100644 --- a/hazelcast-client-sample.json +++ b/hazelcast-client-full.json @@ -14,11 +14,12 @@ "hazelcast.invalidation.reconciliation.interval.seconds": 60, "hazelcast.invalidation.max.tolerated.miss.count": 10, "hazelcast.invalidation.min.reconciliation.interval.seconds": 30, + "hazelcast.logging.level": 2 }, "network": { "clusterMembers": [ - "127.0.0.1:5701", - "127.0.0.2:5703" + "127.0.0.1", + "127.0.0.2:5702" ], "smartRouting": true, "redoOperation": false, @@ -27,6 +28,7 @@ "connectionAttemptLimit": 2, "ssl": { "enabled": false, + "sslOptions": null, "factory": { "path": "path/to/file", "exportedName": "exportedName", @@ -55,6 +57,7 @@ "serialization": { "defaultNumberType": "double", "isBigEndian": true, + "jsonStringDeserializationPolicy": "eager", "dataSerializableFactories": [ { "path": "path/to/file", @@ -115,13 +118,13 @@ "flakeIdGeneratorConfigs": [ { "name": "flakeid", - "prefetchCount": 123, - "prefetchValidityMillis": 150000 + "prefetchCount": 1000, + "prefetchValidityMillis": 30000 }, { "name": "flakeid2", - "prefetchCount": 1234, - "prefetchValidityMillis": 1900000 + "prefetchCount": 5000, + "prefetchValidityMillis": 500000 } ], "import": [ From b53e60abb443933bd379e7e5dc5ee4527ef53680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Thu, 25 Apr 2019 16:41:14 +0300 Subject: [PATCH 241/685] add server version check to hazelcast json value tests and increase timeout on listener tests for old server versions (#475) * add server version check to hazelcast json value tests and increase timeout on listener tests for old server versions * update hz version to 3.12.1 snapshot * seperate hazelcast json value query tests from basic storage tests --- scripts/dev-test-rc.sh | 4 +- scripts/download-rc.bat | 4 +- scripts/download-rc.sh | 4 +- test/ListenersOnReconnectTest.js | 2 +- .../HJVJsonSerializerTest.js | 48 -------- .../HazelcastJsonValueQueryTest.js | 108 ++++++++++++++++++ 6 files changed, 115 insertions(+), 55 deletions(-) create mode 100644 test/hazelcast_json_value/HazelcastJsonValueQueryTest.js diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index ed73eaa64..dcfd49e63 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="3.12-SNAPSHOT" -HAZELCAST_TEST_VERSION="3.12-SNAPSHOT" +HZ_VERSION="3.12.1-SNAPSHOT" +HAZELCAST_TEST_VERSION="3.12.1-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.4-SNAPSHOT" diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index a09ddf384..ae2a038e5 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,5 +1,5 @@ -set HZ_VERSION="3.12-SNAPSHOT" -set HZ_TEST_VERSION="3.12-SNAPSHOT" +set HZ_VERSION="3.12.1-SNAPSHOT" +set HZ_TEST_VERSION="3.12.1-SNAPSHOT" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 771de11c4..244afdc2f 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="3.12-SNAPSHOT" -HZ_TEST_VERSION="3.12-SNAPSHOT" +HZ_VERSION="3.12.1-SNAPSHOT" +HZ_TEST_VERSION="3.12.1-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index a6f39a107..c5436462a 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -23,7 +23,7 @@ var Promise = require('bluebird'); describe('Listeners on reconnect', function () { - this.timeout(30000); + this.timeout(40000); var client; var members = []; var cluster; diff --git a/test/hazelcast_json_value/HJVJsonSerializerTest.js b/test/hazelcast_json_value/HJVJsonSerializerTest.js index bedee13e2..2b551f8e8 100644 --- a/test/hazelcast_json_value/HJVJsonSerializerTest.js +++ b/test/hazelcast_json_value/HJVJsonSerializerTest.js @@ -19,7 +19,6 @@ chai.use(require('chai-as-promised')); var expect = require('chai').expect; var Client = require('../../.').Client; var RC = require('./../RC'); -var Predicates = require('../../.').Predicates; var HazelcastJsonValue = require('../../.').HazelcastJsonValue; describe('HazelcastJsonValue with JsonSerializer', function () { @@ -78,30 +77,6 @@ describe('HazelcastJsonValue with JsonSerializer', function () { }); }); - it('querying over JavaScript objects', function () { - var objects = [ - [0, {'a': 1}], - [1, {'a': 3}] - ]; - return map.putAll(objects).then(function () { - return map.valuesWithPredicate(Predicates.greaterThan('a', 2)); - }).then(function (values) { - expect(values.toArray()).to.deep.equal([objects[1][1]]); - }); - }); - - it('querying over nested attributes', function () { - var objects = [ - [0, {'a': 1, 'b': {'c': 1}}], - [1, {'a': 3, 'b': {'c': 3}}] - ]; - return map.putAll(objects).then(function () { - return map.valuesWithPredicate(Predicates.greaterThan('b.c', 2)); - }).then(function (values) { - expect(values.toArray()).to.deep.equal([objects[1][1]]); - }); - }); - it('storing JavaScript and HazelcastJsonValue objects as keys', function () { return map.put(object, 1).then(function () { return map.get(object); @@ -130,27 +105,4 @@ describe('HazelcastJsonValue with JsonSerializer', function () { expect(value).to.deep.equal(object); }); }); - - it('querying over keys', function () { - var hzJsonValue2 = new HazelcastJsonValue('{ "a": 3 }'); - return map.put(object, 1).then(function () { - return map.put(hzJsonValue2, 2); - }).then(function () { - return map.valuesWithPredicate(Predicates.sql('__key.a > 2')); - }).then(function (values) { - expect(values.toArray()).to.deep.equal([2]); - }); - }); - - it('querying nested attributes over keys', function () { - var object1 = {'a': 1, 'b': {'c': 1}}; - var object2 = {'a': 1, 'b': {'c': 3}}; - return map.put(object1, 1).then(function () { - return map.put(object2, 2); - }).then(function () { - return map.keySetWithPredicate(Predicates.equal('__key.b.c', 3)); - }).then(function (keySet) { - expect(keySet).to.deep.equal([object2]); - }); - }); }); diff --git a/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js new file mode 100644 index 000000000..b2e73551b --- /dev/null +++ b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var chai = require('chai'); +chai.use(require('chai-as-promised')); +var expect = require('chai').expect; +var Client = require('../../.').Client; +var RC = require('./../RC'); +var Predicates = require('../../.').Predicates; +var HazelcastJsonValue = require('../../.').HazelcastJsonValue; +var Util = require('../Util'); + +describe('HazelcastJsonValue query test', function () { + var cluster; + var client; + var map; + var object = { 'a': 1 }; + + before(function () { + Util.markServerVersionAtLeast(this, null, '3.12'); + return RC.createCluster().then(function (response) { + cluster = response; + return RC.startMember(cluster.id); + }).then(function () { + return Client.newHazelcastClient().then(function (hazelcastClient) { + client = hazelcastClient; + }); + }); + }); + + beforeEach(function () { + return client.getMap('jsonTest').then(function (mp) { + map = mp; + }); + }); + + afterEach(function () { + return map.destroy(); + }); + + after(function () { + if (!client) { + return; + } + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + it('querying over JavaScript objects', function () { + var objects = [ + [0, {'a': 1}], + [1, {'a': 3}] + ]; + return map.putAll(objects).then(function () { + return map.valuesWithPredicate(Predicates.greaterThan('a', 2)); + }).then(function (values) { + expect(values.toArray()).to.deep.equal([objects[1][1]]); + }); + }); + + it('querying over nested attributes', function () { + var objects = [ + [0, {'a': 1, 'b': {'c': 1}}], + [1, {'a': 3, 'b': {'c': 3}}] + ]; + return map.putAll(objects).then(function () { + return map.valuesWithPredicate(Predicates.greaterThan('b.c', 2)); + }).then(function (values) { + expect(values.toArray()).to.deep.equal([objects[1][1]]); + }); + }); + + it('querying over keys', function () { + var hzJsonValue2 = new HazelcastJsonValue('{ "a": 3 }'); + return map.put(object, 1).then(function () { + return map.put(hzJsonValue2, 2); + }).then(function () { + return map.valuesWithPredicate(Predicates.sql('__key.a > 2')); + }).then(function (values) { + expect(values.toArray()).to.deep.equal([2]); + }); + }); + + it('querying nested attributes over keys', function () { + var object1 = {'a': 1, 'b': {'c': 1}}; + var object2 = {'a': 1, 'b': {'c': 3}}; + return map.put(object1, 1).then(function () { + return map.put(object2, 2); + }).then(function () { + return map.keySetWithPredicate(Predicates.equal('__key.b.c', 3)); + }).then(function (keySet) { + expect(keySet).to.deep.equal([object2]); + }); + }); +}); From 10e629a0e6ac9e39a2e735261515ba0a47876d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Tue, 30 Apr 2019 10:40:06 +0300 Subject: [PATCH 242/685] log lifecycle events with the info level (#471) --- README.md | 29 ++++++++++++++--------------- src/HazelcastClient.ts | 1 - src/LifecycleService.ts | 10 +++++++--- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index cbc178429..e95102e92 100644 --- a/README.md +++ b/README.md @@ -411,18 +411,19 @@ Client.newHazelcastClient(config).then(function(client) { This should print logs about the cluster members and information about the client itself such as the client type, UUID and address. ``` -[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 192.168.0.3:5701 authenticated +[DefaultLogger] INFO at LifecycleService: HazelcastClient is starting +[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.43:5701 authenticated [DefaultLogger] INFO at ClusterService: Members received. [ Member { - address: Address { host: '192.168.0.3', port: 5701, type: 4 }, - uuid: '05db1504-4f23-426b-9e8a-c9db587ad0d6', + address: Address { host: '10.216.1.43', port: 5701, type: 4 }, + uuid: '7961eef2-940d-42dc-8036-2a29c5c9942c', isLiteMember: false, attributes: {} } ] -[DefaultLogger] INFO at HazelcastClient: Client started +[DefaultLogger] INFO at LifecycleService: HazelcastClient is started ClientInfo { type: 'NodeJS', - uuid: '532e8479-2b86-47f9-a0fb-a2da13a8d584', - localAddress: Address { host: '127.0.0.1', port: 51903, type: 4 } } + uuid: '8618226d-0e7b-4442-b9c2-a5918a3d3db2', + localAddress: Address { host: '127.0.0.1', port: 54708, type: 4 } } ``` Congratulations! You just started a Hazelcast Node.js client. @@ -463,7 +464,6 @@ Client.newHazelcastClient(config).then(function (client) { **Output** ``` -[DefaultLogger] INFO at HazelcastClient: Client started Added IT personnel. Logging all known personnel Alice is in IT department Clark is in IT department @@ -505,7 +505,6 @@ Client.newHazelcastClient(config).then(function (client) { **Output** ``` -[DefaultLogger] INFO at HazelcastClient: Client started Added Sales personnel. Logging all known personnel Denise is in Sales department Erwing is in Sales department @@ -513,7 +512,6 @@ Faith is in Sales department Alice is in IT department Clark is in IT department Bob is in IT department - ``` You will see this time we add only the sales employees but we get the list all known employees including the ones in IT. @@ -2197,20 +2195,21 @@ Client.newHazelcastClient(clientConfig).then(function (hazelcastClient) { **Output:** ``` +[DefaultLogger] INFO at LifecycleService: HazelcastClient is starting Lifecycle Event >>> starting -[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.62:5701 authenticated +[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.43:5701 authenticated [DefaultLogger] INFO at ClusterService: Members received. [ Member { - address: Address { host: '10.216.1.62', port: 5701, type: 4 }, - uuid: 'dc001432-7868-4ced-9161-5649ff6f31fc', + address: Address { host: '10.216.1.43', port: 5701, type: 4 }, + uuid: '7961eef2-940d-42dc-8036-2a29c5c9942c', isLiteMember: false, attributes: {} } ] +[DefaultLogger] INFO at LifecycleService: HazelcastClient is started Lifecycle Event >>> started -[DefaultLogger] INFO at HazelcastClient: Client started +[DefaultLogger] INFO at LifecycleService: HazelcastClient is shuttingDown Lifecycle Event >>> shuttingDown +[DefaultLogger] INFO at LifecycleService: HazelcastClient is shutdown Lifecycle Event >>> shutdown - -Process finished with exit code 0 ``` ### 7.5.2. Listening for Distributed Data Structure Events diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 4b6632e5f..d1a5d2767 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -398,7 +398,6 @@ export default class HazelcastClient { this.proxyManager.init(); this.listenerService.start(); this.statistics.start(); - this.loggingService.getLogger().info('HazelcastClient', 'Client started'); return this; }).catch((e) => { this.loggingService.getLogger().error('HazelcastClient', 'Client failed to start', e); diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index 2fd754eff..bf2274769 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -18,6 +18,7 @@ import {EventEmitter} from 'events'; import {ImportConfig} from './config/ImportConfig'; import HazelcastClient from './HazelcastClient'; import * as Util from './Util'; +import {ILogger} from './logging/ILogger'; /** * Lifecycle events. @@ -51,23 +52,25 @@ export let LifecycleEvent = { export class LifecycleService extends EventEmitter { private active: boolean; private client: HazelcastClient; + private logger: ILogger; constructor(client: HazelcastClient) { super(); this.setMaxListeners(0); this.client = client; + this.logger = this.client.getLoggingService().getLogger(); const listeners = client.getConfig().listeners.lifecycle; listeners.forEach((listener) => { this.on(LifecycleEvent.name, listener); }); - const listenerConfgs = client.getConfig().listenerConfigs; - listenerConfgs.forEach((importConfig: ImportConfig) => { + const listenerConfigs = client.getConfig().listenerConfigs; + listenerConfigs.forEach((importConfig: ImportConfig) => { const path = importConfig.path; const exportedName = importConfig.exportedName; const listener = Util.loadNameFromPath(path, exportedName); this.on(LifecycleEvent.name, listener); }); - this.emit(LifecycleEvent.name, LifecycleEvent.starting); + this.emitLifecycleEvent(LifecycleEvent.starting); } /** @@ -83,6 +86,7 @@ export class LifecycleService extends EventEmitter { } else if (state === LifecycleEvent.shuttingDown) { this.active = false; } + this.logger.info('LifecycleService', 'HazelcastClient is ' + state); this.emit(LifecycleEvent.name, state); } From b64c59b93be3e99ff7558bdc3f04c46d5c33ff59 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 30 Apr 2019 16:07:56 +0300 Subject: [PATCH 243/685] Enhancement/performance optimizations (#473) * Fix package-lock.json to match package.json * Remove deprecated Buffer constructor calls * Add polyfill Buffer library for Node 4 compatibility * Fix code style issues * Add greedy buffer allocation for ObjectDataOutput * Add map.get based benchmark * Upgrade Bluebird library (there were some important fixes) * Improve readUTF/writeUTF performance for ObjectData * Fix deserialization in ObjectDataInput#readUTF * Fix null string serialization in ObjectDataOutput#writeUTF * Add string serialization config setting (legacy/standard) * Revert changes in PortableTest * Add documentation for the new string serialization config option * Migrate tests to safe-buffer * Improve default serializers integration tests * Fix readme section for string serialization * Improve MapGetRunner benchmark * Fix code issues after code review * Fix readme issues for string serialization --- README.md | 25 + benchmark/MapGetRunner.js | 38 + benchmark/README.md | 3 +- config-schema.json | 7 + hazelcast-client-full.json | 1 + package-lock.json | 696 ++++++++++-------- package.json | 7 +- src/BitsUtil.ts | 1 + src/ClientMessage.ts | 6 +- src/config/Config.ts | 3 + src/config/ConfigBuilder.ts | 4 + src/config/SerializationConfig.ts | 2 + src/config/StringSerializationPolicy.ts | 39 + src/index.ts | 2 + src/invocation/ClientConnection.ts | 7 +- src/invocation/ClientConnectionManager.ts | 4 +- src/invocation/InvocationService.ts | 1 + src/serialization/Data.ts | 1 + src/serialization/HeapData.ts | 1 + src/serialization/ObjectData.ts | 188 +++-- src/serialization/SerializationService.ts | 10 +- test/declarative_config/ConfigBuilderTest.js | 2 + .../configurations/full.json | 3 +- test/serialization/APortable.js | 12 +- .../AnIdentifiedDataSerializable.js | 10 +- test/serialization/BinaryCompatibilityTest.js | 56 +- .../DefaultSerializersLiveTest.js | 212 +++--- test/serialization/DefaultSerializersTest.js | 31 +- test/serialization/ObjectDataTest.js | 191 ++--- test/serialization/PortableObjects.js | 14 +- test/serialization/PortableTest.js | 3 +- test/serialization/ReferenceObjects.js | 4 +- 32 files changed, 979 insertions(+), 605 deletions(-) create mode 100644 benchmark/MapGetRunner.js create mode 100644 src/config/StringSerializationPolicy.ts diff --git a/README.md b/README.md index e95102e92..626b0878b 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ * [4.3. Custom Serialization](#43-custom-serialization) * [4.4. Global Serialization](#44-global-serialization) * [4.5. JSON Serialization](#45-json-serialization) + * [4.6. String Serialization](#46-string-serialization) * [5. Setting Up Client Network](#5-setting-up-client-network) * [5.1. Providing Member Addresses](#51-providing-member-addresses) * [5.2. Setting Smart Routing](#52-setting-smart-routing) @@ -1084,6 +1085,30 @@ config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeseriali } ``` +## 4.6. String Serialization + +Starting from version v3.12 Hazelcast Node.js client follows UTF-8 standard (RFC 3629) for string data type serialization of 4 byte UTF characters, like less common CJK characters and emoji. This may lead to compatibility issues with Hazelcast IMDG 3.x and other client libraries for string and JSON values. Such issues are represented by `Malformed byte sequence` (error code 64) errors on members and other clients. + +In case if you encounter these error messages, you can switch to the legacy mode of string serialization that provides full compatibility with Hazelcast IMDG 3.x members and other client libraries. + +Below is the configuration required to use the legacy string serialization. + +**Programmatic Configuration:** + +```javascript +config.serializationConfig.stringSerializationPolicy = StringSerializationPolicy.LEGACY; +``` + +**Declarative Configuration:** + +```json +{ + "serialization": { + "stringSerializationPolicy": "legacy" + } +} +``` + # 5. Setting Up Client Network All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let's first give the examples for these two approaches. Then we will look at its sub-elements and attributes. diff --git a/benchmark/MapGetRunner.js b/benchmark/MapGetRunner.js new file mode 100644 index 000000000..627174ad9 --- /dev/null +++ b/benchmark/MapGetRunner.js @@ -0,0 +1,38 @@ +'use strict'; + +const REQ_COUNT = 10000; +const BATCH_SIZE = 100; + +const Benchmark = require('./SimpleBenchmark'); +const Client = require('../.').Client; + +function randomString(len) { + const charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + let res = ''; + for (let i = 0; i < len; i++) { + const pos = Math.floor(Math.random() * charSet.length); + res += charSet.substring(pos, pos + 1); + } + return res; +} + +const KEY = '00000000-0000-0000-0000-000000000000'; +const VAL = randomString(100 * 1024); + +Client.newHazelcastClient() + .then((client) => client.getMap('default')) + .then((map) => { + return map.set(KEY, VAL) + .then(() => map); + }) + .then((map) => { + const benchmark = new Benchmark({ + nextOp: () => map.get(KEY), + totalOpsCount: REQ_COUNT, + batchSize: BATCH_SIZE + }); + return benchmark.run() + .then(() => map.destroy()) + .then(() => map.client.shutdown()); + }) + .then(() => console.log('Benchmark finished')); diff --git a/benchmark/README.md b/benchmark/README.md index 98fa96690..764814b64 100644 --- a/benchmark/README.md +++ b/benchmark/README.md @@ -2,6 +2,7 @@ A collection of simple benchmarks that run operations on Map in parallel, measure execution time and calculate throughput: * `MapPutRunner` - runs `map.put('foo', 'bar')` operations. +* `MapGetRunner` - runs `map.get` operations that read string value with >100 KB size. * `MapRandomOpRunner` - runs randomly selected operations (`get`, `put`, `remove`). ## Running the benchmark @@ -21,7 +22,7 @@ Next, run at least one instance of IMDG. The most simple way to do it would be t docker run -p 5701:5701 hazelcast/hazelcast:3.11.2 ``` -Finally, run the benchmark: +Finally, run one of the benchmarks, e.g.: ```bash node benchmark/MapPutRunner.js ``` diff --git a/config-schema.json b/config-schema.json index 19e37ac99..58bafb8c7 100644 --- a/config-schema.json +++ b/config-schema.json @@ -164,6 +164,13 @@ ], "default": "double" }, + "stringSerialization": { + "enum": [ + "standard", + "legacy" + ], + "default": "standard" + }, "isBigEndian": { "type": "boolean", "default": false diff --git a/hazelcast-client-full.json b/hazelcast-client-full.json index c3da76e01..960920f88 100644 --- a/hazelcast-client-full.json +++ b/hazelcast-client-full.json @@ -58,6 +58,7 @@ "defaultNumberType": "double", "isBigEndian": true, "jsonStringDeserializationPolicy": "eager", + "stringSerialization": "standard", "dataSerializableFactories": [ { "path": "path/to/file", diff --git a/package-lock.json b/package-lock.json index 311ee3cef..77f8ad5bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "hazelcast-client", - "version": "0.9.0", + "version": "0.10.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@types/bluebird": { - "version": "3.5.12", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.12.tgz", - "integrity": "sha1-GAiBhH/2ZOnilKXc3NTI6aFQ5ac=", + "version": "3.5.21", + "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.21.tgz", + "integrity": "sha512-6UNEwyw+6SGMC/WMI0ld0PS4st7Qq51qgguFrFizOSpGvZiqe9iswztFSdZvwJBEhLOy2JaxNE6VC7yMAlbfyQ==", "dev": true }, "@types/long": { @@ -86,9 +86,9 @@ "dev": true }, "bluebird": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", - "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=" + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", + "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==" }, "brace-expansion": { "version": "1.1.8", @@ -96,7 +96,7 @@ "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -118,8 +118,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "chai": { @@ -128,12 +128,12 @@ "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", "dev": true, "requires": { - "assertion-error": "1.1.0", - "check-error": "1.0.2", - "deep-eql": "3.0.1", - "get-func-name": "2.0.0", - "pathval": "1.1.0", - "type-detect": "4.0.7" + "assertion-error": "^1.0.1", + "check-error": "^1.0.1", + "deep-eql": "^3.0.0", + "get-func-name": "^2.0.0", + "pathval": "^1.0.0", + "type-detect": "^4.0.0" }, "dependencies": { "assertion-error": { @@ -154,7 +154,7 @@ "integrity": "sha1-38lARACtHI/gI+faHfHBR8S0RN8=", "dev": true, "requires": { - "type-detect": "4.0.7" + "type-detect": "^4.0.0" } }, "get-func-name": { @@ -183,7 +183,7 @@ "integrity": "sha1-CGRdgl3rhpbuYXJdv1kMAS6wDKA=", "dev": true, "requires": { - "check-error": "1.0.2" + "check-error": "^1.0.2" }, "dependencies": { "check-error": { @@ -200,13 +200,19 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, + "charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", + "dev": true + }, "clone": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", @@ -237,13 +243,19 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, + "crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=", + "dev": true + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "dateformat": { @@ -252,8 +264,17 @@ "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", "dev": true, "requires": { - "get-stdin": "4.0.1", - "meow": "3.7.0" + "get-stdin": "^4.0.1", + "meow": "^3.3.0" + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" } }, "decamelize": { @@ -268,7 +289,7 @@ "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "dev": true, "requires": { - "readable-stream": "1.1.14" + "readable-stream": "~1.1.9" } }, "error-ex": { @@ -277,7 +298,7 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "escape-string-regexp": { @@ -292,9 +313,9 @@ "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", "dev": true, "requires": { - "ansi-gray": "0.1.1", - "color-support": "1.1.3", - "time-stamp": "1.1.0" + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "time-stamp": "^1.0.0" } }, "find-up": { @@ -303,8 +324,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "get-stdin": { @@ -319,7 +340,7 @@ "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", "dev": true, "requires": { - "sparkles": "1.0.0" + "sparkles": "^1.0.0" } }, "graceful-fs": { @@ -334,24 +355,24 @@ "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=", "dev": true, "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "1.0.12", - "fancy-log": "1.3.2", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", + "array-differ": "^1.0.0", + "array-uniq": "^1.0.2", + "beeper": "^1.0.0", + "chalk": "^1.0.0", + "dateformat": "^1.0.11", + "fancy-log": "^1.1.0", + "gulplog": "^1.0.0", + "has-gulplog": "^0.1.0", + "lodash._reescape": "^3.0.0", + "lodash._reevaluate": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.template": "^3.0.0", + "minimist": "^1.1.0", + "multipipe": "^0.1.2", + "object-assign": "^3.0.0", "replace-ext": "0.0.1", - "through2": "2.0.1", - "vinyl": "0.5.3" + "through2": "^2.0.0", + "vinyl": "^0.5.0" } }, "gulplog": { @@ -360,7 +381,7 @@ "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "dev": true, "requires": { - "glogg": "1.0.1" + "glogg": "^1.0.0" } }, "has-ansi": { @@ -369,7 +390,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-gulplog": { @@ -378,7 +399,7 @@ "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", "dev": true, "requires": { - "sparkles": "1.0.0" + "sparkles": "^1.0.0" } }, "hazelcast-remote-controller": { @@ -387,7 +408,7 @@ "integrity": "sha1-PxFIxrf6taLqm9pkA7iebf3eoZo=", "dev": true, "requires": { - "thrift": "0.9.3" + "thrift": "^0.9.3" }, "dependencies": { "thrift": { @@ -396,9 +417,9 @@ "integrity": "sha1-mQITNkA9QuCLjvrbHDegbXmYsqY=", "dev": true, "requires": { - "node-int64": "0.3.3", - "q": "1.0.1", - "ws": "0.4.32" + "node-int64": "~0.3.0", + "q": "1.0.x", + "ws": "~0.4.32" }, "dependencies": { "node-int64": { @@ -419,10 +440,10 @@ "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", "dev": true, "requires": { - "commander": "2.1.0", - "nan": "1.0.0", - "options": "0.0.6", - "tinycolor": "0.0.1" + "commander": "~2.1.0", + "nan": "~1.0.0", + "options": ">=0.0.5", + "tinycolor": "0.x" }, "dependencies": { "commander": { @@ -467,7 +488,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "inherits": { @@ -482,13 +503,19 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, "is-builtin-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-finite": { @@ -497,7 +524,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-utf8": { @@ -518,20 +545,20 @@ "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", "dev": true, "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "glob": "5.0.15", - "handlebars": "4.0.11", - "js-yaml": "3.10.0", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.3.0", - "wordwrap": "1.0.0" + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" }, "dependencies": { "abbrev": { @@ -552,11 +579,11 @@ "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", "dev": true, "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.2.0" }, "dependencies": { "estraverse": { @@ -577,12 +604,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" }, "dependencies": { "deep-is": { @@ -603,8 +630,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "prelude-ls": { @@ -619,7 +646,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } } } @@ -631,7 +658,7 @@ "dev": true, "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" }, "dependencies": { "amdefine": { @@ -657,11 +684,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "dependencies": { "inflight": { @@ -670,8 +697,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -694,7 +721,7 @@ "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" }, "dependencies": { "brace-expansion": { @@ -703,7 +730,7 @@ "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" }, "dependencies": { @@ -737,10 +764,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "optimist": { @@ -749,8 +776,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.10", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" }, "dependencies": { "minimist": { @@ -773,7 +800,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" }, "dependencies": { "amdefine": { @@ -791,9 +818,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" }, "dependencies": { "source-map": { @@ -817,9 +844,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" }, "dependencies": { @@ -837,8 +864,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" }, "dependencies": { @@ -849,8 +876,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" }, "dependencies": { "align-text": { @@ -860,9 +887,9 @@ "dev": true, "optional": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" }, "dependencies": { "kind-of": { @@ -872,7 +899,7 @@ "dev": true, "optional": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" }, "dependencies": { "is-buffer": { @@ -916,7 +943,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" }, "dependencies": { "align-text": { @@ -926,9 +953,9 @@ "dev": true, "optional": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" }, "dependencies": { "kind-of": { @@ -938,7 +965,7 @@ "dev": true, "optional": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" }, "dependencies": { "is-buffer": { @@ -1003,8 +1030,8 @@ "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=", "dev": true, "requires": { - "argparse": "1.0.9", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" }, "dependencies": { "argparse": { @@ -1013,7 +1040,7 @@ "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" }, "dependencies": { "sprintf-js": { @@ -1055,7 +1082,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.0.9" + "abbrev": "1" } }, "once": { @@ -1064,7 +1091,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -1087,7 +1114,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" }, "dependencies": { "has-flag": { @@ -1104,7 +1131,7 @@ "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" }, "dependencies": { "isexe": { @@ -1135,11 +1162,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "lodash._basecopy": { @@ -1202,7 +1229,7 @@ "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "dev": true, "requires": { - "lodash._root": "3.0.1" + "lodash._root": "^3.0.0" } }, "lodash.isarguments": { @@ -1223,9 +1250,9 @@ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" } }, "lodash.restparam": { @@ -1240,15 +1267,15 @@ "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "dev": true, "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" + "lodash._basecopy": "^3.0.0", + "lodash._basetostring": "^3.0.0", + "lodash._basevalues": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.restparam": "^3.0.0", + "lodash.templatesettings": "^3.0.0" } }, "lodash.templatesettings": { @@ -1257,8 +1284,8 @@ "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0" } }, "long": { @@ -1272,8 +1299,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "map-obj": { @@ -1282,22 +1309,33 @@ "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true }, + "md5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", + "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", + "dev": true, + "requires": { + "charenc": "~0.0.1", + "crypt": "~0.0.1", + "is-buffer": "~1.1.1" + } + }, "meow": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" }, "dependencies": { "object-assign": { @@ -1314,7 +1352,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -1323,6 +1361,23 @@ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } + } + }, "mocha": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", @@ -1355,7 +1410,7 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" }, "dependencies": { "graceful-readlink": { @@ -1401,12 +1456,12 @@ "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "dependencies": { "fs.realpath": { @@ -1421,8 +1476,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -1445,7 +1500,7 @@ "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" }, "dependencies": { "brace-expansion": { @@ -1454,7 +1509,7 @@ "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" }, "dependencies": { @@ -1480,7 +1535,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -1523,9 +1578,9 @@ "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", "dev": true, "requires": { - "lodash._baseassign": "3.2.0", - "lodash._basecreate": "3.0.3", - "lodash._isiterateecall": "3.0.9" + "lodash._baseassign": "^3.0.0", + "lodash._basecreate": "^3.0.0", + "lodash._isiterateecall": "^3.0.0" }, "dependencies": { "lodash._baseassign": { @@ -1534,8 +1589,8 @@ "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", "dev": true, "requires": { - "lodash._basecopy": "3.0.1", - "lodash.keys": "3.1.2" + "lodash._basecopy": "^3.0.0", + "lodash.keys": "^3.0.0" }, "dependencies": { "lodash._basecopy": { @@ -1550,9 +1605,9 @@ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" }, "dependencies": { "lodash._getnative": { @@ -1614,7 +1669,7 @@ "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" }, "dependencies": { "has-flag": { @@ -1627,13 +1682,43 @@ } } }, + "mocha-junit-reporter": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.18.0.tgz", + "integrity": "sha512-y3XuqKa2+HRYtg0wYyhW/XsLm2Ps+pqf9HaTAt7+MVUAKFJaNAHOrNseTZo9KCxjfIbxUWwckP5qCDDPUmjSWA==", + "dev": true, + "requires": { + "debug": "^2.2.0", + "md5": "^2.1.0", + "mkdirp": "~0.5.1", + "strip-ansi": "^4.0.0", + "xml": "^1.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "mousse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/mousse/-/mousse-0.3.1.tgz", "integrity": "sha1-0Hq3MFiaBWSsJpa2wvVLZXgY+7Q=", "dev": true, "requires": { - "collections": "1.2.4", + "collections": "~1.2.1", "q": "1.0.0" }, "dependencies": { @@ -1643,7 +1728,7 @@ "integrity": "sha1-Pi8WRe1D188f4khAYAH6q0Ln5GM=", "dev": true, "requires": { - "weak-map": "1.0.5" + "weak-map": "~1.0.x" }, "dependencies": { "weak-map": { @@ -1662,6 +1747,12 @@ } } }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "multipipe": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", @@ -1677,10 +1768,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.1" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "number-is-nan": { @@ -1701,7 +1792,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "path-exists": { @@ -1710,7 +1801,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-type": { @@ -1719,9 +1810,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -1742,7 +1833,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "process-nextick-args": { @@ -1757,9 +1848,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -1768,8 +1859,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "readable-stream": { @@ -1778,10 +1869,10 @@ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "redent": { @@ -1790,8 +1881,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "remap-istanbul": { @@ -1800,11 +1891,11 @@ "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==", "dev": true, "requires": { - "amdefine": "1.0.1", + "amdefine": "^1.0.0", "gulp-util": "3.0.7", "istanbul": "0.4.5", - "minimatch": "3.0.4", - "source-map": "0.6.1", + "minimatch": "^3.0.3", + "source-map": "^0.6.1", "through2": "2.0.1" } }, @@ -1814,7 +1905,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "replace-ext": { @@ -1829,7 +1920,7 @@ "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" }, "dependencies": { "glob": { @@ -1838,12 +1929,12 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "dependencies": { "fs.realpath": { @@ -1858,8 +1949,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -1882,7 +1973,7 @@ "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" }, "dependencies": { "brace-expansion": { @@ -1891,7 +1982,7 @@ "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" }, "dependencies": { @@ -1917,7 +2008,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -1938,6 +2029,11 @@ } } }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, "semver": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", @@ -1956,16 +2052,16 @@ "integrity": "sha1-pUpfAjeqHdIhXl6ByJtCtQxP22s=", "dev": true, "requires": { - "diff": "3.4.0", + "diff": "^3.1.0", "formatio": "1.2.0", - "lodash.get": "4.4.2", - "lolex": "2.3.1", - "native-promise-only": "0.8.1", - "nise": "1.2.0", - "path-to-regexp": "1.7.0", - "samsam": "1.3.0", + "lodash.get": "^4.4.2", + "lolex": "^2.1.2", + "native-promise-only": "^0.8.1", + "nise": "^1.1.0", + "path-to-regexp": "^1.7.0", + "samsam": "^1.1.3", "text-encoding": "0.6.4", - "type-detect": "4.0.7" + "type-detect": "^4.0.0" }, "dependencies": { "diff": { @@ -1980,7 +2076,7 @@ "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", "dev": true, "requires": { - "samsam": "1.3.0" + "samsam": "1.x" } }, "lodash.get": { @@ -2007,11 +2103,11 @@ "integrity": "sha1-B51srbvLErow448cmZ82rU1rqlM=", "dev": true, "requires": { - "formatio": "1.2.0", - "just-extend": "1.1.27", - "lolex": "1.6.0", - "path-to-regexp": "1.7.0", - "text-encoding": "0.6.4" + "formatio": "^1.2.0", + "just-extend": "^1.1.26", + "lolex": "^1.6.0", + "path-to-regexp": "^1.7.0", + "text-encoding": "^0.6.4" }, "dependencies": { "just-extend": { @@ -2083,7 +2179,7 @@ "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-license-ids": "^1.0.2" } }, "spdx-expression-parse": { @@ -2110,7 +2206,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -2119,7 +2215,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-indent": { @@ -2128,7 +2224,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "supports-color": { @@ -2143,8 +2239,8 @@ "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=", "dev": true, "requires": { - "readable-stream": "2.0.6", - "xtend": "4.0.1" + "readable-stream": "~2.0.0", + "xtend": "~4.0.0" }, "dependencies": { "isarray": { @@ -2159,12 +2255,12 @@ "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "string_decoder": "~0.10.x", + "util-deprecate": "~1.0.1" } } } @@ -2187,16 +2283,16 @@ "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=", "dev": true, "requires": { - "babel-code-frame": "6.26.0", - "colors": "1.1.2", - "commander": "2.13.0", - "diff": "3.4.0", - "glob": "7.1.2", - "minimatch": "3.0.4", - "resolve": "1.5.0", - "semver": "5.5.0", - "tslib": "1.9.0", - "tsutils": "2.19.1" + "babel-code-frame": "^6.22.0", + "colors": "^1.1.2", + "commander": "^2.9.0", + "diff": "^3.2.0", + "glob": "^7.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.7.1", + "tsutils": "^2.8.1" }, "dependencies": { "babel-code-frame": { @@ -2205,9 +2301,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { "chalk": { @@ -2216,11 +2312,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -2241,7 +2337,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -2258,7 +2354,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" }, "dependencies": { "ansi-regex": { @@ -2315,12 +2411,12 @@ "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" }, "dependencies": { "fs.realpath": { @@ -2335,8 +2431,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -2359,7 +2455,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" }, "dependencies": { "wrappy": { @@ -2384,7 +2480,7 @@ "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" }, "dependencies": { "brace-expansion": { @@ -2393,7 +2489,7 @@ "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" }, "dependencies": { @@ -2419,7 +2515,7 @@ "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" }, "dependencies": { "path-parse": { @@ -2448,7 +2544,7 @@ "integrity": "sha1-dtfr3qnXp79KBfUOrTcBsBaHCNc=", "dev": true, "requires": { - "tslib": "1.9.0" + "tslib": "^1.8.1" } } } @@ -2471,8 +2567,8 @@ "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "~1.0.0", + "spdx-expression-parse": "~1.0.0" } }, "vinyl": { @@ -2481,8 +2577,8 @@ "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", "dev": true, "requires": { - "clone": "1.0.3", - "clone-stats": "0.0.1", + "clone": "^1.0.0", + "clone-stats": "^0.0.1", "replace-ext": "0.0.1" } }, @@ -2492,12 +2588,12 @@ "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=", "dev": true, "requires": { - "async": "1.0.0", - "colors": "1.0.3", - "cycle": "1.0.3", - "eyes": "0.1.8", - "isstream": "0.1.2", - "stack-trace": "0.0.10" + "async": "~1.0.0", + "colors": "1.0.x", + "cycle": "1.0.x", + "eyes": "0.1.x", + "isstream": "0.1.x", + "stack-trace": "0.0.x" }, "dependencies": { "async": { @@ -2538,6 +2634,12 @@ } } }, + "xml": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", + "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=", + "dev": true + }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", diff --git a/package.json b/package.json index 1a6dad026..0209a0c7c 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,12 @@ "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", "main": "lib/index.js", "dependencies": { - "bluebird": "3.5.0", - "long": "3.2.0" + "bluebird": "3.5.4", + "long": "3.2.0", + "safe-buffer": "5.1.2" }, "devDependencies": { - "@types/bluebird": "3.5.12", + "@types/bluebird": "3.5.21", "@types/long": "3.0.32", "@types/node": "6.0.87", "chai": "4.1.2", diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index b5fffa97a..98aa81f13 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -15,6 +15,7 @@ */ /* tslint:disable:no-bitwise */ +import {Buffer} from 'safe-buffer'; import Address = require('./Address'); import {Data} from './serialization/Data'; diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 41549481a..603cbbfb1 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -36,6 +36,7 @@ | ... */ +import {Buffer} from 'safe-buffer'; import * as Long from 'long'; import {BitsUtil} from './BitsUtil'; import {Data} from './serialization/Data'; @@ -53,8 +54,7 @@ class ClientMessage { public static newClientMessage(payloadSize: number): ClientMessage { const totalSize = BitsUtil.HEADER_SIZE + payloadSize; - const buffer = new Buffer(totalSize); - buffer.fill(0, 0, totalSize); + const buffer = Buffer.allocUnsafe(totalSize); const message = new ClientMessage(buffer); message.setDataOffset(BitsUtil.HEADER_SIZE); message.setVersion(BitsUtil.VERSION); @@ -224,7 +224,7 @@ class ClientMessage { readBuffer(): Buffer { const size = this.buffer.readUInt32LE(this.cursor); this.cursor += BitsUtil.INT_SIZE_IN_BYTES; - const result = new Buffer(size); + const result = Buffer.allocUnsafe(size); this.buffer.copy(result, 0, this.cursor, this.cursor + size); this.cursor += size; return result; diff --git a/src/config/Config.ts b/src/config/Config.ts index c6fcf1fec..344149b9e 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -32,6 +32,7 @@ import {Statistics} from '../statistics/Statistics'; import {LogLevel} from '..'; import {ILogger} from '../logging/ILogger'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; +import {StringSerializationPolicy} from './StringSerializationPolicy'; /** * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. @@ -145,3 +146,5 @@ export {FlakeIdGeneratorConfig}; export {SSLConfig}; export {JsonStringDeserializationPolicy}; + +export {StringSerializationPolicy}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 2974a29ba..1ad5c15e3 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -29,6 +29,7 @@ import {NearCacheConfig} from './NearCacheConfig'; import {Properties} from './Properties'; import {ReliableTopicConfig} from './ReliableTopicConfig'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; +import {StringSerializationPolicy} from './StringSerializationPolicy'; export class ConfigBuilder { private clientConfig: ClientConfig = new ClientConfig(); @@ -217,6 +218,9 @@ export class ConfigBuilder { } else if (key === 'jsonStringDeserializationPolicy') { this.clientConfig.serializationConfig .jsonStringDeserializationPolicy = tryGetEnum(JsonStringDeserializationPolicy, jsonObject[key]); + } else if (key === 'stringSerializationPolicy') { + this.clientConfig.serializationConfig + .stringSerializationPolicy = tryGetEnum(StringSerializationPolicy, jsonObject[key]); } } } diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index be2f1ef60..444201118 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -17,6 +17,7 @@ import {IdentifiedDataSerializableFactory, PortableFactory} from '../serialization/Serializable'; import {ImportConfig} from './ImportConfig'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; +import {StringSerializationPolicy} from './StringSerializationPolicy'; export class SerializationConfig { defaultNumberType: string = 'double'; @@ -31,4 +32,5 @@ export class SerializationConfig { globalSerializer: any = null; globalSerializerConfig: ImportConfig = null; jsonStringDeserializationPolicy: JsonStringDeserializationPolicy = JsonStringDeserializationPolicy.EAGER; + stringSerializationPolicy: StringSerializationPolicy = StringSerializationPolicy.STANDARD; } diff --git a/src/config/StringSerializationPolicy.ts b/src/config/StringSerializationPolicy.ts new file mode 100644 index 000000000..43004ca2c --- /dev/null +++ b/src/config/StringSerializationPolicy.ts @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * Using this policy, one can control the + * serialization type of strings. + */ +export enum StringSerializationPolicy { + /** + * Strings are serialized and deserialized + * according to UTF-8 standard (RFC 3629). + * + * May lead to server-side compatibility + * issues with IMDG 3.x for 4 byte characters, + * like less common CJK characters and emoji. + */ + STANDARD, + + /** + * 4 byte characters are represented as + * 6 bytes during serialization/deserialization + * (non-standard UTF-8). Provides full compatibility + * with IMDG 3.x members and other clients. + */ + LEGACY, +} diff --git a/src/index.ts b/src/index.ts index 602fc66b3..6624715cb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -38,6 +38,7 @@ import {EntryEvent} from './core/EntryListener'; import {LogLevel} from './logging/LoggingService'; import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializationPolicy'; import {HazelcastJsonValue} from './core/HazelcastJsonValue'; +import {StringSerializationPolicy} from './config/StringSerializationPolicy'; export { HazelcastClient as Client, @@ -67,4 +68,5 @@ export { LogLevel, JsonStringDeserializationPolicy, HazelcastJsonValue, + StringSerializationPolicy, }; diff --git a/src/invocation/ClientConnection.ts b/src/invocation/ClientConnection.ts index 3df38c35a..5828a4681 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/invocation/ClientConnection.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {Buffer} from 'safe-buffer'; import * as Promise from 'bluebird'; import * as net from 'net'; import {BitsUtil} from '../BitsUtil'; @@ -43,7 +44,7 @@ export class ClientConnection { this.socket = socket; this.address = address; this.localAddress = new Address(socket.localAddress, socket.localPort); - this.readBuffer = new Buffer(0); + this.readBuffer = Buffer.alloc(0); this.lastReadTimeMillis = 0; this.closedTime = 0; this.connectedServerVersionString = null; @@ -73,7 +74,7 @@ export class ClientConnection { write(buffer: Buffer): Promise { const deferred = DeferredPromise(); try { - this.socket.write(buffer, (err: any) => { + this.socket.write(buffer as any, (err: any) => { if (err) { deferred.reject(new IOError(err)); } else { @@ -153,7 +154,7 @@ export class ClientConnection { if (frameSize > this.readBuffer.length) { return; } - const message: Buffer = new Buffer(frameSize); + const message = Buffer.allocUnsafe(frameSize); this.readBuffer.copy(message, 0, 0, frameSize); this.readBuffer = this.readBuffer.slice(frameSize); callback(message); diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts index ddaf313b1..ea28b62c5 100644 --- a/src/invocation/ClientConnectionManager.ts +++ b/src/invocation/ClientConnectionManager.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {Buffer} from 'safe-buffer'; import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import HazelcastClient from '../HazelcastClient'; @@ -215,8 +216,7 @@ export class ClientConnectionManager extends EventEmitter { private initiateCommunication(connection: ClientConnection): Promise { // Send the protocol version - const buffer = new Buffer(3); - buffer.write('CB2'); + const buffer = Buffer.from('CB2'); return connection.write(buffer); } diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index ee30367d8..1ef85ac37 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {Buffer} from 'safe-buffer'; import * as assert from 'assert'; import * as Promise from 'bluebird'; import * as Long from 'long'; diff --git a/src/serialization/Data.ts b/src/serialization/Data.ts index 11d9dca2a..755cfd17e 100644 --- a/src/serialization/Data.ts +++ b/src/serialization/Data.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {Buffer} from 'safe-buffer'; import * as Long from 'long'; export interface Data { diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index 09cb8a8f9..77bb2b2ba 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {Buffer} from 'safe-buffer'; import murmur = require('../invocation/Murmur'); import {Data} from './Data'; diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 1e44bfecd..3bfaa83ec 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -15,6 +15,7 @@ */ /* tslint:disable:no-bitwise */ +import {Buffer} from 'safe-buffer'; import * as assert from 'assert'; import * as Long from 'long'; import {BitsUtil} from '../BitsUtil'; @@ -22,6 +23,7 @@ import {Data, DataInput, DataOutput, PositionalDataOutput} from './Data'; import {HeapData} from './HeapData'; import {SerializationService} from './SerializationService'; +const OUTPUT_BUFFER_INITIAL_SIZE = 1024; const MASK_1BYTE = (1 << 8) - 1; const MASK_2BYTE = (1 << 16) - 1; const MASK_4BYTE = (1 << 32) - 1; @@ -29,18 +31,20 @@ const MASK_4BYTE = (1 << 32) - 1; export class ObjectDataOutput implements DataOutput { protected buffer: Buffer; protected bigEndian: boolean; + private standardUTF: boolean; private service: SerializationService; private pos: number; - constructor(length: number, service: SerializationService, isBigEndian: boolean) { - this.buffer = new Buffer(length); + constructor(service: SerializationService, isBigEndian: boolean, isStandardUTF: boolean) { + this.buffer = Buffer.allocUnsafe(OUTPUT_BUFFER_INITIAL_SIZE); this.service = service; this.bigEndian = isBigEndian; + this.standardUTF = isStandardUTF; this.pos = 0; } clear(): void { - this.buffer = new Buffer(this.buffer.length); + this.buffer = Buffer.allocUnsafe(this.buffer.length); this.pos = 0; } @@ -57,13 +61,7 @@ export class ObjectDataOutput implements DataOutput { } toBuffer(): Buffer { - if (this.buffer == null || this.pos === 0) { - return new Buffer(0); - } else { - const snapBuffer = new Buffer(this.pos); - this.buffer.copy(snapBuffer, 0, 0, this.pos); - return snapBuffer; - } + return this.buffer.slice(0, this.pos); } write(byte: number | Buffer): void { @@ -124,7 +122,7 @@ export class ObjectDataOutput implements DataOutput { const len = (buf != null) ? buf.length : BitsUtil.NULL_ARRAY_LENGTH; this.writeInt(len); for (let i = 0; i < len; i++) { - this.write(buf[i]); + this.write((buf as any)[i]); } } @@ -198,21 +196,10 @@ export class ObjectDataOutput implements DataOutput { } writeUTF(val: string): void { - const len = (val != null) ? val.length : BitsUtil.NULL_ARRAY_LENGTH; - this.writeInt(len); - this.ensureAvailable(len * 3); - for (let i = 0; i < len; i++) { - const ch = val.charCodeAt(i); - if (ch <= 0x007F) { - this.writeByte(ch); - } else if (ch <= 0x07FF) { - this.write(0xC0 | ch >> 6 & 0x1F); - this.write(0x80 | ch & 0x3F); - } else { - this.write(0xE0 | ch >> 12 & 0x0F); - this.write(0x80 | ch >> 6 & 0x3F); - this.write(0x80 | ch & 0x3F); - } + if (this.standardUTF) { + this.writeUTFStandard(val); + } else { + this.writeUTFLegacy(val); } } @@ -232,7 +219,7 @@ export class ObjectDataOutput implements DataOutput { private ensureAvailable(size: number): void { if (this.available() < size) { - const newBuffer = new Buffer(this.pos + size); + const newBuffer = Buffer.allocUnsafe(this.pos + size); this.buffer.copy(newBuffer, 0, 0, this.pos); this.buffer = newBuffer; } @@ -246,6 +233,38 @@ export class ObjectDataOutput implements DataOutput { arr.forEach(boundFunc); } } + + private writeUTFStandard(val: string): void { + const len = (val != null) ? val.length : BitsUtil.NULL_ARRAY_LENGTH; + this.writeInt(len); + if (len === BitsUtil.NULL_ARRAY_LENGTH) { + return; + } + + const byteLen = Buffer.byteLength(val, 'utf8'); + this.ensureAvailable(byteLen); + this.buffer.write(val, this.pos, this.pos + byteLen, 'utf8'); + this.pos += byteLen; + } + + private writeUTFLegacy(val: string): void { + const len = (val != null) ? val.length : BitsUtil.NULL_ARRAY_LENGTH; + this.writeInt(len); + this.ensureAvailable(len * 3); + for (let i = 0; i < len; i++) { + const ch = val.charCodeAt(i); + if (ch <= 0x007F) { + this.writeByte(ch); + } else if (ch <= 0x07FF) { + this.write(0xC0 | ch >> 6 & 0x1F); + this.write(0x80 | ch & 0x3F); + } else { + this.write(0xE0 | ch >> 12 & 0x0F); + this.write(0x80 | ch >> 6 & 0x3F); + this.write(0x80 | ch & 0x3F); + } + } + } } export class PositionalObjectDataOutput extends ObjectDataOutput implements PositionalDataOutput { @@ -253,7 +272,7 @@ export class PositionalObjectDataOutput extends ObjectDataOutput implements Posi if (Buffer.isBuffer(byte)) { byte.copy(this.buffer, position); } else { - this.buffer[position] = byte; + (this.buffer as any)[position] = byte; } } @@ -306,13 +325,16 @@ export class ObjectDataInput implements DataInput { private offset: number; private service: SerializationService; private bigEndian: boolean; + private standardUTF: boolean; private pos: number; - constructor(buffer: Buffer, offset: number, serializationService: SerializationService, isBigEndian: boolean) { + constructor(buffer: Buffer, offset: number, serializationService: SerializationService, + isBigEndian: boolean, isStandardUTF: boolean) { this.buffer = buffer; this.offset = offset; this.service = serializationService; this.bigEndian = isBigEndian; + this.standardUTF = isStandardUTF; this.pos = this.offset; } @@ -370,8 +392,8 @@ export class ObjectDataInput implements DataInput { } readData(): Data { - const bytes: number[] = this.readByteArray(); - const data: Data = bytes === null ? null : new HeapData(new Buffer(bytes)); + const bytes = this.readByteArray(); + const data: Data = bytes === null ? null : new HeapData(Buffer.from(bytes)); return data; } @@ -476,6 +498,57 @@ export class ObjectDataInput implements DataInput { } readUTF(pos?: number): string { + if (this.standardUTF) { + return this.readUTFStandard(pos); + } else { + return this.readUTFLegacy(pos); + } + } + + readUTFArray(pos?: number): string[] { + return this.readArray(this.readUTF, pos); + } + + reset(): void { + this.pos = 0; + } + + skipBytes(count: number): void { + this.pos += count; + } + + readCopy(other: Buffer, numBytes: number): void { + this.assertAvailable(numBytes, this.pos); + this.buffer.copy(other, 0, this.pos, this.pos + numBytes); + this.pos += numBytes; + } + + available(): number { + return this.buffer.length - this.pos; + } + + private readArray(func: Function, pos?: number): T[] { + const backupPos = this.pos; + if (pos !== undefined) { + this.pos = pos; + } + const len = this.readInt(); + const arr: T[] = []; + for (let i = 0; i < len; i++) { + arr.push(func.call(this)); + } + if (pos !== undefined) { + this.pos = backupPos; + } + return arr; + } + + private assertAvailable(numOfBytes: number, pos: number = this.pos): void { + assert(pos >= 0); + assert(pos + numOfBytes <= this.buffer.length); + } + + private readUTFLegacy(pos?: number): string { const len = this.readInt(pos); let readingIndex = this.addOrUndefined(pos, 4); if (len === BitsUtil.NULL_ARRAY_LENGTH) { @@ -524,47 +597,28 @@ export class ObjectDataInput implements DataInput { return result; } - readUTFArray(pos?: number): string[] { - return this.readArray(this.readUTF, pos); - } - - reset(): void { - this.pos = 0; - } - - skipBytes(count: number): void { - this.pos += count; - } + private readUTFStandard(pos?: number): string { + const len = this.readInt(pos); + const readPos = this.addOrUndefined(pos, 4) || this.pos; + if (len === BitsUtil.NULL_ARRAY_LENGTH) { + return null; + } - readCopy(other: Buffer, numBytes: number): void { - this.assertAvailable(numBytes, this.pos); - this.buffer.copy(other, 0, this.pos, this.pos + numBytes); - this.pos += numBytes; - } + // max char size in UTF-8 is 4 bytes, see RFC3629 + // TODO: change to `maxByteLen = len;` in future when string serialization in client protocol changes + const maxByteLen = len * 4; + const available = this.available(); + const readByteLen = maxByteLen > available ? available : maxByteLen; - available(): number { - return this.buffer.length - this.pos; - } + const readStr = this.buffer.toString('utf8', readPos, readPos + readByteLen); + const result = readStr.substring(0, len); - private readArray(func: Function, pos?: number): T[] { - const backupPos = this.pos; - if (pos !== undefined) { - this.pos = pos; - } - const len = this.readInt(); - const arr: T[] = []; - for (let i = 0; i < len; i++) { - arr.push(func.call(this)); - } - if (pos !== undefined) { - this.pos = backupPos; + if (pos === undefined) { + const realByteLen = Buffer.byteLength(result, 'utf8'); + this.pos += realByteLen; } - return arr; - } - private assertAvailable(numOfBytes: number, pos: number = this.pos): void { - assert(pos >= 0); - assert(pos + numOfBytes <= this.buffer.length); + return result; } private addOrUndefined(base: number, adder: number): number { diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 34ff0aeb9..a1b21a4e4 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import {Buffer} from 'safe-buffer'; import {AggregatorFactory} from '../aggregation/AggregatorFactory'; import {ClusterDataFactory} from '../ClusterDataFactory'; import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; @@ -55,6 +56,7 @@ import {PREDICATE_FACTORY_ID, PredicateFactory} from './PredicateFactory'; import {IdentifiedDataSerializableFactory} from './Serializable'; import HazelcastClient from '../HazelcastClient'; import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; +import {StringSerializationPolicy} from '../config/StringSerializationPolicy'; export interface SerializationService { toData(object: any, paritioningStrategy?: any): Data; @@ -80,11 +82,13 @@ export class SerializationServiceV1 implements SerializationService { private serializerNameToId: { [name: string]: number }; private numberType: string; private serializationConfig: SerializationConfig; + private isStandardUTF: boolean; private client: HazelcastClient; constructor(client: HazelcastClient, serializationConfig: SerializationConfig) { this.client = client; this.serializationConfig = serializationConfig; + this.isStandardUTF = this.serializationConfig.stringSerializationPolicy === StringSerializationPolicy.STANDARD; this.registry = {}; this.serializerNameToId = {}; this.registerDefaultSerializers(); @@ -104,7 +108,8 @@ export class SerializationServiceV1 implements SerializationService { if (this.isData(object)) { return object as Data; } - const dataOutput: DataOutput = new PositionalObjectDataOutput(1, this, this.serializationConfig.isBigEndian); + const dataOutput: DataOutput = + new PositionalObjectDataOutput(this, this.serializationConfig.isBigEndian, this.isStandardUTF); const serializer = this.findSerializerFor(object); // Check if object is partition aware if (object != null && object.getPartitionKey) { @@ -127,7 +132,8 @@ export class SerializationServiceV1 implements SerializationService { return data; } const serializer = this.findSerializerById(data.getType()); - const dataInput = new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serializationConfig.isBigEndian); + const dataInput = + new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serializationConfig.isBigEndian, this.isStandardUTF); return serializer.read(dataInput); } diff --git a/test/declarative_config/ConfigBuilderTest.js b/test/declarative_config/ConfigBuilderTest.js index 7d3216d6f..d18936c11 100644 --- a/test/declarative_config/ConfigBuilderTest.js +++ b/test/declarative_config/ConfigBuilderTest.js @@ -94,6 +94,8 @@ describe('ConfigBuilder Test', function () { expect(serializationCfg.portableVersion).to.equal(1); expect(serializationCfg.jsonStringDeserializationPolicy) .to.equal(Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION); + expect(serializationCfg.stringSerializationPolicy) + .to.equal(Config.StringSerializationPolicy.LEGACY); expect(serializationCfg.dataSerializableFactoryConfigs[0].path).to.equal('path/to/file'); expect(serializationCfg.dataSerializableFactoryConfigs[0].exportedName).to.equal('exportedName'); diff --git a/test/declarative_config/configurations/full.json b/test/declarative_config/configurations/full.json index 594b8c7cb..cb6430db6 100644 --- a/test/declarative_config/configurations/full.json +++ b/test/declarative_config/configurations/full.json @@ -82,7 +82,8 @@ "typeId": 3 } ], - "jsonStringDeserializationPolicy": "no_deserialization" + "jsonStringDeserializationPolicy": "no_deserialization", + "stringSerializationPolicy": "legacy" }, "nearCaches": [ { diff --git a/test/serialization/APortable.js b/test/serialization/APortable.js index 1954d2755..d3081e170 100644 --- a/test/serialization/APortable.js +++ b/test/serialization/APortable.js @@ -14,6 +14,8 @@ * limitations under the License. */ +var Buffer = require('safe-buffer').Buffer; + function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, doubles, shorts, floats, ints, longs, strings, portables, identifiedDataSerializable, customStreamSerializableObject, customByteArraySerializableObject, data) { if (arguments.length === 0) return; @@ -43,7 +45,7 @@ function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, do this.bytesFully = bytes; this.bytesOffset = bytes.slice(1, 3); this.strChars = str.split(''); - this.strBytes = new Buffer(this.str.length); + this.strBytes = Buffer.alloc(this.str.length); for (var i = 0; i < str.length; i++) { this.strBytes[i] = this.strChars[i].charCodeAt(0); } @@ -132,16 +134,16 @@ APortable.prototype.readPortable = function (reader) { this.stringsNull = dataInput.readUTFArray(); this.byteSize = dataInput.readByte(); - this.bytesFully = new Buffer(this.byteSize); + this.bytesFully = Buffer.alloc(this.byteSize); dataInput.readCopy(this.bytesFully, this.byteSize); - this.bytesOffset = new Buffer(2); + this.bytesOffset = Buffer.alloc(2); dataInput.readCopy(this.bytesOffset, 2); var strSize = dataInput.readInt(); - this.strChars = new Buffer(strSize); + this.strChars = Buffer.alloc(strSize); for (var j = 0; j < strSize; j++) { this.strChars[j] = dataInput.readChar(); } - this.strBytes = new Buffer(strSize); + this.strBytes = Buffer.alloc(strSize); dataInput.readCopy(this.strBytes, strSize); this.unsignedByte = dataInput.readUnsignedByte(); this.unsignedShort = dataInput.readUnsignedShort(); diff --git a/test/serialization/AnIdentifiedDataSerializable.js b/test/serialization/AnIdentifiedDataSerializable.js index 7a0c2dbe6..5e7c802aa 100644 --- a/test/serialization/AnIdentifiedDataSerializable.js +++ b/test/serialization/AnIdentifiedDataSerializable.js @@ -14,6 +14,8 @@ * limitations under the License. */ +var Buffer = require('safe-buffer').Buffer; + function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, doubles, shorts, floats, ints , longs, strings, portable, identifiedDataSerializable, customStreamSerializable, customByteArraySerializableObject, data) { if (arguments.length === 0) return; @@ -41,7 +43,7 @@ function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, this.bytesFully = bytes; this.bytesOffset = bytes.slice(1, 3); this.strChars = str.split(''); - this.strBytes = new Buffer(this.str.length); + this.strBytes = Buffer.alloc(this.str.length); for (var i = 0; i < str.length; i++) { this.strBytes[i] = this.strChars[i].charCodeAt(0); } @@ -94,16 +96,16 @@ AnIdentifiedDataSerializable.prototype.readData = function (dataInput) { this.stringsNull = dataInput.readUTFArray(); this.byteSize = dataInput.readByte(); - this.bytesFully = new Buffer(this.byteSize); + this.bytesFully = Buffer.alloc(this.byteSize); dataInput.readCopy(this.bytesFully, this.byteSize); - this.bytesOffset = Buffer(2); + this.bytesOffset = Buffer.alloc(2); dataInput.readCopy(this.bytesOffset, 2); this.strSize = dataInput.readInt(); this.strChars = []; for (var j = 0; j < this.strSize; j++) { this.strChars[j] = dataInput.readChar(); } - this.strBytes = new Buffer(this.strSize); + this.strBytes = Buffer.alloc(this.strSize); dataInput.readCopy(this.strBytes, this.strSize); this.unsignedByte = dataInput.readUnsignedByte(); this.unsignedShort = dataInput.readUnsignedShort(); diff --git a/test/serialization/BinaryCompatibilityTest.js b/test/serialization/BinaryCompatibilityTest.js index 19ccd7cc7..13218feb9 100644 --- a/test/serialization/BinaryCompatibilityTest.js +++ b/test/serialization/BinaryCompatibilityTest.js @@ -14,10 +14,10 @@ * limitations under the License. */ +var Buffer = require('safe-buffer').Buffer; var fs = require('fs'); var ObjectDataInput = require('../../lib/serialization/ObjectData').ObjectDataInput; var HeapData = require('../../lib/serialization/HeapData').HeapData; -var expect = require('chai').expect; var Config = require('../../.').Config; var ReferenceObjects = require('./ReferenceObjects'); var SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; @@ -27,12 +27,15 @@ var APortable = require('./APortable'); var CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; var CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; var expectAlmostEqual = require('../Util').expectAlmostEqual; +var StringSerializationPolicy = require('../../.').StringSerializationPolicy; + describe('Binary serialization compatibility test', function () { var NULL_LENGTH = -1; var versions = [1]; var objects = ReferenceObjects.testObjects; - var isBigEndian = [true, false]; + var isBigEndianValues = [true, false]; + var isStandardUTFValues = [true, false]; var dataMap = {}; @@ -62,11 +65,10 @@ describe('Binary serialization compatibility test', function () { } function createObjectKey(varName, version, isBigEndian) { - return version + '-' + stripArticle(varName) + '-' + convertEndiannesToByteOrder(isBigEndian); } - function createSerializationService(isBigEndian, defaultNumberType) { + function createSerializationService(isBigEndian, isStandardUTF, defaultNumberType) { var cfg = new Config.ClientConfig().serializationConfig; cfg.portableFactories[ReferenceObjects.PORTABLE_FACTORY_ID] = { create: function (classId) { @@ -95,7 +97,7 @@ describe('Binary serialization compatibility test', function () { }, read: function (inp) { var len = inp.readInt(); - var buf = new Buffer(len); + var buf = Buffer.alloc(len); inp.readCopy(buf, len); return new CustomByteArraySerializable(buf.readInt32BE(0), buf.readFloatBE(4)); } @@ -113,21 +115,24 @@ describe('Binary serialization compatibility test', function () { } }); cfg.isBigEndian = isBigEndian; + cfg.stringSerializationPolicy = isStandardUTF + ? StringSerializationPolicy.STANDARD + : StringSerializationPolicy.LEGACY; cfg.defaultNumberType = defaultNumberType; return new SerializationService(undefined, cfg) } before(function () { versions.forEach(function (version) { - var input = new ObjectDataInput(fs.readFileSync(__dirname + '/' + createFileName(version)), 0, null, true); + var input = new ObjectDataInput(fs.readFileSync(__dirname + '/' + createFileName(version)), 0, null, true, true); while (input.available() > 0) { var utflen = input.readUnsignedShort(); - var namebuf = new Buffer(utflen); + var namebuf = Buffer.alloc(utflen); input.readCopy(namebuf, utflen); var objectKey = namebuf.toString(); var len = input.readInt(); - if (len != NULL_LENGTH) { - var otherBuffer = new Buffer(len); + if (len !== NULL_LENGTH) { + var otherBuffer = Buffer.alloc(len); input.readCopy(otherBuffer, len); dataMap[objectKey] = new HeapData(otherBuffer); } @@ -143,26 +148,27 @@ describe('Binary serialization compatibility test', function () { var object = objects[varName]; if (objects.hasOwnProperty(varName)) { versions.forEach(function (version) { - isBigEndian.forEach(function (isBigEndian) { - it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version, function () { - this.timeout(10000); - var key = createObjectKey(varName, version, isBigEndian); - var service = createSerializationService(isBigEndian, 'integer'); - var deserialized = service.toObject(dataMap[key]); - expectAlmostEqual(deserialized, object); - }); - if (!ReferenceObjects.skipOnSerialize[varName]) { - it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version + ' serialize deserialize', function () { + isBigEndianValues.forEach(function (isBigEndian) { + isStandardUTFValues.forEach(function (isStandardUTF) { + it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + isStandardUTF + '-' + version, function () { this.timeout(10000); var key = createObjectKey(varName, version, isBigEndian); - var service = createSerializationService(isBigEndian, stripArticle(varName).toLowerCase()); - var data = service.toData(object); - var deserialized = service.toObject(data); + var service = createSerializationService(isBigEndian, isStandardUTF, 'integer'); + var deserialized = service.toObject(dataMap[key]); expectAlmostEqual(deserialized, object); }); - } - }) - }) + if (!ReferenceObjects.skipOnSerialize[varName]) { + it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + isStandardUTF + '-' + version + ' serialize deserialize', function () { + this.timeout(10000); + var service = createSerializationService(isBigEndian, isStandardUTF, stripArticle(varName).toLowerCase()); + var data = service.toData(object); + var deserialized = service.toObject(data); + expectAlmostEqual(deserialized, object); + }); + } + }); + }); + }); } })(); } diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index fe16aaa9d..2108157f0 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -15,102 +15,150 @@ */ var Client = require('../../.').Client; +var Config = require('../../.').Config; var RC = require('../RC'); var expect = require('chai').expect; -describe('Default serializers with live instance', function () { - var cluster; - var member; - var client; - var map; - - before(function () { - return RC.createCluster(null, null).then(function (res) { - cluster = res; - }).then(function () { - return RC.startMember(cluster.id); - }).then(function (m) { - member = m; - return Client.newHazelcastClient(); - }).then(function (cl) { - client = cl; - return client.getMap('test').then(function (mp) { - map = mp; +var StringSerializationPolicy = require('../../.').StringSerializationPolicy; + +var stringSerializationPolicies = [StringSerializationPolicy.STANDARD, StringSerializationPolicy.LEGACY]; + +stringSerializationPolicies.forEach(function(stringSerializationPolicy) { + var label = ' - ' + stringSerializationPolicy + 'string serialization'; + + describe('Default serializers with live instance' + label, function () { + var cluster; + var client; + var map; + + before(function () { + return RC.createCluster(null, null).then(function (res) { + cluster = res; + }).then(function () { + return RC.startMember(cluster.id); + }).then(function () { + var config = new Config.ClientConfig(); + config.serializationConfig.stringSerializationPolicy = stringSerializationPolicy; + return Client.newHazelcastClient(config); + }).then(function (cl) { + client = cl; + return client.getMap('test').then(function (mp) { + map = mp; + }); }); }); - }); - after(function () { - client.shutdown(); - return RC.shutdownCluster(cluster.id); - }); + after(function () { + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); - function _generateGet(key) { - return 'var StringArray = Java.type("java.lang.String[]");' + - 'function foo() {' + - ' var map = instance_0.getMap("' + map.getName() + '");' + - ' var res = map.get("' + key + '");' + - ' if (res.getClass().isArray()) {' + - ' return Java.from(res);' + - ' } else {' + - ' return res;' + - ' }' + - '}' + - 'result = ""+foo();' - } - - it('string', function () { - return map.put('testStringKey', 'testStringValue').then(function () { - return RC.executeOnController(cluster.id, _generateGet('testStringKey'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('testStringValue'); - }) - }); + function _generateGet(key) { + return 'var StringArray = Java.type("java.lang.String[]");' + + 'function foo() {' + + ' var map = instance_0.getMap("' + map.getName() + '");' + + ' var res = map.get("' + key + '");' + + ' if (res.getClass().isArray()) {' + + ' return Java.from(res);' + + ' } else {' + + ' return res;' + + ' }' + + '}' + + 'result = ""+foo();' + } - it('emoji string', function () { - return map.put('key', '1⚐中💦2😭‍🙆😔5').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('1⚐中💦2😭‍🙆😔5'); + it('string', function () { + return map.put('testStringKey', 'testStringValue').then(function () { + return RC.executeOnController(cluster.id, _generateGet('testStringKey'), 1); + }).then(function (response) { + return expect(response.result.toString()).to.equal('testStringValue'); + }) }); - }); - it('utf8 characters test', function () { - return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + it('utf8 sample string test', function () { + return map.put('key', 'Iñtërnâtiônàlizætiøn').then(function () { + return RC.executeOnController(cluster.id, _generateGet('key'), 1); + }).then(function (response) { + return expect(response.result.toString()).to.equal('Iñtërnâtiônàlizætiøn'); + }); }); - }); - it('utf8 characters test with surrogates', function () { - return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + it('number', function () { + return map.put('a', 23).then(function () { + return RC.executeOnController(cluster.id, _generateGet('a'), 1); + }).then(function (response) { + return expect(Number.parseInt(response.result.toString())).to.equal(23); + }) }); - }); - it('utf8 sample string test', function () { - return map.put('key', 'Iñtërnâtiônàlizætiøn').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('Iñtërnâtiônàlizætiøn'); + it('array', function () { + return map.put('a', ['a', 'v', 'vg']).then(function () { + return RC.executeOnController(cluster.id, _generateGet('a'), 1); + }).then(function (response) { + return expect(response.result.toString()).to.equal(['a', 'v', 'vg'].toString()); + }) }); - }); - it('number', function () { - return map.put('a', 23).then(function () { - return RC.executeOnController(cluster.id, _generateGet('a'), 1); - }).then(function (response) { - return expect(Number.parseInt(response.result.toString())).to.equal(23); - }) - }); + it('emoji string test on client', function () { + return map.put('key', '1⚐中💦2😭‍🙆😔5').then(function () { + return map.get('key'); + }).then(function (response) { + return expect(response).to.equal('1⚐中💦2😭‍🙆😔5'); + }); + }); + + it('utf8 characters test on client', function () { + return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}').then(function () { + return map.get('key'); + }).then(function (response) { + return expect(response).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + }); + }); + + it('utf8 characters test on client with surrogates', function () { + return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06').then(function () { + return map.get('key'); + }).then(function (response) { + return expect(response).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + }); + }); + + it('emoji string test on RC', function () { + // TODO: remove the check in future when string serialization in client protocol changes + if (stringSerializationPolicy === StringSerializationPolicy.STANDARD) { + this.skip(); + } + + return map.put('key', '1⚐中💦2😭‍🙆😔5').then(function () { + return RC.executeOnController(cluster.id, _generateGet('key'), 1); + }).then(function (response) { + return expect(response.result.toString()).to.equal('1⚐中💦2😭‍🙆😔5'); + }); + }); - it('array', function () { - return map.put('a', ['a', 'v', 'vg']).then(function () { - return RC.executeOnController(cluster.id, _generateGet('a'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal(['a', 'v', 'vg'].toString()); - }) - }) + it('utf8 characters test on RC', function () { + // TODO: remove the check in future when string serialization in client protocol changes + if (stringSerializationPolicy === StringSerializationPolicy.STANDARD) { + this.skip(); + } + + return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}').then(function () { + return RC.executeOnController(cluster.id, _generateGet('key'), 1); + }).then(function (response) { + return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + }); + }); + + it('utf8 characters test on RC with surrogates', function () { + // TODO: remove the check in future when string serialization in client protocol changes + if (stringSerializationPolicy === StringSerializationPolicy.STANDARD) { + this.skip(); + } + + return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06').then(function () { + return RC.executeOnController(cluster.id, _generateGet('key'), 1); + }).then(function (response) { + return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + }); + }); + }); }); diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index 7fba8d9e6..03f307ee3 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -19,14 +19,11 @@ var Long = require('long'); var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var Predicates = require('../../.').Predicates; -describe('Default serializers Test', function () { +var StringSerializationPolicy = require('../../.').StringSerializationPolicy; - var serializationService; +describe('Default serializers Test', function () { - function testObject(obj, serializationService) { - var serialized = serializationService.toData(obj); - expect(serializationService.toObject(serialized)).to.deep.equal(obj); - } + var isStandardUTFValues = [true, false]; var parameters = [ 14, @@ -68,12 +65,22 @@ describe('Default serializers Test', function () { Predicates.paging(Predicates.greaterEqual('this', 10), 10) ]; - parameters.forEach(function (obj) { - it('type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) + ', value: ' + JSON.stringify(obj), function () { - var serializationService = new SerializationService.SerializationServiceV1(undefined, new Config.ClientConfig().serializationConfig); - var serialized = serializationService.toData(obj); - expect(serializationService.toObject(serialized)).to.deep.equal(obj); - }) + isStandardUTFValues.forEach(function(isStandardUTF) { + parameters.forEach(function (obj) { + it( + 'type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) + + ', value: ' + JSON.stringify(obj) + ', isStandardUTF: ' + isStandardUTF, + function () { + var serializationConfig = new Config.ClientConfig().serializationConfig; + serializationConfig.stringSerializationPolicy = isStandardUTF + ? StringSerializationPolicy.STANDARD + : StringSerializationPolicy.LEGACY; + var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig); + var serialized = serializationService.toData(obj); + expect(serializationService.toObject(serialized)).to.deep.equal(obj); + } + ); + }); }); var defaultNumberTypes = [ diff --git a/test/serialization/ObjectDataTest.js b/test/serialization/ObjectDataTest.js index fb57eab4c..678496f2d 100644 --- a/test/serialization/ObjectDataTest.js +++ b/test/serialization/ObjectDataTest.js @@ -14,110 +14,117 @@ * limitations under the License. */ +var Buffer = require('safe-buffer').Buffer; var expect = require('chai').expect; var Long = require('long'); var ObjectData = require('../../lib/serialization/ObjectData'); var ODInp = ObjectData.ObjectDataInput; var ODOut = ObjectData.ObjectDataOutput; + describe('ObjectData Test', function () { - var out = new ODOut(new Buffer(100), null, true); + var isStandardUTFValues = [true, false]; - before(function () { - out.write(15); - out.write(new Buffer(['t'.charCodeAt(0), 'e'.charCodeAt(0), 's'.charCodeAt(0), 't'.charCodeAt(0)])); - out.writeBoolean(true); - out.writeBooleanArray([true, false, false, true, true]); - out.writeByte(255 | 0); - out.writeByteArray([0 | 0, 1 | 0, 65535 | 0]); - out.writeBytes('bytes'); - out.writeChar('∂'); - out.writeCharArray(['h', 'a', 'z', 'e', 'l']); - out.writeChars('cast'); - out.writeDouble(435437.23); - out.writeDoubleArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); - out.writeFloat(3.4); - out.writeFloatArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); - out.writeInt(9876543); - out.writeIntArray([1, -2, 0, 54]); - out.writeLong(new Long(255, 255)); - out.writeLongArray([new Long(255, 255), Long.fromNumber(-2)]); - out.writeShort(32767); - out.writeZeroBytes(6); - out.writeShortArray([-32768, 0, 32767]); - out.writeUTF('selamœ∑®ßåç∫˙˜'); - out.writeUTFArray([ - '', - 'istanbul', - 'üsküdar', - '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' - ]); - }); + isStandardUTFValues.forEach(function(isStandardUTF) { + var out = new ODOut(null, true, isStandardUTF); + var label = ' - ' + (isStandardUTF ? 'standard' : 'legacy') + ' string serialization'; - it('read', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); - expect(inp.read()).to.equal(15); - expect(inp.read()).to.equal('t'.charCodeAt(0)); - expect(inp.read()).to.equal('e'.charCodeAt(0)); - expect(inp.read()).to.equal('s'.charCodeAt(0)); - expect(inp.read()).to.equal('t'.charCodeAt(0)); - expect(inp.readBoolean()).to.be.true; - expect(inp.readBooleanArray()).to.deep.equal([true, false, false, true, true]); - expect(inp.readByte()).to.equal(255); - expect(inp.readByteArray()).to.deep.equal([0, 1, 255]); - var readBytes = []; - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - expect(String.fromCharCode.apply(null, readBytes)).to.equal('bytes'); - expect(inp.readChar()).to.equal('∂'); - expect(inp.readCharArray()).to.deep.equal(['h', 'a', 'z', 'e', 'l']); - expect(inp.readCharArray().join('')).to.equal('cast'); - expect(inp.readDouble()).to.equals(435437.23); - inp.readDoubleArray().forEach(function (fl, index) { - expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); + before(function () { + out.write(15); + out.write(Buffer.from(['t'.charCodeAt(0), 'e'.charCodeAt(0), 's'.charCodeAt(0), 't'.charCodeAt(0)])); + out.writeBoolean(true); + out.writeBooleanArray([true, false, false, true, true]); + out.writeByte(255 | 0); + out.writeByteArray([0 | 0, 1 | 0, 65535 | 0]); + out.writeBytes('bytes'); + out.writeChar('∂'); + out.writeCharArray(['h', 'a', 'z', 'e', 'l']); + out.writeChars('cast'); + out.writeDouble(435437.23); + out.writeDoubleArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); + out.writeFloat(3.4); + out.writeFloatArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); + out.writeInt(9876543); + out.writeIntArray([1, -2, 0, 54]); + out.writeLong(new Long(255, 255)); + out.writeLongArray([new Long(255, 255), Long.fromNumber(-2)]); + out.writeShort(32767); + out.writeZeroBytes(6); + out.writeShortArray([-32768, 0, 32767]); + out.writeUTF('selamœ∑®ßåç∫˙˜'); + out.writeUTFArray([ + '', + 'istanbul', + 'üsküdar', + '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' + ]); }); - expect(inp.readFloat()).to.be.closeTo(3.4, 0.0001); - inp.readFloatArray().forEach(function (fl, index) { - expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); + + it('read' + label, function () { + var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); + expect(inp.read()).to.equal(15); + expect(inp.read()).to.equal('t'.charCodeAt(0)); + expect(inp.read()).to.equal('e'.charCodeAt(0)); + expect(inp.read()).to.equal('s'.charCodeAt(0)); + expect(inp.read()).to.equal('t'.charCodeAt(0)); + expect(inp.readBoolean()).to.be.true; + expect(inp.readBooleanArray()).to.deep.equal([true, false, false, true, true]); + expect(inp.readByte()).to.equal(255); + expect(inp.readByteArray()).to.deep.equal([0, 1, 255]); + var readBytes = []; + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + expect(String.fromCharCode.apply(null, readBytes)).to.equal('bytes'); + expect(inp.readChar()).to.equal('∂'); + expect(inp.readCharArray()).to.deep.equal(['h', 'a', 'z', 'e', 'l']); + expect(inp.readCharArray().join('')).to.equal('cast'); + expect(inp.readDouble()).to.equals(435437.23); + inp.readDoubleArray().forEach(function (fl, index) { + expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); + }); + expect(inp.readFloat()).to.be.closeTo(3.4, 0.0001); + inp.readFloatArray().forEach(function (fl, index) { + expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); + }); + expect(inp.readInt()).to.equal(9876543); + expect(inp.readIntArray()).to.deep.equal([1, -2, 0, 54]); + expect(inp.readLong()).to.deep.equal(new Long(255, 255)); + expect(inp.readLongArray()).to.deep.equal([new Long(255, 255), new Long(4294967294, 4294967295)]); + expect(inp.readShort()).to.equal(32767); + inp.skipBytes(6); + expect(inp.readShortArray()).to.deep.equal([-32768, 0, 32767]); + expect(inp.readUTF()).to.equal('selamœ∑®ßåç∫˙˜'); + expect(inp.readUTFArray()).to.deep.equal([ + '', + 'istanbul', + 'üsküdar', + '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' + ]); + inp.reset(); + expect(inp.read()).to.equal(15); }); - expect(inp.readInt()).to.equal(9876543); - expect(inp.readIntArray()).to.deep.equal([1, -2, 0, 54]); - expect(inp.readLong()).to.deep.equal(new Long(255, 255)); - expect(inp.readLongArray()).to.deep.equal([new Long(255, 255), new Long(4294967294, 4294967295)]); - expect(inp.readShort()).to.equal(32767); - inp.skipBytes(6); - expect(inp.readShortArray()).to.deep.equal([-32768, 0, 32767]); - expect(inp.readUTF()).to.equal('selamœ∑®ßåç∫˙˜'); - expect(inp.readUTFArray()).to.deep.equal([ - '', - 'istanbul', - 'üsküdar', - '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' - ]); - inp.reset(); - expect(inp.read()).to.equal(15); - }); - it('read from pos', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); - inp.read(); - expect(inp.read(0)).to.equal(15); - }); + it('read from pos' + label, function () { + var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); + inp.read(); + expect(inp.read(0)).to.equal(15); + }); - it('position', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); - inp.read(); - inp.position(0); - expect(inp.read()).to.equal(15); - }); + it('position' + label, function () { + var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); + inp.read(); + inp.position(0); + expect(inp.read()).to.equal(15); + }); - it('non integer position does not affect', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); - inp.read(); - inp.position(0.5); - expect(inp.read()).to.equal('t'.charCodeAt(0)); - }) + it('non integer position does not affect' + label, function () { + var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); + inp.read(); + inp.position(0.5); + expect(inp.read()).to.equal('t'.charCodeAt(0)); + }); + }); }); diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index e157b9e1b..202b24502 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -14,7 +14,10 @@ * limitations under the License. */ -function PortableObject(a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, a_portable, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables) { +function PortableObject( + a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, a_portable, + bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables + ) { this.a_byte = a_byte; this.a_boolean = a_boolean; this.a_character = a_character; @@ -55,7 +58,9 @@ PortableObject.prototype.writePortable = function (writer) { writer.writeDouble('a_double', this.a_double); writer.writeUTF('a_string', this.a_string); writer.writePortable('a_portable', this.a_portable); - writer.writeNullPortable('a_null_portable', InnerPortableObject.prototype.getFactoryId.call(null), InnerPortableObject.prototype.getClassId.call(null)); + writer.writeNullPortable( + 'a_null_portable', InnerPortableObject.prototype.getFactoryId.call(null), + InnerPortableObject.prototype.getClassId.call(null)); writer.writeByteArray('bytes', this.bytes); writer.writeBooleanArray('booleans', this.booleans); @@ -116,7 +121,10 @@ InnerPortableObject.prototype.writePortable = function (writer) { writer.writeUTF('p2', this.p2); }; -function PortableObjectV2(a_new_prop, a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_portable, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables) { +function PortableObjectV2( + a_new_prop, a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, + a_portable, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables + ) { this.a_new_prop = a_new_prop;// this prop is newly added this.a_byte = a_byte; this.a_boolean = a_boolean; diff --git a/test/serialization/PortableTest.js b/test/serialization/PortableTest.js index 0f99a40af..d77ed99d1 100644 --- a/test/serialization/PortableTest.js +++ b/test/serialization/PortableTest.js @@ -17,14 +17,13 @@ var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var Long = require('long'); -var expect = require('chai').expect; var Util = require('../Util'); var PortableObject = require('./PortableObjects').PortableObject; var PortableObjectV2 = require('./PortableObjects').PortableObjectV2; var InnerPortableObject = require('./PortableObjects').InnerPortableObject; var SimplePortableV3 = require('./PortableObjects').SimplePortableV3; -describe('Portable Serialization', function () { +describe('Portable Serialization', function () { function createSerializationService(constructorFunction) { var cfg = new Config.ClientConfig(); cfg.serializationConfig.portableFactories[10] = { diff --git a/test/serialization/ReferenceObjects.js b/test/serialization/ReferenceObjects.js index 5713e911f..aa66a9d21 100644 --- a/test/serialization/ReferenceObjects.js +++ b/test/serialization/ReferenceObjects.js @@ -14,6 +14,7 @@ * limitations under the License. */ +var Buffer = require('safe-buffer').Buffer; var Long = require('long'); var AnInnerPortable = require('./AnInnerPortable'); var AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); @@ -21,6 +22,7 @@ var APortable = require('./APortable'); var CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; var CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; var HeapData = require('../../lib/serialization/HeapData').HeapData; + var to = {}; to.aNULL = null; to.aBoolean = true; @@ -58,7 +60,7 @@ to.AnInnerPortable = new AnInnerPortable(to.anInteger, to.aFloat); to.aCustomStreamSerializable = new CustomStreamSerializable(to.anInteger, to.aFloat); to.aCustomByteArraySerializable = new CustomByteArraySerializable(to.anInteger, to.aFloat); -exports.aData = new HeapData(new Buffer('111313123131313131')); +exports.aData = new HeapData(Buffer.from('111313123131313131')); to.AnIdentifiedDataSerializable = new AnIdentifiedDataSerializable(to.aBoolean, to.aByte, to.aCharacter, to.aDouble, to.aShort , to.aFloat, to.anInteger, to.aLong, to.aString, to.booleans, to.bytes, to.chars, to.doubles, to.shorts, to.floats From b3fe83f9cc02eb32cae3419be70028b27635fc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Metin=20Dumanda=C4=9F?= Date: Thu, 2 May 2019 20:20:53 +0300 Subject: [PATCH 244/685] update copyright year to 2019 (#476) --- benchmark/MapGetRunner.js | 16 ++++++++++++++++ benchmark/MapPutRunner.js | 16 ++++++++++++++++ benchmark/MapRandomOpRunner.js | 16 ++++++++++++++++ benchmark/SimpleBenchmark.js | 16 ++++++++++++++++ code_samples/aggregation.js | 2 +- code_samples/client_statistics.js | 2 +- code_samples/custom_serializer.js | 2 +- code_samples/distributed_object_listener.js | 2 +- code_samples/flakeid_generator.js | 2 +- code_samples/global_serializer.js | 2 +- code_samples/hazelcast_cloud_discovery.js | 2 +- code_samples/hazelcast_json_value.js | 2 +- code_samples/jaas_sample/admin_client.js | 16 ++++++++++++++++ .../src/main/resources/hazelcast.xml | 2 +- code_samples/jaas_sample/reader_client.js | 16 ++++++++++++++++ code_samples/jaas_sample/user_pass_cred.js | 16 ++++++++++++++++ .../jaas_sample/user_pass_cred_factory.js | 16 ++++++++++++++++ code_samples/lifecycle_listener.js | 2 +- code_samples/list.js | 2 +- code_samples/logging.js | 2 +- code_samples/map.js | 2 +- code_samples/map_entry_listener.js | 2 +- code_samples/membership_listener.js | 2 +- code_samples/near_cache.js | 16 ++++++++++++++++ .../node_modules/hazelcast-client/index.js | 2 +- code_samples/org-website/AtomicLongSample.js | 16 ++++++++++++++++ .../org-website/CustomSerializerSample.js | 16 ++++++++++++++++ code_samples/org-website/EntryProcessorSample.js | 16 ++++++++++++++++ .../org-website/GlobalSerializerSample.js | 16 ++++++++++++++++ .../IdentifiedDataSerializableSample.js | 16 ++++++++++++++++ code_samples/org-website/ListSample.js | 16 ++++++++++++++++ code_samples/org-website/LockSample.js | 16 ++++++++++++++++ code_samples/org-website/MapSample.js | 16 ++++++++++++++++ code_samples/org-website/MultiMapSample.js | 16 ++++++++++++++++ .../org-website/PortableSerializableSample.js | 16 ++++++++++++++++ code_samples/org-website/QuerySample.js | 16 ++++++++++++++++ code_samples/org-website/QueueSample.js | 16 ++++++++++++++++ code_samples/org-website/ReliableTopicSample.js | 16 ++++++++++++++++ code_samples/org-website/ReplicatedMapSample.js | 16 ++++++++++++++++ code_samples/org-website/RingBufferSample.js | 16 ++++++++++++++++ code_samples/org-website/SetSample.js | 16 ++++++++++++++++ code_samples/paging_predicate.js | 2 +- code_samples/pn_counter.js | 2 +- code_samples/queue.js | 2 +- code_samples/set.js | 2 +- code_samples/ssl_authentication.js | 2 +- download-remote-controller.js | 16 ++++++++++++++++ src/Address.ts | 2 +- src/BitsUtil.ts | 2 +- src/BuildInfo.ts | 2 +- src/ClientInfo.ts | 2 +- src/ClientMessage.ts | 2 +- src/ClusterDataFactory.ts | 2 +- src/ClusterDataFactoryHelper.ts | 2 +- src/DataStoreHashMap.ts | 2 +- src/DistributedObject.ts | 2 +- src/HazelcastClient.ts | 2 +- src/HazelcastError.ts | 2 +- src/HeartbeatService.ts | 2 +- src/LifecycleService.ts | 2 +- src/ListenerMessageCodec.ts | 2 +- src/ListenerService.ts | 2 +- src/LockReferenceIdGenerator.ts | 2 +- src/PartitionService.ts | 2 +- src/Util.ts | 2 +- src/aggregation/Aggregator.ts | 2 +- src/aggregation/AggregatorFactory.ts | 2 +- src/aggregation/Aggregators.ts | 2 +- src/codec/AddressCodec.ts | 2 +- src/codec/AtomicLongAddAndGetCodec.ts | 2 +- src/codec/AtomicLongAlterAndGetCodec.ts | 2 +- src/codec/AtomicLongAlterCodec.ts | 2 +- src/codec/AtomicLongApplyCodec.ts | 2 +- src/codec/AtomicLongCompareAndSetCodec.ts | 2 +- src/codec/AtomicLongDecrementAndGetCodec.ts | 2 +- src/codec/AtomicLongGetAndAddCodec.ts | 2 +- src/codec/AtomicLongGetAndAlterCodec.ts | 2 +- src/codec/AtomicLongGetAndIncrementCodec.ts | 2 +- src/codec/AtomicLongGetAndSetCodec.ts | 2 +- src/codec/AtomicLongGetCodec.ts | 2 +- src/codec/AtomicLongIncrementAndGetCodec.ts | 2 +- src/codec/AtomicLongMessageType.ts | 2 +- src/codec/AtomicLongSetCodec.ts | 2 +- .../ClientAddDistributedObjectListenerCodec.ts | 2 +- src/codec/ClientAddMembershipListenerCodec.ts | 2 +- src/codec/ClientAddPartitionListenerCodec.ts | 2 +- src/codec/ClientAddPartitionLostListenerCodec.ts | 2 +- src/codec/ClientAuthenticationCodec.ts | 2 +- src/codec/ClientAuthenticationCustomCodec.ts | 2 +- src/codec/ClientCreateProxyCodec.ts | 2 +- src/codec/ClientDeployClassesCodec.ts | 2 +- src/codec/ClientDestroyProxyCodec.ts | 2 +- src/codec/ClientGetDistributedObjectsCodec.ts | 2 +- src/codec/ClientGetPartitionsCodec.ts | 2 +- src/codec/ClientMessageType.ts | 2 +- src/codec/ClientPingCodec.ts | 2 +- src/codec/ClientRemoveAllListenersCodec.ts | 2 +- ...ClientRemoveDistributedObjectListenerCodec.ts | 2 +- .../ClientRemovePartitionLostListenerCodec.ts | 2 +- src/codec/ClientStatisticsCodec.ts | 2 +- src/codec/DistributedObjectInfoCodec.ts | 2 +- src/codec/EntryViewCodec.ts | 2 +- src/codec/FlakeIdGeneratorMessageType.ts | 16 ++++++++++++++++ src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 2 +- src/codec/GetPartitionsCodec.ts | 2 +- src/codec/ImmutableLazyDataList.ts | 2 +- src/codec/ListAddAllCodec.ts | 2 +- src/codec/ListAddAllWithIndexCodec.ts | 2 +- src/codec/ListAddCodec.ts | 2 +- src/codec/ListAddListenerCodec.ts | 2 +- src/codec/ListAddWithIndexCodec.ts | 2 +- src/codec/ListClearCodec.ts | 2 +- src/codec/ListCompareAndRemoveAllCodec.ts | 2 +- src/codec/ListCompareAndRetainAllCodec.ts | 2 +- src/codec/ListContainsAllCodec.ts | 2 +- src/codec/ListContainsCodec.ts | 2 +- src/codec/ListGetAllCodec.ts | 2 +- src/codec/ListGetCodec.ts | 2 +- src/codec/ListIndexOfCodec.ts | 2 +- src/codec/ListIsEmptyCodec.ts | 2 +- src/codec/ListIteratorCodec.ts | 2 +- src/codec/ListLastIndexOfCodec.ts | 2 +- src/codec/ListListIteratorCodec.ts | 2 +- src/codec/ListMessageType.ts | 2 +- src/codec/ListRemoveCodec.ts | 2 +- src/codec/ListRemoveListenerCodec.ts | 2 +- src/codec/ListRemoveWithIndexCodec.ts | 2 +- src/codec/ListSetCodec.ts | 2 +- src/codec/ListSizeCodec.ts | 2 +- src/codec/ListSubCodec.ts | 2 +- src/codec/LockForceUnlockCodec.ts | 2 +- src/codec/LockGetLockCountCodec.ts | 2 +- src/codec/LockGetRemainingLeaseTimeCodec.ts | 2 +- src/codec/LockIsLockedByCurrentThreadCodec.ts | 2 +- src/codec/LockIsLockedCodec.ts | 2 +- src/codec/LockLockCodec.ts | 2 +- src/codec/LockMessageType.ts | 2 +- src/codec/LockTryLockCodec.ts | 2 +- src/codec/LockUnlockCodec.ts | 2 +- src/codec/MapAddEntryListenerCodec.ts | 2 +- src/codec/MapAddEntryListenerToKeyCodec.ts | 2 +- ...MapAddEntryListenerToKeyWithPredicateCodec.ts | 2 +- .../MapAddEntryListenerWithPredicateCodec.ts | 2 +- src/codec/MapAddIndexCodec.ts | 2 +- src/codec/MapAddInterceptorCodec.ts | 2 +- src/codec/MapAddNearCacheEntryListenerCodec.ts | 2 +- .../MapAddNearCacheInvalidationListenerCodec.ts | 2 +- src/codec/MapAddPartitionLostListenerCodec.ts | 2 +- src/codec/MapAggregateCodec.ts | 2 +- src/codec/MapAggregateWithPredicateCodec.ts | 2 +- src/codec/MapAssignAndGetUuidsCodec.ts | 2 +- src/codec/MapClearCodec.ts | 2 +- src/codec/MapClearNearCacheCodec.ts | 2 +- src/codec/MapContainsKeyCodec.ts | 2 +- src/codec/MapContainsValueCodec.ts | 2 +- src/codec/MapDeleteCodec.ts | 2 +- src/codec/MapEntriesWithPagingPredicateCodec.ts | 2 +- src/codec/MapEntriesWithPredicateCodec.ts | 2 +- src/codec/MapEntrySetCodec.ts | 2 +- src/codec/MapEventJournalReadCodec.ts | 2 +- src/codec/MapEventJournalSubscribeCodec.ts | 2 +- src/codec/MapEvictAllCodec.ts | 2 +- src/codec/MapEvictCodec.ts | 2 +- src/codec/MapExecuteOnAllKeysCodec.ts | 2 +- src/codec/MapExecuteOnKeyCodec.ts | 2 +- src/codec/MapExecuteOnKeysCodec.ts | 2 +- src/codec/MapExecuteWithPredicateCodec.ts | 2 +- src/codec/MapFetchEntriesCodec.ts | 2 +- src/codec/MapFetchKeysCodec.ts | 2 +- ...MapFetchNearCacheInvalidationMetadataCodec.ts | 2 +- src/codec/MapFetchWithQueryCodec.ts | 2 +- src/codec/MapFlushCodec.ts | 2 +- src/codec/MapForceUnlockCodec.ts | 2 +- src/codec/MapGetAllCodec.ts | 2 +- src/codec/MapGetCodec.ts | 2 +- src/codec/MapGetEntryViewCodec.ts | 2 +- src/codec/MapIsEmptyCodec.ts | 2 +- src/codec/MapIsLockedCodec.ts | 2 +- src/codec/MapKeySetCodec.ts | 2 +- src/codec/MapKeySetWithPagingPredicateCodec.ts | 2 +- src/codec/MapKeySetWithPredicateCodec.ts | 2 +- src/codec/MapLoadAllCodec.ts | 2 +- src/codec/MapLoadGivenKeysCodec.ts | 2 +- src/codec/MapLockCodec.ts | 2 +- src/codec/MapMessageType.ts | 2 +- src/codec/MapProjectCodec.ts | 2 +- src/codec/MapProjectWithPredicateCodec.ts | 2 +- src/codec/MapPutAllCodec.ts | 2 +- src/codec/MapPutCodec.ts | 2 +- src/codec/MapPutIfAbsentCodec.ts | 2 +- src/codec/MapPutTransientCodec.ts | 2 +- src/codec/MapRemoveAllCodec.ts | 2 +- src/codec/MapRemoveCodec.ts | 2 +- src/codec/MapRemoveEntryListenerCodec.ts | 2 +- src/codec/MapRemoveIfSameCodec.ts | 2 +- src/codec/MapRemoveInterceptorCodec.ts | 2 +- src/codec/MapRemovePartitionLostListenerCodec.ts | 2 +- src/codec/MapReplaceCodec.ts | 2 +- src/codec/MapReplaceIfSameCodec.ts | 2 +- src/codec/MapSetCodec.ts | 2 +- src/codec/MapSizeCodec.ts | 2 +- src/codec/MapSubmitToKeyCodec.ts | 2 +- src/codec/MapTryLockCodec.ts | 2 +- src/codec/MapTryPutCodec.ts | 2 +- src/codec/MapTryRemoveCodec.ts | 2 +- src/codec/MapUnlockCodec.ts | 2 +- src/codec/MapValuesCodec.ts | 2 +- src/codec/MapValuesWithPagingPredicateCodec.ts | 2 +- src/codec/MapValuesWithPredicateCodec.ts | 2 +- src/codec/MemberCodec.ts | 2 +- src/codec/MultiMapAddEntryListenerCodec.ts | 2 +- src/codec/MultiMapAddEntryListenerToKeyCodec.ts | 2 +- src/codec/MultiMapClearCodec.ts | 2 +- src/codec/MultiMapContainsEntryCodec.ts | 2 +- src/codec/MultiMapContainsKeyCodec.ts | 2 +- src/codec/MultiMapContainsValueCodec.ts | 2 +- src/codec/MultiMapEntrySetCodec.ts | 2 +- src/codec/MultiMapForceUnlockCodec.ts | 2 +- src/codec/MultiMapGetCodec.ts | 2 +- src/codec/MultiMapIsLockedCodec.ts | 2 +- src/codec/MultiMapKeySetCodec.ts | 2 +- src/codec/MultiMapLockCodec.ts | 2 +- src/codec/MultiMapMessageType.ts | 2 +- src/codec/MultiMapPutCodec.ts | 2 +- src/codec/MultiMapRemoveCodec.ts | 2 +- src/codec/MultiMapRemoveEntryCodec.ts | 2 +- src/codec/MultiMapRemoveEntryListenerCodec.ts | 2 +- src/codec/MultiMapSizeCodec.ts | 2 +- src/codec/MultiMapTryLockCodec.ts | 2 +- src/codec/MultiMapUnlockCodec.ts | 2 +- src/codec/MultiMapValueCountCodec.ts | 2 +- src/codec/MultiMapValuesCodec.ts | 2 +- src/codec/PNCounterAddCodec.ts | 2 +- src/codec/PNCounterGetCodec.ts | 2 +- .../PNCounterGetConfiguredReplicaCountCodec.ts | 2 +- src/codec/PNCounterMessageType.ts | 16 ++++++++++++++++ src/codec/QueueAddAllCodec.ts | 2 +- src/codec/QueueAddListenerCodec.ts | 2 +- src/codec/QueueClearCodec.ts | 2 +- src/codec/QueueCompareAndRemoveAllCodec.ts | 2 +- src/codec/QueueCompareAndRetainAllCodec.ts | 2 +- src/codec/QueueContainsAllCodec.ts | 2 +- src/codec/QueueContainsCodec.ts | 2 +- src/codec/QueueDrainToCodec.ts | 2 +- src/codec/QueueDrainToMaxSizeCodec.ts | 2 +- src/codec/QueueIsEmptyCodec.ts | 2 +- src/codec/QueueIteratorCodec.ts | 2 +- src/codec/QueueMessageType.ts | 2 +- src/codec/QueueOfferCodec.ts | 2 +- src/codec/QueuePeekCodec.ts | 2 +- src/codec/QueuePollCodec.ts | 2 +- src/codec/QueuePutCodec.ts | 2 +- src/codec/QueueRemainingCapacityCodec.ts | 2 +- src/codec/QueueRemoveCodec.ts | 2 +- src/codec/QueueRemoveListenerCodec.ts | 2 +- src/codec/QueueSizeCodec.ts | 2 +- src/codec/QueueTakeCodec.ts | 2 +- src/codec/ReplicatedMapAddEntryListenerCodec.ts | 2 +- .../ReplicatedMapAddEntryListenerToKeyCodec.ts | 2 +- ...MapAddEntryListenerToKeyWithPredicateCodec.ts | 2 +- ...catedMapAddEntryListenerWithPredicateCodec.ts | 2 +- ...eplicatedMapAddNearCacheEntryListenerCodec.ts | 2 +- src/codec/ReplicatedMapClearCodec.ts | 2 +- src/codec/ReplicatedMapContainsKeyCodec.ts | 2 +- src/codec/ReplicatedMapContainsValueCodec.ts | 2 +- src/codec/ReplicatedMapEntrySetCodec.ts | 2 +- src/codec/ReplicatedMapGetCodec.ts | 2 +- src/codec/ReplicatedMapIsEmptyCodec.ts | 2 +- src/codec/ReplicatedMapKeySetCodec.ts | 2 +- src/codec/ReplicatedMapMessageType.ts | 2 +- src/codec/ReplicatedMapPutAllCodec.ts | 2 +- src/codec/ReplicatedMapPutCodec.ts | 2 +- src/codec/ReplicatedMapRemoveCodec.ts | 2 +- .../ReplicatedMapRemoveEntryListenerCodec.ts | 2 +- src/codec/ReplicatedMapSizeCodec.ts | 2 +- src/codec/ReplicatedMapValuesCodec.ts | 2 +- src/codec/RingbufferAddAllCodec.ts | 2 +- src/codec/RingbufferAddCodec.ts | 2 +- src/codec/RingbufferCapacityCodec.ts | 2 +- src/codec/RingbufferHeadSequenceCodec.ts | 2 +- src/codec/RingbufferMessageType.ts | 2 +- src/codec/RingbufferReadManyCodec.ts | 2 +- src/codec/RingbufferReadOneCodec.ts | 2 +- src/codec/RingbufferRemainingCapacityCodec.ts | 2 +- src/codec/RingbufferSizeCodec.ts | 2 +- src/codec/RingbufferTailSequenceCodec.ts | 2 +- src/codec/SemaphoreAcquireCodec.ts | 2 +- src/codec/SemaphoreAvailablePermitsCodec.ts | 2 +- src/codec/SemaphoreDrainPermitsCodec.ts | 2 +- src/codec/SemaphoreInitCodec.ts | 2 +- src/codec/SemaphoreMessageType.ts | 2 +- src/codec/SemaphoreReducePermitsCodec.ts | 2 +- src/codec/SemaphoreReleaseCodec.ts | 2 +- src/codec/SemaphoreTryAcquireCodec.ts | 2 +- src/codec/SetAddAllCodec.ts | 2 +- src/codec/SetAddCodec.ts | 2 +- src/codec/SetAddListenerCodec.ts | 2 +- src/codec/SetClearCodec.ts | 2 +- src/codec/SetCompareAndRemoveAllCodec.ts | 2 +- src/codec/SetCompareAndRetainAllCodec.ts | 2 +- src/codec/SetContainsAllCodec.ts | 2 +- src/codec/SetContainsCodec.ts | 2 +- src/codec/SetGetAllCodec.ts | 2 +- src/codec/SetIsEmptyCodec.ts | 2 +- src/codec/SetMessageType.ts | 2 +- src/codec/SetRemoveCodec.ts | 2 +- src/codec/SetRemoveListenerCodec.ts | 2 +- src/codec/SetSizeCodec.ts | 2 +- src/codec/TopicAddMessageListenerCodec.ts | 2 +- src/codec/TopicMessageType.ts | 2 +- src/codec/TopicPublishCodec.ts | 2 +- src/codec/TopicRemoveMessageListenerCodec.ts | 2 +- src/codec/UUIDCodec.ts | 2 +- src/codec/Utils.ts | 2 +- src/config/ClientCloudConfig.ts | 2 +- src/config/ClientNetworkConfig.ts | 2 +- src/config/Config.ts | 2 +- src/config/ConfigBuilder.ts | 2 +- src/config/ConfigPatternMatcher.ts | 2 +- src/config/EvictionPolicy.ts | 2 +- src/config/FlakeIdGeneratorConfig.ts | 2 +- src/config/GroupConfig.ts | 2 +- src/config/ImportConfig.ts | 2 +- src/config/InMemoryFormat.ts | 2 +- src/config/JsonConfigLocator.ts | 2 +- src/config/JsonStringDeserializationPolicy.ts | 2 +- src/config/ListenerConfig.ts | 2 +- src/config/NearCacheConfig.ts | 2 +- src/config/Properties.ts | 2 +- src/config/ReliableTopicConfig.ts | 2 +- src/config/SSLConfig.ts | 2 +- src/config/SerializationConfig.ts | 2 +- src/config/StringSerializationPolicy.ts | 2 +- src/connection/AddressProvider.ts | 2 +- src/connection/AddressTranslator.ts | 2 +- src/connection/BasicSSLOptionsFactory.ts | 2 +- src/connection/DefaultAddressProvider.ts | 2 +- src/connection/DefaultAddressTranslator.ts | 2 +- src/connection/SSLOptionsFactory.ts | 2 +- src/core/Comparator.ts | 2 +- src/core/ConnectionHeartbeatListener.ts | 2 +- src/core/DistributedObjectListener.ts | 2 +- src/core/EntryListener.ts | 2 +- src/core/EntryView.ts | 2 +- src/core/EventType.ts | 2 +- src/core/HazelcastJsonValue.ts | 2 +- src/core/ItemListener.ts | 2 +- src/core/MapListener.ts | 2 +- src/core/Member.ts | 2 +- src/core/MemberAttributeEvent.ts | 2 +- src/core/MemberSelector.ts | 2 +- src/core/MemberSelectors.ts | 2 +- src/core/MembershipEvent.ts | 2 +- src/core/MembershipListener.ts | 2 +- src/core/OverflowPolicy.ts | 2 +- src/core/PartitionAware.ts | 2 +- src/core/Predicate.ts | 2 +- src/core/ReadOnlyLazyList.ts | 2 +- src/core/UUID.ts | 2 +- src/core/VectorClock.ts | 2 +- src/discovery/HazelcastCloudAddressProvider.ts | 2 +- src/discovery/HazelcastCloudAddressTranslator.ts | 2 +- src/discovery/HazelcastCloudDiscovery.ts | 16 ++++++++++++++++ src/index.ts | 2 +- src/invocation/ClientConnection.ts | 2 +- src/invocation/ClientConnectionManager.ts | 2 +- src/invocation/ClientEventRegistration.ts | 2 +- src/invocation/ClusterService.ts | 2 +- src/invocation/ConnectionAuthenticator.ts | 2 +- src/invocation/InvocationService.ts | 2 +- src/invocation/Murmur.ts | 2 +- src/invocation/RegistrationKey.ts | 2 +- src/logging/DefaultLogger.ts | 2 +- src/logging/ILogger.ts | 2 +- src/logging/LoggingService.ts | 2 +- .../AlwaysFreshStaleReadDetectorImpl.ts | 2 +- src/nearcache/DataRecord.ts | 2 +- src/nearcache/MetadataContainer.ts | 2 +- src/nearcache/MetadataFetcher.ts | 2 +- src/nearcache/NearCache.ts | 2 +- src/nearcache/NearCacheManager.ts | 2 +- src/nearcache/RepairingHandler.ts | 2 +- src/nearcache/RepairingTask.ts | 2 +- src/nearcache/StaleReadDetector.ts | 2 +- src/nearcache/StaleReadDetectorImpl.ts | 2 +- src/protocol/ClientProtocolErrorCodes.ts | 2 +- src/protocol/ErrorCodec.ts | 2 +- src/protocol/ErrorFactory.ts | 2 +- src/protocol/StackTraceElementCodec.ts | 2 +- src/proxy/AtomicLongProxy.ts | 2 +- src/proxy/BaseProxy.ts | 2 +- src/proxy/FlakeIdGenerator.ts | 2 +- src/proxy/FlakeIdGeneratorProxy.ts | 2 +- src/proxy/IAtomicLong.ts | 2 +- src/proxy/IList.ts | 2 +- src/proxy/ILock.ts | 2 +- src/proxy/IMap.ts | 2 +- src/proxy/IQueue.ts | 2 +- src/proxy/ISemaphore.ts | 2 +- src/proxy/ISet.ts | 2 +- src/proxy/ListProxy.ts | 2 +- src/proxy/LockProxy.ts | 2 +- src/proxy/MapProxy.ts | 2 +- src/proxy/MultiMap.ts | 2 +- src/proxy/MultiMapProxy.ts | 2 +- src/proxy/NearCachedMapProxy.ts | 2 +- src/proxy/PNCounter.ts | 2 +- src/proxy/PNCounterProxy.ts | 2 +- src/proxy/PartitionSpecificProxy.ts | 2 +- src/proxy/ProxyManager.ts | 2 +- src/proxy/QueueProxy.ts | 2 +- src/proxy/ReplicatedMap.ts | 2 +- src/proxy/ReplicatedMapProxy.ts | 2 +- src/proxy/Ringbuffer.ts | 2 +- src/proxy/SemaphoreProxy.ts | 2 +- src/proxy/SetProxy.ts | 2 +- src/proxy/flakeid/AutoBatcher.ts | 2 +- src/proxy/ringbuffer/LazyReadResultSet.ts | 2 +- src/proxy/ringbuffer/ReadResultSet.ts | 2 +- src/proxy/ringbuffer/RingbufferProxy.ts | 2 +- src/proxy/topic/ITopic.ts | 2 +- src/proxy/topic/Message.ts | 2 +- src/proxy/topic/MessageListener.ts | 2 +- src/proxy/topic/ReliableTopicListenerRunner.ts | 2 +- src/proxy/topic/ReliableTopicMessage.ts | 2 +- src/proxy/topic/ReliableTopicProxy.ts | 2 +- src/proxy/topic/TopicOverloadPolicy.ts | 2 +- src/serialization/Data.ts | 2 +- src/serialization/DefaultPredicates.ts | 2 +- src/serialization/DefaultSerializer.ts | 2 +- src/serialization/HeapData.ts | 2 +- src/serialization/ObjectData.ts | 2 +- src/serialization/PredicateFactory.ts | 2 +- src/serialization/Serializable.ts | 2 +- src/serialization/SerializationService.ts | 2 +- src/serialization/SerializationUtil.ts | 2 +- src/serialization/portable/ClassDefinition.ts | 2 +- .../portable/ClassDefinitionBuilder.ts | 2 +- .../portable/ClassDefinitionContext.ts | 2 +- .../portable/ClassDefinitionWriter.ts | 2 +- .../portable/DefaultPortableReader.ts | 2 +- .../portable/DefaultPortableWriter.ts | 2 +- .../portable/MorphingPortableReader.ts | 2 +- src/serialization/portable/PortableContext.ts | 2 +- src/serialization/portable/PortableSerializer.ts | 2 +- src/statistics/Statistics.ts | 2 +- src/util/ArrayComparator.ts | 2 +- src/util/UuidUtil.ts | 2 +- test/AddressHelperTest.js | 2 +- test/BuildInfoTest.js | 2 +- test/ClientProxyTest.js | 2 +- test/ClientReconnectTest.js | 2 +- test/ClusterServiceTest.js | 2 +- test/ConnectionManagerTest.js | 2 +- test/HazelcastClientTest.js | 2 +- test/LifecycleServiceTest.js | 2 +- test/ListenerServiceTest.js | 2 +- test/ListenersOnReconnectTest.js | 2 +- test/LoggingTest.js | 2 +- test/LostConnectionTest.js | 2 +- test/MembershipListenerTest.js | 2 +- test/RC.js | 2 +- test/RepetitionTaskTest.js | 2 +- test/Util.js | 2 +- test/atomiclong/AtomicLongTest.js | 2 +- .../ConfigBuilderHazelcastCloudTest.js | 2 +- test/declarative_config/ConfigBuilderSSLTest.js | 2 +- test/declarative_config/ConfigBuilderTest.js | 2 +- test/declarative_config/ConfigLocationTest.js | 2 +- .../ConfigPatternMatcherTest.js | 2 +- test/declarative_config/SchemaValidationTest.js | 2 +- test/discovery/HazelcastCloudConfigTest.js | 2 +- test/discovery/HazelcastCloudProviderTest.js | 2 +- test/discovery/HazelcastCloudTranslatorTest.js | 2 +- test/flakeid/FlakeIdGeneratorOutOfRangeTest.js | 2 +- test/flakeid/FlakeIdGeneratorProxyTest.js | 2 +- .../HJVHazelcastJsonValueSerializerTest.js | 2 +- .../HJVJsonSerializerTest.js | 2 +- .../HazelcastJsonValueQueryTest.js | 2 +- .../HazelcastJsonValueTest.js | 2 +- test/heartbeat/HeartbeatFromClientTest.js | 2 +- test/heartbeat/HeartbeatFromServerTest.js | 2 +- test/heartbeat/short-heartbeat.xml | 2 +- test/javaclasses/CustomComparator.js | 2 +- .../DistortInvalidationMetadataEntryProcessor.js | 2 +- test/javaclasses/IdentifiedEntryProcessor.js | 2 +- test/javaclasses/IdentifiedFactory.js | 2 +- test/javaclasses/PrefixFilter.js | 2 +- test/list/ListProxyTest.js | 2 +- test/lock/LockProxyTest.js | 2 +- test/map/ComparatorFactory.js | 2 +- test/map/MapAggregatorsDoubleTest.js | 2 +- test/map/MapAggregatorsIntTest.js | 2 +- test/map/MapAggregatorsLongTest.js | 2 +- test/map/MapEntryProcessorTest.js | 2 +- test/map/MapPartitionAwareTest.js | 2 +- test/map/MapPredicateTest.js | 2 +- test/map/MapProxyTest.js | 2 +- test/map/MapStoreTest.js | 2 +- test/map/NearCachedMapStressTest.js | 2 +- test/map/NearCachedMapTest.js | 2 +- test/map/hazelcast_identifiedfactory.xml | 2 +- test/map/hazelcast_mapstore.xml | 2 +- ...zelcast_nearcache_batchinvalidation_false.xml | 2 +- test/multimap/MultiMapProxyListenersTest.js | 2 +- test/multimap/MultiMapProxyLockTest.js | 2 +- test/multimap/MultiMapProxyTest.js | 2 +- .../InvalidationMetadataDistortionTest.js | 2 +- test/nearcache/LostInvalidationsTest.js | 2 +- test/nearcache/MigratedDataTest.js | 2 +- .../nearcache/NearCacheSimpleInvalidationTest.js | 2 +- test/nearcache/NearCacheTest.js | 2 +- test/nearcache/hazelcast_eventual_nearcache.xml | 2 +- ...zelcast_nearcache_batchinvalidation_false.xml | 2 +- test/nearcache/impl/RepairingTaskTest.js | 2 +- test/pncounter/PNCounterBasicTest.js | 2 +- test/pncounter/PNCounterConsistencyTest.js | 2 +- test/pncounter/PNCounterWithLiteMembersTest.js | 2 +- .../hazelcast_crdtreplication_delayed.xml | 2 +- test/pncounter/hazelcast_litemember.xml | 2 +- test/queue/QueueProxyTest.js | 2 +- test/queue/hazelcast_queue.xml | 2 +- test/replicatedmap/ReplicatedMapProxyTest.js | 2 +- test/replicatedmap/hazelcast_replicatedmap.xml | 2 +- test/ringbuffer/LazyReadResultSetTest.js | 2 +- test/ringbuffer/RingbufferTest.js | 2 +- test/ringbuffer/hazelcast_ringbuffer.xml | 2 +- test/semaphore/SemaphoreProxyTest.js | 2 +- test/serialization/APortable.js | 2 +- .../AnIdentifiedDataSerializable.js | 2 +- test/serialization/AnInnerPortable.js | 2 +- test/serialization/BinaryCompatibilityTest.js | 2 +- test/serialization/CustomSerializable.js | 2 +- test/serialization/CustomSerializerTest.js | 2 +- test/serialization/DefaultSerializersLiveTest.js | 2 +- test/serialization/DefaultSerializersTest.js | 2 +- test/serialization/GlobalSerializerTest.js | 2 +- .../IdentifiedDataSerializableTest.js | 2 +- test/serialization/JsonSerializersTest.js | 16 ++++++++++++++++ test/serialization/ObjectDataTest.js | 2 +- test/serialization/PortableObjects.js | 2 +- .../serialization/PortableSerializersLiveTest.js | 16 ++++++++++++++++ test/serialization/PortableTest.js | 2 +- test/serialization/ReferenceObjects.js | 2 +- test/serialization/SerializationServiceTest.js | 2 +- test/serialization/config/Address.js | 2 +- .../serialization/config/CustomSerializerTest.js | 2 +- test/serialization/config/FactoriesTest.js | 2 +- test/serialization/config/Foo.js | 2 +- test/serialization/config/Musician.js | 2 +- .../portable/ClassDefinitionTest.js | 2 +- .../portable/NestedPortableVersionTest.js | 2 +- test/set/SetProxyTest.js | 2 +- test/ssl/BasicSSLOptionsFactoryTest.js | 2 +- test/ssl/ClientSSLAuthenticationTest.js | 2 +- test/ssl/ClientSSLTest.js | 2 +- test/ssl/hazelcast-ma-optional.xml | 2 +- test/ssl/hazelcast-ma-required.xml | 2 +- test/ssl/hazelcast-ssl.xml | 2 +- test/statistics/StatisticsTest.js | 2 +- test/topic/TopicTest.js | 2 +- test/topic/hazelcast_topic.xml | 2 +- 562 files changed, 1027 insertions(+), 531 deletions(-) diff --git a/benchmark/MapGetRunner.js b/benchmark/MapGetRunner.js index 627174ad9..1c76ee627 100644 --- a/benchmark/MapGetRunner.js +++ b/benchmark/MapGetRunner.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + 'use strict'; const REQ_COUNT = 10000; diff --git a/benchmark/MapPutRunner.js b/benchmark/MapPutRunner.js index 8d8ea8fbb..543512055 100644 --- a/benchmark/MapPutRunner.js +++ b/benchmark/MapPutRunner.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + 'use strict'; const REQ_COUNT = 50000; diff --git a/benchmark/MapRandomOpRunner.js b/benchmark/MapRandomOpRunner.js index 898764305..466df44bf 100644 --- a/benchmark/MapRandomOpRunner.js +++ b/benchmark/MapRandomOpRunner.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + 'use strict'; const REQ_COUNT = 50000; diff --git a/benchmark/SimpleBenchmark.js b/benchmark/SimpleBenchmark.js index 621a9a075..bdf376994 100644 --- a/benchmark/SimpleBenchmark.js +++ b/benchmark/SimpleBenchmark.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + 'use strict'; class Benchmark { diff --git a/code_samples/aggregation.js b/code_samples/aggregation.js index b10689272..a33015926 100644 --- a/code_samples/aggregation.js +++ b/code_samples/aggregation.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/client_statistics.js b/code_samples/client_statistics.js index 32f257173..4b44ef98e 100644 --- a/code_samples/client_statistics.js +++ b/code_samples/client_statistics.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index e230475eb..22b1362a0 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/distributed_object_listener.js b/code_samples/distributed_object_listener.js index 0f630eda1..338beb5ec 100644 --- a/code_samples/distributed_object_listener.js +++ b/code_samples/distributed_object_listener.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/flakeid_generator.js b/code_samples/flakeid_generator.js index 368082655..63eab12bf 100644 --- a/code_samples/flakeid_generator.js +++ b/code_samples/flakeid_generator.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index ec99b99fa..f8b49c992 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/hazelcast_cloud_discovery.js b/code_samples/hazelcast_cloud_discovery.js index 9b6e85288..0a879c704 100644 --- a/code_samples/hazelcast_cloud_discovery.js +++ b/code_samples/hazelcast_cloud_discovery.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/hazelcast_json_value.js b/code_samples/hazelcast_json_value.js index 9bdd7f048..2f7bae469 100644 --- a/code_samples/hazelcast_json_value.js +++ b/code_samples/hazelcast_json_value.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018, Hazelcast, Inc. All Rights Reserved. + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/code_samples/jaas_sample/admin_client.js b/code_samples/jaas_sample/admin_client.js index b71ed7bb4..a8fa8c602 100644 --- a/code_samples/jaas_sample/admin_client.js +++ b/code_samples/jaas_sample/admin_client.js @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + var Client = require('hazelcast-client').Client; var Config = require('hazelcast-client').Config.ClientConfig; diff --git a/code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml b/code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml index c86c6d0ab..eb2528521 100644 --- a/code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml +++ b/code_samples/jaas_sample/hazelcast-member/src/main/resources/hazelcast.xml @@ -1,6 +1,6 @@ ', entryEvent.value); // Entry Added: 1 --> My new entry + } +}; +map.addEntryListener(entryEventListener, undefined, true).then(function () { + return map.put('1', 'My new entry'); +}); +``` + +A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. + +See the following example. + +```javascript +var mapEventListener = { + mapCleared: function (mapEvent) { + console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 3 + } +}; +map.addEntryListener(mapEventListener).then(function () { + return map.put('1', 'Muhammad Ali'); +}).then(function () { + return map.put('2', 'Mike Tyson'); +}).then(function () { + return map.put('3', 'Joe Louis'); +}).then(function () { + return map.clear(); +}); +``` + +As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. + +#### 7.5.2.2. Entry Listener + +The Entry Listener is used by the Hazelcast `MultiMap` and `ReplicatedMap`. + +You can listen to map-wide or entry-based events by using the functions in the `EntryListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `EntryListener` interface. + +An entry-based event is fired after the operations that affect a specific entry. For example, `MultiMap.put()`, `MultiMap.remove()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. + +```javascript +var entryEventListener = { + added: function (entryEvent) { + console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry + } +}; +return mmp.addEntryListener(entryEventListener, undefined, true).then(function () { + return mmp.put('1', 'My new entry'); +}); +``` + +A map-wide event is fired as a result of a map-wide operation. For example, `MultiMap.clear()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. + +See the following example. + +```javascript +var mapEventListener = { + mapCleared: function (mapEvent) { + console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 1 + } +}; +mmp.addEntryListener(mapEventListener).then(function () { + return mmp.put('1', 'Muhammad Ali'); +}).then(function () { + return mmp.put('1', 'Mike Tyson'); +}).then(function () { + return mmp.put('1', 'Joe Louis'); +}).then(function () { + return mmp.clear(); +}); +``` + +Note that all functions in the `EntryListener` interface is not supported by MultiMap and Replicated Map. See the following headings to see supported listener functions for each data structure. + +**Entry Listener Functions Supported by MultiMap** + +- `added` +- `removed` +- `mapCleared` + +**Entry Listener Functions Supported by Replicated Map** + +- `added` +- `removed` +- `updated` +- `evicted` +- `mapCleared` + +As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. + +#### 7.5.2.3. Item Listener + +The Item Listener is used by the Hazelcast `Queue`, `Set` and `List`. + +You can listen to item events by implementing the functions in the `ItemListener` interface including `itemAdded` and `itemRemoved`. These functions are invoked when an item is added or removed. + +The following is an example of item listener object and its registration to the `Set`. It also applies to `Queue` and `List`. + +```javascript +var itemListener = { + itemAdded: function (itemEvent) { + console.log('Item Added:', itemEvent.item); // Item Added: Item1 + }, + itemRemoved: function (itemEvent) { + console.log('Item Removed:', itemEvent.item); // Item Removed: Item1 + } +}; +return set.addItemListener(itemListener, true).then(function () { + return set.add('Item1'); +}).then(function () { + return set.remove('Item1'); +}); +``` + +As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the item event contains the item value. + +#### 7.5.2.4. Message Listener + +The Message Listener is used by the Hazelcast `Reliable Topic`. + +You can listen to message events. To listen to these events, you need to implement the `MessageListener` function to which a `Message` object is passed. + +See the following example. + +```javascript +topic.addMessageListener(function (message) { + console.log(message.messageObject); +}); + +var movie = { + title: 'The Prestige', + year: '2006', + runtime: '130 min', + director: 'Christopher Nolan', + imdbRating: '8.5' +} +topic.publish(movie); +``` + +## 7.6. Distributed Computing + +This chapter explains how you can use Hazelcast IMDG's entry processor implementation in the Node.js client. + +### 7.6.1. Using EntryProcessor + +Hazelcast supports entry processing. An entry processor is a function that executes your code on a map entry in an atomic way. + +An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys -- executing `IMap.get(key)`, mutating the value and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. + +If you are doing the process described above, you should consider using entry processors. An entry processor executes a read and updates upon the member where the data resides. This eliminates the costly network hops described above. + +> **NOTE: Entry processor is meant to process a single entry per call. Processing multiple entries and data structures in an entry processor is not supported as it may result in deadlocks on the server side.** + +Hazelcast sends the entry processor to each cluster member and these members apply it to the map entries. Therefore, if you add more members, your processing completes faster. + +#### Processing Entries + +The `IMap` interface provides the following functions for entry processing: + +* `executeOnKey` processes an entry mapped by a key. +* `executeOnKeys` processes entries mapped by a list of keys. +* `executeOnEntries` can process all entries in a map with a defined predicate. Predicate is optional. + +In the Node.js client, an `EntryProcessor` should be `IdentifiedDataSerializable` or `Portable` because the server should be able to deserialize it to process. + +The following is an example for `EntryProcessor` which is `IdentifiedDataSerializable`. + +```javascript +function IdentifiedEntryProcessor(value) { + this.value = value; +} + +IdentifiedEntryProcessor.prototype.readData = function (inp) { + this.value = inp.readUTF(); +}; + +IdentifiedEntryProcessor.prototype.writeData = function (outp) { + outp.writeUTF(this.value); +}; + +IdentifiedEntryProcessor.prototype.getFactoryId = function () { + return 5; +}; + +IdentifiedEntryProcessor.prototype.getClassId = function () { + return 1; +}; +``` + +Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). + +The following is the Java equivalent of the entry processor in Node.js client given above: + +```java +import com.hazelcast.map.AbstractEntryProcessor; +import com.hazelcast.nio.ObjectDataInput; +import com.hazelcast.nio.ObjectDataOutput; +import com.hazelcast.nio.serialization.IdentifiedDataSerializable; +import java.io.IOException; +import java.util.Map; + +public class IdentifiedEntryProcessor extends AbstractEntryProcessor implements IdentifiedDataSerializable { + static final int CLASS_ID = 1; + private String value; + + public IdentifiedEntryProcessor() { + } + + @Override + public int getFactoryId() { + return IdentifiedFactory.FACTORY_ID; + } + + @Override + public int getId() { + return CLASS_ID; + } + + @Override + public void writeData(ObjectDataOutput out) throws IOException { + out.writeUTF(value); + } + + @Override + public void readData(ObjectDataInput in) throws IOException { + value = in.readUTF(); + } + + @Override + public Object process(Map.Entry entry) { + entry.setValue(value); + return value; + } +} +``` + +You can implement the above processor’s factory as follows: + +```java +import com.hazelcast.nio.serialization.DataSerializableFactory; +import com.hazelcast.nio.serialization.IdentifiedDataSerializable; + +public class IdentifiedFactory implements DataSerializableFactory { + public static final int FACTORY_ID = 5; + + @Override + public IdentifiedDataSerializable create(int typeId) { + if (typeId == IdentifiedEntryProcessor.CLASS_ID) { + return new IdentifiedEntryProcessor(); + } + return null; + } +} +``` + +Now you need to configure the `hazelcast.xml` to add your factory as shown below. + +```xml + + + + + IdentifiedFactory + + + + +``` + +The code that runs on the entries is implemented in Java on the server side. The client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, see the [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. + +After the above implementations and configuration are done and you start the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. See the following example. + +```javascript +var map; +hazelcastClient.getMap('my-distributed-map').then(function (mp) { + map = mp; + return map.put('key', 'not-processed'); +}).then(function () { + return map.executeOnKey('key', new IdentifiedEntryProcessor('processed')); +}).then(function () { + return map.get('key'); +}).then(function (value) { + console.log(value); // processed +}); +``` + +## 7.7. Distributed Query + +Hazelcast partitions your data and spreads it across cluster of members. You can iterate over the map entries and look for certain entries (specified by predicates) you are interested in. However, this is not very efficient because you will have to bring the entire entry set and iterate locally. Instead, Hazelcast allows you to run distributed queries on your distributed map. + +### 7.7.1. How Distributed Query Works + +1. The requested predicate is sent to each member in the cluster. +2. Each member looks at its own local entries and filters them according to the predicate. At this stage, key-value pairs of the entries are deserialized and then passed to the predicate. +3. The predicate requester merges all the results coming from each member into a single set. + +Distributed query is highly scalable. If you add new members to the cluster, the partition count for each member is reduced and thus the time spent by each member on iterating its entries is reduced. In addition, the pool of partition threads evaluates the entries concurrently in each member, and the network traffic is also reduced since only filtered data is sent to the requester. + +**Predicates Object Operators** + +The `Predicates` object offered by the Node.js client includes many operators for your query requirements. Some of them are described below. + +* `equal`: Checks if the result of an expression is equal to a given value. +* `notEqual`: Checks if the result of an expression is not equal to a given value. +* `instanceOf`: Checks if the result of an expression has a certain type. +* `like`: Checks if the result of an expression matches some string pattern. `%` (percentage sign) is the placeholder for many characters, `_` (underscore) is the placeholder for only one character. +* `greaterThan`: Checks if the result of an expression is greater than a certain value. +* `greaterEqual`: Checks if the result of an expression is greater than or equal to a certain value. +* `lessThan`: Checks if the result of an expression is less than a certain value. +* `lessEqual`: Checks if the result of an expression is less than or equal to a certain value. +* `between`: Checks if the result of an expression is between two values, inclusively. +* `inPredicate`: Checks if the result of an expression is an element of a certain list. +* `not`: Checks if the result of an expression is false. +* `regex`: Checks if the result of an expression matches some regular expression. + +Hazelcast offers the following ways for distributed query purposes: + +* Combining Predicates with AND, OR, NOT +* Distributed SQL Query + +#### 7.7.1.1. Employee Map Query Example + +Assume that you have an `employee` map containing the values of `Employee` objects, as coded below. + +```javascript +function Employee(name, age, active, salary) { + this.name = name; + this.age = age; + this.active = active; + this.salary = salary; +} + +Employee.prototype.getClassId = function () { + return 1; +} + +Employee.prototype.getFactoryId = function () { + return 1; +} + +Employee.prototype.readPortable = function (reader) { + this.name = reader.readUTF(); + this.age = reader.readInt(); + this.active = reader.readBoolean(); + this.salary = reader.readDouble(); +} + +Employee.prototype.writePortable = function (writer) { + writer.writeUTF(this.name); + writer.writeInt(this.age); + writer.writeBoolean(this.active); + writer.writeDouble(this.salary); +} +``` + +Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. + +For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). + +> **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** + +#### 7.7.1.2. Querying by Combining Predicates with AND, OR, NOT + +You can combine predicates by using the `and`, `or` and `not` operators, as shown in the below example. + +```javascript +var map; +client.getMap('employee').then(function (mp) { + map = mp; + var predicate = Predicates.and(Predicates.equal('active', true), Predicates.lessThan('age', 30)); + return map.valuesWithPredicate(predicate); +}).then(function (employees) { + // some operations +}); +``` + +In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than 30. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. + +> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast IMDG's distributed map.** + +#### 7.7.1.3. Querying with SQL + +`SqlPredicate` takes the regular SQL `where` clause. See the following example: + +```javascript +var map; +client.getMap('employee').then(function (mp) { + map = mp; + return map.valuesWithPredicate(new SqlPredicate('active AND age < 30')); +}).then(function (employees) { + // some operations +}); +``` + +##### Supported SQL Syntax + +**AND/OR:** ` AND AND …` + +- `active AND age > 30` +- `active = false OR age = 45 OR name = 'Joe'` +- `active AND ( age > 20 OR salary < 60000 )` + +**Equality:** `=, !=, <, ⇐, >, >=` + +- ` = value` +- `age <= 30` +- `name = 'Joe'` +- `salary != 50000` + +**BETWEEN:** ` [NOT] BETWEEN AND ` + +- `age BETWEEN 20 AND 33 ( same as age >= 20 AND age ⇐ 33 )` +- `age NOT BETWEEN 30 AND 40 ( same as age < 30 OR age > 40 )` + +**IN:** ` [NOT] IN (val1, val2,…)` + +- `age IN ( 20, 30, 40 )` +- `age NOT IN ( 60, 70 )` +- `active AND ( salary >= 50000 OR ( age NOT BETWEEN 20 AND 30 ) )` +- `age IN ( 20, 30, 40 ) AND salary BETWEEN ( 50000, 80000 )` + +**LIKE:** ` [NOT] LIKE 'expression'` + +The `%` (percentage sign) is the placeholder for multiple characters, an `_` (underscore) is the placeholder for only one character. + +- `name LIKE 'Jo%'` (true for 'Joe', 'Josh', 'Joseph' etc.) +- `name LIKE 'Jo_'` (true for 'Joe'; false for 'Josh') +- `name NOT LIKE 'Jo_'` (true for 'Josh'; false for 'Joe') +- `name LIKE 'J_s%'` (true for 'Josh', 'Joseph'; false 'John', 'Joe') + +**ILIKE:** ` [NOT] ILIKE 'expression'` + +ILIKE is similar to the LIKE predicate but in a case-insensitive manner. + +- `name ILIKE 'Jo%'` (true for 'Joe', 'joe', 'jOe','Josh','joSH', etc.) +- `name ILIKE 'Jo_'` (true for 'Joe' or 'jOE'; false for 'Josh') + +**REGEX:** ` [NOT] REGEX 'expression'` + +- `name REGEX 'abc-.*'` (true for 'abc-123'; false for 'abx-123') + +##### Querying Examples with Predicates + +You can use the `__key` attribute to perform a predicated search for the entry keys. See the following example: + +```javascript +var personMap; +client.getMap('persons').then(function (mp) { + personMap = mp; + return personMap.put('Alice', 35); +}).then(function () { + return personMap.put('Andy', 37); +}).then(function () { + return personMap.put('Bob', 22); +}).then(function () { + var predicate = new Predicates.sql('__key like A%'); + return personMap.valuesWithPredicate(predicate); +}).then(function (startingWithA) { + console.log(startingWithA.get(0)); // 35 +}); +``` + +In this example, the code creates a list with the values whose keys start with the letter "A”. + +You can use the `this` attribute to perform a predicated search for entry values. See the following example: + +```javascript +var personMap; +return client.getMap('persons').then(function (mp) { + personMap = mp; + return personMap.put('Alice', 35); +}).then(function () { + return personMap.put('Andy', 37); +}).then(function () { + return personMap.put('Bob', 22); +}).then(function () { + var predicate = new Predicates.greaterEqual('this', 27); + return personMap.valuesWithPredicate(predicate); +}).then(function (olderThan27) { + console.log(olderThan27.get(0), olderThan27.get(1)); // 35 37 +}); +``` + +In this example, the code creates a list with the values greater than or equal to "27". + +#### 7.7.1.4. Querying with JSON Strings + +You can query the JSON strings stored inside your Hazelcast clusters. To query a JSON string, you can +use `HazelcastJsonValue` or JavaScript objects. + +`HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. +Then, it is possible to query these objects using the query methods explained in this section. + +```javascript +var personMap; +var person1 = '{ "name": "John", "age": 35 }'; +var person2 = '{ "name": "Jane", "age": 24 }'; +var person3 = '{ "name": "Trey", "age": 17 }'; + +return hz.getMap('personsMap').then(function (map) { + personMap = map; + return personMap.put(1, new HazelcastJsonValue(person1)); +}).then(function () { + return personMap.put(2, new HazelcastJsonValue(person2)); +}).then(function () { + return personMap.put(3, new HazelcastJsonValue(person3)); +}).then(function () { + return personMap.valuesWithPredicate(Predicates.lessThan('age', 21)); +}).then(function (personsUnder21) { + personsUnder21.toArray().forEach(function (person) { + console.log(person); + }); +}); +``` + +When running the queries, Hazelcast treats values extracted from the JSON documents as Java types so they can be compared with the query attribute. +JSON specification defines five primitive types to be used in the JSON documents: `number`, `string`, `true`, `false` and `null`. +The `string`, `true`/`false` and `null` types are treated as `String`, `boolean` and `null`, respectively. `Number` values treated as `long`s if they can be represented by a `long`. +Otherwise, `number`s are treated as `double`s. + +It is possible to query nested attributes and arrays in JSON documents. The query syntax is the same as querying other Hazelcast objects using the `Predicate`s. + +```javascript +var departmentsMap; +var departments = [ + { + departmentId: 1, + room: 'alpha', + people: [ + { + name: 'Peter', + age: 26, + salary: 50000 + + }, + { + name: 'Jonah', + age: 50, + salary: 140000 + } + ] + }, + { + departmentId: 2, + room: 'beta', + people: [ + { + name: 'Terry', + age: 44, + salary: 100000 + } + ] + } +]; +return hz.getMap('departmentsMap').then(function (map) { + departmentsMap = map; + return departmentsMap.putAll(departments.map(function (department, index) { + return [index, department]; + })); +}).then(function () { + // The following query finds all the departments that have a person named "Peter" working in them. + return departmentsMap.valuesWithPredicate(Predicates.equal('people[any].name', 'Peter')) +}).then(function (departmentWithPeter) { + departmentWithPeter.toArray().forEach(function (department) { + console.log(department); + }); +}); +``` + +`HazelcastJsonValue` is a lightweight wrapper around your JSON strings. It is used merely as a way to indicate that the contained string should be treated as a valid JSON value. +Hazelcast does not check the validity of JSON strings put into to maps. Putting an invalid JSON string in a map is permissible. +However, in that case whether such an entry is going to be returned or not from a query is not defined. + +##### Querying with HazelcastJsonValue Objects + +If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization`. + +This means that, you can run queries over your JavaScript objects if they are serialized as JSON strings. However, when the results +of your query are ready, they are parsed from JSON strings and returned to you as JavaScript objects. + +For the purposes of your application, you may want to get rid of the parsing and just work with the raw JSON strings using `HazelcastJsonValue` objects. Then, you can configure your client to do so +as described in the [JSON Serialization](#45-json-serialization) section. + +```javascript +var config = new Config(); +config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; + +Client.newHazelcastClient(config).then(function (hz) { + var moviesMap; + var movies = [ + [1, new HazelcastJsonValue('{ "name": "The Dark Knight", "rating": 9.1 }')], + [2, new HazelcastJsonValue('{ "name": "Inception", "rating": 8.8 }')], + [3, new HazelcastJsonValue('{ "name": "The Prestige", "rating": 8.5 }')] + ]; + return hz.getMap('moviesMap').then(function (map) { + moviesMap = map; + return moviesMap.putAll(movies); + }).then(function () { + return moviesMap.valuesWithPredicate(Predicates.greaterEqual('rating', 8.8)); + }).then(function (highRatedMovies) { + highRatedMovies.toArray().forEach(function (movie) { + console.log(movie.toString()); + }); + return hz.shutdown(); + }); +}); +``` + +##### Metadata Creation for JSON Querying + +Hazelcast stores a metadata object per JSON serialized object stored. This metadata object is created every time a JSON serialized object is put into an `IMap`. +Metadata is later used to speed up the query operations. Metadata creation is on by default. Depending on your application’s needs, you may want to turn off the metadata creation to decrease the put latency and increase the throughput. + +You can configure this using `metadata-policy` element for the map configuration on the member side as follows: + +```xml + + ... + + + OFF + + ... + +``` + +#### 7.7.1.5. Filtering with Paging Predicates + +The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. + +```javascript +var map; +hazelcastClient.getMap('students').then(function (mp) { + map = mp; + + var greaterEqual = Predicates.greaterEqual('age', 18); + var pagingPredicate = Predicates.paging(greaterEqual, 5); + +// Set page to retrieve third page + pagingPredicate.setPage(3); + + // Retrieve third page + return map.valuesWithPredicate(pagingPredicate) +}).then(function (values) { + // some operations +... + + // Set up next page + pagingPredicate.nextPage(); + + // Retrieve next page + return map.valuesWithPredicate(pagingPredicate); +}).then(function (values) { + // some operations +}); +``` + +If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). + +Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. + +### 7.7.2. Fast-Aggregations + +Fast-Aggregations feature provides some aggregate functions, such as `sum`, `average`, `max`, and `min`, on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. + +The `Aggregators` object provides a wide variety of built-in aggregators. The full list is presented below: + +- `count` +- `doubleAvg` +- `doubleSum` +- `numberAvg` +- `fixedPointSum` +- `floatingPointSum` +- `max` +- `min` +- `integerAvg` +- `integerSum` +- `longAvg` +- `longSum` + +You can use these aggregators with the `IMap.aggregate()` and `IMap.aggregateWithPredicate()` functions. + +See the following example. + +```javascript +var map; +hz.getMap('employees').then(function (mp) { + map = mp; + return map.putAll([ + ['John Stiles', 23], + ['Judy Doe', 29], + ['Richard Miles', 38], + ]); +}).then(function () { + return map.aggregate(Aggregators.count()); +}).then(function (count) { + console.log('There are ' + count + ' employees.'); // There are 3 employees. + return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); +}).then(function (count) { + console.log('There are ' + count + ' employees older than 25.'); // There are 2 employees older than 25. + return map.aggregate(Aggregators.numberAvg()); +}).then(function (avgAge) { + console.log('Average age is ' + avgAge); // Average age is 30 +}); +``` + +## 7.8. Performance + +### 7.8.1. Partition Aware + +Partition Aware ensures that the related entries exist on the same member. If the related data is on the same member, operations can be executed without the cost of extra network calls and extra wire data, and this improves the performance. This feature is provided by using the same partition keys for related data. + +Hazelcast has a standard way of finding out which member owns/manages each key object. The following operations are routed to the same member, since all of them are operating based on the same key `'key1'`. + +```javascript +Client.newHazelcastClient().then(function (client) { + hazelcastClient = client; + return hazelcastClient.getMap('mapA') +}).then(function (mp) { + mapA = mp; + return hazelcastClient.getMap('mapB'); +}).then(function (mp) { + mapB = mp; + return hazelcastClient.getMap('mapC'); +}).then(function (mp) { + mapC = mp; + + // since map names are different, operation is manipulating + // different entries, but the operation takes place on the + // same member since the keys ('key1') are the same + return mapA.put('key1', 'value1'); +}).then(function () { + return mapB.get('key1'); +}).then(function (res) { + return mapC.remove('key1'); +}).then(function () { + // lock operation is still execute on the same member + // of the cluster since the key ("key1") is same + return hazelcastClient.getLock('key1'); +}).then(function (l) { + lock = l; + return lock.lock(); +}); +``` + +When the keys are the same, entries are stored on the same member. However, we sometimes want to have the related entries stored on the same member, such as a customer and his/her order entries. We would have a customers map with `customerId` as the key and an orders map with `orderId` as the key. Since `customerId` and `orderId` are different keys, a customer and his/her orders may fall into different members in your cluster. So how can we have them stored on the same member? We create an affinity between the customer and orders. If we make them part of the same partition then these entries will be co-located. We achieve this by making `OrderKey`s `PartitionAware`. + +```javascript +function OrderKey(orderId, customerId) { + this.orderId = orderId; + this.customerId = customerId; +} + +OrderKey.prototype.getPartitionKey = function () { + return this.customerId; +}; +``` + +Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. + +```javascript +var hazelcastClient; +var mapCustomers; +var mapOrders; + +Client.newHazelcastClient().then(function (client) { + hazelcastClient = client; + return hazelcastClient.getMap('customers') +}).then(function (mp) { + mapCustomers = mp; + return hazelcastClient.getMap('orders'); +}).then(function (mp) { + mapOrders = mp; + + // create the customer entry with customer id = 1 + return mapCustomers.put(1, customer); +}).then(function () { + // now create the orders for this customer + return mapOrders.putAll([ + [new OrderKey(21, 1), order], + [new OrderKey(22, 1), order], + [new OrderKey(23, 1), order] + ]); +}); +``` + +For more details, see the [PartitionAware section](https://docs.hazelcast.org/docs/latest/manual/html-single/#partitionaware) in the Hazelcast IMDG Reference Manual. + +### 7.8.2. Near Cache + +Map entries in Hazelcast are partitioned across the cluster members. Hazelcast clients do not have local data at all. Suppose you read the key `k` a number of times from a Hazelcast client and `k` is owned by a member in your cluster. Then each `map.get(k)` will be a remote operation, which creates a lot of network trips. If you have a map that is mostly read, then you should consider creating a local Near Cache, so that reads are sped up and less network traffic is created. + +These benefits do not come for free, please consider the following trade-offs: + +- If invalidation is enabled and entries are updated frequently, then invalidations will be costly. + +- Near Cache breaks the strong consistency guarantees; you might be reading stale data. + +- Clients with a Near Cache will have to hold the extra cached data, which increases memory consumption. + +Near Cache is highly recommended for maps that are mostly read. + +#### 7.8.2.1. Configuring Near Cache + +The following snippets show how a Near Cache is configured in the Node.js client, presenting all available values for each element: + +**Declarative Configuration:** + +``` +{ + "nearCaches": [ + { + "name": "mostlyReadMap", + "invalidateOnChange": (false|true), + "timeToLiveSeconds": (0..Number.MAX_SAFE_INTEGER), + "maxIdleSeconds": (0..Number.MAX_SAFE_INTEGER), + "inMemoryFormat": "(object|binary)", + "evictionPolicy": "lru|lfu|random|none", + "evictionMaxSize": (0..Number.MAX_SAFE_INTEGER), + "evictionSamplingCount": (0..Number.MAX_SAFE_INTEGER), + "evictionSamplingPoolSize": (0..Number.MAX_SAFE_INTEGER), + } + ] +} +``` + +**Programmatic Configuration:** + +```javascript +var nearCacheConfig = new Config.NearCacheConfig(); +nearCacheConfig.name = 'mostlyReadMap'; +nearCacheConfig.invalidateOnChange = (false|true); +nearCacheConfig.timeToLiveSeconds = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.maxIdleSeconds = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.inMemoryFormat= (InMemoryFormat.OBJECT|InMemoryFormat.BINARY); +nearCacheConfig.evictionPolicy = (EvictionPolicy.LRU|EvictionPolicy.LFU|EvictionPolicy.RANDOM|EvictionPolicy.NONE); +nearCacheConfig.evictionMaxSize = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.evictionSamplingCount = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.evictionSamplingPoolSize = (0..Number.MAX_SAFE_INTEGER); + +cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +``` + +Following are the descriptions of all configuration elements: + +- `inMemoryFormat`: Specifies in which format data will be stored in your Near Cache. Note that a map’s in-memory format can be different from that of its Near Cache. Available values are as follows: + - `BINARY`: Data will be stored in serialized binary format (default value). + - `OBJECT`: Data will be stored in deserialized form. + +- `invalidateOnChange`: Specifies whether the cached entries are evicted when the entries are updated or removed in members. Its default value is true. + +- `timeToLiveSeconds`: Maximum number of seconds for each entry to stay in the Near Cache. Entries that are older than this period are automatically evicted from the Near Cache. Regardless of the eviction policy used, `timeToLiveSeconds` still applies. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. + +- `maxIdleSeconds`: Maximum number of seconds each entry can stay in the Near Cache as untouched (not read). Entries that are not read more than this period are removed from the Near Cache. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. + +- `evictionPolicy`: Eviction policy configuration. Available values are as follows: + - `LRU`: Least Recently Used (default value). + - `LFU`: Least Frequently Used. + - `NONE`: No items are evicted and the `evictionMaxSize` property is ignored. You still can combine it with `timeToLiveSeconds` and `maxIdleSeconds` to evict items from the Near Cache. + - `RANDOM`: A random item is evicted. + +- `evictionMaxSize`: Maximum number of entries kept in the memory before eviction kicks in. +- `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. +- `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. + +#### 7.8.2.2. Near Cache Example for Map + +The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. + +**Declarative Configuration:** + +``` +{ + "nearCaches": [ + { + "name": "mostlyReadMap", + "inMemoryFormat": "object", + "invalidateOnChange": true, + "evictionPolicy": "lru", + "evictionMaxSize": 5000, + } + ] +} +``` + +**Programmatic Configuration:** + +```javascript +var nearCacheConfig = new Config.NearCacheConfig(); +nearCacheConfig.name = "mostlyReadMap"; +nearCacheConfig.inMemoryFormat= InMemoryFormat.OBJECT; +nearCacheConfig.invalidateOnChange = true; +nearCacheConfig.evictionPolicy = EvictionPolicy.LRU; +nearCacheConfig.evictionMaxSize = 5000; + +cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +``` + +#### 7.8.2.3. Near Cache Eviction + +In the scope of Near Cache, eviction means evicting (clearing) the entries selected according to the given `evictionPolicy` when the specified `evictionMaxSize` has been reached. + +The `evictionMaxSize` defines the entry count when the Near Cache is full and determines whether the eviction should be triggered. + +Once the eviction is triggered the configured `evictionPolicy` determines which, if any, entries must be evicted. + +#### 7.8.2.4. Near Cache Expiration + +Expiration means the eviction of expired records. A record is expired: + +- if it is not touched (accessed/read) for `maxIdleSeconds` + +- `timeToLiveSeconds` passed since it is put to Near Cache + +The actual expiration is performed when a record is accessed: it is checked if the record is expired or not. If it is expired, it is evicted and `undefined` is returned as the value to the caller. + + +#### 7.8.2.5. Near Cache Invalidation + +Invalidation is the process of removing an entry from the Near Cache when its value is updated or it is removed from the original map (to prevent stale reads). See the [Near Cache Invalidation section](https://docs.hazelcast.org/docs/latest/manual/html-single/#near-cache-invalidation) in the Hazelcast IMDG Reference Manual. + +#### 7.8.2.6. Near Cache Eventual Consistency + +Near Caches are invalidated by invalidation events. Invalidation events can be lost due to the fire-and-forget fashion of eventing system. If an event is lost, reads from Near Cache can indefinitely be stale. + +To solve this problem, Hazelcast provides eventually consistent behavior for Map Near Caches by detecting invalidation losses. After detection of an invalidation loss, stale data will be made unreachable and Near Cache’s `get` calls to that data will be directed to underlying Map to fetch the fresh data. + +You can configure eventual consistency with the `ClientConfig.properties` below: + +- `hazelcast.invalidation.max.tolerated.miss.count`: Default value is `10`. If missed invalidation count is bigger than this value, relevant cached data will be made unreachable. + +- `hazelcast.invalidation.reconciliation.interval.seconds`: Default value is `60` seconds. This is a periodic task that scans cluster members periodically to compare generated invalidation events with the received ones from the client Near Cache. + +### 7.8.3. Automated Pipelining + +Hazelcast Node.js client performs automated pipelining of operations. It means that the library pushes all operations into an internal queue and tries to send them in batches. This reduces the count of executed `Socket.write()` calls and significantly improves throughtput for read operations. + +You can configure automated operation pipelining with the `ClientConfig.properties` below: + +- `hazelcast.client.autopipelining.enabled`: Default value is `true`. Turns automated pipelining feature on/off. If your application does only writes operations, like `IMap.set()`, you can try disabling automated pipelining to get a slightly better throughtput. + +- `hazelcast.client.autopipelining.threshold.bytes`: Default value is `8192` bytes. This is the coalescing threshold for the internal queue used by automated pipelining. Once the total size of operation payloads taken from the queue reaches this value during batch preparation, these operations are written to the socket. Notice that automated pipelining will still send operations if their total size is smaller than the threshold and there are no more operations in the internal queue. + +## 7.9. Monitoring and Logging + +### 7.9.1. Enabling Client Statistics + +You can monitor your clients using Hazelcast Management Center. + +As a prerequisite, you need to enable the client statistics before starting your clients. This can be done by setting the `hazelcast.client.statistics.enabled` system property to `true` on the **member** as the following: + +```xml + + ... + + true + + ... + +``` + +Also, you need to enable the client statistics in the Node.js client. There are two properties related to client statistics: + +- `hazelcast.client.statistics.enabled`: If set to `true`, it enables collecting the client statistics and sending them to the cluster. When it is `true` you can monitor the clients that are connected to your Hazelcast cluster, using Hazelcast Management Center. Its default value is `false`. + +- `hazelcast.client.statistics.period.seconds`: Period in seconds the client statistics are collected and sent to the cluster. Its default value is `3`. + +You can enable client statistics and set a non-default period in seconds as follows: + +**Declarative Configuration:** + +```json +{ + "properties": { + "hazelcast.client.statistics.enabled": true, + "hazelcast.client.statistics.period.seconds": 4 + } +} +``` + +**Programmatic Configuration:** + +```javascript +var config = new Config.ClientConfig(); +config.properties['hazelcast.client.statistics.enabled'] = true; +config.properties['hazelcast.client.statistics.period.seconds'] = 4; +``` + +After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. + +### 7.9.2. Logging Configuration + + By default, Hazelcast Node.js client uses a default logger which logs to the `stdout` with the `INFO` log level. You can change the log level using the `'hazelcast.logging.level'` property of the `ClientConfig.properties`. + +Below is an example of the logging configuration with the `OFF` log level which disables logging. + +```javascript +cfg.properties['hazelcast.logging.level'] = LogLevel.OFF; +``` + + You can also implement a custom logger depending on your needs. Your custom logger must have `log`, `error`, `warn`, `info`, `debug`, `trace` methods. After implementing it, you can use your custom logger using the `customLogger` property of `ClientConfig` + +See the following for a custom logger example. + +```javascript +var winstonAdapter = { + logger: new (winston.Logger)({ + transports: [ + new (winston.transports.Console)() + ] + }), + + levels: [ + 'error', + 'warn', + 'info', + 'debug', + 'silly' + ], + + log: function (level, objectName, message, furtherInfo) { + this.logger.log(this.levels[level], objectName + ': ' + message, furtherInfo); + }, + + error: function (objectName, message, furtherInfo) { + this.log(LogLevel.ERROR, objectName, message, furtherInfo); + }, + + warn: function (objectName, message, furtherInfo) { + this.log(LogLevel.WARN, objectName, message, furtherInfo); + }, + + info: function (objectName, message, furtherInfo) { + this.log(LogLevel.INFO, objectName, message, furtherInfo); + }, + + debug: function (objectName, message, furtherInfo) { + this.log(LogLevel.DEBUG, objectName, message, furtherInfo); + }, + + trace: function (objectName, message, furtherInfo) { + this.log(LogLevel.TRACE, objectName, message, furtherInfo); + } + +}; +cfg.customLogger = winstonAdapter; +``` + +Note that it is not possible to configure custom logging via declarative configuration. + +# 8. Development and Testing + +Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or +tweak the implementation to your application's needs, you can follow the steps in this section. + +## 8.1. Building and Using Client From Sources + +Follow the below steps to build and install Hazelcast Node.js client from its source: + +1. Clone the GitHub repository (https://github.com/hazelcast/hazelcast-nodejs-client.git). +2. Run `npm install` to automatically download and install all the required modules under `node_modules` directory. Note that, +there may be vulnerabilities reported due to `devDependencies`. In that case, run `npm audit fix` to automatically install any compatible updates to vulnerable dependencies. +3. Run `npm run compile` to compile TypeScript files to JavaScript. + +At this point you have all the runnable code (`.js`) and type declarations (`.d.ts`) in the `lib` directory. You may create a link to this module so that your local +applications can depend on your local copy of Hazelcast Node.js client. In order to create a link, run the below command: + +``` +npm link +``` + +This will create a global link to this module in your computer. Whenever you need to depend on this module from another +local project, run the below command: + +``` +npm link hazelcast-client +``` + +If you are planning to contribute, please run the style checker, as shown below, and fix the reported issues before sending a pull request: + +``` +npm run lint +``` + +## 8.2. Testing + +In order to test Hazelcast Node.js client locally, you will need the following: + +* Java 6 or newer +* Maven + +Following command starts the tests: + +``` +npm test +``` + +Test script automatically downloads `hazelcast-remote-controller` and Hazelcast IMDG. The script uses Maven to download those. + +# 9. Getting Help + +You can use the following channels for your questions and development/usage issues: + +* This repository by opening an issue. +* Hazelcast Node.js client channel on Gitter: +[![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +* Our Google Groups directory: https://groups.google.com/forum/#!forum/hazelcast +* Stack Overflow: https://stackoverflow.com/questions/tagged/hazelcast + +# 10. Contributing + +Besides your development contributions as explained in the [Development and Testing chapter](#8-development-and-testing) above, you can always open a pull request on this repository for your other requests such as documentation changes. + +# 11. License + +[Apache 2 License](https://github.com/hazelcast/hazelcast-nodejs-client/blob/master/LICENSE). + +# 12. Copyright + +Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + +Visit [www.hazelcast.com](http://www.hazelcast.com) for more information. diff --git a/README.md b/README.md index 6eb272ff2..8f11f5619 100644 --- a/README.md +++ b/README.md @@ -1,3470 +1,177 @@ -[![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +

+ + + +

Hazelcast Node.js Client

+

+ +

+ NPM version + Chat on Gitter + Follow on Twitter +

-# Table of Contents - -* [Introduction](#introduction) -* [1. Getting Started](#1-getting-started) - * [1.1. Requirements](#11-requirements) - * [1.2. Working with Hazelcast IMDG Clusters](#12-working-with-hazelcast-imdg-clusters) - * [1.2.1. Setting Up a Hazelcast IMDG Cluster](#121-setting-up-a-hazelcast-imdg-cluster) - * [1.2.1.1. Running Standalone JARs](#1211-running-standalone-jars) - * [1.2.1.2. Adding User Library to CLASSPATH](#1212-adding-user-library-to-classpath) - * [1.3. Downloading and Installing](#13-downloading-and-installing) - * [1.4. Basic Configuration](#14-basic-configuration) - * [1.4.1. Configuring Hazelcast IMDG](#141-configuring-hazelcast-imdg) - * [1.4.2. Configuring Hazelcast Node.js Client](#142-configuring-hazelcast-nodejs-client) - * [1.4.2.1. Group Settings](#1421-group-settings) - * [1.4.2.2. Network Settings](#1422-network-settings) - * [1.5. Basic Usage](#15-basic-usage) - * [1.6. Code Samples](#16-code-samples) -* [2. Features](#2-features) -* [3. Configuration Overview](#3-configuration-overview) - * [3.1. Configuration Options](#31-configuration-options) - * [3.1.1. Programmatic Configuration](#311-programmatic-configuration) - * [3.1.2. Declarative Configuration (JSON)](#312-declarative-configuration-json) - * [3.2. Importing Multiple Configurations](#32-importing-multiple-configurations) - * [3.3. Loading Objects and Path Resolution](#33-loading-objects-and-path-resolution) -* [4. Serialization](#4-serialization) - * [4.1. IdentifiedDataSerializable Serialization](#41-identifieddataserializable-serialization) - * [4.2. Portable Serialization](#42-portable-serialization) - * [4.2.1. Versioning for Portable Serialization](#421-versioning-for-portable-serialization) - * [4.3. Custom Serialization](#43-custom-serialization) - * [4.4. Global Serialization](#44-global-serialization) - * [4.5. JSON Serialization](#45-json-serialization) - * [4.6. String Serialization](#46-string-serialization) -* [5. Setting Up Client Network](#5-setting-up-client-network) - * [5.1. Providing Member Addresses](#51-providing-member-addresses) - * [5.2. Setting Smart Routing](#52-setting-smart-routing) - * [5.3. Enabling Redo Operation](#53-enabling-redo-operation) - * [5.4. Setting Connection Timeout](#54-setting-connection-timeout) - * [5.5. Setting Connection Attempt Limit](#55-setting-connection-attempt-limit) - * [5.6. Setting Connection Attempt Period](#56-setting-connection-attempt-period) - * [5.7. Enabling Client TLS/SSL](#57-enabling-client-tlsssl) - * [5.8. Enabling Hazelcast Cloud Discovery](#58-enabling-hazelcast-cloud-discovery) -* [6. Securing Client Connection](#6-securing-client-connection) - * [6.1. TLS/SSL](#61-tlsssl) - * [6.1.1. TLS/SSL for Hazelcast Members](#611-tlsssl-for-hazelcast-members) - * [6.1.2. TLS/SSL for Hazelcast Node.js Clients](#612-tlsssl-for-hazelcast-nodejs-clients) - * [6.1.3. Mutual Authentication](#613-mutual-authentication) - * [6.2. Credentials](#62-credentials) -* [7. Using Node.js Client with Hazelcast IMDG](#7-using-nodejs-client-with-hazelcast-imdg) - * [7.1. Node.js Client API Overview](#71-nodejs-client-api-overview) - * [7.2. Node.js Client Operation Modes](#72-nodejs-client-operation-modes) - * [7.2.1. Smart Client](#721-smart-client) - * [7.2.2. Unisocket Client](#722-unisocket-client) - * [7.3. Handling Failures](#73-handling-failures) - * [7.3.1. Handling Client Connection Failure](#731-handling-client-connection-failure) - * [7.3.2. Handling Retry-able Operation Failure](#732-handling-retry-able-operation-failure) - * [7.4. Using Distributed Data Structures](#74-using-distributed-data-structures) - * [7.4.1. Using Map](#741-using-map) - * [7.4.2. Using MultiMap](#742-using-multimap) - * [7.4.3. Using Replicated Map](#743-using-replicated-map) - * [7.4.4. Using Queue](#744-using-queue) - * [7.4.5. Using Set](#745-using-set) - * [7.4.6. Using List](#746-using-list) - * [7.4.7. Using Ringbuffer](#747-using-ringbuffer) - * [7.4.8. Using Reliable Topic](#748-using-reliable-topic) - * [7.4.9. Using Lock](#749-using-lock) - * [7.4.10. Using Atomic Long](#7410-using-atomic-long) - * [7.4.11. Using Semaphore](#7411-using-semaphore) - * [7.4.12. Using PN Counter](#7412-using-pn-counter) - * [7.4.13. Using Flake ID Generator](#7413-using-flake-id-generator) - * [7.5. Distributed Events](#75-distributed-events) - * [7.5.1. Listening for Cluster Events](#751-listening-for-cluster-events) - * [7.5.1.1. Membership Listener](#7511-membership-listener) - * [7.5.1.2. Distributed Object Listener](#7512-distributed-object-listener) - * [7.5.1.3. Lifecycle Listener](#7513-lifecycle-listener) - * [7.5.2. Listening for Distributed Data Structure Events](#752-listening-for-distributed-data-structure-events) - * [7.5.2.1. Map Listener](#7521-map-listener) - * [7.5.2.2. Entry Listener](#7522-entry-listener) - * [7.5.2.3. Item Listener](#7523-item-listener) - * [7.5.2.4. Message Listener](#7524-message-listener) - * [7.6. Distributed Computing](#76-distributed-computing) - * [7.6.1. Using EntryProcessor](#761-using-entryprocessor) - * [7.7. Distributed Query](#77-distributed-query) - * [7.7.1. How Distributed Query Works](#771-how-distributed-query-works) - * [7.7.1.1. Employee Map Query Example](#7711-employee-map-query-example) - * [7.7.1.2. Querying by Combining Predicates with AND, OR, NOT](#7712-querying-by-combining-predicates-with-and-or-not) - * [7.7.1.3. Querying with SQL](#7713-querying-with-sql) - * [7.7.1.4. Querying with JSON Strings](#7714-querying-with-json-strings) - * [7.7.1.5. Filtering with Paging Predicates](#7715-filtering-with-paging-predicates) - * [7.7.2. Fast-Aggregations](#772-fast-aggregations) - * [7.8. Performance](#78-performance) - * [7.8.1. Partition Aware](#781-partition-aware) - * [7.8.2. Near Cache](#782-near-cache) - * [7.8.2.1. Configuring Near Cache](#7821-configuring-near-cache) - * [7.8.2.2. Near Cache Example for Map](#7822-near-cache-example-for-map) - * [7.8.2.3. Near Cache Eviction](#7823-near-cache-eviction) - * [7.8.2.4. Near Cache Expiration](#7824-near-cache-expiration) - * [7.8.2.5. Near Cache Invalidation](#7825-near-cache-invalidation) - * [7.8.2.6. Near Cache Eventual Consistency](#7826-near-cache-eventual-consistency) - * [7.8.3. Automated Pipelining](#783-automated-pipelining) - * [7.9. Monitoring and Logging](#79-monitoring-and-logging) - * [7.9.1. Enabling Client Statistics](#791-enabling-client-statistics) - * [7.9.2. Logging Configuration](#792-logging-configuration) -* [8. Development and Testing](#8-development-and-testing) - * [8.1. Building and Using Client From Sources](#81-building-and-using-client-from-sources) - * [8.2. Testing](#82-testing) -* [9. Getting Help](#9-getting-help) -* [10. Contributing](#10-contributing) -* [11. License](#11-license) -* [12. Copyright](#12-copyright) - - -# Introduction - -This document provides information about the Node.js client for [Hazelcast](https://hazelcast.org/). This client uses Hazelcast's [Open Client Protocol](https://hazelcast.org/documentation/#open-binary) and works with Hazelcast IMDG 3.6 and higher versions. - -### Resources - -See the following for more information on Node.js and Hazelcast IMDG: - -* Hazelcast IMDG [website](https://hazelcast.org/) -* Hazelcast IMDG [Reference Manual](https://hazelcast.org/documentation/#imdg) -* About [Node.js](https://nodejs.org/en/about/) - -### Release Notes - -See the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page of this repository. - - -# 1. Getting Started - -This chapter provides information on how to get started with your Hazelcast Node.js client. It outlines the requirements, installation and configuration of the client, setting up a cluster, and provides a simple application that uses a distributed map in Node.js client. - -## 1.1. Requirements - -- Windows, Linux or MacOS -- Node.js 4 or newer -- Java 6 or newer -- Hazelcast IMDG 3.6 or newer -- Latest Hazelcast Node.js client - -## 1.2. Working with Hazelcast IMDG Clusters - -Hazelcast Node.js client requires a working Hazelcast IMDG cluster to run. This cluster handles storage and manipulation of the user data. -Clients are a way to connect to the Hazelcast IMDG cluster and access such data. - -Hazelcast IMDG cluster consists of one or more cluster members. These members generally run on multiple virtual or physical machines -and are connected to each other via network. Any data put on the cluster is partitioned to multiple members transparent to the user. -It is therefore very easy to scale the system by adding new members as the data grows. Hazelcast IMDG cluster also offers resilience. Should -any hardware or software problem causes a crash to any member, the data on that member is recovered from backups and the cluster -continues to operate without any downtime. Hazelcast clients are an easy way to connect to a Hazelcast IMDG cluster and perform tasks on -distributed data structures that live on the cluster. - -In order to use Hazelcast Node.js client, we first need to setup a Hazelcast IMDG cluster. - -### 1.2.1. Setting Up a Hazelcast IMDG Cluster - -There are following options to start a Hazelcast IMDG cluster easily: - -* You can run standalone members by downloading and running JAR files from the website. -* You can embed members to your Java projects. - -We are going to download JARs from the website and run a standalone member for this guide. - -#### 1.2.1.1. Running Standalone JARs - -Follow the instructions below to create a Hazelcast IMDG cluster: - -1. Go to Hazelcast's download [page](https://hazelcast.org/download/) and download either the `.zip` or `.tar` distribution of Hazelcast IMDG. -2. Decompress the contents into any directory that you -want to run members from. -3. Change into the directory that you decompressed the Hazelcast content and then into the `bin` directory. -4. Use either `start.sh` or `start.bat` depending on your operating system. Once you run the start script, you should see the Hazelcast IMDG logs in the terminal. - -You should see a log similar to the following, which means that your 1-member cluster is ready to be used: - -``` -INFO: [192.168.0.3]:5701 [dev] [3.10.4] - -Members {size:1, ver:1} [ - Member [192.168.0.3]:5701 - 65dac4d1-2559-44bb-ba2e-ca41c56eedd6 this -] - -Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService -INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED -``` - -#### 1.2.1.2. Adding User Library to CLASSPATH - -When you want to use features such as querying and language interoperability, you might need to add your own Java classes to the Hazelcast member in order to use them from your Node.js client. This can be done by adding your own compiled code to the `CLASSPATH`. To do this, compile your code with the `CLASSPATH` and add the compiled files to the `user-lib` directory in the extracted `hazelcast-.zip` (or `tar`). Then, you can start your Hazelcast member by using the start scripts in the `bin` directory. The start scripts will automatically add your compiled classes to the `CLASSPATH`. - -Note that if you are adding an `IdentifiedDataSerializable` or a `Portable` class, you need to add its factory too. Then, you should configure the factory in the `hazelcast.xml` configuration file. This file resides in the `bin` directory where you extracted the `hazelcast-.zip` (or `tar`). - -The following is an example configuration when you are adding an `IdentifiedDataSerializable` class: - -```xml - - ... - - - > - IdentifiedFactoryClassName - - - - ... - -``` -If you want to add a `Portable` class, you should use `` instead of `` in the above configuration. - -See the [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#getting-started) for more information on setting up the clusters. - -## 1.3. Downloading and Installing - -Hazelcast Node.js client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. - -``` -npm install hazelcast-client --save -``` - -## 1.4. Basic Configuration - -If you are using Hazelcast IMDG and Node.js Client on the same computer, generally the default configuration should be fine. This is great for -trying out the client. However, if you run the client on a different computer than any of the cluster members, you may -need to do some simple configurations such as specifying the member addresses. - -The Hazelcast IMDG members and clients have their own configuration options. You may need to reflect some of the member side configurations on the client side to properly connect to the cluster. - -This section describes the most common configuration elements to get you started in no time. -It discusses some member side configuration options to ease the understanding of Hazelcast's ecosystem. Then, the client side configuration options -regarding the cluster connection are discussed. The configurations for the Hazelcast IMDG data structures that can be used in the Node.js client are discussed in the following sections. - -See the [Hazelcast IMDG Reference Manual](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html) and [Configuration Overview section](#3-configuration-overview) for more information. - -### 1.4.1. Configuring Hazelcast IMDG - -Hazelcast IMDG aims to run out-of-the-box for most common scenarios. However if you have limitations on your network such as multicast being disabled, -you may have to configure your Hazelcast IMDG members so that they can find each other on the network. Also, since most of the distributed data structures are configurable, you may want to configure them according to your needs. We will show you the basics about network configuration here. - -You can use the following options to configure Hazelcast IMDG: - -* Using the `hazelcast.xml` configuration file. -* Programmatically configuring the member before starting it from the Java code. - -Since we use standalone servers, we will use the `hazelcast.xml` file to configure our cluster members. - -When you download and unzip `hazelcast-.zip` (or `tar`), you see the `hazelcast.xml` in the `bin` directory. When a Hazelcast member starts, it looks for the `hazelcast.xml` file to load the configuration from. A sample `hazelcast.xml` is shown below. - -```xml - - - dev - dev-pass - - - 5701 - - - 224.2.2.3 - 54327 - - - 127.0.0.1 - - 127.0.0.1 - - - - - - - - 1 - - -``` - -We will go over some important configuration elements in the rest of this section. - -- ``: Specifies which cluster this member belongs to. A member connects only to the other members that are in the same group as -itself. As shown in the above configuration sample, there are `` and `` tags under the `` element with some pre-configured values. You may give your clusters different names so that they can -live in the same network without disturbing each other. Note that the cluster name should be the same across all members and clients that belong - to the same cluster. The `` tag is not in use since Hazelcast 3.9. It is there for backward compatibility -purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. -- `` - - ``: Specifies the port number to be used by the member when it starts. Its default value is 5701. You can specify another port number, and if - you set `auto-increment` to `true`, then Hazelcast will try the subsequent ports until it finds an available port or the `port-count` is reached. - - ``: Specifies the strategies to be used by the member to find other cluster members. Choose which strategy you want to - use by setting its `enabled` attribute to `true` and the others to `false`. - - ``: Members find each other by sending multicast requests to the specified address and port. It is very useful if IP addresses - of the members are not static. - - ``: This strategy uses a pre-configured list of known members to find an already existing cluster. It is enough for a member to - find only one cluster member to connect to the cluster. The rest of the member list is automatically retrieved from that member. We recommend - putting multiple known member addresses there to avoid disconnectivity should one of the members in the list is unavailable at the time - of connection. - -These configuration elements are enough for most connection scenarios. Now we will move onto the configuration of the Node.js client. - -### 1.4.2. Configuring Hazelcast Node.js Client - -There are two ways to configure a Hazelcast Node.js client: - -* Programmatically -* Declaratively (JSON) - -This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. See the [Configuration Overview section](#3-configuration-overview) -and the following sections for information about detailed network configurations and/or additional features of Hazelcast Node.js client configuration. - -An easy way to configure your Hazelcast Node.js client is to create a `ClientConfig` object and set the appropriate options. Then you can -supply this object to your client at the startup. This is the programmatic configuration approach. Another way to configure your client, which is the declarative approach, is to provide a `hazelcast-client.json` file. This is similar to the `hazelcast.xml` approach -in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas the member configuration is XML based. Although these -two formats are different, you will realize that the names of configuration parameters are the same for both the client and member. -It is done this way to make it easier to transfer Hazelcast skills to multiple platforms. - -Once you embedded `hazelcast-client` to your Node.js project, you may follow any of programmatic or declarative configuration approaches. -We will provide both ways for each configuration option in this section. Pick one way and stick to it. - -**Programmatic Configuration:** - -You need to create a `ClientConfig` object and adjust its properties. Then you can pass this object to the client when starting it. - -```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); -Client.newHazelcastClient(config).then(function(client) { - // some operations -}); -``` - -**Declarative Configuration:** - -Hazelcast Node.js client looks for a `hazelcast-client.json` in the current working directory unless you provide a configuration object -at the startup. If you intend to configure your client using a configuration file, then place a `hazelcast-client.json` in the directory -of your application's entry point. - -If you prefer to keep your `hazelcast-client.json` file somewhere else, you can override the environment variable `HAZELCAST_CLIENT_CONFIG` -with the location of your config file. In this case, the client uses the configuration file specified in the environment variable. - -For the structure of `hazelcast-client.json`, see the [hazelcast-client-full.json file](hazelcast-client-full.json). You -can use only the relevant parts of the file in your `hazelcast-client.json` and remove the rest. The default configuration is used for any -part that you do not explicitly set in the `hazelcast-client.json` file. - ---- - -If you run the Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster -names as explained in the previous section. If you did, then you need to make certain changes to the network settings of your client. - -#### 1.4.2.1. Group Settings - -You need to provide the group name of the cluster, if it is defined on the server side, to which you want the client to connect. - -**Programmatic Configuration:** - -```javascript -let cfg = new Config.ClientConfig(); -cfg.group.name = 'group name of your cluster' -``` - -**Declarative Configuration:** - -```json -{ - "group": { - "name": "group name of your cluster" - } -} -``` - -> **NOTE: If you have a Hazelcast IMDG release older than 3.11, you need to provide also a group password along with the group name.** - -#### 1.4.2.2. Network Settings - -You need to provide the IP address and port of at least one member in your cluster so the client can find it. - -**Programmatic Configuration:** - -```javascript -let cfg = new Config.ClientConfig(); -cfg.network.addresses.push('some-ip-address:port'); -``` - -**Declarative Configuration:** - -```json -{ - "network": { - "clusterMembers": [ - "some-ip-address:port" - ], - } -} -``` - -## 1.5. Basic Usage - -Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a -distributed map in the Node.js client. - -The following example first creates a programmatic configuration object. Then, it starts a client. - -```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); // We create a config for illustrative purposes. - // We do not adjust this config. Therefore it has default settings. - -Client.newHazelcastClient(config).then(function(client) { - console.log(client.getLocalEndpoint()); // Connects and prints some information about this client -}); -``` - -This should print logs about the cluster members and information about the client itself such as the client type, UUID and address. - -``` -[DefaultLogger] INFO at LifecycleService: HazelcastClient is starting -[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.43:5701 authenticated -[DefaultLogger] INFO at ClusterService: Members received. -[ Member { - address: Address { host: '10.216.1.43', port: 5701, type: 4 }, - uuid: '7961eef2-940d-42dc-8036-2a29c5c9942c', - isLiteMember: false, - attributes: {} } ] -[DefaultLogger] INFO at LifecycleService: HazelcastClient is started -ClientInfo { - type: 'NodeJS', - uuid: '8618226d-0e7b-4442-b9c2-a5918a3d3db2', - localAddress: Address { host: '127.0.0.1', port: 54708, type: 4 } } -``` - -Congratulations! You just started a Hazelcast Node.js client. - -**Using a Map** - -Let's manipulate a distributed map on a cluster using the client. - -Save the following file as `IT.js` and run it using `node IT.js`. - -**IT.js** -```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); - -Client.newHazelcastClient(config).then(function (client) { - var personnelMap; - return client.getMap('personnelMap').then(function (mp) { - personnelMap = mp; - return personnelMap.put('Alice', 'IT'); - }).then(function () { - return personnelMap.put('Bob', 'IT'); - }).then(function () { - return personnelMap.put('Clark', 'IT'); - }).then(function () { - console.log("Added IT personnel. Logging all known personnel"); - return personnelMap.entrySet(); - }).then(function (allPersonnel) { - allPersonnel.forEach(function (person) { - console.log(person[0] + ' is in ' + person[1] + ' department'); - }); - return client.shutdown(); - }); -}); -``` - -**Output** - -``` -Added IT personnel. Logging all known personnel -Alice is in IT department -Clark is in IT department -Bob is in IT department -``` - -You see this example puts all the IT personnel into a cluster-wide `personnelMap` and then prints all the known personnel. - -Now create a `Sales.js` file as shown below and run it using `node Sales.js`. - -**Sales.js** - -```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); - -Client.newHazelcastClient(config).then(function (client) { - var personnelMap; - return client.getMap('personnelMap').then(function (mp) { - personnelMap = mp; - return personnelMap.put('Denise', 'Sales'); - }).then(function () { - return personnelMap.put('Erwing', 'Sales'); - }).then(function () { - return personnelMap.put('Faith', 'Sales'); - }).then(function () { - console.log("Added Sales personnel. Logging all known personnel"); - return personnelMap.entrySet(); - }).then(function (allPersonnel) { - allPersonnel.forEach(function (person) { - console.log(person[0] + ' is in ' + person[1] + ' department'); - }); - return client.shutdown(); - }); -}); -``` - -**Output** - -``` -Added Sales personnel. Logging all known personnel -Denise is in Sales department -Erwing is in Sales department -Faith is in Sales department -Alice is in IT department -Clark is in IT department -Bob is in IT department -``` - -You will see this time we add only the sales employees but we get the list all known employees including the ones in IT. -That is because our map lives in the cluster and no matter which client we use, we can access the whole map. - -## 1.6. Code Samples - -See the Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast-nodejs-client/tree/master/code_samples) for more examples. - -You can also see the Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). - -# 2. Features - -Hazelcast Node.js client supports the following data structures and features: - -* Map -* Queue -* Set -* List -* MultiMap -* Replicated Map -* Ringbuffer -* Reliable Topic -* Lock -* Semaphore -* Atomic Long -* CRDT PN Counter -* Flake Id Generator -* Event Listeners -* Entry Processor -* Query (Predicates) -* Paging Predicate -* Built-in Predicates -* Listener with Predicate -* Fast Aggregations -* Near Cache Support -* Eventual Consistency Control -* Declarative Configuration (JSON) -* Programmatic Configuration -* Client Configuration Import -* Fail Fast on Invalid Configuration -* SSL Support (requires Enterprise server) -* Mutual Authentication (requires Enterprise server) -* Authorization -* Smart Client -* Unisocket Client -* Lifecycle Service -* Hazelcast Cloud Discovery -* IdentifiedDataSerializable Serialization -* Portable Serialization -* Custom Serialization -* Global Serialization - -# 3. Configuration Overview - -This chapter describes the options to configure your Node.js client and explains how you can import multiple configurations -and how you should set paths and exported names for the client to load objects. - -## 3.1. Configuration Options - -You can configure the Hazelcast Node.js client declaratively (JSON) or programmatically (API). - -### 3.1.1. Programmatic Configuration - -For programmatic configuration of the Hazelcast Node.js client, just instantiate a `ClientConfig` object and configure the -desired aspects. An example is shown below. - -```javascript -var Config = require('hazelcast-client').Config; -var cfg = new Config.ClientConfig(); -cfg.networkConfig.addresses.push('127.0.0.1:5701'); -HazelcastClient.newHazelcastClient(cfg).then(function (client) { - // some operations -}); -``` - -See the `ClientConfig` class documentation at [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. - -### 3.1.2. Declarative Configuration (JSON) - -If the client is not supplied with a programmatic configuration at the time of initialization, it will look for a configuration file named `hazelcast-client.json`. If this file exists, then the configuration is loaded from it. Otherwise, the client will start with the default configuration. The following are the places that the client looks for a `hazelcast-client.json` in the given order: - -1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, -the client looks for the configuration file in the specified location. -2. Current working directory: If there is no environment variable set, the client tries to load `hazelcast-client.json` -from the current working directory. -3. Default configuration: If all of the above methods fail, the client starts with the default configuration. -The default configuration is programmatic. If you want to override the default configuration declaratively, you need to create -a `hazelcast-client.json` file in your working directory. To get an idea about the structure of this configuration file, see [hazelcast-client-default.json](hazelcast-client-default.json) and [hazelcast-client-full.json](hazelcast-client-full.json). - -Following is a sample JSON configuration file: - -```json -{ - "group": { - "name": "hazel", - "password": "cast" - }, - "properties": { - "hazelcast.client.heartbeat.timeout": 10000, - "hazelcast.client.invocation.retry.pause.millis": 4000, - "hazelcast.client.invocation.timeout.millis": 180000, - "hazelcast.invalidation.reconciliation.interval.seconds": 50, - "hazelcast.invalidation.max.tolerated.miss.count": 15, - "hazelcast.invalidation.min.reconciliation.interval.seconds": 60 - }, - "network": { - "clusterMembers": [ - "127.0.0.1:5701" - ], - "smartRouting": true, - "connectionTimeout": 6000, - "connectionAttemptPeriod": 4000, - "connectionAttemptLimit": 3 - } -} -``` - -In the following chapters you will learn the description of all elements included in a JSON configuration file used to configure Hazelcast Node.js client. - -## 3.2. Importing Multiple Configurations - -You can compose the declarative configuration of your Node.js client from multiple declarative -configuration snippets. In order to compose a declarative configuration, you can use the `import` element to load -different declarative configuration files. - -Let's assume you have the following two configurations: - -`group-config.json`: - -```json -{ - "group": { - "name": "hazel", - "password": "cast" - } -} -``` - -`network-config.json`: - -```json -{ - "network": { - "clusterMembers": [ - "127.0.0.10:4001", - "127.0.0.11:4001" - ] - } -} -``` - -To get your example client configuration out of the above two, use the `import` element as -shown below. - -```json -{ - "import": [ - "group-config.json", - "network-config.json" - ] -} -``` - -> Note: Use `import` element on top level of JSON hierarchy. - -## 3.3. Loading Objects and Path Resolution - -For configuration elements that require you to specify a code piece, you will need to specify the path to the -code and name of the exported element that you want the client to use. This configuration is set as follows: - -```json -{ - "path": "path/to/file", - "exportedName": "MyObject" -} -``` - -In the above configuration, `path` shows the address to the file that you want the client to load. Unless this is an -absolute path, it is relative to the location of `hazelcast-config.json` file. - -In Javascript, you can define and export as many objects as you want in a single file. Above configuration element -is designed to load only one specified object from a file (`MyObject`). Therefore, `exportedName` specifies the name of desired object. - -Let's say your project's directory structure is as follows: - - my_app/ - my_app/index.js - my_app/factory_utils.js - my_app/hazelcast-client.json - my_app/node_modules/ - my_app/node_modules/hazelcast-client - -In the `factory_utils.js` file, you have multiple exported functions: - -```javascript -exports.utilityFunction = function() {...} -exports.MySSLFactory = function() {...} -``` - -In order to load `MySSLFactory` in your SSL configuration, you should set `path` and `exportedName` as `factory_utils.js` -and `MySSLFactory`, respectively. - -If you have only one export as the default export from `factory_utils.js`, just skip the `exportedName` property and -the client will load the default export from the file. - - -# 4. Serialization - -Serialization is the process of converting an object into a stream of bytes to store the object in the memory, a file or database, or transmit it through the network. Its main purpose is to save the state of an object in order to be able to recreate it when needed. The reverse process is called deserialization. Hazelcast offers you its own native serialization methods. You will see these methods throughout this chapter. - -Hazelcast serializes all your objects before sending them to the server. The `boolean`, `number`,`string` and `Long` types are serialized natively and you cannot override this behavior. The following table is the conversion of types for the Java server side. - -| Node.js | Java | -|---------|-------------------------------------| -| boolean | Boolean | -| number | Byte, Short, Integer, Float, Double | -| string | String | -| Long | Long | - -> Note: A `number` type is serialized as `Double` by default. You can configure this behavior using the `SerializationConfig.defaultNumberType` method. - -Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for the Java server side, respectively. - -**Serialization Priority** - -When Hazelcast Node.js client serializes an object: - -1. It first checks whether the object is null. - -2. If the above check fails, then it checks if it is an instance of `IdentifiedDataSerializable`. - -3. If the above check fails, then it checks if it is an instance of `Portable`. - -4. If the above check fails, then it checks if it is an instance of one of the default types (see above default types). - -5. If the above check fails, then it looks for a user-specified [Custom Serialization](#43-custom-serialization). - -6. If the above check fails, it will use the registered [Global Serialization](#44-global-serialization) if one exists. - -7. If the above check fails, then the Node.js client uses `JSON Serialization` by default. - -However, `JSON Serialization` is not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization methods, such as [`IdentifiedDataSerializable` Serialization](#41-identifieddataserializable-serialization) and [`Portable` Serialization](#42-portable-serialization). - -Or, if you want to use your own serialization method, you can use a [Custom Serialization](#43-custom-serialization). - -> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, - some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** - -## 4.1. IdentifiedDataSerializable Serialization - -For a faster serialization of objects, Hazelcast recommends to implement the `IdentifiedDataSerializable` interface. The following is an example of an object implementing this interface: - -```javascript -function Employee(id, name) { - this.id = id; - this.name = name; -} - -Employee.prototype.readData = function (input) { - this.id = input.readInt(); - this.name = input.readUTF(); -}; - -Employee.prototype.writeData = function (output) { - output.writeInt(this.id); - output.writeUTF(this.name); -}; - -Employee.prototype.getFactoryId = function () { - return 1000; -}; - -Employee.prototype.getClassId = function () { - return 100; -}; - -Employee.prototype.getClassId = function () { - return this.classId; -}; -``` - -The `IdentifiedDataSerializable` interface uses `getClassId()` and `getFactoryId()` to reconstitute the object. To complete the implementation, `IdentifiedDataSerializableFactory` should also be implemented and registered into `SerializationConfig` which can be accessed from `Config.serializationConfig`. The factory's responsibility is to return an instance of the right `IdentifiedDataSerializable` object, given the `classId`. - -A sample `IdentifiedDataSerializableFactory` could be implemented as follows: - -```javascript -function SampleDataSerializableFactory() { - // Constructor function -} - -SampleDataSerializableFactory.prototype.create = function (type) { - if (type === 100) { - return new Employee(); - } - return null; -}; -``` - -The last step is to register the `IdentifiedDataSerializableFactory` to the `SerializationConfig`. - -**Programmatic Configuration:** - -```javascript -var config = new Config.ClientConfig(); -config.serializationConfig.dataSerializableFactories[1000] = new SampleDataSerializableFactory(); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "dataSerializableFactories": [ - { - "path": "factory.js", - "exportedName": "SampleDataSerializableFactory", - "factoryId": 1000 - } - ] - } -} -``` - -Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that the `Employee` object returns. - -## 4.2. Portable Serialization - -As an alternative to the existing serialization methods, Hazelcast offers portable serialization. To use it, you need to implement the `Portable` interface. Portable serialization has the following advantages: - -- Supporting multiversion of the same object type. -- Fetching individual fields without having to rely on the reflection. -- Querying and indexing support without deserialization and/or reflection. - -In order to support these features, a serialized `Portable` object contains meta information like the version and concrete location of the each field in the binary data. This way Hazelcast is able to navigate in the binary data and deserialize only the required field without actually deserializing the whole object which improves the query performance. - -With multiversion support, you can have two members each having different versions of the same object; Hazelcast stores both meta information and uses the correct one to serialize and deserialize portable objects depending on the member. This is very helpful when you are doing a rolling upgrade without shutting down the cluster. - -Also note that portable serialization is totally language independent and is used as the binary protocol between Hazelcast server and clients. - -A sample portable implementation of a `Customer` class looks like the following: - -```javascript -function Customer(name, id, lastOrder) { - this.name = name; - this.id = id; - this.lastOrder = lastOrder; - this.classId = 1; -} - -Customer.prototype.readPortable = function (reader) { - this.name = reader.readUTF('name'); - this.id = reader.readInt('id'); - this.lastOrder = reader.readLong('lastOrder').toNumber(); -}; - -Customer.prototype.writePortable = function (writer) { - writer.writeUTF('name', this.name); - writer.writeInt('id', this.id); - writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); -}; - -Customer.prototype.getFactoryId = function () { - return PortableFactory.factoryId; -}; - -Customer.prototype.getClassId = function () { - return this.classId; -}; -``` - -Similar to `IdentifiedDataSerializable`, a `Portable` object must provide `classId` and `factoryId`. The factory object will be used to create the `Portable` object given the `classId`. - -A sample `PortableFactory` could be implemented as follows: - -```javascript -function PortableFactory() { - // Constructor function -} - -PortableFactory.prototype.create = function (classId) { - if (classId === 1) { - return new Customer(); - } - return null; -}; -``` - -The last step is to register the `PortableFactory` to the `SerializationConfig`. - -**Programmatic Configuration:** - -```javascript -var config = new Config.ClientConfig(); -config.serializationConfig.portableFactories[1] = new PortableFactory(); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "portableFactories": [ - { - "path": "factory.js", - "exportedName": "PortableFactory", - "factoryId": 1 - } - ] - } -} -``` - -Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that `Customer` object returns. - - -### 4.2.1. Versioning for Portable Serialization - -More than one version of the same class may need to be serialized and deserialized. For example, a client may have an older version of a class and the member to which it is connected may have a newer version of the same class. - -Portable serialization supports versioning. It is a global versioning, meaning that all portable classes that are serialized through a client get the globally configured portable version. - -You can declare the version in the `hazelcast-client.json` configuration file using the `portableVersion` element, as shown below. - -```json -{ - "serialization": { - "portableVersion": 0 - } -} -``` - -If you update the class by changing the type of one of the fields or by adding a new field, it is a good idea to upgrade the version of the class, rather than sticking to the global version specified in the `hazelcast-client.json` file. -In the Node.js client, you can achieve this by simply adding the `getVersion()` method to your class’s implementation of `Portable`, and setting the `ClassVersion` to be different than the default global version. - -> **NOTE: If you do not use the `getVersion()` method in your `Portable` implementation, it will have the global version, by default.** - -Here is an example implementation of creating a version 2 for the Foo class: - -```javascript -function Foo(foo, foo2) { - this.foo = foo; - this.foo2 = foo2; -} - -Foo.prototype.getFactoryId = function () { - return 1; -}; - -Foo.prototype.getClassId = function () { - return 1; -}; - -Foo.prototype.getVersion = function () { - return 2; -}; - -Foo.prototype.readPortable = function (reader) { - this.foo = reader.readUTF('foo'); - this.foo2 = reader.readUTF('foo2'); -}; - -Foo.prototype.writePortable = function (writer) { - writer.writeUTF('foo', this.foo); - writer.writeUTF('foo2', this.foo2); -}; -``` - -You should consider the following when you perform versioning: - -- It is important to change the version whenever an update is performed in the serialized fields of a class, for example by incrementing the version. -- If a client performs a Portable deserialization on a field and then that Portable is updated by removing that field on the cluster side, this may lead to problems such as a TypeError being thrown when an older version of the client tries to access the removed field. -- Portable serialization does not use reflection and hence, fields in the class and in the serialized content are not automatically mapped. Field renaming is a simpler process. Also, since the class ID is stored, renaming the Portable does not lead to problems. -- Types of fields need to be updated carefully. Hazelcast performs basic type upgradings, such as `int` to `float`. - -#### Example Portable Versioning Scenarios: - -Assume that a new client joins to the cluster with a class that has been modified and class's version has been upgraded due to this modification. - -If you modified the class by adding a new field, the new client’s put operations include that new field. If this new client tries to get an object that was put from the older clients, it gets null for the newly added field. - -If you modified the class by removing a field, the old clients get null for the objects that are put by the new client. - -If you modified the class by changing the type of a field to an incompatible type (such as from `int` to `String`), a `TypeError` is generated as the client tries accessing an object with the older version of the class. The same applies if a client with the old version tries to access a new version object. - -If you did not modify a class at all, it works as usual. - -## 4.3. Custom Serialization - -Hazelcast lets you plug a custom serializer to be used for serialization of objects. - -Let's say you have an object `CustomSerializable` and you would like to customize the serialization, since you may want to use an external serializer for only one object. - -```javascript -function CustomSerializable(value) { - this.value = value; -} - -CustomSerializable.prototype.hzGetCustomId = function () { - return 10; -}; -``` - -Let's say your custom `CustomSerializer` will serialize `CustomSerializable`. - -```javascript -function CustomSerializer() { - // Constructor function -} - -CustomSerializer.prototype.getId = function () { - return 10; -}; - -CustomSerializer.prototype.write = function (output, t) { - output.writeInt(t.value.length); - for (var i = 0; i < t.value.length; i++) { - output.writeInt(t.value.charCodeAt(i)); - } -}; - -CustomSerializer.prototype.read = function (reader) { - var len = reader.readInt(); - var str = ''; - for (var i = 0; i < len; i++) { - str = str + String.fromCharCode(reader.readInt()); - } - return new CustomSerializable(str); -}; -``` - -Note that the serializer `id` must be unique as Hazelcast will use it to lookup the `CustomSerializer` while it deserializes the object. Now the last required step is to register the `CustomSerializer` to the configuration. - -**Programmatic Configuration:** - -```javascript -var config = new Config.ClientConfig(); -config.serializationConfig.customSerializers.push(new CustomSerializer()); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "defaultNumberType": "integer", - "isBigEndian": false, - "serializers": [ - { - "path": "custom.js", - "exportedName": "CustomSerializer", - "typeId": 10 - } - ] - } -} -``` - -From now on, Hazelcast will use `CustomSerializer` to serialize `CustomSerializable` objects. - -## 4.4. Global Serialization - -The global serializer is identical to custom serializers from the implementation perspective. The global serializer is registered as a fallback serializer to handle all other objects if a serializer cannot be located for them. - -By default, JSON serialization is used if the object is not `IdentifiedDataSerializable` or `Portable` or there is no custom serializer for it. When you configure a global serializer, it is used instead of JSON serialization. - -**Use cases:** - -* Third party serialization frameworks can be integrated using the global serializer. -* For your custom objects, you can implement a single serializer to handle all of them. - -A sample global serializer that integrates with a third party serializer is shown below. - -```javascript -function GlobalSerializer() { - // Constructor function -} - -GlobalSerializer.prototype.getId = function () { - return 20; -}; - -GlobalSerializer.prototype.read = function (input) { - return MyFavoriteSerializer.deserialize(input.readByteArray()); -}; - -GlobalSerializer.prototype.write = function (output, obj) { - output.writeByteArray(MyFavoriteSerializer.serialize(obj)) -}; -``` - -You should register the global serializer in the configuration. - -**Programmatic Configuration:** - -```javascript -config.serializationConfig.globalSerializer = new GlobalSerializer(); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "defaultNumberType": "integer", - "isBigEndian": false, - "globalSerializer": { - "path": "global_serializer.js", - "exportedName": "MyFavoriteSerializer" - } - } -} -``` - -## 4.5. JSON Serialization - -If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization` by default. With `JSON Serialization`, objects -are converted to JSON strings and transmitted to the Hazelcast members as such. - -When the Hazelcast Node.js client retrieves a JSON serialized data from a member, it parses the JSON string and returns the object represented by that -string to the user. However, you may want to defer the string parsing and work with the raw JSON strings. - -For this purpose, you can configure your client to return `HazelcastJsonValue` objects when it retrieves a JSON serialized data from a member. - -`HazelcastJsonValue` is a lightweight wrapper around the JSON strings. You may get the JSON string representation of the object using the `toString` method. - -Below is the configuration required to return `HazelcastJsonValue` objects instead of JavaScript objects. - -**Programmatic Configuration:** - -```javascript -config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "jsonStringDeserializationPolicy": "no_deserialization" - } -} -``` - -## 4.6. String Serialization - -Starting from version v3.12 Hazelcast Node.js client follows UTF-8 standard (RFC 3629) for string data type serialization of 4 byte UTF characters, like less common CJK characters and emoji. This may lead to compatibility issues with Hazelcast IMDG 3.x and other client libraries for string and JSON values. Such issues are represented by `Malformed byte sequence` (error code 64) errors on members and other clients. - -In case if you encounter these error messages, you can switch to the legacy mode of string serialization that provides full compatibility with Hazelcast IMDG 3.x members and other client libraries. - -Below is the configuration required to use the legacy string serialization. - -**Programmatic Configuration:** - -```javascript -config.serializationConfig.stringSerializationPolicy = StringSerializationPolicy.LEGACY; -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "stringSerializationPolicy": "legacy" - } -} -``` - -# 5. Setting Up Client Network - -All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let's first give the examples for these two approaches. Then we will look at its sub-elements and attributes. - -**Declarative Configuration:** - -Here is an example of configuring the network for Node.js Client declaratively. - -```json -{ - "network": { - "clusterMembers": [ - "10.1.1.21", - "10.1.1.22:5703" - ], - "smartRouting": true, - "redoOperation": true, - "connectionTimeout": 6000, - "connectionAttemptPeriod": 5000, - "connectionAttemptLimit": 5 - } -} -``` - -**Programmatic Configuration:** - -Here is an example of configuring the network for Node.js Client programmatically. - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); -clientConfig.networkConfig.smartRouting = true; -clientConfig.networkConfig.redoOperation = true; -clientConfig.networkConfig.connectionTimeout = 6000; -clientConfig.networkConfig.connectionAttemptPeriod = 5000; -clientConfig.networkConfig.connectionAttemptLimit = 5; -``` - -## 5.1. Providing Member Addresses - -Address list is the initial list of cluster addresses which the client will connect to. The client uses this -list to find an alive member. Although it may be enough to give only one address of a member in the cluster -(since all members communicate with each other), it is recommended that you give the addresses for all the members. - -**Declarative Configuration:** - -```json -{ - "network": { - "clusterMembers": [ - "10.1.1.21", - "10.1.1.22:5703" - ] - } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); -``` - -If the port part is omitted, then 5701, 5702 and 5703 will be tried in a random order. - -You can specify multiple addresses with or without the port information as seen above. The provided list is shuffled and tried in a random order. Its default value is `localhost`. - -## 5.2. Setting Smart Routing - -Smart routing defines whether the client mode is smart or unisocket. See the [Node.js Client Operation Modes section](#72-nodejs-client-operation-modes) -for the description of smart and unisocket modes. - -The following are example configurations. - -**Declarative Configuration:** - -```json -{ - "network": { - "smartRouting": true - } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.smartRouting = true; -``` - -Its default value is `true` (smart client mode). - -## 5.3. Enabling Redo Operation - -It enables/disables redo-able operations. While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. - -**Declarative Configuration:** - -```json -{ - "network": { - "redoOperation": true - } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.redoOperation = true; -``` - -Its default value is `false` (disabled). - -## 5.4. Setting Connection Timeout - -Connection timeout is the timeout value in milliseconds for the members to accept the client connection requests. -If the member does not respond within the timeout, the client will retry to connect as many as `ClientNetworkConfig.connectionAttemptLimit` times. - -The following are the example configurations. - - -**Declarative Configuration:** - -```json -{ - "network": { - "connectionTimeout": 6000 - } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.connectionTimeout = 6000; -``` - -Its default value is `5000` milliseconds. - -## 5.5. Setting Connection Attempt Limit - -While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addresses`, that member might not be available at that moment. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `ClientNetworkConfig.connectionAttemptLimit` times. This is also the case when the previously established connection between the client and that member goes down. - -The following are example configurations. - -**Declarative Configuration:** - -```json -{ - "network": { - "connectionAttemptLimit": 5 - } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.connectionAttemptLimit = 5; -``` - -Its default value is `2`. - -## 5.6. Setting Connection Attempt Period - -Connection attempt period is the duration in milliseconds between the connection attempts defined by `ClientNetworkConfig.connectionAttemptLimit`. - -The following are example configurations. - -**Declarative Configuration:** - -```json -{ - "network": { - "connectionAttemptPeriod": 5000 - } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.connectionAttemptPeriod = 5000; -``` - -Its default value is `3000` milliseconds. - -## 5.7. Enabling Client TLS/SSL - -You can use TLS/SSL to secure the connection between the clients and members. If you want to enable TLS/SSL -for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#61-tlsssl). - -As explained in the [TLS/SSL section](#61-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#613-mutual-authentication). - -## 5.8. Enabling Hazelcast Cloud Discovery - -The purpose of Hazelcast Cloud Discovery is to provide the clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. - -The following are example configurations. - -**Declarative Configuration:** - -```json -{ - "group": { - "name": "hazel", - "password": "cast" - }, - - "network": { - "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN", - "enabled": true - } - } -} - -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.groupConfig.name = 'hazel'; -clientConfig.groupConfig.password = 'cast'; - -clientConfig.networkConfig.cloudConfig.enabled = true; -clientConfig.networkConfig.cloudConfig.discoveryToken = 'EXAMPLE_TOKEN'; -``` - -To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. - -# 6. Securing Client Connection - -This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members, mutual authentication and credentials. These security features require **Hazelcast IMDG Enterprise** edition. - -### 6.1. TLS/SSL - -One of the offers of Hazelcast is the TLS/SSL protocol which you can use to establish an encrypted communication across your cluster with key stores and trust stores. - -* A Java `keyStore` is a file that includes a private key and a public certificate. The equivalent of a key store is the combination of `key` and `cert` files at the Node.js client side. -* A Java `trustStore` is a file that includes a list of certificates trusted by your application which is named as "certificate authority". The equivalent of a trust store is a `ca` file at the Node.js client side. - -You should set `keyStore` and `trustStore` before starting the members. See the next section on setting `keyStore` and `trustStore` on the server side. - -#### 6.1.1. TLS/SSL for Hazelcast Members - -Hazelcast allows you to encrypt socket level communication between Hazelcast members and between Hazelcast clients and members, for end to end encryption. To use it, see the [TLS/SSL for Hazelcast Members section](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#tls-ssl-for-hazelcast-members). - -#### 6.1.2. TLS/SSL for Hazelcast Node.js Clients - -TLS/SSL for the Hazelcast Node.js client can be configured using the `SSLConfig` class. In order to turn it on, `enabled` property of `SSLConfig` should be set to `true`: - -```javascript -var fs = require('fs'); - -var clientConfig = new Config.ClientConfig(); -var sslConfig = new Config.SSLConfig(); -sslConfig.enabled = true; -clientConfig.networkConfig.sslConfig = sslConfig; -``` - -`SSLConfig` object takes various SSL options defined in the [Node.js TLS Documentation](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). You can set your custom options -object to `sslConfig.sslOptions`. - -#### 6.1.3. Mutual Authentication - -As explained above, Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast clients have trust stores used to define which members they can trust. - -Using mutual authentication, the clients also have their key stores and members have their trust stores so that the members can know which clients they can trust. - -To enable mutual authentication, firstly, you need to set the following property on the server side in the `hazelcast.xml` file: - -```xml - - - - REQUIRED - - - -``` - -You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#mutual-authentication) of the Hazelcast IMDG Reference Manual. - -At the Node.js client side, you need to supply an SSL `options` object to pass to -[`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js. - -There are two ways to provide this object to the client: - -1. Using the built-in `BasicSSLOptionsFactory` bundled with the client. -2. Writing an `SSLOptionsFactory`. - -Below subsections describe each way. - -**Using the Built-in `BasicSSLOptionsFactory`** - -Hazelcast Node.js client includes a utility factory class that creates the necessary `options` object out of the supplied -properties. All you need to do is to specify your factory as `BasicSSLOptionsFactory` and provide the following options: - -- `caPath` -- `keyPath` -- `certPath` -- `servername` -- `rejectUnauthorized` -- `ciphers` - -See [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js for the descriptions of each option. - -> `caPath`, `keyPath` and `certPath` define the file path to the respective file that stores such information. - -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "exportedName": "BasicSSLOptionsFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "rejectUnauthorized": false - } - } - } - } -} -``` - -If these options are not enough for your application, you may write your own options factory and instruct the client -to get the options from it, as explained below. - -**Writing an `SSLOptionsFactory`** - -In order to use the full range of options provided to [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js, you may write your own factory object. - -An example configuration is shown below. - -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "path": "my_factory.js", - "exportedName": "SSLFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "keepOrder": true - } - } - } - } -} -``` - - -An example of a factory, `my_factory.js`, is shown below. - - -```javascript -function SSLFactory() { -} - -SSLFactory.prototype.init = function (properties) { - var promises = []; - var readFile = Promise.promisify(fs.readFile); - this.keepOrder = props.userDefinedProperty1; - var self = this; - - promises.push(readFile(properties.caPath).then(function (data) { - self.ca = data; - })); - promises.push(readFile(properties.keyPath).then(function (data) { - self.key = data; - })); - promises.push(readFile(properties.certPath).then(function (data) { - self.cert = data; - })); - - return Promise.all(promises).return(); -}; - -SSLFactory.prototype.getSSLOptions = function () { - var sslOpts = { - ca: this.ca, - key: this.key, - cert: this.cert, - servername: 'foo.bar.com', - rejectUnauthorized: true - }; - if (this.keepOrder) { - sslOpts.honorCipherOrder = true; - } - return sslOpts; -}; -exports.SSLFactory = SSLFactory; -``` - -The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with -the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. - -For information about the path resolution, see the [Loading Objects and Path Resolution section](#33-loading-objects-and-path-resolution). - -## 6.2. Credentials - -One of the key elements in Hazelcast security is the `Credentials` object, which can be used to carry all security attributes of the -Hazelcast Node.js client to Hazelcast members. Then, Hazelcast members can authenticate the clients and perform access control -checks on the client operations using this `Credentials` object. - -To use this feature, you need to -* have a class implementing the [`Credentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/Credentials.html) interface which contains the security attributes of your client -* have a class implementing the [`LoginModule`](https://docs.oracle.com/javase/6/docs/api/javax/security/auth/spi/LoginModule.html?is-external=true) interface which uses the `Credentials` object during the authentication process -* configure your Hazelcast member's security properties with respect to these classes before starting it. If you have started your member as described in the [Running Standalone JARs section](#1211-running-standalone-jars), see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). - -[`UsernamePasswordCredentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/UsernamePasswordCredentials.html), a basic implementation of the `Credentials` interface, is available in the Hazelcast `com.hazelcast.security` package. -`UsernamePasswordCredentials` is used for default configuration during the authentication process of both members and clients. You can also use this class to carry the security attributes of your client. - -Hazelcast also has an abstract implementation of the `LoginModule` interface which is the `ClusterLoginModule` class in the `com.hazelcast.security` package. -You can extend this class and do the authentication on the `onLogin()` method. - -Below is an example for the extension of abstract `ClusterLoginModule` class. -On the `ClientLoginModule#onLogin()` method, we are doing a simple authentication against a hardcoded username and password just for illustrative purposes. You should carry out the authentication against a security service of your choice. - -```java -import com.hazelcast.security.ClusterLoginModule; -import com.hazelcast.security.UsernamePasswordCredentials; - -import javax.security.auth.login.FailedLoginException; -import javax.security.auth.login.LoginException; - -public class ClientLoginModule extends ClusterLoginModule { - - @Override - protected boolean onLogin() throws LoginException { - if (credentials instanceof UsernamePasswordCredentials) { - UsernamePasswordCredentials usernamePasswordCredentials = (UsernamePasswordCredentials) credentials; - String username = usernamePasswordCredentials.getUsername(); - String password = usernamePasswordCredentials.getPassword(); - - if (username.equals("admin") && password.equals("password")) { - return true; - } - throw new FailedLoginException("Username or password doesn't match expected value."); - } - return false; - } - - @Override - public boolean onCommit() { - return loginSucceeded; - } - - @Override - protected boolean onAbort() { - return true; - } - - @Override - protected boolean onLogout() { - return true; - } -} -``` - -Finally, you can configure `hazelcast.xml` as follows to enable Hazelcast security, do mandatory authentication with `ClientLoginModule` -and give the user with the name `admin` all the permissions over the map named `importantMap`. - -```xml - - - - - - - - - all - - - - - -``` - -After successfully starting a Hazelcast member as described above, you need to implement `Portable` equivalent of the `UsernamePasswordCredentials` -and register it to your client configuration. - -Below is the code for that. - -**user_pass_cred.js** -```javascript -function UsernamePasswordCredentials(username, password, endpoint) { - this.username = username; - this.password = Buffer.from(password, 'utf8'); - this.endpoint = endpoint; -} - -UsernamePasswordCredentials.prototype.readPortable = function (reader) { - this.username = reader.readUTF('principal'); - this.endpoint = reader.readUTF('endpoint'); - this.password = reader.readByteArray('pwd'); -}; - -UsernamePasswordCredentials.prototype.writePortable = function (writer) { - writer.writeUTF('principal', this.username); - writer.writeUTF('endpoint', this.endpoint); - writer.writeByteArray('pwd', this.password); -}; - -UsernamePasswordCredentials.prototype.getFactoryId = function () { - return -1; -}; - -UsernamePasswordCredentials.prototype.getClassId = function () { - return 1; -}; - -exports.UsernamePasswordCredentials = UsernamePasswordCredentials; -``` - -And below is the `Factory` implementation for the `Portable` implementation of `UsernamePasswordCredentials`. - -**user_pass_cred_factory.js** -```javascript -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; - -function UsernamePasswordCredentialsFactory() { -} - -UsernamePasswordCredentialsFactory.prototype.create = function (classId) { - if(classId === 1){ - return new UsernamePasswordCredentials(); - } - return null; -}; - -exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; -``` - -Now, you can start your client by registering the `Portable` factory and giving the credentials as follows. - -```javascript -var Client = require('hazelcast-client').Client; -var ClientConfig = require('hazelcast-client').Config.ClientConfig; - -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; -var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; - -var config = new ClientConfig(); -config.serializationConfig.portableVersion = 1; -config.serializationConfig.portableFactories[-1] = new UsernamePasswordCredentialsFactory(); -config.customCredentials = new UsernamePasswordCredentials('admin', 'password', '127.0.0.1'); - -Client.newHazelcastClient(config).then(function (client) { - var map; - return client.getMap('importantMap').then(function (mp) { - map = mp; - return map.put('key', 'value'); - }).then(function () { - return map.get('key'); - }).then(function (value) { - console.log(value); - return client.shutdown(); - }); -}); -``` - -> NOTE: It is almost always a bad idea to write the credentials to wire in a clear-text format. Therefore, using TLS/SSL encryption is highly recommended while using the custom credentials as described in [TLS/SSL section]((#61-tlsssl)). - -With Hazelcast's extensible, `JAAS` based security features you can do much more than just authentication. -See the [JAAS code sample](code_samples/jaas_sample) to learn how to perform access control checks on the client operations based on user groups. - -Also, see the [Security section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#security) of Hazelcast IMDG Reference Manual for more information. - - -# 7. Using Node.js Client with Hazelcast IMDG - -This chapter provides information on how you can use Hazelcast IMDG's data structures in the Node.js client, after giving some basic information including an overview to the client API, operation modes of the client and how it handles the failures. - -## 7.1. Node.js Client API Overview - -Most of the functions in the API return `Promise`. Therefore, you need to be familiar with the concept of promises to use the Node.js client. If not, you can learn about them using various online resources, e.g., the [Promise JS](https://www.promisejs.org/) website. - -Promises provide a better way of working with callbacks. You can chain asynchronous functions by the `then()` function of promise. Also, you can use `async/await`, if you use Node.js 8 and higher versions. - -If you are ready to go, let's start to use Hazelcast Node.js client. - -The first step is the configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. See the [Programmatic Configuration section](#311-programmatic-configuration) for details. - -The following is an example on how to create a `ClientConfig` object and configure it programmatically: - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.groupConfig.name = 'dev'; -clientConfig.networkConfig.addresses.push('10.90.0.1', '10.90.0.2:5702'); -``` - -The second step is initializing the `HazelcastClient` to be connected to the cluster: - -```javascript -Client.newHazelcastClient(clientConfig).then(function (client) { - // some operation -}); -``` - -**This client object is your gateway to access all the Hazelcast distributed objects.** - -Let's create a map and populate it with some data, as shown below. - -```javascript -var map; -// Get the Distributed Map from Cluster. -client.getMap('my-distributed-map').then(function (mp) { - map = mp; - // Standard Put and Get. - return map.put('key', 'value'); -}).then(function () { - return map.get('key'); -}).then(function (val) { - // Concurrent Map methods, optimistic updating - return map.putIfAbsent('somekey', 'somevalue'); -}).then(function () { - return map.replace('key', 'value', 'newvalue'); -}); -``` - -As the final step, if you are done with your client, you can shut it down as shown below. This will release all the used resources and close connections to the cluster. - -```javascript -... -.then(function () { - client.shutdown(); -}); -``` - -## 7.2. Node.js Client Operation Modes - -The client has two operation modes because of the distributed nature of the data and cluster: smart and unisocket. - -### 7.2.1. Smart Client - -In the smart mode, the clients connect to each cluster member. Since each data partition uses the well known and consistent hashing algorithm, each client can send an operation to the relevant cluster member, which increases the overall throughput and efficiency. Smart mode is the default mode. - -### 7.2.2. Unisocket Client - -For some cases, the clients can be required to connect to a single member instead of each member in the cluster. Firewalls, security or some custom networking issues can be the reason for these cases. - -In the unisocket client mode, the client will only connect to one of the configured addresses. This single member will behave as a gateway to the other members. For any operation requested from the client, it will redirect the request to the relevant member and return the response back to the client returned from this member. - -## 7.3. Handling Failures - -There are two main failure cases you should be aware of. Below sections explain these and the configurations you can perform to achieve proper behavior. - -### 7.3.1. Handling Client Connection Failure - -While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might not be available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. - -You can configure `connectionAttemptLimit` for the number of times you want the client to retry connecting. See the [Setting Connection Attempt Limit section](#55-setting-connection-attempt-limit). - -The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. - -### 7.3.2. Handling Retry-able Operation Failure - -While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retrying for the other operations, you can set the `redoOperation` to `true`. See the [Enabling Redo Operation section](#53-enabling-redo-operation). - -You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in `ClientConfig.properties`. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: - -* Member throws an exception. -* Connection between the client and member is closed. -* Client’s heartbeat requests are timed out. - -When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all the client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member and then the connection is lost. Since there will be no response for this operation, you will not know whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. - -## 7.4. Using Distributed Data Structures - -Most of the distributed data structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. - -### 7.4.1. Using Map - -Hazelcast Map (`IMap`) is a distributed map. Through the Node.js client, you can perform operations like reading and writing from/to a Hazelcast Map with the well known get and put methods. For details, see the [Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#map) in the Hazelcast IMDG Reference Manual. - -A Map usage example is shown below. - -```javascript -var map; -// Get the Distributed Map from Cluster. -hz.getMap('my-distributed-map').then(function (mp) { - map = mp; - // Standard Put and Get. - return map.put('key', 'value'); -}).then(function () { - return map.get('key'); -}).then(function (val) { - // Concurrent Map methods, optimistic updating - return map.putIfAbsent('somekey', 'somevalue'); -}).then(function () { - return map.replace('key', 'value', 'newvalue'); -}); -``` - -Hazelcast Map supports a Near Cache for remotely stored entries to increase the performance of read operations. See the [Near Cache section](#782-near-cache) for a detailed explanation of the Near Cache feature and its configuration. - -Hazelcast Map uses `MapListener` to listen to the events that occur when the entries are added to, updated/merged in or evicted/removed from the Map. See the [Map Listener section](#7521-map-listener) for information on how to create a map listener object and register it. - -### 7.4.2. Using MultiMap - -Hazelcast `MultiMap` is a distributed and specialized map where you can store multiple values under a single key. For details, see the [MultiMap section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#multimap) in the Hazelcast IMDG Reference Manual. - -A MultiMap usage example is shown below. - -```javascript -var multiMap; -// Get the Distributed MultiMap from Cluster. -hz.getMultiMap('my-distributed-multimap').then(function (mmp) { - multiMap = mmp; - // Put values in the map against the same key - return multiMap.put('my-key', 'value1'); -}).then(function () { - return multiMap.put('my-key', 'value2'); -}).then(function () { - return multiMap.put('my-key', 'value3'); -}).then(function () { - // Print out all the values for associated with key called "my-key" - return multiMap.get('my-key') -}).then(function (values) { - for (value of values) { - console.log(value); - } - // remove specific key/value pair - return multiMap.remove('my-key', 'value2'); -}); -``` - -Hazelcast MultiMap uses `EntryListener` to listen to the events that occur when the entries are added to or removed from the MultiMap. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. - -### 7.4.3. Using Replicated Map - -Hazelcast `ReplicatedMap` is a distributed key-value data structure where the data is replicated to all members in the cluster. It provides full replication of entries to all members for high speed access. For details, see the [Replicated Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#replicated-map) in the Hazelcast IMDG Reference Manual. - -A Replicated Map usage example is shown below. - -```javascript -var map; -// Get a Replicated Map called "my-replicated-map" -hz.getReplicatedMap('my-replicated-map').then(function (rmp) { - map = rmp; - // Put and Get a value from the Replicated Map - // key/value replicated to all members - return map.put('key', 'value'); -}).then(function (replacedValue) { - console.log('replaced value = ' + replacedValue); // Will be null as its first update - return map.get('key'); -}).then(function (value) { - // The value is retrieved from a random member in the cluster - console.log('value for key = ' + value); -}); -``` - -Hazelcast Replicated Map uses `EntryListener` to listen to the events that occur when the entries are added to, updated in or evicted/removed from the Replicated Map. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. - -### 7.4.4. Using Queue - -Hazelcast Queue (`IQueue`) is a distributed queue which enables all cluster members to interact with it. For details, see the [Queue section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#queue) in the Hazelcast IMDG Reference Manual. - -A Queue usage example is shown below. - -```javascript -var queue; -// Get a Blocking Queue called "my-distributed-queue" -hz.getQueue('my-distributed-queue').then(function (q) { - queue = q; - // Offer a String into the Distributed Queue - return queue.offer('item'); -}).then(function () { - // Poll the Distributed Queue and return the String - return queue.poll(); -}).then(function () { - // Timed blocking Operations - return queue.offer('anotheritem', 500); -}).then(function () { - return queue.poll(5000); -}).then(function () { - // Indefinitely blocking Operations - return queue.put('yetanotheritem'); -}).then(function () { - return queue.take(); -}).then(function (value) { - console.log(value); -}); -``` - -Hazelcast Queue uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Queue. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. - -## 7.4.5. Using Set - -Hazelcast Set (`ISet`) is a distributed set which does not allow duplicate elements. For details, see the [Set section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#set) in the Hazelcast IMDG Reference Manual. - -A Set usage example is shown below. - -```javascript -var set; -// Get the Distributed Set from Cluster. -hz.getSet('my-distributed-set').then(function (s) { - set = s; - // Add items to the set with duplicates - return set.add('item1'); -}).then(function () { - return set.add('item1'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item3'); -}).then(function () { - // Get the items. Note that there are no duplicates - return set.toArray(); -}).then(function (values) { - console.log(values); -}); -``` - -Hazelcast Set uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Set. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. - -## 7.4.6. Using List - -Hazelcast List (`IList`) is a distributed list which allows duplicate elements and preserves the order of elements. For details, see the [List section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#list) in the Hazelcast IMDG Reference Manual. - -A List usage example is shown below. - -```javascript -var list; -// Get the Distributed List from Cluster. -hz.getList('my-distributed-list').then(function (l) { - list = l; - // Add elements to the list - return list.add('item1'); -}).then(function () { - return list.add('item2'); -}).then(function () { - //Remove the first element - return list.removeAt(0); -}).then(function (value) { - console.log(value); - // There is only one element left - return list.size(); -}).then(function (len) { - console.log(len); - // Clear the list - return list.clear(); -}); -``` - -Hazelcast List uses `ItemListener` to listen to the events that occur when the items are added to or removed from the List. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. - -## 7.4.7. Using Ringbuffer - -Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that stores its data in a ring-like structure. You can think of it as a circular array with a given capacity. Each Ringbuffer has a tail and a head. The tail is where the items are added and the head is where the items are overwritten or expired. You can reach each element in a Ringbuffer using a sequence ID, which is mapped to the elements between the head and tail (inclusive) of the Ringbuffer. For details, see the [Ringbuffer section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#ringbuffer) in the Hazelcast IMDG Reference Manual. - -A Ringbuffer usage example is shown below. - -```javascript -var rb; -// Get a Ringbuffer called "rb" -hz.getRingbuffer('rb').then(function (buffer) { - rb = buffer; - return rb.add(100); -}).then(function () { - return rb.add(200); -}).then(function (value) { - // we start from the oldest item. - // if you want to start from the next item, call rb.tailSequence()+1 - return rb.headSequence(); -}).then(function (sequence) { - return rb.readOne(sequence).then(function (value) { - console.log(value); - return rb.readOne(sequence.add(1)); - }).then(function (value) { - console.log(value); - }); -}); -``` - -## 7.4.8. Using Reliable Topic - -Hazelcast `ReliableTopic` is a distributed topic implementation backed up by the `Ringbuffer` data structure. For details, see the [Reliable Topic section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#reliable-topic) in the Hazelcast IMDG Reference Manual. - -A Reliable Topic usage example is shown below. - -```javascript -var topic; -// Get a Topic called "my-distributed-topic" -hz.getReliableTopic('my-distributed-topic').then(function (t) { - topic = t; - // Add a Listener to the Topic - topic.addMessageListener(function (message) { - console.log(message); - }); - // Publish a message to the Topic - return topic.publish('Hello to distributed world'); -}); -``` - -Hazelcast Reliable Topic uses `MessageListener` to listen to the events that occur when a message is received. See the [Message Listener section](#7524-message-listener) for information on how to create a message listener object and register it. - -## 7.4.9. Using Lock - -Hazelcast Lock (`ILock`) is a distributed lock implementation. You can synchronize Hazelcast members and clients using a Lock. For details, see the [Lock section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#lock) in the Hazelcast IMDG Reference Manual. - -A Lock usage example is shown below. - -```javascript -var lock; -// Get a distributed lock called "my-distributed-lock" -hz.getLock('my-distributed-lock').then(function (l) { - lock = l; - // Now create a lock and execute some guarded code. - return lock.lock(); -}).then(function () { - // do something here -}).finally(function () { - return lock.unlock(); -}); -``` - -## 7.4.10. Using Atomic Long - -Hazelcast Atomic Long (`IAtomicLong`) is the distributed long which offers most of the operations such as `get`, `set`, `getAndSet`, `compareAndSet` and `incrementAndGet`. For details, see the [Atomic Long section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#iatomiclong) in the Hazelcast IMDG Reference Manual. - -An Atomic Long usage example is shown below. - -```javascript -var counter; -// Get an Atomic Counter, we'll call it "counter" -hz.getAtomicLong('counter').then(function (c) { - counter = c; - // Add and Get the "counter" - return counter.addAndGet(3); -}).then(function (value) { - return counter.get(); -}).then(function (value) { - // Display the "counter" value - console.log('counter: ' + value); -}); -``` - -## 7.4.11. Using Semaphore - -Hazelcast Semaphore (`ISemaphore`) is a distributed semaphore implementation. For details, see the [Semaphore section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#isemaphore) in the Hazelcast IMDG Reference Manual. - -A Semaphore usage example is shown below. - -```javascript -var semaphore; -hazelcastClient.getSemaphore('mySemaphore').then(function (s) { - semaphore = s; - return semaphore.init(10); -}).then(function () { - return semaphore.acquire(5); -}).then(function () { - return semaphore.availablePermits(); -}).then(function (res) { - console.log(res); // 5 -}); -``` - -## 7.4.12. Using PN Counter - -Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative counter implementation. It is an eventually consistent counter given there is no member failure. For details, see the [PN Counter section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#pn-counter) in the Hazelcast IMDG Reference Manual. - -A PN Counter usage example is shown below. - -```javascript -var pnCounter; -hz.getPNCounter('myPNCounter').then(function (counter) { - pnCounter = counter; - return pnCounter.get(); -}).then(function (value) { - console.log('Counter started with value ' + value); // 0 - return pnCounter.addAndGet(5); -}).then(function (value) { - console.log('Value after operation is ' + value); // 5 - return pnCounter.getAndAdd(2); -}).then(function (value) { - console.log('Value before operation was ' + value); // 5 - return pnCounter.get(); -}).then(function (value) { - console.log('New value is ' + value); // 7 - return pnCounter.decrementAndGet(); -}).then(function (value) { - console.log('Decremented counter by one. New value is ' + value); // 6 -}); -``` - -## 7.4.13. Using Flake ID Generator - -Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers. Generated identifiers are long primitive values and are k-ordered (roughly ordered). IDs are in the range from 0 to `2^63-1` (maximum signed long value). For details, see the [FlakeIdGenerator section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#flakeidgenerator) in the Hazelcast IMDG Reference Manual. - -A Flake ID Generator usage example is shown below. - -```javascript -var flakeIdGenerator; -hz.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { - flakeIdGenerator = gen; - return flakeIdGenerator.newId(); -}).then(function (value) { - console.log('New id: ' + value.toString()); -}); -``` - -## 7.5. Distributed Events - -This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. - -### 7.5.1. Listening for Cluster Events - -You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side: - -* Membership Listener: Notifies when a member joins to/leaves the cluster, or when an attribute is changed in a member. -* Distributed Object Listener: Notifies when a distributed object is created or destroyed throughout the cluster. -* Lifecycle Listener: Notifies when the client is starting, started, shutting down and shutdown. - -#### 7.5.1.1. Membership Listener - -The Membership Listener interface has functions that are invoked for the following events. - -* `memberAdded`: A new member is added to the cluster. -* `memberRemoved`: An existing member leaves the cluster. -* `memberAttributeChanged`: An attribute of a member is changed. See the [Defining Member Attributes section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#defining-member-attributes) in the Hazelcast IMDG Reference Manual to learn about member attributes. - -For `memberAdded` and `memberRemoved` events, a `MembershipEvent` object is passed to the listener function. - -After you create the listener object, you can configure your cluster to include the membership listener. You can also add one or more membership listeners. - -The following is a membership listener registration by using the `ClusterService.addMembershipListener()` function. - -```javascript -var membershipListener = { - memberAdded: function (membershipEvent) { - console.log('Member Added: The address is', member.address.toString()); - }, -}; -client.clusterService.addMembershipListener(membershipListener); -``` - -The `memberAttributeChanged` has its own type of event named as `MemberAttributeEvent`. When there is an attribute change on the member, this event is fired. - -See the following example. - -```javascript - -var membershipListener = { - memberAttributeChanged: function (memberAttributeEvent) { - console.log('Member Attribute Changed: The address is', memberAttributeEvent.member.address.toString()); - }, -}; -client.clusterService.addMembershipListener(membershipListener); -``` - -#### 7.5.1.2. Distributed Object Listener - -The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: - -* `serviceName`: Service name of the distributed object. -* `objectName`: Name of the distributed object. -* `eventType`: Type of the invoked event. It can be `created` or `destroyed`. - -The following is an example of adding a `DistributedObjectListener`. - -```javascript -client.addDistributedObjectListener(function (distributedObjectEvent) { - console.log('Distributed object event >>> ', - distributedObjectEvent.serviceName, - distributedObjectEvent.objectName, - distributedObjectEvent.eventType - ); -}).then(function () { - var mapname = 'test'; - // this causes a created event - client.getMap(mapname); - // this causes no event because map was already created - client.getMap(mapname); -}); -``` - -#### 7.5.1.3. Lifecycle Listener - -The `LifecycleListener` interface notifies for the following events: - -* `starting`: A client is starting. -* `started`: A client has started. -* `shuttingDown`: A client is shutting down. -* `shutdown`: A client’s shutdown has completed. - -The following is an example of the `LifecycleListener` that is added to the `ClientConfig` object and its output. - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.listeners.addLifecycleListener(function (state) { - console.log('Lifecycle Event >>> ' + state); -}); - -Client.newHazelcastClient(clientConfig).then(function (hazelcastClient) { - hazelcastClient.shutdown(); -}); -``` - -**Output:** - -``` -[DefaultLogger] INFO at LifecycleService: HazelcastClient is starting -Lifecycle Event >>> starting -[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.43:5701 authenticated -[DefaultLogger] INFO at ClusterService: Members received. -[ Member { - address: Address { host: '10.216.1.43', port: 5701, type: 4 }, - uuid: '7961eef2-940d-42dc-8036-2a29c5c9942c', - isLiteMember: false, - attributes: {} } ] -[DefaultLogger] INFO at LifecycleService: HazelcastClient is started -Lifecycle Event >>> started -[DefaultLogger] INFO at LifecycleService: HazelcastClient is shuttingDown -Lifecycle Event >>> shuttingDown -[DefaultLogger] INFO at LifecycleService: HazelcastClient is shutdown -Lifecycle Event >>> shutdown -``` - -### 7.5.2. Listening for Distributed Data Structure Events - -You can add event listeners to the distributed data structures. - -> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, - some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** - -#### 7.5.2.1. Map Listener - -The Map Listener is used by the Hazelcast `Map`. - -You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. - -An entry-based event is fired after the operations that affect a specific entry. For example, `IMap.put()`, `IMap.remove()` or `IMap.evict()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. - -See the following example. - -```javascript -var entryEventListener = { - added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry - } -}; -map.addEntryListener(entryEventListener, undefined, true).then(function () { - return map.put('1', 'My new entry'); -}); -``` - -A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. - -See the following example. - -```javascript -var mapEventListener = { - mapCleared: function (mapEvent) { - console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 3 - } -}; -map.addEntryListener(mapEventListener).then(function () { - return map.put('1', 'Muhammad Ali'); -}).then(function () { - return map.put('2', 'Mike Tyson'); -}).then(function () { - return map.put('3', 'Joe Louis'); -}).then(function () { - return map.clear(); -}); -``` - -As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. - -#### 7.5.2.2. Entry Listener - -The Entry Listener is used by the Hazelcast `MultiMap` and `ReplicatedMap`. - -You can listen to map-wide or entry-based events by using the functions in the `EntryListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `EntryListener` interface. - -An entry-based event is fired after the operations that affect a specific entry. For example, `MultiMap.put()`, `MultiMap.remove()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. - -```javascript -var entryEventListener = { - added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry - } -}; -return mmp.addEntryListener(entryEventListener, undefined, true).then(function () { - return mmp.put('1', 'My new entry'); -}); -``` - -A map-wide event is fired as a result of a map-wide operation. For example, `MultiMap.clear()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. - -See the following example. - -```javascript -var mapEventListener = { - mapCleared: function (mapEvent) { - console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 1 - } -}; -mmp.addEntryListener(mapEventListener).then(function () { - return mmp.put('1', 'Muhammad Ali'); -}).then(function () { - return mmp.put('1', 'Mike Tyson'); -}).then(function () { - return mmp.put('1', 'Joe Louis'); -}).then(function () { - return mmp.clear(); -}); -``` - -Note that all functions in the `EntryListener` interface is not supported by MultiMap and Replicated Map. See the following headings to see supported listener functions for each data structure. - -**Entry Listener Functions Supported by MultiMap** - -- `added` -- `removed` -- `mapCleared` - -**Entry Listener Functions Supported by Replicated Map** - -- `added` -- `removed` -- `updated` -- `evicted` -- `mapCleared` - -As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. - -#### 7.5.2.3. Item Listener - -The Item Listener is used by the Hazelcast `Queue`, `Set` and `List`. - -You can listen to item events by implementing the functions in the `ItemListener` interface including `itemAdded` and `itemRemoved`. These functions are invoked when an item is added or removed. - -The following is an example of item listener object and its registration to the `Set`. It also applies to `Queue` and `List`. - -```javascript -var itemListener = { - itemAdded: function (itemEvent) { - console.log('Item Added:', itemEvent.item); // Item Added: Item1 - }, - itemRemoved: function (itemEvent) { - console.log('Item Removed:', itemEvent.item); // Item Removed: Item1 - } -}; -return set.addItemListener(itemListener, true).then(function () { - return set.add('Item1'); -}).then(function () { - return set.remove('Item1'); -}); -``` - -As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the item event contains the item value. - -#### 7.5.2.4. Message Listener - -The Message Listener is used by the Hazelcast `Reliable Topic`. - -You can listen to message events. To listen to these events, you need to implement the `MessageListener` function to which a `Message` object is passed. - -See the following example. - -```javascript -topic.addMessageListener(function (message) { - console.log(message.messageObject); -}); - -var movie = { - title: 'The Prestige', - year: '2006', - runtime: '130 min', - director: 'Christopher Nolan', - imdbRating: '8.5' -} -topic.publish(movie); -``` - -## 7.6. Distributed Computing - -This chapter explains how you can use Hazelcast IMDG's entry processor implementation in the Node.js client. - -### 7.6.1. Using EntryProcessor - -Hazelcast supports entry processing. An entry processor is a function that executes your code on a map entry in an atomic way. - -An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys -- executing `IMap.get(key)`, mutating the value and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. - -If you are doing the process described above, you should consider using entry processors. An entry processor executes a read and updates upon the member where the data resides. This eliminates the costly network hops described above. - -> **NOTE: Entry processor is meant to process a single entry per call. Processing multiple entries and data structures in an entry processor is not supported as it may result in deadlocks on the server side.** - -Hazelcast sends the entry processor to each cluster member and these members apply it to the map entries. Therefore, if you add more members, your processing completes faster. - -#### Processing Entries - -The `IMap` interface provides the following functions for entry processing: - -* `executeOnKey` processes an entry mapped by a key. -* `executeOnKeys` processes entries mapped by a list of keys. -* `executeOnEntries` can process all entries in a map with a defined predicate. Predicate is optional. - -In the Node.js client, an `EntryProcessor` should be `IdentifiedDataSerializable` or `Portable` because the server should be able to deserialize it to process. - -The following is an example for `EntryProcessor` which is `IdentifiedDataSerializable`. - -```javascript -function IdentifiedEntryProcessor(value) { - this.value = value; -} - -IdentifiedEntryProcessor.prototype.readData = function (inp) { - this.value = inp.readUTF(); -}; - -IdentifiedEntryProcessor.prototype.writeData = function (outp) { - outp.writeUTF(this.value); -}; - -IdentifiedEntryProcessor.prototype.getFactoryId = function () { - return 5; -}; - -IdentifiedEntryProcessor.prototype.getClassId = function () { - return 1; -}; -``` - -Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). - -The following is the Java equivalent of the entry processor in Node.js client given above: - -```java -import com.hazelcast.map.AbstractEntryProcessor; -import com.hazelcast.nio.ObjectDataInput; -import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import java.io.IOException; -import java.util.Map; - -public class IdentifiedEntryProcessor extends AbstractEntryProcessor implements IdentifiedDataSerializable { - static final int CLASS_ID = 1; - private String value; - - public IdentifiedEntryProcessor() { - } - - @Override - public int getFactoryId() { - return IdentifiedFactory.FACTORY_ID; - } - - @Override - public int getId() { - return CLASS_ID; - } - - @Override - public void writeData(ObjectDataOutput out) throws IOException { - out.writeUTF(value); - } - - @Override - public void readData(ObjectDataInput in) throws IOException { - value = in.readUTF(); - } - - @Override - public Object process(Map.Entry entry) { - entry.setValue(value); - return value; - } -} -``` - -You can implement the above processor’s factory as follows: - -```java -import com.hazelcast.nio.serialization.DataSerializableFactory; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; - -public class IdentifiedFactory implements DataSerializableFactory { - public static final int FACTORY_ID = 5; - - @Override - public IdentifiedDataSerializable create(int typeId) { - if (typeId == IdentifiedEntryProcessor.CLASS_ID) { - return new IdentifiedEntryProcessor(); - } - return null; - } -} -``` - -Now you need to configure the `hazelcast.xml` to add your factory as shown below. - -```xml - - - - - IdentifiedFactory - - - - -``` - -The code that runs on the entries is implemented in Java on the server side. The client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, see the [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. - -After the above implementations and configuration are done and you start the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. See the following example. - -```javascript -var map; -hazelcastClient.getMap('my-distributed-map').then(function (mp) { - map = mp; - return map.put('key', 'not-processed'); -}).then(function () { - return map.executeOnKey('key', new IdentifiedEntryProcessor('processed')); -}).then(function () { - return map.get('key'); -}).then(function (value) { - console.log(value); // processed -}); -``` - -## 7.7. Distributed Query - -Hazelcast partitions your data and spreads it across cluster of members. You can iterate over the map entries and look for certain entries (specified by predicates) you are interested in. However, this is not very efficient because you will have to bring the entire entry set and iterate locally. Instead, Hazelcast allows you to run distributed queries on your distributed map. - -### 7.7.1. How Distributed Query Works - -1. The requested predicate is sent to each member in the cluster. -2. Each member looks at its own local entries and filters them according to the predicate. At this stage, key-value pairs of the entries are deserialized and then passed to the predicate. -3. The predicate requester merges all the results coming from each member into a single set. - -Distributed query is highly scalable. If you add new members to the cluster, the partition count for each member is reduced and thus the time spent by each member on iterating its entries is reduced. In addition, the pool of partition threads evaluates the entries concurrently in each member, and the network traffic is also reduced since only filtered data is sent to the requester. - -**Predicates Object Operators** - -The `Predicates` object offered by the Node.js client includes many operators for your query requirements. Some of them are described below. - -* `equal`: Checks if the result of an expression is equal to a given value. -* `notEqual`: Checks if the result of an expression is not equal to a given value. -* `instanceOf`: Checks if the result of an expression has a certain type. -* `like`: Checks if the result of an expression matches some string pattern. `%` (percentage sign) is the placeholder for many characters, `_` (underscore) is the placeholder for only one character. -* `greaterThan`: Checks if the result of an expression is greater than a certain value. -* `greaterEqual`: Checks if the result of an expression is greater than or equal to a certain value. -* `lessThan`: Checks if the result of an expression is less than a certain value. -* `lessEqual`: Checks if the result of an expression is less than or equal to a certain value. -* `between`: Checks if the result of an expression is between two values, inclusively. -* `inPredicate`: Checks if the result of an expression is an element of a certain list. -* `not`: Checks if the result of an expression is false. -* `regex`: Checks if the result of an expression matches some regular expression. - -Hazelcast offers the following ways for distributed query purposes: - -* Combining Predicates with AND, OR, NOT -* Distributed SQL Query - -#### 7.7.1.1. Employee Map Query Example - -Assume that you have an `employee` map containing the values of `Employee` objects, as coded below. - -```javascript -function Employee(name, age, active, salary) { - this.name = name; - this.age = age; - this.active = active; - this.salary = salary; -} - -Employee.prototype.getClassId = function () { - return 1; -} - -Employee.prototype.getFactoryId = function () { - return 1; -} - -Employee.prototype.readPortable = function (reader) { - this.name = reader.readUTF(); - this.age = reader.readInt(); - this.active = reader.readBoolean(); - this.salary = reader.readDouble(); -} - -Employee.prototype.writePortable = function (writer) { - writer.writeUTF(this.name); - writer.writeInt(this.age); - writer.writeBoolean(this.active); - writer.writeDouble(this.salary); -} -``` - -Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. - -For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). - -> **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** - -#### 7.7.1.2. Querying by Combining Predicates with AND, OR, NOT - -You can combine predicates by using the `and`, `or` and `not` operators, as shown in the below example. - -```javascript -var map; -client.getMap('employee').then(function (mp) { - map = mp; - var predicate = Predicates.and(Predicates.equal('active', true), Predicates.lessThan('age', 30)); - return map.valuesWithPredicate(predicate); -}).then(function (employees) { - // some operations -}); -``` - -In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than 30. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. - -> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast IMDG's distributed map.** - -#### 7.7.1.3. Querying with SQL - -`SqlPredicate` takes the regular SQL `where` clause. See the following example: - -```javascript -var map; -client.getMap('employee').then(function (mp) { - map = mp; - return map.valuesWithPredicate(new SqlPredicate('active AND age < 30')); -}).then(function (employees) { - // some operations -}); -``` - -##### Supported SQL Syntax - -**AND/OR:** ` AND AND …` - -- `active AND age > 30` -- `active = false OR age = 45 OR name = 'Joe'` -- `active AND ( age > 20 OR salary < 60000 )` - -**Equality:** `=, !=, <, ⇐, >, >=` - -- ` = value` -- `age <= 30` -- `name = 'Joe'` -- `salary != 50000` - -**BETWEEN:** ` [NOT] BETWEEN AND ` - -- `age BETWEEN 20 AND 33 ( same as age >= 20 AND age ⇐ 33 )` -- `age NOT BETWEEN 30 AND 40 ( same as age < 30 OR age > 40 )` - -**IN:** ` [NOT] IN (val1, val2,…)` - -- `age IN ( 20, 30, 40 )` -- `age NOT IN ( 60, 70 )` -- `active AND ( salary >= 50000 OR ( age NOT BETWEEN 20 AND 30 ) )` -- `age IN ( 20, 30, 40 ) AND salary BETWEEN ( 50000, 80000 )` - -**LIKE:** ` [NOT] LIKE 'expression'` - -The `%` (percentage sign) is the placeholder for multiple characters, an `_` (underscore) is the placeholder for only one character. - -- `name LIKE 'Jo%'` (true for 'Joe', 'Josh', 'Joseph' etc.) -- `name LIKE 'Jo_'` (true for 'Joe'; false for 'Josh') -- `name NOT LIKE 'Jo_'` (true for 'Josh'; false for 'Joe') -- `name LIKE 'J_s%'` (true for 'Josh', 'Joseph'; false 'John', 'Joe') - -**ILIKE:** ` [NOT] ILIKE 'expression'` - -ILIKE is similar to the LIKE predicate but in a case-insensitive manner. - -- `name ILIKE 'Jo%'` (true for 'Joe', 'joe', 'jOe','Josh','joSH', etc.) -- `name ILIKE 'Jo_'` (true for 'Joe' or 'jOE'; false for 'Josh') - -**REGEX:** ` [NOT] REGEX 'expression'` - -- `name REGEX 'abc-.*'` (true for 'abc-123'; false for 'abx-123') - -##### Querying Examples with Predicates - -You can use the `__key` attribute to perform a predicated search for the entry keys. See the following example: - -```javascript -var personMap; -client.getMap('persons').then(function (mp) { - personMap = mp; - return personMap.put('Alice', 35); -}).then(function () { - return personMap.put('Andy', 37); -}).then(function () { - return personMap.put('Bob', 22); -}).then(function () { - var predicate = new Predicates.sql('__key like A%'); - return personMap.valuesWithPredicate(predicate); -}).then(function (startingWithA) { - console.log(startingWithA.get(0)); // 35 -}); -``` - -In this example, the code creates a list with the values whose keys start with the letter "A”. - -You can use the `this` attribute to perform a predicated search for entry values. See the following example: - -```javascript -var personMap; -return client.getMap('persons').then(function (mp) { - personMap = mp; - return personMap.put('Alice', 35); -}).then(function () { - return personMap.put('Andy', 37); -}).then(function () { - return personMap.put('Bob', 22); -}).then(function () { - var predicate = new Predicates.greaterEqual('this', 27); - return personMap.valuesWithPredicate(predicate); -}).then(function (olderThan27) { - console.log(olderThan27.get(0), olderThan27.get(1)); // 35 37 -}); -``` - -In this example, the code creates a list with the values greater than or equal to "27". - -#### 7.7.1.4. Querying with JSON Strings - -You can query the JSON strings stored inside your Hazelcast clusters. To query a JSON string, you can -use `HazelcastJsonValue` or JavaScript objects. - -`HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. -Then, it is possible to query these objects using the query methods explained in this section. - -```javascript -var personMap; -var person1 = '{ "name": "John", "age": 35 }'; -var person2 = '{ "name": "Jane", "age": 24 }'; -var person3 = '{ "name": "Trey", "age": 17 }'; - -return hz.getMap('personsMap').then(function (map) { - personMap = map; - return personMap.put(1, new HazelcastJsonValue(person1)); -}).then(function () { - return personMap.put(2, new HazelcastJsonValue(person2)); -}).then(function () { - return personMap.put(3, new HazelcastJsonValue(person3)); -}).then(function () { - return personMap.valuesWithPredicate(Predicates.lessThan('age', 21)); -}).then(function (personsUnder21) { - personsUnder21.toArray().forEach(function (person) { - console.log(person); - }); -}); -``` - -When running the queries, Hazelcast treats values extracted from the JSON documents as Java types so they can be compared with the query attribute. -JSON specification defines five primitive types to be used in the JSON documents: `number`, `string`, `true`, `false` and `null`. -The `string`, `true`/`false` and `null` types are treated as `String`, `boolean` and `null`, respectively. `Number` values treated as `long`s if they can be represented by a `long`. -Otherwise, `number`s are treated as `double`s. - -It is possible to query nested attributes and arrays in JSON documents. The query syntax is the same as querying other Hazelcast objects using the `Predicate`s. - -```javascript -var departmentsMap; -var departments = [ - { - departmentId: 1, - room: 'alpha', - people: [ - { - name: 'Peter', - age: 26, - salary: 50000 - - }, - { - name: 'Jonah', - age: 50, - salary: 140000 - } - ] - }, - { - departmentId: 2, - room: 'beta', - people: [ - { - name: 'Terry', - age: 44, - salary: 100000 - } - ] - } -]; -return hz.getMap('departmentsMap').then(function (map) { - departmentsMap = map; - return departmentsMap.putAll(departments.map(function (department, index) { - return [index, department]; - })); -}).then(function () { - // The following query finds all the departments that have a person named "Peter" working in them. - return departmentsMap.valuesWithPredicate(Predicates.equal('people[any].name', 'Peter')) -}).then(function (departmentWithPeter) { - departmentWithPeter.toArray().forEach(function (department) { - console.log(department); - }); -}); -``` - -`HazelcastJsonValue` is a lightweight wrapper around your JSON strings. It is used merely as a way to indicate that the contained string should be treated as a valid JSON value. -Hazelcast does not check the validity of JSON strings put into to maps. Putting an invalid JSON string in a map is permissible. -However, in that case whether such an entry is going to be returned or not from a query is not defined. - -##### Querying with HazelcastJsonValue Objects - -If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization`. - -This means that, you can run queries over your JavaScript objects if they are serialized as JSON strings. However, when the results -of your query are ready, they are parsed from JSON strings and returned to you as JavaScript objects. - -For the purposes of your application, you may want to get rid of the parsing and just work with the raw JSON strings using `HazelcastJsonValue` objects. Then, you can configure your client to do so -as described in the [JSON Serialization](#45-json-serialization) section. - -```javascript -var config = new Config(); -config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; - -Client.newHazelcastClient(config).then(function (hz) { - var moviesMap; - var movies = [ - [1, new HazelcastJsonValue('{ "name": "The Dark Knight", "rating": 9.1 }')], - [2, new HazelcastJsonValue('{ "name": "Inception", "rating": 8.8 }')], - [3, new HazelcastJsonValue('{ "name": "The Prestige", "rating": 8.5 }')] - ]; - return hz.getMap('moviesMap').then(function (map) { - moviesMap = map; - return moviesMap.putAll(movies); - }).then(function () { - return moviesMap.valuesWithPredicate(Predicates.greaterEqual('rating', 8.8)); - }).then(function (highRatedMovies) { - highRatedMovies.toArray().forEach(function (movie) { - console.log(movie.toString()); - }); - return hz.shutdown(); - }); -}); -``` - -##### Metadata Creation for JSON Querying - -Hazelcast stores a metadata object per JSON serialized object stored. This metadata object is created every time a JSON serialized object is put into an `IMap`. -Metadata is later used to speed up the query operations. Metadata creation is on by default. Depending on your application’s needs, you may want to turn off the metadata creation to decrease the put latency and increase the throughput. - -You can configure this using `metadata-policy` element for the map configuration on the member side as follows: - -```xml - - ... - - - OFF - - ... - -``` - -#### 7.7.1.5. Filtering with Paging Predicates - -The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. - -```javascript -var map; -hazelcastClient.getMap('students').then(function (mp) { - map = mp; - - var greaterEqual = Predicates.greaterEqual('age', 18); - var pagingPredicate = Predicates.paging(greaterEqual, 5); - -// Set page to retrieve third page - pagingPredicate.setPage(3); - - // Retrieve third page - return map.valuesWithPredicate(pagingPredicate) -}).then(function (values) { - // some operations -... - - // Set up next page - pagingPredicate.nextPage(); - - // Retrieve next page - return map.valuesWithPredicate(pagingPredicate); -}).then(function (values) { - // some operations -}); -``` - -If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). - -Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. - -### 7.7.2. Fast-Aggregations - -Fast-Aggregations feature provides some aggregate functions, such as `sum`, `average`, `max`, and `min`, on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. - -The `Aggregators` object provides a wide variety of built-in aggregators. The full list is presented below: - -- `count` -- `doubleAvg` -- `doubleSum` -- `numberAvg` -- `fixedPointSum` -- `floatingPointSum` -- `max` -- `min` -- `integerAvg` -- `integerSum` -- `longAvg` -- `longSum` - -You can use these aggregators with the `IMap.aggregate()` and `IMap.aggregateWithPredicate()` functions. - -See the following example. - -```javascript -var map; -hz.getMap('employees').then(function (mp) { - map = mp; - return map.putAll([ - ['John Stiles', 23], - ['Judy Doe', 29], - ['Richard Miles', 38], - ]); -}).then(function () { - return map.aggregate(Aggregators.count()); -}).then(function (count) { - console.log('There are ' + count + ' employees.'); // There are 3 employees. - return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); -}).then(function (count) { - console.log('There are ' + count + ' employees older than 25.'); // There are 2 employees older than 25. - return map.aggregate(Aggregators.numberAvg()); -}).then(function (avgAge) { - console.log('Average age is ' + avgAge); // Average age is 30 -}); -``` - -## 7.8. Performance - -### 7.8.1. Partition Aware - -Partition Aware ensures that the related entries exist on the same member. If the related data is on the same member, operations can be executed without the cost of extra network calls and extra wire data, and this improves the performance. This feature is provided by using the same partition keys for related data. - -Hazelcast has a standard way of finding out which member owns/manages each key object. The following operations are routed to the same member, since all of them are operating based on the same key `'key1'`. - -```javascript -Client.newHazelcastClient().then(function (client) { - hazelcastClient = client; - return hazelcastClient.getMap('mapA') -}).then(function (mp) { - mapA = mp; - return hazelcastClient.getMap('mapB'); -}).then(function (mp) { - mapB = mp; - return hazelcastClient.getMap('mapC'); -}).then(function (mp) { - mapC = mp; - - // since map names are different, operation is manipulating - // different entries, but the operation takes place on the - // same member since the keys ('key1') are the same - return mapA.put('key1', 'value1'); -}).then(function () { - return mapB.get('key1'); -}).then(function (res) { - return mapC.remove('key1'); -}).then(function () { - // lock operation is still execute on the same member - // of the cluster since the key ("key1") is same - return hazelcastClient.getLock('key1'); -}).then(function (l) { - lock = l; - return lock.lock(); -}); -``` - -When the keys are the same, entries are stored on the same member. However, we sometimes want to have the related entries stored on the same member, such as a customer and his/her order entries. We would have a customers map with `customerId` as the key and an orders map with `orderId` as the key. Since `customerId` and `orderId` are different keys, a customer and his/her orders may fall into different members in your cluster. So how can we have them stored on the same member? We create an affinity between the customer and orders. If we make them part of the same partition then these entries will be co-located. We achieve this by making `OrderKey`s `PartitionAware`. - -```javascript -function OrderKey(orderId, customerId) { - this.orderId = orderId; - this.customerId = customerId; -} - -OrderKey.prototype.getPartitionKey = function () { - return this.customerId; -}; -``` - -Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. - -```javascript -var hazelcastClient; -var mapCustomers; -var mapOrders; - -Client.newHazelcastClient().then(function (client) { - hazelcastClient = client; - return hazelcastClient.getMap('customers') -}).then(function (mp) { - mapCustomers = mp; - return hazelcastClient.getMap('orders'); -}).then(function (mp) { - mapOrders = mp; - - // create the customer entry with customer id = 1 - return mapCustomers.put(1, customer); -}).then(function () { - // now create the orders for this customer - return mapOrders.putAll([ - [new OrderKey(21, 1), order], - [new OrderKey(22, 1), order], - [new OrderKey(23, 1), order] - ]); -}); -``` - -For more details, see the [PartitionAware section](https://docs.hazelcast.org/docs/latest/manual/html-single/#partitionaware) in the Hazelcast IMDG Reference Manual. - -### 7.8.2. Near Cache - -Map entries in Hazelcast are partitioned across the cluster members. Hazelcast clients do not have local data at all. Suppose you read the key `k` a number of times from a Hazelcast client and `k` is owned by a member in your cluster. Then each `map.get(k)` will be a remote operation, which creates a lot of network trips. If you have a map that is mostly read, then you should consider creating a local Near Cache, so that reads are sped up and less network traffic is created. - -These benefits do not come for free, please consider the following trade-offs: - -- If invalidation is enabled and entries are updated frequently, then invalidations will be costly. - -- Near Cache breaks the strong consistency guarantees; you might be reading stale data. - -- Clients with a Near Cache will have to hold the extra cached data, which increases memory consumption. +--- -Near Cache is highly recommended for maps that are mostly read. +[Hazelcast](https://hazelcast.org/) is an open-source distributed in-memory data store and computation platform that +provides a wide variety of distributed data structures and concurrency primitives. -#### 7.8.2.1. Configuring Near Cache +Hazelcast Node.js client is a way to communicate to Hazelcast IMDG clusters and access the cluster data. +The client provides a Promise-based API with a builtin support for native JavaScript objects. -The following snippets show how a Near Cache is configured in the Node.js client, presenting all available values for each element: +## Installation -**Declarative Configuration:** +### Hazelcast -``` -{ - "nearCaches": [ - { - "name": "mostlyReadMap", - "invalidateOnChange": (false|true), - "timeToLiveSeconds": (0..Number.MAX_SAFE_INTEGER), - "maxIdleSeconds": (0..Number.MAX_SAFE_INTEGER), - "inMemoryFormat": "(object|binary)", - "evictionPolicy": "lru|lfu|random|none", - "evictionMaxSize": (0..Number.MAX_SAFE_INTEGER), - "evictionSamplingCount": (0..Number.MAX_SAFE_INTEGER), - "evictionSamplingPoolSize": (0..Number.MAX_SAFE_INTEGER), - } - ] -} -``` +Hazelcast Node.js client requires a working Hazelcast IMDG cluster to run. This cluster handles the storage and +manipulation of the user data. -**Programmatic Configuration:** +A Hazelcast IMDG cluster consists of one or more cluster members. These members generally run on multiple virtual or +physical machines and are connected to each other via the network. Any data put on the cluster is partitioned to +multiple members transparent to the user. It is therefore very easy to scale the system by adding new members as +the data grows. Hazelcast IMDG cluster also offers resilience. Should any hardware or software problem causes a crash +to any member, the data on that member is recovered from backups and the cluster continues to operate without any +downtime. -```javascript -var nearCacheConfig = new Config.NearCacheConfig(); -nearCacheConfig.name = 'mostlyReadMap'; -nearCacheConfig.invalidateOnChange = (false|true); -nearCacheConfig.timeToLiveSeconds = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.maxIdleSeconds = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.inMemoryFormat= (InMemoryFormat.OBJECT|InMemoryFormat.BINARY); -nearCacheConfig.evictionPolicy = (EvictionPolicy.LRU|EvictionPolicy.LFU|EvictionPolicy.RANDOM|EvictionPolicy.NONE); -nearCacheConfig.evictionMaxSize = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.evictionSamplingCount = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.evictionSamplingPoolSize = (0..Number.MAX_SAFE_INTEGER); +The quickest way to start a single member cluster for development purposes is to use our +[Docker images](https://hub.docker.com/r/hazelcast/hazelcast/). -cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +```bash +docker run -p 5701:5701 hazelcast/hazelcast:3.12.6 ``` -Following are the descriptions of all configuration elements: - -- `inMemoryFormat`: Specifies in which format data will be stored in your Near Cache. Note that a map’s in-memory format can be different from that of its Near Cache. Available values are as follows: - - `BINARY`: Data will be stored in serialized binary format (default value). - - `OBJECT`: Data will be stored in deserialized form. - -- `invalidateOnChange`: Specifies whether the cached entries are evicted when the entries are updated or removed in members. Its default value is true. - -- `timeToLiveSeconds`: Maximum number of seconds for each entry to stay in the Near Cache. Entries that are older than this period are automatically evicted from the Near Cache. Regardless of the eviction policy used, `timeToLiveSeconds` still applies. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. - -- `maxIdleSeconds`: Maximum number of seconds each entry can stay in the Near Cache as untouched (not read). Entries that are not read more than this period are removed from the Near Cache. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. - -- `evictionPolicy`: Eviction policy configuration. Available values are as follows: - - `LRU`: Least Recently Used (default value). - - `LFU`: Least Frequently Used. - - `NONE`: No items are evicted and the `evictionMaxSize` property is ignored. You still can combine it with `timeToLiveSeconds` and `maxIdleSeconds` to evict items from the Near Cache. - - `RANDOM`: A random item is evicted. - -- `evictionMaxSize`: Maximum number of entries kept in the memory before eviction kicks in. -- `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. -- `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. - -#### 7.8.2.2. Near Cache Example for Map - -The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. - -**Declarative Configuration:** - -``` -{ - "nearCaches": [ - { - "name": "mostlyReadMap", - "inMemoryFormat": "object", - "invalidateOnChange": true, - "evictionPolicy": "lru", - "evictionMaxSize": 5000, - } - ] -} -``` +You can also use our ZIP or TAR [distributions](https://hazelcast.org/imdg/download/archives/#hazelcast-imdg) +as described [here](DOCUMENTATION.md#121-setting-up-a-hazelcast-imdg-cluster). -**Programmatic Configuration:** +Make sure to use Hazelcast IMDG 3.x versions as the work to support 4.x versions is in progress. -```javascript -var nearCacheConfig = new Config.NearCacheConfig(); -nearCacheConfig.name = "mostlyReadMap"; -nearCacheConfig.inMemoryFormat= InMemoryFormat.OBJECT; -nearCacheConfig.invalidateOnChange = true; -nearCacheConfig.evictionPolicy = EvictionPolicy.LRU; -nearCacheConfig.evictionMaxSize = 5000; +### Client -cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +```bash +npm install hazelcast-client ``` -#### 7.8.2.3. Near Cache Eviction - -In the scope of Near Cache, eviction means evicting (clearing) the entries selected according to the given `evictionPolicy` when the specified `evictionMaxSize` has been reached. - -The `evictionMaxSize` defines the entry count when the Near Cache is full and determines whether the eviction should be triggered. - -Once the eviction is triggered the configured `evictionPolicy` determines which, if any, entries must be evicted. - -#### 7.8.2.4. Near Cache Expiration - -Expiration means the eviction of expired records. A record is expired: - -- if it is not touched (accessed/read) for `maxIdleSeconds` - -- `timeToLiveSeconds` passed since it is put to Near Cache - -The actual expiration is performed when a record is accessed: it is checked if the record is expired or not. If it is expired, it is evicted and `undefined` is returned as the value to the caller. - - -#### 7.8.2.5. Near Cache Invalidation - -Invalidation is the process of removing an entry from the Near Cache when its value is updated or it is removed from the original map (to prevent stale reads). See the [Near Cache Invalidation section](https://docs.hazelcast.org/docs/latest/manual/html-single/#near-cache-invalidation) in the Hazelcast IMDG Reference Manual. - -#### 7.8.2.6. Near Cache Eventual Consistency - -Near Caches are invalidated by invalidation events. Invalidation events can be lost due to the fire-and-forget fashion of eventing system. If an event is lost, reads from Near Cache can indefinitely be stale. - -To solve this problem, Hazelcast provides eventually consistent behavior for Map Near Caches by detecting invalidation losses. After detection of an invalidation loss, stale data will be made unreachable and Near Cache’s `get` calls to that data will be directed to underlying Map to fetch the fresh data. +## Overview -You can configure eventual consistency with the `ClientConfig.properties` below: +### Usage -- `hazelcast.invalidation.max.tolerated.miss.count`: Default value is `10`. If missed invalidation count is bigger than this value, relevant cached data will be made unreachable. +```js +const { Client } = require('hazelcast-client'); -- `hazelcast.invalidation.reconciliation.interval.seconds`: Default value is `60` seconds. This is a periodic task that scans cluster members periodically to compare generated invalidation events with the received ones from the client Near Cache. +// Connect to Hazelcast cluster +const client = await Client.newHazelcastClient(); -### 7.8.3. Automated Pipelining +// Get or create the 'distributed-map' on the cluster +const map = await client.getMap('distributed-map'); -Hazelcast Node.js client performs automated pipelining of operations. It means that the library pushes all operations into an internal queue and tries to send them in batches. This reduces the count of executed `Socket.write()` calls and significantly improves throughtput for read operations. +// Put 'key', 'value' pair into the 'distributed-map' +await map.put('key', 'value'); -You can configure automated operation pipelining with the `ClientConfig.properties` below: +// Get the value associated with the given key from the cluster +const value = await map.get('key'); +console.log(value); // Outputs 'value' -- `hazelcast.client.autopipelining.enabled`: Default value is `true`. Turns automated pipelining feature on/off. If your application does only writes operations, like `IMap.set()`, you can try disabling automated pipelining to get a slightly better throughtput. - -- `hazelcast.client.autopipelining.threshold.bytes`: Default value is `8192` bytes. This is the coalescing threshold for the internal queue used by automated pipelining. Once the total size of operation payloads taken from the queue reaches this value during batch preparation, these operations are written to the socket. Notice that automated pipelining will still send operations if their total size is smaller than the threshold and there are no more operations in the internal queue. - -## 7.9. Monitoring and Logging - -### 7.9.1. Enabling Client Statistics - -You can monitor your clients using Hazelcast Management Center. - -As a prerequisite, you need to enable the client statistics before starting your clients. This can be done by setting the `hazelcast.client.statistics.enabled` system property to `true` on the **member** as the following: - -```xml - - ... - - true - - ... - +// Shutdown the client +client.shutdown(); ``` -Also, you need to enable the client statistics in the Node.js client. There are two properties related to client statistics: - -- `hazelcast.client.statistics.enabled`: If set to `true`, it enables collecting the client statistics and sending them to the cluster. When it is `true` you can monitor the clients that are connected to your Hazelcast cluster, using Hazelcast Management Center. Its default value is `false`. - -- `hazelcast.client.statistics.period.seconds`: Period in seconds the client statistics are collected and sent to the cluster. Its default value is `3`. +If you are using Hazelcast IMDG and the Node.js client on the same machine, the default configuration should work +out-of-the-box. However, you may need to configure the client to connect to cluster nodes that are running on +different machines or to customize client properties. -You can enable client statistics and set a non-default period in seconds as follows: +### Configuration -**Declarative Configuration:** +```js +const { Client, Config } = require('hazelcast-client'); -```json -{ - "properties": { - "hazelcast.client.statistics.enabled": true, - "hazelcast.client.statistics.period.seconds": 4 - } -} -``` - -**Programmatic Configuration:** - -```javascript -var config = new Config.ClientConfig(); -config.properties['hazelcast.client.statistics.enabled'] = true; -config.properties['hazelcast.client.statistics.period.seconds'] = 4; -``` +// Create a configuration object +const clientConfig = new Config.ClientConfig(); -After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. +// Customize the client configuration +clientConfig.groupConfig.name = 'cluster-name'; +clientConfig.networkConfig.addresses.push('10.90.0.2:5701'); +clientConfig.networkConfig.addresses.push('10.90.0.3:5701'); -### 7.9.2. Logging Configuration +// Initialize the client with the given configuration +const client = await Client.newHazelcastClient(clientConfig); - By default, Hazelcast Node.js client uses a default logger which logs to the `stdout` with the `INFO` log level. You can change the log level using the `'hazelcast.logging.level'` property of the `ClientConfig.properties`. - -Below is an example of the logging configuration with the `OFF` log level which disables logging. - -```javascript -cfg.properties['hazelcast.logging.level'] = LogLevel.OFF; +console.log('Connected to cluster'); +client.shutdown(); ``` - - You can also implement a custom logger depending on your needs. Your custom logger must have `log`, `error`, `warn`, `info`, `debug`, `trace` methods. After implementing it, you can use your custom logger using the `customLogger` property of `ClientConfig` - -See the following for a custom logger example. - -```javascript -var winstonAdapter = { - logger: new (winston.Logger)({ - transports: [ - new (winston.transports.Console)() - ] - }), - - levels: [ - 'error', - 'warn', - 'info', - 'debug', - 'silly' - ], - - log: function (level, objectName, message, furtherInfo) { - this.logger.log(this.levels[level], objectName + ': ' + message, furtherInfo); - }, - - error: function (objectName, message, furtherInfo) { - this.log(LogLevel.ERROR, objectName, message, furtherInfo); - }, - - warn: function (objectName, message, furtherInfo) { - this.log(LogLevel.WARN, objectName, message, furtherInfo); - }, - info: function (objectName, message, furtherInfo) { - this.log(LogLevel.INFO, objectName, message, furtherInfo); - }, +You can also configure the client +[declaratively](DOCUMENTATION.md#312-declarative-configuration-json) using a JSON file. - debug: function (objectName, message, furtherInfo) { - this.log(LogLevel.DEBUG, objectName, message, furtherInfo); - }, +## Features - trace: function (objectName, message, furtherInfo) { - this.log(LogLevel.TRACE, objectName, message, furtherInfo); - } +* Distributed, partitioned and queryable in-memory key-value store implementation, called **Map** +* Eventually consistent cache implementation to store a subset of the Map data locally in the memory of the client, called **Near Cache** +* Additional data structures and simple messaging constructs such as **Set**, **MultiMap**, **Queue**, **Topic** +* Cluster-wide unique ID generator, called **FlakeIdGenerator** +* Distributed, CRDT based counter, called **PNCounter** +* Primitives for distributed computing such as **Lock**, **Semaphore**, **Atomic Long** +* Integration with [Hazelcast Cloud](https://cloud.hazelcast.com/) +* Support for serverless and traditional web service architectures with **Unisocket** and **Smart** operation modes +* Ability to listen client lifecycle, cluster state and distributed data structure events +* and [many more](https://hazelcast.org/imdg/clients-languages/node-js/#client-features). -}; -cfg.customLogger = winstonAdapter; -``` - -Note that it is not possible to configure custom logging via declarative configuration. +## Getting Help -# 8. Development and Testing +You can use the following channels for your questions and development/usage issues: -Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or -tweak the implementation to your application's needs, you can follow the steps in this section. +* [GitHub repository](https://github.com/hazelcast/hazelcast-nodejs-client) +* [Complete documentation](DOCUMENTATION.md) +* [API documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) +* [Gitter](https://gitter.im/hazelcast/hazelcast) +* [Google Groups](https://groups.google.com/forum/#!forum/hazelcast) +* [Stack Overflow](https://stackoverflow.com/questions/tagged/hazelcast) -## 8.1. Building and Using Client From Sources +## Contributing -Follow the below steps to build and install Hazelcast Node.js client from its source: +We encourage any type of contribution in the form of issue reports or pull requests. -1. Clone the GitHub repository (https://github.com/hazelcast/hazelcast-nodejs-client.git). -2. Run `npm install` to automatically download and install all the required modules under `node_modules` directory. Note that, -there may be vulnerabilities reported due to `devDependencies`. In that case, run `npm audit fix` to automatically install any compatible updates to vulnerable dependencies. -3. Run `npm run compile` to compile TypeScript files to JavaScript. +### Issue Reports -At this point you have all the runnable code (`.js`) and type declarations (`.d.ts`) in the `lib` directory. You may create a link to this module so that your local -applications can depend on your local copy of Hazelcast Node.js client. In order to create a link, run the below command: +For issue reports, please share the following information with us to quickly resolve the problems. -``` -npm link -``` +* Hazelcast IMDG and the client version that you use +* General information about the environment and the architecture you use like Node.js version, cluster size, number of clients, Java version, JVM parameters, operating system etc. +* Logs and stack traces, if any. +* Detailed description of the steps to reproduce the issue. -This will create a global link to this module in your computer. Whenever you need to depend on this module from another -local project, run the below command: +### Pull Requests -``` -npm link hazelcast-client -``` +Contributions are submitted, reviewed and accepted using the pull requests on GitHub. For an enhancement or larger +feature, create a GitHub issue first to discuss. -If you are planning to contribute, please run the style checker, as shown below, and fix the reported issues before sending a pull request: +#### Development -``` -npm run lint -``` +1. Clone the GitHub [repository](https://github.com/hazelcast/hazelcast-nodejs-client.git). +2. Run `npm install` to automatically download and install all the required modules. +3. Do the work. +4. Hazelcast Node.js client developed using TypeScript. Run `npm run compile` to compile TypeScript files to JavaScript. +5. To have a consistent code style across the code base, Hazelcast Node.js client uses a style checker. Run `npm run lint` and fix the reported issues, if any. -## 8.2. Testing +#### Testing In order to test Hazelcast Node.js client locally, you will need the following: -* Java 6 or newer +* Java 8 or newer * Maven Following command starts the tests: -``` +```bash npm test ``` Test script automatically downloads `hazelcast-remote-controller` and Hazelcast IMDG. The script uses Maven to download those. -# 9. Getting Help - -You can use the following channels for your questions and development/usage issues: - -* This repository by opening an issue. -* Hazelcast Node.js client channel on Gitter: -[![Join the chat at https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hazelcast-incubator/hazelcast-nodejs-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -* Our Google Groups directory: https://groups.google.com/forum/#!forum/hazelcast -* Stack Overflow: https://stackoverflow.com/questions/tagged/hazelcast - -# 10. Contributing - -Besides your development contributions as explained in the [Development and Testing chapter](#8-development-and-testing) above, you can always open a pull request on this repository for your other requests such as documentation changes. - -# 11. License +## License -[Apache 2 License](https://github.com/hazelcast/hazelcast-nodejs-client/blob/master/LICENSE). +[Apache 2 License](LICENSE). -# 12. Copyright +## Copyright Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 77f8ad5bd..000000000 --- a/package-lock.json +++ /dev/null @@ -1,2650 +0,0 @@ -{ - "name": "hazelcast-client", - "version": "0.10.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@types/bluebird": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.21.tgz", - "integrity": "sha512-6UNEwyw+6SGMC/WMI0ld0PS4st7Qq51qgguFrFizOSpGvZiqe9iswztFSdZvwJBEhLOy2JaxNE6VC7yMAlbfyQ==", - "dev": true - }, - "@types/long": { - "version": "3.0.32", - "resolved": "https://registry.npmjs.org/@types/long/-/long-3.0.32.tgz", - "integrity": "sha1-9OWvMenpsZbY5fyopeLiCqPWC2k=", - "dev": true - }, - "@types/node": { - "version": "6.0.87", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.87.tgz", - "integrity": "sha1-WrV3T4NRozqTUJn6a+hQqgsK1WQ=", - "dev": true - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", - "dev": true, - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", - "dev": true - }, - "array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", - "dev": true - }, - "bluebird": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", - "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==" - }, - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - } - }, - "chai": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz", - "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=", - "dev": true, - "requires": { - "assertion-error": "^1.0.1", - "check-error": "^1.0.1", - "deep-eql": "^3.0.0", - "get-func-name": "^2.0.0", - "pathval": "^1.0.0", - "type-detect": "^4.0.0" - }, - "dependencies": { - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs=", - "dev": true - }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha1-38lARACtHI/gI+faHfHBR8S0RN8=", - "dev": true, - "requires": { - "type-detect": "^4.0.0" - } - }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true - }, - "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", - "dev": true - }, - "type-detect": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", - "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", - "dev": true - } - } - }, - "chai-as-promised": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", - "integrity": "sha1-CGRdgl3rhpbuYXJdv1kMAS6wDKA=", - "dev": true, - "requires": { - "check-error": "^1.0.2" - }, - "dependencies": { - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - } - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "charenc": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", - "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=", - "dev": true - }, - "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", - "dev": true - }, - "clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", - "dev": true - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "crypt": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", - "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=", - "dev": true - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "^1.0.1" - } - }, - "dateformat": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz", - "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1", - "meow": "^3.3.0" - } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", - "dev": true, - "requires": { - "readable-stream": "~1.1.9" - } - }, - "error-ex": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", - "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "fancy-log": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", - "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", - "dev": true, - "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "time-stamp": "^1.0.0" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "glogg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", - "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", - "dev": true, - "requires": { - "sparkles": "^1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "gulp-util": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz", - "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=", - "dev": true, - "requires": { - "array-differ": "^1.0.0", - "array-uniq": "^1.0.2", - "beeper": "^1.0.0", - "chalk": "^1.0.0", - "dateformat": "^1.0.11", - "fancy-log": "^1.1.0", - "gulplog": "^1.0.0", - "has-gulplog": "^0.1.0", - "lodash._reescape": "^3.0.0", - "lodash._reevaluate": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.template": "^3.0.0", - "minimist": "^1.1.0", - "multipipe": "^0.1.2", - "object-assign": "^3.0.0", - "replace-ext": "0.0.1", - "through2": "^2.0.0", - "vinyl": "^0.5.0" - } - }, - "gulplog": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", - "dev": true, - "requires": { - "glogg": "^1.0.0" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", - "dev": true, - "requires": { - "sparkles": "^1.0.0" - } - }, - "hazelcast-remote-controller": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hazelcast-remote-controller/-/hazelcast-remote-controller-1.0.0.tgz", - "integrity": "sha1-PxFIxrf6taLqm9pkA7iebf3eoZo=", - "dev": true, - "requires": { - "thrift": "^0.9.3" - }, - "dependencies": { - "thrift": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/thrift/-/thrift-0.9.3.tgz", - "integrity": "sha1-mQITNkA9QuCLjvrbHDegbXmYsqY=", - "dev": true, - "requires": { - "node-int64": "~0.3.0", - "q": "1.0.x", - "ws": "~0.4.32" - }, - "dependencies": { - "node-int64": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz", - "integrity": "sha1-LW5rLs5d6FiLQ9iNG8QbJs0fqE0=", - "dev": true - }, - "q": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz", - "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ=", - "dev": true - }, - "ws": { - "version": "0.4.32", - "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", - "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=", - "dev": true, - "requires": { - "commander": "~2.1.0", - "nan": "~1.0.0", - "options": ">=0.0.5", - "tinycolor": "0.x" - }, - "dependencies": { - "commander": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", - "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=", - "dev": true - }, - "nan": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", - "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg=", - "dev": true - }, - "options": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz", - "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=", - "dev": true - }, - "tinycolor": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", - "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ=", - "dev": true - } - } - } - } - } - } - }, - "hosted-git-info": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", - "dev": true - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "^1.0.0" - } - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "istanbul": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz", - "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", - "dev": true, - "requires": { - "abbrev": "1.0.x", - "async": "1.x", - "escodegen": "1.8.x", - "esprima": "2.7.x", - "glob": "^5.0.15", - "handlebars": "^4.0.1", - "js-yaml": "3.x", - "mkdirp": "0.5.x", - "nopt": "3.x", - "once": "1.x", - "resolve": "1.1.x", - "supports-color": "^3.1.0", - "which": "^1.1.1", - "wordwrap": "^1.0.0" - }, - "dependencies": { - "abbrev": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", - "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", - "dev": true - }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", - "dev": true, - "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.2.0" - }, - "dependencies": { - "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - }, - "dependencies": { - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - } - } - }, - "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "dev": true, - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - }, - "dependencies": { - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true, - "optional": true - } - } - } - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "dependencies": { - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - } - } - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - } - } - }, - "handlebars": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", - "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", - "dev": true, - "requires": { - "async": "^1.4.0", - "optimist": "^0.6.1", - "source-map": "^0.4.4", - "uglify-js": "^2.6" - }, - "dependencies": { - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - }, - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - }, - "dependencies": { - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - } - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "optional": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "optional": true - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "optional": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - }, - "dependencies": { - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "optional": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "optional": true, - "requires": { - "is-buffer": "^1.1.5" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", - "dev": true, - "optional": true - } - } - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true, - "optional": true - } - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true, - "optional": true - } - } - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "optional": true, - "requires": { - "align-text": "^0.1.1" - }, - "dependencies": { - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "optional": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "optional": true, - "requires": { - "is-buffer": "^1.1.5" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", - "dev": true, - "optional": true - } - } - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true, - "optional": true - } - } - } - } - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true - } - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "optional": true - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true - } - } - } - } - } - } - }, - "js-yaml": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", - "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "dependencies": { - "argparse": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", - "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - }, - "dependencies": { - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - } - } - }, - "esprima": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=", - "dev": true - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - } - } - }, - "which": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", - "dev": true, - "requires": { - "isexe": "^2.0.0" - }, - "dependencies": { - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - } - } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - } - } - }, - "jsonschema": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.4.tgz", - "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw==", - "dev": true - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", - "dev": true - }, - "lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", - "dev": true - }, - "lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "dev": true - }, - "lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", - "dev": true, - "requires": { - "lodash._root": "^3.0.0" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, - "lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", - "dev": true - }, - "lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", - "dev": true, - "requires": { - "lodash._basecopy": "^3.0.0", - "lodash._basetostring": "^3.0.0", - "lodash._basevalues": "^3.0.0", - "lodash._isiterateecall": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0", - "lodash.keys": "^3.0.0", - "lodash.restparam": "^3.0.0", - "lodash.templatesettings": "^3.0.0" - } - }, - "lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", - "dev": true, - "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0" - } - }, - "long": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", - "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "md5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz", - "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=", - "dev": true, - "requires": { - "charenc": "~0.0.1", - "crypt": "~0.0.1", - "is-buffer": "~1.1.1" - } - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "mocha": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", - "integrity": "sha1-HgSA/jbS2lhY0etqzDhBiybqog0=", - "dev": true, - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.9.0", - "debug": "2.6.8", - "diff": "3.2.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.1", - "growl": "1.9.2", - "he": "1.1.1", - "json3": "3.3.2", - "lodash.create": "3.1.1", - "mkdirp": "0.5.1", - "supports-color": "3.1.2" - }, - "dependencies": { - "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", - "dev": true - }, - "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "dev": true, - "requires": { - "graceful-readlink": ">= 1.0.0" - }, - "dependencies": { - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true - } - } - }, - "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "diff": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", - "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", - "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.2", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - } - } - } - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - } - } - }, - "growl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", - "dev": true - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, - "lodash.create": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", - "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", - "dev": true, - "requires": { - "lodash._baseassign": "^3.0.0", - "lodash._basecreate": "^3.0.0", - "lodash._isiterateecall": "^3.0.0" - }, - "dependencies": { - "lodash._baseassign": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", - "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", - "dev": true, - "requires": { - "lodash._basecopy": "^3.0.0", - "lodash.keys": "^3.0.0" - }, - "dependencies": { - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - }, - "dependencies": { - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - } - } - } - } - }, - "lodash._basecreate": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", - "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "supports-color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - }, - "dependencies": { - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - } - } - } - } - }, - "mocha-junit-reporter": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-1.18.0.tgz", - "integrity": "sha512-y3XuqKa2+HRYtg0wYyhW/XsLm2Ps+pqf9HaTAt7+MVUAKFJaNAHOrNseTZo9KCxjfIbxUWwckP5qCDDPUmjSWA==", - "dev": true, - "requires": { - "debug": "^2.2.0", - "md5": "^2.1.0", - "mkdirp": "~0.5.1", - "strip-ansi": "^4.0.0", - "xml": "^1.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "mousse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/mousse/-/mousse-0.3.1.tgz", - "integrity": "sha1-0Hq3MFiaBWSsJpa2wvVLZXgY+7Q=", - "dev": true, - "requires": { - "collections": "~1.2.1", - "q": "1.0.0" - }, - "dependencies": { - "collections": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/collections/-/collections-1.2.4.tgz", - "integrity": "sha1-Pi8WRe1D188f4khAYAH6q0Ln5GM=", - "dev": true, - "requires": { - "weak-map": "~1.0.x" - }, - "dependencies": { - "weak-map": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", - "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=", - "dev": true - } - } - }, - "q": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.0.0.tgz", - "integrity": "sha1-3B+SxFh75U94U7Kdwo5tJDqISY0=", - "dev": true - } - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", - "dev": true, - "requires": { - "duplexer2": "0.0.2" - } - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, - "remap-istanbul": { - "version": "0.9.6", - "resolved": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.9.6.tgz", - "integrity": "sha512-l0WDBsVjaTzP8m3glERJO6bjlAFUahcgfcgvcX+owZw7dKeDLT3CVRpS7UO4L9LfGcMiNsqk223HopwVxlh8Hg==", - "dev": true, - "requires": { - "amdefine": "^1.0.0", - "gulp-util": "3.0.7", - "istanbul": "0.4.5", - "minimatch": "^3.0.3", - "source-map": "^0.6.1", - "through2": "2.0.1" - } - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", - "dev": true - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", - "dev": true, - "requires": { - "glob": "^7.0.5" - }, - "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - } - } - } - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - } - } - } - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "sinon": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.0.0.tgz", - "integrity": "sha1-pUpfAjeqHdIhXl6ByJtCtQxP22s=", - "dev": true, - "requires": { - "diff": "^3.1.0", - "formatio": "1.2.0", - "lodash.get": "^4.4.2", - "lolex": "^2.1.2", - "native-promise-only": "^0.8.1", - "nise": "^1.1.0", - "path-to-regexp": "^1.7.0", - "samsam": "^1.1.3", - "text-encoding": "0.6.4", - "type-detect": "^4.0.0" - }, - "dependencies": { - "diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", - "dev": true - }, - "formatio": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz", - "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=", - "dev": true, - "requires": { - "samsam": "1.x" - } - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "lolex": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz", - "integrity": "sha1-PSMZiURx6glQ72RpLq0qUxjP82I=", - "dev": true - }, - "native-promise-only": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", - "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=", - "dev": true - }, - "nise": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz", - "integrity": "sha1-B51srbvLErow448cmZ82rU1rqlM=", - "dev": true, - "requires": { - "formatio": "^1.2.0", - "just-extend": "^1.1.26", - "lolex": "^1.6.0", - "path-to-regexp": "^1.7.0", - "text-encoding": "^0.6.4" - }, - "dependencies": { - "just-extend": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz", - "integrity": "sha1-7G55QQ/5FORyZSq/oOYDwD1g6QU=", - "dev": true - }, - "lolex": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz", - "integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=", - "dev": true - } - } - }, - "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } - }, - "samsam": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz", - "integrity": "sha1-jR2TUOJWItow3j5EumkrUiGrfFA=", - "dev": true - }, - "text-encoding": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", - "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk=", - "dev": true - }, - "type-detect": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz", - "integrity": "sha1-hivSz2BYrZJ5n/WluM97bOxyYZg=", - "dev": true - } - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "sparkles": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", - "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", - "dev": true - }, - "spdx-correct": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", - "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "dev": true, - "requires": { - "spdx-license-ids": "^1.0.2" - } - }, - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - }, - "spdx-license-ids": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "through2": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz", - "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=", - "dev": true, - "requires": { - "readable-stream": "~2.0.0", - "xtend": "~4.0.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~0.10.x", - "util-deprecate": "~1.0.1" - } - } - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", - "dev": true - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "tslint": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.7.0.tgz", - "integrity": "sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI=", - "dev": true, - "requires": { - "babel-code-frame": "^6.22.0", - "colors": "^1.1.2", - "commander": "^2.9.0", - "diff": "^3.2.0", - "glob": "^7.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.7.1", - "tsutils": "^2.8.1" - }, - "dependencies": { - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - } - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - } - } - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha1-aWS8pnaF33wfFDDFhPB9dZeIW5w=", - "dev": true - }, - "diff": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz", - "integrity": "sha1-sdhVB9rzlkgo3lSzfQ1zumfdpWw=", - "dev": true - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "dependencies": { - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - }, - "dependencies": { - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - } - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - } - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", - "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - } - } - } - } - }, - "resolve": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", - "integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=", - "dev": true, - "requires": { - "path-parse": "^1.0.5" - }, - "dependencies": { - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true - } - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=", - "dev": true - }, - "tslib": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", - "integrity": "sha1-43qG/ajLuvI6BX9HPJ9Nxk5fwug=", - "dev": true - }, - "tsutils": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.19.1.tgz", - "integrity": "sha1-dtfr3qnXp79KBfUOrTcBsBaHCNc=", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } - } - } - }, - "typescript": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz", - "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", - "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "dev": true, - "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" - } - }, - "vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", - "dev": true, - "requires": { - "clone": "^1.0.0", - "clone-stats": "^0.0.1", - "replace-ext": "0.0.1" - } - }, - "winston": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz", - "integrity": "sha1-C0hCDZeMAYBM8CMLZIhhWYIloRk=", - "dev": true, - "requires": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - }, - "dependencies": { - "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=", - "dev": true - }, - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true - }, - "cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", - "dev": true - }, - "eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", - "dev": true - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", - "dev": true - } - } - }, - "xml": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", - "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - } - } -} From 9ecf35aab15fc72f6659a0925e1c1d5ae1e9cfd0 Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Fri, 1 May 2020 10:10:58 +0300 Subject: [PATCH 262/685] Add RestValue serializer (#528) * add RestValue serializer * address review comments --- src/core/RestValue.ts | 53 +++++++++ src/serialization/SerializationService.ts | 2 + test/rest_value/RestValueTest.js | 106 ++++++++++++++++++ test/rest_value/hazelcast_rest.xml | 25 +++++ .../DefaultSerializersLiveTest.js | 28 ++++- test/serialization/DefaultSerializersTest.js | 7 +- 6 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 src/core/RestValue.ts create mode 100644 test/rest_value/RestValueTest.js create mode 100644 test/rest_value/hazelcast_rest.xml diff --git a/src/core/RestValue.ts b/src/core/RestValue.ts new file mode 100644 index 000000000..8d6053972 --- /dev/null +++ b/src/core/RestValue.ts @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../serialization/Serializable'; +import {DataInput, DataOutput} from '../serialization/Data'; + +export const REST_VALUE_FACTORY_ID = -37; +export const REST_VALUE_CLASS_ID = 1; + +export class RestValue implements IdentifiedDataSerializable { + value: string; + contentType: string; + + getClassId(): number { + return REST_VALUE_CLASS_ID; + } + + getFactoryId(): number { + return REST_VALUE_FACTORY_ID; + } + + readData(input: DataInput): any { + this.value = input.readUTF(); + this.contentType = input.readUTF(); + } + + writeData(output: DataOutput): void { + output.writeUTF(this.value); + output.writeUTF(this.contentType); + } +} + +export class RestValueFactory implements IdentifiedDataSerializableFactory { + create(type: number): IdentifiedDataSerializable { + if (type === REST_VALUE_CLASS_ID) { + return new RestValue(); + } + return null; + } +} diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index d389f8df7..1297635d7 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -57,6 +57,7 @@ import {IdentifiedDataSerializableFactory} from './Serializable'; import HazelcastClient from '../HazelcastClient'; import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; import {StringSerializationPolicy} from '../config/StringSerializationPolicy'; +import {RestValueFactory, REST_VALUE_FACTORY_ID} from '../core/RestValue'; export interface SerializationService { toData(object: any, paritioningStrategy?: any): Data; @@ -292,6 +293,7 @@ export class SerializationServiceV1 implements SerializationService { factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = new ReliableTopicMessageFactory(); factories[ClusterDataFactoryHelper.FACTORY_ID] = new ClusterDataFactory(); factories[AggregatorFactory.FACTORY_ID] = new AggregatorFactory(); + factories[REST_VALUE_FACTORY_ID] = new RestValueFactory(); this.registerSerializer('identified', new IdentifiedDataSerializableSerializer(factories)); } diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js new file mode 100644 index 000000000..af01a1603 --- /dev/null +++ b/test/rest_value/RestValueTest.js @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const expect = require('chai').expect; +const HazelcastClient = require('../../lib').Client; +const Controller = require('../RC'); +const fs = require('fs'); +const http = require('http'); +const querystring = require('querystring'); +const DeferredPromise = require('../../lib/Util').DeferredPromise; +const Buffer = require('safe-buffer').Buffer; + +describe('RestValueTest', function () { + + let cluster; + let client; + let member; + + before(function () { + this.timeout(32000); + return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_rest.xml', 'utf8')) + .then(c => { + cluster = c; + return Controller.startMember(cluster.id); + }).then(m => { + member = m; + return HazelcastClient.newHazelcastClient(); + }).then(c => { + client = c; + }); + }); + + after(function () { + client.shutdown(); + return Controller.shutdownCluster(cluster.id); + }); + + it('client should receive REST events from server as RestValue', function (done) { + const contentType = 'text/plain'; + const value = { + 'key': 'value' + }; + const postData = querystring.stringify(value); + + client.getQueue('test') + .then((queue) => { + const itemListener = { + itemAdded: (event) => { + const item = event.item; + expect(item.contentType).to.equal(contentType); + expect(item.value).to.equal(postData); + done(); + } + }; + return queue.addItemListener(itemListener, true); + }) + .then(() => { + const deferred = DeferredPromise(); + + const options = { + hostname: member.host, + port: member.port, + path: '/hazelcast/rest/queues/test', + method: 'POST', + headers: { + 'Content-Type': contentType, + 'Content-Length': Buffer.byteLength(postData) + } + }; + + const request = http.request(options, res => { + if (res.statusCode === 200) { + deferred.resolve(); + } else { + deferred.reject(res.statusCode); + } + }); + + request.on('error', e => { + deferred.reject(e); + }); + + request.write(postData); + request.end(); + return deferred.promise; + }) + .catch(e => { + done(e); + }) + }); +}); diff --git a/test/rest_value/hazelcast_rest.xml b/test/rest_value/hazelcast_rest.xml new file mode 100644 index 000000000..d74ddb60f --- /dev/null +++ b/test/rest_value/hazelcast_rest.xml @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index 05f040b7e..4462b4654 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -19,10 +19,11 @@ var Config = require('../../.').Config; var RC = require('../RC'); var expect = require('chai').expect; var StringSerializationPolicy = require('../../.').StringSerializationPolicy; +var RestValue = require('../../lib/core/RestValue').RestValue; var stringSerializationPolicies = [StringSerializationPolicy.STANDARD, StringSerializationPolicy.LEGACY]; -stringSerializationPolicies.forEach(function(stringSerializationPolicy) { +stringSerializationPolicies.forEach(function (stringSerializationPolicy) { var label = ' - ' + stringSerializationPolicy + 'string serialization'; describe('Default serializers with live instance' + label, function () { @@ -160,5 +161,30 @@ stringSerializationPolicies.forEach(function(stringSerializationPolicy) { return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); }); }); + + it('rest value', function () { + // Making sure that the object is properly de-serialized at the server + var restValue = new RestValue(); + restValue.value = '{\'test\':\'data\'}'; + restValue.contentType = 'text/plain'; + + var script = 'var map = instance_0.getMap("' + map.getName() + '");\n' + + 'var restValue = map.get("key");\n' + + 'var contentType = restValue.getContentType();\n' + + 'var value = restValue.getValue();\n' + + 'var String = Java.type("java.lang.String");\n' + + 'result = "{\\"contentType\\": \\"" + new String(contentType) + "\\", ' + + '\\"value\\": \\"" + new String(value) + "\\"}"\n'; + + return map.put('key', restValue) + .then(function () { + return RC.executeOnController(cluster.id, script, 1); + }) + .then(function (response) { + var result = JSON.parse(response.result.toString()); + expect(result.contentType).to.equal(restValue.contentType); + expect(result.value).to.equal(restValue.value); + }); + }); }); }); diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index d38ae4ab5..b480c77e6 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -20,10 +20,14 @@ var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var Predicates = require('../../.').Predicates; var StringSerializationPolicy = require('../../.').StringSerializationPolicy; +var RestValue = require('../../lib/core/RestValue').RestValue; describe('Default serializers Test', function () { var isStandardUTFValues = [true, false]; + var restValue = new RestValue(); + restValue.value = '{"test":"data"}'; + restValue.contentType = 'text/plain'; var parameters = [ 14, @@ -62,7 +66,8 @@ describe('Default serializers Test', function () { Predicates.regex('this', '/abc/'), Predicates.alwaysTrue(), Predicates.alwaysFalse(), - Predicates.paging(Predicates.greaterEqual('this', 10), 10) + Predicates.paging(Predicates.greaterEqual('this', 10), 10), + restValue ]; isStandardUTFValues.forEach(function(isStandardUTF) { From ae6215700690ede83f6345eb17bdf39cbbb38c77 Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Tue, 5 May 2020 13:18:29 +0300 Subject: [PATCH 263/685] Add compatibility checks for the rest value tests (#531) RestValue class was DataSerializable up until 3.8, therefore it was not supported by the non-Java clients. So, this PR adds a test check to skip when the server version is less than that. Also, the rest-api config element is added to xml config on IMDG version 3.12. To support older versions, it is replaced by the property based config. --- test/rest_value/RestValueTest.js | 5 +++++ test/rest_value/hazelcast_rest.xml | 10 ++++------ test/serialization/DefaultSerializersLiveTest.js | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js index af01a1603..5b8d12162 100644 --- a/test/rest_value/RestValueTest.js +++ b/test/rest_value/RestValueTest.js @@ -24,6 +24,7 @@ const http = require('http'); const querystring = require('querystring'); const DeferredPromise = require('../../lib/Util').DeferredPromise; const Buffer = require('safe-buffer').Buffer; +const Util = require('../Util'); describe('RestValueTest', function () { @@ -45,6 +46,10 @@ describe('RestValueTest', function () { }); }); + beforeEach(function () { + Util.markServerVersionAtLeast(this, client, '3.8'); + }); + after(function () { client.shutdown(); return Controller.shutdownCluster(cluster.id); diff --git a/test/rest_value/hazelcast_rest.xml b/test/rest_value/hazelcast_rest.xml index d74ddb60f..a3ce874c3 100644 --- a/test/rest_value/hazelcast_rest.xml +++ b/test/rest_value/hazelcast_rest.xml @@ -15,11 +15,9 @@ --> - - - - - + + true + diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index 4462b4654..525c07557 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -20,6 +20,7 @@ var RC = require('../RC'); var expect = require('chai').expect; var StringSerializationPolicy = require('../../.').StringSerializationPolicy; var RestValue = require('../../lib/core/RestValue').RestValue; +var Util = require('../Util'); var stringSerializationPolicies = [StringSerializationPolicy.STANDARD, StringSerializationPolicy.LEGACY]; @@ -163,6 +164,7 @@ stringSerializationPolicies.forEach(function (stringSerializationPolicy) { }); it('rest value', function () { + Util.markServerVersionAtLeast(this, client, '3.8'); // Making sure that the object is properly de-serialized at the server var restValue = new RestValue(); restValue.value = '{\'test\':\'data\'}'; From 9f42c1e65239ccf184a677a668788d8821919a6e Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 8 May 2020 09:40:14 +0000 Subject: [PATCH 264/685] 3.12.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02c3dfbfd..bcfe5b6ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hazelcast-client", - "version": "3.12.2", + "version": "3.12.3", "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", "main": "lib/index.js", "dependencies": { From eeb4cbc32ae2fb2365aabbd9a54d6d84a4100510 Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Wed, 17 Jun 2020 15:34:31 +0300 Subject: [PATCH 265/685] Client 4.0 (#522) * Add codecs, implement most of the ownerless client changes along with the other 4.0 updates * fix map proxy and tests * fix multimap proxy and tests * fix replicated map tests * fix ringbuffer proxy and tests * fix ssl tests * fix topic tests * fix serialization tests * fix nearcache tests * remove deprecated atomic long, semaphore and lock proxies * fix json value and cloud discovery tests * more test fixes * fix client message and address helper tests * enable legacy statistics and its tests * fix linter issues * fix reliable topic message factory id * rebase from master * more test fixes * more test fixes * fix remote controller for nodejs 4 * terminate cluster instead of shutdown * remove server version dependency * add new configs to config builder and remove old ones * add connection strategy test * simplify invocation retry logic * update copyright * fix index config test * review some TODOs * remove unused authenticator * clean up bitutil * fix listener service test * change Util#pad param ordering * address review comments * update documentation * more documentation updates * add initial membership listener test * update test * add documentation and test for client labels * update default config and config schema * address documentation comments * address review comments * set partition id and message type using the client message methods * fix client message test * revert back to using random starting index for round robin lb * use client message as the iterator and remove frameIterator method * set initial seed cap to 65k * update hz version to 4.0.2 snapshot * fix sync ClientOfflineError for partition specific proxies * address review comments * address review comments * wait for partition table event in migration test * fix log message * revert framed and pipelined writers and activate tests * fix remaining array initailizations without size * add message fragmentation test * test builtin codecs * remove TODOs after creating issues for them * expose DEFAULT_FLAGS and decrease nesting level in connection manager * fix UUID toString method * update readme * do not create an extra message while putting it into map --- CONFIG.md | 503 --- DOCUMENTATION.md | 3320 +++++++++-------- README.md | 17 +- code_samples/hazelcast_cloud_discovery.js | 8 +- code_samples/org-website/AtomicLongSample.js | 34 - code_samples/org-website/LockSample.js | 34 - config-schema.json | 128 +- hazelcast-client-default.json | 39 +- hazelcast-client-full.json | 31 +- package.json | 2 +- scripts/dev-test-rc.sh | 19 +- scripts/download-rc.bat | 10 +- scripts/download-rc.sh | 10 +- src/Address.ts | 4 +- src/BitsUtil.ts | 58 +- src/ClientInfo.ts | 20 +- src/ClientMessage.ts | 325 +- src/ClusterDataFactory.ts | 2 +- src/ClusterDataFactoryHelper.ts | 1 - ...essageType.ts => DistributedObjectInfo.ts} | 13 +- src/HazelcastClient.ts | 223 +- src/HazelcastError.ts | 39 +- src/HeartbeatManager.ts | 108 + src/HeartbeatService.ts | 119 - src/LifecycleService.ts | 90 +- src/ListenerMessageCodec.ts | 7 +- src/ListenerService.ts | 165 +- src/LoadBalancer.ts | 45 + src/PartitionService.ts | 152 +- src/Util.ts | 16 +- src/aggregation/AggregatorFactory.ts | 2 +- src/codec/AddressCodec.ts | 32 - src/codec/AtomicLongAddAndGetCodec.ts | 62 - src/codec/AtomicLongAlterAndGetCodec.ts | 62 - src/codec/AtomicLongAlterCodec.ts | 53 - src/codec/AtomicLongApplyCodec.ts | 65 - src/codec/AtomicLongCompareAndSetCodec.ts | 64 - src/codec/AtomicLongDecrementAndGetCodec.ts | 60 - src/codec/AtomicLongGetAndAddCodec.ts | 62 - src/codec/AtomicLongGetAndAlterCodec.ts | 62 - src/codec/AtomicLongGetAndIncrementCodec.ts | 60 - src/codec/AtomicLongGetAndSetCodec.ts | 62 - src/codec/AtomicLongGetCodec.ts | 60 - src/codec/AtomicLongIncrementAndGetCodec.ts | 60 - src/codec/AtomicLongMessageType.ts | 32 - src/codec/AtomicLongSetCodec.ts | 52 - .../ClientAddClusterViewListenerCodec.ts | 70 + ...ClientAddDistributedObjectListenerCodec.ts | 90 +- src/codec/ClientAddMembershipListenerCodec.ts | 115 - src/codec/ClientAddPartitionListenerCodec.ts | 88 - .../ClientAddPartitionLostListenerCodec.ts | 96 +- src/codec/ClientAuthenticationCodec.ts | 169 +- src/codec/ClientAuthenticationCustomCodec.ts | 168 +- src/codec/ClientCreateProxiesCodec.ts | 43 + src/codec/ClientCreateProxyCodec.ts | 47 +- src/codec/ClientDeployClassesCodec.ts | 65 +- src/codec/ClientDestroyProxyCodec.ts | 43 +- src/codec/ClientGetDistributedObjectsCodec.ts | 70 +- src/codec/ClientGetPartitionsCodec.ts | 84 - src/codec/ClientLocalBackupListenerCodec.ts | 69 + src/codec/ClientMessageType.ts | 35 - src/codec/ClientPingCodec.ts | 37 +- src/codec/ClientRemoveAllListenersCodec.ts | 47 - ...entRemoveDistributedObjectListenerCodec.ts | 59 +- .../ClientRemovePartitionLostListenerCodec.ts | 59 +- src/codec/ClientStatisticsCodec.ts | 43 +- .../ClientTriggerPartitionAssignmentCodec.ts | 40 + src/codec/EntryViewCodec.ts | 54 - src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 74 +- src/codec/GetPartitionsCodec.ts | 49 - src/codec/ImmutableLazyDataList.ts | 55 - src/codec/ListAddAllCodec.ts | 71 +- src/codec/ListAddAllWithIndexCodec.ts | 79 +- src/codec/ListAddCodec.ts | 61 +- src/codec/ListAddListenerCodec.ts | 101 +- src/codec/ListAddWithIndexCodec.ts | 53 +- src/codec/ListClearCodec.ts | 40 +- src/codec/ListCompareAndRemoveAllCodec.ts | 71 +- src/codec/ListCompareAndRetainAllCodec.ts | 71 +- src/codec/ListContainsAllCodec.ts | 71 +- src/codec/ListContainsCodec.ts | 61 +- src/codec/ListGetAllCodec.ts | 66 +- src/codec/ListGetCodec.ts | 66 +- src/codec/ListIndexOfCodec.ts | 61 +- src/codec/ListIsEmptyCodec.ts | 58 +- src/codec/ListIteratorCodec.ts | 66 +- src/codec/ListLastIndexOfCodec.ts | 61 +- src/codec/ListListIteratorCodec.ts | 71 +- src/codec/ListMessageType.ts | 42 - src/codec/ListRemoveCodec.ts | 61 +- src/codec/ListRemoveListenerCodec.ts | 67 +- src/codec/ListRemoveWithIndexCodec.ts | 66 +- src/codec/ListSetCodec.ts | 73 +- src/codec/ListSizeCodec.ts | 58 +- src/codec/ListSubCodec.ts | 79 +- src/codec/LockForceUnlockCodec.ts | 52 - src/codec/LockGetLockCountCodec.ts | 60 - src/codec/LockGetRemainingLeaseTimeCodec.ts | 60 - src/codec/LockIsLockedByCurrentThreadCodec.ts | 62 - src/codec/LockIsLockedCodec.ts | 60 - src/codec/LockLockCodec.ts | 56 - src/codec/LockMessageType.ts | 27 - src/codec/LockTryLockCodec.ts | 68 - src/codec/LockUnlockCodec.ts | 54 - src/codec/MapAddEntryListenerCodec.ts | 143 +- src/codec/MapAddEntryListenerToKeyCodec.ts | 146 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 149 +- .../MapAddEntryListenerWithPredicateCodec.ts | 146 +- src/codec/MapAddIndexCodec.ts | 47 +- src/codec/MapAddInterceptorCodec.ts | 60 +- .../MapAddNearCacheEntryListenerCodec.ts | 146 - ...apAddNearCacheInvalidationListenerCodec.ts | 187 +- src/codec/MapAddPartitionLostListenerCodec.ts | 88 +- src/codec/MapAggregateCodec.ts | 67 +- src/codec/MapAggregateWithPredicateCodec.ts | 74 +- src/codec/MapAssignAndGetUuidsCodec.ts | 73 - src/codec/MapClearCodec.ts | 40 +- src/codec/MapClearNearCacheCodec.ts | 54 - src/codec/MapContainsKeyCodec.ts | 70 +- src/codec/MapContainsValueCodec.ts | 61 +- src/codec/MapDeleteCodec.ts | 54 +- .../MapEntriesWithPagingPredicateCodec.ts | 79 +- src/codec/MapEntriesWithPredicateCodec.ts | 73 +- src/codec/MapEntrySetCodec.ts | 70 +- src/codec/MapEventJournalReadCodec.ts | 135 +- src/codec/MapEventJournalSubscribeCodec.ts | 72 +- src/codec/MapEvictAllCodec.ts | 40 +- src/codec/MapEvictCodec.ts | 70 +- src/codec/MapExecuteOnAllKeysCodec.ts | 73 +- src/codec/MapExecuteOnKeyCodec.ts | 73 +- src/codec/MapExecuteOnKeysCodec.ts | 90 +- src/codec/MapExecuteWithPredicateCodec.ts | 80 +- src/codec/MapFetchEntriesCodec.ts | 89 +- src/codec/MapFetchKeysCodec.ts | 85 +- ...FetchNearCacheInvalidationMetadataCodec.ts | 127 +- src/codec/MapFetchWithQueryCodec.ts | 89 +- src/codec/MapFlushCodec.ts | 40 +- src/codec/MapForceUnlockCodec.ts | 54 +- src/codec/MapGetAllCodec.ts | 83 +- src/codec/MapGetCodec.ts | 74 +- src/codec/MapGetEntryViewCodec.ts | 75 +- src/codec/MapIsEmptyCodec.ts | 58 +- src/codec/MapIsLockedCodec.ts | 61 +- src/codec/MapKeySetCodec.ts | 66 +- .../MapKeySetWithPagingPredicateCodec.ts | 75 +- src/codec/MapKeySetWithPredicateCodec.ts | 69 +- src/codec/MapLoadAllCodec.ts | 45 +- src/codec/MapLoadGivenKeysCodec.ts | 64 +- src/codec/MapLockCodec.ts | 62 +- src/codec/MapMessageType.ts | 88 - src/codec/MapProjectCodec.ts | 72 +- src/codec/MapProjectWithPredicateCodec.ts | 79 +- src/codec/MapPutAllCodec.ts | 60 +- src/codec/MapPutCodec.ts | 77 +- src/codec/MapPutIfAbsentCodec.ts | 77 +- src/codec/MapPutIfAbsentWithMaxIdleCodec.ts | 68 + src/codec/MapPutTransientCodec.ts | 61 +- src/codec/MapPutTransientWithMaxIdleCodec.ts | 68 + src/codec/MapPutWithMaxIdleCodec.ts | 68 + src/codec/MapRemoveAllCodec.ts | 44 +- src/codec/MapRemoveCodec.ts | 74 +- src/codec/MapRemoveEntryListenerCodec.ts | 67 +- src/codec/MapRemoveIfSameCodec.ts | 73 +- src/codec/MapRemoveInterceptorCodec.ts | 61 +- .../MapRemovePartitionLostListenerCodec.ts | 67 +- src/codec/MapReplaceCodec.ts | 73 +- src/codec/MapReplaceIfSameCodec.ts | 72 +- src/codec/MapSetCodec.ts | 61 +- src/codec/MapSetTtlCodec.ts | 62 + src/codec/MapSetWithMaxIdleCodec.ts | 68 + src/codec/MapSizeCodec.ts | 58 +- src/codec/MapSubmitToKeyCodec.ts | 73 +- src/codec/MapTryLockCodec.ts | 78 +- src/codec/MapTryPutCodec.ts | 73 +- src/codec/MapTryRemoveCodec.ts | 70 +- src/codec/MapUnlockCodec.ts | 58 +- src/codec/MapValuesCodec.ts | 66 +- .../MapValuesWithPagingPredicateCodec.ts | 79 +- src/codec/MapValuesWithPredicateCodec.ts | 69 +- src/codec/MemberCodec.ts | 50 - src/codec/MultiMapAddEntryListenerCodec.ts | 139 +- .../MultiMapAddEntryListenerToKeyCodec.ts | 142 +- src/codec/MultiMapClearCodec.ts | 40 +- src/codec/MultiMapContainsEntryCodec.ts | 73 +- src/codec/MultiMapContainsKeyCodec.ts | 70 +- src/codec/MultiMapContainsValueCodec.ts | 61 +- src/codec/MultiMapDeleteCodec.ts | 49 + src/codec/MultiMapEntrySetCodec.ts | 70 +- src/codec/MultiMapForceUnlockCodec.ts | 54 +- src/codec/MultiMapGetCodec.ts | 79 +- src/codec/MultiMapIsLockedCodec.ts | 61 +- src/codec/MultiMapKeySetCodec.ts | 66 +- src/codec/MultiMapLockCodec.ts | 62 +- src/codec/MultiMapMessageType.ts | 40 - src/codec/MultiMapPutCodec.ts | 73 +- src/codec/MultiMapRemoveCodec.ts | 79 +- src/codec/MultiMapRemoveEntryCodec.ts | 73 +- src/codec/MultiMapRemoveEntryListenerCodec.ts | 67 +- src/codec/MultiMapSizeCodec.ts | 58 +- src/codec/MultiMapTryLockCodec.ts | 78 +- src/codec/MultiMapUnlockCodec.ts | 58 +- src/codec/MultiMapValueCountCodec.ts | 70 +- src/codec/MultiMapValuesCodec.ts | 66 +- src/codec/PNCounterAddCodec.ts | 113 +- src/codec/PNCounterGetCodec.ts | 105 +- ...PNCounterGetConfiguredReplicaCountCodec.ts | 57 +- src/codec/QueueAddAllCodec.ts | 71 +- src/codec/QueueAddListenerCodec.ts | 101 +- src/codec/QueueClearCodec.ts | 40 +- src/codec/QueueCompareAndRemoveAllCodec.ts | 71 +- src/codec/QueueCompareAndRetainAllCodec.ts | 71 +- src/codec/QueueContainsAllCodec.ts | 71 +- src/codec/QueueContainsCodec.ts | 61 +- src/codec/QueueDrainToCodec.ts | 66 +- src/codec/QueueDrainToMaxSizeCodec.ts | 71 +- src/codec/QueueIsEmptyCodec.ts | 58 +- src/codec/QueueIteratorCodec.ts | 66 +- src/codec/QueueMessageType.ts | 39 - src/codec/QueueOfferCodec.ts | 70 +- src/codec/QueuePeekCodec.ts | 61 +- src/codec/QueuePollCodec.ts | 67 +- src/codec/QueuePutCodec.ts | 44 +- src/codec/QueueRemainingCapacityCodec.ts | 58 +- src/codec/QueueRemoveCodec.ts | 61 +- src/codec/QueueRemoveListenerCodec.ts | 67 +- src/codec/QueueSizeCodec.ts | 58 +- src/codec/QueueTakeCodec.ts | 61 +- .../ReplicatedMapAddEntryListenerCodec.ts | 131 +- ...ReplicatedMapAddEntryListenerToKeyCodec.ts | 138 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 141 +- ...edMapAddEntryListenerWithPredicateCodec.ts | 138 +- ...icatedMapAddNearCacheEntryListenerCodec.ts | 139 +- src/codec/ReplicatedMapClearCodec.ts | 40 +- src/codec/ReplicatedMapContainsKeyCodec.ts | 61 +- src/codec/ReplicatedMapContainsValueCodec.ts | 61 +- src/codec/ReplicatedMapEntrySetCodec.ts | 70 +- src/codec/ReplicatedMapGetCodec.ts | 64 +- src/codec/ReplicatedMapIsEmptyCodec.ts | 58 +- src/codec/ReplicatedMapKeySetCodec.ts | 66 +- src/codec/ReplicatedMapMessageType.ts | 37 - src/codec/ReplicatedMapPutAllCodec.ts | 60 +- src/codec/ReplicatedMapPutCodec.ts | 73 +- src/codec/ReplicatedMapRemoveCodec.ts | 64 +- .../ReplicatedMapRemoveEntryListenerCodec.ts | 67 +- src/codec/ReplicatedMapSizeCodec.ts | 58 +- src/codec/ReplicatedMapValuesCodec.ts | 66 +- src/codec/RingbufferAddAllCodec.ts | 80 +- src/codec/RingbufferAddCodec.ts | 70 +- src/codec/RingbufferCapacityCodec.ts | 59 +- src/codec/RingbufferHeadSequenceCodec.ts | 59 +- src/codec/RingbufferMessageType.ts | 28 - src/codec/RingbufferReadManyCodec.ts | 126 +- src/codec/RingbufferReadOneCodec.ts | 67 +- src/codec/RingbufferRemainingCapacityCodec.ts | 59 +- src/codec/RingbufferSizeCodec.ts | 59 +- src/codec/RingbufferTailSequenceCodec.ts | 59 +- src/codec/SemaphoreAcquireCodec.ts | 52 - src/codec/SemaphoreAvailablePermitsCodec.ts | 60 - src/codec/SemaphoreDrainPermitsCodec.ts | 60 - src/codec/SemaphoreInitCodec.ts | 62 - src/codec/SemaphoreMessageType.ts | 26 - src/codec/SemaphoreReducePermitsCodec.ts | 52 - src/codec/SemaphoreReleaseCodec.ts | 52 - src/codec/SemaphoreTryAcquireCodec.ts | 64 - src/codec/SetAddAllCodec.ts | 71 +- src/codec/SetAddCodec.ts | 61 +- src/codec/SetAddListenerCodec.ts | 101 +- src/codec/SetClearCodec.ts | 40 +- src/codec/SetCompareAndRemoveAllCodec.ts | 71 +- src/codec/SetCompareAndRetainAllCodec.ts | 71 +- src/codec/SetContainsAllCodec.ts | 71 +- src/codec/SetContainsCodec.ts | 61 +- src/codec/SetGetAllCodec.ts | 66 +- src/codec/SetIsEmptyCodec.ts | 58 +- src/codec/SetMessageType.ts | 32 - src/codec/SetRemoveCodec.ts | 61 +- src/codec/SetRemoveListenerCodec.ts | 67 +- src/codec/SetSizeCodec.ts | 58 +- src/codec/TopicAddMessageListenerCodec.ts | 94 +- src/codec/TopicPublishCodec.ts | 44 +- src/codec/TopicRemoveMessageListenerCodec.ts | 67 +- src/codec/TransactionCommitCodec.ts | 47 + src/codec/TransactionCreateCodec.ts | 64 + src/codec/TransactionRollbackCodec.ts | 47 + src/codec/TransactionalListAddCodec.ts | 65 + src/codec/TransactionalListRemoveCodec.ts | 65 + src/codec/TransactionalListSizeCodec.ts | 62 + src/codec/TransactionalMapContainsKeyCodec.ts | 65 + .../TransactionalMapContainsValueCodec.ts | 65 + src/codec/TransactionalMapDeleteCodec.ts | 52 + src/codec/TransactionalMapGetCodec.ts | 66 + .../TransactionalMapGetForUpdateCodec.ts | 66 + src/codec/TransactionalMapIsEmptyCodec.ts | 62 + src/codec/TransactionalMapKeySetCodec.ts | 65 + ...ransactionalMapKeySetWithPredicateCodec.ts | 66 + src/codec/TransactionalMapPutCodec.ts | 69 + src/codec/TransactionalMapPutIfAbsentCodec.ts | 67 + src/codec/TransactionalMapRemoveCodec.ts | 66 + .../TransactionalMapRemoveIfSameCodec.ts | 66 + src/codec/TransactionalMapReplaceCodec.ts | 67 + .../TransactionalMapReplaceIfSameCodec.ts | 67 + src/codec/TransactionalMapSetCodec.ts | 53 + src/codec/TransactionalMapSizeCodec.ts | 62 + src/codec/TransactionalMapValuesCodec.ts | 65 + ...ransactionalMapValuesWithPredicateCodec.ts | 66 + src/codec/TransactionalMultiMapGetCodec.ts | 66 + src/codec/TransactionalMultiMapPutCodec.ts | 66 + src/codec/TransactionalMultiMapRemoveCodec.ts | 66 + .../TransactionalMultiMapRemoveEntryCodec.ts | 66 + src/codec/TransactionalMultiMapSizeCodec.ts | 62 + .../TransactionalMultiMapValueCountCodec.ts | 65 + src/codec/TransactionalQueueOfferCodec.ts | 67 + src/codec/TransactionalQueuePeekCodec.ts | 67 + src/codec/TransactionalQueuePollCodec.ts | 67 + src/codec/TransactionalQueueSizeCodec.ts | 62 + src/codec/TransactionalQueueTakeCodec.ts | 65 + src/codec/TransactionalSetAddCodec.ts | 65 + src/codec/TransactionalSetRemoveCodec.ts | 65 + src/codec/TransactionalSetSizeCodec.ts | 62 + .../ByteArrayCodec.ts} | 16 +- src/codec/builtin/CodecUtil.ts | 63 + src/codec/builtin/DataCodec.ts | 42 + src/codec/builtin/EntryListCodec.ts | 63 + .../builtin/EntryListIntegerIntegerCodec.ts | 46 + .../builtin/EntryListIntegerLongCodec.ts | 47 + .../builtin/EntryListIntegerUUIDCodec.ts | 47 + .../builtin/EntryListLongByteArrayCodec.ts | 47 + .../builtin/EntryListUUIDListIntegerCodec.ts | 46 + src/codec/builtin/EntryListUUIDLongCodec.ts | 48 + src/codec/builtin/EntryListUUIDUUIDCodec.ts | 47 + src/codec/builtin/ErrorsCodec.ts | 33 + src/codec/builtin/FixSizedTypesCodec.ts | 84 + src/codec/builtin/ListIntegerCodec.ts | 41 + src/codec/builtin/ListLongCodec.ts | 42 + src/codec/builtin/ListMultiFrameCodec.ts | 62 + src/codec/builtin/ListUUIDCodec.ts | 42 + .../builtin/LongArrayCodec.ts} | 23 +- src/codec/builtin/MapCodec.ts | 63 + src/codec/builtin/StringCodec.ts | 29 + src/codec/custom/AddressCodec.ts | 53 + src/codec/custom/AnchorDataListHolderCodec.ts | 46 + src/codec/custom/BitmapIndexOptionsCodec.ts | 53 + .../custom/DistributedObjectInfoCodec.ts | 43 + src/codec/custom/ErrorHolderCodec.ts | 60 + src/codec/custom/IndexConfigCodec.ts | 60 + src/codec/custom/MemberInfoCodec.ts | 66 + src/codec/custom/MemberVersionCodec.ts | 55 + .../custom/PagingPredicateHolderCodec.ts | 68 + src/codec/custom/SimpleEntryViewCodec.ts | 84 + src/codec/custom/StackTraceElementCodec.ts | 57 + src/config/BitmapIndexOptions.ts | 79 + src/config/ClientNetworkConfig.ts | 14 +- src/config/Config.ts | 30 +- src/config/ConfigBuilder.ts | 108 +- src/config/ConfigPatternMatcher.ts | 4 +- src/config/ConnectionRetryConfig.ts | 49 + src/config/ConnectionStrategyConfig.ts | 65 + src/config/ImportConfig.ts | 5 + src/config/IndexConfig.ts | 92 + src/config/{GroupConfig.ts => IndexType.ts} | 19 +- src/config/ListenerConfig.ts | 22 +- src/config/ReliableTopicConfig.ts | 2 +- src/connection/AddressProvider.ts | 13 +- src/connection/AddressTranslator.ts | 39 - src/connection/BasicSSLOptionsFactory.ts | 3 +- src/connection/DefaultAddressProvider.ts | 13 +- src/core/Cluster.ts | 66 + src/core/ConnectionHeartbeatListener.ts | 33 - src/core/EventType.ts | 8 +- src/core/InitialMembershipEvent.ts | 34 + src/core/InitialMembershipListener.ts | 35 + src/core/Member.ts | 46 +- src/core/MemberAttributeEvent.ts | 65 - src/core/MemberInfo.ts | 63 + src/core/MemberSelectors.ts | 2 +- .../MemberVersion.ts} | 15 +- src/core/MembershipEvent.ts | 6 +- src/core/MembershipListener.ts | 7 - src/core/Predicate.ts | 12 + src/core/RestValue.ts | 2 +- src/core/SimpleEntryView.ts | 49 + src/core/UUID.ts | 14 +- .../HazelcastCloudAddressProvider.ts | 30 + .../HazelcastCloudAddressTranslator.ts | 60 - src/discovery/HazelcastCloudDiscovery.ts | 2 +- src/index.ts | 13 +- src/invocation/ClientConnectionManager.ts | 234 -- src/invocation/ClientEventRegistration.ts | 9 +- src/invocation/ClusterService.ts | 423 +-- src/invocation/ConnectionAuthenticator.ts | 109 - src/invocation/InvocationService.ts | 173 +- src/invocation/RegistrationKey.ts | 2 +- src/listener/ClusterViewListenerService.ts | 108 + src/nearcache/MetadataFetcher.ts | 6 +- src/nearcache/NearCacheManager.ts | 13 +- src/nearcache/RepairingHandler.ts | 12 +- src/nearcache/RepairingTask.ts | 3 +- .../ClientConnection.ts | 210 +- src/network/ClientConnectionManager.ts | 790 ++++ src/network/WaitStrategy.ts | 73 + src/protocol/AnchorDataListHolder.ts | 42 + .../AuthenticationStatus.ts} | 11 +- src/protocol/ClientProtocolErrorCodes.ts | 156 +- src/protocol/ErrorCodec.ts | 57 - src/protocol/ErrorFactory.ts | 32 +- .../ErrorHolder.ts} | 23 +- src/protocol/PagingPredicateHolder.ts | 69 + .../StackTraceElement.ts} | 19 +- src/protocol/StackTraceElementCodec.ts | 38 - src/proxy/AtomicLongProxy.ts | 68 - src/proxy/BaseProxy.ts | 53 +- src/proxy/FlakeIdGeneratorProxy.ts | 8 +- src/proxy/IAtomicLong.ts | 39 - src/proxy/ILock.ts | 78 - src/proxy/IMap.ts | 62 +- src/proxy/ISemaphore.ts | 74 - src/proxy/ListProxy.ts | 121 +- src/proxy/LockProxy.ts | 74 - src/proxy/MapProxy.ts | 337 +- src/proxy/MultiMapProxy.ts | 167 +- src/proxy/NearCachedMapProxy.ts | 83 +- src/proxy/PNCounterProxy.ts | 43 +- src/proxy/PartitionSpecificProxy.ts | 5 +- src/proxy/ProxyManager.ts | 197 +- src/proxy/QueueProxy.ts | 116 +- src/proxy/ReplicatedMapProxy.ts | 105 +- src/proxy/SemaphoreProxy.ts | 64 - src/proxy/SetProxy.ts | 74 +- src/proxy/ringbuffer/RingbufferProxy.ts | 60 +- src/proxy/topic/Message.ts | 2 +- src/proxy/topic/ReliableTopicMessage.ts | 4 +- src/proxy/topic/ReliableTopicProxy.ts | 9 +- src/serialization/DefaultPredicates.ts | 20 +- src/serialization/DefaultSerializer.ts | 8 +- src/serialization/ObjectData.ts | 21 +- src/serialization/PredicateFactory.ts | 2 +- src/statistics/Statistics.ts | 72 +- src/util/AbstractLoadBalancer.ts | 55 + src/util/IndexUtil.ts | 175 + src/util/RandomLB.ts | 33 + src/util/RoundRobinLB.ts | 46 + src/util/UuidUtil.ts | 6 +- test/AddressHelperTest.js | 55 - test/AutoPipeliningDisabledTest.js | 9 +- test/ClientMessageTest.js | 152 - test/ClientProxyTest.js | 31 +- test/ClientReconnectTest.js | 5 +- test/ClusterServiceTest.js | 71 +- test/ConnectionManagerTest.js | 10 +- test/HazelcastClientTest.js | 10 +- test/LifecycleServiceTest.js | 96 +- test/ListenerServiceTest.js | 29 +- test/ListenersOnReconnectTest.js | 11 +- test/LoggingTest.js | 13 +- test/LostConnectionTest.js | 10 +- test/MembershipListenerTest.js | 68 +- test/RC.js | 2 +- test/Util.js | 14 +- test/atomiclong/AtomicLongTest.js | 163 - ...aderTest.js => ClientMessageReaderTest.js} | 27 +- test/connection/DirectWriterTest.js | 2 +- .../FragmentedClientMessageHandlerTest.js | 165 + test/connection/PipelinedWriterTest.js | 3 +- test/declarative_config/ConfigBuilderTest.js | 72 +- test/declarative_config/ConfigLocationTest.js | 14 +- .../configurations/full.json | 31 +- test/discovery/HazelcastCloudDiscoveryTest.js | 2 +- test/discovery/HazelcastCloudProviderTest.js | 47 +- .../discovery/HazelcastCloudTranslatorTest.js | 93 - .../flakeid/FlakeIdGeneratorOutOfRangeTest.js | 11 +- test/flakeid/FlakeIdGeneratorProxyTest.js | 7 +- .../HJVHazelcastJsonValueSerializerTest.js | 3 +- .../HJVJsonSerializerTest.js | 7 +- .../HazelcastJsonValueQueryTest.js | 9 +- test/heartbeat/HeartbeatFromClientTest.js | 5 +- test/heartbeat/HeartbeatFromServerTest.js | 94 +- test/heartbeat/short-heartbeat.xml | 7 +- test/integration/ClientLabelTest.js | 69 + test/integration/ConnectionStrategyTest.js | 239 ++ test/integration/DistributedObjectsTest.js | 190 + .../InitialMembershipListenerTest.js | 145 + test/list/ListProxyTest.js | 8 +- test/lock/LockProxyTest.js | 199 - test/map/MapAggregatorsDoubleTest.js | 9 +- test/map/MapAggregatorsIntTest.js | 9 +- test/map/MapAggregatorsLongTest.js | 9 +- test/map/MapEntryProcessorTest.js | 7 +- test/map/MapPartitionAwareTest.js | 7 +- test/map/MapPredicateTest.js | 7 +- test/map/MapProxyTest.js | 74 +- test/map/MapStoreTest.js | 13 +- test/map/NearCachedMapStressTest.js | 7 +- test/map/NearCachedMapTest.js | 13 +- test/map/hazelcast_identifiedfactory.xml | 7 +- test/map/hazelcast_mapstore.xml | 7 +- ...cast_nearcache_batchinvalidation_false.xml | 13 +- test/multimap/MultiMapProxyListenersTest.js | 19 +- test/multimap/MultiMapProxyLockTest.js | 9 +- test/multimap/MultiMapProxyTest.js | 7 +- .../InvalidationMetadataDistortionTest.js | 6 +- test/nearcache/LostInvalidationsTest.js | 13 +- test/nearcache/MigratedDataTest.js | 40 +- .../NearCacheSimpleInvalidationTest.js | 7 +- test/nearcache/NearCacheTest.js | 6 +- .../hazelcast_eventual_nearcache.xml | 7 +- ...cast_nearcache_batchinvalidation_false.xml | 7 +- test/nearcache/impl/RepairingTaskTest.js | 3 +- test/pncounter/PNCounterBasicTest.js | 9 +- test/pncounter/PNCounterConsistencyTest.js | 26 +- .../pncounter/PNCounterWithLiteMembersTest.js | 9 +- .../hazelcast_crdtreplication_delayed.xml | 7 +- test/pncounter/hazelcast_litemember.xml | 7 +- test/queue/QueueProxyTest.js | 7 +- test/queue/hazelcast_queue.xml | 7 +- test/remote_controller/Controller.js | 85 + test/remote_controller/RemoteController.js | 2893 ++++++++++++++ .../remote-controller_types.js | 295 ++ test/replicatedmap/ReplicatedMapProxyTest.js | 42 +- .../replicatedmap/hazelcast_replicatedmap.xml | 7 +- test/rest_value/RestValueTest.js | 12 +- test/rest_value/hazelcast_rest.xml | 15 +- test/ringbuffer/RingbufferTest.js | 7 +- test/ringbuffer/hazelcast_ringbuffer.xml | 7 +- test/semaphore/SemaphoreProxyTest.js | 195 - .../1.serialization.compatibility.binary | Bin 9271549 -> 3090846 bytes test/serialization/BinaryCompatibilityTest.js | 38 +- .../DefaultSerializersLiveTest.js | 272 +- .../PortableSerializersLiveTest.js | 9 +- .../config/CustomSerializerTest.js | 34 +- test/serialization/config/FactoriesTest.js | 48 +- test/set/SetProxyTest.js | 7 +- test/ssl/ClientSSLAuthenticationTest.js | 13 +- test/ssl/ClientSSLTest.js | 14 +- test/ssl/hazelcast-ma-optional.xml | 31 +- test/ssl/hazelcast-ma-required.xml | 31 +- test/ssl/hazelcast-ssl.xml | 31 +- test/statistics/StatisticsTest.js | 37 +- test/topic/TopicTest.js | 10 +- test/topic/hazelcast_topic.xml | 9 +- test/unit/AddressHelperTest.js | 65 + test/unit/LoadBalancerTest.js | 79 + test/unit/UuidTest.js | 75 + .../unit/protocol/ClientMessageFramingTest.js | 266 ++ test/unit/protocol/ClientMessageTest.js | 96 + tslint.json | 4 + 545 files changed, 22702 insertions(+), 17585 deletions(-) delete mode 100644 CONFIG.md delete mode 100644 code_samples/org-website/AtomicLongSample.js delete mode 100644 code_samples/org-website/LockSample.js rename src/{codec/PNCounterMessageType.ts => DistributedObjectInfo.ts} (75%) create mode 100644 src/HeartbeatManager.ts delete mode 100644 src/HeartbeatService.ts create mode 100644 src/LoadBalancer.ts delete mode 100644 src/codec/AddressCodec.ts delete mode 100644 src/codec/AtomicLongAddAndGetCodec.ts delete mode 100644 src/codec/AtomicLongAlterAndGetCodec.ts delete mode 100644 src/codec/AtomicLongAlterCodec.ts delete mode 100644 src/codec/AtomicLongApplyCodec.ts delete mode 100644 src/codec/AtomicLongCompareAndSetCodec.ts delete mode 100644 src/codec/AtomicLongDecrementAndGetCodec.ts delete mode 100644 src/codec/AtomicLongGetAndAddCodec.ts delete mode 100644 src/codec/AtomicLongGetAndAlterCodec.ts delete mode 100644 src/codec/AtomicLongGetAndIncrementCodec.ts delete mode 100644 src/codec/AtomicLongGetAndSetCodec.ts delete mode 100644 src/codec/AtomicLongGetCodec.ts delete mode 100644 src/codec/AtomicLongIncrementAndGetCodec.ts delete mode 100644 src/codec/AtomicLongMessageType.ts delete mode 100644 src/codec/AtomicLongSetCodec.ts create mode 100644 src/codec/ClientAddClusterViewListenerCodec.ts delete mode 100644 src/codec/ClientAddMembershipListenerCodec.ts delete mode 100644 src/codec/ClientAddPartitionListenerCodec.ts create mode 100644 src/codec/ClientCreateProxiesCodec.ts delete mode 100644 src/codec/ClientGetPartitionsCodec.ts create mode 100644 src/codec/ClientLocalBackupListenerCodec.ts delete mode 100644 src/codec/ClientMessageType.ts delete mode 100644 src/codec/ClientRemoveAllListenersCodec.ts create mode 100644 src/codec/ClientTriggerPartitionAssignmentCodec.ts delete mode 100644 src/codec/EntryViewCodec.ts delete mode 100644 src/codec/GetPartitionsCodec.ts delete mode 100644 src/codec/ImmutableLazyDataList.ts delete mode 100644 src/codec/ListMessageType.ts delete mode 100644 src/codec/LockForceUnlockCodec.ts delete mode 100644 src/codec/LockGetLockCountCodec.ts delete mode 100644 src/codec/LockGetRemainingLeaseTimeCodec.ts delete mode 100644 src/codec/LockIsLockedByCurrentThreadCodec.ts delete mode 100644 src/codec/LockIsLockedCodec.ts delete mode 100644 src/codec/LockLockCodec.ts delete mode 100644 src/codec/LockMessageType.ts delete mode 100644 src/codec/LockTryLockCodec.ts delete mode 100644 src/codec/LockUnlockCodec.ts delete mode 100644 src/codec/MapAddNearCacheEntryListenerCodec.ts delete mode 100644 src/codec/MapAssignAndGetUuidsCodec.ts delete mode 100644 src/codec/MapClearNearCacheCodec.ts delete mode 100644 src/codec/MapMessageType.ts create mode 100644 src/codec/MapPutIfAbsentWithMaxIdleCodec.ts create mode 100644 src/codec/MapPutTransientWithMaxIdleCodec.ts create mode 100644 src/codec/MapPutWithMaxIdleCodec.ts create mode 100644 src/codec/MapSetTtlCodec.ts create mode 100644 src/codec/MapSetWithMaxIdleCodec.ts delete mode 100644 src/codec/MemberCodec.ts create mode 100644 src/codec/MultiMapDeleteCodec.ts delete mode 100644 src/codec/MultiMapMessageType.ts delete mode 100644 src/codec/QueueMessageType.ts delete mode 100644 src/codec/ReplicatedMapMessageType.ts delete mode 100644 src/codec/RingbufferMessageType.ts delete mode 100644 src/codec/SemaphoreAcquireCodec.ts delete mode 100644 src/codec/SemaphoreAvailablePermitsCodec.ts delete mode 100644 src/codec/SemaphoreDrainPermitsCodec.ts delete mode 100644 src/codec/SemaphoreInitCodec.ts delete mode 100644 src/codec/SemaphoreMessageType.ts delete mode 100644 src/codec/SemaphoreReducePermitsCodec.ts delete mode 100644 src/codec/SemaphoreReleaseCodec.ts delete mode 100644 src/codec/SemaphoreTryAcquireCodec.ts delete mode 100644 src/codec/SetMessageType.ts create mode 100644 src/codec/TransactionCommitCodec.ts create mode 100644 src/codec/TransactionCreateCodec.ts create mode 100644 src/codec/TransactionRollbackCodec.ts create mode 100644 src/codec/TransactionalListAddCodec.ts create mode 100644 src/codec/TransactionalListRemoveCodec.ts create mode 100644 src/codec/TransactionalListSizeCodec.ts create mode 100644 src/codec/TransactionalMapContainsKeyCodec.ts create mode 100644 src/codec/TransactionalMapContainsValueCodec.ts create mode 100644 src/codec/TransactionalMapDeleteCodec.ts create mode 100644 src/codec/TransactionalMapGetCodec.ts create mode 100644 src/codec/TransactionalMapGetForUpdateCodec.ts create mode 100644 src/codec/TransactionalMapIsEmptyCodec.ts create mode 100644 src/codec/TransactionalMapKeySetCodec.ts create mode 100644 src/codec/TransactionalMapKeySetWithPredicateCodec.ts create mode 100644 src/codec/TransactionalMapPutCodec.ts create mode 100644 src/codec/TransactionalMapPutIfAbsentCodec.ts create mode 100644 src/codec/TransactionalMapRemoveCodec.ts create mode 100644 src/codec/TransactionalMapRemoveIfSameCodec.ts create mode 100644 src/codec/TransactionalMapReplaceCodec.ts create mode 100644 src/codec/TransactionalMapReplaceIfSameCodec.ts create mode 100644 src/codec/TransactionalMapSetCodec.ts create mode 100644 src/codec/TransactionalMapSizeCodec.ts create mode 100644 src/codec/TransactionalMapValuesCodec.ts create mode 100644 src/codec/TransactionalMapValuesWithPredicateCodec.ts create mode 100644 src/codec/TransactionalMultiMapGetCodec.ts create mode 100644 src/codec/TransactionalMultiMapPutCodec.ts create mode 100644 src/codec/TransactionalMultiMapRemoveCodec.ts create mode 100644 src/codec/TransactionalMultiMapRemoveEntryCodec.ts create mode 100644 src/codec/TransactionalMultiMapSizeCodec.ts create mode 100644 src/codec/TransactionalMultiMapValueCountCodec.ts create mode 100644 src/codec/TransactionalQueueOfferCodec.ts create mode 100644 src/codec/TransactionalQueuePeekCodec.ts create mode 100644 src/codec/TransactionalQueuePollCodec.ts create mode 100644 src/codec/TransactionalQueueSizeCodec.ts create mode 100644 src/codec/TransactionalQueueTakeCodec.ts create mode 100644 src/codec/TransactionalSetAddCodec.ts create mode 100644 src/codec/TransactionalSetRemoveCodec.ts create mode 100644 src/codec/TransactionalSetSizeCodec.ts rename src/codec/{UUIDCodec.ts => builtin/ByteArrayCodec.ts} (63%) create mode 100644 src/codec/builtin/CodecUtil.ts create mode 100644 src/codec/builtin/DataCodec.ts create mode 100644 src/codec/builtin/EntryListCodec.ts create mode 100644 src/codec/builtin/EntryListIntegerIntegerCodec.ts create mode 100644 src/codec/builtin/EntryListIntegerLongCodec.ts create mode 100644 src/codec/builtin/EntryListIntegerUUIDCodec.ts create mode 100644 src/codec/builtin/EntryListLongByteArrayCodec.ts create mode 100644 src/codec/builtin/EntryListUUIDListIntegerCodec.ts create mode 100644 src/codec/builtin/EntryListUUIDLongCodec.ts create mode 100644 src/codec/builtin/EntryListUUIDUUIDCodec.ts create mode 100644 src/codec/builtin/ErrorsCodec.ts create mode 100644 src/codec/builtin/FixSizedTypesCodec.ts create mode 100644 src/codec/builtin/ListIntegerCodec.ts create mode 100644 src/codec/builtin/ListLongCodec.ts create mode 100644 src/codec/builtin/ListMultiFrameCodec.ts create mode 100644 src/codec/builtin/ListUUIDCodec.ts rename src/{core/EntryView.ts => codec/builtin/LongArrayCodec.ts} (63%) create mode 100644 src/codec/builtin/MapCodec.ts create mode 100644 src/codec/builtin/StringCodec.ts create mode 100644 src/codec/custom/AddressCodec.ts create mode 100644 src/codec/custom/AnchorDataListHolderCodec.ts create mode 100644 src/codec/custom/BitmapIndexOptionsCodec.ts create mode 100644 src/codec/custom/DistributedObjectInfoCodec.ts create mode 100644 src/codec/custom/ErrorHolderCodec.ts create mode 100644 src/codec/custom/IndexConfigCodec.ts create mode 100644 src/codec/custom/MemberInfoCodec.ts create mode 100644 src/codec/custom/MemberVersionCodec.ts create mode 100644 src/codec/custom/PagingPredicateHolderCodec.ts create mode 100644 src/codec/custom/SimpleEntryViewCodec.ts create mode 100644 src/codec/custom/StackTraceElementCodec.ts create mode 100644 src/config/BitmapIndexOptions.ts create mode 100644 src/config/ConnectionRetryConfig.ts create mode 100644 src/config/ConnectionStrategyConfig.ts create mode 100644 src/config/IndexConfig.ts rename src/config/{GroupConfig.ts => IndexType.ts} (69%) delete mode 100644 src/connection/AddressTranslator.ts create mode 100644 src/core/Cluster.ts delete mode 100644 src/core/ConnectionHeartbeatListener.ts create mode 100644 src/core/InitialMembershipEvent.ts create mode 100644 src/core/InitialMembershipListener.ts delete mode 100644 src/core/MemberAttributeEvent.ts create mode 100644 src/core/MemberInfo.ts rename src/{codec/TopicMessageType.ts => core/MemberVersion.ts} (72%) create mode 100644 src/core/SimpleEntryView.ts delete mode 100644 src/discovery/HazelcastCloudAddressTranslator.ts delete mode 100644 src/invocation/ClientConnectionManager.ts delete mode 100644 src/invocation/ConnectionAuthenticator.ts create mode 100644 src/listener/ClusterViewListenerService.ts rename src/{invocation => network}/ClientConnection.ts (57%) create mode 100644 src/network/ClientConnectionManager.ts create mode 100644 src/network/WaitStrategy.ts create mode 100644 src/protocol/AnchorDataListHolder.ts rename src/{codec/FlakeIdGeneratorMessageType.ts => protocol/AuthenticationStatus.ts} (74%) delete mode 100644 src/protocol/ErrorCodec.ts rename src/{connection/DefaultAddressTranslator.ts => protocol/ErrorHolder.ts} (57%) create mode 100644 src/protocol/PagingPredicateHolder.ts rename src/{codec/DistributedObjectInfoCodec.ts => protocol/StackTraceElement.ts} (62%) delete mode 100644 src/protocol/StackTraceElementCodec.ts delete mode 100644 src/proxy/AtomicLongProxy.ts delete mode 100644 src/proxy/IAtomicLong.ts delete mode 100644 src/proxy/ILock.ts delete mode 100644 src/proxy/ISemaphore.ts delete mode 100644 src/proxy/LockProxy.ts delete mode 100644 src/proxy/SemaphoreProxy.ts create mode 100644 src/util/AbstractLoadBalancer.ts create mode 100644 src/util/IndexUtil.ts create mode 100644 src/util/RandomLB.ts create mode 100644 src/util/RoundRobinLB.ts delete mode 100644 test/AddressHelperTest.js delete mode 100644 test/ClientMessageTest.js delete mode 100644 test/atomiclong/AtomicLongTest.js rename test/connection/{FrameReaderTest.js => ClientMessageReaderTest.js} (68%) create mode 100644 test/connection/FragmentedClientMessageHandlerTest.js delete mode 100644 test/discovery/HazelcastCloudTranslatorTest.js create mode 100644 test/integration/ClientLabelTest.js create mode 100644 test/integration/ConnectionStrategyTest.js create mode 100644 test/integration/DistributedObjectsTest.js create mode 100644 test/integration/InitialMembershipListenerTest.js delete mode 100644 test/lock/LockProxyTest.js create mode 100644 test/remote_controller/Controller.js create mode 100644 test/remote_controller/RemoteController.js create mode 100644 test/remote_controller/remote-controller_types.js delete mode 100644 test/semaphore/SemaphoreProxyTest.js create mode 100644 test/unit/AddressHelperTest.js create mode 100644 test/unit/LoadBalancerTest.js create mode 100644 test/unit/UuidTest.js create mode 100644 test/unit/protocol/ClientMessageFramingTest.js create mode 100644 test/unit/protocol/ClientMessageTest.js diff --git a/CONFIG.md b/CONFIG.md deleted file mode 100644 index abb2efcf1..000000000 --- a/CONFIG.md +++ /dev/null @@ -1,503 +0,0 @@ -You can configure Hazelcast Node.js Client declaratively (JSON) or programmatically (API). - -* Programmatic configuration -* Declarative configuration (JSON file) - -# Programmatic Configuration -For programmatic configuration of the Hazelcast Java Client, just instantiate a ClientConfig object and configure the -desired aspects. An example is shown below. - -```javascript -var Config = require('hazelcast-client').Config; -var Address = require('hazelcast-client').Address; -var cfg = new Config.ClientConfig(); -cfg.networkConfig.addresses.push('127.0.0.1:5701'); -return HazelcastClient.newHazelcastClient(cfg); -``` - -Refer to [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. - -# Declarative Configuration (JSON) -For declarative configuration, the Hazelcast client looks at the following places for the client configuration file. - -1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, -the client looks for the configuration file in the specified location. -2. Current working directory: If there is no environment variable set, the client tries to load `hazelcast-client.json` -from the current working directory. -3. Default configuration: If all of the above methods fail, the client starts with the default configuration. - -Following is a sample JSON configuration file: - -```json -{ - "group": { - "name": "hazel", - "password": "cast" - }, - "properties": { - "hazelcast.client.heartbeat.timeout": 10000, - "hazelcast.client.invocation.retry.pause.millis": 4000, - "hazelcast.client.invocation.timeout.millis": 180000, - "hazelcast.invalidation.reconciliation.interval.seconds": 50, - "hazelcast.invalidation.max.tolerated.miss.count": 15, - "hazelcast.invalidation.min.reconciliation.interval.seconds": 60 - }, - "network": { - "clusterMembers": [ - "127.0.0.1:5701" - ], - "smartRouting": true, - "connectionTimeout": 6000, - "connectionAttemptPeriod": 4000, - "connectionAttemptLimit": 3 - } -} -``` - -## Group Configuration - -The clients should provide a group name and password in order to connect to the cluster. -You can configure them as shown below. - -```json -{ - "group": { - "name": "hazel", - "password": "cast" - } -} -``` - -## Client Network - -All network related configuration of Hazelcast Node.js Client is performed via the `network` element in the declarative -configuration file. Let's first give an example for `network` configuration. Then we will look at its properties. - -```json -{ - "network": { - "clusterMembers": [ - "127.0.0.9", - "127.0.0.2:5702" - ], - "smartRouting": false, - "connectionTimeout": 6000, - "connectionAttemptPeriod": 4000, - "connectionAttemptLimit": 3, - "ssl": { - "enabled": true, - "factory": { - "path": "path/to/file", - "exportedName": "exportedName", - "properties": { - "userDefinedProperty1": "userDefinedValue" - } - } - } - } -} -``` - -### Configuring Address List - -Address list is the initial list of cluster addresses to which the client will connect. The client uses this -list to find an alive member. Although it may be enough to give only one address of a member in the cluster -(since all members communicate with each other), it is recommended that you give the addresses for all the members. - -```json -{ - "network": { - "clusterMembers": [ - "127.0.0.9", - "127.0.0.2:5702" - ] - } -} -``` -If the port part is omitted, then 5701, 5702, and 5703 will be tried in random order. - -Default address is 127.0.0.1. - -### Setting Smart Routing - -Smart routing defines whether the client mode is smart or unisocket. The following is an example configuration. - -```json -{ - "network": { - "smartRouting": true - } -} -``` - -Default is smart routing mode. - -### Setting Connection Timeout - -Connection timeout is the timeout value in milliseconds for the members to accept client connection requests. -```json -{ - "network": { - "connectionTimeout": 6000 - } -} -``` -Default value is 5000 milliseconds. - -### Setting Connection Attempt Limit - -While the client is trying to connect initially to one of the members in the address list, that member -might not be available at that moment. Instead of giving up, throwing an error and stopping the client, -the client will retry as many as connection attempt limit times. This is also the case when the previously -established connection between the client and that member goes down. - -```json -{ - "network": { - "connectionAttemptLimit": 3 - } -} -``` -Default value is 2. - -### Setting Connection Attempt Period - -Connection timeout period is the duration in milliseconds between the connection attempts defined by -connection attempt limit. - -```json -{ - "network": { - "connectionAttemptPeriod": 4000 - } -} -``` - -Default value is 3000. - -### Enabling Client TLS/SSL - -You can use TLS/SSL to secure the connection between the client and members. If you want TLS/SSL enabled -for the client-cluster connection, you should set an SSL configuration. Once set, the connection (socket) is -established out of an `options` object supplied by the user. - -Hazelcast Node.js Client uses a user supplied SSL `options` object to pass to -[`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). There are two ways -to provide this object to the client: - -1. Using the built-in `BasicSSLOptionsFactory` bundled with the client. -2. Writing an SSLOptionsFactory. - -Below subsections describe each way. - -#### Using Built-in BasicSSLOptionsFactory - -Hazelcast Node.js Client includes a utility factory class that creates the necessary `options` object out of the supplied -properties. All you need to do is specifying your factory as `BasicSSLOptionsFactory` and provide the following options: - - caPath - keyPath - certPath - servername - rejectUnauthorized - ciphers - -Please refer to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) for the descriptions of each option. - -> `certPath` and `caPath` define file path to respective file that stores such information. - -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "exportedName": "BasicSSLOptionsFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "rejectUnauthorized": false - } - } - } - } -} -``` - -If these options are not enough for your application, you may write your own options factory and instruct the client -to get the options from it, as explained below. - -#### Writing an SSL Options Factory - -In order to use the full range of options provided to [`tls.connect` of Node.js](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback), -you may write your own factory object. - -An example configuration: - -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "path": "my_factory.js", - "exportedName": "SSLFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "keepOrder": true - } - } - } - } -} -``` - - -And your own factory, `My_Factory.js`: - - -```javascript -function SSLFactory() { -} - -SSLFactory.prototype.init = function(props) { - this.caPath = props.caPath; - this.keyPath = props.keyPath; - this.certPath = props.certPath; - this.keepOrder = props.userDefinedProperty1; -}; - -SSLFactory.prototype.getSSLOptions = function() { - var sslOpts = { - servername: 'foo.bar.com', - rejectUnauthorized: true, - ca: fs.readFileSync(this.caPath) - key: fs.readFileSync(this.keyPath), - cert: fs.readFileSync(this.certPath), - }; - if (this.keepOrder) { - sslOpts.honorCipherOrder = true; - } - return sslOpts; -}; -exports.SSLFactory = SSLFactory; -``` - -The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with -the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. - -For information about the path resolution, please refer to the [Path Resolution](#path-resolution-and-object-loading) section. - -### Enabling Hazelcast Cloud Discovery -The purpose of Hazelcast Cloud Discovery is to provide clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to "true". - -Hazelcast Cloud configuration is as follows: - -```json -{ - "group": { - "name": "hazel", - "password": "cast" - }, - - "network": { - "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN", - "enabled": true - } - } -} - -``` - -To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. - -## Serialization Configuration - -This section shows how to configure Hazelcast serialization declaratively. Please refer to [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#serialization) -and [Node.js client readme](https://github.com/hazelcast/hazelcast-nodejs-client/#serialization-considerations) for more information on serializations. - -Serialization configuration is as follows: - -```json -{ -"serialization": { - "defaultNumberType": "integer", - "isBigEndian": false, - "dataSerializableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 0 - } - ], - "portableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 1 - } - ], - "portableVersion": 1, - "globalSerializer": { - "path": "path/to/file", - "exportedName": "exportedName" - }, - "serializers": [ - { - "path": "path/to/custom", - "exportedName": "CustomSerializer1", - "typeId": 2 - }, - { - "path": "path/to/custom", - "exportedName": "CustomSerializer2", - "typeId": 3 - } - ] - } -} -``` - -One important aspect of Node.js Client's serialization is `defaultNumberType`. Hazelcast servers use 4 different -primitive numeric types; `int`, `long`, `float` and `double`. However, Javascript has only one numeric type which -is `number`. Number is a floating point type. If you do not work with heterogenous clients (multiple languages), -you do not need to worry about this setting. However, if your numeric data is accessed by the clients in different -languages, you need to map `number` type to one of the numeric types recognized by the Java servers. Hazelcast handles -type conversions automatically. Accepted values for `defaultNumberType` are `integer`, `float` and `double`. You -may use `long` module for working with longs. [long module](https://www.npmjs.com/package/long) is included -in Hazelcast Node.js Client. - -Related section: [Path Resolution](#path-resolution-and-object-loading) - -## Configuring Near Cache - -You may configure Near Caches for your maps as the following: - -```json -{ - "nearCaches": [ - { - "name": "nc-map", - "invalidateOnChange": false, - "maxIdleSeconds": 2, - "inMemoryFormat": "object", - "timeToLiveSeconds": 3, - "evictionPolicy": "lru", - "evictionMaxSize": 3000, - "evictionSamplingCount": 4, - "evictionSamplingPoolSize": 8 - } - ] -} -``` -`nearCaches` is an array that includes one configuration object for each Near Cache in the client. For meanings -of configuration options, please refer to [NearCacheConfig API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/0.7/docs/classes/_config_.nearcacheconfig.html). - -## Configuring Flake Id Generator -You may configure flake id generators as the following: - -```json -{ - "flakeIdGeneratorConfigs": [ - { - "name": "flakeidgenerator", - "prefetchCount": 123, - "prefetchValidityMillis": 150000 - } - ] -} -``` -For meanings of configuration options refer to FlakeIdGenerator's API documantation [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) - -> Note: Since Javascript cannot represent numbers greater than 2^53, you need to put long numbers in quotes as a string. - -## Composing Declarative Configuration - -You can compose the declarative configuration of your Hazelcast client from multiple declarative -configuration snippets. In order to compose a declarative configuration, you can use the `import` element to load -different declarative configuration files. - -Let's assume you have the following two configurations: - -`group-config.json`: - -```json -{ - "group": { - "name": "hazel", - "password": "cast" - } -} -``` - -`network-config.json`: - -```json -{ - "network": { - "clusterMembers": [ - "127.0.0.10:4001", - "127.0.0.11:4001" - ] - } -} -``` - -To get your example Hazelcast declarative configuration out of the above two, use the `import` element as -shown below. - -```json -{ - "import": [ - "group-config.json", - "network-config.json" - ] -} -``` - -> Note: Use `import` element on top level of JSON hierarchy. - - -## Path Resolution and Object Loading - -For configuration elements that require you to specify a code piece, you will need to specify the path to the -code and name of the exported element that you want the client to use. This configuration is set as follows: - -```json -{ - "path": "path/to/file", - "exportedName": "MyObject" -} -``` - -In the above configuration, `path` shows the address to the file that you want the client to load. Unless this is an -absolute path, it is relative to the location of `hazelcast-config.json` file. - -In Javascript, you can define and export as many objects as you want in a single file. Above configuration element -is designed to load only one specified object from a file (`MyObject`). Therefore, `exportedName` specifies the name of desired object. - -Let's say your project's directory structure is as follows: - - my_app/ - my_app/index.js - my_app/factory_utils.js - my_app/hazelcast-client.json - my_app/node_modules/ - my_app/node_modules/hazelcast-client - -In `factory_utils.js`, you have multiple exported functions. - -```javascript -exports.utilityFunction = function() {...} -exports.MySSLFactory = function() {...} -``` - -In order to load `MySSLFactory` in your SSL configuration, you should set `path` and `exportedName` as `factory_utils.js` -and `MySSLFactory` respectively. - -If you have only one export as the default export from `factory_utils.js`, just skip `exportedName` property and -the client will load the default export from the file. diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 24e561208..193eec977 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -11,7 +11,7 @@ * [1.4. Basic Configuration](#14-basic-configuration) * [1.4.1. Configuring Hazelcast IMDG](#141-configuring-hazelcast-imdg) * [1.4.2. Configuring Hazelcast Node.js Client](#142-configuring-hazelcast-nodejs-client) - * [1.4.2.1. Group Settings](#1421-group-settings) + * [1.4.2.1. Cluster Name Setting](#1421-cluster-name-setting) * [1.4.2.2. Network Settings](#1422-network-settings) * [1.5. Basic Usage](#15-basic-usage) * [1.6. Code Samples](#16-code-samples) @@ -35,16 +35,10 @@ * [5.2. Setting Smart Routing](#52-setting-smart-routing) * [5.3. Enabling Redo Operation](#53-enabling-redo-operation) * [5.4. Setting Connection Timeout](#54-setting-connection-timeout) - * [5.5. Setting Connection Attempt Limit](#55-setting-connection-attempt-limit) - * [5.6. Setting Connection Attempt Period](#56-setting-connection-attempt-period) - * [5.7. Enabling Client TLS/SSL](#57-enabling-client-tlsssl) - * [5.8. Enabling Hazelcast Cloud Discovery](#58-enabling-hazelcast-cloud-discovery) -* [6. Securing Client Connection](#6-securing-client-connection) - * [6.1. TLS/SSL](#61-tlsssl) - * [6.1.1. TLS/SSL for Hazelcast Members](#611-tlsssl-for-hazelcast-members) - * [6.1.2. TLS/SSL for Hazelcast Node.js Clients](#612-tlsssl-for-hazelcast-nodejs-clients) - * [6.1.3. Mutual Authentication](#613-mutual-authentication) - * [6.2. Credentials](#62-credentials) + * [5.5. Enabling Client TLS/SSL](#55-enabling-client-tlsssl) + * [5.6. Enabling Hazelcast Cloud Discovery](#56-enabling-hazelcast-cloud-discovery) +* [6. Client Connection Strategy](#6-client-connection-strategy) + * [6.1. Configuring Client Connection Retry](#61-configuring-client-connection-retry) * [7. Using Node.js Client with Hazelcast IMDG](#7-using-nodejs-client-with-hazelcast-imdg) * [7.1. Node.js Client API Overview](#71-nodejs-client-api-overview) * [7.2. Node.js Client Operation Modes](#72-nodejs-client-operation-modes) @@ -62,11 +56,11 @@ * [7.4.6. Using List](#746-using-list) * [7.4.7. Using Ringbuffer](#747-using-ringbuffer) * [7.4.8. Using Reliable Topic](#748-using-reliable-topic) - * [7.4.9. Using Lock](#749-using-lock) - * [7.4.10. Using Atomic Long](#7410-using-atomic-long) - * [7.4.11. Using Semaphore](#7411-using-semaphore) - * [7.4.12. Using PN Counter](#7412-using-pn-counter) - * [7.4.13. Using Flake ID Generator](#7413-using-flake-id-generator) + * [7.4.8.1. Configuring Reliable Topic](#7481-configuring-reliable-topic) + * [7.4.9. Using PN Counter](#749-using-pn-counter) + * [7.4.10. Using Flake ID Generator](#7410-using-flake-id-generator) + * [7.4.10.1. Configuring Flake ID Generator](#74101-configuring-flake-id-generator) + * [7.4.11. Using Lock, Semaphore and Atomic Long](#7411-using-lock-semaphore-and-atomic-long) * [7.5. Distributed Events](#75-distributed-events) * [7.5.1. Listening for Cluster Events](#751-listening-for-cluster-events) * [7.5.1.1. Membership Listener](#7511-membership-listener) @@ -100,18 +94,27 @@ * [7.9. Monitoring and Logging](#79-monitoring-and-logging) * [7.9.1. Enabling Client Statistics](#791-enabling-client-statistics) * [7.9.2. Logging Configuration](#792-logging-configuration) -* [8. Development and Testing](#8-development-and-testing) - * [8.1. Building and Using Client From Sources](#81-building-and-using-client-from-sources) - * [8.2. Testing](#82-testing) -* [9. Getting Help](#9-getting-help) -* [10. Contributing](#10-contributing) -* [11. License](#11-license) -* [12. Copyright](#12-copyright) + * [7.10. Defining Client Labels](#710-defining-client-labels) + * [7.11. Defining Instance Name](#711-defining-instance-name) + * [7.12. Configuring Load Balancer](#712-configuring-load-balancer) +* [8. Securing Client Connection](#8-securing-client-connection) + * [8.1. TLS/SSL](#81-tlsssl) + * [8.1.1. TLS/SSL for Hazelcast Members](#811-tlsssl-for-hazelcast-members) + * [8.1.2. TLS/SSL for Hazelcast Node.js Clients](#812-tlsssl-for-hazelcast-nodejs-clients) + * [8.1.3. Mutual Authentication](#813-mutual-authentication) + * [8.2. Credentials](#82-credentials) +* [9. Development and Testing](#9-development-and-testing) + * [9.1. Building and Using Client From Sources](#91-building-and-using-client-from-sources) + * [9.2. Testing](#92-testing) +* [10. Getting Help](#10-getting-help) +* [11. Contributing](#11-contributing) +* [12. License](#12-license) +* [13. Copyright](#13-copyright) # Introduction -This document provides information about the Node.js client for [Hazelcast](https://hazelcast.org/). This client uses Hazelcast's [Open Client Protocol](https://hazelcast.org/documentation/#open-binary) and works with Hazelcast IMDG 3.6 and higher versions. +This document provides information about the Node.js client for [Hazelcast](https://hazelcast.org/). This client uses Hazelcast's [Open Client Protocol](https://github.com/hazelcast/hazelcast-client-protocol) and works with Hazelcast IMDG 4.0 and higher versions. ### Resources @@ -125,7 +128,6 @@ See the following for more information on Node.js and Hazelcast IMDG: See the [Releases](https://github.com/hazelcast/hazelcast-nodejs-client/releases) page of this repository. - # 1. Getting Started This chapter provides information on how to get started with your Hazelcast Node.js client. It outlines the requirements, installation and configuration of the client, setting up a cluster, and provides a simple application that uses a distributed map in Node.js client. @@ -133,9 +135,9 @@ This chapter provides information on how to get started with your Hazelcast Node ## 1.1. Requirements - Windows, Linux or MacOS -- Node.js 4 or newer -- Java 6 or newer -- Hazelcast IMDG 3.6 or newer +- Node.js 8 or newer +- Java 8 or newer +- Hazelcast IMDG 4.0 or newer - Latest Hazelcast Node.js client ## 1.2. Working with Hazelcast IMDG Clusters @@ -146,11 +148,11 @@ Clients are a way to connect to the Hazelcast IMDG cluster and access such data. Hazelcast IMDG cluster consists of one or more cluster members. These members generally run on multiple virtual or physical machines and are connected to each other via network. Any data put on the cluster is partitioned to multiple members transparent to the user. It is therefore very easy to scale the system by adding new members as the data grows. Hazelcast IMDG cluster also offers resilience. Should -any hardware or software problem causes a crash to any member, the data on that member is recovered from backups and the cluster +any hardware or software problem causes a crash to any member, the data on that member is recovered from backups, and the cluster continues to operate without any downtime. Hazelcast clients are an easy way to connect to a Hazelcast IMDG cluster and perform tasks on distributed data structures that live on the cluster. -In order to use Hazelcast Node.js client, we first need to setup a Hazelcast IMDG cluster. +In order to use Hazelcast Node.js client, we first need to set up a Hazelcast IMDG cluster. ### 1.2.1. Setting Up a Hazelcast IMDG Cluster @@ -158,6 +160,7 @@ There are following options to start a Hazelcast IMDG cluster easily: * You can run standalone members by downloading and running JAR files from the website. * You can embed members to your Java projects. +* You can use our [Docker images](https://hub.docker.com/r/hazelcast/hazelcast/). We are going to download JARs from the website and run a standalone member for this guide. @@ -174,14 +177,16 @@ want to run members from. You should see a log similar to the following, which means that your 1-member cluster is ready to be used: ``` -INFO: [192.168.0.3]:5701 [dev] [3.10.4] +INFO: [192.168.1.10]:5701 [dev] [4.0.1] [192.168.1.10]:5701 is STARTING +May 22, 2020 2:59:11 PM com.hazelcast.internal.cluster.ClusterService +INFO: [192.168.1.10]:5701 [dev] [4.0.1] Members {size:1, ver:1} [ - Member [192.168.0.3]:5701 - 65dac4d1-2559-44bb-ba2e-ca41c56eedd6 this + Member [192.168.1.10]:5701 - 60255b17-d31c-43c4-a1c1-30f19b90f1ea this ] -Sep 06, 2018 10:50:23 AM com.hazelcast.core.LifecycleService -INFO: [192.168.0.3]:5701 [dev] [3.10.4] [192.168.0.3]:5701 is STARTED +May 22, 2020 2:59:11 PM com.hazelcast.core.LifecycleService +INFO: [192.168.1.10]:5701 [dev] [4.0.1] [192.168.1.10]:5701 is STARTED ``` #### 1.2.1.2. Adding User Library to CLASSPATH @@ -211,7 +216,7 @@ See the [Hazelcast IMDG Reference Manual](http://docs.hazelcast.org/docs/latest/ ## 1.3. Downloading and Installing -Hazelcast Node.js client is on NPM. Just add `hazelcast-client` as a dependency to your Node.js project and you are good to go. +Hazelcast Node.js client is on [NPM](https://www.npmjs.com/package/hazelcast-client). Just add `hazelcast-client` as a dependency to your Node.js project, and you are good to go. ``` npm install hazelcast-client --save @@ -223,7 +228,7 @@ If you are using Hazelcast IMDG and Node.js Client on the same computer, general trying out the client. However, if you run the client on a different computer than any of the cluster members, you may need to do some simple configurations such as specifying the member addresses. -The Hazelcast IMDG members and clients have their own configuration options. You may need to reflect some of the member side configurations on the client side to properly connect to the cluster. +The Hazelcast IMDG members and clients have their own configuration options. You may need to reflect some member side configurations on the client side to properly connect to the cluster. This section describes the most common configuration elements to get you started in no time. It discusses some member side configuration options to ease the understanding of Hazelcast's ecosystem. Then, the client side configuration options @@ -233,7 +238,7 @@ See the [Hazelcast IMDG Reference Manual](https://docs.hazelcast.org/docs/latest ### 1.4.1. Configuring Hazelcast IMDG -Hazelcast IMDG aims to run out-of-the-box for most common scenarios. However if you have limitations on your network such as multicast being disabled, +Hazelcast IMDG aims to run out-of-the-box for most common scenarios. However, if you have limitations on your network such as multicast being disabled, you may have to configure your Hazelcast IMDG members so that they can find each other on the network. Also, since most of the distributed data structures are configurable, you may want to configure them according to your needs. We will show you the basics about network configuration here. You can use the following options to configure Hazelcast IMDG: @@ -247,10 +252,7 @@ When you download and unzip `hazelcast-.zip` (or `tar`), you see the `h ```xml - - dev - dev-pass - + dev 5701 @@ -276,11 +278,9 @@ When you download and unzip `hazelcast-.zip` (or `tar`), you see the `h We will go over some important configuration elements in the rest of this section. -- ``: Specifies which cluster this member belongs to. A member connects only to the other members that are in the same group as -itself. As shown in the above configuration sample, there are `` and `` tags under the `` element with some pre-configured values. You may give your clusters different names so that they can -live in the same network without disturbing each other. Note that the cluster name should be the same across all members and clients that belong - to the same cluster. The `` tag is not in use since Hazelcast 3.9. It is there for backward compatibility -purposes. You can remove or leave it as it is if you use Hazelcast 3.9 or later. +- `` : Specifies which cluster this member belongs to. A member connects only to the other members that are in the same cluster as +itself. You may give your clusters different names so that they can live in the same network without disturbing each other. Note that the cluster name should be the same across all members and clients that belong +to the same cluster. - `` - ``: Specifies the port number to be used by the member when it starts. Its default value is 5701. You can specify another port number, and if you set `auto-increment` to `true`, then Hazelcast will try the subsequent ports until it finds an available port or the `port-count` is reached. @@ -323,7 +323,7 @@ let Client = require('hazelcast-client').Client; let Config = require('hazelcast-client').Config; let config = new Config.ClientConfig(); Client.newHazelcastClient(config).then(function(client) { - // some operations + // Some operations }); ``` @@ -338,45 +338,41 @@ with the location of your config file. In this case, the client uses the configu For the structure of `hazelcast-client.json`, see the [hazelcast-client-full.json file](hazelcast-client-full.json). You can use only the relevant parts of the file in your `hazelcast-client.json` and remove the rest. The default configuration is used for any -part that you do not explicitly set in the `hazelcast-client.json` file. +part you do not explicitly set in the `hazelcast-client.json` file. --- If you run the Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster names as explained in the previous section. If you did, then you need to make certain changes to the network settings of your client. -#### 1.4.2.1. Group Settings +#### 1.4.2.1. Cluster Name Setting -You need to provide the group name of the cluster, if it is defined on the server side, to which you want the client to connect. +You need to provide the name of the cluster, if it is defined on the server side, to which you want the client to connect. **Programmatic Configuration:** ```javascript let cfg = new Config.ClientConfig(); -cfg.group.name = 'group name of your cluster' +cfg.clusterName = 'name of your cluster'; ``` **Declarative Configuration:** ```json { - "group": { - "name": "group name of your cluster" - } + "clusterName": "name of your cluster" } ``` -> **NOTE: If you have a Hazelcast IMDG release older than 3.11, you need to provide also a group password along with the group name.** - #### 1.4.2.2. Network Settings -You need to provide the IP address and port of at least one member in your cluster so the client can find it. +You need to provide the IP address and port of at least one member in your cluster, so the client can find it. **Programmatic Configuration:** ```javascript let cfg = new Config.ClientConfig(); -cfg.network.addresses.push('some-ip-address:port'); +cfg.networkConfig.addresses.push('some-ip-address:port'); ``` **Declarative Configuration:** @@ -386,14 +382,14 @@ cfg.network.addresses.push('some-ip-address:port'); "network": { "clusterMembers": [ "some-ip-address:port" - ], + ] } } ``` ## 1.5. Basic Usage -Now that we have a working cluster and we know how to configure both our cluster and client, we can run a simple program to use a +Now we have a working cluster, and we know how to configure both our cluster and client, we can run a simple program to use a distributed map in the Node.js client. The following example first creates a programmatic configuration object. Then, it starts a client. @@ -412,19 +408,31 @@ Client.newHazelcastClient(config).then(function(client) { This should print logs about the cluster members and information about the client itself such as the client type, UUID and address. ``` -[DefaultLogger] INFO at LifecycleService: HazelcastClient is starting -[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.43:5701 authenticated -[DefaultLogger] INFO at ClusterService: Members received. -[ Member { - address: Address { host: '10.216.1.43', port: 5701, type: 4 }, - uuid: '7961eef2-940d-42dc-8036-2a29c5c9942c', - isLiteMember: false, - attributes: {} } ] -[DefaultLogger] INFO at LifecycleService: HazelcastClient is started +[DefaultLogger] INFO at LifecycleService: HazelcastClient is STARTING +[DefaultLogger] INFO at LifecycleService: HazelcastClient is STARTED +[DefaultLogger] INFO at ConnectionManager: Trying to connect to localhost:5701 +[DefaultLogger] INFO at LifecycleService: HazelcastClient is CONNECTED +[DefaultLogger] INFO at ConnectionManager: Authenticated with server 192.168.1.10:5701:01bda57b-b987-448c-ac7f-6c0e4e8dd675, server version: 4.1-SNAPSHOT, local address: 127.0.0.1:54528 +[DefaultLogger] INFO at ClusterService: + +Members [1] { + Member [192.168.1.10]:5701 - 01bda57b-b987-448c-ac7f-6c0e4e8dd675 +} + ClientInfo { type: 'NodeJS', - uuid: '8618226d-0e7b-4442-b9c2-a5918a3d3db2', - localAddress: Address { host: '127.0.0.1', port: 54708, type: 4 } } + uuid: + UUID { + mostSignificant: Long { low: -798352083, high: 92336003, unsigned: false }, + leastSignificant: Long { low: -763619649, high: 328743032, unsigned: false } }, + localAddress: + Address { + host: '127.0.0.1', + port: 54528, + type: 4, + addrStr: '127.0.0.1:54528' }, + labels: Set {}, + name: 'hz.client_0' } ``` Congratulations! You just started a Hazelcast Node.js client. @@ -515,7 +523,7 @@ Clark is in IT department Bob is in IT department ``` -You will see this time we add only the sales employees but we get the list all known employees including the ones in IT. +You will see this time we add only the sales employees, but we get the list all known employees including the ones in IT. That is because our map lives in the cluster and no matter which client we use, we can access the whole map. ## 1.6. Code Samples @@ -536,9 +544,6 @@ Hazelcast Node.js client supports the following data structures and features: * Replicated Map * Ringbuffer * Reliable Topic -* Lock -* Semaphore -* Atomic Long * CRDT PN Counter * Flake Id Generator * Event Listeners @@ -557,14 +562,20 @@ Hazelcast Node.js client supports the following data structures and features: * SSL Support (requires Enterprise server) * Mutual Authentication (requires Enterprise server) * Authorization +* Management Center Integration / Awareness +* Client Near Cache Stats +* Client Runtime Stats +* Client Operating Systems Stats +* Hazelcast Cloud Discovery * Smart Client * Unisocket Client * Lifecycle Service -* Hazelcast Cloud Discovery * IdentifiedDataSerializable Serialization * Portable Serialization * Custom Serialization * Global Serialization +* Connection Strategy +* Connection Retry # 3. Configuration Overview @@ -585,7 +596,7 @@ var Config = require('hazelcast-client').Config; var cfg = new Config.ClientConfig(); cfg.networkConfig.addresses.push('127.0.0.1:5701'); HazelcastClient.newHazelcastClient(cfg).then(function (client) { - // some operations + // Some operations }); ``` @@ -607,10 +618,7 @@ Following is a sample JSON configuration file: ```json { - "group": { - "name": "hazel", - "password": "cast" - }, + "clusterName": "hzCluster", "properties": { "hazelcast.client.heartbeat.timeout": 10000, "hazelcast.client.invocation.retry.pause.millis": 4000, @@ -624,9 +632,7 @@ Following is a sample JSON configuration file: "127.0.0.1:5701" ], "smartRouting": true, - "connectionTimeout": 6000, - "connectionAttemptPeriod": 4000, - "connectionAttemptLimit": 3 + "connectionTimeout": 6000 } } ``` @@ -641,14 +647,11 @@ different declarative configuration files. Let's assume you have the following two configurations: -`group-config.json`: +`cluster-name-config.json`: ```json { - "group": { - "name": "hazel", - "password": "cast" - } + "clusterName": "hzCluster" } ``` @@ -671,7 +674,7 @@ shown below. ```json { "import": [ - "group-config.json", + "cluster-name-config.json", "network-config.json" ] } @@ -1198,9 +1201,7 @@ Here is an example of configuring the network for Node.js Client declaratively. ], "smartRouting": true, "redoOperation": true, - "connectionTimeout": 6000, - "connectionAttemptPeriod": 5000, - "connectionAttemptLimit": 5 + "connectionTimeout": 6000 } } ``` @@ -1215,8 +1216,6 @@ clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); clientConfig.networkConfig.smartRouting = true; clientConfig.networkConfig.redoOperation = true; clientConfig.networkConfig.connectionTimeout = 6000; -clientConfig.networkConfig.connectionAttemptPeriod = 5000; -clientConfig.networkConfig.connectionAttemptLimit = 5; ``` ## 5.1. Providing Member Addresses @@ -1301,11 +1300,9 @@ Its default value is `false` (disabled). ## 5.4. Setting Connection Timeout Connection timeout is the timeout value in milliseconds for the members to accept the client connection requests. -If the member does not respond within the timeout, the client will retry to connect as many as `ClientNetworkConfig.connectionAttemptLimit` times. The following are the example configurations. - **Declarative Configuration:** ```json @@ -1325,9 +1322,16 @@ clientConfig.networkConfig.connectionTimeout = 6000; Its default value is `5000` milliseconds. -## 5.5. Setting Connection Attempt Limit +## 5.5. Enabling Client TLS/SSL + +You can use TLS/SSL to secure the connection between the clients and members. If you want to enable TLS/SSL +for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#81-tlsssl). + +As explained in the [TLS/SSL section](#81-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#813-mutual-authentication). -While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addresses`, that member might not be available at that moment. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `ClientNetworkConfig.connectionAttemptLimit` times. This is also the case when the previously established connection between the client and that member goes down. +## 5.6. Enabling Hazelcast Cloud Discovery + +The purpose of [Hazelcast Cloud](https://cloud.hazelcast.com/) Discovery is to provide the clients to use IP addresses provided by Hazelcast orchestrator. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. The following are example configurations. @@ -1335,8 +1339,12 @@ The following are example configurations. ```json { + "clusterName": "hzCluster", "network": { - "connectionAttemptLimit": 5 + "hazelcastCloud": { + "discoveryToken": "EXAMPLE_TOKEN", + "enabled": true + } } } ``` @@ -1345,23 +1353,44 @@ The following are example configurations. ```javascript var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.connectionAttemptLimit = 5; +clientConfig.clusterName = 'hzCluster'; + +clientConfig.networkConfig.cloudConfig.enabled = true; +clientConfig.networkConfig.cloudConfig.discoveryToken = 'EXAMPLE_TOKEN'; ``` -Its default value is `2`. +To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. -## 5.6. Setting Connection Attempt Period +# 6. Client Connection Strategy -Connection attempt period is the duration in milliseconds between the connection attempts defined by `ClientNetworkConfig.connectionAttemptLimit`. +Node.js client can be configured to connect to a cluster in an async manner during the client start and reconnecting +after a cluster disconnect. Both of these options are configured via `ClientConnectionStrategyConfig`. -The following are example configurations. +You can configure the client’s starting mode as async or sync using the configuration element `asyncStart`. +When it is set to `true` (async), the behavior of `Client.newHazelcastClient()` call changes. +It resolves a client instance without waiting to establish a cluster connection. In this case, the client rejects +any network dependent operation with `ClientOfflineError` immediately until it connects to the cluster. If it is `false`, +the call is not resolved and the client is not created until a connection with the cluster is established. +Its default value is `false` (sync). + +You can also configure how the client reconnects to the cluster after a disconnection. This is configured using the +configuration element `reconnectMode`; it has three options: + +* `OFF`: Client rejects to reconnect to the cluster and triggers the shutdown process. +* `ON`: Client opens a connection to the cluster in a blocking manner by not resolving any of the waiting invocations. +* `ASYNC`: Client opens a connection to the cluster in a non-blocking manner by resolving all the waiting invocations with `ClientOfflineError`. + +Its default value is `ON`. + +The example declarative and programmatic configurations below show how to configure a Node.js client’s starting and reconnecting modes. **Declarative Configuration:** ```json { - "network": { - "connectionAttemptPeriod": 5000 + "connectionStrategy": { + "asyncStart": false, + "reconnectMode": "ON" } } ``` @@ -1370,2037 +1399,2178 @@ The following are example configurations. ```javascript var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.connectionAttemptPeriod = 5000; -``` - -Its default value is `3000` milliseconds. - -## 5.7. Enabling Client TLS/SSL -You can use TLS/SSL to secure the connection between the clients and members. If you want to enable TLS/SSL -for the client-cluster connection, you should set an SSL configuration. Please see [TLS/SSL section](#61-tlsssl). - -As explained in the [TLS/SSL section](#61-tlsssl), Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast Node.js clients have certificate authorities used to define which members they can trust. Hazelcast has the mutual authentication feature which allows the Node.js clients also to have their private keys and public certificates, and members to have their certificate authorities so that the members can know which clients they can trust. See the [Mutual Authentication section](#613-mutual-authentication). +clientConfig.connectionStrategyConfig.asyncStart = false; +clientConfig.connectionStrategyConfig.reconnectMode = Config.ReconnectMode.ON; +``` -## 5.8. Enabling Hazelcast Cloud Discovery +## 6.1. Configuring Client Connection Retry -The purpose of Hazelcast Cloud Discovery is to provide the clients to use IP addresses provided by `hazelcast orchestrator`. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. +When client is disconnected from the cluster, it searches for new connections to reconnect. +You can configure the frequency of the reconnection attempts and client shutdown behavior using +`ConnectionRetryConfig` (programmatical approach) or `connectionRetry` element (declarative approach). -The following are example configurations. +Below are the example configurations for each. **Declarative Configuration:** ```json { - "group": { - "name": "hazel", - "password": "cast" - }, - - "network": { - "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN", - "enabled": true + "connectionStrategy": { + "asyncStart": false, + "reconnectMode": "ON", + "connectionRetry": { + "initialBackoffMillis": 1000, + "maxBackoffMillis": 60000, + "multiplier": 2, + "clusterConnectTimeoutMillis": 50000, + "jitter": 0.2 } } } - ``` **Programmatic Configuration:** ```javascript var clientConfig = new Config.ClientConfig(); -clientConfig.groupConfig.name = 'hazel'; -clientConfig.groupConfig.password = 'cast'; +var connectionRetryConfig = new Config.ConnectionRetryConfig(); +connectionRetryConfig.initialBackoffMillis = 1000; +connectionRetryConfig.maxBackoffMillis = 60000; +connectionRetryConfig.multiplier = 2; +connectionRetryConfig.clusterConnectTimeoutMillis = 50000; +connectionRetryConfig.jitter = 0.2; -clientConfig.networkConfig.cloudConfig.enabled = true; -clientConfig.networkConfig.cloudConfig.discoveryToken = 'EXAMPLE_TOKEN'; +clientConfig.connectionStrategyConfig.connectionRetryConfig = connectionRetryConfig; ``` -To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. +The following are configuration element descriptions: -# 6. Securing Client Connection +* `initialBackoffMillis`: Specifies how long to wait (backoff), in milliseconds, after the first failure before retrying. Its default value is `1000` ms. It must be non-negative. +* `maxBackoffMillis`: Specifies the upper limit for the backoff in milliseconds. Its default value is `30000` ms. It must be non-negative. +* `multiplier`: Factor to multiply the backoff after a failed retry. Its default value is `1`. It must be greater than or equal to `1`. +* `clusterConnectTimeoutMillis`: Timeout value in milliseconds for the client to give up to connect to the current cluster. Its default value is `20000`. +* `jitter`: Specifies by how much to randomize backoffs. Its default value is `0`. It must be in range `0` to `1`. -This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members, mutual authentication and credentials. These security features require **Hazelcast IMDG Enterprise** edition. +A pseudo-code is as follows: -### 6.1. TLS/SSL +```text +begin_time = getCurrentTime() +current_backoff_millis = INITIAL_BACKOFF_MILLIS +while (tryConnect(connectionTimeout)) != SUCCESS) { + if (getCurrentTime() - begin_time >= CLUSTER_CONNECT_TIMEOUT_MILLIS) { + // Give up to connecting to the current cluster and switch to another if exists. + } + Sleep(current_backoff_millis + UniformRandom(-JITTER * current_backoff_millis, JITTER * current_backoff_millis)) + current_backoff = Min(current_backoff_millis * MULTIPLIER, MAX_BACKOFF_MILLIS) +} +``` -One of the offers of Hazelcast is the TLS/SSL protocol which you can use to establish an encrypted communication across your cluster with key stores and trust stores. +Note that, `tryConnect` above tries to connect to any member that the client knows, and for each connection we +have a connection timeout; see the [Setting Connection Timeout](#54-setting-connection-timeout) section. -* A Java `keyStore` is a file that includes a private key and a public certificate. The equivalent of a key store is the combination of `key` and `cert` files at the Node.js client side. -* A Java `trustStore` is a file that includes a list of certificates trusted by your application which is named as "certificate authority". The equivalent of a trust store is a `ca` file at the Node.js client side. +# 7. Using Node.js Client with Hazelcast IMDG -You should set `keyStore` and `trustStore` before starting the members. See the next section on setting `keyStore` and `trustStore` on the server side. +This chapter provides information on how you can use Hazelcast IMDG's data structures in the Node.js client, after giving some basic information including an overview to the client API, operation modes of the client and how it handles the failures. -#### 6.1.1. TLS/SSL for Hazelcast Members +## 7.1. Node.js Client API Overview -Hazelcast allows you to encrypt socket level communication between Hazelcast members and between Hazelcast clients and members, for end to end encryption. To use it, see the [TLS/SSL for Hazelcast Members section](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#tls-ssl-for-hazelcast-members). +Most of the functions in the API return Promises. Therefore, you need to be familiar with the concept of +promises to use the Node.js client. If not, you can learn about them using various online resources. +Also, you can use `async/await`. -#### 6.1.2. TLS/SSL for Hazelcast Node.js Clients +If you are ready to go, let's start to use Hazelcast Node.js client. -TLS/SSL for the Hazelcast Node.js client can be configured using the `SSLConfig` class. In order to turn it on, `enabled` property of `SSLConfig` should be set to `true`: +The first step is the configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. See the [Programmatic Configuration section](#311-programmatic-configuration) for details. -```javascript -var fs = require('fs'); +The following is an example on how to create a `ClientConfig` object and configure it programmatically: +```javascript var clientConfig = new Config.ClientConfig(); -var sslConfig = new Config.SSLConfig(); -sslConfig.enabled = true; -clientConfig.networkConfig.sslConfig = sslConfig; +clientConfig.clusterName = 'dev'; +clientConfig.networkConfig.addresses.push('10.90.0.1', '10.90.0.2:5702'); ``` -`SSLConfig` object takes various SSL options defined in the [Node.js TLS Documentation](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). You can set your custom options -object to `sslConfig.sslOptions`. - -#### 6.1.3. Mutual Authentication +The second step is initializing the `HazelcastClient` to be connected to the cluster: -As explained above, Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast clients have trust stores used to define which members they can trust. +```javascript +Client.newHazelcastClient(clientConfig).then(function (client) { + // Some operation +}); +``` -Using mutual authentication, the clients also have their key stores and members have their trust stores so that the members can know which clients they can trust. +This client object is your gateway to access all the Hazelcast distributed objects. -To enable mutual authentication, firstly, you need to set the following property on the server side in the `hazelcast.xml` file: +Let's create a map and populate it with some data, as shown below. -```xml - - - - REQUIRED - - - +```javascript +var map; +// Get the Distributed Map from Cluster +client.getMap('my-distributed-map').then(function (mp) { + map = mp; + // Standard Put and Get + return map.put('key', 'value'); +}).then(function () { + return map.get('key'); +}).then(function (val) { + // Concurrent Map methods, optimistic updating + return map.putIfAbsent('somekey', 'somevalue'); +}).then(function () { + return map.replace('key', 'value', 'newvalue'); +}); ``` -You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#mutual-authentication) of the Hazelcast IMDG Reference Manual. - -At the Node.js client side, you need to supply an SSL `options` object to pass to -[`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js. +As the final step, if you are done with your client, you can shut it down as shown below. This will release all the used resources and close connections to the cluster. -There are two ways to provide this object to the client: +```javascript +... +.then(function () { + client.shutdown(); +}); +``` -1. Using the built-in `BasicSSLOptionsFactory` bundled with the client. -2. Writing an `SSLOptionsFactory`. +## 7.2. Node.js Client Operation Modes -Below subsections describe each way. +The client has two operation modes because of the distributed nature of the data and cluster: smart and unisocket. +Refer to the [Setting Smart Routing](#52-setting-smart-routing) section to see how to configure the client for +different operation modes. -**Using the Built-in `BasicSSLOptionsFactory`** +### 7.2.1. Smart Client -Hazelcast Node.js client includes a utility factory class that creates the necessary `options` object out of the supplied -properties. All you need to do is to specify your factory as `BasicSSLOptionsFactory` and provide the following options: +In the smart mode, the clients connect to each cluster member. Since each data partition uses the well-known and +consistent hashing algorithm, each client can send an operation to the relevant cluster member, +which increases the overall throughput and efficiency. Smart mode is the default mode. -- `caPath` -- `keyPath` -- `certPath` -- `servername` -- `rejectUnauthorized` -- `ciphers` +### 7.2.2. Unisocket Client -See [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js for the descriptions of each option. +For some cases, the clients can be required to connect to a single member instead of each member in the cluster. +Firewalls, security or some custom networking issues can be the reason for these cases. -> `caPath`, `keyPath` and `certPath` define the file path to the respective file that stores such information. +In the unisocket client mode, the client will only connect to one of the configured addresses. +This single member will behave as a gateway to the other members. +For any operation requested from the client, it will redirect the request to the relevant member and return the +response back to the client connected to this member. -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "exportedName": "BasicSSLOptionsFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "rejectUnauthorized": false - } - } - } - } -} -``` +## 7.3. Handling Failures -If these options are not enough for your application, you may write your own options factory and instruct the client -to get the options from it, as explained below. +There are two main failure cases you should be aware of. Below sections explain these, +and the configuration options you can use to achieve proper behavior. -**Writing an `SSLOptionsFactory`** +### 7.3.1. Handling Client Connection Failure -In order to use the full range of options provided to [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js, you may write your own factory object. +While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might not be available. +Instead of giving up, throwing an error and stopping the client, the client retries to connect as configured. +This behavior is described in the [Configuring Client Connection Retry](#61-configuring-client-connection-retry) section. -An example configuration is shown below. +The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "path": "my_factory.js", - "exportedName": "SSLFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "keepOrder": true - } - } - } - } -} -``` +### 7.3.2. Handling Retry-able Operation Failure +While sending requests to cluster members, the operations may fail due to various reasons. Read-only operations are retried by default. If you want to enable retrying for non-read-only operations, you can set the `redoOperation` to `true`. See the [Enabling Redo Operation section](#53-enabling-redo-operation). -An example of a factory, `my_factory.js`, is shown below. +You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in `ClientConfig.properties`. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: +* Member throws an exception. +* Connection between the client and member is closed. +* Client’s heartbeat requests are timed out. -```javascript -function SSLFactory() { -} +When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all the client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member and then the connection is lost. Since there will be no response for this operation, you will not know whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. -SSLFactory.prototype.init = function (properties) { - var promises = []; - var readFile = Promise.promisify(fs.readFile); - this.keepOrder = props.userDefinedProperty1; - var self = this; +## 7.4. Using Distributed Data Structures - promises.push(readFile(properties.caPath).then(function (data) { - self.ca = data; - })); - promises.push(readFile(properties.keyPath).then(function (data) { - self.key = data; - })); - promises.push(readFile(properties.certPath).then(function (data) { - self.cert = data; - })); +Most of the distributed data structures available in IMDG are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. - return Promise.all(promises).return(); -}; +### 7.4.1. Using Map -SSLFactory.prototype.getSSLOptions = function () { - var sslOpts = { - ca: this.ca, - key: this.key, - cert: this.cert, - servername: 'foo.bar.com', - rejectUnauthorized: true - }; - if (this.keepOrder) { - sslOpts.honorCipherOrder = true; - } - return sslOpts; -}; -exports.SSLFactory = SSLFactory; -``` +Hazelcast Map (`IMap`) is a distributed map. Through the Node.js client, you can perform operations like reading and writing from/to a Hazelcast Map with the well known get and put methods. For details, see the [Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#map) in the Hazelcast IMDG Reference Manual. -The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with -the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. +A Map usage example is shown below. -For information about the path resolution, see the [Loading Objects and Path Resolution section](#33-loading-objects-and-path-resolution). +```javascript +var map; +// Get the Distributed Map from Cluster +hz.getMap('my-distributed-map').then(function (mp) { + map = mp; + // Standard Put and Get + return map.put('key', 'value'); +}).then(function () { + return map.get('key'); +}).then(function (val) { + // Concurrent Map methods, optimistic updating + return map.putIfAbsent('somekey', 'somevalue'); +}).then(function () { + return map.replace('key', 'value', 'newvalue'); +}); +``` -## 6.2. Credentials +Hazelcast Map supports a Near Cache for remotely stored entries to increase the performance of read operations. See the [Near Cache section](#782-near-cache) for a detailed explanation of the Near Cache feature and its configuration. -One of the key elements in Hazelcast security is the `Credentials` object, which can be used to carry all security attributes of the -Hazelcast Node.js client to Hazelcast members. Then, Hazelcast members can authenticate the clients and perform access control -checks on the client operations using this `Credentials` object. +Hazelcast Map uses `MapListener` to listen to the events that occur when the entries are added to, updated/merged in or evicted/removed from the Map. See the [Map Listener section](#7521-map-listener) for information on how to create a map listener object and register it. -To use this feature, you need to -* have a class implementing the [`Credentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/Credentials.html) interface which contains the security attributes of your client -* have a class implementing the [`LoginModule`](https://docs.oracle.com/javase/6/docs/api/javax/security/auth/spi/LoginModule.html?is-external=true) interface which uses the `Credentials` object during the authentication process -* configure your Hazelcast member's security properties with respect to these classes before starting it. If you have started your member as described in the [Running Standalone JARs section](#1211-running-standalone-jars), see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). +### 7.4.2. Using MultiMap -[`UsernamePasswordCredentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/UsernamePasswordCredentials.html), a basic implementation of the `Credentials` interface, is available in the Hazelcast `com.hazelcast.security` package. -`UsernamePasswordCredentials` is used for default configuration during the authentication process of both members and clients. You can also use this class to carry the security attributes of your client. +Hazelcast `MultiMap` is a distributed and specialized map where you can store multiple values under a single key. For details, see the [MultiMap section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#multimap) in the Hazelcast IMDG Reference Manual. -Hazelcast also has an abstract implementation of the `LoginModule` interface which is the `ClusterLoginModule` class in the `com.hazelcast.security` package. -You can extend this class and do the authentication on the `onLogin()` method. +A MultiMap usage example is shown below. -Below is an example for the extension of abstract `ClusterLoginModule` class. -On the `ClientLoginModule#onLogin()` method, we are doing a simple authentication against a hardcoded username and password just for illustrative purposes. You should carry out the authentication against a security service of your choice. - -```java -import com.hazelcast.security.ClusterLoginModule; -import com.hazelcast.security.UsernamePasswordCredentials; - -import javax.security.auth.login.FailedLoginException; -import javax.security.auth.login.LoginException; - -public class ClientLoginModule extends ClusterLoginModule { +```javascript +var multiMap; +// Get the Distributed MultiMap from Cluster +hz.getMultiMap('my-distributed-multimap').then(function (mmp) { + multiMap = mmp; + // Put values in the map against the same key + return multiMap.put('my-key', 'value1'); +}).then(function () { + return multiMap.put('my-key', 'value2'); +}).then(function () { + return multiMap.put('my-key', 'value3'); +}).then(function () { + // Print out all the values for associated with key called "my-key" + return multiMap.get('my-key') +}).then(function (values) { + for (value of values) { + console.log(value); + } + // Remove specific key/value pair + return multiMap.remove('my-key', 'value2'); +}); +``` - @Override - protected boolean onLogin() throws LoginException { - if (credentials instanceof UsernamePasswordCredentials) { - UsernamePasswordCredentials usernamePasswordCredentials = (UsernamePasswordCredentials) credentials; - String username = usernamePasswordCredentials.getUsername(); - String password = usernamePasswordCredentials.getPassword(); +Hazelcast MultiMap uses `EntryListener` to listen to the events that occur when the entries are added to or removed from the MultiMap. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. - if (username.equals("admin") && password.equals("password")) { - return true; - } - throw new FailedLoginException("Username or password doesn't match expected value."); - } - return false; - } +### 7.4.3. Using Replicated Map - @Override - public boolean onCommit() { - return loginSucceeded; - } +Hazelcast `ReplicatedMap` is a distributed key-value data structure where the data is replicated to all members in the cluster. It provides full replication of entries to all members for high speed access. For details, see the [Replicated Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#replicated-map) in the Hazelcast IMDG Reference Manual. - @Override - protected boolean onAbort() { - return true; - } +A Replicated Map usage example is shown below. - @Override - protected boolean onLogout() { - return true; - } -} +```javascript +var map; +// Get a Replicated Map called "my-replicated-map" +hz.getReplicatedMap('my-replicated-map').then(function (rmp) { + map = rmp; + // Put and Get a value from the Replicated Map + // Key/value replicated to all members + return map.put('key', 'value'); +}).then(function (replacedValue) { + console.log('replaced value = ' + replacedValue); // Will be null as its first update + return map.get('key'); +}).then(function (value) { + // The value is retrieved from a random member in the cluster + console.log('value for key = ' + value); +}); ``` -Finally, you can configure `hazelcast.xml` as follows to enable Hazelcast security, do mandatory authentication with `ClientLoginModule` -and give the user with the name `admin` all the permissions over the map named `importantMap`. +Hazelcast Replicated Map uses `EntryListener` to listen to the events that occur when the entries are added to, updated in or evicted/removed from the Replicated Map. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. -```xml - - - - - - - - - all - - - - - -``` +### 7.4.4. Using Queue -After successfully starting a Hazelcast member as described above, you need to implement `Portable` equivalent of the `UsernamePasswordCredentials` -and register it to your client configuration. +Hazelcast Queue (`IQueue`) is a distributed queue which enables all cluster members to interact with it. For details, see the [Queue section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#queue) in the Hazelcast IMDG Reference Manual. -Below is the code for that. +A Queue usage example is shown below. -**user_pass_cred.js** ```javascript -function UsernamePasswordCredentials(username, password, endpoint) { - this.username = username; - this.password = Buffer.from(password, 'utf8'); - this.endpoint = endpoint; -} +var queue; +// Get a Blocking Queue called "my-distributed-queue" +hz.getQueue('my-distributed-queue').then(function (q) { + queue = q; + // Offer a String into the Distributed Queue + return queue.offer('item'); +}).then(function () { + // Poll the Distributed Queue and return the String + return queue.poll(); +}).then(function () { + // Timed blocking Operations + return queue.offer('anotheritem', 500); +}).then(function () { + return queue.poll(5000); +}).then(function () { + // Indefinitely blocking Operations + return queue.put('yetanotheritem'); +}).then(function () { + return queue.take(); +}).then(function (value) { + console.log(value); +}); +``` -UsernamePasswordCredentials.prototype.readPortable = function (reader) { - this.username = reader.readUTF('principal'); - this.endpoint = reader.readUTF('endpoint'); - this.password = reader.readByteArray('pwd'); -}; +Hazelcast Queue uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Queue. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. -UsernamePasswordCredentials.prototype.writePortable = function (writer) { - writer.writeUTF('principal', this.username); - writer.writeUTF('endpoint', this.endpoint); - writer.writeByteArray('pwd', this.password); -}; +### 7.4.5. Using Set -UsernamePasswordCredentials.prototype.getFactoryId = function () { - return -1; -}; +Hazelcast Set (`ISet`) is a distributed set which does not allow duplicate elements. For details, see the [Set section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#set) in the Hazelcast IMDG Reference Manual. -UsernamePasswordCredentials.prototype.getClassId = function () { - return 1; -}; +A Set usage example is shown below. -exports.UsernamePasswordCredentials = UsernamePasswordCredentials; +```javascript +var set; +// Get the Distributed Set from Cluster +hz.getSet('my-distributed-set').then(function (s) { + set = s; + // Add items to the set with duplicates + return set.add('item1'); +}).then(function () { + return set.add('item1'); +}).then(function () { + return set.add('item2'); +}).then(function () { + return set.add('item2'); +}).then(function () { + return set.add('item2'); +}).then(function () { + return set.add('item3'); +}).then(function () { + // Get the items. Note that there are no duplicates + return set.toArray(); +}).then(function (values) { + console.log(values); +}); ``` -And below is the `Factory` implementation for the `Portable` implementation of `UsernamePasswordCredentials`. +Hazelcast Set uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Set. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. -**user_pass_cred_factory.js** -```javascript -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; +### 7.4.6. Using List -function UsernamePasswordCredentialsFactory() { -} +Hazelcast List (`IList`) is a distributed list which allows duplicate elements and preserves the order of elements. For details, see the [List section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#list) in the Hazelcast IMDG Reference Manual. -UsernamePasswordCredentialsFactory.prototype.create = function (classId) { - if(classId === 1){ - return new UsernamePasswordCredentials(); - } - return null; -}; +A List usage example is shown below. -exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; +```javascript +var list; +// Get the Distributed List from Cluster +hz.getList('my-distributed-list').then(function (l) { + list = l; + // Add elements to the list + return list.add('item1'); +}).then(function () { + return list.add('item2'); +}).then(function () { + //Remove the first element + return list.removeAt(0); +}).then(function (value) { + console.log(value); + // There is only one element left + return list.size(); +}).then(function (len) { + console.log(len); + // Clear the list + return list.clear(); +}); ``` -Now, you can start your client by registering the `Portable` factory and giving the credentials as follows. +Hazelcast List uses `ItemListener` to listen to the events that occur when the items are added to or removed from the List. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. -```javascript -var Client = require('hazelcast-client').Client; -var ClientConfig = require('hazelcast-client').Config.ClientConfig; +### 7.4.7. Using Ringbuffer -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; -var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; +Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that stores its data in a ring-like structure. You can think of it as a circular array with a given capacity. Each Ringbuffer has a tail and a head. The tail is where the items are added and the head is where the items are overwritten or expired. You can reach each element in a Ringbuffer using a sequence ID, which is mapped to the elements between the head and tail (inclusive) of the Ringbuffer. For details, see the [Ringbuffer section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#ringbuffer) in the Hazelcast IMDG Reference Manual. -var config = new ClientConfig(); -config.serializationConfig.portableVersion = 1; -config.serializationConfig.portableFactories[-1] = new UsernamePasswordCredentialsFactory(); -config.customCredentials = new UsernamePasswordCredentials('admin', 'password', '127.0.0.1'); +A Ringbuffer usage example is shown below. -Client.newHazelcastClient(config).then(function (client) { - var map; - return client.getMap('importantMap').then(function (mp) { - map = mp; - return map.put('key', 'value'); - }).then(function () { - return map.get('key'); +```javascript +var rb; +// Get a Ringbuffer called "rb" +hz.getRingbuffer('rb').then(function (buffer) { + rb = buffer; + return rb.add(100); +}).then(function () { + return rb.add(200); +}).then(function (value) { + // We start from the oldest item. + // If you want to start from the next item, call rb.tailSequence()+1 + return rb.headSequence(); +}).then(function (sequence) { + return rb.readOne(sequence).then(function (value) { + console.log(value); + return rb.readOne(sequence.add(1)); }).then(function (value) { console.log(value); - return client.shutdown(); }); }); ``` -> NOTE: It is almost always a bad idea to write the credentials to wire in a clear-text format. Therefore, using TLS/SSL encryption is highly recommended while using the custom credentials as described in [TLS/SSL section]((#61-tlsssl)). +### 7.4.8. Using Reliable Topic -With Hazelcast's extensible, `JAAS` based security features you can do much more than just authentication. -See the [JAAS code sample](code_samples/jaas_sample) to learn how to perform access control checks on the client operations based on user groups. +Hazelcast `ReliableTopic` is a distributed topic implementation backed up by the `Ringbuffer` data structure. For details, see the [Reliable Topic section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#reliable-topic) in the Hazelcast IMDG Reference Manual. -Also, see the [Security section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#security) of Hazelcast IMDG Reference Manual for more information. +A Reliable Topic usage example is shown below. +```javascript +var topic; +// Get a Topic called "my-distributed-topic" +hz.getReliableTopic('my-distributed-topic').then(function (t) { + topic = t; + // Add a Listener to the Topic + topic.addMessageListener(function (message) { + console.log(message); + }); + // Publish a message to the Topic + return topic.publish('Hello to distributed world'); +}); +``` -# 7. Using Node.js Client with Hazelcast IMDG +Hazelcast Reliable Topic uses `MessageListener` to listen to the events that occur when a message is received. See the [Message Listener section](#7524-message-listener) for information on how to create a message listener object and register it. -This chapter provides information on how you can use Hazelcast IMDG's data structures in the Node.js client, after giving some basic information including an overview to the client API, operation modes of the client and how it handles the failures. +#### 7.4.8.1 Configuring Reliable Topic -## 7.1. Node.js Client API Overview +You may configure `ReliableTopic`s as the following: -Most of the functions in the API return `Promise`. Therefore, you need to be familiar with the concept of promises to use the Node.js client. If not, you can learn about them using various online resources, e.g., the [Promise JS](https://www.promisejs.org/) website. +**Declarative Configuration:** -Promises provide a better way of working with callbacks. You can chain asynchronous functions by the `then()` function of promise. Also, you can use `async/await`, if you use Node.js 8 and higher versions. +```json +{ + "reliableTopics": [ + { + "name": "rt1", + "readBatchSize": 35, + "overloadPolicy": "discard_newest" + } + ] +} +``` -If you are ready to go, let's start to use Hazelcast Node.js client. +**Programmatic Configuration:** -The first step is the configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. See the [Programmatic Configuration section](#311-programmatic-configuration) for details. +```javascript +var config = new Config.ClientConfig(); -The following is an example on how to create a `ClientConfig` object and configure it programmatically: +var reliableTopicConfig = new Config.ReliableTopicConfig(); +reliableTopicConfig.name = 'rt1'; +reliableTopicConfig.readBatchSize = 35; +reliableTopicConfig.overloadPolicy = Config.TopicOverloadPolicy.DISCARD_NEWEST; -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.groupConfig.name = 'dev'; -clientConfig.networkConfig.addresses.push('10.90.0.1', '10.90.0.2:5702'); +config.reliableTopicConfigs['rt1'] = reliableTopicConfig; ``` -The second step is initializing the `HazelcastClient` to be connected to the cluster: +The following are the descriptions of configuration elements and attributes: + +* `name`: Name of your Reliable Topic. +* `readBatchSize`: Minimum number of messages that Reliable Topic tries to read in batches. Its default value is `10`. +* `overloadPolicy`: Policy to handle an overloaded topic. Available values are `DISCARD_OLDEST`, `DISCARD_NEWEST`, `BLOCK` and `ERROR`. Its default value is `BLOCK`. See [Slow Consumers](https://docs.hazelcast.org/docs/latest/manual/html-single/#slow-consumers) for definitions of these policies. + +### 7.4.9. Using PN Counter + +Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative counter implementation. It is an eventually consistent counter given there is no member failure. For details, see the [PN Counter section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#pn-counter) in the Hazelcast IMDG Reference Manual. + +A PN Counter usage example is shown below. ```javascript -Client.newHazelcastClient(clientConfig).then(function (client) { - // some operation +var pnCounter; +hz.getPNCounter('myPNCounter').then(function (counter) { + pnCounter = counter; + return pnCounter.get(); +}).then(function (value) { + console.log('Counter started with value ' + value); // 0 + return pnCounter.addAndGet(5); +}).then(function (value) { + console.log('Value after operation is ' + value); // 5 + return pnCounter.getAndAdd(2); +}).then(function (value) { + console.log('Value before operation was ' + value); // 5 + return pnCounter.get(); +}).then(function (value) { + console.log('New value is ' + value); // 7 + return pnCounter.decrementAndGet(); +}).then(function (value) { + console.log('Decremented counter by one. New value is ' + value); // 6 }); ``` -**This client object is your gateway to access all the Hazelcast distributed objects.** +### 7.4.10. Using Flake ID Generator -Let's create a map and populate it with some data, as shown below. +Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers. Generated identifiers are long primitive values and are k-ordered (roughly ordered). IDs are in the range from `0` to `2^63-1` (maximum value for Java's `long` type). For details, see the [FlakeIdGenerator section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#flakeidgenerator) in the Hazelcast IMDG Reference Manual. + +A Flake ID Generator usage example is shown below. ```javascript -var map; -// Get the Distributed Map from Cluster. -client.getMap('my-distributed-map').then(function (mp) { - map = mp; - // Standard Put and Get. - return map.put('key', 'value'); -}).then(function () { - return map.get('key'); -}).then(function (val) { - // Concurrent Map methods, optimistic updating - return map.putIfAbsent('somekey', 'somevalue'); -}).then(function () { - return map.replace('key', 'value', 'newvalue'); +var flakeIdGenerator; +hz.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { + flakeIdGenerator = gen; + return flakeIdGenerator.newId(); +}).then(function (value) { + console.log('New id: ' + value.toString()); }); ``` -As the final step, if you are done with your client, you can shut it down as shown below. This will release all the used resources and close connections to the cluster. +#### 7.4.10.1 Configuring Flake ID Generator + +You may configure `FlakeIdGenerator`s as the following: + +**Declarative Configuration:** + +```json +{ + "flakeIdGeneratorConfigs": [ + { + "name": "flakeidgenerator", + "prefetchCount": 123, + "prefetchValidityMillis": 150000 + } + ] +} +``` +> Note: Since Javascript cannot represent numbers greater than 2^53, you need to put long numbers in quotes as a string. + +**Programmatic Configuration:** ```javascript -... -.then(function () { - client.shutdown(); -}); +var config = new Config.ClientConfig(); +var flakeIdGeneratorConfig = new Config.FlakeIdGeneratorConfig(); +flakeIdGeneratorConfig.name = 'flakeidgenerator'; +flakeIdGeneratorConfig.prefetchCount = 123; +flakeIdGeneratorConfig.prefetchValidityMillis = 150000; + +config.flakeIdGeneratorConfigs['flakeidgenerator'] = flakeIdGeneratorConfig; ``` -## 7.2. Node.js Client Operation Modes +The following are the descriptions of configuration elements and attributes: -The client has two operation modes because of the distributed nature of the data and cluster: smart and unisocket. +* `name`: Name of your Flake ID Generator. +* `prefetchCount`: Count of IDs which are pre-fetched on the background when one call to `FlakeIdGenerator.newId()` is made. Its value must be in the range `1` - `100,000`. Its default value is `100`. +* `prefetchValidityMillis`: Specifies for how long the pre-fetched IDs can be used. After this time elapses, a new batch of IDs are fetched. Time unit is milliseconds. Its default value is `600,000` milliseconds (`10` minutes). The IDs contain a timestamp component, which ensures a rough global ordering of them. If an ID is assigned to an object that was created later, it will be out of order. If ordering is not important, set this value to `0`. -### 7.2.1. Smart Client +### 7.4.11. Using Lock, Semaphore and Atomic Long -In the smart mode, the clients connect to each cluster member. Since each data partition uses the well known and consistent hashing algorithm, each client can send an operation to the relevant cluster member, which increases the overall throughput and efficiency. Smart mode is the default mode. +Hazelcast IMDG 4.0 introduces CP concurrency primitives with respect to the [CAP principle](http://awoc.wolski.fi/dlib/big-data/Brewer_podc_keynote_2000.pdf), i.e., they always +maintain [linearizability](https://aphyr.com/posts/313-strong-consistency-models) and prefer consistency to availability during network partitions and client or server failures. -### 7.2.2. Unisocket Client +These new implementations are accessed using the [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) +which cannot be used with the Node.js client yet. We plan to implement support for the CP Subsystem in the upcoming 4.0 release. +In the meantime, since there is no way to access old non-CP primitives using IMDG 4.x, we removed their implementations, +code samples and documentations. They will be back once we implement them. + +## 7.5. Distributed Events -For some cases, the clients can be required to connect to a single member instead of each member in the cluster. Firewalls, security or some custom networking issues can be the reason for these cases. +This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. -In the unisocket client mode, the client will only connect to one of the configured addresses. This single member will behave as a gateway to the other members. For any operation requested from the client, it will redirect the request to the relevant member and return the response back to the client returned from this member. +### 7.5.1. Listening for Cluster Events -## 7.3. Handling Failures +You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side: -There are two main failure cases you should be aware of. Below sections explain these and the configurations you can perform to achieve proper behavior. +* Membership Listener: Notifies when a member joins to/leaves the cluster, or when an attribute is changed in a member. +* Distributed Object Listener: Notifies when a distributed object is created or destroyed throughout the cluster. +* Lifecycle Listener: Notifies when the client is starting, started, shutting down and shutdown. -### 7.3.1. Handling Client Connection Failure +#### 7.5.1.1. Membership Listener -While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might not be available. Instead of giving up, throwing an error and stopping the client, the client will retry as many as `connectionAttemptLimit` times. +The Membership Listener interface has functions that are invoked for the following events. -You can configure `connectionAttemptLimit` for the number of times you want the client to retry connecting. See the [Setting Connection Attempt Limit section](#55-setting-connection-attempt-limit). +* `memberAdded`: A new member is added to the cluster. +* `memberRemoved`: An existing member leaves the cluster. -The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. +For these events, a `MembershipEvent` object is passed to the listener function. -### 7.3.2. Handling Retry-able Operation Failure +After you create the listener object, you can configure your cluster to include the membership listener. You can also add one or more membership listeners. -While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retrying for the other operations, you can set the `redoOperation` to `true`. See the [Enabling Redo Operation section](#53-enabling-redo-operation). +The following is a membership listener registration by using the `ClusterService.addMembershipListener()` function. -You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in `ClientConfig.properties`. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: +```javascript +var membershipListener = { + memberAdded: function (event) { + console.log('Member Added: The address is', event.member.address.toString()); + }, +}; +client.clusterService.addMembershipListener(membershipListener); +``` -* Member throws an exception. -* Connection between the client and member is closed. -* Client’s heartbeat requests are timed out. +Also, if you want to receive the list of available members when the client connects to cluster you may register an +`InitialMembershipListener`. This listener receives an only-once `InitialMembershipEvent` when the member list becomes +available. After the event has been received, the listener will receive the normal `MembershipEvent`s. -When a connection problem occurs, an operation is retried if it is certain that it has not run on the member yet or if it is idempotent such as a read-only operation, i.e., retrying does not have a side effect. If it is not certain whether the operation has run on the member, then the non-idempotent operations are not retried. However, as explained in the first paragraph of this section, you can force all the client operations to be retried (`redoOperation`) when there is a connection failure between the client and member. But in this case, you should know that some operations may run multiple times causing conflicts. For example, assume that your client sent a `queue.offer` operation to the member and then the connection is lost. Since there will be no response for this operation, you will not know whether it has run on the member or not. If you enabled `redoOperation`, it means this operation may run again, which may cause two instances of the same object in the queue. +The following is an initial membership listener registration by using the `config.listeners.addMembershipListener()` function. -## 7.4. Using Distributed Data Structures +```javascript +var membershipListener = { + init: function (event) { + console.log("Initial member list received -> " + event.members); + }, + memberAdded: function (event) { + console.log('Member Added: The address is', event.member.address.toString()); + }, +}; + +var config = new Config.ClientConfig(); +config.listeners.addMembershipListener(membershipListener); +``` -Most of the distributed data structures are supported by the Node.js client. In this chapter, you will learn how to use these distributed data structures. +#### 7.5.1.2. Distributed Object Listener -### 7.4.1. Using Map +The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: + +* `serviceName`: Service name of the distributed object. +* `objectName`: Name of the distributed object. +* `eventType`: Type of the invoked event. It can be `created` or `destroyed`. + +The following is an example of adding a `DistributedObjectListener`. + +```javascript +client.addDistributedObjectListener(function (distributedObjectEvent) { + console.log('Distributed object event >>> ', + distributedObjectEvent.serviceName, + distributedObjectEvent.objectName, + distributedObjectEvent.eventType + ); +}).then(function () { + var mapname = 'test'; + // This causes a created event + client.getMap(mapname); + // This causes no event because map was already created + client.getMap(mapname); +}); +``` + +#### 7.5.1.3. Lifecycle Listener + +The `LifecycleListener` interface notifies for the following events: + +* `STARTING`: The client is starting. +* `STARTED`: The client has started. +* `CONNECTED`: The client connected to a member. +* `SHUTTING_DOWN`: The client is shutting down. +* `DISCONNECTED`: The client disconnected from a member. +* `SHUTDOWN`: The client has shutdown. + +The following is an example of the `LifecycleListener` that is added to the `ClientConfig` object and its output. + +```javascript +var clientConfig = new Config.ClientConfig(); +clientConfig.listeners.addLifecycleListener(function (state) { + console.log('Lifecycle Event >>> ' + state); +}); + +Client.newHazelcastClient(clientConfig).then(function (hazelcastClient) { + hazelcastClient.shutdown(); +}); +``` + +**Output:** + +``` +[DefaultLogger] INFO at LifecycleService: HazelcastClient is STARTING +Lifecycle Event >>> STARTING +[DefaultLogger] INFO at LifecycleService: HazelcastClient is STARTED +Lifecycle Event >>> STARTED +[DefaultLogger] INFO at ConnectionManager: Trying to connect to localhost:5701 +[DefaultLogger] INFO at LifecycleService: HazelcastClient is CONNECTED +Lifecycle Event >>> CONNECTED +[DefaultLogger] INFO at ConnectionManager: Authenticated with server 192.168.1.10:5701:8d69d670-fa8a-4278-a91f-b43875fccfe8, server version: 4.1-SNAPSHOT, local address: 127.0.0.1:59316 +[DefaultLogger] INFO at ClusterService: + +Members [1] { + Member [192.168.1.10]:5701 - 8d69d670-fa8a-4278-a91f-b43875fccfe8 +} + +[DefaultLogger] INFO at LifecycleService: HazelcastClient is SHUTTING_DOWN +Lifecycle Event >>> SHUTTING_DOWN +[DefaultLogger] INFO at ConnectionManager: Removed connection to endpoint: 192.168.1.10:5701:8d69d670-fa8a-4278-a91f-b43875fccfe8, connection: ClientConnection{alive=false, connectionId=0, remoteAddress=192.168.1.10:5701} +[DefaultLogger] INFO at LifecycleService: HazelcastClient is DISCONNECTED +Lifecycle Event >>> DISCONNECTED +[DefaultLogger] INFO at LifecycleService: HazelcastClient is SHUTDOWN +Lifecycle Event >>> SHUTDOWN +``` + +### 7.5.2. Listening for Distributed Data Structure Events + +You can add event listeners to the distributed data structures. + +> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, + some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** + +#### 7.5.2.1. Map Listener + +The Map Listener is used by the Hazelcast `Map`. + +You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. -Hazelcast Map (`IMap`) is a distributed map. Through the Node.js client, you can perform operations like reading and writing from/to a Hazelcast Map with the well known get and put methods. For details, see the [Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#map) in the Hazelcast IMDG Reference Manual. +An entry-based event is fired after the operations that affect a specific entry. For example, `IMap.put()`, `IMap.remove()` or `IMap.evict()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. -A Map usage example is shown below. +See the following example. ```javascript -var map; -// Get the Distributed Map from Cluster. -hz.getMap('my-distributed-map').then(function (mp) { - map = mp; - // Standard Put and Get. - return map.put('key', 'value'); -}).then(function () { - return map.get('key'); -}).then(function (val) { - // Concurrent Map methods, optimistic updating - return map.putIfAbsent('somekey', 'somevalue'); -}).then(function () { - return map.replace('key', 'value', 'newvalue'); +var entryEventListener = { + added: function (entryEvent) { + console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry + } +}; +map.addEntryListener(entryEventListener, undefined, true).then(function () { + return map.put('1', 'My new entry'); }); ``` -Hazelcast Map supports a Near Cache for remotely stored entries to increase the performance of read operations. See the [Near Cache section](#782-near-cache) for a detailed explanation of the Near Cache feature and its configuration. - -Hazelcast Map uses `MapListener` to listen to the events that occur when the entries are added to, updated/merged in or evicted/removed from the Map. See the [Map Listener section](#7521-map-listener) for information on how to create a map listener object and register it. - -### 7.4.2. Using MultiMap - -Hazelcast `MultiMap` is a distributed and specialized map where you can store multiple values under a single key. For details, see the [MultiMap section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#multimap) in the Hazelcast IMDG Reference Manual. +A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. -A MultiMap usage example is shown below. +See the following example. ```javascript -var multiMap; -// Get the Distributed MultiMap from Cluster. -hz.getMultiMap('my-distributed-multimap').then(function (mmp) { - multiMap = mmp; - // Put values in the map against the same key - return multiMap.put('my-key', 'value1'); +var mapEventListener = { + mapCleared: function (mapEvent) { + console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 3 + } +}; +map.addEntryListener(mapEventListener).then(function () { + return map.put('1', 'Muhammad Ali'); }).then(function () { - return multiMap.put('my-key', 'value2'); + return map.put('2', 'Mike Tyson'); }).then(function () { - return multiMap.put('my-key', 'value3'); + return map.put('3', 'Joe Louis'); }).then(function () { - // Print out all the values for associated with key called "my-key" - return multiMap.get('my-key') -}).then(function (values) { - for (value of values) { - console.log(value); - } - // remove specific key/value pair - return multiMap.remove('my-key', 'value2'); + return map.clear(); }); ``` -Hazelcast MultiMap uses `EntryListener` to listen to the events that occur when the entries are added to or removed from the MultiMap. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. +As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. -### 7.4.3. Using Replicated Map +#### 7.5.2.2. Entry Listener -Hazelcast `ReplicatedMap` is a distributed key-value data structure where the data is replicated to all members in the cluster. It provides full replication of entries to all members for high speed access. For details, see the [Replicated Map section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#replicated-map) in the Hazelcast IMDG Reference Manual. +The Entry Listener is used by the Hazelcast `MultiMap` and `ReplicatedMap`. -A Replicated Map usage example is shown below. +You can listen to map-wide or entry-based events by using the functions in the `EntryListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `EntryListener` interface. + +An entry-based event is fired after the operations that affect a specific entry. For example, `MultiMap.put()`, `MultiMap.remove()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. ```javascript -var map; -// Get a Replicated Map called "my-replicated-map" -hz.getReplicatedMap('my-replicated-map').then(function (rmp) { - map = rmp; - // Put and Get a value from the Replicated Map - // key/value replicated to all members - return map.put('key', 'value'); -}).then(function (replacedValue) { - console.log('replaced value = ' + replacedValue); // Will be null as its first update - return map.get('key'); -}).then(function (value) { - // The value is retrieved from a random member in the cluster - console.log('value for key = ' + value); +var entryEventListener = { + added: function (entryEvent) { + console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry + } +}; +return mmp.addEntryListener(entryEventListener, undefined, true).then(function () { + return mmp.put('1', 'My new entry'); }); ``` -Hazelcast Replicated Map uses `EntryListener` to listen to the events that occur when the entries are added to, updated in or evicted/removed from the Replicated Map. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. - -### 7.4.4. Using Queue - -Hazelcast Queue (`IQueue`) is a distributed queue which enables all cluster members to interact with it. For details, see the [Queue section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#queue) in the Hazelcast IMDG Reference Manual. +A map-wide event is fired as a result of a map-wide operation. For example, `MultiMap.clear()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. -A Queue usage example is shown below. +See the following example. ```javascript -var queue; -// Get a Blocking Queue called "my-distributed-queue" -hz.getQueue('my-distributed-queue').then(function (q) { - queue = q; - // Offer a String into the Distributed Queue - return queue.offer('item'); -}).then(function () { - // Poll the Distributed Queue and return the String - return queue.poll(); -}).then(function () { - // Timed blocking Operations - return queue.offer('anotheritem', 500); +var mapEventListener = { + mapCleared: function (mapEvent) { + console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 1 + } +}; +mmp.addEntryListener(mapEventListener).then(function () { + return mmp.put('1', 'Muhammad Ali'); }).then(function () { - return queue.poll(5000); + return mmp.put('1', 'Mike Tyson'); }).then(function () { - // Indefinitely blocking Operations - return queue.put('yetanotheritem'); + return mmp.put('1', 'Joe Louis'); }).then(function () { - return queue.take(); -}).then(function (value) { - console.log(value); + return mmp.clear(); }); ``` -Hazelcast Queue uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Queue. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. +Note that all functions in the `EntryListener` interface is not supported by MultiMap and Replicated Map. See the following headings to see supported listener functions for each data structure. -## 7.4.5. Using Set +**Entry Listener Functions Supported by MultiMap** -Hazelcast Set (`ISet`) is a distributed set which does not allow duplicate elements. For details, see the [Set section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#set) in the Hazelcast IMDG Reference Manual. +- `added` +- `removed` +- `mapCleared` -A Set usage example is shown below. +**Entry Listener Functions Supported by Replicated Map** -```javascript -var set; -// Get the Distributed Set from Cluster. -hz.getSet('my-distributed-set').then(function (s) { - set = s; - // Add items to the set with duplicates - return set.add('item1'); -}).then(function () { - return set.add('item1'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item3'); -}).then(function () { - // Get the items. Note that there are no duplicates - return set.toArray(); -}).then(function (values) { - console.log(values); -}); -``` +- `added` +- `removed` +- `updated` +- `evicted` +- `mapCleared` -Hazelcast Set uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Set. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. +As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. -## 7.4.6. Using List +#### 7.5.2.3. Item Listener -Hazelcast List (`IList`) is a distributed list which allows duplicate elements and preserves the order of elements. For details, see the [List section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#list) in the Hazelcast IMDG Reference Manual. +The Item Listener is used by the Hazelcast `Queue`, `Set` and `List`. -A List usage example is shown below. +You can listen to item events by implementing the functions in the `ItemListener` interface including `itemAdded` and `itemRemoved`. These functions are invoked when an item is added or removed. + +The following is an example of item listener object and its registration to the `Set`. It also applies to `Queue` and `List`. ```javascript -var list; -// Get the Distributed List from Cluster. -hz.getList('my-distributed-list').then(function (l) { - list = l; - // Add elements to the list - return list.add('item1'); -}).then(function () { - return list.add('item2'); +var itemListener = { + itemAdded: function (itemEvent) { + console.log('Item Added:', itemEvent.item); // Item Added: Item1 + }, + itemRemoved: function (itemEvent) { + console.log('Item Removed:', itemEvent.item); // Item Removed: Item1 + } +}; +return set.addItemListener(itemListener, true).then(function () { + return set.add('Item1'); }).then(function () { - //Remove the first element - return list.removeAt(0); -}).then(function (value) { - console.log(value); - // There is only one element left - return list.size(); -}).then(function (len) { - console.log(len); - // Clear the list - return list.clear(); + return set.remove('Item1'); }); ``` -Hazelcast List uses `ItemListener` to listen to the events that occur when the items are added to or removed from the List. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. +As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the item event contains the item value. -## 7.4.7. Using Ringbuffer +#### 7.5.2.4. Message Listener -Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that stores its data in a ring-like structure. You can think of it as a circular array with a given capacity. Each Ringbuffer has a tail and a head. The tail is where the items are added and the head is where the items are overwritten or expired. You can reach each element in a Ringbuffer using a sequence ID, which is mapped to the elements between the head and tail (inclusive) of the Ringbuffer. For details, see the [Ringbuffer section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#ringbuffer) in the Hazelcast IMDG Reference Manual. +The Message Listener is used by the Hazelcast `Reliable Topic`. -A Ringbuffer usage example is shown below. +You can listen to message events. To listen to these events, you need to implement the `MessageListener` function to which a `Message` object is passed. + +See the following example. ```javascript -var rb; -// Get a Ringbuffer called "rb" -hz.getRingbuffer('rb').then(function (buffer) { - rb = buffer; - return rb.add(100); -}).then(function () { - return rb.add(200); -}).then(function (value) { - // we start from the oldest item. - // if you want to start from the next item, call rb.tailSequence()+1 - return rb.headSequence(); -}).then(function (sequence) { - return rb.readOne(sequence).then(function (value) { - console.log(value); - return rb.readOne(sequence.add(1)); - }).then(function (value) { - console.log(value); - }); +topic.addMessageListener(function (message) { + console.log(message.messageObject); }); + +var movie = { + title: 'The Prestige', + year: '2006', + runtime: '130 min', + director: 'Christopher Nolan', + imdbRating: '8.5' +} +topic.publish(movie); ``` -## 7.4.8. Using Reliable Topic +## 7.6. Distributed Computing + +This chapter explains how you can use Hazelcast IMDG's entry processor implementation in the Node.js client. -Hazelcast `ReliableTopic` is a distributed topic implementation backed up by the `Ringbuffer` data structure. For details, see the [Reliable Topic section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#reliable-topic) in the Hazelcast IMDG Reference Manual. +### 7.6.1. Using EntryProcessor + +Hazelcast supports entry processing. An entry processor is a function that executes your code on a map entry in an atomic way. + +An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys -- executing `IMap.get(key)`, mutating the value and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. + +If you are doing the process described above, you should consider using entry processors. An entry processor executes a read and updates upon the member where the data resides. This eliminates the costly network hops described above. + +> **NOTE: Entry processor is meant to process a single entry per call. Processing multiple entries and data structures in an entry processor is not supported as it may result in deadlocks on the server side.** + +Hazelcast sends the entry processor to each cluster member and these members apply it to the map entries. Therefore, if you add more members, your processing completes faster. + +#### Processing Entries + +The `IMap` interface provides the following functions for entry processing: + +* `executeOnKey` processes an entry mapped by a key. +* `executeOnKeys` processes entries mapped by a list of keys. +* `executeOnEntries` can process all entries in a map with a defined predicate. Predicate is optional. + +In the Node.js client, an `EntryProcessor` should be `IdentifiedDataSerializable` or `Portable` because the server should be able to deserialize it to process. -A Reliable Topic usage example is shown below. +The following is an example for `EntryProcessor` which is `IdentifiedDataSerializable`. ```javascript -var topic; -// Get a Topic called "my-distributed-topic" -hz.getReliableTopic('my-distributed-topic').then(function (t) { - topic = t; - // Add a Listener to the Topic - topic.addMessageListener(function (message) { - console.log(message); - }); - // Publish a message to the Topic - return topic.publish('Hello to distributed world'); -}); -``` - -Hazelcast Reliable Topic uses `MessageListener` to listen to the events that occur when a message is received. See the [Message Listener section](#7524-message-listener) for information on how to create a message listener object and register it. +function IdentifiedEntryProcessor(value) { + this.value = value; +} -## 7.4.9. Using Lock +IdentifiedEntryProcessor.prototype.readData = function (inp) { + this.value = inp.readUTF(); +}; -Hazelcast Lock (`ILock`) is a distributed lock implementation. You can synchronize Hazelcast members and clients using a Lock. For details, see the [Lock section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#lock) in the Hazelcast IMDG Reference Manual. +IdentifiedEntryProcessor.prototype.writeData = function (outp) { + outp.writeUTF(this.value); +}; -A Lock usage example is shown below. +IdentifiedEntryProcessor.prototype.getFactoryId = function () { + return 5; +}; -```javascript -var lock; -// Get a distributed lock called "my-distributed-lock" -hz.getLock('my-distributed-lock').then(function (l) { - lock = l; - // Now create a lock and execute some guarded code. - return lock.lock(); -}).then(function () { - // do something here -}).finally(function () { - return lock.unlock(); -}); +IdentifiedEntryProcessor.prototype.getClassId = function () { + return 1; +}; ``` -## 7.4.10. Using Atomic Long +Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). -Hazelcast Atomic Long (`IAtomicLong`) is the distributed long which offers most of the operations such as `get`, `set`, `getAndSet`, `compareAndSet` and `incrementAndGet`. For details, see the [Atomic Long section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#iatomiclong) in the Hazelcast IMDG Reference Manual. +The following is the Java equivalent of the entry processor in Node.js client given above: -An Atomic Long usage example is shown below. +```java +import com.hazelcast.map.AbstractEntryProcessor; +import com.hazelcast.nio.ObjectDataInput; +import com.hazelcast.nio.ObjectDataOutput; +import com.hazelcast.nio.serialization.IdentifiedDataSerializable; +import java.io.IOException; +import java.util.Map; -```javascript -var counter; -// Get an Atomic Counter, we'll call it "counter" -hz.getAtomicLong('counter').then(function (c) { - counter = c; - // Add and Get the "counter" - return counter.addAndGet(3); -}).then(function (value) { - return counter.get(); -}).then(function (value) { - // Display the "counter" value - console.log('counter: ' + value); -}); -``` +public class IdentifiedEntryProcessor extends AbstractEntryProcessor implements IdentifiedDataSerializable { + static final int CLASS_ID = 1; + private String value; -## 7.4.11. Using Semaphore + public IdentifiedEntryProcessor() { + } -Hazelcast Semaphore (`ISemaphore`) is a distributed semaphore implementation. For details, see the [Semaphore section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#isemaphore) in the Hazelcast IMDG Reference Manual. + @Override + public int getFactoryId() { + return IdentifiedFactory.FACTORY_ID; + } -A Semaphore usage example is shown below. + @Override + public int getId() { + return CLASS_ID; + } -```javascript -var semaphore; -hazelcastClient.getSemaphore('mySemaphore').then(function (s) { - semaphore = s; - return semaphore.init(10); -}).then(function () { - return semaphore.acquire(5); -}).then(function () { - return semaphore.availablePermits(); -}).then(function (res) { - console.log(res); // 5 -}); + @Override + public void writeData(ObjectDataOutput out) throws IOException { + out.writeUTF(value); + } + + @Override + public void readData(ObjectDataInput in) throws IOException { + value = in.readUTF(); + } + + @Override + public Object process(Map.Entry entry) { + entry.setValue(value); + return value; + } +} ``` -## 7.4.12. Using PN Counter +You can implement the above processor’s factory as follows: -Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative counter implementation. It is an eventually consistent counter given there is no member failure. For details, see the [PN Counter section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#pn-counter) in the Hazelcast IMDG Reference Manual. +```java +import com.hazelcast.nio.serialization.DataSerializableFactory; +import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -A PN Counter usage example is shown below. +public class IdentifiedFactory implements DataSerializableFactory { + public static final int FACTORY_ID = 5; -```javascript -var pnCounter; -hz.getPNCounter('myPNCounter').then(function (counter) { - pnCounter = counter; - return pnCounter.get(); -}).then(function (value) { - console.log('Counter started with value ' + value); // 0 - return pnCounter.addAndGet(5); -}).then(function (value) { - console.log('Value after operation is ' + value); // 5 - return pnCounter.getAndAdd(2); -}).then(function (value) { - console.log('Value before operation was ' + value); // 5 - return pnCounter.get(); -}).then(function (value) { - console.log('New value is ' + value); // 7 - return pnCounter.decrementAndGet(); -}).then(function (value) { - console.log('Decremented counter by one. New value is ' + value); // 6 -}); + @Override + public IdentifiedDataSerializable create(int typeId) { + if (typeId == IdentifiedEntryProcessor.CLASS_ID) { + return new IdentifiedEntryProcessor(); + } + return null; + } +} ``` -## 7.4.13. Using Flake ID Generator +Now you need to configure the `hazelcast.xml` to add your factory as shown below. + +```xml + + + + + IdentifiedFactory + + + + +``` -Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers. Generated identifiers are long primitive values and are k-ordered (roughly ordered). IDs are in the range from 0 to `2^63-1` (maximum signed long value). For details, see the [FlakeIdGenerator section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#flakeidgenerator) in the Hazelcast IMDG Reference Manual. +The code that runs on the entries is implemented in Java on the server side. The client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, see the [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. -A Flake ID Generator usage example is shown below. +After the above implementations and configuration are done and you start the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. See the following example. ```javascript -var flakeIdGenerator; -hz.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { - flakeIdGenerator = gen; - return flakeIdGenerator.newId(); +var map; +hazelcastClient.getMap('my-distributed-map').then(function (mp) { + map = mp; + return map.put('key', 'not-processed'); +}).then(function () { + return map.executeOnKey('key', new IdentifiedEntryProcessor('processed')); +}).then(function () { + return map.get('key'); }).then(function (value) { - console.log('New id: ' + value.toString()); + console.log(value); // Processed }); ``` -## 7.5. Distributed Events +## 7.7. Distributed Query -This chapter explains when various events are fired and describes how you can add event listeners on a Hazelcast Node.js client. These events can be categorized as cluster and distributed data structure events. +Hazelcast partitions your data and spreads it across cluster of members. You can iterate over the map entries and look for certain entries (specified by predicates) you are interested in. However, this is not very efficient because you will have to bring the entire entry set and iterate locally. Instead, Hazelcast allows you to run distributed queries on your distributed map. -### 7.5.1. Listening for Cluster Events +### 7.7.1. How Distributed Query Works -You can add event listeners to a Hazelcast Node.js client. You can configure the following listeners to listen to the events on the client side: +1. The requested predicate is sent to each member in the cluster. +2. Each member looks at its own local entries and filters them according to the predicate. At this stage, key-value pairs of the entries are deserialized and then passed to the predicate. +3. The predicate requester merges all the results coming from each member into a single set. -* Membership Listener: Notifies when a member joins to/leaves the cluster, or when an attribute is changed in a member. -* Distributed Object Listener: Notifies when a distributed object is created or destroyed throughout the cluster. -* Lifecycle Listener: Notifies when the client is starting, started, shutting down and shutdown. +Distributed query is highly scalable. If you add new members to the cluster, the partition count for each member is reduced and thus the time spent by each member on iterating its entries is reduced. In addition, the pool of partition threads evaluates the entries concurrently in each member, and the network traffic is also reduced since only filtered data is sent to the requester. -#### 7.5.1.1. Membership Listener +**Predicates Object Operators** -The Membership Listener interface has functions that are invoked for the following events. +The `Predicates` object offered by the Node.js client includes many operators for your query requirements. Some of them are described below. -* `memberAdded`: A new member is added to the cluster. -* `memberRemoved`: An existing member leaves the cluster. -* `memberAttributeChanged`: An attribute of a member is changed. See the [Defining Member Attributes section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#defining-member-attributes) in the Hazelcast IMDG Reference Manual to learn about member attributes. +* `equal`: Checks if the result of an expression is equal to a given value. +* `notEqual`: Checks if the result of an expression is not equal to a given value. +* `instanceOf`: Checks if the result of an expression has a certain type. +* `like`: Checks if the result of an expression matches some string pattern. `%` (percentage sign) is the placeholder for many characters, `_` (underscore) is the placeholder for only one character. +* `greaterThan`: Checks if the result of an expression is greater than a certain value. +* `greaterEqual`: Checks if the result of an expression is greater than or equal to a certain value. +* `lessThan`: Checks if the result of an expression is less than a certain value. +* `lessEqual`: Checks if the result of an expression is less than or equal to a certain value. +* `between`: Checks if the result of an expression is between two values, inclusively. +* `inPredicate`: Checks if the result of an expression is an element of a certain list. +* `not`: Checks if the result of an expression is false. +* `regex`: Checks if the result of an expression matches some regular expression. -For `memberAdded` and `memberRemoved` events, a `MembershipEvent` object is passed to the listener function. +Hazelcast offers the following ways for distributed query purposes: -After you create the listener object, you can configure your cluster to include the membership listener. You can also add one or more membership listeners. +* Combining Predicates with AND, OR, NOT +* Distributed SQL Query -The following is a membership listener registration by using the `ClusterService.addMembershipListener()` function. +#### 7.7.1.1. Employee Map Query Example + +Assume that you have an `employee` map containing the values of `Employee` objects, as coded below. ```javascript -var membershipListener = { - memberAdded: function (membershipEvent) { - console.log('Member Added: The address is', member.address.toString()); - }, -}; -client.clusterService.addMembershipListener(membershipListener); -``` +function Employee(name, age, active, salary) { + this.name = name; + this.age = age; + this.active = active; + this.salary = salary; +} -The `memberAttributeChanged` has its own type of event named as `MemberAttributeEvent`. When there is an attribute change on the member, this event is fired. +Employee.prototype.getClassId = function () { + return 1; +} -See the following example. +Employee.prototype.getFactoryId = function () { + return 1; +} -```javascript +Employee.prototype.readPortable = function (reader) { + this.name = reader.readUTF(); + this.age = reader.readInt(); + this.active = reader.readBoolean(); + this.salary = reader.readDouble(); +} -var membershipListener = { - memberAttributeChanged: function (memberAttributeEvent) { - console.log('Member Attribute Changed: The address is', memberAttributeEvent.member.address.toString()); - }, -}; -client.clusterService.addMembershipListener(membershipListener); +Employee.prototype.writePortable = function (writer) { + writer.writeUTF(this.name); + writer.writeInt(this.age); + writer.writeBoolean(this.active); + writer.writeDouble(this.salary); +} ``` -#### 7.5.1.2. Distributed Object Listener +Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. -The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: +For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). -* `serviceName`: Service name of the distributed object. -* `objectName`: Name of the distributed object. -* `eventType`: Type of the invoked event. It can be `created` or `destroyed`. +> **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** -The following is an example of adding a `DistributedObjectListener`. +#### 7.7.1.2. Querying by Combining Predicates with AND, OR, NOT + +You can combine predicates by using the `and`, `or` and `not` operators, as shown in the below example. ```javascript -client.addDistributedObjectListener(function (distributedObjectEvent) { - console.log('Distributed object event >>> ', - distributedObjectEvent.serviceName, - distributedObjectEvent.objectName, - distributedObjectEvent.eventType - ); -}).then(function () { - var mapname = 'test'; - // this causes a created event - client.getMap(mapname); - // this causes no event because map was already created - client.getMap(mapname); +var map; +client.getMap('employee').then(function (mp) { + map = mp; + var predicate = Predicates.and(Predicates.equal('active', true), Predicates.lessThan('age', 30)); + return map.valuesWithPredicate(predicate); +}).then(function (employees) { + // Some operations }); ``` -#### 7.5.1.3. Lifecycle Listener +In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than 30. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. -The `LifecycleListener` interface notifies for the following events: +> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast IMDG's distributed map.** -* `starting`: A client is starting. -* `started`: A client has started. -* `shuttingDown`: A client is shutting down. -* `shutdown`: A client’s shutdown has completed. +#### 7.7.1.3. Querying with SQL -The following is an example of the `LifecycleListener` that is added to the `ClientConfig` object and its output. +`SqlPredicate` takes the regular SQL `where` clause. See the following example: ```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.listeners.addLifecycleListener(function (state) { - console.log('Lifecycle Event >>> ' + state); -}); - -Client.newHazelcastClient(clientConfig).then(function (hazelcastClient) { - hazelcastClient.shutdown(); +var map; +client.getMap('employee').then(function (mp) { + map = mp; + return map.valuesWithPredicate(new SqlPredicate('active AND age < 30')); +}).then(function (employees) { + // Some operations }); ``` -**Output:** +##### Supported SQL Syntax -``` -[DefaultLogger] INFO at LifecycleService: HazelcastClient is starting -Lifecycle Event >>> starting -[DefaultLogger] INFO at ConnectionAuthenticator: Connection to 10.216.1.43:5701 authenticated -[DefaultLogger] INFO at ClusterService: Members received. -[ Member { - address: Address { host: '10.216.1.43', port: 5701, type: 4 }, - uuid: '7961eef2-940d-42dc-8036-2a29c5c9942c', - isLiteMember: false, - attributes: {} } ] -[DefaultLogger] INFO at LifecycleService: HazelcastClient is started -Lifecycle Event >>> started -[DefaultLogger] INFO at LifecycleService: HazelcastClient is shuttingDown -Lifecycle Event >>> shuttingDown -[DefaultLogger] INFO at LifecycleService: HazelcastClient is shutdown -Lifecycle Event >>> shutdown -``` +**AND/OR:** ` AND AND …` -### 7.5.2. Listening for Distributed Data Structure Events +- `active AND age > 30` +- `active = false OR age = 45 OR name = 'Joe'` +- `active AND ( age > 20 OR salary < 60000 )` -You can add event listeners to the distributed data structures. +**Equality:** `=, !=, <, ⇐, >, >=` -> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, - some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** +- ` = value` +- `age <= 30` +- `name = 'Joe'` +- `salary != 50000` -#### 7.5.2.1. Map Listener +**BETWEEN:** ` [NOT] BETWEEN AND ` -The Map Listener is used by the Hazelcast `Map`. +- `age BETWEEN 20 AND 33 ( same as age >= 20 AND age ⇐ 33 )` +- `age NOT BETWEEN 30 AND 40 ( same as age < 30 OR age > 40 )` -You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. +**IN:** ` [NOT] IN (val1, val2,…)` -An entry-based event is fired after the operations that affect a specific entry. For example, `IMap.put()`, `IMap.remove()` or `IMap.evict()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. +- `age IN ( 20, 30, 40 )` +- `age NOT IN ( 60, 70 )` +- `active AND ( salary >= 50000 OR ( age NOT BETWEEN 20 AND 30 ) )` +- `age IN ( 20, 30, 40 ) AND salary BETWEEN ( 50000, 80000 )` -See the following example. +**LIKE:** ` [NOT] LIKE 'expression'` -```javascript -var entryEventListener = { - added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry - } -}; -map.addEntryListener(entryEventListener, undefined, true).then(function () { - return map.put('1', 'My new entry'); -}); -``` +The `%` (percentage sign) is the placeholder for multiple characters, an `_` (underscore) is the placeholder for only one character. -A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. +- `name LIKE 'Jo%'` (true for 'Joe', 'Josh', 'Joseph' etc.) +- `name LIKE 'Jo_'` (true for 'Joe'; false for 'Josh') +- `name NOT LIKE 'Jo_'` (true for 'Josh'; false for 'Joe') +- `name LIKE 'J_s%'` (true for 'Josh', 'Joseph'; false 'John', 'Joe') -See the following example. +**ILIKE:** ` [NOT] ILIKE 'expression'` -```javascript -var mapEventListener = { - mapCleared: function (mapEvent) { - console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 3 - } -}; -map.addEntryListener(mapEventListener).then(function () { - return map.put('1', 'Muhammad Ali'); -}).then(function () { - return map.put('2', 'Mike Tyson'); -}).then(function () { - return map.put('3', 'Joe Louis'); -}).then(function () { - return map.clear(); -}); -``` +ILIKE is similar to the LIKE predicate but in a case-insensitive manner. -As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. +- `name ILIKE 'Jo%'` (true for 'Joe', 'joe', 'jOe','Josh','joSH', etc.) +- `name ILIKE 'Jo_'` (true for 'Joe' or 'jOE'; false for 'Josh') -#### 7.5.2.2. Entry Listener +**REGEX:** ` [NOT] REGEX 'expression'` -The Entry Listener is used by the Hazelcast `MultiMap` and `ReplicatedMap`. +- `name REGEX 'abc-.*'` (true for 'abc-123'; false for 'abx-123') -You can listen to map-wide or entry-based events by using the functions in the `EntryListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `EntryListener` interface. +##### Querying Examples with Predicates -An entry-based event is fired after the operations that affect a specific entry. For example, `MultiMap.put()`, `MultiMap.remove()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. +You can use the `__key` attribute to perform a predicated search for the entry keys. See the following example: ```javascript -var entryEventListener = { - added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry - } -}; -return mmp.addEntryListener(entryEventListener, undefined, true).then(function () { - return mmp.put('1', 'My new entry'); +var personMap; +client.getMap('persons').then(function (mp) { + personMap = mp; + return personMap.put('Alice', 35); +}).then(function () { + return personMap.put('Andy', 37); +}).then(function () { + return personMap.put('Bob', 22); +}).then(function () { + var predicate = new Predicates.sql('__key like A%'); + return personMap.valuesWithPredicate(predicate); +}).then(function (startingWithA) { + console.log(startingWithA.get(0)); // 35 }); ``` -A map-wide event is fired as a result of a map-wide operation. For example, `MultiMap.clear()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. +In this example, the code creates a list with the values whose keys start with the letter "A”. -See the following example. +You can use the `this` attribute to perform a predicated search for entry values. See the following example: ```javascript -var mapEventListener = { - mapCleared: function (mapEvent) { - console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 1 - } -}; -mmp.addEntryListener(mapEventListener).then(function () { - return mmp.put('1', 'Muhammad Ali'); +var personMap; +return client.getMap('persons').then(function (mp) { + personMap = mp; + return personMap.put('Alice', 35); }).then(function () { - return mmp.put('1', 'Mike Tyson'); + return personMap.put('Andy', 37); }).then(function () { - return mmp.put('1', 'Joe Louis'); + return personMap.put('Bob', 22); }).then(function () { - return mmp.clear(); + var predicate = new Predicates.greaterEqual('this', 27); + return personMap.valuesWithPredicate(predicate); +}).then(function (olderThan27) { + console.log(olderThan27.get(0), olderThan27.get(1)); // 35 37 }); ``` -Note that all functions in the `EntryListener` interface is not supported by MultiMap and Replicated Map. See the following headings to see supported listener functions for each data structure. - -**Entry Listener Functions Supported by MultiMap** - -- `added` -- `removed` -- `mapCleared` - -**Entry Listener Functions Supported by Replicated Map** - -- `added` -- `removed` -- `updated` -- `evicted` -- `mapCleared` - -As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. - -#### 7.5.2.3. Item Listener +In this example, the code creates a list with the values greater than or equal to "27". -The Item Listener is used by the Hazelcast `Queue`, `Set` and `List`. +#### 7.7.1.4. Querying with JSON Strings -You can listen to item events by implementing the functions in the `ItemListener` interface including `itemAdded` and `itemRemoved`. These functions are invoked when an item is added or removed. +You can query the JSON strings stored inside your Hazelcast clusters. To query a JSON string, you can +use `HazelcastJsonValue` or JavaScript objects. -The following is an example of item listener object and its registration to the `Set`. It also applies to `Queue` and `List`. +`HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. +Then, it is possible to query these objects using the query methods explained in this section. ```javascript -var itemListener = { - itemAdded: function (itemEvent) { - console.log('Item Added:', itemEvent.item); // Item Added: Item1 - }, - itemRemoved: function (itemEvent) { - console.log('Item Removed:', itemEvent.item); // Item Removed: Item1 - } -}; -return set.addItemListener(itemListener, true).then(function () { - return set.add('Item1'); +var personMap; +var person1 = '{ "name": "John", "age": 35 }'; +var person2 = '{ "name": "Jane", "age": 24 }'; +var person3 = '{ "name": "Trey", "age": 17 }'; + +return hz.getMap('personsMap').then(function (map) { + personMap = map; + return personMap.put(1, new HazelcastJsonValue(person1)); }).then(function () { - return set.remove('Item1'); + return personMap.put(2, new HazelcastJsonValue(person2)); +}).then(function () { + return personMap.put(3, new HazelcastJsonValue(person3)); +}).then(function () { + return personMap.valuesWithPredicate(Predicates.lessThan('age', 21)); +}).then(function (personsUnder21) { + personsUnder21.toArray().forEach(function (person) { + console.log(person); + }); }); ``` -As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the item event contains the item value. - -#### 7.5.2.4. Message Listener - -The Message Listener is used by the Hazelcast `Reliable Topic`. - -You can listen to message events. To listen to these events, you need to implement the `MessageListener` function to which a `Message` object is passed. +When running the queries, Hazelcast treats values extracted from the JSON documents as Java types so they can be compared with the query attribute. +JSON specification defines five primitive types to be used in the JSON documents: `number`, `string`, `true`, `false` and `null`. +The `string`, `true`/`false` and `null` types are treated as `String`, `boolean` and `null`, respectively. `Number` values treated as `long`s if they can be represented by a `long`. +Otherwise, `number`s are treated as `double`s. -See the following example. +It is possible to query nested attributes and arrays in JSON documents. The query syntax is the same as querying other Hazelcast objects using the `Predicate`s. ```javascript -topic.addMessageListener(function (message) { - console.log(message.messageObject); -}); +var departmentsMap; +var departments = [ + { + departmentId: 1, + room: 'alpha', + people: [ + { + name: 'Peter', + age: 26, + salary: 50000 -var movie = { - title: 'The Prestige', - year: '2006', - runtime: '130 min', - director: 'Christopher Nolan', - imdbRating: '8.5' -} -topic.publish(movie); + }, + { + name: 'Jonah', + age: 50, + salary: 140000 + } + ] + }, + { + departmentId: 2, + room: 'beta', + people: [ + { + name: 'Terry', + age: 44, + salary: 100000 + } + ] + } +]; +return hz.getMap('departmentsMap').then(function (map) { + departmentsMap = map; + return departmentsMap.putAll(departments.map(function (department, index) { + return [index, department]; + })); +}).then(function () { + // The following query finds all the departments that have a person named "Peter" working in them + return departmentsMap.valuesWithPredicate(Predicates.equal('people[any].name', 'Peter')) +}).then(function (departmentWithPeter) { + departmentWithPeter.toArray().forEach(function (department) { + console.log(department); + }); +}); ``` -## 7.6. Distributed Computing - -This chapter explains how you can use Hazelcast IMDG's entry processor implementation in the Node.js client. - -### 7.6.1. Using EntryProcessor - -Hazelcast supports entry processing. An entry processor is a function that executes your code on a map entry in an atomic way. - -An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys -- executing `IMap.get(key)`, mutating the value and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. - -If you are doing the process described above, you should consider using entry processors. An entry processor executes a read and updates upon the member where the data resides. This eliminates the costly network hops described above. - -> **NOTE: Entry processor is meant to process a single entry per call. Processing multiple entries and data structures in an entry processor is not supported as it may result in deadlocks on the server side.** - -Hazelcast sends the entry processor to each cluster member and these members apply it to the map entries. Therefore, if you add more members, your processing completes faster. - -#### Processing Entries +`HazelcastJsonValue` is a lightweight wrapper around your JSON strings. It is used merely as a way to indicate that the contained string should be treated as a valid JSON value. +Hazelcast does not check the validity of JSON strings put into to maps. Putting an invalid JSON string in a map is permissible. +However, in that case whether such an entry is going to be returned or not from a query is not defined. -The `IMap` interface provides the following functions for entry processing: +##### Querying with HazelcastJsonValue Objects -* `executeOnKey` processes an entry mapped by a key. -* `executeOnKeys` processes entries mapped by a list of keys. -* `executeOnEntries` can process all entries in a map with a defined predicate. Predicate is optional. +If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization`. -In the Node.js client, an `EntryProcessor` should be `IdentifiedDataSerializable` or `Portable` because the server should be able to deserialize it to process. +This means that, you can run queries over your JavaScript objects if they are serialized as JSON strings. However, when the results +of your query are ready, they are parsed from JSON strings and returned to you as JavaScript objects. -The following is an example for `EntryProcessor` which is `IdentifiedDataSerializable`. +For the purposes of your application, you may want to get rid of the parsing and just work with the raw JSON strings using `HazelcastJsonValue` objects. Then, you can configure your client to do so +as described in the [JSON Serialization](#45-json-serialization) section. ```javascript -function IdentifiedEntryProcessor(value) { - this.value = value; -} - -IdentifiedEntryProcessor.prototype.readData = function (inp) { - this.value = inp.readUTF(); -}; +var config = new Config(); +config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; -IdentifiedEntryProcessor.prototype.writeData = function (outp) { - outp.writeUTF(this.value); -}; +Client.newHazelcastClient(config).then(function (hz) { + var moviesMap; + var movies = [ + [1, new HazelcastJsonValue('{ "name": "The Dark Knight", "rating": 9.1 }')], + [2, new HazelcastJsonValue('{ "name": "Inception", "rating": 8.8 }')], + [3, new HazelcastJsonValue('{ "name": "The Prestige", "rating": 8.5 }')] + ]; + return hz.getMap('moviesMap').then(function (map) { + moviesMap = map; + return moviesMap.putAll(movies); + }).then(function () { + return moviesMap.valuesWithPredicate(Predicates.greaterEqual('rating', 8.8)); + }).then(function (highRatedMovies) { + highRatedMovies.toArray().forEach(function (movie) { + console.log(movie.toString()); + }); + return hz.shutdown(); + }); +}); +``` -IdentifiedEntryProcessor.prototype.getFactoryId = function () { - return 5; -}; +##### Metadata Creation for JSON Querying -IdentifiedEntryProcessor.prototype.getClassId = function () { - return 1; -}; -``` +Hazelcast stores a metadata object per JSON serialized object stored. This metadata object is created every time a JSON serialized object is put into an `IMap`. +Metadata is later used to speed up the query operations. Metadata creation is on by default. Depending on your application’s needs, you may want to turn off the metadata creation to decrease the put latency and increase the throughput. -Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). +You can configure this using `metadata-policy` element for the map configuration on the member side as follows: -The following is the Java equivalent of the entry processor in Node.js client given above: +```xml + + ... + + + OFF + + ... + +``` -```java -import com.hazelcast.map.AbstractEntryProcessor; -import com.hazelcast.nio.ObjectDataInput; -import com.hazelcast.nio.ObjectDataOutput; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; -import java.io.IOException; -import java.util.Map; +#### 7.7.1.5. Filtering with Paging Predicates -public class IdentifiedEntryProcessor extends AbstractEntryProcessor implements IdentifiedDataSerializable { - static final int CLASS_ID = 1; - private String value; +The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. - public IdentifiedEntryProcessor() { - } +```javascript +var map; +hazelcastClient.getMap('students').then(function (mp) { + map = mp; - @Override - public int getFactoryId() { - return IdentifiedFactory.FACTORY_ID; - } + var greaterEqual = Predicates.greaterEqual('age', 18); + var pagingPredicate = Predicates.paging(greaterEqual, 5); - @Override - public int getId() { - return CLASS_ID; - } +// Set page to retrieve third page + pagingPredicate.setPage(3); - @Override - public void writeData(ObjectDataOutput out) throws IOException { - out.writeUTF(value); - } + // Retrieve third page + return map.valuesWithPredicate(pagingPredicate) +}).then(function (values) { + // Some operations +... - @Override - public void readData(ObjectDataInput in) throws IOException { - value = in.readUTF(); - } + // Set up next page + pagingPredicate.nextPage(); - @Override - public Object process(Map.Entry entry) { - entry.setValue(value); - return value; - } -} + // Retrieve next page + return map.valuesWithPredicate(pagingPredicate); +}).then(function (values) { + // Some operations +}); ``` -You can implement the above processor’s factory as follows: +If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). -```java -import com.hazelcast.nio.serialization.DataSerializableFactory; -import com.hazelcast.nio.serialization.IdentifiedDataSerializable; +Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. -public class IdentifiedFactory implements DataSerializableFactory { - public static final int FACTORY_ID = 5; +### 7.7.2. Fast-Aggregations - @Override - public IdentifiedDataSerializable create(int typeId) { - if (typeId == IdentifiedEntryProcessor.CLASS_ID) { - return new IdentifiedEntryProcessor(); - } - return null; - } -} -``` +Fast-Aggregations feature provides some aggregate functions, such as `sum`, `average`, `max`, and `min`, on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. -Now you need to configure the `hazelcast.xml` to add your factory as shown below. +The `Aggregators` object provides a wide variety of built-in aggregators. The full list is presented below: -```xml - - - - - IdentifiedFactory - - - - -``` +- `count` +- `doubleAvg` +- `doubleSum` +- `numberAvg` +- `fixedPointSum` +- `floatingPointSum` +- `max` +- `min` +- `integerAvg` +- `integerSum` +- `longAvg` +- `longSum` -The code that runs on the entries is implemented in Java on the server side. The client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, see the [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. +You can use these aggregators with the `IMap.aggregate()` and `IMap.aggregateWithPredicate()` functions. -After the above implementations and configuration are done and you start the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. See the following example. +See the following example. ```javascript var map; -hazelcastClient.getMap('my-distributed-map').then(function (mp) { +hz.getMap('employees').then(function (mp) { map = mp; - return map.put('key', 'not-processed'); -}).then(function () { - return map.executeOnKey('key', new IdentifiedEntryProcessor('processed')); + return map.putAll([ + ['John Stiles', 23], + ['Judy Doe', 29], + ['Richard Miles', 38], + ]); }).then(function () { - return map.get('key'); -}).then(function (value) { - console.log(value); // processed + return map.aggregate(Aggregators.count()); +}).then(function (count) { + console.log('There are ' + count + ' employees.'); // There are 3 employees + return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); +}).then(function (count) { + console.log('There are ' + count + ' employees older than 25.'); // There are 2 employees older than 25. + return map.aggregate(Aggregators.numberAvg()); +}).then(function (avgAge) { + console.log('Average age is ' + avgAge); // Average age is 30 }); ``` -## 7.7. Distributed Query - -Hazelcast partitions your data and spreads it across cluster of members. You can iterate over the map entries and look for certain entries (specified by predicates) you are interested in. However, this is not very efficient because you will have to bring the entire entry set and iterate locally. Instead, Hazelcast allows you to run distributed queries on your distributed map. - -### 7.7.1. How Distributed Query Works - -1. The requested predicate is sent to each member in the cluster. -2. Each member looks at its own local entries and filters them according to the predicate. At this stage, key-value pairs of the entries are deserialized and then passed to the predicate. -3. The predicate requester merges all the results coming from each member into a single set. - -Distributed query is highly scalable. If you add new members to the cluster, the partition count for each member is reduced and thus the time spent by each member on iterating its entries is reduced. In addition, the pool of partition threads evaluates the entries concurrently in each member, and the network traffic is also reduced since only filtered data is sent to the requester. - -**Predicates Object Operators** +## 7.8. Performance -The `Predicates` object offered by the Node.js client includes many operators for your query requirements. Some of them are described below. +### 7.8.1. Partition Aware -* `equal`: Checks if the result of an expression is equal to a given value. -* `notEqual`: Checks if the result of an expression is not equal to a given value. -* `instanceOf`: Checks if the result of an expression has a certain type. -* `like`: Checks if the result of an expression matches some string pattern. `%` (percentage sign) is the placeholder for many characters, `_` (underscore) is the placeholder for only one character. -* `greaterThan`: Checks if the result of an expression is greater than a certain value. -* `greaterEqual`: Checks if the result of an expression is greater than or equal to a certain value. -* `lessThan`: Checks if the result of an expression is less than a certain value. -* `lessEqual`: Checks if the result of an expression is less than or equal to a certain value. -* `between`: Checks if the result of an expression is between two values, inclusively. -* `inPredicate`: Checks if the result of an expression is an element of a certain list. -* `not`: Checks if the result of an expression is false. -* `regex`: Checks if the result of an expression matches some regular expression. +Partition Aware ensures that the related entries exist on the same member. If the related data is on the same member, operations can be executed without the cost of extra network calls and extra wire data, and this improves the performance. This feature is provided by using the same partition keys for related data. -Hazelcast offers the following ways for distributed query purposes: +Hazelcast has a standard way of finding out which member owns/manages each key object. The following operations are routed to the same member, since all of them are operating based on the same key `'key1'`. -* Combining Predicates with AND, OR, NOT -* Distributed SQL Query +```javascript +Client.newHazelcastClient().then(function (client) { + hazelcastClient = client; + return hazelcastClient.getMap('mapA') +}).then(function (mp) { + mapA = mp; + return hazelcastClient.getMap('mapB'); +}).then(function (mp) { + mapB = mp; + return hazelcastClient.getMap('mapC'); +}).then(function (mp) { + mapC = mp; -#### 7.7.1.1. Employee Map Query Example + // Since map names are different, operation is manipulating + // different entries, but the operation takes place on the + // same member since the keys ('key1') are the same + return mapA.put('key1', 'value1'); +}).then(function () { + return mapB.get('key1'); +}).then(function (res) { + return mapC.remove('key1'); +}).then(function () { + // Lock operation is still execute on the same member + // of the cluster since the key ("key1") is same + return hazelcastClient.getLock('key1'); +}).then(function (l) { + lock = l; + return lock.lock(); +}); +``` -Assume that you have an `employee` map containing the values of `Employee` objects, as coded below. +When the keys are the same, entries are stored on the same member. However, we sometimes want to have the related entries stored on the same member, such as a customer and their order entries. We would have a customers map with `customerId` as the key and an orders map with `orderId` as the key. Since `customerId` and `orderId` are different keys, a customer and their orders may fall into different members in your cluster. So how can we have them stored on the same member? We create an affinity between the customer and orders. If we make them part of the same partition then these entries will be co-located. We achieve this by making `OrderKey`s `PartitionAware`. ```javascript -function Employee(name, age, active, salary) { - this.name = name; - this.age = age; - this.active = active; - this.salary = salary; +function OrderKey(orderId, customerId) { + this.orderId = orderId; + this.customerId = customerId; } -Employee.prototype.getClassId = function () { - return 1; -} +OrderKey.prototype.getPartitionKey = function () { + return this.customerId; +}; +``` -Employee.prototype.getFactoryId = function () { - return 1; -} +Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. -Employee.prototype.readPortable = function (reader) { - this.name = reader.readUTF(); - this.age = reader.readInt(); - this.active = reader.readBoolean(); - this.salary = reader.readDouble(); -} +```javascript +var hazelcastClient; +var mapCustomers; +var mapOrders; -Employee.prototype.writePortable = function (writer) { - writer.writeUTF(this.name); - writer.writeInt(this.age); - writer.writeBoolean(this.active); - writer.writeDouble(this.salary); -} +Client.newHazelcastClient().then(function (client) { + hazelcastClient = client; + return hazelcastClient.getMap('customers') +}).then(function (mp) { + mapCustomers = mp; + return hazelcastClient.getMap('orders'); +}).then(function (mp) { + mapOrders = mp; + + // Create the customer entry with customer id = 1 + return mapCustomers.put(1, customer); +}).then(function () { + // Now create the orders for this customer + return mapOrders.putAll([ + [new OrderKey(21, 1), order], + [new OrderKey(22, 1), order], + [new OrderKey(23, 1), order] + ]); +}); ``` -Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. +For more details, see the [PartitionAware section](https://docs.hazelcast.org/docs/latest/manual/html-single/#partitionaware) in the Hazelcast IMDG Reference Manual. -For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). +### 7.8.2. Near Cache -> **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** +Map entries in Hazelcast are partitioned across the cluster members. Hazelcast clients do not have local data at all. Suppose you read the key `k` a number of times from a Hazelcast client and `k` is owned by a member in your cluster. Then each `map.get(k)` will be a remote operation, which creates a lot of network trips. If you have a map that is mostly read, then you should consider creating a local Near Cache, so that reads are sped up and less network traffic is created. -#### 7.7.1.2. Querying by Combining Predicates with AND, OR, NOT +These benefits do not come for free, please consider the following trade-offs: -You can combine predicates by using the `and`, `or` and `not` operators, as shown in the below example. +- If invalidation is enabled and entries are updated frequently, then invalidations will be costly. -```javascript -var map; -client.getMap('employee').then(function (mp) { - map = mp; - var predicate = Predicates.and(Predicates.equal('active', true), Predicates.lessThan('age', 30)); - return map.valuesWithPredicate(predicate); -}).then(function (employees) { - // some operations -}); -``` +- Near Cache breaks the strong consistency guarantees; you might be reading stale data. -In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than 30. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. +- Clients with a Near Cache will have to hold the extra cached data, which increases memory consumption. -> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast IMDG's distributed map.** +Near Cache is highly recommended for maps that are mostly read. -#### 7.7.1.3. Querying with SQL +#### 7.8.2.1. Configuring Near Cache -`SqlPredicate` takes the regular SQL `where` clause. See the following example: +The following snippets show how a Near Cache is configured in the Node.js client, presenting all available values for each element: -```javascript -var map; -client.getMap('employee').then(function (mp) { - map = mp; - return map.valuesWithPredicate(new SqlPredicate('active AND age < 30')); -}).then(function (employees) { - // some operations -}); +**Declarative Configuration:** + +``` +{ + "nearCaches": [ + { + "name": "mostlyReadMap", + "invalidateOnChange": (false|true), + "timeToLiveSeconds": (0..Number.MAX_SAFE_INTEGER), + "maxIdleSeconds": (0..Number.MAX_SAFE_INTEGER), + "inMemoryFormat": "(object|binary)", + "evictionPolicy": "lru|lfu|random|none", + "evictionMaxSize": (0..Number.MAX_SAFE_INTEGER), + "evictionSamplingCount": (0..Number.MAX_SAFE_INTEGER), + "evictionSamplingPoolSize": (0..Number.MAX_SAFE_INTEGER), + } + ] +} ``` -##### Supported SQL Syntax +**Programmatic Configuration:** -**AND/OR:** ` AND AND …` +```javascript +var nearCacheConfig = new Config.NearCacheConfig(); +nearCacheConfig.name = 'mostlyReadMap'; +nearCacheConfig.invalidateOnChange = (false|true); +nearCacheConfig.timeToLiveSeconds = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.maxIdleSeconds = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.inMemoryFormat= (InMemoryFormat.OBJECT|InMemoryFormat.BINARY); +nearCacheConfig.evictionPolicy = (EvictionPolicy.LRU|EvictionPolicy.LFU|EvictionPolicy.RANDOM|EvictionPolicy.NONE); +nearCacheConfig.evictionMaxSize = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.evictionSamplingCount = (0..Number.MAX_SAFE_INTEGER); +nearCacheConfig.evictionSamplingPoolSize = (0..Number.MAX_SAFE_INTEGER); -- `active AND age > 30` -- `active = false OR age = 45 OR name = 'Joe'` -- `active AND ( age > 20 OR salary < 60000 )` +cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +``` -**Equality:** `=, !=, <, ⇐, >, >=` +Following are the descriptions of all configuration elements: -- ` = value` -- `age <= 30` -- `name = 'Joe'` -- `salary != 50000` +- `inMemoryFormat`: Specifies in which format data will be stored in your Near Cache. Note that a map’s in-memory format can be different from that of its Near Cache. Available values are as follows: + - `BINARY`: Data will be stored in serialized binary format (default value). + - `OBJECT`: Data will be stored in deserialized form. -**BETWEEN:** ` [NOT] BETWEEN AND ` +- `invalidateOnChange`: Specifies whether the cached entries are evicted when the entries are updated or removed in members. Its default value is true. -- `age BETWEEN 20 AND 33 ( same as age >= 20 AND age ⇐ 33 )` -- `age NOT BETWEEN 30 AND 40 ( same as age < 30 OR age > 40 )` +- `timeToLiveSeconds`: Maximum number of seconds for each entry to stay in the Near Cache. Entries that are older than this period are automatically evicted from the Near Cache. Regardless of the eviction policy used, `timeToLiveSeconds` still applies. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. -**IN:** ` [NOT] IN (val1, val2,…)` +- `maxIdleSeconds`: Maximum number of seconds each entry can stay in the Near Cache as untouched (not read). Entries that are not read more than this period are removed from the Near Cache. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. -- `age IN ( 20, 30, 40 )` -- `age NOT IN ( 60, 70 )` -- `active AND ( salary >= 50000 OR ( age NOT BETWEEN 20 AND 30 ) )` -- `age IN ( 20, 30, 40 ) AND salary BETWEEN ( 50000, 80000 )` +- `evictionPolicy`: Eviction policy configuration. Available values are as follows: + - `LRU`: Least Recently Used (default value). + - `LFU`: Least Frequently Used. + - `NONE`: No items are evicted and the `evictionMaxSize` property is ignored. You still can combine it with `timeToLiveSeconds` and `maxIdleSeconds` to evict items from the Near Cache. + - `RANDOM`: A random item is evicted. -**LIKE:** ` [NOT] LIKE 'expression'` +- `evictionMaxSize`: Maximum number of entries kept in the memory before eviction kicks in. +- `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. +- `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. -The `%` (percentage sign) is the placeholder for multiple characters, an `_` (underscore) is the placeholder for only one character. +#### 7.8.2.2. Near Cache Example for Map -- `name LIKE 'Jo%'` (true for 'Joe', 'Josh', 'Joseph' etc.) -- `name LIKE 'Jo_'` (true for 'Joe'; false for 'Josh') -- `name NOT LIKE 'Jo_'` (true for 'Josh'; false for 'Joe') -- `name LIKE 'J_s%'` (true for 'Josh', 'Joseph'; false 'John', 'Joe') +The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. -**ILIKE:** ` [NOT] ILIKE 'expression'` +**Declarative Configuration:** -ILIKE is similar to the LIKE predicate but in a case-insensitive manner. +``` +{ + "nearCaches": [ + { + "name": "mostlyReadMap", + "inMemoryFormat": "object", + "invalidateOnChange": true, + "evictionPolicy": "lru", + "evictionMaxSize": 5000, + } + ] +} +``` -- `name ILIKE 'Jo%'` (true for 'Joe', 'joe', 'jOe','Josh','joSH', etc.) -- `name ILIKE 'Jo_'` (true for 'Joe' or 'jOE'; false for 'Josh') +**Programmatic Configuration:** -**REGEX:** ` [NOT] REGEX 'expression'` +```javascript +var nearCacheConfig = new Config.NearCacheConfig(); +nearCacheConfig.name = "mostlyReadMap"; +nearCacheConfig.inMemoryFormat= InMemoryFormat.OBJECT; +nearCacheConfig.invalidateOnChange = true; +nearCacheConfig.evictionPolicy = EvictionPolicy.LRU; +nearCacheConfig.evictionMaxSize = 5000; -- `name REGEX 'abc-.*'` (true for 'abc-123'; false for 'abx-123') +cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +``` -##### Querying Examples with Predicates +#### 7.8.2.3. Near Cache Eviction -You can use the `__key` attribute to perform a predicated search for the entry keys. See the following example: +In the scope of Near Cache, eviction means evicting (clearing) the entries selected according to the given `evictionPolicy` when the specified `evictionMaxSize` has been reached. -```javascript -var personMap; -client.getMap('persons').then(function (mp) { - personMap = mp; - return personMap.put('Alice', 35); -}).then(function () { - return personMap.put('Andy', 37); -}).then(function () { - return personMap.put('Bob', 22); -}).then(function () { - var predicate = new Predicates.sql('__key like A%'); - return personMap.valuesWithPredicate(predicate); -}).then(function (startingWithA) { - console.log(startingWithA.get(0)); // 35 -}); -``` +The `evictionMaxSize` defines the entry count when the Near Cache is full and determines whether the eviction should be triggered. -In this example, the code creates a list with the values whose keys start with the letter "A”. +Once the eviction is triggered the configured `evictionPolicy` determines which, if any, entries must be evicted. -You can use the `this` attribute to perform a predicated search for entry values. See the following example: +#### 7.8.2.4. Near Cache Expiration -```javascript -var personMap; -return client.getMap('persons').then(function (mp) { - personMap = mp; - return personMap.put('Alice', 35); -}).then(function () { - return personMap.put('Andy', 37); -}).then(function () { - return personMap.put('Bob', 22); -}).then(function () { - var predicate = new Predicates.greaterEqual('this', 27); - return personMap.valuesWithPredicate(predicate); -}).then(function (olderThan27) { - console.log(olderThan27.get(0), olderThan27.get(1)); // 35 37 -}); -``` +Expiration means the eviction of expired records. A record is expired: -In this example, the code creates a list with the values greater than or equal to "27". +- if it is not touched (accessed/read) for `maxIdleSeconds` + +- `timeToLiveSeconds` passed since it is put to Near Cache -#### 7.7.1.4. Querying with JSON Strings +The actual expiration is performed when a record is accessed: it is checked if the record is expired or not. If it is expired, it is evicted and `undefined` is returned as the value to the caller. -You can query the JSON strings stored inside your Hazelcast clusters. To query a JSON string, you can -use `HazelcastJsonValue` or JavaScript objects. -`HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. -Then, it is possible to query these objects using the query methods explained in this section. +#### 7.8.2.5. Near Cache Invalidation -```javascript -var personMap; -var person1 = '{ "name": "John", "age": 35 }'; -var person2 = '{ "name": "Jane", "age": 24 }'; -var person3 = '{ "name": "Trey", "age": 17 }'; +Invalidation is the process of removing an entry from the Near Cache when its value is updated or it is removed from the original map (to prevent stale reads). See the [Near Cache Invalidation section](https://docs.hazelcast.org/docs/latest/manual/html-single/#near-cache-invalidation) in the Hazelcast IMDG Reference Manual. -return hz.getMap('personsMap').then(function (map) { - personMap = map; - return personMap.put(1, new HazelcastJsonValue(person1)); -}).then(function () { - return personMap.put(2, new HazelcastJsonValue(person2)); -}).then(function () { - return personMap.put(3, new HazelcastJsonValue(person3)); -}).then(function () { - return personMap.valuesWithPredicate(Predicates.lessThan('age', 21)); -}).then(function (personsUnder21) { - personsUnder21.toArray().forEach(function (person) { - console.log(person); - }); -}); -``` +#### 7.8.2.6. Near Cache Eventual Consistency -When running the queries, Hazelcast treats values extracted from the JSON documents as Java types so they can be compared with the query attribute. -JSON specification defines five primitive types to be used in the JSON documents: `number`, `string`, `true`, `false` and `null`. -The `string`, `true`/`false` and `null` types are treated as `String`, `boolean` and `null`, respectively. `Number` values treated as `long`s if they can be represented by a `long`. -Otherwise, `number`s are treated as `double`s. +Near Caches are invalidated by invalidation events. Invalidation events can be lost due to the fire-and-forget fashion of eventing system. If an event is lost, reads from Near Cache can indefinitely be stale. -It is possible to query nested attributes and arrays in JSON documents. The query syntax is the same as querying other Hazelcast objects using the `Predicate`s. +To solve this problem, Hazelcast provides eventually consistent behavior for Map Near Caches by detecting invalidation losses. After detection of an invalidation loss, stale data will be made unreachable and Near Cache’s `get` calls to that data will be directed to underlying Map to fetch the fresh data. -```javascript -var departmentsMap; -var departments = [ - { - departmentId: 1, - room: 'alpha', - people: [ - { - name: 'Peter', - age: 26, - salary: 50000 +You can configure eventual consistency with the `ClientConfig.properties` below: - }, - { - name: 'Jonah', - age: 50, - salary: 140000 - } - ] - }, - { - departmentId: 2, - room: 'beta', - people: [ - { - name: 'Terry', - age: 44, - salary: 100000 - } - ] - } -]; -return hz.getMap('departmentsMap').then(function (map) { - departmentsMap = map; - return departmentsMap.putAll(departments.map(function (department, index) { - return [index, department]; - })); -}).then(function () { - // The following query finds all the departments that have a person named "Peter" working in them. - return departmentsMap.valuesWithPredicate(Predicates.equal('people[any].name', 'Peter')) -}).then(function (departmentWithPeter) { - departmentWithPeter.toArray().forEach(function (department) { - console.log(department); - }); -}); -``` +- `hazelcast.invalidation.max.tolerated.miss.count`: Default value is `10`. If missed invalidation count is bigger than this value, relevant cached data will be made unreachable. -`HazelcastJsonValue` is a lightweight wrapper around your JSON strings. It is used merely as a way to indicate that the contained string should be treated as a valid JSON value. -Hazelcast does not check the validity of JSON strings put into to maps. Putting an invalid JSON string in a map is permissible. -However, in that case whether such an entry is going to be returned or not from a query is not defined. +- `hazelcast.invalidation.reconciliation.interval.seconds`: Default value is `60` seconds. This is a periodic task that scans cluster members periodically to compare generated invalidation events with the received ones from the client Near Cache. -##### Querying with HazelcastJsonValue Objects +### 7.8.3. Automated Pipelining -If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization`. +Hazelcast Node.js client performs automated pipelining of operations. It means that the library pushes all operations into an internal queue and tries to send them in batches. This reduces the count of executed `Socket.write()` calls and significantly improves throughtput for read operations. -This means that, you can run queries over your JavaScript objects if they are serialized as JSON strings. However, when the results -of your query are ready, they are parsed from JSON strings and returned to you as JavaScript objects. +You can configure automated operation pipelining with the `ClientConfig.properties` below: -For the purposes of your application, you may want to get rid of the parsing and just work with the raw JSON strings using `HazelcastJsonValue` objects. Then, you can configure your client to do so -as described in the [JSON Serialization](#45-json-serialization) section. +- `hazelcast.client.autopipelining.enabled`: Default value is `true`. Turns automated pipelining feature on/off. If your application does only writes operations, like `IMap.set()`, you can try disabling automated pipelining to get a slightly better throughtput. -```javascript -var config = new Config(); -config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; +- `hazelcast.client.autopipelining.threshold.bytes`: Default value is `8192` bytes. This is the coalescing threshold for the internal queue used by automated pipelining. Once the total size of operation payloads taken from the queue reaches this value during batch preparation, these operations are written to the socket. Notice that automated pipelining will still send operations if their total size is smaller than the threshold and there are no more operations in the internal queue. -Client.newHazelcastClient(config).then(function (hz) { - var moviesMap; - var movies = [ - [1, new HazelcastJsonValue('{ "name": "The Dark Knight", "rating": 9.1 }')], - [2, new HazelcastJsonValue('{ "name": "Inception", "rating": 8.8 }')], - [3, new HazelcastJsonValue('{ "name": "The Prestige", "rating": 8.5 }')] - ]; - return hz.getMap('moviesMap').then(function (map) { - moviesMap = map; - return moviesMap.putAll(movies); - }).then(function () { - return moviesMap.valuesWithPredicate(Predicates.greaterEqual('rating', 8.8)); - }).then(function (highRatedMovies) { - highRatedMovies.toArray().forEach(function (movie) { - console.log(movie.toString()); - }); - return hz.shutdown(); - }); -}); -``` +## 7.9. Monitoring and Logging -##### Metadata Creation for JSON Querying +### 7.9.1. Enabling Client Statistics -Hazelcast stores a metadata object per JSON serialized object stored. This metadata object is created every time a JSON serialized object is put into an `IMap`. -Metadata is later used to speed up the query operations. Metadata creation is on by default. Depending on your application’s needs, you may want to turn off the metadata creation to decrease the put latency and increase the throughput. +You can monitor your clients using Hazelcast Management Center. -You can configure this using `metadata-policy` element for the map configuration on the member side as follows: +As a prerequisite, you need to enable the client statistics before starting your clients. This can be done by setting the `hazelcast.client.statistics.enabled` system property to `true` on the **member** as the following: ```xml ... - - - OFF - + + true + ... ``` -#### 7.7.1.5. Filtering with Paging Predicates +Also, you need to enable the client statistics in the Node.js client. There are two properties related to client statistics: -The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. +- `hazelcast.client.statistics.enabled`: If set to `true`, it enables collecting the client statistics and sending them to the cluster. When it is `true` you can monitor the clients that are connected to your Hazelcast cluster, using Hazelcast Management Center. Its default value is `false`. + +- `hazelcast.client.statistics.period.seconds`: Period in seconds the client statistics are collected and sent to the cluster. Its default value is `3`. + +You can enable client statistics and set a non-default period in seconds as follows: + +**Declarative Configuration:** + +```json +{ + "properties": { + "hazelcast.client.statistics.enabled": true, + "hazelcast.client.statistics.period.seconds": 4 + } +} +``` + +**Programmatic Configuration:** ```javascript -var map; -hazelcastClient.getMap('students').then(function (mp) { - map = mp; +var config = new Config.ClientConfig(); +config.properties['hazelcast.client.statistics.enabled'] = true; +config.properties['hazelcast.client.statistics.period.seconds'] = 4; +``` - var greaterEqual = Predicates.greaterEqual('age', 18); - var pagingPredicate = Predicates.paging(greaterEqual, 5); +After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. -// Set page to retrieve third page - pagingPredicate.setPage(3); +### 7.9.2. Logging Configuration - // Retrieve third page - return map.valuesWithPredicate(pagingPredicate) -}).then(function (values) { - // some operations -... + By default, Hazelcast Node.js client uses a default logger which logs to the `stdout` with the `INFO` log level. You can change the log level using the `'hazelcast.logging.level'` property of the `ClientConfig.properties`. - // Set up next page - pagingPredicate.nextPage(); +Below is an example of the logging configuration with the `OFF` log level which disables logging. - // Retrieve next page - return map.valuesWithPredicate(pagingPredicate); -}).then(function (values) { - // some operations -}); +```javascript +cfg.properties['hazelcast.logging.level'] = LogLevel.OFF; ``` -If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). + You can also implement a custom logger depending on your needs. Your custom logger must have `log`, `error`, `warn`, `info`, `debug`, `trace` methods. After implementing it, you can use your custom logger using the `customLogger` property of `ClientConfig` -Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. +See the following for a custom logger example. -### 7.7.2. Fast-Aggregations +```javascript +var winstonAdapter = { + logger: new (winston.Logger)({ + transports: [ + new (winston.transports.Console)() + ] + }), -Fast-Aggregations feature provides some aggregate functions, such as `sum`, `average`, `max`, and `min`, on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. + levels: [ + 'error', + 'warn', + 'info', + 'debug', + 'silly' + ], -The `Aggregators` object provides a wide variety of built-in aggregators. The full list is presented below: + log: function (level, objectName, message, furtherInfo) { + this.logger.log(this.levels[level], objectName + ': ' + message, furtherInfo); + }, -- `count` -- `doubleAvg` -- `doubleSum` -- `numberAvg` -- `fixedPointSum` -- `floatingPointSum` -- `max` -- `min` -- `integerAvg` -- `integerSum` -- `longAvg` -- `longSum` + error: function (objectName, message, furtherInfo) { + this.log(LogLevel.ERROR, objectName, message, furtherInfo); + }, -You can use these aggregators with the `IMap.aggregate()` and `IMap.aggregateWithPredicate()` functions. + warn: function (objectName, message, furtherInfo) { + this.log(LogLevel.WARN, objectName, message, furtherInfo); + }, -See the following example. + info: function (objectName, message, furtherInfo) { + this.log(LogLevel.INFO, objectName, message, furtherInfo); + }, -```javascript -var map; -hz.getMap('employees').then(function (mp) { - map = mp; - return map.putAll([ - ['John Stiles', 23], - ['Judy Doe', 29], - ['Richard Miles', 38], - ]); -}).then(function () { - return map.aggregate(Aggregators.count()); -}).then(function (count) { - console.log('There are ' + count + ' employees.'); // There are 3 employees. - return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); -}).then(function (count) { - console.log('There are ' + count + ' employees older than 25.'); // There are 2 employees older than 25. - return map.aggregate(Aggregators.numberAvg()); -}).then(function (avgAge) { - console.log('Average age is ' + avgAge); // Average age is 30 -}); + debug: function (objectName, message, furtherInfo) { + this.log(LogLevel.DEBUG, objectName, message, furtherInfo); + }, + + trace: function (objectName, message, furtherInfo) { + this.log(LogLevel.TRACE, objectName, message, furtherInfo); + } + +}; +cfg.customLogger = winstonAdapter; ``` -## 7.8. Performance +Note that it is not possible to configure custom logging via declarative configuration. -### 7.8.1. Partition Aware +## 7.10. Defining Client Labels -Partition Aware ensures that the related entries exist on the same member. If the related data is on the same member, operations can be executed without the cost of extra network calls and extra wire data, and this improves the performance. This feature is provided by using the same partition keys for related data. +Through the client labels, you can assign special roles for your clients and use these roles to perform some actions +specific to those client connections. -Hazelcast has a standard way of finding out which member owns/manages each key object. The following operations are routed to the same member, since all of them are operating based on the same key `'key1'`. +You can also group your clients using the client labels. These client groups can be blacklisted in the +Hazelcast Management Center so that they can be prevented from connecting to a cluster. +See the [related section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#changing-cluster-client-filtering) in the Hazelcast Management Center Reference Manual for more information on this topic. -```javascript -Client.newHazelcastClient().then(function (client) { - hazelcastClient = client; - return hazelcastClient.getMap('mapA') -}).then(function (mp) { - mapA = mp; - return hazelcastClient.getMap('mapB'); -}).then(function (mp) { - mapB = mp; - return hazelcastClient.getMap('mapC'); -}).then(function (mp) { - mapC = mp; +Declaratively, you can define the client labels using the `clientLabels` configuration element. See the below example. - // since map names are different, operation is manipulating - // different entries, but the operation takes place on the - // same member since the keys ('key1') are the same - return mapA.put('key1', 'value1'); -}).then(function () { - return mapB.get('key1'); -}).then(function (res) { - return mapC.remove('key1'); -}).then(function () { - // lock operation is still execute on the same member - // of the cluster since the key ("key1") is same - return hazelcastClient.getLock('key1'); -}).then(function (l) { - lock = l; - return lock.lock(); -}); +```json +{ + "clientLabels": [ + "role admin", + "region foo" + ] +} ``` -When the keys are the same, entries are stored on the same member. However, we sometimes want to have the related entries stored on the same member, such as a customer and his/her order entries. We would have a customers map with `customerId` as the key and an orders map with `orderId` as the key. Since `customerId` and `orderId` are different keys, a customer and his/her orders may fall into different members in your cluster. So how can we have them stored on the same member? We create an affinity between the customer and orders. If we make them part of the same partition then these entries will be co-located. We achieve this by making `OrderKey`s `PartitionAware`. +The equivalent programmatic approach is shown below. ```javascript -function OrderKey(orderId, customerId) { - this.orderId = orderId; - this.customerId = customerId; -} +var config = new Config.ClientConfig(); -OrderKey.prototype.getPartitionKey = function () { - return this.customerId; -}; +config.labels.add("role admin"); +config.labels.add("region foo"); ``` -Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. +## 7.11. Defining Instance Name + +Each client has a name associated with it. By default, it is set to `hz.client_${CLIENT_ID}`. +`CLIENT_ID` starts from `0` and it is incremented by `1` for each new client. This id is incremented and set by the +client, so it may not be unique between different clients used by different applications. + +Declaratively, you can set the client name using the `instanceName` configuration element. + +```json +{ + "instanceName": "blue_client_0" +} +``` +The equivalent programmatic approach is shown below. ```javascript -var hazelcastClient; -var mapCustomers; -var mapOrders; +var config = new Config.ClientConfig(); -Client.newHazelcastClient().then(function (client) { - hazelcastClient = client; - return hazelcastClient.getMap('customers') -}).then(function (mp) { - mapCustomers = mp; - return hazelcastClient.getMap('orders'); -}).then(function (mp) { - mapOrders = mp; +config.name = "blue_client_0"; +``` - // create the customer entry with customer id = 1 - return mapCustomers.put(1, customer); -}).then(function () { - // now create the orders for this customer - return mapOrders.putAll([ - [new OrderKey(21, 1), order], - [new OrderKey(22, 1), order], - [new OrderKey(23, 1), order] - ]); -}); +## 7.12. Configuring Load Balancer + +`LoadBalancer` allows you to specify which cluster member to send next operation when queried. +It is up to your implementation to use different load balancing policies. +You should implement the `LoadBalancer` interface or extend the `AbstractLoadBalancer` class for that purpose. + +If it is a [smart client](#721-smart-client), only the operations that are not key-based are routed to the member +that is returned by the `LoadBalancer`. If it is not a smart client, `LoadBalancer` is ignored. + +By default, client uses `RoundRobinLB` which picks each cluster member in turn. Also, the client provides +`RandomLB` which picks the next member randomly as the name suggests. For the declarative configuration, +you can use `roundRobin` or `random` configuration elements as the load balancer type. + +The following are example configurations. + +Declarative Configuration: +```json +{ + "loadBalancer": { + "type": "roundRobin" + } +} ``` -For more details, see the [PartitionAware section](https://docs.hazelcast.org/docs/latest/manual/html-single/#partitionaware) in the Hazelcast IMDG Reference Manual. +Programmatic Configuration: +```javascript +var config = new Config.ClientConfig(); +config.loadBalancer = new RoundRobinLB(); +``` -### 7.8.2. Near Cache +# 8. Securing Client Connection -Map entries in Hazelcast are partitioned across the cluster members. Hazelcast clients do not have local data at all. Suppose you read the key `k` a number of times from a Hazelcast client and `k` is owned by a member in your cluster. Then each `map.get(k)` will be a remote operation, which creates a lot of network trips. If you have a map that is mostly read, then you should consider creating a local Near Cache, so that reads are sped up and less network traffic is created. +This chapter describes the security features of Hazelcast Node.js client. These include using TLS/SSL for connections between members and between clients and members, mutual authentication and credentials. These security features require **Hazelcast IMDG Enterprise** edition. -These benefits do not come for free, please consider the following trade-offs: +## 8.1. TLS/SSL -- If invalidation is enabled and entries are updated frequently, then invalidations will be costly. +One of the offers of Hazelcast is the TLS/SSL protocol which you can use to establish an encrypted communication across your cluster with key stores and trust stores. -- Near Cache breaks the strong consistency guarantees; you might be reading stale data. +* A Java `keyStore` is a file that includes a private key and a public certificate. The equivalent of a key store is the combination of `key` and `cert` files at the Node.js client side. +* A Java `trustStore` is a file that includes a list of certificates trusted by your application which is named as "certificate authority". The equivalent of a trust store is a `ca` file at the Node.js client side. -- Clients with a Near Cache will have to hold the extra cached data, which increases memory consumption. +You should set `keyStore` and `trustStore` before starting the members. See the next section on setting `keyStore` and `trustStore` on the server side. -Near Cache is highly recommended for maps that are mostly read. +### 8.1.1. TLS/SSL for Hazelcast Members -#### 7.8.2.1. Configuring Near Cache +Hazelcast allows you to encrypt socket level communication between Hazelcast members and between Hazelcast clients and members, for end to end encryption. To use it, see the [TLS/SSL for Hazelcast Members section](http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#tls-ssl-for-hazelcast-members). -The following snippets show how a Near Cache is configured in the Node.js client, presenting all available values for each element: +### 8.1.2. TLS/SSL for Hazelcast Node.js Clients -**Declarative Configuration:** +TLS/SSL for the Hazelcast Node.js client can be configured using the `SSLConfig` class. In order to turn it on, `enabled` property of `SSLConfig` should be set to `true`: -``` -{ - "nearCaches": [ - { - "name": "mostlyReadMap", - "invalidateOnChange": (false|true), - "timeToLiveSeconds": (0..Number.MAX_SAFE_INTEGER), - "maxIdleSeconds": (0..Number.MAX_SAFE_INTEGER), - "inMemoryFormat": "(object|binary)", - "evictionPolicy": "lru|lfu|random|none", - "evictionMaxSize": (0..Number.MAX_SAFE_INTEGER), - "evictionSamplingCount": (0..Number.MAX_SAFE_INTEGER), - "evictionSamplingPoolSize": (0..Number.MAX_SAFE_INTEGER), - } - ] -} +```javascript +var clientConfig = new Config.ClientConfig(); +var sslConfig = new Config.SSLConfig(); +sslConfig.enabled = true; +clientConfig.networkConfig.sslConfig = sslConfig; ``` -**Programmatic Configuration:** +`SSLConfig` object takes various SSL options defined in the [Node.js TLS Documentation](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). You can set your custom options +object to `sslConfig.sslOptions`. -```javascript -var nearCacheConfig = new Config.NearCacheConfig(); -nearCacheConfig.name = 'mostlyReadMap'; -nearCacheConfig.invalidateOnChange = (false|true); -nearCacheConfig.timeToLiveSeconds = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.maxIdleSeconds = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.inMemoryFormat= (InMemoryFormat.OBJECT|InMemoryFormat.BINARY); -nearCacheConfig.evictionPolicy = (EvictionPolicy.LRU|EvictionPolicy.LFU|EvictionPolicy.RANDOM|EvictionPolicy.NONE); -nearCacheConfig.evictionMaxSize = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.evictionSamplingCount = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.evictionSamplingPoolSize = (0..Number.MAX_SAFE_INTEGER); +### 8.1.3. Mutual Authentication -cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +As explained above, Hazelcast members have key stores used to identify themselves (to other members) and Hazelcast clients have trust stores used to define which members they can trust. + +Using mutual authentication, the clients also have their key stores and members have their trust stores so that the members can know which clients they can trust. + +To enable mutual authentication, firstly, you need to set the following property on the server side in the `hazelcast.xml` file: + +```xml + + + + REQUIRED + + + ``` -Following are the descriptions of all configuration elements: +You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#mutual-authentication) of the Hazelcast IMDG Reference Manual. -- `inMemoryFormat`: Specifies in which format data will be stored in your Near Cache. Note that a map’s in-memory format can be different from that of its Near Cache. Available values are as follows: - - `BINARY`: Data will be stored in serialized binary format (default value). - - `OBJECT`: Data will be stored in deserialized form. +At the Node.js client side, you need to supply an SSL `options` object to pass to +[`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js. -- `invalidateOnChange`: Specifies whether the cached entries are evicted when the entries are updated or removed in members. Its default value is true. +There are two ways to provide this object to the client: -- `timeToLiveSeconds`: Maximum number of seconds for each entry to stay in the Near Cache. Entries that are older than this period are automatically evicted from the Near Cache. Regardless of the eviction policy used, `timeToLiveSeconds` still applies. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. +1. Using the built-in `BasicSSLOptionsFactory` bundled with the client. +2. Writing an `SSLOptionsFactory`. -- `maxIdleSeconds`: Maximum number of seconds each entry can stay in the Near Cache as untouched (not read). Entries that are not read more than this period are removed from the Near Cache. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. +Below subsections describe each way. -- `evictionPolicy`: Eviction policy configuration. Available values are as follows: - - `LRU`: Least Recently Used (default value). - - `LFU`: Least Frequently Used. - - `NONE`: No items are evicted and the `evictionMaxSize` property is ignored. You still can combine it with `timeToLiveSeconds` and `maxIdleSeconds` to evict items from the Near Cache. - - `RANDOM`: A random item is evicted. +**Using the Built-in `BasicSSLOptionsFactory`** -- `evictionMaxSize`: Maximum number of entries kept in the memory before eviction kicks in. -- `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. -- `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. +Hazelcast Node.js client includes a utility factory class that creates the necessary `options` object out of the supplied +properties. All you need to do is to specify your factory as `BasicSSLOptionsFactory` and provide the following options: -#### 7.8.2.2. Near Cache Example for Map +- `caPath` +- `keyPath` +- `certPath` +- `servername` +- `rejectUnauthorized` +- `ciphers` -The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. +See [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js for the descriptions of each option. -**Declarative Configuration:** +> `caPath`, `keyPath` and `certPath` define the file path to the respective file that stores such information. -``` +```json { - "nearCaches": [ - { - "name": "mostlyReadMap", - "inMemoryFormat": "object", - "invalidateOnChange": true, - "evictionPolicy": "lru", - "evictionMaxSize": 5000, + "network": { + "ssl": { + "enabled": true, + "factory": { + "exportedName": "BasicSSLOptionsFactory", + "properties": { + "caPath": "ca.pem", + "keyPath": "key.pem", + "certPath": "cert.pem", + "rejectUnauthorized": false + } + } } - ] + } } ``` -**Programmatic Configuration:** - -```javascript -var nearCacheConfig = new Config.NearCacheConfig(); -nearCacheConfig.name = "mostlyReadMap"; -nearCacheConfig.inMemoryFormat= InMemoryFormat.OBJECT; -nearCacheConfig.invalidateOnChange = true; -nearCacheConfig.evictionPolicy = EvictionPolicy.LRU; -nearCacheConfig.evictionMaxSize = 5000; - -cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; -``` +If these options are not enough for your application, you may write your own options factory and instruct the client +to get the options from it, as explained below. -#### 7.8.2.3. Near Cache Eviction +**Writing an `SSLOptionsFactory`** -In the scope of Near Cache, eviction means evicting (clearing) the entries selected according to the given `evictionPolicy` when the specified `evictionMaxSize` has been reached. +In order to use the full range of options provided to [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js, you may write your own factory object. -The `evictionMaxSize` defines the entry count when the Near Cache is full and determines whether the eviction should be triggered. +An example configuration is shown below. -Once the eviction is triggered the configured `evictionPolicy` determines which, if any, entries must be evicted. +```json +{ + "network": { + "ssl": { + "enabled": true, + "factory": { + "path": "my_factory.js", + "exportedName": "SSLFactory", + "properties": { + "caPath": "ca.pem", + "keyPath": "key.pem", + "certPath": "cert.pem", + "keepOrder": true + } + } + } + } +} +``` -#### 7.8.2.4. Near Cache Expiration +An example of a factory, `my_factory.js`, is shown below. -Expiration means the eviction of expired records. A record is expired: +```javascript +function SSLFactory() { +} -- if it is not touched (accessed/read) for `maxIdleSeconds` +SSLFactory.prototype.init = function (properties) { + var promises = []; + var readFile = Promise.promisify(fs.readFile); + this.keepOrder = properties.userDefinedProperty1; + var self = this; -- `timeToLiveSeconds` passed since it is put to Near Cache + promises.push(readFile(properties.caPath).then(function (data) { + self.ca = data; + })); + promises.push(readFile(properties.keyPath).then(function (data) { + self.key = data; + })); + promises.push(readFile(properties.certPath).then(function (data) { + self.cert = data; + })); -The actual expiration is performed when a record is accessed: it is checked if the record is expired or not. If it is expired, it is evicted and `undefined` is returned as the value to the caller. + return Promise.all(promises).return(); +}; +SSLFactory.prototype.getSSLOptions = function () { + var sslOpts = { + ca: this.ca, + key: this.key, + cert: this.cert, + servername: 'foo.bar.com', + rejectUnauthorized: true + }; + if (this.keepOrder) { + sslOpts.honorCipherOrder = true; + } + return sslOpts; +}; +exports.SSLFactory = SSLFactory; +``` -#### 7.8.2.5. Near Cache Invalidation +The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with +the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. -Invalidation is the process of removing an entry from the Near Cache when its value is updated or it is removed from the original map (to prevent stale reads). See the [Near Cache Invalidation section](https://docs.hazelcast.org/docs/latest/manual/html-single/#near-cache-invalidation) in the Hazelcast IMDG Reference Manual. +For information about the path resolution, see the [Loading Objects and Path Resolution section](#33-loading-objects-and-path-resolution). -#### 7.8.2.6. Near Cache Eventual Consistency +## 8.2. Credentials -Near Caches are invalidated by invalidation events. Invalidation events can be lost due to the fire-and-forget fashion of eventing system. If an event is lost, reads from Near Cache can indefinitely be stale. +One of the key elements in Hazelcast security is the `Credentials` object, which can be used to carry all security attributes of the +Hazelcast Node.js client to Hazelcast members. Then, Hazelcast members can authenticate the clients and perform access control +checks on the client operations using this `Credentials` object. -To solve this problem, Hazelcast provides eventually consistent behavior for Map Near Caches by detecting invalidation losses. After detection of an invalidation loss, stale data will be made unreachable and Near Cache’s `get` calls to that data will be directed to underlying Map to fetch the fresh data. +To use this feature, you need to +* have a class implementing the [`Credentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/Credentials.html) interface which contains the security attributes of your client +* have a class implementing the [`LoginModule`](https://docs.oracle.com/javase/8/docs/api/javax/security/auth/spi/LoginModule.html?is-external=true) interface which uses the `Credentials` object during the authentication process +* configure your Hazelcast member's security properties with respect to these classes before starting it. If you have started your member as described in the [Running Standalone JARs section](#1211-running-standalone-jars), see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). -You can configure eventual consistency with the `ClientConfig.properties` below: +[`UsernamePasswordCredentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/UsernamePasswordCredentials.html), a basic implementation of the `Credentials` interface, is available in the Hazelcast `com.hazelcast.security` package. +`UsernamePasswordCredentials` is used for default configuration during the authentication process of both members and clients. You can also use this class to carry the security attributes of your client. -- `hazelcast.invalidation.max.tolerated.miss.count`: Default value is `10`. If missed invalidation count is bigger than this value, relevant cached data will be made unreachable. +Hazelcast also has an abstract implementation of the `LoginModule` interface which is the `ClusterLoginModule` class in the `com.hazelcast.security` package. +You can extend this class and do the authentication on the `onLogin()` method. -- `hazelcast.invalidation.reconciliation.interval.seconds`: Default value is `60` seconds. This is a periodic task that scans cluster members periodically to compare generated invalidation events with the received ones from the client Near Cache. +Below is an example for the extension of abstract `ClusterLoginModule` class. +On the `ClientLoginModule#onLogin()` method, we are doing a simple authentication against a hardcoded username and password just for illustrative purposes. You should carry out the authentication against a security service of your choice. -### 7.8.3. Automated Pipelining +```java +import com.hazelcast.security.ClusterLoginModule; +import com.hazelcast.security.UsernamePasswordCredentials; -Hazelcast Node.js client performs automated pipelining of operations. It means that the library pushes all operations into an internal queue and tries to send them in batches. This reduces the count of executed `Socket.write()` calls and significantly improves throughtput for read operations. +import javax.security.auth.login.FailedLoginException; +import javax.security.auth.login.LoginException; -You can configure automated operation pipelining with the `ClientConfig.properties` below: +public class ClientLoginModule extends ClusterLoginModule { -- `hazelcast.client.autopipelining.enabled`: Default value is `true`. Turns automated pipelining feature on/off. If your application does only writes operations, like `IMap.set()`, you can try disabling automated pipelining to get a slightly better throughtput. + @Override + protected boolean onLogin() throws LoginException { + if (credentials instanceof UsernamePasswordCredentials) { + UsernamePasswordCredentials usernamePasswordCredentials = (UsernamePasswordCredentials) credentials; + String username = usernamePasswordCredentials.getUsername(); + String password = usernamePasswordCredentials.getPassword(); -- `hazelcast.client.autopipelining.threshold.bytes`: Default value is `8192` bytes. This is the coalescing threshold for the internal queue used by automated pipelining. Once the total size of operation payloads taken from the queue reaches this value during batch preparation, these operations are written to the socket. Notice that automated pipelining will still send operations if their total size is smaller than the threshold and there are no more operations in the internal queue. + if (username.equals("admin") && password.equals("password")) { + return true; + } + throw new FailedLoginException("Username or password doesn't match expected value."); + } + return false; + } -## 7.9. Monitoring and Logging + @Override + public boolean onCommit() { + return loginSucceeded; + } -### 7.9.1. Enabling Client Statistics + @Override + protected boolean onAbort() { + return true; + } -You can monitor your clients using Hazelcast Management Center. + @Override + protected boolean onLogout() { + return true; + } +} +``` -As a prerequisite, you need to enable the client statistics before starting your clients. This can be done by setting the `hazelcast.client.statistics.enabled` system property to `true` on the **member** as the following: +Finally, you can configure `hazelcast.xml` as follows to enable Hazelcast security, do mandatory authentication with `ClientLoginModule` +and give the user with the name `admin` all the permissions over the map named `importantMap`. ```xml - ... - - true - - ... + + + + + + + + all + + + + ``` -Also, you need to enable the client statistics in the Node.js client. There are two properties related to client statistics: +After successfully starting a Hazelcast member as described above, you need to implement `Portable` equivalent of the `UsernamePasswordCredentials` +and register it to your client configuration. -- `hazelcast.client.statistics.enabled`: If set to `true`, it enables collecting the client statistics and sending them to the cluster. When it is `true` you can monitor the clients that are connected to your Hazelcast cluster, using Hazelcast Management Center. Its default value is `false`. +Below is the code for that. -- `hazelcast.client.statistics.period.seconds`: Period in seconds the client statistics are collected and sent to the cluster. Its default value is `3`. +**user_pass_cred.js** +```javascript +function UsernamePasswordCredentials(username, password, endpoint) { + this.username = username; + this.password = Buffer.from(password, 'utf8'); + this.endpoint = endpoint; +} -You can enable client statistics and set a non-default period in seconds as follows: +UsernamePasswordCredentials.prototype.readPortable = function (reader) { + this.username = reader.readUTF('principal'); + this.endpoint = reader.readUTF('endpoint'); + this.password = reader.readByteArray('pwd'); +}; -**Declarative Configuration:** +UsernamePasswordCredentials.prototype.writePortable = function (writer) { + writer.writeUTF('principal', this.username); + writer.writeUTF('endpoint', this.endpoint); + writer.writeByteArray('pwd', this.password); +}; -```json -{ - "properties": { - "hazelcast.client.statistics.enabled": true, - "hazelcast.client.statistics.period.seconds": 4 - } -} -``` +UsernamePasswordCredentials.prototype.getFactoryId = function () { + return -1; +}; -**Programmatic Configuration:** +UsernamePasswordCredentials.prototype.getClassId = function () { + return 1; +}; -```javascript -var config = new Config.ClientConfig(); -config.properties['hazelcast.client.statistics.enabled'] = true; -config.properties['hazelcast.client.statistics.period.seconds'] = 4; +exports.UsernamePasswordCredentials = UsernamePasswordCredentials; ``` -After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. +And below is the `Factory` implementation for the `Portable` implementation of `UsernamePasswordCredentials`. -### 7.9.2. Logging Configuration +**user_pass_cred_factory.js** +```javascript +var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; - By default, Hazelcast Node.js client uses a default logger which logs to the `stdout` with the `INFO` log level. You can change the log level using the `'hazelcast.logging.level'` property of the `ClientConfig.properties`. +function UsernamePasswordCredentialsFactory() { +} -Below is an example of the logging configuration with the `OFF` log level which disables logging. +UsernamePasswordCredentialsFactory.prototype.create = function (classId) { + if(classId === 1){ + return new UsernamePasswordCredentials(); + } + return null; +}; -```javascript -cfg.properties['hazelcast.logging.level'] = LogLevel.OFF; +exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; ``` - You can also implement a custom logger depending on your needs. Your custom logger must have `log`, `error`, `warn`, `info`, `debug`, `trace` methods. After implementing it, you can use your custom logger using the `customLogger` property of `ClientConfig` - -See the following for a custom logger example. +Now, you can start your client by registering the `Portable` factory and giving the credentials as follows. ```javascript -var winstonAdapter = { - logger: new (winston.Logger)({ - transports: [ - new (winston.transports.Console)() - ] - }), - - levels: [ - 'error', - 'warn', - 'info', - 'debug', - 'silly' - ], - - log: function (level, objectName, message, furtherInfo) { - this.logger.log(this.levels[level], objectName + ': ' + message, furtherInfo); - }, +var Client = require('hazelcast-client').Client; +var ClientConfig = require('hazelcast-client').Config.ClientConfig; - error: function (objectName, message, furtherInfo) { - this.log(LogLevel.ERROR, objectName, message, furtherInfo); - }, +var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; +var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; - warn: function (objectName, message, furtherInfo) { - this.log(LogLevel.WARN, objectName, message, furtherInfo); - }, +var config = new ClientConfig(); +config.serializationConfig.portableVersion = 1; +config.serializationConfig.portableFactories[-1] = new UsernamePasswordCredentialsFactory(); +config.customCredentials = new UsernamePasswordCredentials('admin', 'password', '127.0.0.1'); - info: function (objectName, message, furtherInfo) { - this.log(LogLevel.INFO, objectName, message, furtherInfo); - }, +Client.newHazelcastClient(config).then(function (client) { + var map; + return client.getMap('importantMap').then(function (mp) { + map = mp; + return map.put('key', 'value'); + }).then(function () { + return map.get('key'); + }).then(function (value) { + console.log(value); + return client.shutdown(); + }); +}); +``` - debug: function (objectName, message, furtherInfo) { - this.log(LogLevel.DEBUG, objectName, message, furtherInfo); - }, +> NOTE: It is almost always a bad idea to write the credentials to wire in a clear-text format. Therefore, using TLS/SSL encryption is highly recommended while using the custom credentials as described in [TLS/SSL section]((#81-tlsssl)). - trace: function (objectName, message, furtherInfo) { - this.log(LogLevel.TRACE, objectName, message, furtherInfo); - } +With Hazelcast's extensible, `JAAS` based security features you can do much more than just authentication. +See the [JAAS code sample](code_samples/jaas_sample) to learn how to perform access control checks on the client operations based on user groups. -}; -cfg.customLogger = winstonAdapter; -``` +Also, see the [Security section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#security) of Hazelcast IMDG Reference Manual for more information. -Note that it is not possible to configure custom logging via declarative configuration. -# 8. Development and Testing +# 9. Development and Testing Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or tweak the implementation to your application's needs, you can follow the steps in this section. -## 8.1. Building and Using Client From Sources +## 9.1. Building and Using Client From Sources Follow the below steps to build and install Hazelcast Node.js client from its source: @@ -3429,7 +3599,7 @@ If you are planning to contribute, please run the style checker, as shown below, npm run lint ``` -## 8.2. Testing +## 9.2. Testing In order to test Hazelcast Node.js client locally, you will need the following: @@ -3444,7 +3614,7 @@ npm test Test script automatically downloads `hazelcast-remote-controller` and Hazelcast IMDG. The script uses Maven to download those. -# 9. Getting Help +# 10. Getting Help You can use the following channels for your questions and development/usage issues: @@ -3454,15 +3624,15 @@ You can use the following channels for your questions and development/usage issu * Our Google Groups directory: https://groups.google.com/forum/#!forum/hazelcast * Stack Overflow: https://stackoverflow.com/questions/tagged/hazelcast -# 10. Contributing +# 11. Contributing -Besides your development contributions as explained in the [Development and Testing chapter](#8-development-and-testing) above, you can always open a pull request on this repository for your other requests such as documentation changes. +Besides your development contributions as explained in the [Development and Testing chapter](#9-development-and-testing) above, you can always open a pull request on this repository for your other requests such as documentation changes. -# 11. License +# 12. License [Apache 2 License](https://github.com/hazelcast/hazelcast-nodejs-client/blob/master/LICENSE). -# 12. Copyright +# 13. Copyright Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. diff --git a/README.md b/README.md index 8f11f5619..9195cb6f0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ + +This client is under heavy development for version 4.0. + +Please switch to a 3.12.x branch or tag if you are using a 3.12.x version of Hazelcast IMDG. + +--- +

@@ -37,14 +44,12 @@ The quickest way to start a single member cluster for development purposes is to [Docker images](https://hub.docker.com/r/hazelcast/hazelcast/). ```bash -docker run -p 5701:5701 hazelcast/hazelcast:3.12.6 +docker run -p 5701:5701 hazelcast/hazelcast:4.0.1 ``` You can also use our ZIP or TAR [distributions](https://hazelcast.org/imdg/download/archives/#hazelcast-imdg) as described [here](DOCUMENTATION.md#121-setting-up-a-hazelcast-imdg-cluster). -Make sure to use Hazelcast IMDG 3.x versions as the work to support 4.x versions is in progress. - ### Client ```bash @@ -88,7 +93,7 @@ const { Client, Config } = require('hazelcast-client'); const clientConfig = new Config.ClientConfig(); // Customize the client configuration -clientConfig.groupConfig.name = 'cluster-name'; +clientConfig.clusterName = 'cluster-name'; clientConfig.networkConfig.addresses.push('10.90.0.2:5701'); clientConfig.networkConfig.addresses.push('10.90.0.3:5701'); @@ -109,12 +114,14 @@ You can also configure the client * Additional data structures and simple messaging constructs such as **Set**, **MultiMap**, **Queue**, **Topic** * Cluster-wide unique ID generator, called **FlakeIdGenerator** * Distributed, CRDT based counter, called **PNCounter** -* Primitives for distributed computing such as **Lock**, **Semaphore**, **Atomic Long** +* Primitives for distributed computing such as **Lock**, **Semaphore**, **Atomic Long** * * Integration with [Hazelcast Cloud](https://cloud.hazelcast.com/) * Support for serverless and traditional web service architectures with **Unisocket** and **Smart** operation modes * Ability to listen client lifecycle, cluster state and distributed data structure events * and [many more](https://hazelcast.org/imdg/clients-languages/node-js/#client-features). +> *: Make sure to use 3.x versions of Hazelcast Node.js client and IMDG to access these primitives as the work to support them in 4.x versions is in progress. + ## Getting Help You can use the following channels for your questions and development/usage issues: diff --git a/code_samples/hazelcast_cloud_discovery.js b/code_samples/hazelcast_cloud_discovery.js index a9068f9af..843998b42 100644 --- a/code_samples/hazelcast_cloud_discovery.js +++ b/code_samples/hazelcast_cloud_discovery.js @@ -19,7 +19,7 @@ var ClientConfig = require('hazelcast-client').Config.ClientConfig; var fs = require('fs'); var Path = require('path'); - +// TODO test this sample with the Hazelcast Cloud function createClientConfigWithSSLOpts(key, cert, ca) { var sslOpts = { servername: 'Hazelcast-Inc', @@ -29,15 +29,13 @@ function createClientConfigWithSSLOpts(key, cert, ca) { cert: fs.readFileSync(Path.join(__dirname, cert)) }; var cfg = new ClientConfig(); - cfg.networkConfig.sslOptions = sslOpts; - cfg.networkConfig.connectionAttemptLimit = 1000; + cfg.networkConfig.sslConfig.sslOptions = sslOpts; var token = 'EXAMPLE_TOKEN'; cfg.networkConfig.cloudConfig.enabled = true; cfg.networkConfig.cloudConfig.discoveryToken = token; - cfg.groupConfig.name = 'hazel'; - cfg.groupConfig.password = 'cast'; + cfg.clusterName = 'hazelcast'; return cfg; } diff --git a/code_samples/org-website/AtomicLongSample.js b/code_samples/org-website/AtomicLongSample.js deleted file mode 100644 index e94618f31..000000000 --- a/code_samples/org-website/AtomicLongSample.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var counter; - // Get an Atomic Counter, we'll call it "counter" - hz.getAtomicLong('counter').then(function (c) { - counter = c; - // Add and Get the "counter" - return counter.addAndGet(3); - }).then(function (value) { - return counter.get(); - }).then(function (value) { - // Display the "counter" value - console.log('counter: ' + value); - // Shutdown this Hazelcast Client - hz.shutdown(); - }); -}); diff --git a/code_samples/org-website/LockSample.js b/code_samples/org-website/LockSample.js deleted file mode 100644 index 7a8595b20..000000000 --- a/code_samples/org-website/LockSample.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var lock; - // Get a distributed lock called "my-distributed-lock" - hz.getLock('my-distributed-lock').then(function (l) { - lock = l; - // Now create a lock and execute some guarded code. - return lock.lock(); - }).then(function () { - // do something here - }).finally(function () { - return lock.unlock(); - }).then(function () { - // Shutdown this Hazelcast Client - hz.shutdown(); - }); -}); diff --git a/config-schema.json b/config-schema.json index fe2aadc20..130fed9da 100644 --- a/config-schema.json +++ b/config-schema.json @@ -44,7 +44,7 @@ "type": { "enum": [ "lifecycle", - "map" + "membership" ] } } @@ -73,25 +73,28 @@ } }, "properties": { - "group": { - "type": "object", - "required": [ - "name", - "password" - ], - "properties": { - "name": { - "type": "string" - }, - "password": { - "type": "string" - } - }, - "additionalProperties": false + "clusterName": { + "type": [ + "string", + "null" + ] + }, + "instanceName": { + "type": [ + "string", + "null" + ] }, "properties": { "$ref": "#/definitions/propertiesObject" }, + "clientLabels": { + "type": "array", + "uniqueItems": true, + "items": { + "type": "string" + } + }, "network": { "type": "object", "properties": { @@ -112,15 +115,20 @@ "minimum": 1000, "default": 5000 }, - "connectionAttemptPeriod": { - "type": "number", - "minimum": 1, - "default": 3000 - }, - "connectionAttemptLimit": { - "type": "number", - "minimum": 0, - "default": 2 + "hazelcastCloud": { + "type": "object", + "properties": { + "discoveryToken": { + "type": [ + "string", + "null" + ] + }, + "enabled": { + "type": "boolean", + "default": false + } + } }, "ssl": { "type": "object", @@ -129,6 +137,21 @@ "type": "boolean", "default": false }, + "sslOptions": { + "anyOf": [ + { + "type": "object", + "properties": { + "properties": { + "$ref": "#/definitions/propertiesObject" + } + } + }, + { + "type": "null" + } + ] + }, "factory": { "anyOf": [ { @@ -141,6 +164,9 @@ "$ref": "#/definitions/propertiesObject" } } + }, + { + "type": "null" } ] } @@ -148,6 +174,47 @@ } } }, + "connectionStrategy": { + "type": "object", + "properties": { + "asyncStart": { + "type": "boolean", + "default": false + }, + "reconnectMode": { + "enum": [ + "on", + "off", + "async" + ] + }, + "connectionRetry": { + "type": "object", + "properties": { + "initialBackoffMillis": { + "type": "number", + "minimum": 0 + }, + "maxBackoffMillis": { + "type": "number", + "minimum": 0 + }, + "multiplier": { + "type": "number", + "minimum": 1 + }, + "clusterConnectTimeoutMillis": { + "type": "number" + }, + "jitter": { + "type": "number", + "minimum": 0, + "maximum": 1 + } + } + } + } + }, "listeners": { "type": "array", "items": { @@ -303,6 +370,17 @@ } } }, + "loadBalancer": { + "type": "object", + "properties": { + "type": { + "enum": [ + "roundRobin", + "random" + ] + } + } + }, "import": { "type": "array", "minItems": 1, diff --git a/hazelcast-client-default.json b/hazelcast-client-default.json index aeb08e415..7c7d92c98 100644 --- a/hazelcast-client-default.json +++ b/hazelcast-client-default.json @@ -1,8 +1,6 @@ { - "group": { - "name": "dev", - "password": "dev-pass" - }, + "clusterName": "dev", + "instanceName": null, "properties": { "hazelcast.client.heartbeat.interval": 5000, "hazelcast.client.heartbeat.timeout": 60000, @@ -13,23 +11,42 @@ "hazelcast.client.statistics.period.seconds": 3, "hazelcast.invalidation.reconciliation.interval.seconds": 60, "hazelcast.invalidation.max.tolerated.miss.count": 10, - "hazelcast.invalidation.min.reconciliation.interval.seconds": 30 + "hazelcast.invalidation.min.reconciliation.interval.seconds": 30, + "hazelcast.logging.level": 2, + "hazelcast.client.autopipelining.enabled": true, + "hazelcast.client.autopipelining.threshold.bytes": 8192, + "hazelcast.client.socket.no.delay": true, + "hazelcast.client.shuffle.member.list": true }, + "clientLabels": [], "network": { "clusterMembers": [ - "127.0.0.1:5701" + "127.0.0.1" ], "smartRouting": true, "redoOperation": false, "connectionTimeout": 5000, - "connectionAttemptPeriod": 3000, - "connectionAttemptLimit": 2, - "ssl": null, + "ssl": { + "enabled": false, + "sslOptions": null, + "factory": null + }, "hazelcastCloud": { "discoveryToken": null, "enabled": false } }, + "connectionStrategy": { + "asyncStart": false, + "reconnectMode": "on", + "connectionRetry": { + "initialBackoffMillis": 1000, + "maxBackoffMillis": 30000, + "multiplier": 1, + "clusterConnectTimeoutMillis": 20000, + "jitter": 0 + } + }, "listeners": [], "serialization": { "defaultNumberType": "double", @@ -45,5 +62,7 @@ "nearCaches": [], "reliableTopics": [], "flakeIdGeneratorConfigs": [], - "import": [] + "loadBalancer": { + "type": "roundRobin" + } } diff --git a/hazelcast-client-full.json b/hazelcast-client-full.json index bfdf3ac8b..69a9f5b6b 100644 --- a/hazelcast-client-full.json +++ b/hazelcast-client-full.json @@ -1,8 +1,6 @@ { - "group": { - "name": "hazel", - "password": "cast" - }, + "clusterName": "dev", + "instanceName": "hazelcastClient", "properties": { "hazelcast.client.heartbeat.interval": 5000, "hazelcast.client.heartbeat.timeout": 60000, @@ -17,8 +15,13 @@ "hazelcast.logging.level": 2, "hazelcast.client.autopipelining.enabled": true, "hazelcast.client.autopipelining.threshold.bytes": 8192, - "hazelcast.client.socket.no.delay": true + "hazelcast.client.socket.no.delay": true, + "hazelcast.client.shuffle.member.list": true }, + "clientLabels": [ + "role admin", + "region foo" + ], "network": { "clusterMembers": [ "127.0.0.1", @@ -27,8 +30,6 @@ "smartRouting": true, "redoOperation": false, "connectionTimeout": 5000, - "connectionAttemptPeriod": 3000, - "connectionAttemptLimit": 2, "ssl": { "enabled": false, "sslOptions": null, @@ -45,6 +46,17 @@ "enabled": false } }, + "connectionStrategy": { + "asyncStart": false, + "reconnectMode": "on", + "connectionRetry": { + "initialBackoffMillis": 1000, + "maxBackoffMillis": 30000, + "multiplier": 1, + "clusterConnectTimeoutMillis": 20000, + "jitter": 0 + } + }, "listeners": [ { "type": "lifecycle", @@ -52,7 +64,7 @@ "exportedName": "listener" }, { - "type": "lifecycle", + "type": "membership", "path": "path/to/file", "exportedName": "listener2" } @@ -131,6 +143,9 @@ "prefetchValidityMillis": 500000 } ], + "loadBalancer": { + "type": "random" + }, "import": [ "hazelcast-client-near-cache.json" ] diff --git a/package.json b/package.json index bcfe5b6ae..1e0c2b4a9 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "@types/node": "6.0.87", "chai": "4.1.2", "chai-as-promised": "7.1.1", - "hazelcast-remote-controller": "^1.0.0", "istanbul": "0.4.5", "jsonschema": "1.2.4", "mocha": "3.5.3", @@ -23,6 +22,7 @@ "remap-istanbul": "0.9.6", "rimraf": "2.6.2", "sinon": "4.0.0", + "thrift": "^0.9.3", "tslint": "5.7.0", "typescript": "2.5.2", "winston": "2.3.1" diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 36eb55005..4e1ed617a 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,9 +1,9 @@ #!/bin/sh -HZ_VERSION="3.12.6" -HAZELCAST_TEST_VERSION="3.12.6" +HZ_VERSION="4.0.2-SNAPSHOT" +HAZELCAST_TEST_VERSION="4.0.2-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.4-SNAPSHOT" +HAZELCAST_RC_VERSION="0.7-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" @@ -18,6 +18,15 @@ else ENTERPRISE_REPO=${ENTERPRISE_RELEASE_REPO} fi +if [[ ${HZ_TEST_VERSION} == *-SNAPSHOT ]] +then + TEST_REPO=${SNAPSHOT_REPO} + ENTRERPRISE_TEST_REPO=${ENTERPRISE_SNAPSHOT_REPO} +else + TEST_REPO=${RELEASE_REPO} + ENTRERPRISE_TEST_REPO=${ENTERPRISE_RELEASE_REPO} +fi + if [ -f "hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar" ]; then echo "remote controller already exist, not downloading from maven." else @@ -56,7 +65,7 @@ if [ -n "${HAZELCAST_ENTERPRISE_KEY}" ]; then echo "hazelcast-enterprise-tests.jar already exists, not downloading from maven." else echo "Downloading: hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" - mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTERPRISE_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar + mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTRERPRISE_TEST_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar if [ $? -ne 0 ]; then echo "Failed to download hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" exit 1 @@ -80,5 +89,5 @@ else echo "Starting Remote Controller ... oss ..." fi -java -Dhazelcast.enterprise.license.key=${HAZELCAST_ENTERPRISE_KEY} -cp ${CLASSPATH} com.hazelcast.remotecontroller.Main +java -Dhazelcast.enterprise.license.key=${HAZELCAST_ENTERPRISE_KEY} -cp ${CLASSPATH} com.hazelcast.remotecontroller.Main --use-simple-server diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index be73cd448..521343f3c 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,9 +1,9 @@ -set HZ_VERSION="3.12.6" -set HZ_TEST_VERSION="3.12.6" +set HZ_VERSION="4.0.2-SNAPSHOT" +set HZ_TEST_VERSION="4.0.2-SNAPSHOT" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% -set HAZELCAST_RC_VERSION="0.4-SNAPSHOT" +set HAZELCAST_RC_VERSION="0.7-SNAPSHOT" set SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" set RELEASE_REPO="http://repo1.maven.apache.org/maven2" set ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" @@ -67,7 +67,7 @@ if defined HAZELCAST_ENTERPRISE_KEY ( echo hazelcast-enterprise-test.jar already exists, not downloading from maven. ) else ( echo Downloading: hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:%HAZELCAST_ENTERPRISE_VERSION%:jar:tests - call mvn -q dependency:get -DrepoUrl=%TEST_REPO% -Dartifact=com.hazelcast:hazelcast-enterprise:%HAZELCAST_TEST_VERSION%:jar:tests -Ddest=hazelcast-enterprise-%HAZELCAST_TEST_VERSION%-tests.jar + call mvn -q dependency:get -DrepoUrl=%ENTRERPRISE_TEST_REPO% -Dartifact=com.hazelcast:hazelcast-enterprise:%HAZELCAST_TEST_VERSION%:jar:tests -Ddest=hazelcast-enterprise-%HAZELCAST_TEST_VERSION%-tests.jar if errorlevel 1 ( echo Failed download hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:%HAZELCAST_TEST_VERSION%:jar:tests exit 1 @@ -91,7 +91,7 @@ if defined HAZELCAST_ENTERPRISE_KEY ( echo Starting Remote Controller ... oss ... ) -start /min "hazelcast-remote-controller" cmd /c "java -Dhazelcast.enterprise.license.key=%HAZELCAST_ENTERPRISE_KEY% -cp %CLASSPATH% com.hazelcast.remotecontroller.Main> rc_stdout.txt 2>rc_stderr.txt" +start /min "hazelcast-remote-controller" cmd /c "java -Dhazelcast.enterprise.license.key=%HAZELCAST_ENTERPRISE_KEY% -cp %CLASSPATH% com.hazelcast.remotecontroller.Main --use-simple-server> rc_stdout.txt 2>rc_stderr.txt" echo wait for Hazelcast to start ... ping -n 15 127.0.0.1 > nul diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 7a5ddfbd1..54e5525af 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,11 +1,11 @@ #!/bin/sh -HZ_VERSION="3.12.6" -HZ_TEST_VERSION="3.12.6" +HZ_VERSION="4.0.2-SNAPSHOT" +HZ_TEST_VERSION="4.0.2-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_TEST_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.4-SNAPSHOT" +HAZELCAST_RC_VERSION="0.7-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" @@ -69,7 +69,7 @@ if [ -n "${HAZELCAST_ENTERPRISE_KEY}" ]; then echo "hazelcast-enterprise-tests.jar already exists, not downloading from maven." else echo "Downloading: hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" - mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTERPRISE_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar + mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTRERPRISE_TEST_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar if [ $? -ne 0 ]; then echo "Failed to download hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" exit 1 @@ -93,7 +93,7 @@ else echo "Starting Remote Controller ... oss ..." fi -nohup java -Dhazelcast.enterprise.license.key=${HAZELCAST_ENTERPRISE_KEY} -cp ${CLASSPATH} com.hazelcast.remotecontroller.Main>rc_stdout.log 2>rc_stderr.log & +nohup java -Dhazelcast.enterprise.license.key=${HAZELCAST_ENTERPRISE_KEY} -cp ${CLASSPATH} com.hazelcast.remotecontroller.Main --use-simple-server>rc_stdout.log 2>rc_stderr.log & sleep 10 diff --git a/src/Address.ts b/src/Address.ts index a8a28edc8..c1e19880b 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -19,7 +19,7 @@ import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; import {DataInput, DataOutput} from './serialization/Data'; import {IdentifiedDataSerializable} from './serialization/Serializable'; -class Address implements IdentifiedDataSerializable { +export class Address implements IdentifiedDataSerializable { host: string; port: number; @@ -78,5 +78,3 @@ class Address implements IdentifiedDataSerializable { return this.host + ':' + this.port; } } - -export = Address; diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index 5e3aed81d..402f9098d 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -16,29 +16,8 @@ /* tslint:disable:no-bitwise */ import {Buffer} from 'safe-buffer'; -import Address = require('./Address'); -import {Data} from './serialization/Data'; export class BitsUtil { - static EVENT_MEMBER = 200; - static EVENT_MEMBERLIST = 201; - static EVENT_MEMBERATTRIBUTECHANGE = 202; - static EVENT_ENTRY = 203; - static EVENT_ITEM = 204; - static EVENT_TOPIC = 205; - static EVENT_PARTITIONLOST = 206; - static EVENT_DISTRIBUTEDOBJECT = 207; - static EVENT_CACHEINVALIDATION = 208; - static EVENT_MAPPARTITIONLOST = 209; - static EVENT_CACHE = 210; - static EVENT_CACHEBATCHINVALIDATION = 211; - static EVENT_QUERYCACHESINGLE = 212; - static EVENT_QUERYCACHEBATCH = 213; - static EVENT_CACHEPARTITIONLOST = 214; - static EVENT_IMAPINVALIDATION = 215; - static EVENT_IMAPBATCHINVALIDATION = 216; - static EVENT_PARTITIONS = 217; - static BYTE_SIZE_IN_BYTES: number = 1; static BOOLEAN_SIZE_IN_BYTES: number = 1; static SHORT_SIZE_IN_BYTES: number = 2; @@ -47,11 +26,11 @@ export class BitsUtil { static FLOAT_SIZE_IN_BYTES: number = 4; static LONG_SIZE_IN_BYTES: number = 8; static DOUBLE_SIZE_IN_BYTES: number = 8; + static UUID_SIZE_IN_BYTES: number = BitsUtil.BOOLEAN_SIZE_IN_BYTES + 2 * BitsUtil.LONG_SIZE_IN_BYTES; static BIG_ENDIAN: number = 2; static LITTLE_ENDIAN: number = 1; - static VERSION: number = 1; static BEGIN_FLAG: number = 0x80; static END_FLAG: number = 0x40; static BEGIN_END_FLAG: number = BitsUtil.BEGIN_FLAG | BitsUtil.END_FLAG; @@ -59,8 +38,6 @@ export class BitsUtil { static NULL_ARRAY_LENGTH: number = -1; - static SIZE_OFFSET: number = 0; - static FRAME_LENGTH_FIELD_OFFSET: number = 0; static VERSION_FIELD_OFFSET: number = BitsUtil.FRAME_LENGTH_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; static FLAGS_FIELD_OFFSET: number = BitsUtil.VERSION_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; @@ -71,39 +48,6 @@ export class BitsUtil { static HEADER_SIZE: number = BitsUtil.DATA_OFFSET_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; - static calculateSizeData(data: Data): number { - return BitsUtil.INT_SIZE_IN_BYTES + data.totalSize(); - } - - public static getStringSize(value: string, nullable: boolean = false): number { - // int32 for string length - let size = 4; - - if (nullable) { - size += 1; - } - - size += value == null ? 0 : Buffer.byteLength(value, 'utf8'); - - return size; - } - - public static calculateSizeString(value: string): number { - return this.getStringSize(value); - } - - public static calculateSizeBuffer(value: Buffer): number { - let size = 4; - size += value.length; - return size; - } - - public static calculateSizeAddress(value: Address): number { - let size = 4; - size += this.calculateSizeString(value.host); - return size; - } - static writeUInt32(buffer: Buffer, pos: number, val: number, isBigEndian: boolean): void { if (isBigEndian) { buffer.writeUInt32BE(val, pos); diff --git a/src/ClientInfo.ts b/src/ClientInfo.ts index a0539da28..bc283ec08 100644 --- a/src/ClientInfo.ts +++ b/src/ClientInfo.ts @@ -14,19 +14,33 @@ * limitations under the License. */ -import Address = require('./Address'); +import {Address} from './Address'; +import {UUID} from './core/UUID'; export class ClientInfo { + /** - * Unique id of this client instance. It is provided by owner server instance. + * Unique id of this client instance. */ - uuid: string; + uuid: UUID; + /** * Local port address that is used to communicate with cluster. */ localAddress: Address; + /** * Type of this client. It is always NodeJS. */ type: string = 'NodeJS'; + + /** + * Name of the client. + */ + name: string; + + /** + * Set of all labels of this client. + */ + labels: Set; } diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 7be87339c..177ac9bc1 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -15,248 +15,255 @@ */ /* tslint:disable:no-bitwise */ -/* - Client Message is the carrier framed data as defined below. - Any request parameter, response or event data will be carried in the payload. - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - |R| Frame Length | - +-------------+---------------+---------------------------------+ - | Version |B|E| Flags | Type | - +-------------+---------------+---------------------------------+ - | CorrelationId | - | | - +---------------------------------------------------------------+ - | PartitionId | - +-----------------------------+---------------------------------+ - | Data Offset | | - +-----------------------------+ | - | Message Payload Data ... - | ... - */ - import {Buffer} from 'safe-buffer'; -import * as Long from 'long'; import {BitsUtil} from './BitsUtil'; -import {Data} from './serialization/Data'; -import {HeapData} from './serialization/HeapData'; +import {ClientConnection} from './network/ClientConnection'; +import {FixSizedTypesCodec} from './codec/builtin/FixSizedTypesCodec'; -class ClientMessage { +const MESSAGE_TYPE_OFFSET = 0; +const CORRELATION_ID_OFFSET = MESSAGE_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +export const RESPONSE_BACKUP_ACKS_OFFSET = CORRELATION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +export const PARTITION_ID_OFFSET = CORRELATION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const FRAGMENTATION_ID_OFFSET = 0; - private buffer: Buffer; - private cursor: number = BitsUtil.HEADER_SIZE; - private isRetryable: boolean; +export const DEFAULT_FLAGS = 0; +const BEGIN_FRAGMENT_FLAG = 1 << 15; +const END_FRAGMENT_FLAG = 1 << 14; +const UNFRAGMENTED_MESSAGE = BEGIN_FRAGMENT_FLAG | END_FRAGMENT_FLAG; +const IS_FINAL_FLAG = 1 << 13; +const BEGIN_DATA_STRUCTURE_FLAG = 1 << 12; +const END_DATA_STRUCTURE_FLAG = 1 << 11; +const IS_NULL_FLAG = 1 << 10; +const IS_EVENT_FLAG = 1 << 9; - constructor(buffer: Buffer) { - this.buffer = buffer; - } +export const SIZE_OF_FRAME_LENGTH_AND_FLAGS = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.SHORT_SIZE_IN_BYTES; - public static newClientMessage(payloadSize: number): ClientMessage { - const totalSize = BitsUtil.HEADER_SIZE + payloadSize; - const buffer = Buffer.allocUnsafe(totalSize); - const message = new ClientMessage(buffer); - message.setDataOffset(BitsUtil.HEADER_SIZE); - message.setVersion(BitsUtil.VERSION); - message.setFrameLength(totalSize); - message.setFlags(0xc0); - message.setPartitionId(-1); - return message; - } +export class Frame { + content: Buffer; + flags: number; + next: Frame; - clone(): ClientMessage { - const message = new ClientMessage(Buffer.from(this.buffer)); - message.isRetryable = this.isRetryable; - return message; + constructor(content: Buffer, flags?: number) { + this.content = content; + this.flags = flags || DEFAULT_FLAGS; } - getBuffer(): Buffer { - return this.buffer; + static createInitialFrame(size: number, flags = UNFRAGMENTED_MESSAGE): Frame { + return new Frame(Buffer.allocUnsafe(size), flags); } - getCorrelationId(): number { - const offset = BitsUtil.CORRELATION_ID_FIELD_OFFSET; - return this.readLongInternal(offset).toNumber(); + getLength(): number { + return SIZE_OF_FRAME_LENGTH_AND_FLAGS + this.content.length; } - setCorrelationId(value: number): void { - this.writeLongInternal(value, BitsUtil.CORRELATION_ID_FIELD_OFFSET); + copy(): Frame { + const frame = new Frame(this.content, this.flags); + frame.next = this.next; + return frame; } - getPartitionId(): number { - return this.buffer.readInt32LE(BitsUtil.PARTITION_ID_FIELD_OFFSET); + deepCopy(): Frame { + const content = Buffer.from(this.content); + const frame = new Frame(content, this.flags); + frame.next = this.next; + return frame; } - setPartitionId(value: number): void { - this.buffer.writeInt32LE(value, BitsUtil.PARTITION_ID_FIELD_OFFSET); + isBeginFrame(): boolean { + return this.isFlagSet(this.flags, BEGIN_DATA_STRUCTURE_FLAG); } - setVersion(value: number): void { - this.buffer.writeUInt8(value, BitsUtil.VERSION_FIELD_OFFSET); + isEndFrame(): boolean { + return this.isFlagSet(this.flags, END_DATA_STRUCTURE_FLAG); } - getMessageType(): number { - return this.buffer.readUInt16LE(BitsUtil.TYPE_FIELD_OFFSET); + isNullFrame(): boolean { + return this.isFlagSet(this.flags, IS_NULL_FLAG); } - setMessageType(value: number): void { - this.buffer.writeUInt16LE(value, BitsUtil.TYPE_FIELD_OFFSET); + hasEventFlag(): boolean { + return this.isFlagSet(this.flags, IS_EVENT_FLAG); } - getFlags(): number { - return this.buffer.readUInt8(BitsUtil.FLAGS_FIELD_OFFSET); + isFinalFrame(): boolean { + return this.isFlagSet(this.flags, IS_FINAL_FLAG); } - setFlags(value: number): void { - this.buffer.writeUInt8(value, BitsUtil.FLAGS_FIELD_OFFSET); + hasUnfragmentedMessageFlag(): boolean { + return this.isFlagSet(this.flags, UNFRAGMENTED_MESSAGE); } - hasFlags(flags: number): number { - return this.getFlags() & flags; + hasBeginFragmentFlag(): boolean { + return this.isFlagSet(this.flags, BEGIN_FRAGMENT_FLAG); } - getFrameLength(): number { - return this.buffer.readInt32LE(BitsUtil.FRAME_LENGTH_FIELD_OFFSET); + hasEndFragmentFlag(): boolean { + return this.isFlagSet(this.flags, END_FRAGMENT_FLAG); } - setFrameLength(value: number): void { - this.buffer.writeInt32LE(value, BitsUtil.FRAME_LENGTH_FIELD_OFFSET); + private isFlagSet(flags: number, flagMask: number): boolean { + const i = flags & flagMask; + return i === flagMask; } +} - getDataOffset(): number { - return this.buffer.readInt16LE(BitsUtil.DATA_OFFSET_FIELD_OFFSET); +export const NULL_FRAME = new Frame(Buffer.allocUnsafe(0), IS_NULL_FLAG); +export const BEGIN_FRAME = new Frame(Buffer.allocUnsafe(0), BEGIN_DATA_STRUCTURE_FLAG); +export const END_FRAME = new Frame(Buffer.allocUnsafe(0), END_DATA_STRUCTURE_FLAG); + +export class ClientMessage { + startFrame: Frame; + endFrame: Frame; + private retryable: boolean; + private connection: ClientConnection; + private _nextFrame: Frame; + + private constructor(startFrame?: Frame, endFrame?: Frame) { + this.startFrame = startFrame; + this.endFrame = endFrame || startFrame; + this._nextFrame = startFrame; } - setDataOffset(value: number): void { - this.buffer.writeInt16LE(value, BitsUtil.DATA_OFFSET_FIELD_OFFSET); + static createForEncode(): ClientMessage { + return new ClientMessage(); } - setRetryable(value: boolean): void { - this.isRetryable = value; + static createForDecode(startFrame: Frame, endFrame?: Frame): ClientMessage { + return new ClientMessage(startFrame, endFrame); } - appendByte(value: number): void { - this.buffer.writeUInt8(value, this.cursor); - this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; + getStartFrame(): Frame { + return this.startFrame; } - appendBoolean(value: boolean): void { - return this.appendByte(value ? 1 : 0); + nextFrame(): Frame { + const result = this._nextFrame; + if (this._nextFrame != null) { + this._nextFrame = this._nextFrame.next; + } + return result; } - appendInt32(value: number): void { - this.buffer.writeInt32LE(value, this.cursor); - this.cursor += BitsUtil.INT_SIZE_IN_BYTES; + hasNextFrame(): boolean { + return this._nextFrame != null; } - appendUint8(value: number): void { - this.buffer.writeUInt8(value, this.cursor); - this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; + peekNextFrame(): Frame { + return this._nextFrame; } - appendLong(value: any): void { - this.writeLongInternal(value, this.cursor); - this.cursor += BitsUtil.LONG_SIZE_IN_BYTES; + addFrame(frame: Frame): void { + frame.next = null; + if (this.startFrame == null) { + this.startFrame = frame; + this.endFrame = frame; + this._nextFrame = frame; + return; + } + + this.endFrame.next = frame; + this.endFrame = frame; } - appendString(value: string): void { - const length = Buffer.byteLength(value, 'utf8'); - this.buffer.writeInt32LE(length, this.cursor); - this.cursor += 4; - this.buffer.write(value, this.cursor); - this.cursor += length; + getMessageType(): number { + return this.startFrame.content.readInt32LE(MESSAGE_TYPE_OFFSET); } - appendBuffer(buffer: Buffer): void { - const length = buffer.length; - this.appendInt32(length); - buffer.copy(this.buffer, this.cursor); - this.cursor += length; + setMessageType(messageType: number): void { + this.startFrame.content.writeInt32LE(messageType, MESSAGE_TYPE_OFFSET); } - appendData(data: Data): void { - this.appendBuffer(data.toBuffer()); + getCorrelationId(): number { + return FixSizedTypesCodec.decodeLong(this.startFrame.content, CORRELATION_ID_OFFSET).toNumber(); } - addFlag(value: number): void { - this.buffer.writeUInt8(value | this.getFlags(), BitsUtil.FLAGS_FIELD_OFFSET); + setCorrelationId(correlationId: any): void { + FixSizedTypesCodec.encodeLong(this.startFrame.content, CORRELATION_ID_OFFSET, correlationId); } - updateFrameLength(): void { - this.setFrameLength(this.cursor); + getPartitionId(): number { + return this.startFrame.content.readInt32LE(PARTITION_ID_OFFSET); } - readData(): Data { - const dataPayload: Buffer = this.readBuffer(); - return new HeapData(dataPayload); + setPartitionId(partitionId: number): void { + this.startFrame.content.writeInt32LE(partitionId, PARTITION_ID_OFFSET); } - readByte(): number { - const value = this.buffer.readUInt8(this.cursor); - this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; - return value; + getHeaderFlags(): number { + return this.startFrame.flags; } - readBoolean(): boolean { - return this.readByte() === 1; + isRetryable(): boolean { + return this.retryable; } - readUInt8(): number { - const value = this.buffer.readUInt8(this.cursor); - this.cursor += BitsUtil.BYTE_SIZE_IN_BYTES; - return value; + setRetryable(retryable: boolean): void { + this.retryable = retryable; } - readInt32(): number { - const value = this.buffer.readInt32LE(this.cursor); - this.cursor += BitsUtil.INT_SIZE_IN_BYTES; - return value; + getConnection(): ClientConnection { + return this.connection; } - readLong(): Long { - const value = this.readLongInternal(this.cursor); - this.cursor += BitsUtil.LONG_SIZE_IN_BYTES; - return value; + setConnection(connection: ClientConnection): void { + this.connection = connection; } - readString(): string { - const length = this.buffer.readInt32LE(this.cursor); - this.cursor += BitsUtil.INT_SIZE_IN_BYTES; - const value = this.buffer.toString('utf8', this.cursor, this.cursor + length); - this.cursor += length; - return value; + getTotalFrameLength(): number { + let frameLength = 0; + let currentFrame = this.startFrame; + while (currentFrame != null) { + frameLength += currentFrame.getLength(); + currentFrame = currentFrame.next; + } + return frameLength; } - readBuffer(): Buffer { - const size = this.buffer.readUInt32LE(this.cursor); - this.cursor += BitsUtil.INT_SIZE_IN_BYTES; - const result = this.buffer.slice(this.cursor, this.cursor + size); - this.cursor += size; - return result; + getFragmentationId(): number { + return FixSizedTypesCodec.decodeLong(this.startFrame.content, FRAGMENTATION_ID_OFFSET).toNumber(); } - isComplete(): boolean { - return (this.cursor >= BitsUtil.HEADER_SIZE) && (this.cursor === this.getFrameLength()); + merge(fragment: ClientMessage): void { + // Should be called after calling dropFragmentationFrame() on the fragment + this.endFrame.next = fragment.startFrame; + this.endFrame = fragment.endFrame; } - readMapEntry(): any { - // TODO + dropFragmentationFrame(): void { + this.startFrame = this.startFrame.next; + this._nextFrame = this._nextFrame.next; } - private writeLongInternal(value: any, offset: number): void { - if (!Long.isLong(value)) { - value = Long.fromValue(value); - } + copyWithNewCorrelationId(): ClientMessage { + const startFrameCopy = this.startFrame.deepCopy(); + const newMessage = new ClientMessage(startFrameCopy, this.endFrame); - this.buffer.writeInt32LE(value.low, offset); - this.buffer.writeInt32LE(value.high, offset + 4); + newMessage.setCorrelationId(-1); + newMessage.retryable = this.retryable; + return newMessage; } - private readLongInternal(offset: number): Long { - const low = this.buffer.readInt32LE(offset); - const high = this.buffer.readInt32LE(offset + 4); - return new Long(low, high); + toBuffer(): Buffer { + const buffers: Buffer[] = []; + let totalLength = 0; + let currentFrame = this.startFrame; + while (currentFrame != null) { + const isLastFrame = currentFrame.next == null; + const frameLengthAndFlags = Buffer.allocUnsafe(SIZE_OF_FRAME_LENGTH_AND_FLAGS); + frameLengthAndFlags.writeInt32LE(currentFrame.content.length + SIZE_OF_FRAME_LENGTH_AND_FLAGS, 0); + + if (isLastFrame) { + // tslint:disable-next-line:no-bitwise + frameLengthAndFlags.writeUInt16LE(currentFrame.flags | IS_FINAL_FLAG, BitsUtil.INT_SIZE_IN_BYTES); + } else { + frameLengthAndFlags.writeUInt16LE(currentFrame.flags, BitsUtil.INT_SIZE_IN_BYTES); + } + totalLength += SIZE_OF_FRAME_LENGTH_AND_FLAGS; + buffers.push(frameLengthAndFlags); + totalLength += currentFrame.content.length; + buffers.push(currentFrame.content); + currentFrame = currentFrame.next; + } + return Buffer.concat(buffers, totalLength); } } - -export = ClientMessage; diff --git a/src/ClusterDataFactory.ts b/src/ClusterDataFactory.ts index 903e60d90..9adde1259 100644 --- a/src/ClusterDataFactory.ts +++ b/src/ClusterDataFactory.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import Address = require('./Address'); import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './serialization/Serializable'; +import {Address} from './Address'; export class ClusterDataFactory implements IdentifiedDataSerializableFactory { diff --git a/src/ClusterDataFactoryHelper.ts b/src/ClusterDataFactoryHelper.ts index c04d2ff5a..6a50a661d 100644 --- a/src/ClusterDataFactoryHelper.ts +++ b/src/ClusterDataFactoryHelper.ts @@ -17,5 +17,4 @@ export class ClusterDataFactoryHelper { static readonly FACTORY_ID = 0; static readonly ADDRESS_ID = 1; - static readonly VECTOR_CLOCK = 43; } diff --git a/src/codec/PNCounterMessageType.ts b/src/DistributedObjectInfo.ts similarity index 75% rename from src/codec/PNCounterMessageType.ts rename to src/DistributedObjectInfo.ts index f04c6580e..507c65d0a 100644 --- a/src/codec/PNCounterMessageType.ts +++ b/src/DistributedObjectInfo.ts @@ -14,9 +14,12 @@ * limitations under the License. */ -/* tslint:disable */ -export class PNCounterMessageType { - static PNCOUNTER_GET = 0x2001; - static PNCOUNTER_ADD = 0x2002; - static PNCOUNTER_GETCONFIGUREDREPLICACOUNT = 0x2003; +export class DistributedObjectInfo { + serviceName: string; + name: string; + + constructor(serviceName: string, name: string) { + this.serviceName = serviceName; + this.name = name; + } } diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 5a70baf1b..af8ef62d5 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -20,11 +20,10 @@ import {ClientGetDistributedObjectsCodec} from './codec/ClientGetDistributedObje import {ClientConfig} from './config/Config'; import {ConfigBuilder} from './config/ConfigBuilder'; import {DistributedObject} from './DistributedObject'; -import {Heartbeat} from './HeartbeatService'; -import {ClientConnectionManager} from './invocation/ClientConnectionManager'; +import {ClientConnectionManager} from './network/ClientConnectionManager'; import {ClusterService} from './invocation/ClusterService'; import {InvocationService} from './invocation/InvocationService'; -import {LifecycleEvent, LifecycleService} from './LifecycleService'; +import {LifecycleService} from './LifecycleService'; import {ListenerService} from './ListenerService'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; import {LoggingService} from './logging/LoggingService'; @@ -32,30 +31,29 @@ import {RepairingTask} from './nearcache/RepairingTask'; import {PartitionService} from './PartitionService'; import {ClientErrorFactory} from './protocol/ErrorFactory'; import {FlakeIdGenerator} from './proxy/FlakeIdGenerator'; -import {IAtomicLong} from './proxy/IAtomicLong'; import {IList} from './proxy/IList'; -import {ILock} from './proxy/ILock'; import {IMap} from './proxy/IMap'; import {IQueue} from './proxy/IQueue'; import {ReplicatedMap} from './proxy/ReplicatedMap'; import {Ringbuffer} from './proxy/Ringbuffer'; -import {ISemaphore} from './proxy/ISemaphore'; import {ISet} from './proxy/ISet'; import {MultiMap} from './proxy/MultiMap'; import {PNCounter} from './proxy/PNCounter'; -import {ProxyManager} from './proxy/ProxyManager'; +import {ProxyManager, NAMESPACE_SEPARATOR} from './proxy/ProxyManager'; import {ITopic} from './proxy/topic/ITopic'; import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; import {AddressProvider} from './connection/AddressProvider'; import {HazelcastCloudAddressProvider} from './discovery/HazelcastCloudAddressProvider'; -import {HazelcastCloudAddressTranslator} from './discovery/HazelcastCloudAddressTranslator'; -import {AddressTranslator} from './connection/AddressTranslator'; -import {DefaultAddressTranslator} from './connection/DefaultAddressTranslator'; import {DefaultAddressProvider} from './connection/DefaultAddressProvider'; import {HazelcastCloudDiscovery} from './discovery/HazelcastCloudDiscovery'; import {Statistics} from './statistics/Statistics'; import {NearCacheManager} from './nearcache/NearCacheManager'; import {DistributedObjectListener} from './core/DistributedObjectListener'; +import {IllegalStateError} from './HazelcastError'; +import {LoadBalancer} from './LoadBalancer'; +import {RoundRobinLB} from './util/RoundRobinLB'; +import {ClusterViewListenerService} from './listener/ClusterViewListenerService'; +import {ClientMessage} from './ClientMessage'; export default class HazelcastClient { private static CLIENT_ID = 0; @@ -73,18 +71,17 @@ export default class HazelcastClient { private readonly lifecycleService: LifecycleService; private readonly proxyManager: ProxyManager; private readonly nearCacheManager: NearCacheManager; - private readonly heartbeat: Heartbeat; private readonly lockReferenceIdGenerator: LockReferenceIdGenerator; private readonly errorFactory: ClientErrorFactory; private readonly statistics: Statistics; + private readonly addressProvider: AddressProvider; + private readonly loadBalancer: LoadBalancer; + private readonly clusterViewListenerService: ClusterViewListenerService; private mapRepairingTask: RepairingTask; - constructor(config?: ClientConfig) { - if (config) { - this.config = config; - } - + constructor(config: ClientConfig) { + this.config = config; if (config.getInstanceName() != null) { this.instanceName = config.getInstanceName(); } else { @@ -93,21 +90,21 @@ export default class HazelcastClient { this.loggingService = new LoggingService(this.config.customLogger, this.config.properties['hazelcast.logging.level'] as number); - this.invocationService = new InvocationService(this); + this.loadBalancer = this.initLoadBalancer(); this.listenerService = new ListenerService(this); this.serializationService = new SerializationServiceV1(this, this.config.serializationConfig); - this.proxyManager = new ProxyManager(this); this.nearCacheManager = new NearCacheManager(this); this.partitionService = new PartitionService(this); - const addressProviders = this.createAddressProviders(); - const addressTranslator = this.createAddressTranslator(); - this.connectionManager = new ClientConnectionManager(this, addressTranslator, addressProviders); + this.addressProvider = this.createAddressProvider(); + this.connectionManager = new ClientConnectionManager(this); + this.invocationService = new InvocationService(this); + this.proxyManager = new ProxyManager(this); this.clusterService = new ClusterService(this); this.lifecycleService = new LifecycleService(this); - this.heartbeat = new Heartbeat(this); this.lockReferenceIdGenerator = new LockReferenceIdGenerator(); this.errorFactory = new ClientErrorFactory(); this.statistics = new Statistics(this); + this.clusterViewListenerService = new ClusterViewListenerService(this); } /** @@ -142,7 +139,7 @@ export default class HazelcastClient { * @returns {ClientInfo} */ getLocalEndpoint(): ClientInfo { - return this.clusterService.getClientInfo(); + return this.clusterService.getLocalClient(); } /** @@ -151,14 +148,38 @@ export default class HazelcastClient { */ getDistributedObjects(): Promise { const clientMessage = ClientGetDistributedObjectsCodec.encodeRequest(); - const toObjectFunc = this.getSerializationService().toObject.bind(this); - const proxyManager = this.proxyManager; - return this.invocationService.invokeOnRandomTarget(clientMessage).then(function (resp): any { - const response = ClientGetDistributedObjectsCodec.decodeResponse(resp, toObjectFunc).response; - return response.map((objectInfo: { [key: string]: any }) => { - return proxyManager.getOrCreateProxy(objectInfo.value, objectInfo.key, false).value(); + let localDistributedObjects: Set; + let responseMessage: ClientMessage; + return this.invocationService.invokeOnRandomTarget(clientMessage) + .then((resp) => { + responseMessage = resp; + return this.proxyManager.getDistributedObjects(); + }) + .then((distributedObjects) => { + localDistributedObjects = new Set(); + distributedObjects.forEach((obj) => { + localDistributedObjects.add(obj.getServiceName() + NAMESPACE_SEPARATOR + obj.getName()); + }); + + const newDistributedObjectInfos = ClientGetDistributedObjectsCodec.decodeResponse(responseMessage).response; + const createLocalProxiesPromise = newDistributedObjectInfos.map((doi) => { + return this.proxyManager.getOrCreateProxy(doi.name, doi.serviceName, false) + .then(() => localDistributedObjects.delete(doi.serviceName + NAMESPACE_SEPARATOR + doi.name)); + }); + + return Promise.all(createLocalProxiesPromise); + }) + .then(() => { + const destroyLocalProxiesPromises = new Array>(localDistributedObjects.size); + let index = 0; + localDistributedObjects.forEach((namespace) => { + destroyLocalProxiesPromises[index++] = this.proxyManager.destroyProxyLocally(namespace); + }); + return Promise.all(destroyLocalProxiesPromises); + }) + .then(() => { + return this.proxyManager.getDistributedObjects(); }); - }); } /** @@ -179,15 +200,6 @@ export default class HazelcastClient { return this.proxyManager.getOrCreateProxy(name, ProxyManager.SET_SERVICE) as Promise>; } - /** - * Returns the distributed lock instance with given name. - * @param name - * @returns {Promise} - */ - getLock(name: string): Promise { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.LOCK_SERVICE) as Promise; - } - /** * Returns the distributed queue instance with given name. * @param name @@ -242,15 +254,6 @@ export default class HazelcastClient { return this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE) as Promise>; } - /** - * Returns the distributed atomic long instance with given name. - * @param name - * @returns {Promise} - */ - getAtomicLong(name: string): Promise { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.ATOMICLONG_SERVICE) as Promise; - } - /** * Returns the distributed flake ID generator instance with given name. * @param name @@ -269,15 +272,6 @@ export default class HazelcastClient { return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE) as Promise; } - /** - * Returns the distributed semaphore instance with given name. - * @param name - * @returns {Promise} - */ - getSemaphore(name: string): Promise { - return this.proxyManager.getOrCreateProxy(name, ProxyManager.SEMAPHORE_SERVICE) as Promise; - } - /** * Return configuration that this instance started with. * Returned configuration object should not be modified. @@ -319,10 +313,6 @@ export default class HazelcastClient { return this.clusterService; } - getHeartbeat(): Heartbeat { - return this.heartbeat; - } - getLifecycleService(): LifecycleService { return this.lifecycleService; } @@ -370,64 +360,105 @@ export default class HazelcastClient { } /** - * Shuts down this client instance. + * Returns the {@link AddressProvider} of the client. */ - shutdown(): void { - this.lifecycleService.emitLifecycleEvent(LifecycleEvent.shuttingDown); + getAddressProvider(): AddressProvider { + return this.addressProvider; + } + + getLoadBalancer(): LoadBalancer { + return this.loadBalancer; + } + + doShutdown(): void { if (this.mapRepairingTask !== undefined) { this.mapRepairingTask.shutdown(); } this.nearCacheManager.destroyAllNearCaches(); - this.statistics.stop(); - this.partitionService.shutdown(); - this.heartbeat.cancel(); + this.proxyManager.destroy(); this.connectionManager.shutdown(); - this.listenerService.shutdown(); this.invocationService.shutdown(); - this.lifecycleService.emitLifecycleEvent(LifecycleEvent.shutdown); + this.statistics.stop(); + } + + /** + * Shuts down this client instance. + */ + shutdown(): void { + this.getLifecycleService().shutdown(); + } + + onClusterRestart(): void { + this.getLoggingService().getLogger() + .info('HazelcastClient', 'Clearing local state of the client, because of a cluster restart'); + this.nearCacheManager.clearAllNearCaches(); + this.clusterService.clearMemberListVersion(); + } + + public sendStateToCluster(): Promise { + return this.proxyManager.createDistributedObjectsOnCluster(); } private init(): Promise { - return this.clusterService.start().then(() => { - return this.partitionService.initialize(); - }).then(() => { - return this.heartbeat.start(); - }).then(() => { - this.lifecycleService.emitLifecycleEvent(LifecycleEvent.started); - }).then(() => { - this.proxyManager.init(); - this.listenerService.start(); - this.statistics.start(); - return this; - }).catch((e) => { + try { + this.lifecycleService.start(); + const configuredMembershipListeners = this.config.listeners.getMembershipListeners(); + this.clusterService.start(configuredMembershipListeners); + this.clusterViewListenerService.start(); + } catch (e) { this.loggingService.getLogger().error('HazelcastClient', 'Client failed to start', e); throw e; - }); + } + + return this.connectionManager.start() + .then(() => { + const connectionStrategyConfig = this.config.connectionStrategyConfig; + if (!connectionStrategyConfig.asyncStart) { + return this.clusterService.waitInitialMemberListFetched() + .then(() => this.connectionManager.connectToAllClusterMembers()); + } + }) + .then(() => { + this.listenerService.start(); + this.proxyManager.init(); + this.loadBalancer.initLoadBalancer(this.clusterService, this.config); + this.statistics.start(); + return this.sendStateToCluster(); + }) + .then(() => { + return this; + }) + .catch((e) => { + this.loggingService.getLogger().error('HazelcastClient', 'Client failed to start', e); + throw e; + }); } - private createAddressTranslator(): AddressTranslator { - const cloudConfig = this.getConfig().networkConfig.cloudConfig; - if (cloudConfig.enabled) { - const urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(this.getConfig().properties, - cloudConfig.discoveryToken); - return new HazelcastCloudAddressTranslator(urlEndpoint, this.getConnectionTimeoutMillis(), - this.loggingService.getLogger()); + private initLoadBalancer(): LoadBalancer { + let lb = this.config.loadBalancer; + if (lb == null) { + lb = new RoundRobinLB(); } - return new DefaultAddressTranslator(); - + return lb; } - private createAddressProviders(): AddressProvider[] { + private createAddressProvider(): AddressProvider { const networkConfig = this.getConfig().networkConfig; - const addressProviders: AddressProvider[] = []; + + const addressListProvided = networkConfig.addresses.length !== 0; + const hazelcastCloudEnabled = networkConfig.cloudConfig.enabled; + if (addressListProvided && hazelcastCloudEnabled) { + throw new IllegalStateError('Only one discovery method can be enabled at a time. ' + + 'Cluster members given explicitly: ' + addressListProvided + + ', hazelcast.cloud enabled: ' + hazelcastCloudEnabled); + } const cloudAddressProvider = this.initCloudAddressProvider(); if (cloudAddressProvider != null) { - addressProviders.push(cloudAddressProvider); + return cloudAddressProvider; } - addressProviders.push(new DefaultAddressProvider(networkConfig, addressProviders.length === 0)); - return addressProviders; + return new DefaultAddressProvider(networkConfig); } private initCloudAddressProvider(): HazelcastCloudAddressProvider { diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index 67494c3ed..1157602f2 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -54,6 +54,27 @@ export class ClientNotActiveError extends HazelcastError { } } +export class ClientNotAllowedInClusterError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ClientNotAllowedInClusterError.prototype); + } +} + +export class ClientOfflineError extends HazelcastError { + constructor(cause?: Error) { + super('No connection found to cluster', cause); + Object.setPrototypeOf(this, ClientOfflineError.prototype); + } +} + +export class InvalidConfigurationError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, InvalidConfigurationError.prototype); + } +} + export class IllegalStateError extends HazelcastError { constructor(msg: string, cause?: Error) { super(msg, cause); @@ -152,13 +173,6 @@ export class ConfigMismatchError extends HazelcastError { } } -export class ConfigurationError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); - Object.setPrototypeOf(this, ConfigurationError.prototype); - } -} - export class DistributedObjectDestroyedError extends HazelcastError { constructor(msg: string, cause?: Error) { super(msg, cause); @@ -166,13 +180,6 @@ export class DistributedObjectDestroyedError extends HazelcastError { } } -export class DuplicateInstanceNameError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); - Object.setPrototypeOf(this, DuplicateInstanceNameError.prototype); - } -} - export class HazelcastInstanceNotActiveError extends IllegalStateError { constructor(msg: string, cause?: Error) { super(msg, cause); @@ -222,10 +229,10 @@ export class TransactionTimedOutError extends HazelcastError { } } -export class QuorumError extends TransactionError { +export class SplitBrainProtectionError extends TransactionError { constructor(msg: string, cause?: Error) { super(msg, cause); - Object.setPrototypeOf(this, QuorumError.prototype); + Object.setPrototypeOf(this, SplitBrainProtectionError.prototype); } } diff --git a/src/HeartbeatManager.ts b/src/HeartbeatManager.ts new file mode 100644 index 000000000..641d52021 --- /dev/null +++ b/src/HeartbeatManager.ts @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientPingCodec} from './codec/ClientPingCodec'; +import HazelcastClient from './HazelcastClient'; +import {ClientConnection} from './network/ClientConnection'; +import {ILogger} from './logging/ILogger'; +import {ClientConnectionManager} from './network/ClientConnectionManager'; +import {cancelRepetitionTask, scheduleWithRepetition, Task} from './Util'; +import {TargetDisconnectedError} from './HazelcastError'; +import {Invocation} from './invocation/InvocationService'; + +const PROPERTY_HEARTBEAT_INTERVAL: string = 'hazelcast.client.heartbeat.interval'; +const PROPERTY_HEARTBEAT_TIMEOUT: string = 'hazelcast.client.heartbeat.timeout'; + +/** + * HeartbeatManager manager used by connection manager. + */ +export class HeartbeatManager { + private client: HazelcastClient; + private connectionManager: ClientConnectionManager; + private readonly heartbeatTimeout: number; + private readonly heartbeatInterval: number; + private logger: ILogger; + private timer: Task; + + constructor(client: HazelcastClient, connectionManager: ClientConnectionManager) { + this.client = client; + this.connectionManager = connectionManager; + this.logger = this.client.getLoggingService().getLogger(); + this.heartbeatInterval = this.client.getConfig().properties[PROPERTY_HEARTBEAT_INTERVAL] as number; + this.heartbeatTimeout = this.client.getConfig().properties[PROPERTY_HEARTBEAT_TIMEOUT] as number; + } + + /** + * Starts sending periodic heartbeat operations. + */ + public start(): void { + this.timer = scheduleWithRepetition(this.heartbeatFunction.bind(this), this.heartbeatInterval, this.heartbeatInterval); + } + + /** + * Cancels the periodic heartbeat operation. + */ + public shutdown(): void { + cancelRepetitionTask(this.timer); + } + + /** + * Returns the heartbeat timeout in milliseconds. + */ + public getHeartbeatTimeout(): number { + return this.heartbeatTimeout; + } + + private heartbeatFunction(): void { + if (!this.connectionManager.isAlive()) { + return; + } + + const now = Date.now(); + const activeConnections = this.connectionManager.getActiveConnections(); + for (const connection of activeConnections) { + this.checkConnection(now, connection); + } + } + + private checkConnection(now: number, connection: ClientConnection): void { + if (!connection.isAlive()) { + return; + } + + if (now - connection.getLastReadTimeMillis() > this.heartbeatTimeout) { + if (connection.isAlive()) { + this.logger.warn('HeartbeatManager', `Heartbeat failed over connection: ${connection}`); + this.onHeartbeatStopped(connection, 'Heartbeat timed out'); + } + } + + if (now - connection.getLastWriteTimeMillis() > this.heartbeatInterval) { + const request = ClientPingCodec.encodeRequest(); + const invocation = new Invocation(this.client, request); + invocation.connection = connection; + this.client.getInvocationService() + .invokeUrgent(invocation) + .catch(() => { + // No-op + }); + } + } + + private onHeartbeatStopped(connection: ClientConnection, reason: string): void { + connection.close(reason, new TargetDisconnectedError(`Heartbeat timed out to connection ${connection}`)); + } +} diff --git a/src/HeartbeatService.ts b/src/HeartbeatService.ts deleted file mode 100644 index e7958f2d2..000000000 --- a/src/HeartbeatService.ts +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {ClientPingCodec} from './codec/ClientPingCodec'; -import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; -import HazelcastClient from './HazelcastClient'; -import {ClientConnection} from './invocation/ClientConnection'; -import {ILogger} from './logging/ILogger'; - -const PROPERTY_HEARTBEAT_INTERVAL: string = 'hazelcast.client.heartbeat.interval'; -const PROPERTY_HEARTBEAT_TIMEOUT: string = 'hazelcast.client.heartbeat.timeout'; - -/** - * Hearbeat Service - */ -export class Heartbeat { - private client: HazelcastClient; - private heartbeatTimeout: number; - private heartbeatInterval: number; - private listeners: ConnectionHeartbeatListener[] = []; - private logger: ILogger; - - // Actually it is a NodeJS.Timer. Another typing file that comes with a module we use causes TSD to see - // return type of setTimeout as number. Because of this we defined timer property as `any` type. - private timer: any; - - constructor(client: HazelcastClient) { - this.client = client; - this.logger = this.client.getLoggingService().getLogger(); - this.heartbeatInterval = this.client.getConfig().properties[PROPERTY_HEARTBEAT_INTERVAL] as number; - this.heartbeatTimeout = this.client.getConfig().properties[PROPERTY_HEARTBEAT_TIMEOUT] as number; - } - - /** - * Starts sending periodic heartbeat operations. - */ - start(): void { - this.timer = setTimeout(this.heartbeatFunction.bind(this), this.heartbeatInterval); - } - - /** - * Cancels scheduled heartbeat operations. - */ - cancel(): void { - clearTimeout(this.timer); - } - - /** - * Registers a heartbeat listener. Listener is invoked when a heartbeat related event occurs. - * @param heartbeatListener - */ - addListener(heartbeatListener: ConnectionHeartbeatListener): void { - this.listeners.push(heartbeatListener); - } - - private heartbeatFunction(): void { - const estConnections = this.client.getConnectionManager().establishedConnections; - for (const address in estConnections) { - if (estConnections[address]) { - const conn = estConnections[address]; - const now = Date.now(); - if (now - conn.getLastReadTimeMillis() > this.heartbeatTimeout) { - if (conn.isHeartbeating()) { - conn.setHeartbeating(false); - this.onHeartbeatStopped(conn); - } - } - if (now - conn.getLastWriteTimeMillis() > this.heartbeatInterval) { - const req = ClientPingCodec.encodeRequest(); - this.client.getInvocationService().invokeOnConnection(conn, req) - .catch((error) => { - if (conn.isAlive()) { - this.logger.warn('HeartbeatService', 'Error receiving ping answer from the connection: ' - + conn + ' ' + error); - } - }); - } else { - if (!conn.isHeartbeating()) { - conn.setHeartbeating(true); - this.onHeartbeatRestored(conn); - } - } - } - } - this.timer = setTimeout(this.heartbeatFunction.bind(this), this.heartbeatInterval); - } - - private onHeartbeatStopped(connection: ClientConnection): void { - this.logger.warn('HeartbeatService', 'Heartbeat stopped on ' + connection.toString()); - this.listeners.forEach((listener) => { - if (listener.hasOwnProperty('onHeartbeatStopped')) { - setImmediate(listener.onHeartbeatStopped.bind(this), connection); - } - }); - } - - private onHeartbeatRestored(connection: ClientConnection): void { - this.logger.warn('HeartbeatService', 'Heartbeat restored on ' + connection.toString()); - this.listeners.forEach((listener) => { - if (listener.hasOwnProperty('onHeartbeatRestored')) { - setImmediate(listener.onHeartbeatRestored.bind(this), connection); - } - }); - } - -} diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index 3002f0219..f929f027e 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -15,36 +15,52 @@ */ import {EventEmitter} from 'events'; -import {ImportConfig} from './config/ImportConfig'; +import {ListenerImportConfig} from './config/ImportConfig'; import HazelcastClient from './HazelcastClient'; import * as Util from './Util'; import {ILogger} from './logging/ILogger'; /** - * Lifecycle events. + * Lifecycle states. */ -export let LifecycleEvent = { +export enum LifecycleState { /** - * events are emitted with this name. + * Fired when the client is starting. */ - name: 'lifecycleEvent', + STARTING = 'STARTING', + + /** + * Fired when the client's start is completed. + */ + STARTED = 'STARTED', + + /** + * Fired when the client is shutting down. + */ + SHUTTING_DOWN = 'SHUTTING_DOWN', + /** - * From creation of client to connected state. + * Fired when the client's shut down is completed. */ - starting: 'starting', + SHUTDOWN = 'SHUTDOWN', + /** - * Client is connected to cluster. Ready to use. + * Fired when the client is connected to the member. */ - started: 'started', + CONNECTED = 'CONNECTED', + /** - * Disconnect initiated. + * Fired when the client is disconnected from the member. */ - shuttingDown: 'shuttingDown', + DISCONNECTED = 'DISCONNECTED', + /** - * Disconnect completed gracefully. + * Fired when the client is connected to a new cluster. */ - shutdown: 'shutdown', -}; + CHANGED_CLUSTER = 'CHANGED_CLUSTER', +} + +const LIFECYCLE_EVENT_NAME = 'lifecycleEvent'; /** * LifecycleService @@ -59,35 +75,28 @@ export class LifecycleService extends EventEmitter { this.setMaxListeners(0); this.client = client; this.logger = this.client.getLoggingService().getLogger(); - const listeners = client.getConfig().listeners.lifecycle; + const listeners = client.getConfig().listeners.lifecycleListeners; listeners.forEach((listener) => { - this.on(LifecycleEvent.name, listener); + this.on(LIFECYCLE_EVENT_NAME, listener); }); const listenerConfigs = client.getConfig().listenerConfigs; - listenerConfigs.forEach((importConfig: ImportConfig) => { - const path = importConfig.path; - const exportedName = importConfig.exportedName; - const listener = Util.loadNameFromPath(path, exportedName); - this.on(LifecycleEvent.name, listener); + listenerConfigs.forEach((config: ListenerImportConfig) => { + if (config.type === 'lifecycle') { + const path = config.importConfig.path; + const exportedName = config.importConfig.exportedName; + const listener = Util.loadNameFromPath(path, exportedName); + this.on(LIFECYCLE_EVENT_NAME, listener); + } }); - this.emitLifecycleEvent(LifecycleEvent.starting); } /** * Causes LifecycleService to emit given event to all registered listeners. * @param state */ - emitLifecycleEvent(state: string): void { - if (!LifecycleEvent.hasOwnProperty(state)) { - throw new Error(state + ' is not a valid lifecycle event'); - } - if (state === LifecycleEvent.started) { - this.active = true; - } else if (state === LifecycleEvent.shuttingDown) { - this.active = false; - } + emitLifecycleEvent(state: LifecycleState): void { this.logger.info('LifecycleService', 'HazelcastClient is ' + state); - this.emit(LifecycleEvent.name, state); + this.emit(LIFECYCLE_EVENT_NAME, state); } /** @@ -97,4 +106,21 @@ export class LifecycleService extends EventEmitter { isRunning(): boolean { return this.active; } + + public start(): void { + this.emitLifecycleEvent(LifecycleState.STARTING); + this.active = true; + this.emitLifecycleEvent(LifecycleState.STARTED); + } + + public shutdown(): void { + if (!this.active) { + return; + } + this.active = false; + + this.emitLifecycleEvent(LifecycleState.SHUTTING_DOWN); + this.client.doShutdown(); + this.emitLifecycleEvent(LifecycleState.SHUTDOWN); + } } diff --git a/src/ListenerMessageCodec.ts b/src/ListenerMessageCodec.ts index 617c90fa4..7dc07f842 100644 --- a/src/ListenerMessageCodec.ts +++ b/src/ListenerMessageCodec.ts @@ -14,10 +14,11 @@ * limitations under the License. */ -import ClientMessage = require('./ClientMessage'); +import {ClientMessage} from './ClientMessage'; +import {UUID} from './core/UUID'; export interface ListenerMessageCodec { encodeAddRequest: (localOnly: boolean) => ClientMessage; - decodeAddResponse: (msg: ClientMessage) => string; - encodeRemoveRequest: (listenerId: string) => ClientMessage; + decodeAddResponse: (msg: ClientMessage) => UUID; + encodeRemoveRequest: (listenerId: UUID) => ClientMessage; } diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 7e705f1d9..34823db8b 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -14,54 +14,37 @@ * limitations under the License. */ -import * as assert from 'assert'; import * as Promise from 'bluebird'; -import {EventEmitter} from 'events'; -import {ConnectionHeartbeatListener} from './core/ConnectionHeartbeatListener'; -import {Member} from './core/Member'; import HazelcastClient from './HazelcastClient'; import {HazelcastError} from './HazelcastError'; -import {ClientConnection} from './invocation/ClientConnection'; +import {ClientConnection} from './network/ClientConnection'; import {ClientEventRegistration} from './invocation/ClientEventRegistration'; import {Invocation} from './invocation/InvocationService'; import {RegistrationKey} from './invocation/RegistrationKey'; import {ListenerMessageCodec} from './ListenerMessageCodec'; -import {copyObjectShallow, DeferredPromise} from './Util'; +import {DeferredPromise} from './Util'; import {UuidUtil} from './util/UuidUtil'; import {ILogger} from './logging/ILogger'; -export class ListenerService implements ConnectionHeartbeatListener { +export class ListenerService { private client: HazelcastClient; - private internalEventEmitter: EventEmitter; private logger: ILogger; - private isShutdown: boolean; private isSmartService: boolean; private activeRegistrations: Map>; - private failedRegistrations: Map>; private userRegistrationKeyInformation: Map; - private connectionRefreshTask: any; - private connectionRefreshTaskInterval: number; constructor(client: HazelcastClient) { - this.isShutdown = false; this.client = client; this.logger = this.client.getLoggingService().getLogger(); this.isSmartService = this.client.getConfig().networkConfig.smartRouting; - this.internalEventEmitter = new EventEmitter(); - this.internalEventEmitter.setMaxListeners(0); this.activeRegistrations = new Map(); - this.failedRegistrations = new Map(); this.userRegistrationKeyInformation = new Map(); - this.connectionRefreshTaskInterval = 2000; } start(): void { - this.client.getConnectionManager().on('connectionOpened', this.onConnectionAdded.bind(this)); - this.client.getConnectionManager().on('connectionClosed', this.onConnectionRemoved.bind(this)); - if (this.isSmart()) { - this.connectionRefreshTask = this.connectionRefreshHandler(); - } + this.client.getConnectionManager().on('connectionAdded', this.onConnectionAdded.bind(this)); + this.client.getConnectionManager().on('connectionRemoved', this.onConnectionRemoved.bind(this)); } onConnectionAdded(connection: ClientConnection): void { @@ -72,13 +55,6 @@ export class ListenerService implements ConnectionHeartbeatListener { this.removeRegistrationsOnConnection(connection); } - onHeartbeatRestored(connection: ClientConnection): void { - const failedRegistrationsOnConn: Set = this.failedRegistrations.get(connection); - failedRegistrationsOnConn.forEach((userKey: string, ignored: string) => { - this.invokeRegistrationFromRecord(userKey, connection); - }); - } - reregisterListeners(): void { const connections = this.client.getConnectionManager().getActiveConnections(); for (const connAddress in connections) { @@ -87,11 +63,11 @@ export class ListenerService implements ConnectionHeartbeatListener { } reregisterListenersOnConnection(connection: ClientConnection): void { - this.activeRegistrations.forEach((registrationMap: Map, userKey: string) => { + this.activeRegistrations.forEach((registrationMap, userKey) => { if (registrationMap.has(connection)) { return; } - this.invokeRegistrationFromRecord(userKey, connection).then((eventRegistration: ClientEventRegistration) => { + this.invokeRegistrationFromRecord(userKey, connection).then((eventRegistration) => { registrationMap.set(connection, eventRegistration); }).catch((e) => { this.logger.warn('ListenerService', e); @@ -100,10 +76,8 @@ export class ListenerService implements ConnectionHeartbeatListener { } removeRegistrationsOnConnection(connection: ClientConnection): void { - this.failedRegistrations.delete(connection); - this.activeRegistrations.forEach((registrationsOnUserKey: Map, - userKey: string) => { - const eventRegistration: ClientEventRegistration = registrationsOnUserKey.get(connection); + this.activeRegistrations.forEach((registrationsOnUserKey) => { + const eventRegistration = registrationsOnUserKey.get(connection); if (eventRegistration !== undefined) { this.client.getInvocationService().removeEventHandler(eventRegistration.correlationId); } @@ -118,12 +92,13 @@ export class ListenerService implements ConnectionHeartbeatListener { return deferred.promise; } const registrationKey = this.userRegistrationKeyInformation.get(userRegistrationKey); - const registerRequest = registrationKey.getRegisterRequest(); + // New correlation id will be set on the invoke call + const registerRequest = registrationKey.getRegisterRequest().copyWithNewCorrelationId(); const codec = registrationKey.getCodec(); const invocation = new Invocation(this.client, registerRequest); invocation.handler = registrationKey.getHandler() as any; invocation.connection = connection; - this.client.getInvocationService().invoke(invocation).then((responseMessage) => { + this.client.getInvocationService().invokeUrgent(invocation).then((responseMessage) => { const correlationId = responseMessage.getCorrelationId(); const response = codec.decodeAddResponse(responseMessage); const eventRegistration = new ClientEventRegistration(response, correlationId, invocation.connection, codec); @@ -132,80 +107,14 @@ export class ListenerService implements ConnectionHeartbeatListener { deferred.resolve(eventRegistration); }).catch(((e) => { - let failedRegsOnConnection = this.failedRegistrations.get(connection); - if (failedRegsOnConnection === undefined) { - failedRegsOnConnection = new Set(); - failedRegsOnConnection.add(userRegistrationKey); - this.failedRegistrations.set(connection, failedRegsOnConnection); - } else { - failedRegsOnConnection.add(userRegistrationKey); - } deferred.reject(new HazelcastError('Could not add listener[' + userRegistrationKey + '] to connection[' + connection.toString() + ']', e)); })); return deferred.promise; } - registerListener(codec: ListenerMessageCodec, registerHandlerFunc: any): Promise { - let readyToRegisterPromise: Promise; - if (this.isSmart()) { - readyToRegisterPromise = this.trySyncConnectToAllConnections(); - } else { - // No need for preparation, just return a resolved promise - readyToRegisterPromise = Promise.resolve(); - } - return readyToRegisterPromise.then(() => { - return this.registerListenerInternal(codec, registerHandlerFunc); - }); - } - - deregisterListener(userRegistrationKey: string): Promise { - const deferred = DeferredPromise(); - const registrationsOnUserKey = this.activeRegistrations.get(userRegistrationKey); - if (registrationsOnUserKey === undefined) { - deferred.resolve(false); - return deferred.promise; - } - registrationsOnUserKey.forEach((eventRegistration: ClientEventRegistration, connection: ClientConnection) => { - const clientMessage = eventRegistration.codec.encodeRemoveRequest(eventRegistration.serverRegistrationId); - const invocation = new Invocation(this.client, clientMessage); - invocation.connection = eventRegistration.subscriber; - this.client.getInvocationService().invoke(invocation).then((responseMessage) => { - registrationsOnUserKey.delete(connection); - this.client.getInvocationService().removeEventHandler(eventRegistration.correlationId); - this.logger.debug('ListenerService', - 'Listener ' + userRegistrationKey + ' unregistered from ' + invocation.connection.toString()); - this.activeRegistrations.delete(userRegistrationKey); - this.userRegistrationKeyInformation.delete(userRegistrationKey); - deferred.resolve(true); - }); - }); - - return deferred.promise; - } - - isSmart(): boolean { - return this.isSmartService; - } - - shutdown(): void { - this.isShutdown = true; - clearTimeout(this.connectionRefreshTask); - } - - protected connectionRefreshHandler(): void { - if (this.isShutdown) { - return; - } - this.trySyncConnectToAllConnections().catch((e) => {/*no-op*/ - }).finally(() => { - this.connectionRefreshTask = - setTimeout(this.connectionRefreshHandler.bind(this), this.connectionRefreshTaskInterval); - }); - } - - protected registerListenerInternal(codec: ListenerMessageCodec, listenerHandlerFunc: Function): Promise { - const activeConnections = copyObjectShallow(this.client.getConnectionManager().getActiveConnections()); + registerListener(codec: ListenerMessageCodec, listenerHandlerFunc: Function): Promise { + const activeConnections = this.client.getConnectionManager().getActiveConnections(); const userRegistrationKey: string = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; const deferred = DeferredPromise(); @@ -217,22 +126,23 @@ export class ListenerService implements ConnectionHeartbeatListener { this.userRegistrationKeyInformation.set(userRegistrationKey, new RegistrationKey(userRegistrationKey, codec, registerRequest, listenerHandlerFunc)); } - for (const address in activeConnections) { - if (connectionsOnUserKey.has(activeConnections[address])) { + for (const connection of activeConnections) { + if (connectionsOnUserKey.has(connection)) { continue; } - const requestCopy = registerRequest.clone(); + // New correlation id will be set on the invoke call + const requestCopy = registerRequest.copyWithNewCorrelationId(); const invocation = new Invocation(this.client, requestCopy); invocation.handler = listenerHandlerFunc as any; - invocation.connection = activeConnections[address]; - this.client.getInvocationService().invoke(invocation).then((responseMessage) => { + invocation.connection = connection; + this.client.getInvocationService().invokeUrgent(invocation).then((responseMessage) => { const correlationId = responseMessage.getCorrelationId(); const response = codec.decodeAddResponse(responseMessage); const clientEventRegistration = new ClientEventRegistration( response, correlationId, invocation.connection, codec); this.logger.debug('ListenerService', 'Listener ' + userRegistrationKey + ' registered on ' + invocation.connection.toString()); - connectionsOnUserKey.set(activeConnections[address], clientEventRegistration); + connectionsOnUserKey.set(connection, clientEventRegistration); }).then(() => { deferred.resolve(userRegistrationKey); }).catch((e) => { @@ -245,13 +155,32 @@ export class ListenerService implements ConnectionHeartbeatListener { return deferred.promise; } - private trySyncConnectToAllConnections(): Promise { - assert(this.isSmart()); - const members = this.client.getClusterService().getMembers(); - const promises: Array> = []; - members.forEach((member: Member) => { - promises.push(this.client.getConnectionManager().getOrConnect(member.address)); + deregisterListener(userRegistrationKey: string): Promise { + const deferred = DeferredPromise(); + const registrationsOnUserKey = this.activeRegistrations.get(userRegistrationKey); + if (registrationsOnUserKey === undefined) { + deferred.resolve(false); + return deferred.promise; + } + registrationsOnUserKey.forEach((eventRegistration: ClientEventRegistration, connection: ClientConnection) => { + const clientMessage = eventRegistration.codec.encodeRemoveRequest(eventRegistration.serverRegistrationId); + const invocation = new Invocation(this.client, clientMessage); + invocation.connection = eventRegistration.subscriber; + this.client.getInvocationService().invoke(invocation).then((responseMessage) => { + registrationsOnUserKey.delete(connection); + this.client.getInvocationService().removeEventHandler(eventRegistration.correlationId); + this.logger.debug('ListenerService', + 'Listener ' + userRegistrationKey + ' unregistered from ' + invocation.connection.toString()); + this.activeRegistrations.delete(userRegistrationKey); + this.userRegistrationKeyInformation.delete(userRegistrationKey); + deferred.resolve(true); + }); }); - return Promise.all(promises).thenReturn(); + + return deferred.promise; + } + + isSmart(): boolean { + return this.isSmartService; } } diff --git a/src/LoadBalancer.ts b/src/LoadBalancer.ts new file mode 100644 index 000000000..fb8cf48a2 --- /dev/null +++ b/src/LoadBalancer.ts @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientConfig, ClientNetworkConfig} from './config/Config'; +import {Cluster} from './core/Cluster'; +import {Member} from './core/Member'; + +/** + * {@link LoadBalancer} allows you to send operations to one of a number of endpoints (Members). + * It is up to the implementation to use different load balancing policies. + *

+ * If Client is configured with {@link ClientNetworkConfig#smartRouting}, + * only the operations that are not key based will be routed to the endpoint + * returned by the LoadBalancer. If it is not, the LoadBalancer will not be used. + *

+ */ +export interface LoadBalancer { + /** + * Initializes the LoadBalancer. + * + * @param cluster the Cluster this LoadBalancer uses to select members from. + * @param config the ClientConfig. + */ + initLoadBalancer(cluster: Cluster, config: ClientConfig): void; + + /** + * Returns the next member to route to. + * + * @return Returns the next member or null if no member is available + */ + next(): Member; +} diff --git a/src/PartitionService.ts b/src/PartitionService.ts index 9f1fc1180..ee2bf3b62 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -14,84 +14,73 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import HazelcastClient from './HazelcastClient'; import {ILogger} from './logging/ILogger'; -import Address = require('./Address'); -import ClientMessage = require('./ClientMessage'); -import GetPartitionsCodec = require('./codec/GetPartitionsCodec'); +import {ClientConnection} from './network/ClientConnection'; +import {UUID} from './core/UUID'; +import {ClientOfflineError} from './HazelcastError'; -const PARTITION_REFRESH_INTERVAL = 10000; +class PartitionTable { + connection: ClientConnection; + partitionStateVersion: number = -1; + partitions = new Map(); +} +/** + * Partition service for Hazelcast clients. + * + * Allows to retrieve information about the partition count, the partition owner or the partitionId of a key. + */ export class PartitionService { private client: HazelcastClient; - private partitionMap: { [partitionId: number]: Address } = {}; - private partitionCount: number; - private partitionRefreshTask: any; - private isShutdown: boolean; + private partitionTable = new PartitionTable(); + private partitionCount: number = 0; private logger: ILogger; constructor(client: HazelcastClient) { this.client = client; this.logger = client.getLoggingService().getLogger(); - this.isShutdown = false; - } - - initialize(): Promise { - this.partitionRefreshTask = setInterval(this.refresh.bind(this), PARTITION_REFRESH_INTERVAL); - return this.refresh(); - } - - shutdown(): void { - clearInterval(this.partitionRefreshTask); - this.isShutdown = true; } /** - * Refreshes the internal partition table. + * The partitions can be empty on the response, client will not apply the empty partition table. */ - refresh(): Promise { - if (this.isShutdown) { - return Promise.resolve(); - } - const ownerConnection = this.client.getClusterService().getOwnerConnection(); - if (ownerConnection == null) { - return Promise.resolve(); + public handlePartitionViewEvent(connection: ClientConnection, partitions: Array<[UUID, number[]]>, + partitionStateVersion: number): void { + this.logger.debug('PartitionService', + 'Handling new partition table with partitionStateVersion: ' + partitionStateVersion); + if (!this.shouldBeApplied(connection, partitions, partitionStateVersion, this.partitionTable)) { + return; } - const clientMessage: ClientMessage = GetPartitionsCodec.encodeRequest(); - - return this.client.getInvocationService() - .invokeOnConnection(ownerConnection, clientMessage) - .then((response: ClientMessage) => { - const receivedPartitionMap = GetPartitionsCodec.decodeResponse(response); - for (const partitionId in receivedPartitionMap) { - this.partitionMap[partitionId] = receivedPartitionMap[partitionId]; - } - this.partitionCount = Object.keys(this.partitionMap).length; - }).catch((e) => { - if (this.client.getLifecycleService().isRunning()) { - this.logger.warn('PartitionService', 'Error while fetching cluster partition table from' - + this.client.getClusterService().ownerUuid, e); - } - }); + const newPartitions = this.convertToMap(partitions); + this.partitionTable.connection = connection; + this.partitionTable.partitionStateVersion = partitionStateVersion; + this.partitionTable.partitions = newPartitions; } /** - * Returns the {@link Address} of the node which owns given partition id. * @param partitionId - * @returns the address of the node. + * @return the owner of the partition or `undefined` if a partition is not assigned yet */ - getAddressForPartition(partitionId: number): Address { - return this.partitionMap[partitionId]; + public getPartitionOwner(partitionId: number): UUID { + return this.getPartitions().get(partitionId); } /** * Computes the partition id for a given key. * @param key * @returns the partition id. + * @throws ClientOfflineError if the partition table is not arrived yet. */ - getPartitionId(key: any): number { + public getPartitionId(key: any): number { + if (this.partitionCount === 0) { + // Partition count can not be zero for the sync mode. + // On the sync mode, we are waiting for the first connection to be established. + // We are initializing the partition count with the value coming from the server with authentication. + // This exception is used only for async mode client. + throw new ClientOfflineError(); + } let partitionHash: number; if (typeof key === 'object' && 'getPartitionHash' in key) { partitionHash = key.getPartitionHash(); @@ -101,7 +90,70 @@ export class PartitionService { return Math.abs(partitionHash) % this.partitionCount; } - getPartitionCount(): number { + /** + * If partition table is not fetched yet, this method returns zero + * + * @return the partition count + */ + public getPartitionCount(): number { return this.partitionCount; } + + /** + * @param newPartitionCount + * @return true if partition count can be set for the first time, or it is equal to + * one that is already available, returns false otherwise + */ + public checkAndSetPartitionCount(newPartitionCount: number): boolean { + if (this.partitionCount === 0) { + this.partitionCount = newPartitionCount; + return true; + } + return this.partitionCount === newPartitionCount; + } + + private convertToMap(partitions: Array<[UUID, number[]]>): Map { + const newPartitions = new Map(); + for (const entry of partitions) { + const uuid = entry[0]; + const ownedPartitions = entry[1]; + for (const ownedPartition of ownedPartitions) { + newPartitions.set(ownedPartition, uuid); + } + } + return newPartitions; + } + + private logFailure(connection: ClientConnection, partitionStateVersion: number, + current: PartitionTable, cause: string): void { + this.logger.debug('PartitionService', 'Response will not be applied since ' + cause + + '. Response is from ' + connection + + '. Current connection ' + current.connection + + '. Response state version ' + partitionStateVersion + + '. Current state version ' + current.partitionStateVersion); + } + + private getPartitions(): Map { + return this.partitionTable.partitions; + } + + private shouldBeApplied(connection: ClientConnection, partitions: Array<[UUID, number[]]>, + partitionStateVersion: number, current: PartitionTable): boolean { + if (partitions.length === 0) { + this.logFailure(connection, partitionStateVersion, current, 'response is empty'); + return false; + } + + if (!connection.equals(current.connection)) { + this.logger.trace('PartitionService', 'Event coming from a new connection. Old connection: ' + current.connection + + ', new connection ' + connection); + return true; + } + + if (partitionStateVersion <= current.partitionStateVersion) { + this.logFailure(connection, partitionStateVersion, current, 'response state version is old'); + return false; + } + return true; + } } diff --git a/src/Util.ts b/src/Util.ts index 6e0644dc4..ed97b8f94 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -22,7 +22,7 @@ import {JsonConfigLocator} from './config/JsonConfigLocator'; import {Comparator} from './core/Comparator'; import {IterationType} from './core/Predicate'; import {PagingPredicate} from './serialization/DefaultPredicates'; -import Address = require('./Address'); +import {Address} from './Address'; export function assertNotNull(v: any): void { assert.notEqual(v, null, 'Non null value expected.'); @@ -171,7 +171,11 @@ export function getBooleanOrUndefined(val: any): boolean { } export function tryGetEnum(enumClass: any | { [index: string]: number }, str: string): T { - return enumClass[str.toUpperCase()] as any; + const result = enumClass[str.toUpperCase()]; + if (result == null) { + throw new TypeError(str + ' is not a member of the enum ' + enumClass); + } + return result; } export function resolvePath(path: string): string { @@ -340,3 +344,11 @@ export function getNodejsMajorVersion(): number { const versions = versionString.split('.'); return Number.parseInt(versions[0].substr(1)); } + +export function pad(str: string, targetLength: number, padString: string): string { + if (str.length >= targetLength) { + return str; + } else { + return new Array(targetLength - str.length + 1).join(padString) + str; + } +} diff --git a/src/aggregation/AggregatorFactory.ts b/src/aggregation/AggregatorFactory.ts index 6d1a4b44a..58a02d3d3 100644 --- a/src/aggregation/AggregatorFactory.ts +++ b/src/aggregation/AggregatorFactory.ts @@ -35,7 +35,7 @@ import {HazelcastError} from '../HazelcastError'; export class AggregatorFactory implements IdentifiedDataSerializableFactory { - static readonly FACTORY_ID = -41; + static readonly FACTORY_ID = -29; static readonly BIG_DECIMAL_AVG = 0; // not implemented in node.js static readonly BIG_DECIMAL_SUM = 1; // not implemented in node.js diff --git a/src/codec/AddressCodec.ts b/src/codec/AddressCodec.ts deleted file mode 100644 index a29b66cd8..000000000 --- a/src/codec/AddressCodec.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); - -export class AddressCodec { - static encode(clientMessage: ClientMessage, target: Address): void { - clientMessage.appendString(target.host); - clientMessage.appendInt32(target.port); - } - - static decode(clientMessage: ClientMessage, toObjectFunction: Function) { - var host = clientMessage.readString(); - var port = clientMessage.readInt32(); - return new Address(host, port); - } -} diff --git a/src/codec/AtomicLongAddAndGetCodec.ts b/src/codec/AtomicLongAddAndGetCodec.ts deleted file mode 100644 index 31b5145b4..000000000 --- a/src/codec/AtomicLongAddAndGetCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_ADDANDGET; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongAddAndGetCodec { - - - static calculateSize(name: string, delta: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, delta: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, delta)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(delta); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongAlterAndGetCodec.ts b/src/codec/AtomicLongAlterAndGetCodec.ts deleted file mode 100644 index a668f331d..000000000 --- a/src/codec/AtomicLongAlterAndGetCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_ALTERANDGET; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongAlterAndGetCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongAlterCodec.ts b/src/codec/AtomicLongAlterCodec.ts deleted file mode 100644 index bc73dade5..000000000 --- a/src/codec/AtomicLongAlterCodec.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_ALTER; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class AtomicLongAlterCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/AtomicLongApplyCodec.ts b/src/codec/AtomicLongApplyCodec.ts deleted file mode 100644 index 0e3d819a7..000000000 --- a/src/codec/AtomicLongApplyCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_APPLY; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; - - -export class AtomicLongApplyCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongCompareAndSetCodec.ts b/src/codec/AtomicLongCompareAndSetCodec.ts deleted file mode 100644 index 2ca0ab001..000000000 --- a/src/codec/AtomicLongCompareAndSetCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_COMPAREANDSET; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class AtomicLongCompareAndSetCodec { - - - static calculateSize(name: string, expected: any, updated: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, expected: any, updated: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, expected, updated)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(expected); - clientMessage.appendLong(updated); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongDecrementAndGetCodec.ts b/src/codec/AtomicLongDecrementAndGetCodec.ts deleted file mode 100644 index 354081bb1..000000000 --- a/src/codec/AtomicLongDecrementAndGetCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_DECREMENTANDGET; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongDecrementAndGetCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongGetAndAddCodec.ts b/src/codec/AtomicLongGetAndAddCodec.ts deleted file mode 100644 index d30b24cd4..000000000 --- a/src/codec/AtomicLongGetAndAddCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDADD; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongGetAndAddCodec { - - - static calculateSize(name: string, delta: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, delta: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, delta)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(delta); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongGetAndAlterCodec.ts b/src/codec/AtomicLongGetAndAlterCodec.ts deleted file mode 100644 index b4b968402..000000000 --- a/src/codec/AtomicLongGetAndAlterCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDALTER; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongGetAndAlterCodec { - - - static calculateSize(name: string, arr: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(arr); - return dataSize; - } - - static encodeRequest(name: string, arr: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, arr)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(arr); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongGetAndIncrementCodec.ts b/src/codec/AtomicLongGetAndIncrementCodec.ts deleted file mode 100644 index 007b839f3..000000000 --- a/src/codec/AtomicLongGetAndIncrementCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDINCREMENT; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongGetAndIncrementCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongGetAndSetCodec.ts b/src/codec/AtomicLongGetAndSetCodec.ts deleted file mode 100644 index dc8846ed8..000000000 --- a/src/codec/AtomicLongGetAndSetCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GETANDSET; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongGetAndSetCodec { - - - static calculateSize(name: string, newValue: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, newValue: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, newValue)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(newValue); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongGetCodec.ts b/src/codec/AtomicLongGetCodec.ts deleted file mode 100644 index b038ca449..000000000 --- a/src/codec/AtomicLongGetCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_GET; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongGetCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongIncrementAndGetCodec.ts b/src/codec/AtomicLongIncrementAndGetCodec.ts deleted file mode 100644 index c0d9ccf94..000000000 --- a/src/codec/AtomicLongIncrementAndGetCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_INCREMENTANDGET; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; - - -export class AtomicLongIncrementAndGetCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/AtomicLongMessageType.ts b/src/codec/AtomicLongMessageType.ts deleted file mode 100644 index 79bc03967..000000000 --- a/src/codec/AtomicLongMessageType.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class AtomicLongMessageType { - static ATOMICLONG_APPLY = 0x0a01; - static ATOMICLONG_ALTER = 0x0a02; - static ATOMICLONG_ALTERANDGET = 0x0a03; - static ATOMICLONG_GETANDALTER = 0x0a04; - static ATOMICLONG_ADDANDGET = 0x0a05; - static ATOMICLONG_COMPAREANDSET = 0x0a06; - static ATOMICLONG_DECREMENTANDGET = 0x0a07; - static ATOMICLONG_GET = 0x0a08; - static ATOMICLONG_GETANDADD = 0x0a09; - static ATOMICLONG_GETANDSET = 0x0a0a; - static ATOMICLONG_INCREMENTANDGET = 0x0a0b; - static ATOMICLONG_GETANDINCREMENT = 0x0a0c; - static ATOMICLONG_SET = 0x0a0d; -} diff --git a/src/codec/AtomicLongSetCodec.ts b/src/codec/AtomicLongSetCodec.ts deleted file mode 100644 index e400489d0..000000000 --- a/src/codec/AtomicLongSetCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {AtomicLongMessageType} from './AtomicLongMessageType'; - -var REQUEST_TYPE = AtomicLongMessageType.ATOMICLONG_SET; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class AtomicLongSetCodec { - - - static calculateSize(name: string, newValue: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, newValue: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, newValue)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(newValue); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ClientAddClusterViewListenerCodec.ts b/src/codec/ClientAddClusterViewListenerCodec.ts new file mode 100644 index 000000000..0f1b1c07e --- /dev/null +++ b/src/codec/ClientAddClusterViewListenerCodec.ts @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {MemberInfo} from '../core/MemberInfo'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {MemberInfoCodec} from './custom/MemberInfoCodec'; +import {EntryListUUIDListIntegerCodec} from './builtin/EntryListUUIDListIntegerCodec'; +import {UUID} from '../core/UUID'; + +// hex: 0x000300 +const REQUEST_MESSAGE_TYPE = 768; +// hex: 0x000301 +const RESPONSE_MESSAGE_TYPE = 769; +// hex: 0x000302 +const EVENT_MEMBERS_VIEW_MESSAGE_TYPE = 770; +// hex: 0x000303 +const EVENT_PARTITIONS_VIEW_MESSAGE_TYPE = 771; + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_MEMBERS_VIEW_VERSION_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_PARTITIONS_VIEW_VERSION_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class ClientAddClusterViewListenerCodec { + static encodeRequest(): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + return clientMessage; + } + + static handle(clientMessage: ClientMessage, handleMembersViewEvent: (version: number, memberInfos: MemberInfo[]) => void = null, handlePartitionsViewEvent: (version: number, partitions: Array<[UUID, number[]]>) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_MEMBERS_VIEW_MESSAGE_TYPE && handleMembersViewEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const version = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_MEMBERS_VIEW_VERSION_OFFSET); + const memberInfos = ListMultiFrameCodec.decode(clientMessage, MemberInfoCodec.decode); + handleMembersViewEvent(version, memberInfos); + return; + } + if (messageType === EVENT_PARTITIONS_VIEW_MESSAGE_TYPE && handlePartitionsViewEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const version = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_PARTITIONS_VIEW_VERSION_OFFSET); + const partitions = EntryListUUIDListIntegerCodec.decode(clientMessage); + handlePartitionsViewEvent(version, partitions); + return; + } + } +} diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index 0b55b017a..c7318826c 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -14,67 +14,61 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ClientMessageType.CLIENT_ADDDISTRIBUTEDOBJECTLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x000900 +const REQUEST_MESSAGE_TYPE = 2304; +// hex: 0x000901 +const RESPONSE_MESSAGE_TYPE = 2305; +// hex: 0x000902 +const EVENT_DISTRIBUTED_OBJECT_MESSAGE_TYPE = 2306; +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_DISTRIBUTED_OBJECT_SOURCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ClientAddDistributedObjectListenerResponseParams { + response: UUID; +} export class ClientAddDistributedObjectListenerCodec { + static encodeRequest(localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ClientAddDistributedObjectListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readString(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventDistributedobject: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_DISTRIBUTEDOBJECT && handleEventDistributedobject !== null) { - var messageFinished = false; - var name: string = undefined; - if (!messageFinished) { - name = clientMessage.readString(); - } - var serviceName: string = undefined; - if (!messageFinished) { - serviceName = clientMessage.readString(); - } - var eventType: string = undefined; - if (!messageFinished) { - eventType = clientMessage.readString(); - } - handleEventDistributedobject(name, serviceName, eventType); + static handle(clientMessage: ClientMessage, handleDistributedObjectEvent: (name: string, serviceName: string, eventType: string, source: UUID) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_DISTRIBUTED_OBJECT_MESSAGE_TYPE && handleDistributedObjectEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const source = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_DISTRIBUTED_OBJECT_SOURCE_OFFSET); + const name = StringCodec.decode(clientMessage); + const serviceName = StringCodec.decode(clientMessage); + const eventType = StringCodec.decode(clientMessage); + handleDistributedObjectEvent(name, serviceName, eventType, source); + return; } } - } diff --git a/src/codec/ClientAddMembershipListenerCodec.ts b/src/codec/ClientAddMembershipListenerCodec.ts deleted file mode 100644 index 9e1e4ed79..000000000 --- a/src/codec/ClientAddMembershipListenerCodec.ts +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_ADDMEMBERSHIPLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class ClientAddMembershipListenerCodec { - - - static calculateSize(localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - static handle(clientMessage: ClientMessage, handleEventMember: any, handleEventMemberlist: any, handleEventMemberattributechange: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_MEMBER && handleEventMember !== null) { - var messageFinished = false; - var member: any = undefined; - if (!messageFinished) { - member = MemberCodec.decode(clientMessage, toObjectFunction); - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - handleEventMember(member, eventType); - } - if (messageType === BitsUtil.EVENT_MEMBERLIST && handleEventMemberlist !== null) { - var messageFinished = false; - var members: any = undefined; - if (!messageFinished) { - - var membersSize = clientMessage.readInt32(); - members = []; - for (var membersIndex = 0; membersIndex < membersSize; membersIndex++) { - var membersItem: any; - membersItem = MemberCodec.decode(clientMessage, toObjectFunction); - members.push(membersItem); - } - } - handleEventMemberlist(members); - } - if (messageType === BitsUtil.EVENT_MEMBERATTRIBUTECHANGE && handleEventMemberattributechange !== null) { - var messageFinished = false; - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var key: string = undefined; - if (!messageFinished) { - key = clientMessage.readString(); - } - var operationType: number = undefined; - if (!messageFinished) { - operationType = clientMessage.readInt32(); - } - var value: string = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readString(); - } - } - handleEventMemberattributechange(uuid, key, operationType, value); - } - } - -} diff --git a/src/codec/ClientAddPartitionListenerCodec.ts b/src/codec/ClientAddPartitionListenerCodec.ts deleted file mode 100644 index e5111046c..000000000 --- a/src/codec/ClientAddPartitionListenerCodec.ts +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); -import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_ADDPARTITIONLISTENER; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class ClientAddPartitionListenerCodec { - - - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - static handle(clientMessage: ClientMessage, handleEventPartitions: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_PARTITIONS && handleEventPartitions !== null) { - var messageFinished = false; - var partitions: any = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - - var partitionsSize = clientMessage.readInt32(); - partitions = []; - for (var partitionsIndex = 0; partitionsIndex < partitionsSize; partitionsIndex++) { - var partitionsItem: any; - var partitionsItemKey: Address; - var partitionsItemVal: any; - partitionsItemKey = AddressCodec.decode(clientMessage, toObjectFunction); - - var partitionsItemValSize = clientMessage.readInt32(); - var partitionsItemVal: any = []; - for (var partitionsItemValIndex = 0; partitionsItemValIndex < partitionsItemValSize; partitionsItemValIndex++) { - var partitionsItemValItem: number; - partitionsItemValItem = clientMessage.readInt32(); - partitionsItemVal.push(partitionsItemValItem); - } - partitionsItem = [partitionsItemKey, partitionsItemVal]; - partitions.push(partitionsItem); - } - } - var partitionStateVersion: number = undefined; - if (!messageFinished) { - partitionStateVersion = clientMessage.readInt32(); - } - handleEventPartitions(partitions, partitionStateVersion); - } - } - -} diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 43c69b61f..7ac49efd6 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -14,72 +14,62 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ClientMessageType.CLIENT_ADDPARTITIONLOSTLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x000600 +const REQUEST_MESSAGE_TYPE = 1536; +// hex: 0x000601 +const RESPONSE_MESSAGE_TYPE = 1537; +// hex: 0x000602 +const EVENT_PARTITION_LOST_MESSAGE_TYPE = 1538; +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_PARTITION_LOST_PARTITION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_PARTITION_LOST_LOST_BACKUP_COUNT_OFFSET = EVENT_PARTITION_LOST_PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_PARTITION_LOST_SOURCE_OFFSET = EVENT_PARTITION_LOST_LOST_BACKUP_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ClientAddPartitionLostListenerResponseParams { + response: UUID; +} export class ClientAddPartitionLostListenerCodec { + static encodeRequest(localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): ClientAddPartitionLostListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventPartitionlost: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_PARTITIONLOST && handleEventPartitionlost !== null) { - var messageFinished = false; - var partitionId: number = undefined; - if (!messageFinished) { - partitionId = clientMessage.readInt32(); - } - var lostBackupCount: number = undefined; - if (!messageFinished) { - lostBackupCount = clientMessage.readInt32(); - } - var source: Address = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - source = AddressCodec.decode(clientMessage, toObjectFunction); - } - } - handleEventPartitionlost(partitionId, lostBackupCount, source); + static handle(clientMessage: ClientMessage, handlePartitionLostEvent: (partitionId: number, lostBackupCount: number, source: UUID) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_PARTITION_LOST_MESSAGE_TYPE && handlePartitionLostEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const partitionId = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_PARTITION_LOST_PARTITION_ID_OFFSET); + const lostBackupCount = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_PARTITION_LOST_LOST_BACKUP_COUNT_OFFSET); + const source = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_PARTITION_LOST_SOURCE_OFFSET); + handlePartitionLostEvent(partitionId, lostBackupCount, source); + return; } } - } diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index b12279885..ee3d861b0 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -14,116 +14,77 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_AUTHENTICATION; -var RESPONSE_TYPE = 107; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; +import {StringCodec} from './builtin/StringCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {Address} from '../Address'; +import {AddressCodec} from './custom/AddressCodec'; + +// hex: 0x000100 +const REQUEST_MESSAGE_TYPE = 256; +// hex: 0x000101 +const RESPONSE_MESSAGE_TYPE = 257; + +const REQUEST_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_SERIALIZATION_VERSION_OFFSET = REQUEST_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_SERIALIZATION_VERSION_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_STATUS_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_MEMBER_UUID_OFFSET = RESPONSE_STATUS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_SERIALIZATION_VERSION_OFFSET = RESPONSE_MEMBER_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_PARTITION_COUNT_OFFSET = RESPONSE_SERIALIZATION_VERSION_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_CLUSTER_ID_OFFSET = RESPONSE_PARTITION_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_FAILOVER_SUPPORTED_OFFSET = RESPONSE_CLUSTER_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ClientAuthenticationResponseParams { + status: number; + address: Address; + memberUuid: UUID; + serializationVersion: number; + serverHazelcastVersion: string; + partitionCount: number; + clusterId: UUID; + failoverSupported: boolean; +} export class ClientAuthenticationCodec { - - - static calculateSize(username: string, password: string, uuid: string, ownerUuid: string, isOwnerConnection: boolean, clientType: string, serializationVersion: any, clientHazelcastVersion: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(username); - dataSize += BitsUtil.calculateSizeString(password); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (uuid !== null) { - dataSize += BitsUtil.calculateSizeString(uuid); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (ownerUuid !== null) { - dataSize += BitsUtil.calculateSizeString(ownerUuid); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(clientType); - dataSize += BitsUtil.BYTE_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(clientHazelcastVersion); - return dataSize; - } - - static encodeRequest(username: string, password: string, uuid: string, ownerUuid: string, isOwnerConnection: boolean, clientType: string, serializationVersion: any, clientHazelcastVersion: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(username, password, uuid, ownerUuid, isOwnerConnection, clientType, serializationVersion, clientHazelcastVersion)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(username); - clientMessage.appendString(password); - clientMessage.appendBoolean(uuid === null); - if (uuid !== null) { - clientMessage.appendString(uuid); - } - clientMessage.appendBoolean(ownerUuid === null); - if (ownerUuid !== null) { - clientMessage.appendString(ownerUuid); - } - clientMessage.appendBoolean(isOwnerConnection); - clientMessage.appendString(clientType); - clientMessage.appendByte(serializationVersion); - clientMessage.appendString(clientHazelcastVersion); - clientMessage.updateFrameLength(); + static encodeRequest(clusterName: string, username: string, password: string, uuid: UUID, clientType: string, serializationVersion: number, clientHazelcastVersion: string, clientName: string, labels: string[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_UUID_OFFSET, uuid); + FixSizedTypesCodec.encodeByte(initialFrame.content, REQUEST_SERIALIZATION_VERSION_OFFSET, serializationVersion); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, clusterName); + CodecUtil.encodeNullable(clientMessage, username, StringCodec.encode); + CodecUtil.encodeNullable(clientMessage, password, StringCodec.encode); + StringCodec.encode(clientMessage, clientType); + StringCodec.encode(clientMessage, clientHazelcastVersion); + StringCodec.encode(clientMessage, clientName); + ListMultiFrameCodec.encode(clientMessage, labels, StringCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'status': null, - 'address': null, - 'uuid': null, - 'ownerUuid': null, - 'serializationVersion': null, - 'serverHazelcastVersion': null, - 'clientUnregisteredMembers': null + static decodeResponse(clientMessage: ClientMessage): ClientAuthenticationResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + status: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_STATUS_OFFSET), + memberUuid: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_MEMBER_UUID_OFFSET), + serializationVersion: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_SERIALIZATION_VERSION_OFFSET), + partitionCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_PARTITION_COUNT_OFFSET), + clusterId: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_CLUSTER_ID_OFFSET), + failoverSupported: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_FAILOVER_SUPPORTED_OFFSET), + address: CodecUtil.decodeNullable(clientMessage, AddressCodec.decode), + serverHazelcastVersion: StringCodec.decode(clientMessage), }; - - parameters['status'] = clientMessage.readByte(); - - - if (clientMessage.readBoolean() !== true) { - parameters['address'] = AddressCodec.decode(clientMessage, toObjectFunction); - } - - - if (clientMessage.readBoolean() !== true) { - parameters['uuid'] = clientMessage.readString(); - } - - - if (clientMessage.readBoolean() !== true) { - parameters['ownerUuid'] = clientMessage.readString(); - } - - parameters['serializationVersion'] = clientMessage.readByte(); - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['serverHazelcastVersion'] = clientMessage.readString(); - parameters.serverHazelcastVersionExist = true; - - if (clientMessage.readBoolean() !== true) { - - var clientUnregisteredMembersSize = clientMessage.readInt32(); - var clientUnregisteredMembers: any = []; - for (var clientUnregisteredMembersIndex = 0; clientUnregisteredMembersIndex < clientUnregisteredMembersSize; clientUnregisteredMembersIndex++) { - var clientUnregisteredMembersItem: any; - clientUnregisteredMembersItem = MemberCodec.decode(clientMessage, toObjectFunction); - clientUnregisteredMembers.push(clientUnregisteredMembersItem); - } - parameters['clientUnregisteredMembers'] = clientUnregisteredMembers; - } - parameters.clientUnregisteredMembersExist = true; - return parameters; } - - } diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 44253b790..956f8adf6 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -14,114 +14,78 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {MemberCodec} from './MemberCodec'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_AUTHENTICATIONCUSTOM; -var RESPONSE_TYPE = 107; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; +import {StringCodec} from './builtin/StringCodec'; +import {Buffer} from 'safe-buffer'; +import {ByteArrayCodec} from './builtin/ByteArrayCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {Address} from '../Address'; +import {AddressCodec} from './custom/AddressCodec'; + +// hex: 0x000200 +const REQUEST_MESSAGE_TYPE = 512; +// hex: 0x000201 +const RESPONSE_MESSAGE_TYPE = 513; + +const REQUEST_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_SERIALIZATION_VERSION_OFFSET = REQUEST_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_SERIALIZATION_VERSION_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_STATUS_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_MEMBER_UUID_OFFSET = RESPONSE_STATUS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_SERIALIZATION_VERSION_OFFSET = RESPONSE_MEMBER_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_PARTITION_COUNT_OFFSET = RESPONSE_SERIALIZATION_VERSION_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_CLUSTER_ID_OFFSET = RESPONSE_PARTITION_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_FAILOVER_SUPPORTED_OFFSET = RESPONSE_CLUSTER_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ClientAuthenticationCustomResponseParams { + status: number; + address: Address; + memberUuid: UUID; + serializationVersion: number; + serverHazelcastVersion: string; + partitionCount: number; + clusterId: UUID; + failoverSupported: boolean; +} export class ClientAuthenticationCustomCodec { - - - static calculateSize(credentials: Data, uuid: string, ownerUuid: string, isOwnerConnection: boolean, clientType: string, serializationVersion: any, clientHazelcastVersion: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeData(credentials); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (uuid !== null) { - dataSize += BitsUtil.calculateSizeString(uuid); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (ownerUuid !== null) { - dataSize += BitsUtil.calculateSizeString(ownerUuid); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(clientType); - dataSize += BitsUtil.BYTE_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeString(clientHazelcastVersion); - return dataSize; - } - - static encodeRequest(credentials: Data, uuid: string, ownerUuid: string, isOwnerConnection: boolean, clientType: string, serializationVersion: any, clientHazelcastVersion: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(credentials, uuid, ownerUuid, isOwnerConnection, clientType, serializationVersion, clientHazelcastVersion)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendData(credentials); - clientMessage.appendBoolean(uuid === null); - if (uuid !== null) { - clientMessage.appendString(uuid); - } - clientMessage.appendBoolean(ownerUuid === null); - if (ownerUuid !== null) { - clientMessage.appendString(ownerUuid); - } - clientMessage.appendBoolean(isOwnerConnection); - clientMessage.appendString(clientType); - clientMessage.appendByte(serializationVersion); - clientMessage.appendString(clientHazelcastVersion); - clientMessage.updateFrameLength(); + static encodeRequest(clusterName: string, credentials: Buffer, uuid: UUID, clientType: string, serializationVersion: number, clientHazelcastVersion: string, clientName: string, labels: string[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_UUID_OFFSET, uuid); + FixSizedTypesCodec.encodeByte(initialFrame.content, REQUEST_SERIALIZATION_VERSION_OFFSET, serializationVersion); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, clusterName); + ByteArrayCodec.encode(clientMessage, credentials); + StringCodec.encode(clientMessage, clientType); + StringCodec.encode(clientMessage, clientHazelcastVersion); + StringCodec.encode(clientMessage, clientName); + ListMultiFrameCodec.encode(clientMessage, labels, StringCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'status': null, - 'address': null, - 'uuid': null, - 'ownerUuid': null, - 'serializationVersion': null, - 'serverHazelcastVersion': null, - 'clientUnregisteredMembers': null + static decodeResponse(clientMessage: ClientMessage): ClientAuthenticationCustomResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + status: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_STATUS_OFFSET), + memberUuid: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_MEMBER_UUID_OFFSET), + serializationVersion: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_SERIALIZATION_VERSION_OFFSET), + partitionCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_PARTITION_COUNT_OFFSET), + clusterId: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_CLUSTER_ID_OFFSET), + failoverSupported: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_FAILOVER_SUPPORTED_OFFSET), + address: CodecUtil.decodeNullable(clientMessage, AddressCodec.decode), + serverHazelcastVersion: StringCodec.decode(clientMessage), }; - - parameters['status'] = clientMessage.readByte(); - - - if (clientMessage.readBoolean() !== true) { - parameters['address'] = AddressCodec.decode(clientMessage, toObjectFunction); - } - - - if (clientMessage.readBoolean() !== true) { - parameters['uuid'] = clientMessage.readString(); - } - - - if (clientMessage.readBoolean() !== true) { - parameters['ownerUuid'] = clientMessage.readString(); - } - - parameters['serializationVersion'] = clientMessage.readByte(); - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['serverHazelcastVersion'] = clientMessage.readString(); - parameters.serverHazelcastVersionExist = true; - - if (clientMessage.readBoolean() !== true) { - - var clientUnregisteredMembersSize = clientMessage.readInt32(); - var clientUnregisteredMembers: any = []; - for (var clientUnregisteredMembersIndex = 0; clientUnregisteredMembersIndex < clientUnregisteredMembersSize; clientUnregisteredMembersIndex++) { - var clientUnregisteredMembersItem: any; - clientUnregisteredMembersItem = MemberCodec.decode(clientMessage, toObjectFunction); - clientUnregisteredMembers.push(clientUnregisteredMembersItem); - } - parameters['clientUnregisteredMembers'] = clientUnregisteredMembers; - } - parameters.clientUnregisteredMembersExist = true; - return parameters; } - - } diff --git a/src/codec/ClientCreateProxiesCodec.ts b/src/codec/ClientCreateProxiesCodec.ts new file mode 100644 index 000000000..62d30775f --- /dev/null +++ b/src/codec/ClientCreateProxiesCodec.ts @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x000E00 +const REQUEST_MESSAGE_TYPE = 3584; +// hex: 0x000E01 +const RESPONSE_MESSAGE_TYPE = 3585; + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class ClientCreateProxiesCodec { + static encodeRequest(proxies: Array<[string, string]>): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + EntryListCodec.encode(clientMessage, proxies, StringCodec.encode, StringCodec.encode); + return clientMessage; + } +} diff --git a/src/codec/ClientCreateProxyCodec.ts b/src/codec/ClientCreateProxyCodec.ts index 07d903238..81d8fc39f 100644 --- a/src/codec/ClientCreateProxyCodec.ts +++ b/src/codec/ClientCreateProxyCodec.ts @@ -14,43 +14,30 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {ClientMessageType} from './ClientMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ClientMessageType.CLIENT_CREATEPROXY; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x000400 +const REQUEST_MESSAGE_TYPE = 1024; +// hex: 0x000401 +const RESPONSE_MESSAGE_TYPE = 1025; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ClientCreateProxyCodec { + static encodeRequest(name: string, serviceName: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, serviceName: string, target: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(serviceName); - dataSize += BitsUtil.calculateSizeAddress(target); - return dataSize; - } - - static encodeRequest(name: string, serviceName: string, target: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, serviceName, target)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(serviceName); - AddressCodec.encode(clientMessage, target); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + StringCodec.encode(clientMessage, serviceName); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index 324e88d5d..4b8fea707 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -14,60 +14,31 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {ClientMessageType} from './ClientMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {StringCodec} from './builtin/StringCodec'; +import {ByteArrayCodec} from './builtin/ByteArrayCodec'; -var REQUEST_TYPE = ClientMessageType.CLIENT_DEPLOYCLASSES; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x000D00 +const REQUEST_MESSAGE_TYPE = 3328; +// hex: 0x000D01 +const RESPONSE_MESSAGE_TYPE = 3329; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ClientDeployClassesCodec { + static encodeRequest(classDefinitions: Array<[string, Buffer]>): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(classDefinitions: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - classDefinitions.forEach((classDefinitionsItem: any) => { - var key: string = classDefinitionsItem[0]; - var val: any = classDefinitionsItem[1]; - dataSize += BitsUtil.calculateSizeString(key); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - val.forEach((valItem: any) => { - dataSize += BitsUtil.BYTE_SIZE_IN_BYTES; - }); - }); - return dataSize; - } - - static encodeRequest(classDefinitions: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(classDefinitions)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendInt32(classDefinitions.length); - - classDefinitions.forEach((classDefinitionsItem: any) => { - var key: string = classDefinitionsItem[0]; - var val: any = classDefinitionsItem[1]; - clientMessage.appendString(key); - clientMessage.appendInt32(val.length); - - val.forEach((valItem: any) => { - clientMessage.appendByte(valItem); - }); - - }); - - clientMessage.updateFrameLength(); + EntryListCodec.encode(clientMessage, classDefinitions, StringCodec.encode, ByteArrayCodec.encode); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ClientDestroyProxyCodec.ts b/src/codec/ClientDestroyProxyCodec.ts index 2633f2f36..184046746 100644 --- a/src/codec/ClientDestroyProxyCodec.ts +++ b/src/codec/ClientDestroyProxyCodec.ts @@ -14,39 +14,30 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {ClientMessageType} from './ClientMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ClientMessageType.CLIENT_DESTROYPROXY; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x000500 +const REQUEST_MESSAGE_TYPE = 1280; +// hex: 0x000501 +const RESPONSE_MESSAGE_TYPE = 1281; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ClientDestroyProxyCodec { + static encodeRequest(name: string, serviceName: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, serviceName: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(serviceName); - return dataSize; - } - - static encodeRequest(name: string, serviceName: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, serviceName)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(serviceName); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + StringCodec.encode(clientMessage, serviceName); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index 36a9fbeb9..9428c87ba 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -14,53 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import DistributedObjectInfoCodec = require('./DistributedObjectInfoCodec'); -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_GETDISTRIBUTEDOBJECTS; -var RESPONSE_TYPE = 110; -var RETRYABLE = false; - +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {DistributedObjectInfo} from '../DistributedObjectInfo'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DistributedObjectInfoCodec} from './custom/DistributedObjectInfoCodec'; + +// hex: 0x000800 +const REQUEST_MESSAGE_TYPE = 2048; +// hex: 0x000801 +const RESPONSE_MESSAGE_TYPE = 2049; + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ClientGetDistributedObjectsResponseParams { + response: DistributedObjectInfo[]; +} export class ClientGetDistributedObjectsCodec { + static encodeRequest(): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ClientGetDistributedObjectsResponseParams { + // empty initial frame + clientMessage.nextFrame(); - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - responseItem = DistributedObjectInfoCodec.decode(clientMessage, toObjectFunction); - response.push(responseItem); - } - parameters['response'] = response; - - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DistributedObjectInfoCodec.decode), + }; } - - } diff --git a/src/codec/ClientGetPartitionsCodec.ts b/src/codec/ClientGetPartitionsCodec.ts deleted file mode 100644 index 24b160e9e..000000000 --- a/src/codec/ClientGetPartitionsCodec.ts +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); -import {AddressCodec} from './AddressCodec'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_GETPARTITIONS; -var RESPONSE_TYPE = 108; -var RETRYABLE = false; - - -export class ClientGetPartitionsCodec { - - - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'partitions': null, - 'partitionStateVersion': null - }; - - - var partitionsSize = clientMessage.readInt32(); - var partitions: any = []; - for (var partitionsIndex = 0; partitionsIndex < partitionsSize; partitionsIndex++) { - var partitionsItem: any; - var partitionsItemKey: Address; - var partitionsItemVal: any; - partitionsItemKey = AddressCodec.decode(clientMessage, toObjectFunction); - - var partitionsItemValSize = clientMessage.readInt32(); - var partitionsItemVal: any = []; - for (var partitionsItemValIndex = 0; partitionsItemValIndex < partitionsItemValSize; partitionsItemValIndex++) { - var partitionsItemValItem: number; - partitionsItemValItem = clientMessage.readInt32(); - partitionsItemVal.push(partitionsItemValItem); - } - partitionsItem = [partitionsItemKey, partitionsItemVal]; - partitions.push(partitionsItem); - } - parameters['partitions'] = partitions; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['partitionStateVersion'] = clientMessage.readInt32(); - parameters.partitionStateVersionExist = true; - return parameters; - } - - -} diff --git a/src/codec/ClientLocalBackupListenerCodec.ts b/src/codec/ClientLocalBackupListenerCodec.ts new file mode 100644 index 000000000..c97059148 --- /dev/null +++ b/src/codec/ClientLocalBackupListenerCodec.ts @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; + +// hex: 0x000F00 +const REQUEST_MESSAGE_TYPE = 3840; +// hex: 0x000F01 +const RESPONSE_MESSAGE_TYPE = 3841; +// hex: 0x000F02 +const EVENT_BACKUP_MESSAGE_TYPE = 3842; + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_BACKUP_SOURCE_INVOCATION_CORRELATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ClientLocalBackupListenerResponseParams { + response: UUID; +} + +export class ClientLocalBackupListenerCodec { + static encodeRequest(): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): ClientLocalBackupListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } + + static handle(clientMessage: ClientMessage, handleBackupEvent: (sourceInvocationCorrelationId: Long) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_BACKUP_MESSAGE_TYPE && handleBackupEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const sourceInvocationCorrelationId = FixSizedTypesCodec.decodeLong(initialFrame.content, EVENT_BACKUP_SOURCE_INVOCATION_CORRELATION_ID_OFFSET); + handleBackupEvent(sourceInvocationCorrelationId); + return; + } + } +} diff --git a/src/codec/ClientMessageType.ts b/src/codec/ClientMessageType.ts deleted file mode 100644 index 08d490c5c..000000000 --- a/src/codec/ClientMessageType.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class ClientMessageType { - static CLIENT_AUTHENTICATION = 0x0002; - static CLIENT_AUTHENTICATIONCUSTOM = 0x0003; - static CLIENT_ADDMEMBERSHIPLISTENER = 0x0004; - static CLIENT_CREATEPROXY = 0x0005; - static CLIENT_DESTROYPROXY = 0x0006; - static CLIENT_GETPARTITIONS = 0x0008; - static CLIENT_REMOVEALLLISTENERS = 0x0009; - static CLIENT_ADDPARTITIONLOSTLISTENER = 0x000a; - static CLIENT_REMOVEPARTITIONLOSTLISTENER = 0x000b; - static CLIENT_GETDISTRIBUTEDOBJECTS = 0x000c; - static CLIENT_ADDDISTRIBUTEDOBJECTLISTENER = 0x000d; - static CLIENT_REMOVEDISTRIBUTEDOBJECTLISTENER = 0x000e; - static CLIENT_PING = 0x000f; - static CLIENT_STATISTICS = 0x0010; - static CLIENT_DEPLOYCLASSES = 0x0011; - static CLIENT_ADDPARTITIONLISTENER = 0x0012; -} diff --git a/src/codec/ClientPingCodec.ts b/src/codec/ClientPingCodec.ts index f6eb093fc..52cd51d07 100644 --- a/src/codec/ClientPingCodec.ts +++ b/src/codec/ClientPingCodec.ts @@ -14,34 +14,27 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {ClientMessageType} from './ClientMessageType'; +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -var REQUEST_TYPE = ClientMessageType.CLIENT_PING; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; +// hex: 0x000B00 +const REQUEST_MESSAGE_TYPE = 2816; +// hex: 0x000B01 +const RESPONSE_MESSAGE_TYPE = 2817; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ClientPingCodec { + static encodeRequest(): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ClientRemoveAllListenersCodec.ts b/src/codec/ClientRemoveAllListenersCodec.ts deleted file mode 100644 index aedc16f0b..000000000 --- a/src/codec/ClientRemoveAllListenersCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {ClientMessageType} from './ClientMessageType'; - -var REQUEST_TYPE = ClientMessageType.CLIENT_REMOVEALLLISTENERS; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class ClientRemoveAllListenersCodec { - - - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index 7411e272b..88c3867a4 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -14,47 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; -var REQUEST_TYPE = ClientMessageType.CLIENT_REMOVEDISTRIBUTEDOBJECTLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x000A00 +const REQUEST_MESSAGE_TYPE = 2560; +// hex: 0x000A01 +const RESPONSE_MESSAGE_TYPE = 2561; +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ClientRemoveDistributedObjectListenerResponseParams { + response: boolean; +} export class ClientRemoveDistributedObjectListenerCodec { + static encodeRequest(registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ClientRemoveDistributedObjectListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index 7da19ea42..04f3bfc66 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -14,47 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ClientMessageType} from './ClientMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; -var REQUEST_TYPE = ClientMessageType.CLIENT_REMOVEPARTITIONLOSTLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x000700 +const REQUEST_MESSAGE_TYPE = 1792; +// hex: 0x000701 +const RESPONSE_MESSAGE_TYPE = 1793; +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ClientRemovePartitionLostListenerResponseParams { + response: boolean; +} export class ClientRemovePartitionLostListenerCodec { + static encodeRequest(registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ClientRemovePartitionLostListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts index 63ce36888..908d58823 100644 --- a/src/codec/ClientStatisticsCodec.ts +++ b/src/codec/ClientStatisticsCodec.ts @@ -14,31 +14,36 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {ClientMessageType} from './ClientMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Buffer} from 'safe-buffer'; +import {ByteArrayCodec} from './builtin/ByteArrayCodec'; -var REQUEST_TYPE = ClientMessageType.CLIENT_STATISTICS; -var RETRYABLE = false; +// hex: 0x000C00 +const REQUEST_MESSAGE_TYPE = 3072; +// hex: 0x000C01 +const RESPONSE_MESSAGE_TYPE = 3073; +const REQUEST_TIMESTAMP_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMESTAMP_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class ClientStatisticsCodec { - static calculateSize(stats: string) { - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(stats); - return dataSize; - } + static encodeRequest(timestamp: Long, clientAttributes: string, metricsBlob: Buffer): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMESTAMP_OFFSET, timestamp); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static encodeRequest(stats: string) { - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(stats)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(stats); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, clientAttributes); + ByteArrayCodec.encode(clientMessage, metricsBlob); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - } diff --git a/src/codec/ClientTriggerPartitionAssignmentCodec.ts b/src/codec/ClientTriggerPartitionAssignmentCodec.ts new file mode 100644 index 000000000..cd687a4b3 --- /dev/null +++ b/src/codec/ClientTriggerPartitionAssignmentCodec.ts @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; + +// hex: 0x001000 +const REQUEST_MESSAGE_TYPE = 4096; +// hex: 0x001001 +const RESPONSE_MESSAGE_TYPE = 4097; + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class ClientTriggerPartitionAssignmentCodec { + static encodeRequest(): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + return clientMessage; + } +} diff --git a/src/codec/EntryViewCodec.ts b/src/codec/EntryViewCodec.ts deleted file mode 100644 index cb85ccb3d..000000000 --- a/src/codec/EntryViewCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {Data} from '../serialization/Data'; -import {EntryView} from '../core/EntryView'; - -export class EntryViewCodec { - static encode(clientMessage: ClientMessage, entryView: EntryView, toData: (object: any) => Data = null) { - clientMessage.appendData(toData(entryView.key)); - clientMessage.appendData(toData(entryView.value)); - clientMessage.appendLong(entryView.cost); - clientMessage.appendLong(entryView.creationTime); - clientMessage.appendLong(entryView.expirationTime); - clientMessage.appendLong(entryView.hits); - clientMessage.appendLong(entryView.lastAccessTime); - clientMessage.appendLong(entryView.lastStoreTime); - clientMessage.appendLong(entryView.lastUpdateTime); - clientMessage.appendLong(entryView.version); - clientMessage.appendLong(entryView.evictionCriteriaNumber); - clientMessage.appendLong(entryView.ttl); - } - - static decode(clientMessage: ClientMessage, toObject: (data: Data) => any = null) { - var entry = new EntryView(); - entry.key = toObject(clientMessage.readData()); - entry.value = toObject(clientMessage.readData()); - entry.cost = clientMessage.readLong(); - entry.creationTime = clientMessage.readLong(); - entry.expirationTime = clientMessage.readLong(); - entry.hits = clientMessage.readLong(); - entry.lastAccessTime = clientMessage.readLong(); - entry.lastStoreTime = clientMessage.readLong(); - entry.lastUpdateTime = clientMessage.readLong(); - entry.version = clientMessage.readLong(); - entry.evictionCriteriaNumber = clientMessage.readLong(); - entry.ttl = clientMessage.readLong(); - return entry; - } -} diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts index 375dce906..65d1ecf28 100644 --- a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -14,52 +14,52 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {FlakeIdGeneratorMessageType} from './FlakeIdGeneratorMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = FlakeIdGeneratorMessageType.FLAKEIDGENERATOR_NEWIDBATCH; -var RESPONSE_TYPE = 126; -var RETRYABLE = true; +// hex: 0x1C0100 +const REQUEST_MESSAGE_TYPE = 1835264; +// hex: 0x1C0101 +const RESPONSE_MESSAGE_TYPE = 1835265; +const REQUEST_BATCH_SIZE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_BASE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_INCREMENT_OFFSET = RESPONSE_BASE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_BATCH_SIZE_OFFSET = RESPONSE_INCREMENT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface FlakeIdGeneratorNewIdBatchResponseParams { + base: Long; + increment: Long; + batchSize: number; +} export class FlakeIdGeneratorNewIdBatchCodec { - static calculateSize(name: string, batchSize: number) { - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } + static encodeRequest(name: string, batchSize: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); - static encodeRequest(name: string, batchSize: number) { - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, batchSize)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(batchSize); - clientMessage.updateFrameLength(); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_BATCH_SIZE_OFFSET, batchSize); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - var parameters: any = { - 'base': null, - 'increment': null, - 'batchSize': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['base'] = clientMessage.readLong(); - - parameters['increment'] = clientMessage.readLong(); - - parameters['batchSize'] = clientMessage.readInt32(); + static decodeResponse(clientMessage: ClientMessage): FlakeIdGeneratorNewIdBatchResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + base: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_BASE_OFFSET), + increment: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_INCREMENT_OFFSET), + batchSize: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_BATCH_SIZE_OFFSET), + }; } - } diff --git a/src/codec/GetPartitionsCodec.ts b/src/codec/GetPartitionsCodec.ts deleted file mode 100644 index 2407579b8..000000000 --- a/src/codec/GetPartitionsCodec.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); - -class GetPartitionsCodec { - static encodeRequest(): ClientMessage { - var clientMessage = ClientMessage.newClientMessage(0); - clientMessage.setMessageType(0x0008); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): { [partitionId: number]: Address } { - var result: { [partitionId: number]: Address } = {}; - var size = clientMessage.readInt32(); - - for (var i = 0; i < size; i++) { - var host = clientMessage.readString(); - var port = clientMessage.readInt32(); - var address = new Address(host, port); - - var partitionCount = clientMessage.readInt32(); - - for (var j = 0; j < partitionCount; j++) { - var partitionId = clientMessage.readInt32(); - result[partitionId] = address; - } - } - - return result; - } -} - -export = GetPartitionsCodec diff --git a/src/codec/ImmutableLazyDataList.ts b/src/codec/ImmutableLazyDataList.ts deleted file mode 100644 index d8b0cd4f2..000000000 --- a/src/codec/ImmutableLazyDataList.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable:no-bitwise */ - -import {Data} from '../serialization/Data'; - -class ImmutableLazyDataList { - - private response: any; - private toObjectFunction: any; - - constructor(response: any, toObjectFunction: (data: Data) => any) { - this.response = response; - this.toObjectFunction = toObjectFunction; - } - - public contains(item: any): boolean { - return this.response.contains(item); - } - - public size(): number { - return this.response.length; - } - - public get(index: number): any { - const element = this.response[index]; - return [element.key, element.value]; - } - - public populate(): any { - // TODO - } - - public equal(): boolean { - // TODO - return false; - } - -} - -export = ImmutableLazyDataList; diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 2e79ba20e..14c8b784d 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_ADDALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x050600 +const REQUEST_MESSAGE_TYPE = 329216; +// hex: 0x050601 +const RESPONSE_MESSAGE_TYPE = 329217; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class ListAddAllCodec { - - - static calculateSize(name: string, valueList: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - valueList.forEach((valueListItem: any) => { - dataSize += BitsUtil.calculateSizeData(valueListItem); - }); - return dataSize; - } +export interface ListAddAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, valueList: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, valueList)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(valueList.length); +export class ListAddAllCodec { + static encodeRequest(name: string, valueList: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - valueList.forEach((valueListItem: any) => { - clientMessage.appendData(valueListItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, valueList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): ListAddAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index 0c027be05..9e628ba94 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -14,60 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_ADDALLWITHINDEX; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x050E00 +const REQUEST_MESSAGE_TYPE = 331264; +// hex: 0x050E01 +const RESPONSE_MESSAGE_TYPE = 331265; +const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class ListAddAllWithIndexCodec { - - - static calculateSize(name: string, index: number, valueList: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - valueList.forEach((valueListItem: any) => { - dataSize += BitsUtil.calculateSizeData(valueListItem); - }); - return dataSize; - } - - static encodeRequest(name: string, index: number, valueList: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, index, valueList)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(index); - clientMessage.appendInt32(valueList.length); - - valueList.forEach((valueListItem: any) => { - clientMessage.appendData(valueListItem); - }); +export interface ListAddAllWithIndexResponseParams { + response: boolean; +} - clientMessage.updateFrameLength(); +export class ListAddAllWithIndexCodec { + static encodeRequest(name: string, index: number, valueList: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_INDEX_OFFSET, index); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, valueList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): ListAddAllWithIndexResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index 30e7f2cf6..68d0b2f64 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_ADD; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x050400 +const REQUEST_MESSAGE_TYPE = 328704; +// hex: 0x050401 +const RESPONSE_MESSAGE_TYPE = 328705; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListAddResponseParams { + response: boolean; +} export class ListAddCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ListAddResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index 305fbd12e..5e0f497d4 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -14,74 +14,67 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ListMessageType.LIST_ADDLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x050B00 +const REQUEST_MESSAGE_TYPE = 330496; +// hex: 0x050B01 +const RESPONSE_MESSAGE_TYPE = 330497; +// hex: 0x050B02 +const EVENT_ITEM_MESSAGE_TYPE = 330498; +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ITEM_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ITEM_EVENT_TYPE_OFFSET = EVENT_ITEM_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ListAddListenerResponseParams { + response: UUID; +} export class ListAddListenerCodec { + static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, includeValue: boolean, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, includeValue: boolean, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, includeValue, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(includeValue); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): ListAddListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventItem: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ITEM && handleEventItem !== null) { - var messageFinished = false; - var item: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - item = clientMessage.readData(); - } - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - handleEventItem(item, uuid, eventType); + static handle(clientMessage: ClientMessage, handleItemEvent: (item: Data, uuid: UUID, eventType: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ITEM_MESSAGE_TYPE && handleItemEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ITEM_UUID_OFFSET); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ITEM_EVENT_TYPE_OFFSET); + const item = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleItemEvent(item, uuid, eventType); + return; } } - } diff --git a/src/codec/ListAddWithIndexCodec.ts b/src/codec/ListAddWithIndexCodec.ts index a8d29b87a..c129083f7 100644 --- a/src/codec/ListAddWithIndexCodec.ts +++ b/src/codec/ListAddWithIndexCodec.ts @@ -14,42 +14,35 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_ADDWITHINDEX; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x051100 +const REQUEST_MESSAGE_TYPE = 332032; +// hex: 0x051101 +const RESPONSE_MESSAGE_TYPE = 332033; +const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ListAddWithIndexCodec { - - - static calculateSize(name: string, index: number, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, index: number, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, index, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(index); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, index: number, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_INDEX_OFFSET, index); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ListClearCodec.ts b/src/codec/ListClearCodec.ts index be5060ad5..f9fdaff65 100644 --- a/src/codec/ListClearCodec.ts +++ b/src/codec/ListClearCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {ListMessageType} from './ListMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ListMessageType.LIST_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x050900 +const REQUEST_MESSAGE_TYPE = 329984; +// hex: 0x050901 +const RESPONSE_MESSAGE_TYPE = 329985; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ListClearCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index 62364dac0..bafde2cc7 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_COMPAREANDREMOVEALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x050700 +const REQUEST_MESSAGE_TYPE = 329472; +// hex: 0x050701 +const RESPONSE_MESSAGE_TYPE = 329473; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class ListCompareAndRemoveAllCodec { - - - static calculateSize(name: string, values: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - values.forEach((valuesItem: any) => { - dataSize += BitsUtil.calculateSizeData(valuesItem); - }); - return dataSize; - } +export interface ListCompareAndRemoveAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, values: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, values)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(values.length); +export class ListCompareAndRemoveAllCodec { + static encodeRequest(name: string, values: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - values.forEach((valuesItem: any) => { - clientMessage.appendData(valuesItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, values, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): ListCompareAndRemoveAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 39b58236d..27a241256 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_COMPAREANDRETAINALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x050800 +const REQUEST_MESSAGE_TYPE = 329728; +// hex: 0x050801 +const RESPONSE_MESSAGE_TYPE = 329729; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class ListCompareAndRetainAllCodec { - - - static calculateSize(name: string, values: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - values.forEach((valuesItem: any) => { - dataSize += BitsUtil.calculateSizeData(valuesItem); - }); - return dataSize; - } +export interface ListCompareAndRetainAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, values: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, values)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(values.length); +export class ListCompareAndRetainAllCodec { + static encodeRequest(name: string, values: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - values.forEach((valuesItem: any) => { - clientMessage.appendData(valuesItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, values, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): ListCompareAndRetainAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index fe4c4ad35..4a39b02af 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_CONTAINSALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x050300 +const REQUEST_MESSAGE_TYPE = 328448; +// hex: 0x050301 +const RESPONSE_MESSAGE_TYPE = 328449; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class ListContainsAllCodec { - - - static calculateSize(name: string, values: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - values.forEach((valuesItem: any) => { - dataSize += BitsUtil.calculateSizeData(valuesItem); - }); - return dataSize; - } +export interface ListContainsAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, values: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, values)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(values.length); +export class ListContainsAllCodec { + static encodeRequest(name: string, values: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); - values.forEach((valuesItem: any) => { - clientMessage.appendData(valuesItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, values, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): ListContainsAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index 63621af20..289a6c655 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_CONTAINS; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x050200 +const REQUEST_MESSAGE_TYPE = 328192; +// hex: 0x050201 +const RESPONSE_MESSAGE_TYPE = 328193; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListContainsResponseParams { + response: boolean; +} export class ListContainsCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ListContainsResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index 0f066ca22..3f4c40bcc 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_GETALL; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x050A00 +const REQUEST_MESSAGE_TYPE = 330240; +// hex: 0x050A01 +const RESPONSE_MESSAGE_TYPE = 330241; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ListGetAllResponseParams { + response: Data[]; +} export class ListGetAllCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): ListGetAllResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index ca2b8ee12..1f11125ae 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -14,52 +14,48 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ListMessageType.LIST_GET; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; +// hex: 0x050F00 +const REQUEST_MESSAGE_TYPE = 331520; +// hex: 0x050F01 +const RESPONSE_MESSAGE_TYPE = 331521; +const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ListGetResponseParams { + response: Data; +} export class ListGetCodec { + static encodeRequest(name: string, index: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_INDEX_OFFSET, index); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, index: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, index: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, index)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(index); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): ListGetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index c1c20d233..809ab1a9e 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_INDEXOF; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x051400 +const REQUEST_MESSAGE_TYPE = 332800; +// hex: 0x051401 +const RESPONSE_MESSAGE_TYPE = 332801; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListIndexOfResponseParams { + response: number; +} export class ListIndexOfCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ListIndexOfResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index a92ada721..2b754ce5a 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ListMessageType.LIST_ISEMPTY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x050D00 +const REQUEST_MESSAGE_TYPE = 331008; +// hex: 0x050D01 +const RESPONSE_MESSAGE_TYPE = 331009; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListIsEmptyResponseParams { + response: boolean; +} export class ListIsEmptyCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ListIsEmptyResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 6742521a4..587c618f6 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_ITERATOR; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x051600 +const REQUEST_MESSAGE_TYPE = 333312; +// hex: 0x051601 +const RESPONSE_MESSAGE_TYPE = 333313; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ListIteratorResponseParams { + response: Data[]; +} export class ListIteratorCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): ListIteratorResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index a10e310a1..f4d96ac2e 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_LASTINDEXOF; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x051300 +const REQUEST_MESSAGE_TYPE = 332544; +// hex: 0x051301 +const RESPONSE_MESSAGE_TYPE = 332545; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListLastIndexOfResponseParams { + response: number; +} export class ListLastIndexOfCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ListLastIndexOfResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index ea30da4cb..fbe1232bd 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -14,57 +14,48 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_LISTITERATOR; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x051700 +const REQUEST_MESSAGE_TYPE = 333568; +// hex: 0x051701 +const RESPONSE_MESSAGE_TYPE = 333569; +const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ListListIteratorResponseParams { + response: Data[]; +} export class ListListIteratorCodec { + static encodeRequest(name: string, index: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_INDEX_OFFSET, index); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, index: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, index: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, index)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(index); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): ListListIteratorResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ListMessageType.ts b/src/codec/ListMessageType.ts deleted file mode 100644 index 1588b2110..000000000 --- a/src/codec/ListMessageType.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class ListMessageType { - static LIST_SIZE = 0x0501; - static LIST_CONTAINS = 0x0502; - static LIST_CONTAINSALL = 0x0503; - static LIST_ADD = 0x0504; - static LIST_REMOVE = 0x0505; - static LIST_ADDALL = 0x0506; - static LIST_COMPAREANDREMOVEALL = 0x0507; - static LIST_COMPAREANDRETAINALL = 0x0508; - static LIST_CLEAR = 0x0509; - static LIST_GETALL = 0x050a; - static LIST_ADDLISTENER = 0x050b; - static LIST_REMOVELISTENER = 0x050c; - static LIST_ISEMPTY = 0x050d; - static LIST_ADDALLWITHINDEX = 0x050e; - static LIST_GET = 0x050f; - static LIST_SET = 0x0510; - static LIST_ADDWITHINDEX = 0x0511; - static LIST_REMOVEWITHINDEX = 0x0512; - static LIST_LASTINDEXOF = 0x0513; - static LIST_INDEXOF = 0x0514; - static LIST_SUB = 0x0515; - static LIST_ITERATOR = 0x0516; - static LIST_LISTITERATOR = 0x0517; -} diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index 4fa925451..ce53ddedf 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_REMOVE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x050500 +const REQUEST_MESSAGE_TYPE = 328960; +// hex: 0x050501 +const RESPONSE_MESSAGE_TYPE = 328961; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListRemoveResponseParams { + response: boolean; +} export class ListRemoveCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ListRemoveResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index 86f08fca0..5dfdee061 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; - -var REQUEST_TYPE = ListMessageType.LIST_REMOVELISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x050C00 +const REQUEST_MESSAGE_TYPE = 330752; +// hex: 0x050C01 +const RESPONSE_MESSAGE_TYPE = 330753; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListRemoveListenerResponseParams { + response: boolean; +} export class ListRemoveListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): ListRemoveListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index a8faa37b6..0c3171179 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -14,52 +14,48 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ListMessageType.LIST_REMOVEWITHINDEX; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x051200 +const REQUEST_MESSAGE_TYPE = 332288; +// hex: 0x051201 +const RESPONSE_MESSAGE_TYPE = 332289; +const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ListRemoveWithIndexResponseParams { + response: Data; +} export class ListRemoveWithIndexCodec { + static encodeRequest(name: string, index: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_INDEX_OFFSET, index); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, index: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, index: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, index)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(index); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): ListRemoveWithIndexResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 07a8a31a6..9284c9ef9 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -14,54 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ListMessageType.LIST_SET; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x051000 +const REQUEST_MESSAGE_TYPE = 331776; +// hex: 0x051001 +const RESPONSE_MESSAGE_TYPE = 331777; +const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class ListSetCodec { - - - static calculateSize(name: string, index: number, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } +export interface ListSetResponseParams { + response: Data; +} - static encodeRequest(name: string, index: number, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, index, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(index); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); +export class ListSetCodec { + static encodeRequest(name: string, index: number, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_INDEX_OFFSET, index); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): ListSetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index 27d4bca09..3ff459352 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ListMessageType.LIST_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x050100 +const REQUEST_MESSAGE_TYPE = 327936; +// hex: 0x050101 +const RESPONSE_MESSAGE_TYPE = 327937; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ListSizeResponseParams { + response: number; +} export class ListSizeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ListSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index 8f7912b0a..c3a5cc0fa 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -14,59 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ListMessageType} from './ListMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ListMessageType.LIST_SUB; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x051500 +const REQUEST_MESSAGE_TYPE = 333056; +// hex: 0x051501 +const RESPONSE_MESSAGE_TYPE = 333057; +const REQUEST_FROM_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TO_OFFSET = REQUEST_FROM_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TO_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class ListSubCodec { - - - static calculateSize(name: string, from: number, to: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } +export interface ListSubResponseParams { + response: Data[]; +} - static encodeRequest(name: string, from: number, to: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, from, to)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(from); - clientMessage.appendInt32(to); - clientMessage.updateFrameLength(); +export class ListSubCodec { + static encodeRequest(name: string, from: number, to: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_FROM_OFFSET, from); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_TO_OFFSET, to); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): ListSubResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/LockForceUnlockCodec.ts b/src/codec/LockForceUnlockCodec.ts deleted file mode 100644 index 9ef3a3043..000000000 --- a/src/codec/LockForceUnlockCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_FORCEUNLOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class LockForceUnlockCodec { - - - static calculateSize(name: string, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/LockGetLockCountCodec.ts b/src/codec/LockGetLockCountCodec.ts deleted file mode 100644 index d7734c41b..000000000 --- a/src/codec/LockGetLockCountCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_GETLOCKCOUNT; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; - - -export class LockGetLockCountCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/LockGetRemainingLeaseTimeCodec.ts b/src/codec/LockGetRemainingLeaseTimeCodec.ts deleted file mode 100644 index 78967c270..000000000 --- a/src/codec/LockGetRemainingLeaseTimeCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_GETREMAININGLEASETIME; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; - - -export class LockGetRemainingLeaseTimeCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); - - return parameters; - } - - -} diff --git a/src/codec/LockIsLockedByCurrentThreadCodec.ts b/src/codec/LockIsLockedByCurrentThreadCodec.ts deleted file mode 100644 index 88d0af063..000000000 --- a/src/codec/LockIsLockedByCurrentThreadCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_ISLOCKEDBYCURRENTTHREAD; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class LockIsLockedByCurrentThreadCodec { - - - static calculateSize(name: string, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/LockIsLockedCodec.ts b/src/codec/LockIsLockedCodec.ts deleted file mode 100644 index 441c03f50..000000000 --- a/src/codec/LockIsLockedCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_ISLOCKED; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class LockIsLockedCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/LockLockCodec.ts b/src/codec/LockLockCodec.ts deleted file mode 100644 index 8b0c97098..000000000 --- a/src/codec/LockLockCodec.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_LOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class LockLockCodec { - - - static calculateSize(name: string, leaseTime: any, threadId: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, leaseTime: any, threadId: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, leaseTime, threadId, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(leaseTime); - clientMessage.appendLong(threadId); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/LockMessageType.ts b/src/codec/LockMessageType.ts deleted file mode 100644 index a8be70d15..000000000 --- a/src/codec/LockMessageType.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class LockMessageType { - static LOCK_ISLOCKED = 0x0701; - static LOCK_ISLOCKEDBYCURRENTTHREAD = 0x0702; - static LOCK_GETLOCKCOUNT = 0x0703; - static LOCK_GETREMAININGLEASETIME = 0x0704; - static LOCK_LOCK = 0x0705; - static LOCK_UNLOCK = 0x0706; - static LOCK_FORCEUNLOCK = 0x0707; - static LOCK_TRYLOCK = 0x0708; -} diff --git a/src/codec/LockTryLockCodec.ts b/src/codec/LockTryLockCodec.ts deleted file mode 100644 index 9643e4cd3..000000000 --- a/src/codec/LockTryLockCodec.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_TRYLOCK; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - - -export class LockTryLockCodec { - - - static calculateSize(name: string, threadId: any, lease: any, timeout: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, threadId: any, lease: any, timeout: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, threadId, lease, timeout, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(threadId); - clientMessage.appendLong(lease); - clientMessage.appendLong(timeout); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/LockUnlockCodec.ts b/src/codec/LockUnlockCodec.ts deleted file mode 100644 index 6068c905a..000000000 --- a/src/codec/LockUnlockCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {LockMessageType} from './LockMessageType'; - -var REQUEST_TYPE = LockMessageType.LOCK_UNLOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; - - -export class LockUnlockCodec { - - - static calculateSize(name: string, threadId: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, threadId: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, threadId, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(threadId); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index 0cfeef568..2e348d03e 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -14,101 +14,74 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x011900 +const REQUEST_MESSAGE_TYPE = 71936; +// hex: 0x011901 +const RESPONSE_MESSAGE_TYPE = 71937; +// hex: 0x011902 +const EVENT_ENTRY_MESSAGE_TYPE = 71938; + +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LISTENER_FLAGS_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_LISTENER_FLAGS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MapAddEntryListenerResponseParams { + response: UUID; +} export class MapAddEntryListenerCodec { - - - static calculateSize(name: string, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, includeValue, listenerFlags, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(includeValue); - clientMessage.appendInt32(listenerFlags); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_LISTENER_FLAGS_OFFSET, listenerFlags); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index e277f2a5b..56eb108a7 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -14,103 +14,75 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENERTOKEY; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x011800 +const REQUEST_MESSAGE_TYPE = 71680; +// hex: 0x011801 +const RESPONSE_MESSAGE_TYPE = 71681; +// hex: 0x011802 +const EVENT_ENTRY_MESSAGE_TYPE = 71682; + +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LISTENER_FLAGS_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_LISTENER_FLAGS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MapAddEntryListenerToKeyResponseParams { + response: UUID; +} export class MapAddEntryListenerToKeyCodec { - - - static calculateSize(name: string, key: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, includeValue, listenerFlags, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendBoolean(includeValue); - clientMessage.appendInt32(listenerFlags); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_LISTENER_FLAGS_OFFSET, listenerFlags); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerToKeyResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index 3ac911b18..f6f8bda86 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -14,105 +14,76 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENERTOKEYWITHPREDICATE; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x011600 +const REQUEST_MESSAGE_TYPE = 71168; +// hex: 0x011601 +const RESPONSE_MESSAGE_TYPE = 71169; +// hex: 0x011602 +const EVENT_ENTRY_MESSAGE_TYPE = 71170; + +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LISTENER_FLAGS_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_LISTENER_FLAGS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MapAddEntryListenerToKeyWithPredicateResponseParams { + response: UUID; +} export class MapAddEntryListenerToKeyWithPredicateCodec { - - - static calculateSize(name: string, key: Data, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(predicate); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, predicate, includeValue, listenerFlags, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(predicate); - clientMessage.appendBoolean(includeValue); - clientMessage.appendInt32(listenerFlags); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_LISTENER_FLAGS_OFFSET, listenerFlags); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerToKeyWithPredicateResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index af79db41a..ea7c5c3de 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -14,103 +14,75 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_ADDENTRYLISTENERWITHPREDICATE; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x011700 +const REQUEST_MESSAGE_TYPE = 71424; +// hex: 0x011701 +const RESPONSE_MESSAGE_TYPE = 71425; +// hex: 0x011702 +const EVENT_ENTRY_MESSAGE_TYPE = 71426; + +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LISTENER_FLAGS_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_LISTENER_FLAGS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MapAddEntryListenerWithPredicateResponseParams { + response: UUID; +} export class MapAddEntryListenerWithPredicateCodec { - - - static calculateSize(name: string, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate, includeValue, listenerFlags, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.appendBoolean(includeValue); - clientMessage.appendInt32(listenerFlags); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_LISTENER_FLAGS_OFFSET, listenerFlags); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerWithPredicateResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index 8cd98767f..e3e14e6ee 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -14,41 +14,32 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {MapMessageType} from './MapMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {IndexConfig} from '../config/IndexConfig'; +import {IndexConfigCodec} from './custom/IndexConfigCodec'; -var REQUEST_TYPE = MapMessageType.MAP_ADDINDEX; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x012900 +const REQUEST_MESSAGE_TYPE = 76032; +// hex: 0x012901 +const RESPONSE_MESSAGE_TYPE = 76033; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MapAddIndexCodec { + static encodeRequest(name: string, indexConfig: IndexConfig): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, attribute: string, ordered: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(attribute); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, attribute: string, ordered: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, attribute, ordered)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(attribute); - clientMessage.appendBoolean(ordered); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + IndexConfigCodec.encode(clientMessage, indexConfig); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index 8a5e4659f..928581181 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -14,49 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_ADDINTERCEPTOR; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x011400 +const REQUEST_MESSAGE_TYPE = 70656; +// hex: 0x011401 +const RESPONSE_MESSAGE_TYPE = 70657; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapAddInterceptorResponseParams { + response: string; +} export class MapAddInterceptorCodec { + static encodeRequest(name: string, interceptor: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, interceptor: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(interceptor); - return dataSize; - } - - static encodeRequest(name: string, interceptor: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, interceptor)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(interceptor); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, interceptor); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapAddInterceptorResponseParams { + // empty initial frame + clientMessage.nextFrame(); - parameters['response'] = clientMessage.readString(); - - return parameters; + return { + response: StringCodec.decode(clientMessage), + }; } - - } diff --git a/src/codec/MapAddNearCacheEntryListenerCodec.ts b/src/codec/MapAddNearCacheEntryListenerCodec.ts deleted file mode 100644 index 1ddb11085..000000000 --- a/src/codec/MapAddNearCacheEntryListenerCodec.ts +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {UUIDCodec} from './UUIDCodec'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_ADDNEARCACHEENTRYLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - - -export class MapAddNearCacheEntryListenerCodec { - - - static calculateSize(name: string, listenerFlags: number, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, listenerFlags: number, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, listenerFlags, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(listenerFlags); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); - - return parameters; - } - - static handle(clientMessage: ClientMessage, handleEventImapinvalidation: any, handleEventImapbatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_IMAPINVALIDATION && handleEventImapinvalidation !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var sourceUuid: string = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - sourceUuid = clientMessage.readString(); - } - var partitionUuid: any = undefined; - if (!messageFinished) { - partitionUuid = UUIDCodec.decode(clientMessage, toObjectFunction); - } - var sequence: any = undefined; - if (!messageFinished) { - sequence = clientMessage.readLong(); - } - handleEventImapinvalidation(key, sourceUuid, partitionUuid, sequence); - } - if (messageType === BitsUtil.EVENT_IMAPBATCHINVALIDATION && handleEventImapbatchinvalidation !== null) { - var messageFinished = false; - var keys: any = undefined; - if (!messageFinished) { - - var keysSize = clientMessage.readInt32(); - keys = []; - for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { - var keysItem: Data; - keysItem = clientMessage.readData(); - keys.push(keysItem); - } - } - var sourceUuids: any = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - - var sourceUuidsSize = clientMessage.readInt32(); - sourceUuids = []; - for (var sourceUuidsIndex = 0; sourceUuidsIndex < sourceUuidsSize; sourceUuidsIndex++) { - var sourceUuidsItem: string; - sourceUuidsItem = clientMessage.readString(); - sourceUuids.push(sourceUuidsItem); - } - } - var partitionUuids: any = undefined; - if (!messageFinished) { - - var partitionUuidsSize = clientMessage.readInt32(); - partitionUuids = []; - for (var partitionUuidsIndex = 0; partitionUuidsIndex < partitionUuidsSize; partitionUuidsIndex++) { - var partitionUuidsItem: any; - partitionUuidsItem = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuids.push(partitionUuidsItem); - } - } - var sequences: any = undefined; - if (!messageFinished) { - - var sequencesSize = clientMessage.readInt32(); - sequences = []; - for (var sequencesIndex = 0; sequencesIndex < sequencesSize; sequencesIndex++) { - var sequencesItem: any; - sequencesItem = clientMessage.readLong(); - sequences.push(sequencesItem); - } - } - handleEventImapbatchinvalidation(keys, sourceUuids, partitionUuids, sequences); - } - } - -} diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index b55a33ff8..e01e6d574 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -14,136 +14,85 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {UUIDCodec} from './UUIDCodec'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_ADDNEARCACHEINVALIDATIONLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {ListUUIDCodec} from './builtin/ListUUIDCodec'; +import {ListLongCodec} from './builtin/ListLongCodec'; + +// hex: 0x013F00 +const REQUEST_MESSAGE_TYPE = 81664; +// hex: 0x013F01 +const RESPONSE_MESSAGE_TYPE = 81665; +// hex: 0x013F02 +const EVENT_I_MAP_INVALIDATION_MESSAGE_TYPE = 81666; +// hex: 0x013F03 +const EVENT_I_MAP_BATCH_INVALIDATION_MESSAGE_TYPE = 81667; + +const REQUEST_LISTENER_FLAGS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_LISTENER_FLAGS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_I_MAP_INVALIDATION_SOURCE_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_I_MAP_INVALIDATION_PARTITION_UUID_OFFSET = EVENT_I_MAP_INVALIDATION_SOURCE_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const EVENT_I_MAP_INVALIDATION_SEQUENCE_OFFSET = EVENT_I_MAP_INVALIDATION_PARTITION_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MapAddNearCacheInvalidationListenerResponseParams { + response: UUID; +} export class MapAddNearCacheInvalidationListenerCodec { - - - static calculateSize(name: string, listenerFlags: number, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, listenerFlags: number, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, listenerFlags, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(listenerFlags); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, listenerFlags: number, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_LISTENER_FLAGS_OFFSET, listenerFlags); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): MapAddNearCacheInvalidationListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventImapinvalidation: any, handleEventImapbatchinvalidation: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_IMAPINVALIDATION && handleEventImapinvalidation !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var sourceUuid: string = undefined; - if (!messageFinished) { - sourceUuid = clientMessage.readString(); - } - var partitionUuid: any = undefined; - if (!messageFinished) { - partitionUuid = UUIDCodec.decode(clientMessage, toObjectFunction); - } - var sequence: any = undefined; - if (!messageFinished) { - sequence = clientMessage.readLong(); - } - handleEventImapinvalidation(key, sourceUuid, partitionUuid, sequence); + static handle(clientMessage: ClientMessage, handleIMapInvalidationEvent: (key: Data, sourceUuid: UUID, partitionUuid: UUID, sequence: Long) => void = null, handleIMapBatchInvalidationEvent: (keys: Data[], sourceUuids: UUID[], partitionUuids: UUID[], sequences: Long[]) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_I_MAP_INVALIDATION_MESSAGE_TYPE && handleIMapInvalidationEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const sourceUuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_I_MAP_INVALIDATION_SOURCE_UUID_OFFSET); + const partitionUuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_I_MAP_INVALIDATION_PARTITION_UUID_OFFSET); + const sequence = FixSizedTypesCodec.decodeLong(initialFrame.content, EVENT_I_MAP_INVALIDATION_SEQUENCE_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleIMapInvalidationEvent(key, sourceUuid, partitionUuid, sequence); + return; } - if (messageType === BitsUtil.EVENT_IMAPBATCHINVALIDATION && handleEventImapbatchinvalidation !== null) { - var messageFinished = false; - var keys: any = undefined; - if (!messageFinished) { - messageFinished = clientMessage.isComplete(); - } - if (!messageFinished) { - - var keysSize = clientMessage.readInt32(); - keys = []; - for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { - var keysItem: Data; - keysItem = clientMessage.readData(); - keys.push(keysItem); - } - } - var sourceUuids: any = undefined; - if (!messageFinished) { - - var sourceUuidsSize = clientMessage.readInt32(); - sourceUuids = []; - for (var sourceUuidsIndex = 0; sourceUuidsIndex < sourceUuidsSize; sourceUuidsIndex++) { - var sourceUuidsItem: string; - sourceUuidsItem = clientMessage.readString(); - sourceUuids.push(sourceUuidsItem); - } - } - var partitionUuids: any = undefined; - if (!messageFinished) { - - var partitionUuidsSize = clientMessage.readInt32(); - partitionUuids = []; - for (var partitionUuidsIndex = 0; partitionUuidsIndex < partitionUuidsSize; partitionUuidsIndex++) { - var partitionUuidsItem: any; - partitionUuidsItem = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuids.push(partitionUuidsItem); - } - } - var sequences: any = undefined; - if (!messageFinished) { - - var sequencesSize = clientMessage.readInt32(); - sequences = []; - for (var sequencesIndex = 0; sequencesIndex < sequencesSize; sequencesIndex++) { - var sequencesItem: any; - sequencesItem = clientMessage.readLong(); - sequences.push(sequencesItem); - } - } - handleEventImapbatchinvalidation(keys, sourceUuids, partitionUuids, sequences); + if (messageType === EVENT_I_MAP_BATCH_INVALIDATION_MESSAGE_TYPE && handleIMapBatchInvalidationEvent !== null) { + // empty initial frame + clientMessage.nextFrame(); + const keys = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + const sourceUuids = ListUUIDCodec.decode(clientMessage); + const partitionUuids = ListUUIDCodec.decode(clientMessage); + const sequences = ListLongCodec.decode(clientMessage); + handleIMapBatchInvalidationEvent(keys, sourceUuids, partitionUuids, sequences); + return; } } - } diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index 34f1afdc3..9ed0d0fd7 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -14,65 +14,61 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; -var REQUEST_TYPE = MapMessageType.MAP_ADDPARTITIONLOSTLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x011B00 +const REQUEST_MESSAGE_TYPE = 72448; +// hex: 0x011B01 +const RESPONSE_MESSAGE_TYPE = 72449; +// hex: 0x011B02 +const EVENT_MAP_PARTITION_LOST_MESSAGE_TYPE = 72450; +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_MAP_PARTITION_LOST_PARTITION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_MAP_PARTITION_LOST_UUID_OFFSET = EVENT_MAP_PARTITION_LOST_PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapAddPartitionLostListenerResponseParams { + response: UUID; +} export class MapAddPartitionLostListenerCodec { + static encodeRequest(name: string, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapAddPartitionLostListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readString(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventMappartitionlost: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_MAPPARTITIONLOST && handleEventMappartitionlost !== null) { - var messageFinished = false; - var partitionId: number = undefined; - if (!messageFinished) { - partitionId = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - handleEventMappartitionlost(partitionId, uuid); + static handle(clientMessage: ClientMessage, handleMapPartitionLostEvent: (partitionId: number, uuid: UUID) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_MAP_PARTITION_LOST_MESSAGE_TYPE && handleMapPartitionLostEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const partitionId = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_MAP_PARTITION_LOST_PARTITION_ID_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_MAP_PARTITION_LOST_UUID_OFFSET); + handleMapPartitionLostEvent(partitionId, uuid); + return; } } - } diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index 91889a497..c4e6d42eb 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -14,55 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_AGGREGATE; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; +// hex: 0x013900 +const REQUEST_MESSAGE_TYPE = 80128; +// hex: 0x013901 +const RESPONSE_MESSAGE_TYPE = 80129; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapAggregateResponseParams { + response: Data; +} export class MapAggregateCodec { + static encodeRequest(name: string, aggregator: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, aggregator: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(aggregator); - return dataSize; - } - - static encodeRequest(name: string, aggregator: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, aggregator)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(aggregator); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, aggregator); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapAggregateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index 1fdb07aac..46a48ba43 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -14,57 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_AGGREGATEWITHPREDICATE; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; +// hex: 0x013A00 +const REQUEST_MESSAGE_TYPE = 80384; +// hex: 0x013A01 +const RESPONSE_MESSAGE_TYPE = 80385; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapAggregateWithPredicateCodec { - - - static calculateSize(name: string, aggregator: Data, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(aggregator); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } +export interface MapAggregateWithPredicateResponseParams { + response: Data; +} - static encodeRequest(name: string, aggregator: Data, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, aggregator, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(aggregator); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); +export class MapAggregateWithPredicateCodec { + static encodeRequest(name: string, aggregator: Data, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, aggregator); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapAggregateWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapAssignAndGetUuidsCodec.ts b/src/codec/MapAssignAndGetUuidsCodec.ts deleted file mode 100644 index 77356c4d2..000000000 --- a/src/codec/MapAssignAndGetUuidsCodec.ts +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {UUIDCodec} from './UUIDCodec'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_ASSIGNANDGETUUIDS; -var RESPONSE_TYPE = 123; -var RETRYABLE = true; - - -export class MapAssignAndGetUuidsCodec { - - - static calculateSize() { -// Calculates the request payload size - var dataSize: number = 0; - return dataSize; - } - - static encodeRequest() { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize()); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'partitionUuidList': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - var partitionUuidListSize = clientMessage.readInt32(); - var partitionUuidList: any = []; - for (var partitionUuidListIndex = 0; partitionUuidListIndex < partitionUuidListSize; partitionUuidListIndex++) { - var partitionUuidListItem: any; - var partitionUuidListItemKey: number; - var partitionUuidListItemVal: any; - partitionUuidListItemKey = clientMessage.readInt32(); - partitionUuidListItemVal = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuidListItem = [partitionUuidListItemKey, partitionUuidListItemVal]; - partitionUuidList.push(partitionUuidListItem); - } - parameters['partitionUuidList'] = partitionUuidList; - - return parameters; - } - - -} diff --git a/src/codec/MapClearCodec.ts b/src/codec/MapClearCodec.ts index 391aba3ad..e5467de9b 100644 --- a/src/codec/MapClearCodec.ts +++ b/src/codec/MapClearCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {MapMessageType} from './MapMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MapMessageType.MAP_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x012D00 +const REQUEST_MESSAGE_TYPE = 77056; +// hex: 0x012D01 +const RESPONSE_MESSAGE_TYPE = 77057; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MapClearCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapClearNearCacheCodec.ts b/src/codec/MapClearNearCacheCodec.ts deleted file mode 100644 index 3db4d3684..000000000 --- a/src/codec/MapClearNearCacheCodec.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); -import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_CLEARNEARCACHE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class MapClearNearCacheCodec { - - - static calculateSize(name: string, target: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeAddress(target); - return dataSize; - } - - static encodeRequest(name: string, target: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, target)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - AddressCodec.encode(clientMessage, target); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 8d68b1552..1d2c2995f 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -14,51 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_CONTAINSKEY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x010600 +const REQUEST_MESSAGE_TYPE = 67072; +// hex: 0x010601 +const RESPONSE_MESSAGE_TYPE = 67073; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MapContainsKeyCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MapContainsKeyResponseParams { + response: boolean; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MapContainsKeyCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MapContainsKeyResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 8f632618a..6a6c1166b 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_CONTAINSVALUE; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x010700 +const REQUEST_MESSAGE_TYPE = 67328; +// hex: 0x010701 +const RESPONSE_MESSAGE_TYPE = 67329; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapContainsValueResponseParams { + response: boolean; +} export class MapContainsValueCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapContainsValueResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapDeleteCodec.ts b/src/codec/MapDeleteCodec.ts index faa5bc9f2..0c21396ce 100644 --- a/src/codec/MapDeleteCodec.ts +++ b/src/codec/MapDeleteCodec.ts @@ -14,42 +14,36 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_DELETE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x010900 +const REQUEST_MESSAGE_TYPE = 67840; +// hex: 0x010901 +const RESPONSE_MESSAGE_TYPE = 67841; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MapDeleteCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index 36cfee457..a49e2065c 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -14,61 +14,52 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; +import {PagingPredicateHolderCodec} from './custom/PagingPredicateHolderCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {AnchorDataListHolder} from '../protocol/AnchorDataListHolder'; +import {AnchorDataListHolderCodec} from './custom/AnchorDataListHolderCodec'; -var REQUEST_TYPE = MapMessageType.MAP_ENTRIESWITHPAGINGPREDICATE; -var RESPONSE_TYPE = 117; -var RETRYABLE = true; +// hex: 0x013600 +const REQUEST_MESSAGE_TYPE = 79360; +// hex: 0x013601 +const RESPONSE_MESSAGE_TYPE = 79361; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapEntriesWithPagingPredicateResponseParams { + response: Array<[Data, Data]>; + anchorDataList: AnchorDataListHolder; +} export class MapEntriesWithPagingPredicateCodec { + static encodeRequest(name: string, predicate: PagingPredicateHolder): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + PagingPredicateHolderCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapEntriesWithPagingPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + anchorDataList: AnchorDataListHolderCodec.decode(clientMessage), + }; } - - } diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index fc7388228..42fccf9f0 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -14,61 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; -var REQUEST_TYPE = MapMessageType.MAP_ENTRIESWITHPREDICATE; -var RESPONSE_TYPE = 117; -var RETRYABLE = true; +// hex: 0x012800 +const REQUEST_MESSAGE_TYPE = 75776; +// hex: 0x012801 +const RESPONSE_MESSAGE_TYPE = 75777; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapEntriesWithPredicateResponseParams { + response: Array<[Data, Data]>; +} export class MapEntriesWithPredicateCodec { + static encodeRequest(name: string, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapEntriesWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index f27a385f7..124a31b9b 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -14,59 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; -var REQUEST_TYPE = MapMessageType.MAP_ENTRYSET; -var RESPONSE_TYPE = 117; -var RETRYABLE = true; +// hex: 0x012500 +const REQUEST_MESSAGE_TYPE = 75008; +// hex: 0x012501 +const RESPONSE_MESSAGE_TYPE = 75009; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapEntrySetResponseParams { + response: Array<[Data, Data]>; +} export class MapEntrySetCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapEntrySetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index 94513c5e1..1ce284c3e 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -14,97 +14,64 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_EVENTJOURNALREAD; -var RESPONSE_TYPE = 115; -var RETRYABLE = true; - +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {LongArrayCodec} from './builtin/LongArrayCodec'; + +// hex: 0x014200 +const REQUEST_MESSAGE_TYPE = 82432; +// hex: 0x014201 +const RESPONSE_MESSAGE_TYPE = 82433; + +const REQUEST_START_SEQUENCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_MIN_SIZE_OFFSET = REQUEST_START_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_MAX_SIZE_OFFSET = REQUEST_MIN_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_READ_COUNT_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_NEXT_SEQ_OFFSET = RESPONSE_READ_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapEventJournalReadResponseParams { + readCount: number; + items: Data[]; + itemSeqs: Long[]; + nextSeq: Long; +} export class MapEventJournalReadCodec { - - - static calculateSize(name: string, startSequence: any, minSize: number, maxSize: number, predicate: Data, projection: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (predicate !== null) { - dataSize += BitsUtil.calculateSizeData(predicate); - } - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (projection !== null) { - dataSize += BitsUtil.calculateSizeData(projection); - } - return dataSize; - } - - static encodeRequest(name: string, startSequence: any, minSize: number, maxSize: number, predicate: Data, projection: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, startSequence, minSize, maxSize, predicate, projection)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(startSequence); - clientMessage.appendInt32(minSize); - clientMessage.appendInt32(maxSize); - clientMessage.appendBoolean(predicate === null); - if (predicate !== null) { - clientMessage.appendData(predicate); - } - clientMessage.appendBoolean(projection === null); - if (projection !== null) { - clientMessage.appendData(projection); - } - clientMessage.updateFrameLength(); + static encodeRequest(name: string, startSequence: Long, minSize: number, maxSize: number, predicate: Data, projection: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_START_SEQUENCE_OFFSET, startSequence); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_MIN_SIZE_OFFSET, minSize); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_MAX_SIZE_OFFSET, maxSize); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + CodecUtil.encodeNullable(clientMessage, predicate, DataCodec.encode); + CodecUtil.encodeNullable(clientMessage, projection, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'readCount': null, - 'items': null, - 'itemSeqs': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['readCount'] = clientMessage.readInt32(); + static decodeResponse(clientMessage: ClientMessage): MapEventJournalReadResponseParams { + const initialFrame = clientMessage.nextFrame(); - - var itemsSize = clientMessage.readInt32(); - var items: any = []; - for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { - var itemsItem: Data; - itemsItem = clientMessage.readData(); - items.push(itemsItem); - } - parameters['items'] = items; - - - if (clientMessage.readBoolean() !== true) { - - var itemSeqsSize = clientMessage.readInt32(); - var itemSeqs: any = []; - for (var itemSeqsIndex = 0; itemSeqsIndex < itemSeqsSize; itemSeqsIndex++) { - var itemSeqsItem: any; - itemSeqsItem = clientMessage.readLong(); - itemSeqs.push(itemSeqsItem); - } - parameters['itemSeqs'] = itemSeqs; - } - - return parameters; + return { + readCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_READ_COUNT_OFFSET), + nextSeq: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEXT_SEQ_OFFSET), + items: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + itemSeqs: CodecUtil.decodeNullable(clientMessage, LongArrayCodec.decode), + }; } - - } diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index e13b3111f..d29494aaa 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -14,53 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_EVENTJOURNALSUBSCRIBE; -var RESPONSE_TYPE = 125; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; + +// hex: 0x014100 +const REQUEST_MESSAGE_TYPE = 82176; +// hex: 0x014101 +const RESPONSE_MESSAGE_TYPE = 82177; + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_OLDEST_SEQUENCE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_NEWEST_SEQUENCE_OFFSET = RESPONSE_OLDEST_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapEventJournalSubscribeResponseParams { + oldestSequence: Long; + newestSequence: Long; +} export class MapEventJournalSubscribeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'oldestSequence': null, - 'newestSequence': null - }; + static decodeResponse(clientMessage: ClientMessage): MapEventJournalSubscribeResponseParams { + const initialFrame = clientMessage.nextFrame(); - if (clientMessage.isComplete()) { - return parameters; - } - parameters['oldestSequence'] = clientMessage.readLong(); - - parameters['newestSequence'] = clientMessage.readLong(); - - return parameters; + return { + oldestSequence: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_OLDEST_SEQUENCE_OFFSET), + newestSequence: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEWEST_SEQUENCE_OFFSET), + }; } - - } diff --git a/src/codec/MapEvictAllCodec.ts b/src/codec/MapEvictAllCodec.ts index 07e7d0a36..1e6c23a5a 100644 --- a/src/codec/MapEvictAllCodec.ts +++ b/src/codec/MapEvictAllCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {MapMessageType} from './MapMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MapMessageType.MAP_EVICTALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x011F00 +const REQUEST_MESSAGE_TYPE = 73472; +// hex: 0x011F01 +const RESPONSE_MESSAGE_TYPE = 73473; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MapEvictAllCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index 5b01ea584..8dbd52f1a 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -14,51 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_EVICT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x011E00 +const REQUEST_MESSAGE_TYPE = 73216; +// hex: 0x011E01 +const RESPONSE_MESSAGE_TYPE = 73217; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MapEvictCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MapEvictResponseParams { + response: boolean; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MapEvictCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MapEvictResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index a1ad6c189..50059136d 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -14,61 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; -var REQUEST_TYPE = MapMessageType.MAP_EXECUTEONALLKEYS; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; +// hex: 0x013000 +const REQUEST_MESSAGE_TYPE = 77824; +// hex: 0x013001 +const RESPONSE_MESSAGE_TYPE = 77825; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapExecuteOnAllKeysResponseParams { + response: Array<[Data, Data]>; +} export class MapExecuteOnAllKeysCodec { + static encodeRequest(name: string, entryProcessor: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, entryProcessor: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(entryProcessor); - return dataSize; - } - - static encodeRequest(name: string, entryProcessor: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entryProcessor)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(entryProcessor); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, entryProcessor); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapExecuteOnAllKeysResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index d20b47900..c7a3c2a26 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -14,56 +14,51 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_EXECUTEONKEY; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x012E00 +const REQUEST_MESSAGE_TYPE = 77312; +// hex: 0x012E01 +const RESPONSE_MESSAGE_TYPE = 77313; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapExecuteOnKeyResponseParams { + response: Data; +} export class MapExecuteOnKeyCodec { + static encodeRequest(name: string, entryProcessor: Data, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, entryProcessor: Data, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(entryProcessor); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, entryProcessor: Data, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entryProcessor, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(entryProcessor); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, entryProcessor); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapExecuteOnKeyResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index 718e6cd14..06e8c6cc2 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -14,72 +14,48 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; -var REQUEST_TYPE = MapMessageType.MAP_EXECUTEONKEYS; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; +// hex: 0x013200 +const REQUEST_MESSAGE_TYPE = 78336; +// hex: 0x013201 +const RESPONSE_MESSAGE_TYPE = 78337; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapExecuteOnKeysCodec { - - - static calculateSize(name: string, entryProcessor: Data, keys: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(entryProcessor); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - return dataSize; - } - - static encodeRequest(name: string, entryProcessor: Data, keys: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entryProcessor, keys)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(entryProcessor); - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); +export interface MapExecuteOnKeysResponseParams { + response: Array<[Data, Data]>; +} - clientMessage.updateFrameLength(); +export class MapExecuteOnKeysCodec { + static encodeRequest(name: string, entryProcessor: Data, keys: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, entryProcessor); + ListMultiFrameCodec.encode(clientMessage, keys, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapExecuteOnKeysResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 65d6e4aac..95f342476 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -14,63 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; -var REQUEST_TYPE = MapMessageType.MAP_EXECUTEWITHPREDICATE; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; +// hex: 0x013100 +const REQUEST_MESSAGE_TYPE = 78080; +// hex: 0x013101 +const RESPONSE_MESSAGE_TYPE = 78081; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapExecuteWithPredicateCodec { - - - static calculateSize(name: string, entryProcessor: Data, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(entryProcessor); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } +export interface MapExecuteWithPredicateResponseParams { + response: Array<[Data, Data]>; +} - static encodeRequest(name: string, entryProcessor: Data, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entryProcessor, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(entryProcessor); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); +export class MapExecuteWithPredicateCodec { + static encodeRequest(name: string, entryProcessor: Data, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, entryProcessor); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapExecuteWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index 9ba8cc6ae..2405e48f6 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -14,71 +14,52 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListIntegerIntegerCodec} from './builtin/EntryListIntegerIntegerCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; -var REQUEST_TYPE = MapMessageType.MAP_FETCHENTRIES; -var RESPONSE_TYPE = 118; -var RETRYABLE = true; +// hex: 0x013800 +const REQUEST_MESSAGE_TYPE = 79872; +// hex: 0x013801 +const RESPONSE_MESSAGE_TYPE = 79873; +const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapFetchEntriesCodec { +export interface MapFetchEntriesResponseParams { + iterationPointers: Array<[number, number]>; + entries: Array<[Data, Data]>; +} +export class MapFetchEntriesCodec { + static encodeRequest(name: string, iterationPointers: Array<[number, number]>, batch: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); - static calculateSize(name: string, partitionId: number, tableIndex: number, batch: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_BATCH_OFFSET, batch); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static encodeRequest(name: string, partitionId: number, tableIndex: number, batch: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, partitionId, tableIndex, batch)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(partitionId); - clientMessage.appendInt32(tableIndex); - clientMessage.appendInt32(batch); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + EntryListIntegerIntegerCodec.encode(clientMessage, iterationPointers); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'tableIndex': null, - 'entries': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['tableIndex'] = clientMessage.readInt32(); + static decodeResponse(clientMessage: ClientMessage): MapFetchEntriesResponseParams { + // empty initial frame + clientMessage.nextFrame(); - - var entriesSize = clientMessage.readInt32(); - var entries: any = []; - for (var entriesIndex = 0; entriesIndex < entriesSize; entriesIndex++) { - var entriesItem: any; - var entriesItemKey: Data; - var entriesItemVal: any; - entriesItemKey = clientMessage.readData(); - entriesItemVal = clientMessage.readData(); - entriesItem = [entriesItemKey, entriesItemVal]; - entries.push(entriesItem); - } - parameters['entries'] = entries; - - return parameters; + return { + iterationPointers: EntryListIntegerIntegerCodec.decode(clientMessage), + entries: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index d3bb3ee2e..f477e14a7 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -14,67 +14,52 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListIntegerIntegerCodec} from './builtin/EntryListIntegerIntegerCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_FETCHKEYS; -var RESPONSE_TYPE = 116; -var RETRYABLE = true; +// hex: 0x013700 +const REQUEST_MESSAGE_TYPE = 79616; +// hex: 0x013701 +const RESPONSE_MESSAGE_TYPE = 79617; +const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapFetchKeysCodec { +export interface MapFetchKeysResponseParams { + iterationPointers: Array<[number, number]>; + keys: Data[]; +} +export class MapFetchKeysCodec { + static encodeRequest(name: string, iterationPointers: Array<[number, number]>, batch: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); - static calculateSize(name: string, partitionId: number, tableIndex: number, batch: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_BATCH_OFFSET, batch); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static encodeRequest(name: string, partitionId: number, tableIndex: number, batch: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, partitionId, tableIndex, batch)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(partitionId); - clientMessage.appendInt32(tableIndex); - clientMessage.appendInt32(batch); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + EntryListIntegerIntegerCodec.encode(clientMessage, iterationPointers); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'tableIndex': null, - 'keys': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['tableIndex'] = clientMessage.readInt32(); + static decodeResponse(clientMessage: ClientMessage): MapFetchKeysResponseParams { + // empty initial frame + clientMessage.nextFrame(); - - var keysSize = clientMessage.readInt32(); - var keys: any = []; - for (var keysIndex = 0; keysIndex < keysSize; keysIndex++) { - var keysItem: Data; - keysItem = clientMessage.readData(); - keys.push(keysItem); - } - parameters['keys'] = keys; - - return parameters; + return { + iterationPointers: EntryListIntegerIntegerCodec.decode(clientMessage), + keys: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index bf82bf319..e0749f1af 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -14,102 +14,53 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {UUIDCodec} from './UUIDCodec'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_FETCHNEARCACHEINVALIDATIONMETADATA; -var RESPONSE_TYPE = 122; -var RETRYABLE = false; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {EntryListIntegerLongCodec} from './builtin/EntryListIntegerLongCodec'; +import * as Long from 'long'; +import {EntryListIntegerUUIDCodec} from './builtin/EntryListIntegerUUIDCodec'; + +// hex: 0x013D00 +const REQUEST_MESSAGE_TYPE = 81152; +// hex: 0x013D01 +const RESPONSE_MESSAGE_TYPE = 81153; + +const REQUEST_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MapFetchNearCacheInvalidationMetadataResponseParams { + namePartitionSequenceList: Array<[string, Array<[number, Long]>]>; + partitionUuidList: Array<[number, UUID]>; +} export class MapFetchNearCacheInvalidationMetadataCodec { + static encodeRequest(names: string[], uuid: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_UUID_OFFSET, uuid); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(names: any, address: Address) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - names.forEach((namesItem: any) => { - dataSize += BitsUtil.calculateSizeString(namesItem); - }); - dataSize += BitsUtil.calculateSizeAddress(address); - return dataSize; - } - - static encodeRequest(names: any, address: Address) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(names, address)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendInt32(names.length); - - names.forEach((namesItem: any) => { - clientMessage.appendString(namesItem); - }); - - AddressCodec.encode(clientMessage, address); - clientMessage.updateFrameLength(); + ListMultiFrameCodec.encode(clientMessage, names, StringCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'namePartitionSequenceList': null, - 'partitionUuidList': null - }; + static decodeResponse(clientMessage: ClientMessage): MapFetchNearCacheInvalidationMetadataResponseParams { + // empty initial frame + clientMessage.nextFrame(); - if (clientMessage.isComplete()) { - return parameters; - } - - var namePartitionSequenceListSize = clientMessage.readInt32(); - var namePartitionSequenceList: any = []; - for (var namePartitionSequenceListIndex = 0; namePartitionSequenceListIndex < namePartitionSequenceListSize; namePartitionSequenceListIndex++) { - var namePartitionSequenceListItem: any; - var namePartitionSequenceListItemKey: string; - var namePartitionSequenceListItemVal: any; - namePartitionSequenceListItemKey = clientMessage.readString(); - - var namePartitionSequenceListItemValSize = clientMessage.readInt32(); - var namePartitionSequenceListItemVal: any = []; - for (var namePartitionSequenceListItemValIndex = 0; namePartitionSequenceListItemValIndex < namePartitionSequenceListItemValSize; namePartitionSequenceListItemValIndex++) { - var namePartitionSequenceListItemValItem: any; - var namePartitionSequenceListItemValItemKey: number; - var namePartitionSequenceListItemValItemVal: any; - namePartitionSequenceListItemValItemKey = clientMessage.readInt32(); - namePartitionSequenceListItemValItemVal = clientMessage.readLong(); - namePartitionSequenceListItemValItem = [namePartitionSequenceListItemValItemKey, namePartitionSequenceListItemValItemVal]; - namePartitionSequenceListItemVal.push(namePartitionSequenceListItemValItem); - } - namePartitionSequenceListItem = [namePartitionSequenceListItemKey, namePartitionSequenceListItemVal]; - namePartitionSequenceList.push(namePartitionSequenceListItem); - } - parameters['namePartitionSequenceList'] = namePartitionSequenceList; - - - var partitionUuidListSize = clientMessage.readInt32(); - var partitionUuidList: any = []; - for (var partitionUuidListIndex = 0; partitionUuidListIndex < partitionUuidListSize; partitionUuidListIndex++) { - var partitionUuidListItem: any; - var partitionUuidListItemKey: number; - var partitionUuidListItemVal: any; - partitionUuidListItemKey = clientMessage.readInt32(); - partitionUuidListItemVal = UUIDCodec.decode(clientMessage, toObjectFunction); - partitionUuidListItem = [partitionUuidListItemKey, partitionUuidListItemVal]; - partitionUuidList.push(partitionUuidListItem); - } - parameters['partitionUuidList'] = partitionUuidList; - - return parameters; + return { + namePartitionSequenceList: EntryListCodec.decode(clientMessage, StringCodec.decode, EntryListIntegerLongCodec.decode), + partitionUuidList: EntryListIntegerUUIDCodec.decode(clientMessage), + }; } - - } diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index 098f9e4f3..b05abe5fc 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -14,69 +14,54 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListIntegerIntegerCodec} from './builtin/EntryListIntegerIntegerCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -var REQUEST_TYPE = MapMessageType.MAP_FETCHWITHQUERY; -var RESPONSE_TYPE = 124; -var RETRYABLE = true; +// hex: 0x014000 +const REQUEST_MESSAGE_TYPE = 81920; +// hex: 0x014001 +const RESPONSE_MESSAGE_TYPE = 81921; +const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapFetchWithQueryCodec { +export interface MapFetchWithQueryResponseParams { + results: Data[]; + iterationPointers: Array<[number, number]>; +} +export class MapFetchWithQueryCodec { + static encodeRequest(name: string, iterationPointers: Array<[number, number]>, batch: number, projection: Data, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); - static calculateSize(name: string, tableIndex: number, batch: number, projection: Data, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(projection); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_BATCH_OFFSET, batch); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static encodeRequest(name: string, tableIndex: number, batch: number, projection: Data, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, tableIndex, batch, projection, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(tableIndex); - clientMessage.appendInt32(batch); - clientMessage.appendData(projection); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + EntryListIntegerIntegerCodec.encode(clientMessage, iterationPointers); + DataCodec.encode(clientMessage, projection); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'results': null, - 'nextTableIndexToReadFrom': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } + static decodeResponse(clientMessage: ClientMessage): MapFetchWithQueryResponseParams { + // empty initial frame + clientMessage.nextFrame(); - var resultsSize = clientMessage.readInt32(); - var results: any = []; - for (var resultsIndex = 0; resultsIndex < resultsSize; resultsIndex++) { - var resultsItem: Data; - resultsItem = clientMessage.readData(); - results.push(resultsItem); - } - parameters['results'] = results; - - parameters['nextTableIndexToReadFrom'] = clientMessage.readInt32(); - - return parameters; + return { + results: ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode), + iterationPointers: EntryListIntegerIntegerCodec.decode(clientMessage), + }; } - - } diff --git a/src/codec/MapFlushCodec.ts b/src/codec/MapFlushCodec.ts index 865cd2ba8..d854c99fe 100644 --- a/src/codec/MapFlushCodec.ts +++ b/src/codec/MapFlushCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {MapMessageType} from './MapMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MapMessageType.MAP_FLUSH; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x010A00 +const REQUEST_MESSAGE_TYPE = 68096; +// hex: 0x010A01 +const RESPONSE_MESSAGE_TYPE = 68097; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MapFlushCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapForceUnlockCodec.ts b/src/codec/MapForceUnlockCodec.ts index fa84f6561..55c860c62 100644 --- a/src/codec/MapForceUnlockCodec.ts +++ b/src/codec/MapForceUnlockCodec.ts @@ -14,42 +14,36 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_FORCEUNLOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; +// hex: 0x013300 +const REQUEST_MESSAGE_TYPE = 78592; +// hex: 0x013301 +const RESPONSE_MESSAGE_TYPE = 78593; +const REQUEST_REFERENCE_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MapForceUnlockCodec { - - - static calculateSize(name: string, key: Data, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index ca34cb0e5..5935580a5 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -14,70 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; -var REQUEST_TYPE = MapMessageType.MAP_GETALL; -var RESPONSE_TYPE = 117; -var RETRYABLE = false; +// hex: 0x012300 +const REQUEST_MESSAGE_TYPE = 74496; +// hex: 0x012301 +const RESPONSE_MESSAGE_TYPE = 74497; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapGetAllCodec { - - - static calculateSize(name: string, keys: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - return dataSize; - } +export interface MapGetAllResponseParams { + response: Array<[Data, Data]>; +} - static encodeRequest(name: string, keys: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, keys)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(keys.length); +export class MapGetAllCodec { + static encodeRequest(name: string, keys: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, keys, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapGetAllResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index 52d739474..93f52e2c5 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -14,54 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_GET; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; +// hex: 0x010200 +const REQUEST_MESSAGE_TYPE = 66048; +// hex: 0x010201 +const RESPONSE_MESSAGE_TYPE = 66049; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -export class MapGetCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MapGetResponseParams { + response: Data; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MapGetCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapGetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index 8ad527f69..9dbaf86f2 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -14,55 +14,54 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {EntryViewCodec} from './EntryViewCodec'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {SimpleEntryView} from '../core/SimpleEntryView'; +import {SimpleEntryViewCodec} from './custom/SimpleEntryViewCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_GETENTRYVIEW; -var RESPONSE_TYPE = 111; -var RETRYABLE = true; +// hex: 0x011D00 +const REQUEST_MESSAGE_TYPE = 72960; +// hex: 0x011D01 +const RESPONSE_MESSAGE_TYPE = 72961; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_MAX_IDLE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapGetEntryViewResponseParams { + response: SimpleEntryView; + maxIdle: Long; +} export class MapGetEntryViewCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = EntryViewCodec.decode(clientMessage, toObjectFunction); - } + static decodeResponse(clientMessage: ClientMessage): MapGetEntryViewResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + maxIdle: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_MAX_IDLE_OFFSET), + response: CodecUtil.decodeNullable(clientMessage, SimpleEntryViewCodec.decode), + }; } - - } diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index f04a88750..dbd1137d3 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MapMessageType.MAP_ISEMPTY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x012B00 +const REQUEST_MESSAGE_TYPE = 76544; +// hex: 0x012B01 +const RESPONSE_MESSAGE_TYPE = 76545; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapIsEmptyResponseParams { + response: boolean; +} export class MapIsEmptyCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapIsEmptyResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index 51b4fa26e..04e345464 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_ISLOCKED; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x011200 +const REQUEST_MESSAGE_TYPE = 70144; +// hex: 0x011201 +const RESPONSE_MESSAGE_TYPE = 70145; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapIsLockedResponseParams { + response: boolean; +} export class MapIsLockedCodec { + static encodeRequest(name: string, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapIsLockedResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index c076ea702..a0bbcf91e 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_KEYSET; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x012200 +const REQUEST_MESSAGE_TYPE = 74240; +// hex: 0x012201 +const RESPONSE_MESSAGE_TYPE = 74241; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapKeySetResponseParams { + response: Data[]; +} export class MapKeySetCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapKeySetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index 30a03b5c0..c9c459194 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -14,57 +14,52 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; +import {PagingPredicateHolderCodec} from './custom/PagingPredicateHolderCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; +import {AnchorDataListHolder} from '../protocol/AnchorDataListHolder'; +import {AnchorDataListHolderCodec} from './custom/AnchorDataListHolderCodec'; -var REQUEST_TYPE = MapMessageType.MAP_KEYSETWITHPAGINGPREDICATE; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x013400 +const REQUEST_MESSAGE_TYPE = 78848; +// hex: 0x013401 +const RESPONSE_MESSAGE_TYPE = 78849; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapKeySetWithPagingPredicateResponseParams { + response: Data[]; + anchorDataList: AnchorDataListHolder; +} export class MapKeySetWithPagingPredicateCodec { + static encodeRequest(name: string, predicate: PagingPredicateHolder): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + PagingPredicateHolderCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapKeySetWithPagingPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + anchorDataList: AnchorDataListHolderCodec.decode(clientMessage), + }; } - - } diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index c83f495e0..56c2097ea 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -14,57 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -var REQUEST_TYPE = MapMessageType.MAP_KEYSETWITHPREDICATE; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x012600 +const REQUEST_MESSAGE_TYPE = 75264; +// hex: 0x012601 +const RESPONSE_MESSAGE_TYPE = 75265; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapKeySetWithPredicateResponseParams { + response: Data[]; +} export class MapKeySetWithPredicateCodec { + static encodeRequest(name: string, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapKeySetWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapLoadAllCodec.ts b/src/codec/MapLoadAllCodec.ts index 6bbd1467a..ceb31faac 100644 --- a/src/codec/MapLoadAllCodec.ts +++ b/src/codec/MapLoadAllCodec.ts @@ -14,39 +14,32 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {MapMessageType} from './MapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MapMessageType.MAP_LOADALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x012000 +const REQUEST_MESSAGE_TYPE = 73728; +// hex: 0x012001 +const RESPONSE_MESSAGE_TYPE = 73729; +const REQUEST_REPLACE_EXISTING_VALUES_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REPLACE_EXISTING_VALUES_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; export class MapLoadAllCodec { + static encodeRequest(name: string, replaceExistingValues: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_REPLACE_EXISTING_VALUES_OFFSET, replaceExistingValues); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, replaceExistingValues: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, replaceExistingValues: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, replaceExistingValues)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(replaceExistingValues); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapLoadGivenKeysCodec.ts b/src/codec/MapLoadGivenKeysCodec.ts index 586f320e3..629ca2d78 100644 --- a/src/codec/MapLoadGivenKeysCodec.ts +++ b/src/codec/MapLoadGivenKeysCodec.ts @@ -14,50 +14,36 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {MapMessageType} from './MapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_LOADGIVENKEYS; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x012100 +const REQUEST_MESSAGE_TYPE = 73984; +// hex: 0x012101 +const RESPONSE_MESSAGE_TYPE = 73985; +const REQUEST_REPLACE_EXISTING_VALUES_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REPLACE_EXISTING_VALUES_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; export class MapLoadGivenKeysCodec { - - - static calculateSize(name: string, keys: any, replaceExistingValues: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - keys.forEach((keysItem: any) => { - dataSize += BitsUtil.calculateSizeData(keysItem); - }); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, keys: any, replaceExistingValues: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, keys, replaceExistingValues)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(keys.length); - - keys.forEach((keysItem: any) => { - clientMessage.appendData(keysItem); - }); - - clientMessage.appendBoolean(replaceExistingValues); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, keys: Data[], replaceExistingValues: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_REPLACE_EXISTING_VALUES_OFFSET, replaceExistingValues); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, keys, DataCodec.encode); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapLockCodec.ts b/src/codec/MapLockCodec.ts index e4643df51..33f5a6e5e 100644 --- a/src/codec/MapLockCodec.ts +++ b/src/codec/MapLockCodec.ts @@ -14,46 +14,40 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_LOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; +// hex: 0x011000 +const REQUEST_MESSAGE_TYPE = 69632; +// hex: 0x011001 +const RESPONSE_MESSAGE_TYPE = 69633; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MapLockCodec { - - - static calculateSize(name: string, key: Data, threadId: any, ttl: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any, ttl: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId, ttl, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.appendLong(ttl); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, threadId: Long, ttl: Long, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapMessageType.ts b/src/codec/MapMessageType.ts deleted file mode 100644 index 4f9ac79f1..000000000 --- a/src/codec/MapMessageType.ts +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class MapMessageType { - static MAP_PUT = 0x0101; - static MAP_GET = 0x0102; - static MAP_REMOVE = 0x0103; - static MAP_REPLACE = 0x0104; - static MAP_REPLACEIFSAME = 0x0105; - static MAP_CONTAINSKEY = 0x0109; - static MAP_CONTAINSVALUE = 0x010a; - static MAP_REMOVEIFSAME = 0x010b; - static MAP_DELETE = 0x010c; - static MAP_FLUSH = 0x010d; - static MAP_TRYREMOVE = 0x010e; - static MAP_TRYPUT = 0x010f; - static MAP_PUTTRANSIENT = 0x0110; - static MAP_PUTIFABSENT = 0x0111; - static MAP_SET = 0x0112; - static MAP_LOCK = 0x0113; - static MAP_TRYLOCK = 0x0114; - static MAP_ISLOCKED = 0x0115; - static MAP_UNLOCK = 0x0116; - static MAP_ADDINTERCEPTOR = 0x0117; - static MAP_REMOVEINTERCEPTOR = 0x0118; - static MAP_ADDENTRYLISTENERTOKEYWITHPREDICATE = 0x0119; - static MAP_ADDENTRYLISTENERWITHPREDICATE = 0x011a; - static MAP_ADDENTRYLISTENERTOKEY = 0x011b; - static MAP_ADDENTRYLISTENER = 0x011c; - static MAP_ADDNEARCACHEENTRYLISTENER = 0x011d; - static MAP_REMOVEENTRYLISTENER = 0x011e; - static MAP_ADDPARTITIONLOSTLISTENER = 0x011f; - static MAP_REMOVEPARTITIONLOSTLISTENER = 0x0120; - static MAP_GETENTRYVIEW = 0x0121; - static MAP_EVICT = 0x0122; - static MAP_EVICTALL = 0x0123; - static MAP_LOADALL = 0x0124; - static MAP_LOADGIVENKEYS = 0x0125; - static MAP_KEYSET = 0x0126; - static MAP_GETALL = 0x0127; - static MAP_VALUES = 0x0128; - static MAP_ENTRYSET = 0x0129; - static MAP_KEYSETWITHPREDICATE = 0x012a; - static MAP_VALUESWITHPREDICATE = 0x012b; - static MAP_ENTRIESWITHPREDICATE = 0x012c; - static MAP_ADDINDEX = 0x012d; - static MAP_SIZE = 0x012e; - static MAP_ISEMPTY = 0x012f; - static MAP_PUTALL = 0x0130; - static MAP_CLEAR = 0x0131; - static MAP_EXECUTEONKEY = 0x0132; - static MAP_SUBMITTOKEY = 0x0133; - static MAP_EXECUTEONALLKEYS = 0x0134; - static MAP_EXECUTEWITHPREDICATE = 0x0135; - static MAP_EXECUTEONKEYS = 0x0136; - static MAP_FORCEUNLOCK = 0x0137; - static MAP_KEYSETWITHPAGINGPREDICATE = 0x0138; - static MAP_VALUESWITHPAGINGPREDICATE = 0x0139; - static MAP_ENTRIESWITHPAGINGPREDICATE = 0x013a; - static MAP_CLEARNEARCACHE = 0x013b; - static MAP_FETCHKEYS = 0x013c; - static MAP_FETCHENTRIES = 0x013d; - static MAP_AGGREGATE = 0x013e; - static MAP_AGGREGATEWITHPREDICATE = 0x013f; - static MAP_PROJECT = 0x0140; - static MAP_PROJECTWITHPREDICATE = 0x0141; - static MAP_FETCHNEARCACHEINVALIDATIONMETADATA = 0x0142; - static MAP_ASSIGNANDGETUUIDS = 0x0143; - static MAP_REMOVEALL = 0x0144; - static MAP_ADDNEARCACHEINVALIDATIONLISTENER = 0x0145; - static MAP_FETCHWITHQUERY = 0x0146; - static MAP_EVENTJOURNALSUBSCRIBE = 0x0147; - static MAP_EVENTJOURNALREAD = 0x0148; -} diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 4646325ee..90bf3aaec 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -14,60 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -var REQUEST_TYPE = MapMessageType.MAP_PROJECT; -var RESPONSE_TYPE = 119; -var RETRYABLE = true; +// hex: 0x013B00 +const REQUEST_MESSAGE_TYPE = 80640; +// hex: 0x013B01 +const RESPONSE_MESSAGE_TYPE = 80641; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapProjectResponseParams { + response: Data[]; +} export class MapProjectCodec { + static encodeRequest(name: string, projection: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, projection: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(projection); - return dataSize; - } - - static encodeRequest(name: string, projection: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, projection)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(projection); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, projection); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapProjectResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index c79019805..cb3b65b20 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -14,62 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -var REQUEST_TYPE = MapMessageType.MAP_PROJECTWITHPREDICATE; -var RESPONSE_TYPE = 119; -var RETRYABLE = true; +// hex: 0x013C00 +const REQUEST_MESSAGE_TYPE = 80896; +// hex: 0x013C01 +const RESPONSE_MESSAGE_TYPE = 80897; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -export class MapProjectWithPredicateCodec { - - - static calculateSize(name: string, projection: Data, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(projection); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } +export interface MapProjectWithPredicateResponseParams { + response: Data[]; +} - static encodeRequest(name: string, projection: Data, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, projection, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(projection); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); +export class MapProjectWithPredicateCodec { + static encodeRequest(name: string, projection: Data, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, projection); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapProjectWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapPutAllCodec.ts b/src/codec/MapPutAllCodec.ts index b23e15edd..44050630b 100644 --- a/src/codec/MapPutAllCodec.ts +++ b/src/codec/MapPutAllCodec.ts @@ -14,55 +14,33 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; -var REQUEST_TYPE = MapMessageType.MAP_PUTALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x012C00 +const REQUEST_MESSAGE_TYPE = 76800; +// hex: 0x012C01 +const RESPONSE_MESSAGE_TYPE = 76801; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MapPutAllCodec { + static encodeRequest(name: string, entries: Array<[Data, Data]>): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, entries: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - entries.forEach((entriesItem: any) => { - var key: Data = entriesItem[0]; - var val: Data = entriesItem[1]; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(val); - }); - return dataSize; - } - - static encodeRequest(name: string, entries: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entries)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(entries.length); - - entries.forEach((entriesItem: any) => { - var key: Data = entriesItem[0]; - var val: Data = entriesItem[1]; - clientMessage.appendData(key); - clientMessage.appendData(val); - }); - - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + EntryListCodec.encode(clientMessage, entries, DataCodec.encode, DataCodec.encode); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index 85cad2194..bd010ca80 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -14,58 +14,53 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_PUT; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x010100 +const REQUEST_MESSAGE_TYPE = 65792; +// hex: 0x010101 +const RESPONSE_MESSAGE_TYPE = 65793; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapPutResponseParams { + response: Data; +} export class MapPutCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId, ttl)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.appendLong(ttl); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapPutResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index b6d1ce496..ce71ab94d 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -14,58 +14,53 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_PUTIFABSENT; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x010E00 +const REQUEST_MESSAGE_TYPE = 69120; +// hex: 0x010E01 +const RESPONSE_MESSAGE_TYPE = 69121; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapPutIfAbsentResponseParams { + response: Data; +} export class MapPutIfAbsentCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId, ttl)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.appendLong(ttl); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapPutIfAbsentResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts new file mode 100644 index 000000000..155b51955 --- /dev/null +++ b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x014600 +const REQUEST_MESSAGE_TYPE = 83456; +// hex: 0x014601 +const RESPONSE_MESSAGE_TYPE = 83457; + +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapPutIfAbsentWithMaxIdleResponseParams { + response: Data; +} + +export class MapPutIfAbsentWithMaxIdleCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_MAX_IDLE_OFFSET, maxIdle); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): MapPutIfAbsentWithMaxIdleResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/MapPutTransientCodec.ts b/src/codec/MapPutTransientCodec.ts index 911b4b119..e2e8f7fa8 100644 --- a/src/codec/MapPutTransientCodec.ts +++ b/src/codec/MapPutTransientCodec.ts @@ -14,46 +14,39 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_PUTTRANSIENT; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x010D00 +const REQUEST_MESSAGE_TYPE = 68864; +// hex: 0x010D01 +const RESPONSE_MESSAGE_TYPE = 68865; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MapPutTransientCodec { - - - static calculateSize(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId, ttl)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.appendLong(ttl); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapPutTransientWithMaxIdleCodec.ts b/src/codec/MapPutTransientWithMaxIdleCodec.ts new file mode 100644 index 000000000..669726765 --- /dev/null +++ b/src/codec/MapPutTransientWithMaxIdleCodec.ts @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x014500 +const REQUEST_MESSAGE_TYPE = 83200; +// hex: 0x014501 +const RESPONSE_MESSAGE_TYPE = 83201; + +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapPutTransientWithMaxIdleResponseParams { + response: Data; +} + +export class MapPutTransientWithMaxIdleCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_MAX_IDLE_OFFSET, maxIdle); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): MapPutTransientWithMaxIdleResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/MapPutWithMaxIdleCodec.ts b/src/codec/MapPutWithMaxIdleCodec.ts new file mode 100644 index 000000000..dfcd45f3c --- /dev/null +++ b/src/codec/MapPutWithMaxIdleCodec.ts @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x014400 +const REQUEST_MESSAGE_TYPE = 82944; +// hex: 0x014401 +const RESPONSE_MESSAGE_TYPE = 82945; + +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapPutWithMaxIdleResponseParams { + response: Data; +} + +export class MapPutWithMaxIdleCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_MAX_IDLE_OFFSET, maxIdle); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): MapPutWithMaxIdleResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/MapRemoveAllCodec.ts b/src/codec/MapRemoveAllCodec.ts index bab2ac97e..6ab577f96 100644 --- a/src/codec/MapRemoveAllCodec.ts +++ b/src/codec/MapRemoveAllCodec.ts @@ -14,40 +14,32 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_REMOVEALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x013E00 +const REQUEST_MESSAGE_TYPE = 81408; +// hex: 0x013E01 +const RESPONSE_MESSAGE_TYPE = 81409; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MapRemoveAllCodec { + static encodeRequest(name: string, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index 43ad8d6d3..0e6bb3ddd 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -14,54 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_REMOVE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x010300 +const REQUEST_MESSAGE_TYPE = 66304; +// hex: 0x010301 +const RESPONSE_MESSAGE_TYPE = 66305; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -export class MapRemoveCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MapRemoveResponseParams { + response: Data; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MapRemoveCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapRemoveResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index 6cb43c43e..b4b10be15 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_REMOVEENTRYLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x011A00 +const REQUEST_MESSAGE_TYPE = 72192; +// hex: 0x011A01 +const RESPONSE_MESSAGE_TYPE = 72193; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapRemoveEntryListenerResponseParams { + response: boolean; +} export class MapRemoveEntryListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MapRemoveEntryListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index f51a2f0c0..4242394c9 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -14,53 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_REMOVEIFSAME; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x010800 +const REQUEST_MESSAGE_TYPE = 67584; +// hex: 0x010801 +const RESPONSE_MESSAGE_TYPE = 67585; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MapRemoveIfSameCodec { - - - static calculateSize(name: string, key: Data, value: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MapRemoveIfSameResponseParams { + response: boolean; +} - static encodeRequest(name: string, key: Data, value: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MapRemoveIfSameCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MapRemoveIfSameResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index be1e418f1..5d9318bd5 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -14,49 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MapMessageType.MAP_REMOVEINTERCEPTOR; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x011500 +const REQUEST_MESSAGE_TYPE = 70912; +// hex: 0x011501 +const RESPONSE_MESSAGE_TYPE = 70913; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapRemoveInterceptorResponseParams { + response: boolean; +} export class MapRemoveInterceptorCodec { + static encodeRequest(name: string, id: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, id: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(id); - return dataSize; - } - - static encodeRequest(name: string, id: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, id)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(id); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + StringCodec.encode(clientMessage, id); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapRemoveInterceptorResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index 8dc1887a6..e49d5bfe5 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; - -var REQUEST_TYPE = MapMessageType.MAP_REMOVEPARTITIONLOSTLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x011C00 +const REQUEST_MESSAGE_TYPE = 72704; +// hex: 0x011C01 +const RESPONSE_MESSAGE_TYPE = 72705; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapRemovePartitionLostListenerResponseParams { + response: boolean; +} export class MapRemovePartitionLostListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MapRemovePartitionLostListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index e8ff35f33..0b9d70945 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -14,56 +14,51 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_REPLACE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x010400 +const REQUEST_MESSAGE_TYPE = 66560; +// hex: 0x010401 +const RESPONSE_MESSAGE_TYPE = 66561; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapReplaceResponseParams { + response: Data; +} export class MapReplaceCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, value: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapReplaceResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index e608ef85b..e2a19eb39 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -14,55 +14,51 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_REPLACEIFSAME; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x010500 +const REQUEST_MESSAGE_TYPE = 66816; +// hex: 0x010501 +const RESPONSE_MESSAGE_TYPE = 66817; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapReplaceIfSameResponseParams { + response: boolean; +} export class MapReplaceIfSameCodec { + static encodeRequest(name: string, key: Data, testValue: Data, value: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, testValue: Data, value: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(testValue); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, testValue: Data, value: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, testValue, value, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(testValue); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, testValue); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapReplaceIfSameResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapSetCodec.ts b/src/codec/MapSetCodec.ts index e83d93dca..6fcd2c5f4 100644 --- a/src/codec/MapSetCodec.ts +++ b/src/codec/MapSetCodec.ts @@ -14,46 +14,39 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_SET; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x010F00 +const REQUEST_MESSAGE_TYPE = 69376; +// hex: 0x010F01 +const RESPONSE_MESSAGE_TYPE = 69377; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MapSetCodec { - - - static calculateSize(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, threadId: any, ttl: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId, ttl)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.appendLong(ttl); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapSetTtlCodec.ts b/src/codec/MapSetTtlCodec.ts new file mode 100644 index 000000000..f4c57bd54 --- /dev/null +++ b/src/codec/MapSetTtlCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x014300 +const REQUEST_MESSAGE_TYPE = 82688; +// hex: 0x014301 +const RESPONSE_MESSAGE_TYPE = 82689; + +const REQUEST_TTL_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapSetTtlResponseParams { + response: boolean; +} + +export class MapSetTtlCodec { + static encodeRequest(name: string, key: Data, ttl: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): MapSetTtlResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/MapSetWithMaxIdleCodec.ts b/src/codec/MapSetWithMaxIdleCodec.ts new file mode 100644 index 000000000..7441759b6 --- /dev/null +++ b/src/codec/MapSetWithMaxIdleCodec.ts @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x014700 +const REQUEST_MESSAGE_TYPE = 83712; +// hex: 0x014701 +const RESPONSE_MESSAGE_TYPE = 83713; + +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapSetWithMaxIdleResponseParams { + response: Data; +} + +export class MapSetWithMaxIdleCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_MAX_IDLE_OFFSET, maxIdle); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): MapSetWithMaxIdleResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index ab61ecc4a..7a6e8baec 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MapMessageType.MAP_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x012A00 +const REQUEST_MESSAGE_TYPE = 76288; +// hex: 0x012A01 +const RESPONSE_MESSAGE_TYPE = 76289; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapSizeResponseParams { + response: number; +} export class MapSizeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 1cc4fba71..2d04c6a10 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -14,56 +14,51 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = MapMessageType.MAP_SUBMITTOKEY; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x012F00 +const REQUEST_MESSAGE_TYPE = 77568; +// hex: 0x012F01 +const RESPONSE_MESSAGE_TYPE = 77569; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface MapSubmitToKeyResponseParams { + response: Data; +} export class MapSubmitToKeyCodec { + static encodeRequest(name: string, entryProcessor: Data, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, entryProcessor: Data, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(entryProcessor); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, entryProcessor: Data, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entryProcessor, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(entryProcessor); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, entryProcessor); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): MapSubmitToKeyResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index 4ea3dae7b..2a1e0a3da 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -14,57 +14,55 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_TRYLOCK; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x011100 +const REQUEST_MESSAGE_TYPE = 69888; +// hex: 0x011101 +const RESPONSE_MESSAGE_TYPE = 69889; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LEASE_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_OFFSET = REQUEST_LEASE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapTryLockResponseParams { + response: boolean; +} export class MapTryLockCodec { + static encodeRequest(name: string, key: Data, threadId: Long, lease: Long, timeout: Long, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_LEASE_OFFSET, lease); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, threadId: any, lease: any, timeout: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any, lease: any, timeout: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId, lease, timeout, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.appendLong(lease); - clientMessage.appendLong(timeout); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapTryLockResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index 58e26fee8..a3ff35438 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -14,55 +14,52 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_TRYPUT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x010C00 +const REQUEST_MESSAGE_TYPE = 68608; +// hex: 0x010C01 +const RESPONSE_MESSAGE_TYPE = 68609; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapTryPutResponseParams { + response: boolean; +} export class MapTryPutCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long, timeout: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, value: Data, threadId: any, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, threadId: any, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapTryPutResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index f2cd48355..c355b03b4 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -14,53 +14,51 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_TRYREMOVE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x010B00 +const REQUEST_MESSAGE_TYPE = 68352; +// hex: 0x010B01 +const RESPONSE_MESSAGE_TYPE = 68353; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MapTryRemoveResponseParams { + response: boolean; +} export class MapTryRemoveCodec { + static encodeRequest(name: string, key: Data, threadId: Long, timeout: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, threadId: any, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MapTryRemoveResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MapUnlockCodec.ts b/src/codec/MapUnlockCodec.ts index 564e2c537..c1c57e449 100644 --- a/src/codec/MapUnlockCodec.ts +++ b/src/codec/MapUnlockCodec.ts @@ -14,44 +14,38 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_UNLOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; +// hex: 0x011300 +const REQUEST_MESSAGE_TYPE = 70400; +// hex: 0x011301 +const RESPONSE_MESSAGE_TYPE = 70401; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_REFERENCE_ID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MapUnlockCodec { - - - static calculateSize(name: string, key: Data, threadId: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, threadId: Long, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 07aac2488..823144d2a 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MapMessageType.MAP_VALUES; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x012400 +const REQUEST_MESSAGE_TYPE = 74752; +// hex: 0x012401 +const RESPONSE_MESSAGE_TYPE = 74753; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapValuesResponseParams { + response: Data[]; +} export class MapValuesCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapValuesResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index 50b4a156e..7b84b8456 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -14,61 +14,52 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; +import {PagingPredicateHolderCodec} from './custom/PagingPredicateHolderCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; +import {AnchorDataListHolder} from '../protocol/AnchorDataListHolder'; +import {AnchorDataListHolderCodec} from './custom/AnchorDataListHolderCodec'; -var REQUEST_TYPE = MapMessageType.MAP_VALUESWITHPAGINGPREDICATE; -var RESPONSE_TYPE = 117; -var RETRYABLE = true; +// hex: 0x013500 +const REQUEST_MESSAGE_TYPE = 79104; +// hex: 0x013501 +const RESPONSE_MESSAGE_TYPE = 79105; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapValuesWithPagingPredicateResponseParams { + response: Data[]; + anchorDataList: AnchorDataListHolder; +} export class MapValuesWithPagingPredicateCodec { + static encodeRequest(name: string, predicate: PagingPredicateHolder): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + PagingPredicateHolderCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapValuesWithPagingPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + anchorDataList: AnchorDataListHolderCodec.decode(clientMessage), + }; } - - } diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 40dd67bf4..77ff5cf24 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -14,57 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MapMessageType} from './MapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -var REQUEST_TYPE = MapMessageType.MAP_VALUESWITHPREDICATE; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x012700 +const REQUEST_MESSAGE_TYPE = 75520; +// hex: 0x012701 +const RESPONSE_MESSAGE_TYPE = 75521; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MapValuesWithPredicateResponseParams { + response: Data[]; +} export class MapValuesWithPredicateCodec { + static encodeRequest(name: string, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, predicate: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - return dataSize; - } - - static encodeRequest(name: string, predicate: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MapValuesWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MemberCodec.ts b/src/codec/MemberCodec.ts deleted file mode 100644 index e31c8c44b..000000000 --- a/src/codec/MemberCodec.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); -import {Member} from '../core/Member'; -import {AddressCodec} from './AddressCodec'; - -export class MemberCodec { - - static encode(clientMessage: ClientMessage, member: Member): void { - AddressCodec.encode(clientMessage, member.address); - clientMessage.appendString(member.uuid); - clientMessage.appendBoolean(member.isLiteMember); - var keys = Object.keys(member.attributes); - clientMessage.appendInt32(keys.length); - for (var key in keys) { - clientMessage.appendString(key); - clientMessage.appendString(member.attributes[key]); - } - } - - static decode(clientMessage: ClientMessage, toObject: Function) { - var address: Address = AddressCodec.decode(clientMessage, toObject); - var uuid = clientMessage.readString(); - var liteMember = clientMessage.readBoolean(); - var attributeSize = clientMessage.readInt32(); - var attributes: any = {}; - for (var i = 0; i < attributeSize; i++) { - var key = clientMessage.readString(); - var val = clientMessage.readString(); - attributes[key] = val; - } - return new Member(address, uuid, liteMember, attributes); - } -} diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index adc3ea942..533cbaaf6 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -14,99 +14,72 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; - -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ADDENTRYLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x020E00 +const REQUEST_MESSAGE_TYPE = 134656; +// hex: 0x020E01 +const RESPONSE_MESSAGE_TYPE = 134657; +// hex: 0x020E02 +const EVENT_ENTRY_MESSAGE_TYPE = 134658; + +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MultiMapAddEntryListenerResponseParams { + response: UUID; +} export class MultiMapAddEntryListenerCodec { - - - static calculateSize(name: string, includeValue: boolean, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, includeValue: boolean, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, includeValue, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(includeValue); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): MultiMapAddEntryListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index e127e4cbd..6b30b45c2 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -14,101 +14,73 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; - -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ADDENTRYLISTENERTOKEY; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x020D00 +const REQUEST_MESSAGE_TYPE = 134400; +// hex: 0x020D01 +const RESPONSE_MESSAGE_TYPE = 134401; +// hex: 0x020D02 +const EVENT_ENTRY_MESSAGE_TYPE = 134402; + +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface MultiMapAddEntryListenerToKeyResponseParams { + response: UUID; +} export class MultiMapAddEntryListenerToKeyCodec { - - - static calculateSize(name: string, key: Data, includeValue: boolean, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, includeValue: boolean, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, includeValue, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendBoolean(includeValue); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, includeValue: boolean, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): MultiMapAddEntryListenerToKeyResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/MultiMapClearCodec.ts b/src/codec/MultiMapClearCodec.ts index 523c5a969..a550a17a1 100644 --- a/src/codec/MultiMapClearCodec.ts +++ b/src/codec/MultiMapClearCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x020B00 +const REQUEST_MESSAGE_TYPE = 133888; +// hex: 0x020B01 +const RESPONSE_MESSAGE_TYPE = 133889; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MultiMapClearCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 5db7b6b17..3f254be10 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -14,53 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CONTAINSENTRY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x020900 +const REQUEST_MESSAGE_TYPE = 133376; +// hex: 0x020901 +const RESPONSE_MESSAGE_TYPE = 133377; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MultiMapContainsEntryCodec { - - - static calculateSize(name: string, key: Data, value: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MultiMapContainsEntryResponseParams { + response: boolean; +} - static encodeRequest(name: string, key: Data, value: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MultiMapContainsEntryCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MultiMapContainsEntryResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index 616cb0128..70dc91a22 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -14,51 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CONTAINSKEY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x020700 +const REQUEST_MESSAGE_TYPE = 132864; +// hex: 0x020701 +const RESPONSE_MESSAGE_TYPE = 132865; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MultiMapContainsKeyCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MultiMapContainsKeyResponseParams { + response: boolean; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MultiMapContainsKeyCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MultiMapContainsKeyResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index adcce5a22..f713a9ddc 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_CONTAINSVALUE; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x020800 +const REQUEST_MESSAGE_TYPE = 133120; +// hex: 0x020801 +const RESPONSE_MESSAGE_TYPE = 133121; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MultiMapContainsValueResponseParams { + response: boolean; +} export class MultiMapContainsValueCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MultiMapContainsValueResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapDeleteCodec.ts b/src/codec/MultiMapDeleteCodec.ts new file mode 100644 index 000000000..c894aab63 --- /dev/null +++ b/src/codec/MultiMapDeleteCodec.ts @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x021600 +const REQUEST_MESSAGE_TYPE = 136704; +// hex: 0x021601 +const RESPONSE_MESSAGE_TYPE = 136705; + +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export class MultiMapDeleteCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } +} diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index 9ed8ee99a..ecc85d7d3 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -14,59 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ENTRYSET; -var RESPONSE_TYPE = 117; -var RETRYABLE = true; +// hex: 0x020600 +const REQUEST_MESSAGE_TYPE = 132608; +// hex: 0x020601 +const RESPONSE_MESSAGE_TYPE = 132609; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MultiMapEntrySetResponseParams { + response: Array<[Data, Data]>; +} export class MultiMapEntrySetCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MultiMapEntrySetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/MultiMapForceUnlockCodec.ts b/src/codec/MultiMapForceUnlockCodec.ts index ed7833108..b90334a8b 100644 --- a/src/codec/MultiMapForceUnlockCodec.ts +++ b/src/codec/MultiMapForceUnlockCodec.ts @@ -14,42 +14,36 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_FORCEUNLOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; +// hex: 0x021400 +const REQUEST_MESSAGE_TYPE = 136192; +// hex: 0x021401 +const RESPONSE_MESSAGE_TYPE = 136193; +const REQUEST_REFERENCE_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MultiMapForceUnlockCodec { - - - static calculateSize(name: string, key: Data, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index afe5236a3..90b183388 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -14,59 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_GET; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x020200 +const REQUEST_MESSAGE_TYPE = 131584; +// hex: 0x020201 +const RESPONSE_MESSAGE_TYPE = 131585; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -export class MultiMapGetCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MultiMapGetResponseParams { + response: Data[]; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MultiMapGetCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MultiMapGetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index fedc9d520..43cb970a4 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_ISLOCKED; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x021200 +const REQUEST_MESSAGE_TYPE = 135680; +// hex: 0x021201 +const RESPONSE_MESSAGE_TYPE = 135681; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MultiMapIsLockedResponseParams { + response: boolean; +} export class MultiMapIsLockedCodec { + static encodeRequest(name: string, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MultiMapIsLockedResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 55092a588..9670843b7 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_KEYSET; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x020400 +const REQUEST_MESSAGE_TYPE = 132096; +// hex: 0x020401 +const RESPONSE_MESSAGE_TYPE = 132097; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MultiMapKeySetResponseParams { + response: Data[]; +} export class MultiMapKeySetCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MultiMapKeySetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MultiMapLockCodec.ts b/src/codec/MultiMapLockCodec.ts index cd96f9a0f..38e1efe98 100644 --- a/src/codec/MultiMapLockCodec.ts +++ b/src/codec/MultiMapLockCodec.ts @@ -14,46 +14,40 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_LOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; +// hex: 0x021000 +const REQUEST_MESSAGE_TYPE = 135168; +// hex: 0x021001 +const RESPONSE_MESSAGE_TYPE = 135169; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MultiMapLockCodec { - - - static calculateSize(name: string, key: Data, threadId: any, ttl: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any, ttl: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId, ttl, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.appendLong(ttl); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, threadId: Long, ttl: Long, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MultiMapMessageType.ts b/src/codec/MultiMapMessageType.ts deleted file mode 100644 index ba3ad9763..000000000 --- a/src/codec/MultiMapMessageType.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class MultiMapMessageType { - static MULTIMAP_PUT = 0x0201; - static MULTIMAP_GET = 0x0202; - static MULTIMAP_REMOVE = 0x0203; - static MULTIMAP_KEYSET = 0x0204; - static MULTIMAP_VALUES = 0x0205; - static MULTIMAP_ENTRYSET = 0x0206; - static MULTIMAP_CONTAINSKEY = 0x0207; - static MULTIMAP_CONTAINSVALUE = 0x0208; - static MULTIMAP_CONTAINSENTRY = 0x0209; - static MULTIMAP_SIZE = 0x020a; - static MULTIMAP_CLEAR = 0x020b; - static MULTIMAP_VALUECOUNT = 0x020c; - static MULTIMAP_ADDENTRYLISTENERTOKEY = 0x020d; - static MULTIMAP_ADDENTRYLISTENER = 0x020e; - static MULTIMAP_REMOVEENTRYLISTENER = 0x020f; - static MULTIMAP_LOCK = 0x0210; - static MULTIMAP_TRYLOCK = 0x0211; - static MULTIMAP_ISLOCKED = 0x0212; - static MULTIMAP_UNLOCK = 0x0213; - static MULTIMAP_FORCEUNLOCK = 0x0214; - static MULTIMAP_REMOVEENTRY = 0x0215; -} diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index 8a5e5e10e..d105778e5 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -14,53 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_PUT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x020100 +const REQUEST_MESSAGE_TYPE = 131328; +// hex: 0x020101 +const RESPONSE_MESSAGE_TYPE = 131329; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MultiMapPutCodec { - - - static calculateSize(name: string, key: Data, value: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MultiMapPutResponseParams { + response: boolean; +} - static encodeRequest(name: string, key: Data, value: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MultiMapPutCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MultiMapPutResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index 42d68a8da..c20c433b0 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -14,59 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_REMOVE; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; +// hex: 0x020300 +const REQUEST_MESSAGE_TYPE = 131840; +// hex: 0x020301 +const RESPONSE_MESSAGE_TYPE = 131841; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -export class MultiMapRemoveCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MultiMapRemoveResponseParams { + response: Data[]; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MultiMapRemoveCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MultiMapRemoveResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index d7d1ad283..b9bfb12f1 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -14,53 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_REMOVEENTRY; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x021500 +const REQUEST_MESSAGE_TYPE = 136448; +// hex: 0x021501 +const RESPONSE_MESSAGE_TYPE = 136449; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MultiMapRemoveEntryCodec { - - - static calculateSize(name: string, key: Data, value: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MultiMapRemoveEntryResponseParams { + response: boolean; +} - static encodeRequest(name: string, key: Data, value: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MultiMapRemoveEntryCodec { + static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MultiMapRemoveEntryResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 078af44d2..5ad002770 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; - -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_REMOVEENTRYLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x020F00 +const REQUEST_MESSAGE_TYPE = 134912; +// hex: 0x020F01 +const RESPONSE_MESSAGE_TYPE = 134913; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MultiMapRemoveEntryListenerResponseParams { + response: boolean; +} export class MultiMapRemoveEntryListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): MultiMapRemoveEntryListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index f6a7bc489..2a23c50b9 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x020A00 +const REQUEST_MESSAGE_TYPE = 133632; +// hex: 0x020A01 +const RESPONSE_MESSAGE_TYPE = 133633; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MultiMapSizeResponseParams { + response: number; +} export class MultiMapSizeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MultiMapSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index eaa640996..66c238ff8 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -14,57 +14,55 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_TRYLOCK; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x021100 +const REQUEST_MESSAGE_TYPE = 135424; +// hex: 0x021101 +const RESPONSE_MESSAGE_TYPE = 135425; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LEASE_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_OFFSET = REQUEST_LEASE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface MultiMapTryLockResponseParams { + response: boolean; +} export class MultiMapTryLockCodec { + static encodeRequest(name: string, key: Data, threadId: Long, lease: Long, timeout: Long, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_LEASE_OFFSET, lease); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, threadId: any, lease: any, timeout: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any, lease: any, timeout: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId, lease, timeout, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.appendLong(lease); - clientMessage.appendLong(timeout); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): MultiMapTryLockResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapUnlockCodec.ts b/src/codec/MultiMapUnlockCodec.ts index 0ce4afbf4..767af7139 100644 --- a/src/codec/MultiMapUnlockCodec.ts +++ b/src/codec/MultiMapUnlockCodec.ts @@ -14,44 +14,38 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_UNLOCK; -var RESPONSE_TYPE = 100; -var RETRYABLE = true; +// hex: 0x021300 +const REQUEST_MESSAGE_TYPE = 135936; +// hex: 0x021301 +const RESPONSE_MESSAGE_TYPE = 135937; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_REFERENCE_ID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; export class MultiMapUnlockCodec { - - - static calculateSize(name: string, key: Data, threadId: any, referenceId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, threadId: any, referenceId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId, referenceId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.appendLong(referenceId); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, threadId: Long, referenceId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_REFERENCE_ID_OFFSET, referenceId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index 7d9a30a7e..b9f47b458 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -14,51 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_VALUECOUNT; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x020C00 +const REQUEST_MESSAGE_TYPE = 134144; +// hex: 0x020C01 +const RESPONSE_MESSAGE_TYPE = 134145; +const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class MultiMapValueCountCodec { - - - static calculateSize(name: string, key: Data, threadId: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface MultiMapValueCountResponseParams { + response: number; +} - static encodeRequest(name: string, key: Data, threadId: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, threadId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendLong(threadId); - clientMessage.updateFrameLength(); +export class MultiMapValueCountCodec { + static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); + static decodeResponse(clientMessage: ClientMessage): MultiMapValueCountResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index 6e02548bd..f3221231e 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {MultiMapMessageType} from './MultiMapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = MultiMapMessageType.MULTIMAP_VALUES; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x020500 +const REQUEST_MESSAGE_TYPE = 132352; +// hex: 0x020501 +const RESPONSE_MESSAGE_TYPE = 132353; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface MultiMapValuesResponseParams { + response: Data[]; +} export class MultiMapValuesCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): MultiMapValuesResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts index c0e02d7a6..69a4dbd55 100644 --- a/src/codec/PNCounterAddCodec.ts +++ b/src/codec/PNCounterAddCodec.ts @@ -14,87 +14,58 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {Data} from '../serialization/Data'; -import {PNCounterMessageType} from './PNCounterMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListUUIDLongCodec} from './builtin/EntryListUUIDLongCodec'; -var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_ADD; -var RESPONSE_TYPE = 127; -var RETRYABLE = false; +// hex: 0x1D0200 +const REQUEST_MESSAGE_TYPE = 1901056; +// hex: 0x1D0201 +const RESPONSE_MESSAGE_TYPE = 1901057; +const REQUEST_DELTA_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_GET_BEFORE_UPDATE_OFFSET = REQUEST_DELTA_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_TARGET_REPLICA_UUID_OFFSET = REQUEST_GET_BEFORE_UPDATE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TARGET_REPLICA_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_VALUE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_REPLICA_COUNT_OFFSET = RESPONSE_VALUE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -export class PNCounterAddCodec { - static calculateSize(name: string, delta: any, getBeforeUpdate: boolean, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - replicaTimestamps.forEach((replicaTimestampsItem: [string, any]) => { - var key: string = replicaTimestampsItem[0]; - var val: any = replicaTimestampsItem[1]; - dataSize += BitsUtil.calculateSizeString(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - }); - dataSize += BitsUtil.calculateSizeAddress(targetReplica); - return dataSize; - } +export interface PNCounterAddResponseParams { + value: Long; + replicaTimestamps: Array<[UUID, Long]>; + replicaCount: number; +} - static encodeRequest(name: string, delta: any, getBeforeUpdate: boolean, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, delta, getBeforeUpdate, replicaTimestamps, targetReplica)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(delta); - clientMessage.appendBoolean(getBeforeUpdate); - clientMessage.appendInt32(replicaTimestamps.length); +export class PNCounterAddCodec { + static encodeRequest(name: string, delta: Long, getBeforeUpdate: boolean, replicaTimestamps: Array<[UUID, Long]>, targetReplicaUUID: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - replicaTimestamps.forEach((replicaTimestampsItem: any) => { - var key: string = replicaTimestampsItem[0]; - var val: any = replicaTimestampsItem[1]; - clientMessage.appendString(key); - clientMessage.appendLong(val); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_DELTA_OFFSET, delta); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_GET_BEFORE_UPDATE_OFFSET, getBeforeUpdate); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TARGET_REPLICA_UUID_OFFSET, targetReplicaUUID); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - AddressCodec.encode(clientMessage, targetReplica); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + EntryListUUIDLongCodec.encode(clientMessage, replicaTimestamps); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - var parameters: any = { - 'value': null, - 'replicaTimestamps': null, - 'replicaCount': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['value'] = clientMessage.readLong(); - - - var replicaTimestampsSize = clientMessage.readInt32(); - var replicaTimestamps: Array<[string, any]> = []; - for (var replicaTimestampsIndex = 0; replicaTimestampsIndex < replicaTimestampsSize; replicaTimestampsIndex++) { - var replicaTimestampsItem: [string, any]; - var replicaTimestampsItemKey: string; - var replicaTimestampsItemVal: any; - replicaTimestampsItemKey = clientMessage.readString(); - replicaTimestampsItemVal = clientMessage.readLong(); - replicaTimestampsItem = [replicaTimestampsItemKey, replicaTimestampsItemVal]; - replicaTimestamps.push(replicaTimestampsItem); - } - parameters['replicaTimestamps'] = replicaTimestamps; + static decodeResponse(clientMessage: ClientMessage): PNCounterAddResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['replicaCount'] = clientMessage.readInt32(); - - return parameters; + return { + value: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_VALUE_OFFSET), + replicaCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_REPLICA_COUNT_OFFSET), + replicaTimestamps: EntryListUUIDLongCodec.decode(clientMessage), + }; } - } diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts index f3aa83efc..05f4b1e38 100644 --- a/src/codec/PNCounterGetCodec.ts +++ b/src/codec/PNCounterGetCodec.ts @@ -14,83 +14,54 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import Address = require('../Address'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {AddressCodec} from './AddressCodec'; -import {Data} from '../serialization/Data'; -import {PNCounterMessageType} from './PNCounterMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListUUIDLongCodec} from './builtin/EntryListUUIDLongCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_GET; -var RESPONSE_TYPE = 127; -var RETRYABLE = true; +// hex: 0x1D0100 +const REQUEST_MESSAGE_TYPE = 1900800; +// hex: 0x1D0101 +const RESPONSE_MESSAGE_TYPE = 1900801; +const REQUEST_TARGET_REPLICA_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TARGET_REPLICA_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_VALUE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_REPLICA_COUNT_OFFSET = RESPONSE_VALUE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -export class PNCounterGetCodec { - static calculateSize(name: string, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - replicaTimestamps.forEach((replicaTimestampsItem: [string, any]) => { - var key: string = replicaTimestampsItem[0]; - var val: any = replicaTimestampsItem[1]; - dataSize += BitsUtil.calculateSizeString(key); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - }); - dataSize += BitsUtil.calculateSizeAddress(targetReplica); - return dataSize; - } +export interface PNCounterGetResponseParams { + value: Long; + replicaTimestamps: Array<[UUID, Long]>; + replicaCount: number; +} - static encodeRequest(name: string, replicaTimestamps: Array<[string, any]>, targetReplica: Address) { - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, replicaTimestamps, targetReplica)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(replicaTimestamps.length); +export class PNCounterGetCodec { + static encodeRequest(name: string, replicaTimestamps: Array<[UUID, Long]>, targetReplicaUUID: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); - replicaTimestamps.forEach((replicaTimestampsItem: any) => { - var key: string = replicaTimestampsItem[0]; - var val: any = replicaTimestampsItem[1]; - clientMessage.appendString(key); - clientMessage.appendLong(val); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TARGET_REPLICA_UUID_OFFSET, targetReplicaUUID); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - AddressCodec.encode(clientMessage, targetReplica); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + EntryListUUIDLongCodec.encode(clientMessage, replicaTimestamps); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - var parameters: any = { - 'value': null, - 'replicaTimestamps': null, - 'replicaCount': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['value'] = clientMessage.readLong(); - - - var replicaTimestampsSize = clientMessage.readInt32(); - var replicaTimestamps: Array<[string, any]> = []; - for (var replicaTimestampsIndex = 0; replicaTimestampsIndex < replicaTimestampsSize; replicaTimestampsIndex++) { - var replicaTimestampsItem: [string, any]; - var replicaTimestampsItemKey: string; - var replicaTimestampsItemVal: any; - replicaTimestampsItemKey = clientMessage.readString(); - replicaTimestampsItemVal = clientMessage.readLong(); - replicaTimestampsItem = [replicaTimestampsItemKey, replicaTimestampsItemVal]; - replicaTimestamps.push(replicaTimestampsItem); - } - parameters['replicaTimestamps'] = replicaTimestamps; + static decodeResponse(clientMessage: ClientMessage): PNCounterGetResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['replicaCount'] = clientMessage.readInt32(); - - return parameters; + return { + value: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_VALUE_OFFSET), + replicaCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_REPLICA_COUNT_OFFSET), + replicaTimestamps: EntryListUUIDLongCodec.decode(clientMessage), + }; } - } diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts index 1eea20044..c220f1933 100644 --- a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -14,44 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {PNCounterMessageType} from './PNCounterMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = PNCounterMessageType.PNCOUNTER_GETCONFIGUREDREPLICACOUNT; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x1D0300 +const REQUEST_MESSAGE_TYPE = 1901312; +// hex: 0x1D0301 +const RESPONSE_MESSAGE_TYPE = 1901313; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface PNCounterGetConfiguredReplicaCountResponseParams { + response: number; +} export class PNCounterGetConfiguredReplicaCountCodec { - static calculateSize(name: string) { - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static encodeRequest(name: string) { - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - var parameters: any = { - 'response': null - }; - - if (clientMessage.isComplete()) { - return parameters; - } - parameters['response'] = clientMessage.readInt32(); + static decodeResponse(clientMessage: ClientMessage): PNCounterGetConfiguredReplicaCountResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - } diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index a8a94bddf..12c139524 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_ADDALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x031000 +const REQUEST_MESSAGE_TYPE = 200704; +// hex: 0x031001 +const RESPONSE_MESSAGE_TYPE = 200705; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class QueueAddAllCodec { - - - static calculateSize(name: string, dataList: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - dataList.forEach((dataListItem: any) => { - dataSize += BitsUtil.calculateSizeData(dataListItem); - }); - return dataSize; - } +export interface QueueAddAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, dataList: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, dataList)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(dataList.length); +export class QueueAddAllCodec { + static encodeRequest(name: string, dataList: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - dataList.forEach((dataListItem: any) => { - clientMessage.appendData(dataListItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, dataList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): QueueAddAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index 598df088f..e99a0835b 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -14,74 +14,67 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = QueueMessageType.QUEUE_ADDLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x031100 +const REQUEST_MESSAGE_TYPE = 200960; +// hex: 0x031101 +const RESPONSE_MESSAGE_TYPE = 200961; +// hex: 0x031102 +const EVENT_ITEM_MESSAGE_TYPE = 200962; +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ITEM_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ITEM_EVENT_TYPE_OFFSET = EVENT_ITEM_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface QueueAddListenerResponseParams { + response: UUID; +} export class QueueAddListenerCodec { + static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, includeValue: boolean, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, includeValue: boolean, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, includeValue, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(includeValue); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): QueueAddListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventItem: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ITEM && handleEventItem !== null) { - var messageFinished = false; - var item: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - item = clientMessage.readData(); - } - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - handleEventItem(item, uuid, eventType); + static handle(clientMessage: ClientMessage, handleItemEvent: (item: Data, uuid: UUID, eventType: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ITEM_MESSAGE_TYPE && handleItemEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ITEM_UUID_OFFSET); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ITEM_EVENT_TYPE_OFFSET); + const item = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleItemEvent(item, uuid, eventType); + return; } } - } diff --git a/src/codec/QueueClearCodec.ts b/src/codec/QueueClearCodec.ts index b5fb6a26a..236c4571b 100644 --- a/src/codec/QueueClearCodec.ts +++ b/src/codec/QueueClearCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {QueueMessageType} from './QueueMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x030F00 +const REQUEST_MESSAGE_TYPE = 200448; +// hex: 0x030F01 +const RESPONSE_MESSAGE_TYPE = 200449; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class QueueClearCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index bf4c09b33..0720e67ef 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_COMPAREANDREMOVEALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x030D00 +const REQUEST_MESSAGE_TYPE = 199936; +// hex: 0x030D01 +const RESPONSE_MESSAGE_TYPE = 199937; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class QueueCompareAndRemoveAllCodec { - - - static calculateSize(name: string, dataList: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - dataList.forEach((dataListItem: any) => { - dataSize += BitsUtil.calculateSizeData(dataListItem); - }); - return dataSize; - } +export interface QueueCompareAndRemoveAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, dataList: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, dataList)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(dataList.length); +export class QueueCompareAndRemoveAllCodec { + static encodeRequest(name: string, dataList: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - dataList.forEach((dataListItem: any) => { - clientMessage.appendData(dataListItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, dataList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): QueueCompareAndRemoveAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index cc44c267d..c9811f997 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_COMPAREANDRETAINALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x030E00 +const REQUEST_MESSAGE_TYPE = 200192; +// hex: 0x030E01 +const RESPONSE_MESSAGE_TYPE = 200193; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class QueueCompareAndRetainAllCodec { - - - static calculateSize(name: string, dataList: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - dataList.forEach((dataListItem: any) => { - dataSize += BitsUtil.calculateSizeData(dataListItem); - }); - return dataSize; - } +export interface QueueCompareAndRetainAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, dataList: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, dataList)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(dataList.length); +export class QueueCompareAndRetainAllCodec { + static encodeRequest(name: string, dataList: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - dataList.forEach((dataListItem: any) => { - clientMessage.appendData(dataListItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, dataList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): QueueCompareAndRetainAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index bd1e1b60b..d59b88a67 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_CONTAINSALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x030C00 +const REQUEST_MESSAGE_TYPE = 199680; +// hex: 0x030C01 +const RESPONSE_MESSAGE_TYPE = 199681; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class QueueContainsAllCodec { - - - static calculateSize(name: string, dataList: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - dataList.forEach((dataListItem: any) => { - dataSize += BitsUtil.calculateSizeData(dataListItem); - }); - return dataSize; - } +export interface QueueContainsAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, dataList: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, dataList)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(dataList.length); +export class QueueContainsAllCodec { + static encodeRequest(name: string, dataList: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - dataList.forEach((dataListItem: any) => { - clientMessage.appendData(dataListItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, dataList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): QueueContainsAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index bb9b22da1..d6b67db06 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_CONTAINS; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x030B00 +const REQUEST_MESSAGE_TYPE = 199424; +// hex: 0x030B01 +const RESPONSE_MESSAGE_TYPE = 199425; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface QueueContainsResponseParams { + response: boolean; +} export class QueueContainsCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): QueueContainsResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index 4d5e1a92f..98155ab1f 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_DRAINTO; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; +// hex: 0x030900 +const REQUEST_MESSAGE_TYPE = 198912; +// hex: 0x030901 +const RESPONSE_MESSAGE_TYPE = 198913; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface QueueDrainToResponseParams { + response: Data[]; +} export class QueueDrainToCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): QueueDrainToResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index a8ea7eea8..a36968644 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -14,57 +14,48 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_DRAINTOMAXSIZE; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; +// hex: 0x030A00 +const REQUEST_MESSAGE_TYPE = 199168; +// hex: 0x030A01 +const RESPONSE_MESSAGE_TYPE = 199169; +const REQUEST_MAX_SIZE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface QueueDrainToMaxSizeResponseParams { + response: Data[]; +} export class QueueDrainToMaxSizeCodec { + static encodeRequest(name: string, maxSize: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_MAX_SIZE_OFFSET, maxSize); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, maxSize: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, maxSize: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, maxSize)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(maxSize); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): QueueDrainToMaxSizeResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index ba6ca1f04..a7aa2addc 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_ISEMPTY; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x031400 +const REQUEST_MESSAGE_TYPE = 201728; +// hex: 0x031401 +const RESPONSE_MESSAGE_TYPE = 201729; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface QueueIsEmptyResponseParams { + response: boolean; +} export class QueueIsEmptyCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): QueueIsEmptyResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index 215ec6fe7..002976404 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_ITERATOR; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; +// hex: 0x030800 +const REQUEST_MESSAGE_TYPE = 198656; +// hex: 0x030801 +const RESPONSE_MESSAGE_TYPE = 198657; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface QueueIteratorResponseParams { + response: Data[]; +} export class QueueIteratorCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): QueueIteratorResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/QueueMessageType.ts b/src/codec/QueueMessageType.ts deleted file mode 100644 index 31336455e..000000000 --- a/src/codec/QueueMessageType.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class QueueMessageType { - static QUEUE_OFFER = 0x0301; - static QUEUE_PUT = 0x0302; - static QUEUE_SIZE = 0x0303; - static QUEUE_REMOVE = 0x0304; - static QUEUE_POLL = 0x0305; - static QUEUE_TAKE = 0x0306; - static QUEUE_PEEK = 0x0307; - static QUEUE_ITERATOR = 0x0308; - static QUEUE_DRAINTO = 0x0309; - static QUEUE_DRAINTOMAXSIZE = 0x030a; - static QUEUE_CONTAINS = 0x030b; - static QUEUE_CONTAINSALL = 0x030c; - static QUEUE_COMPAREANDREMOVEALL = 0x030d; - static QUEUE_COMPAREANDRETAINALL = 0x030e; - static QUEUE_CLEAR = 0x030f; - static QUEUE_ADDALL = 0x0310; - static QUEUE_ADDLISTENER = 0x0311; - static QUEUE_REMOVELISTENER = 0x0312; - static QUEUE_REMAININGCAPACITY = 0x0313; - static QUEUE_ISEMPTY = 0x0314; -} diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index 71edc3a19..2be1cb387 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -14,51 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_OFFER; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x030100 +const REQUEST_MESSAGE_TYPE = 196864; +// hex: 0x030101 +const RESPONSE_MESSAGE_TYPE = 196865; +const REQUEST_TIMEOUT_MILLIS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MILLIS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class QueueOfferCodec { - - - static calculateSize(name: string, value: Data, timeoutMillis: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } +export interface QueueOfferResponseParams { + response: boolean; +} - static encodeRequest(name: string, value: Data, timeoutMillis: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value, timeoutMillis)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.appendLong(timeoutMillis); - clientMessage.updateFrameLength(); +export class QueueOfferCodec { + static encodeRequest(name: string, value: Data, timeoutMillis: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_MILLIS_OFFSET, timeoutMillis); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): QueueOfferResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index 25cf1334b..10a7b8dd0 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -14,50 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = QueueMessageType.QUEUE_PEEK; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x030700 +const REQUEST_MESSAGE_TYPE = 198400; +// hex: 0x030701 +const RESPONSE_MESSAGE_TYPE = 198401; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface QueuePeekResponseParams { + response: Data; +} export class QueuePeekCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): QueuePeekResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index 4a143d9a2..543a6e695 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -14,52 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = QueueMessageType.QUEUE_POLL; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x030500 +const REQUEST_MESSAGE_TYPE = 197888; +// hex: 0x030501 +const RESPONSE_MESSAGE_TYPE = 197889; +const REQUEST_TIMEOUT_MILLIS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MILLIS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface QueuePollResponseParams { + response: Data; +} export class QueuePollCodec { + static encodeRequest(name: string, timeoutMillis: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_MILLIS_OFFSET, timeoutMillis); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, timeoutMillis: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, timeoutMillis: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, timeoutMillis)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(timeoutMillis); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): QueuePollResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/QueuePutCodec.ts b/src/codec/QueuePutCodec.ts index 21c9d93c0..016aa155f 100644 --- a/src/codec/QueuePutCodec.ts +++ b/src/codec/QueuePutCodec.ts @@ -14,40 +14,32 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_PUT; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x030200 +const REQUEST_MESSAGE_TYPE = 197120; +// hex: 0x030201 +const RESPONSE_MESSAGE_TYPE = 197121; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class QueuePutCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index 9ca4447d4..b0c75b291 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_REMAININGCAPACITY; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; +// hex: 0x031300 +const REQUEST_MESSAGE_TYPE = 201472; +// hex: 0x031301 +const RESPONSE_MESSAGE_TYPE = 201473; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface QueueRemainingCapacityResponseParams { + response: number; +} export class QueueRemainingCapacityCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): QueueRemainingCapacityResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index 1af9765a2..3698016ef 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_REMOVE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x030400 +const REQUEST_MESSAGE_TYPE = 197632; +// hex: 0x030401 +const RESPONSE_MESSAGE_TYPE = 197633; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface QueueRemoveResponseParams { + response: boolean; +} export class QueueRemoveCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): QueueRemoveResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index ecf66554e..06bc169c7 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; - -var REQUEST_TYPE = QueueMessageType.QUEUE_REMOVELISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x031200 +const REQUEST_MESSAGE_TYPE = 201216; +// hex: 0x031201 +const RESPONSE_MESSAGE_TYPE = 201217; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface QueueRemoveListenerResponseParams { + response: boolean; +} export class QueueRemoveListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): QueueRemoveListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index 57d3d0470..75397212e 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = QueueMessageType.QUEUE_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; +// hex: 0x030300 +const REQUEST_MESSAGE_TYPE = 197376; +// hex: 0x030301 +const RESPONSE_MESSAGE_TYPE = 197377; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface QueueSizeResponseParams { + response: number; +} export class QueueSizeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): QueueSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index a5cc5a5ff..6d44010fe 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -14,50 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {QueueMessageType} from './QueueMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = QueueMessageType.QUEUE_TAKE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x030600 +const REQUEST_MESSAGE_TYPE = 198144; +// hex: 0x030601 +const RESPONSE_MESSAGE_TYPE = 198145; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface QueueTakeResponseParams { + response: Data; +} export class QueueTakeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): QueueTakeResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index b2a26a437..97bdba2ca 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -14,97 +14,70 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; - -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0D0D00 +const REQUEST_MESSAGE_TYPE = 855296; +// hex: 0x0D0D01 +const RESPONSE_MESSAGE_TYPE = 855297; +// hex: 0x0D0D02 +const EVENT_ENTRY_MESSAGE_TYPE = 855298; + +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ReplicatedMapAddEntryListenerResponseParams { + response: UUID; +} export class ReplicatedMapAddEntryListenerCodec { + static encodeRequest(name: string, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index 3c2fe16f0..27c5ade76 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -14,99 +14,71 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; - -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENERTOKEY; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0D0C00 +const REQUEST_MESSAGE_TYPE = 855040; +// hex: 0x0D0C01 +const RESPONSE_MESSAGE_TYPE = 855041; +// hex: 0x0D0C02 +const EVENT_ENTRY_MESSAGE_TYPE = 855042; + +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ReplicatedMapAddEntryListenerToKeyResponseParams { + response: UUID; +} export class ReplicatedMapAddEntryListenerToKeyCodec { - - - static calculateSize(name: string, key: Data, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerToKeyResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index 68e103eef..d5bb26068 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -14,101 +14,72 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; - -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENERTOKEYWITHPREDICATE; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0D0A00 +const REQUEST_MESSAGE_TYPE = 854528; +// hex: 0x0D0A01 +const RESPONSE_MESSAGE_TYPE = 854529; +// hex: 0x0D0A02 +const EVENT_ENTRY_MESSAGE_TYPE = 854530; + +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ReplicatedMapAddEntryListenerToKeyWithPredicateResponseParams { + response: UUID; +} export class ReplicatedMapAddEntryListenerToKeyWithPredicateCodec { - - - static calculateSize(name: string, key: Data, predicate: Data, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(predicate); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, predicate: Data, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, predicate, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(predicate); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, key: Data, predicate: Data, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerToKeyWithPredicateResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 0d4a619be..56388ad1d 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -14,99 +14,71 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; - -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDENTRYLISTENERWITHPREDICATE; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {UUID} from '../core/UUID'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0D0B00 +const REQUEST_MESSAGE_TYPE = 854784; +// hex: 0x0D0B01 +const RESPONSE_MESSAGE_TYPE = 854785; +// hex: 0x0D0B02 +const EVENT_ENTRY_MESSAGE_TYPE = 854786; + +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ReplicatedMapAddEntryListenerWithPredicateResponseParams { + response: UUID; +} export class ReplicatedMapAddEntryListenerWithPredicateCodec { - - - static calculateSize(name: string, predicate: Data, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(predicate); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, predicate: Data, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, predicate, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(predicate); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, predicate: Data, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerWithPredicateResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index e7c346004..81ee04e33 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -14,99 +14,72 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; - -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ADDNEARCACHEENTRYLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; - +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0D1200 +const REQUEST_MESSAGE_TYPE = 856576; +// hex: 0x0D1201 +const RESPONSE_MESSAGE_TYPE = 856577; +// hex: 0x0D1202 +const EVENT_ENTRY_MESSAGE_TYPE = 856578; + +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface ReplicatedMapAddNearCacheEntryListenerResponseParams { + response: UUID; +} export class ReplicatedMapAddNearCacheEntryListenerCodec { - - - static calculateSize(name: string, includeValue: boolean, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, includeValue: boolean, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, includeValue, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(includeValue); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddNearCacheEntryListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventEntry: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ENTRY && handleEventEntry !== null) { - var messageFinished = false; - var key: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - key = clientMessage.readData(); - } - } - var value: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - value = clientMessage.readData(); - } - } - var oldValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - oldValue = clientMessage.readData(); - } - } - var mergingValue: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - mergingValue = clientMessage.readData(); - } - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var numberOfAffectedEntries: number = undefined; - if (!messageFinished) { - numberOfAffectedEntries = clientMessage.readInt32(); - } - handleEventEntry(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ENTRY_MESSAGE_TYPE && handleEntryEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_EVENT_TYPE_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ENTRY_UUID_OFFSET); + const numberOfAffectedEntries = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET); + const key = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const value = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const oldValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const mergingValue = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleEntryEvent(key, value, oldValue, mergingValue, eventType, uuid, numberOfAffectedEntries); + return; } } - } diff --git a/src/codec/ReplicatedMapClearCodec.ts b/src/codec/ReplicatedMapClearCodec.ts index 1f8bd9312..271de2c0e 100644 --- a/src/codec/ReplicatedMapClearCodec.ts +++ b/src/codec/ReplicatedMapClearCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x0D0900 +const REQUEST_MESSAGE_TYPE = 854272; +// hex: 0x0D0901 +const RESPONSE_MESSAGE_TYPE = 854273; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ReplicatedMapClearCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index 77b80e842..bedd6ad68 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_CONTAINSKEY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x0D0400 +const REQUEST_MESSAGE_TYPE = 852992; +// hex: 0x0D0401 +const RESPONSE_MESSAGE_TYPE = 852993; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ReplicatedMapContainsKeyResponseParams { + response: boolean; +} export class ReplicatedMapContainsKeyCodec { + static encodeRequest(name: string, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapContainsKeyResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 058483b0b..f94ccda1f 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_CONTAINSVALUE; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x0D0500 +const REQUEST_MESSAGE_TYPE = 853248; +// hex: 0x0D0501 +const RESPONSE_MESSAGE_TYPE = 853249; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ReplicatedMapContainsValueResponseParams { + response: boolean; +} export class ReplicatedMapContainsValueCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapContainsValueResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index 33f31fd3b..9e48edc58 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -14,59 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ENTRYSET; -var RESPONSE_TYPE = 117; -var RETRYABLE = true; +// hex: 0x0D1100 +const REQUEST_MESSAGE_TYPE = 856320; +// hex: 0x0D1101 +const RESPONSE_MESSAGE_TYPE = 856321; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ReplicatedMapEntrySetResponseParams { + response: Array<[Data, Data]>; +} export class ReplicatedMapEntrySetCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: any; - var responseItemKey: Data; - var responseItemVal: any; - responseItemKey = clientMessage.readData(); - responseItemVal = clientMessage.readData(); - responseItem = [responseItemKey, responseItemVal]; - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapEntrySetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), + }; } - - } diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index b14df72be..533bdac66 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -14,52 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_GET; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; +// hex: 0x0D0600 +const REQUEST_MESSAGE_TYPE = 853504; +// hex: 0x0D0601 +const RESPONSE_MESSAGE_TYPE = 853505; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ReplicatedMapGetResponseParams { + response: Data; +} export class ReplicatedMapGetCodec { + static encodeRequest(name: string, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapGetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index 2b04eb2f7..a56dd4e41 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_ISEMPTY; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; +// hex: 0x0D0300 +const REQUEST_MESSAGE_TYPE = 852736; +// hex: 0x0D0301 +const RESPONSE_MESSAGE_TYPE = 852737; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ReplicatedMapIsEmptyResponseParams { + response: boolean; +} export class ReplicatedMapIsEmptyCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapIsEmptyResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index e23a6244e..9ffa6b389 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_KEYSET; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x0D0F00 +const REQUEST_MESSAGE_TYPE = 855808; +// hex: 0x0D0F01 +const RESPONSE_MESSAGE_TYPE = 855809; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ReplicatedMapKeySetResponseParams { + response: Data[]; +} export class ReplicatedMapKeySetCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapKeySetResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ReplicatedMapMessageType.ts b/src/codec/ReplicatedMapMessageType.ts deleted file mode 100644 index d924a66a8..000000000 --- a/src/codec/ReplicatedMapMessageType.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class ReplicatedMapMessageType { - static REPLICATEDMAP_PUT = 0x0e01; - static REPLICATEDMAP_SIZE = 0x0e02; - static REPLICATEDMAP_ISEMPTY = 0x0e03; - static REPLICATEDMAP_CONTAINSKEY = 0x0e04; - static REPLICATEDMAP_CONTAINSVALUE = 0x0e05; - static REPLICATEDMAP_GET = 0x0e06; - static REPLICATEDMAP_REMOVE = 0x0e07; - static REPLICATEDMAP_PUTALL = 0x0e08; - static REPLICATEDMAP_CLEAR = 0x0e09; - static REPLICATEDMAP_ADDENTRYLISTENERTOKEYWITHPREDICATE = 0x0e0a; - static REPLICATEDMAP_ADDENTRYLISTENERWITHPREDICATE = 0x0e0b; - static REPLICATEDMAP_ADDENTRYLISTENERTOKEY = 0x0e0c; - static REPLICATEDMAP_ADDENTRYLISTENER = 0x0e0d; - static REPLICATEDMAP_REMOVEENTRYLISTENER = 0x0e0e; - static REPLICATEDMAP_KEYSET = 0x0e0f; - static REPLICATEDMAP_VALUES = 0x0e10; - static REPLICATEDMAP_ENTRYSET = 0x0e11; - static REPLICATEDMAP_ADDNEARCACHEENTRYLISTENER = 0x0e12; -} diff --git a/src/codec/ReplicatedMapPutAllCodec.ts b/src/codec/ReplicatedMapPutAllCodec.ts index 57c8a4a89..079980459 100644 --- a/src/codec/ReplicatedMapPutAllCodec.ts +++ b/src/codec/ReplicatedMapPutAllCodec.ts @@ -14,55 +14,33 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_PUTALL; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x0D0800 +const REQUEST_MESSAGE_TYPE = 854016; +// hex: 0x0D0801 +const RESPONSE_MESSAGE_TYPE = 854017; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class ReplicatedMapPutAllCodec { + static encodeRequest(name: string, entries: Array<[Data, Data]>): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, entries: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - entries.forEach((entriesItem: any) => { - var key: Data = entriesItem[0]; - var val: Data = entriesItem[1]; - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(val); - }); - return dataSize; - } - - static encodeRequest(name: string, entries: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, entries)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(entries.length); - - entries.forEach((entriesItem: any) => { - var key: Data = entriesItem[0]; - var val: Data = entriesItem[1]; - clientMessage.appendData(key); - clientMessage.appendData(val); - }); - - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + EntryListCodec.encode(clientMessage, entries, DataCodec.encode, DataCodec.encode); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index 9c53781ff..d3933a013 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -14,56 +14,51 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_PUT; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x0D0100 +const REQUEST_MESSAGE_TYPE = 852224; +// hex: 0x0D0101 +const RESPONSE_MESSAGE_TYPE = 852225; +const REQUEST_TTL_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface ReplicatedMapPutResponseParams { + response: Data; +} export class ReplicatedMapPutCodec { + static encodeRequest(name: string, key: Data, value: Data, ttl: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data, value: Data, ttl: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - dataSize += BitsUtil.calculateSizeData(value); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, key: Data, value: Data, ttl: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key, value, ttl)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.appendData(value); - clientMessage.appendLong(ttl); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapPutResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index 17f86cdcf..c99ffbc8a 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -14,52 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_REMOVE; -var RESPONSE_TYPE = 105; -var RETRYABLE = false; +// hex: 0x0D0700 +const REQUEST_MESSAGE_TYPE = 853760; +// hex: 0x0D0701 +const RESPONSE_MESSAGE_TYPE = 853761; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ReplicatedMapRemoveResponseParams { + response: Data; +} export class ReplicatedMapRemoveCodec { + static encodeRequest(name: string, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, key: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(key); - return dataSize; - } - - static encodeRequest(name: string, key: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, key)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(key); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapRemoveResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index 43a57cdf0..d54398f07 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; - -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_REMOVEENTRYLISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0D0E00 +const REQUEST_MESSAGE_TYPE = 855552; +// hex: 0x0D0E01 +const RESPONSE_MESSAGE_TYPE = 855553; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ReplicatedMapRemoveEntryListenerResponseParams { + response: boolean; +} export class ReplicatedMapRemoveEntryListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapRemoveEntryListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index f58a928ee..aa247ec3e 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; +// hex: 0x0D0200 +const REQUEST_MESSAGE_TYPE = 852480; +// hex: 0x0D0201 +const RESPONSE_MESSAGE_TYPE = 852481; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface ReplicatedMapSizeResponseParams { + response: number; +} export class ReplicatedMapSizeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index 92e48efd4..3a9c21db8 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {ReplicatedMapMessageType} from './ReplicatedMapMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = ReplicatedMapMessageType.REPLICATEDMAP_VALUES; -var RESPONSE_TYPE = 106; -var RETRYABLE = true; +// hex: 0x0D1000 +const REQUEST_MESSAGE_TYPE = 856064; +// hex: 0x0D1001 +const RESPONSE_MESSAGE_TYPE = 856065; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface ReplicatedMapValuesResponseParams { + response: Data[]; +} export class ReplicatedMapValuesCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): ReplicatedMapValuesResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index 1d63f27d6..ad33ee343 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -14,60 +14,50 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_ADDALL; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; +// hex: 0x170800 +const REQUEST_MESSAGE_TYPE = 1509376; +// hex: 0x170801 +const RESPONSE_MESSAGE_TYPE = 1509377; +const REQUEST_OVERFLOW_POLICY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_OVERFLOW_POLICY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class RingbufferAddAllCodec { - - - static calculateSize(name: string, valueList: any, overflowPolicy: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - valueList.forEach((valueListItem: any) => { - dataSize += BitsUtil.calculateSizeData(valueListItem); - }); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, valueList: any, overflowPolicy: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, valueList, overflowPolicy)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(valueList.length); - - valueList.forEach((valueListItem: any) => { - clientMessage.appendData(valueListItem); - }); +export interface RingbufferAddAllResponseParams { + response: Long; +} - clientMessage.appendInt32(overflowPolicy); - clientMessage.updateFrameLength(); +export class RingbufferAddAllCodec { + static encodeRequest(name: string, valueList: Data[], overflowPolicy: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_OVERFLOW_POLICY_OFFSET, overflowPolicy); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, valueList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); + static decodeResponse(clientMessage: ClientMessage): RingbufferAddAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 8229f43b6..3159155c4 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -14,51 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_ADD; -var RESPONSE_TYPE = 103; -var RETRYABLE = false; +// hex: 0x170600 +const REQUEST_MESSAGE_TYPE = 1508864; +// hex: 0x170601 +const RESPONSE_MESSAGE_TYPE = 1508865; +const REQUEST_OVERFLOW_POLICY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_OVERFLOW_POLICY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class RingbufferAddCodec { - - - static calculateSize(name: string, overflowPolicy: number, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } +export interface RingbufferAddResponseParams { + response: Long; +} - static encodeRequest(name: string, overflowPolicy: number, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, overflowPolicy, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(overflowPolicy); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); +export class RingbufferAddCodec { + static encodeRequest(name: string, overflowPolicy: number, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_OVERFLOW_POLICY_OFFSET, overflowPolicy); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readLong(); + static decodeResponse(clientMessage: ClientMessage): RingbufferAddResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index d00733524..775c8cda4 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -14,47 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_CAPACITY; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; +// hex: 0x170400 +const REQUEST_MESSAGE_TYPE = 1508352; +// hex: 0x170401 +const RESPONSE_MESSAGE_TYPE = 1508353; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface RingbufferCapacityResponseParams { + response: Long; +} export class RingbufferCapacityCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): RingbufferCapacityResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readLong(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index dc2a94fe7..e7fe7c89e 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -14,47 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_HEADSEQUENCE; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; +// hex: 0x170300 +const REQUEST_MESSAGE_TYPE = 1508096; +// hex: 0x170301 +const RESPONSE_MESSAGE_TYPE = 1508097; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface RingbufferHeadSequenceResponseParams { + response: Long; +} export class RingbufferHeadSequenceCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): RingbufferHeadSequenceResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readLong(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/RingbufferMessageType.ts b/src/codec/RingbufferMessageType.ts deleted file mode 100644 index 0edf99309..000000000 --- a/src/codec/RingbufferMessageType.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class RingbufferMessageType { - static RINGBUFFER_SIZE = 0x1901; - static RINGBUFFER_TAILSEQUENCE = 0x1902; - static RINGBUFFER_HEADSEQUENCE = 0x1903; - static RINGBUFFER_CAPACITY = 0x1904; - static RINGBUFFER_REMAININGCAPACITY = 0x1905; - static RINGBUFFER_ADD = 0x1906; - static RINGBUFFER_READONE = 0x1908; - static RINGBUFFER_ADDALL = 0x1909; - static RINGBUFFER_READMANY = 0x190a; -} diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index 0ad1fa352..387f545e0 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -14,89 +14,63 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; - -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_READMANY; -var RESPONSE_TYPE = 115; -var RETRYABLE = true; - +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {LongArrayCodec} from './builtin/LongArrayCodec'; + +// hex: 0x170900 +const REQUEST_MESSAGE_TYPE = 1509632; +// hex: 0x170901 +const RESPONSE_MESSAGE_TYPE = 1509633; + +const REQUEST_START_SEQUENCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_MIN_COUNT_OFFSET = REQUEST_START_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_MAX_COUNT_OFFSET = REQUEST_MIN_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_READ_COUNT_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_NEXT_SEQ_OFFSET = RESPONSE_READ_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface RingbufferReadManyResponseParams { + readCount: number; + items: Data[]; + itemSeqs: Long[]; + nextSeq: Long; +} export class RingbufferReadManyCodec { - - - static calculateSize(name: string, startSequence: any, minCount: number, maxCount: number, filter: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - if (filter !== null) { - dataSize += BitsUtil.calculateSizeData(filter); - } - return dataSize; - } - - static encodeRequest(name: string, startSequence: any, minCount: number, maxCount: number, filter: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, startSequence, minCount, maxCount, filter)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(startSequence); - clientMessage.appendInt32(minCount); - clientMessage.appendInt32(maxCount); - clientMessage.appendBoolean(filter === null); - if (filter !== null) { - clientMessage.appendData(filter); - } - clientMessage.updateFrameLength(); + static encodeRequest(name: string, startSequence: Long, minCount: number, maxCount: number, filter: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_START_SEQUENCE_OFFSET, startSequence); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_MIN_COUNT_OFFSET, minCount); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_MAX_COUNT_OFFSET, maxCount); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + CodecUtil.encodeNullable(clientMessage, filter, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'readCount': null, - 'items': null, - 'itemSeqs': null - }; - - parameters['readCount'] = clientMessage.readInt32(); - - - var itemsSize = clientMessage.readInt32(); - var items: any = []; - for (var itemsIndex = 0; itemsIndex < itemsSize; itemsIndex++) { - var itemsItem: Data; - itemsItem = clientMessage.readData(); - items.push(itemsItem); - } - parameters['items'] = items; - - if (clientMessage.isComplete()) { - return parameters; - } + static decodeResponse(clientMessage: ClientMessage): RingbufferReadManyResponseParams { + const initialFrame = clientMessage.nextFrame(); - if (clientMessage.readBoolean() !== true) { - - var itemSeqsSize = clientMessage.readInt32(); - var itemSeqs: any = []; - for (var itemSeqsIndex = 0; itemSeqsIndex < itemSeqsSize; itemSeqsIndex++) { - var itemSeqsItem: any; - itemSeqsItem = clientMessage.readLong(); - itemSeqs.push(itemSeqsItem); - } - parameters['itemSeqs'] = itemSeqs; - } - parameters.itemSeqsExist = true; - return parameters; + return { + readCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_READ_COUNT_OFFSET), + nextSeq: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEXT_SEQ_OFFSET), + items: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + itemSeqs: CodecUtil.decodeNullable(clientMessage, LongArrayCodec.decode), + }; } - - } diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index 00d30ac12..94f7926c5 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -14,52 +14,49 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_READONE; -var RESPONSE_TYPE = 105; -var RETRYABLE = true; +// hex: 0x170700 +const REQUEST_MESSAGE_TYPE = 1509120; +// hex: 0x170701 +const RESPONSE_MESSAGE_TYPE = 1509121; +const REQUEST_SEQUENCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface RingbufferReadOneResponseParams { + response: Data; +} export class RingbufferReadOneCodec { + static encodeRequest(name: string, sequence: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SEQUENCE_OFFSET, sequence); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, sequence: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, sequence: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, sequence)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendLong(sequence); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - if (clientMessage.readBoolean() !== true) { - parameters['response'] = toObjectFunction(clientMessage.readData()); - } + static decodeResponse(clientMessage: ClientMessage): RingbufferReadOneResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index 6ecdaad0a..66ca9338f 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -14,47 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_REMAININGCAPACITY; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; +// hex: 0x170500 +const REQUEST_MESSAGE_TYPE = 1508608; +// hex: 0x170501 +const RESPONSE_MESSAGE_TYPE = 1508609; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface RingbufferRemainingCapacityResponseParams { + response: Long; +} export class RingbufferRemainingCapacityCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): RingbufferRemainingCapacityResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readLong(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index 4a6bd0cea..b85bedffa 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -14,47 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_SIZE; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; +// hex: 0x170100 +const REQUEST_MESSAGE_TYPE = 1507584; +// hex: 0x170101 +const RESPONSE_MESSAGE_TYPE = 1507585; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface RingbufferSizeResponseParams { + response: Long; +} export class RingbufferSizeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): RingbufferSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readLong(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index bf9929a60..e3fda9ffb 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -14,47 +14,44 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {RingbufferMessageType} from './RingbufferMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; -var REQUEST_TYPE = RingbufferMessageType.RINGBUFFER_TAILSEQUENCE; -var RESPONSE_TYPE = 103; -var RETRYABLE = true; +// hex: 0x170200 +const REQUEST_MESSAGE_TYPE = 1507840; +// hex: 0x170201 +const RESPONSE_MESSAGE_TYPE = 1507841; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface RingbufferTailSequenceResponseParams { + response: Long; +} export class RingbufferTailSequenceCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): RingbufferTailSequenceResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readLong(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SemaphoreAcquireCodec.ts b/src/codec/SemaphoreAcquireCodec.ts deleted file mode 100644 index 7eda037d2..000000000 --- a/src/codec/SemaphoreAcquireCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {SemaphoreMessageType} from './SemaphoreMessageType'; - -var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_ACQUIRE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class SemaphoreAcquireCodec { - - - static calculateSize(name: string, permits: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, permits: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, permits)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(permits); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/SemaphoreAvailablePermitsCodec.ts b/src/codec/SemaphoreAvailablePermitsCodec.ts deleted file mode 100644 index db9ef3839..000000000 --- a/src/codec/SemaphoreAvailablePermitsCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {SemaphoreMessageType} from './SemaphoreMessageType'; - -var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_AVAILABLEPERMITS; -var RESPONSE_TYPE = 102; -var RETRYABLE = true; - - -export class SemaphoreAvailablePermitsCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/SemaphoreDrainPermitsCodec.ts b/src/codec/SemaphoreDrainPermitsCodec.ts deleted file mode 100644 index 0f1f28f3a..000000000 --- a/src/codec/SemaphoreDrainPermitsCodec.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {SemaphoreMessageType} from './SemaphoreMessageType'; - -var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_DRAINPERMITS; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; - - -export class SemaphoreDrainPermitsCodec { - - - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readInt32(); - - return parameters; - } - - -} diff --git a/src/codec/SemaphoreInitCodec.ts b/src/codec/SemaphoreInitCodec.ts deleted file mode 100644 index 0970aade8..000000000 --- a/src/codec/SemaphoreInitCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {SemaphoreMessageType} from './SemaphoreMessageType'; - -var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_INIT; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class SemaphoreInitCodec { - - - static calculateSize(name: string, permits: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, permits: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, permits)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(permits); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/SemaphoreMessageType.ts b/src/codec/SemaphoreMessageType.ts deleted file mode 100644 index 772d613a8..000000000 --- a/src/codec/SemaphoreMessageType.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class SemaphoreMessageType { - static SEMAPHORE_INIT = 0x0d01; - static SEMAPHORE_ACQUIRE = 0x0d02; - static SEMAPHORE_AVAILABLEPERMITS = 0x0d03; - static SEMAPHORE_DRAINPERMITS = 0x0d04; - static SEMAPHORE_REDUCEPERMITS = 0x0d05; - static SEMAPHORE_RELEASE = 0x0d06; - static SEMAPHORE_TRYACQUIRE = 0x0d07; -} diff --git a/src/codec/SemaphoreReducePermitsCodec.ts b/src/codec/SemaphoreReducePermitsCodec.ts deleted file mode 100644 index a5decb3e2..000000000 --- a/src/codec/SemaphoreReducePermitsCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {SemaphoreMessageType} from './SemaphoreMessageType'; - -var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_REDUCEPERMITS; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class SemaphoreReducePermitsCodec { - - - static calculateSize(name: string, reduction: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, reduction: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, reduction)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(reduction); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/SemaphoreReleaseCodec.ts b/src/codec/SemaphoreReleaseCodec.ts deleted file mode 100644 index 50ebf7afc..000000000 --- a/src/codec/SemaphoreReleaseCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {SemaphoreMessageType} from './SemaphoreMessageType'; - -var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_RELEASE; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; - - -export class SemaphoreReleaseCodec { - - - static calculateSize(name: string, permits: number) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, permits: number) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, permits)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(permits); - clientMessage.updateFrameLength(); - return clientMessage; - } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - -} diff --git a/src/codec/SemaphoreTryAcquireCodec.ts b/src/codec/SemaphoreTryAcquireCodec.ts deleted file mode 100644 index bc28a7ea5..000000000 --- a/src/codec/SemaphoreTryAcquireCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); -import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {SemaphoreMessageType} from './SemaphoreMessageType'; - -var REQUEST_TYPE = SemaphoreMessageType.SEMAPHORE_TRYACQUIRE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; - - -export class SemaphoreTryAcquireCodec { - - - static calculateSize(name: string, permits: number, timeout: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - dataSize += BitsUtil.LONG_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, permits: number, timeout: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, permits, timeout)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(permits); - clientMessage.appendLong(timeout); - clientMessage.updateFrameLength(); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); - - return parameters; - } - - -} diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index 9232ee87e..b34ba20e1 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_ADDALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060600 +const REQUEST_MESSAGE_TYPE = 394752; +// hex: 0x060601 +const RESPONSE_MESSAGE_TYPE = 394753; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class SetAddAllCodec { - - - static calculateSize(name: string, valueList: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - valueList.forEach((valueListItem: any) => { - dataSize += BitsUtil.calculateSizeData(valueListItem); - }); - return dataSize; - } +export interface SetAddAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, valueList: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, valueList)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(valueList.length); +export class SetAddAllCodec { + static encodeRequest(name: string, valueList: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - valueList.forEach((valueListItem: any) => { - clientMessage.appendData(valueListItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, valueList, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): SetAddAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index 064bb2765..496d4f298 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_ADD; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060400 +const REQUEST_MESSAGE_TYPE = 394240; +// hex: 0x060401 +const RESPONSE_MESSAGE_TYPE = 394241; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface SetAddResponseParams { + response: boolean; +} export class SetAddCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): SetAddResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index ba3f67096..6d4b9e9ca 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -14,74 +14,67 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; -var REQUEST_TYPE = SetMessageType.SET_ADDLISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x060B00 +const REQUEST_MESSAGE_TYPE = 396032; +// hex: 0x060B01 +const RESPONSE_MESSAGE_TYPE = 396033; +// hex: 0x060B02 +const EVENT_ITEM_MESSAGE_TYPE = 396034; +const REQUEST_INCLUDE_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_LOCAL_ONLY_OFFSET = REQUEST_INCLUDE_VALUE_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_ITEM_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_ITEM_EVENT_TYPE_OFFSET = EVENT_ITEM_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; + +export interface SetAddListenerResponseParams { + response: UUID; +} export class SetAddListenerCodec { + static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_INCLUDE_VALUE_OFFSET, includeValue); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, includeValue: boolean, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, includeValue: boolean, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, includeValue, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(includeValue); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readString(); + static decodeResponse(clientMessage: ClientMessage): SetAddListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventItem: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_ITEM && handleEventItem !== null) { - var messageFinished = false; - var item: Data = undefined; - if (!messageFinished) { - - if (clientMessage.readBoolean() !== true) { - item = clientMessage.readData(); - } - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - var eventType: number = undefined; - if (!messageFinished) { - eventType = clientMessage.readInt32(); - } - handleEventItem(item, uuid, eventType); + static handle(clientMessage: ClientMessage, handleItemEvent: (item: Data, uuid: UUID, eventType: number) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_ITEM_MESSAGE_TYPE && handleItemEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_ITEM_UUID_OFFSET); + const eventType = FixSizedTypesCodec.decodeInt(initialFrame.content, EVENT_ITEM_EVENT_TYPE_OFFSET); + const item = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + handleItemEvent(item, uuid, eventType); + return; } } - } diff --git a/src/codec/SetClearCodec.ts b/src/codec/SetClearCodec.ts index da4743c2e..f0842ecf4 100644 --- a/src/codec/SetClearCodec.ts +++ b/src/codec/SetClearCodec.ts @@ -14,37 +14,29 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {SetMessageType} from './SetMessageType'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = SetMessageType.SET_CLEAR; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x060900 +const REQUEST_MESSAGE_TYPE = 395520; +// hex: 0x060901 +const RESPONSE_MESSAGE_TYPE = 395521; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class SetClearCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index a4f58da2a..38bda420e 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_COMPAREANDREMOVEALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060700 +const REQUEST_MESSAGE_TYPE = 395008; +// hex: 0x060701 +const RESPONSE_MESSAGE_TYPE = 395009; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class SetCompareAndRemoveAllCodec { - - - static calculateSize(name: string, values: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - values.forEach((valuesItem: any) => { - dataSize += BitsUtil.calculateSizeData(valuesItem); - }); - return dataSize; - } +export interface SetCompareAndRemoveAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, values: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, values)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(values.length); +export class SetCompareAndRemoveAllCodec { + static encodeRequest(name: string, values: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - values.forEach((valuesItem: any) => { - clientMessage.appendData(valuesItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, values, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): SetCompareAndRemoveAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index f28dc6805..859d3e559 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_COMPAREANDRETAINALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060800 +const REQUEST_MESSAGE_TYPE = 395264; +// hex: 0x060801 +const RESPONSE_MESSAGE_TYPE = 395265; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class SetCompareAndRetainAllCodec { - - - static calculateSize(name: string, values: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - values.forEach((valuesItem: any) => { - dataSize += BitsUtil.calculateSizeData(valuesItem); - }); - return dataSize; - } +export interface SetCompareAndRetainAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, values: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, values)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(values.length); +export class SetCompareAndRetainAllCodec { + static encodeRequest(name: string, values: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - values.forEach((valuesItem: any) => { - clientMessage.appendData(valuesItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, values, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): SetCompareAndRetainAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index 39c4e34a9..e06efdb3d 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -14,58 +14,47 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_CONTAINSALL; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060300 +const REQUEST_MESSAGE_TYPE = 393984; +// hex: 0x060301 +const RESPONSE_MESSAGE_TYPE = 393985; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; -export class SetContainsAllCodec { - - - static calculateSize(name: string, items: any) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.INT_SIZE_IN_BYTES; - - items.forEach((itemsItem: any) => { - dataSize += BitsUtil.calculateSizeData(itemsItem); - }); - return dataSize; - } +export interface SetContainsAllResponseParams { + response: boolean; +} - static encodeRequest(name: string, items: any) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, items)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendInt32(items.length); +export class SetContainsAllCodec { + static encodeRequest(name: string, items: Data[]): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); - items.forEach((itemsItem: any) => { - clientMessage.appendData(itemsItem); - }); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + ListMultiFrameCodec.encode(clientMessage, items, DataCodec.encode); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): SetContainsAllResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index c3ecb16aa..fb0dcddc8 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_CONTAINS; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060200 +const REQUEST_MESSAGE_TYPE = 393728; +// hex: 0x060201 +const RESPONSE_MESSAGE_TYPE = 393729; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface SetContainsResponseParams { + response: boolean; +} export class SetContainsCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): SetContainsResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index 08e3dadaf..6d2c3c800 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -14,55 +14,45 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_GETALL; -var RESPONSE_TYPE = 106; -var RETRYABLE = false; +// hex: 0x060A00 +const REQUEST_MESSAGE_TYPE = 395776; +// hex: 0x060A01 +const RESPONSE_MESSAGE_TYPE = 395777; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export interface SetGetAllResponseParams { + response: Data[]; +} export class SetGetAllCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - - var responseSize = clientMessage.readInt32(); - var response: any = []; - for (var responseIndex = 0; responseIndex < responseSize; responseIndex++) { - var responseItem: Data; - responseItem = clientMessage.readData(); - response.push(responseItem); - } - parameters['response'] = response; + static decodeResponse(clientMessage: ClientMessage): SetGetAllResponseParams { + // empty initial frame + clientMessage.nextFrame(); - return parameters; + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; } - - } diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index d39bab730..fac3da6d5 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = SetMessageType.SET_ISEMPTY; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060D00 +const REQUEST_MESSAGE_TYPE = 396544; +// hex: 0x060D01 +const RESPONSE_MESSAGE_TYPE = 396545; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface SetIsEmptyResponseParams { + response: boolean; +} export class SetIsEmptyCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): SetIsEmptyResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetMessageType.ts b/src/codec/SetMessageType.ts deleted file mode 100644 index 1ba3d03a9..000000000 --- a/src/codec/SetMessageType.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* tslint:disable */ -export class SetMessageType { - static SET_SIZE = 0x0601; - static SET_CONTAINS = 0x0602; - static SET_CONTAINSALL = 0x0603; - static SET_ADD = 0x0604; - static SET_REMOVE = 0x0605; - static SET_ADDALL = 0x0606; - static SET_COMPAREANDREMOVEALL = 0x0607; - static SET_COMPAREANDRETAINALL = 0x0608; - static SET_CLEAR = 0x0609; - static SET_GETALL = 0x060a; - static SET_ADDLISTENER = 0x060b; - static SET_REMOVELISTENER = 0x060c; - static SET_ISEMPTY = 0x060d; -} diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index 4e569bf89..cdf1827b2 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = SetMessageType.SET_REMOVE; -var RESPONSE_TYPE = 101; -var RETRYABLE = false; +// hex: 0x060500 +const REQUEST_MESSAGE_TYPE = 394496; +// hex: 0x060501 +const RESPONSE_MESSAGE_TYPE = 394497; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface SetRemoveResponseParams { + response: boolean; +} export class SetRemoveCodec { + static encodeRequest(name: string, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, value: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(value); - return dataSize; - } - - static encodeRequest(name: string, value: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, value)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(value); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): SetRemoveResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readBoolean(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index 0425e3c4b..4c427d392 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; - -var REQUEST_TYPE = SetMessageType.SET_REMOVELISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x060C00 +const REQUEST_MESSAGE_TYPE = 396288; +// hex: 0x060C01 +const RESPONSE_MESSAGE_TYPE = 396289; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface SetRemoveListenerResponseParams { + response: boolean; +} export class SetRemoveListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): SetRemoveListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index 684ff1c97..348a1c505 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -14,47 +14,43 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {SetMessageType} from './SetMessageType'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; -var REQUEST_TYPE = SetMessageType.SET_SIZE; -var RESPONSE_TYPE = 102; -var RETRYABLE = false; +// hex: 0x060100 +const REQUEST_MESSAGE_TYPE = 393472; +// hex: 0x060101 +const RESPONSE_MESSAGE_TYPE = 393473; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface SetSizeResponseParams { + response: number; +} export class SetSizeCodec { + static encodeRequest(name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - return dataSize; - } - - static encodeRequest(name: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): SetSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readInt32(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index be3c91ec4..22db0e237 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -14,69 +14,65 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; import {Data} from '../serialization/Data'; -import {TopicMessageType} from './TopicMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = TopicMessageType.TOPIC_ADDMESSAGELISTENER; -var RESPONSE_TYPE = 104; -var RETRYABLE = false; +// hex: 0x040200 +const REQUEST_MESSAGE_TYPE = 262656; +// hex: 0x040201 +const RESPONSE_MESSAGE_TYPE = 262657; +// hex: 0x040202 +const EVENT_TOPIC_MESSAGE_TYPE = 262658; +const REQUEST_LOCAL_ONLY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const EVENT_TOPIC_PUBLISH_TIME_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const EVENT_TOPIC_UUID_OFFSET = EVENT_TOPIC_PUBLISH_TIME_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TopicAddMessageListenerResponseParams { + response: UUID; +} export class TopicAddMessageListenerCodec { + static encodeRequest(name: string, localOnly: boolean): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_LOCAL_ONLY_OFFSET, localOnly); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, localOnly: boolean) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.BOOLEAN_SIZE_IN_BYTES; - return dataSize; - } - - static encodeRequest(name: string, localOnly: boolean) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, localOnly)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendBoolean(localOnly); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; + static decodeResponse(clientMessage: ClientMessage): TopicAddMessageListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - parameters['response'] = clientMessage.readString(); - - return parameters; + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - static handle(clientMessage: ClientMessage, handleEventTopic: any, toObjectFunction: (data: Data) => any = null) { - - var messageType = clientMessage.getMessageType(); - if (messageType === BitsUtil.EVENT_TOPIC && handleEventTopic !== null) { - var messageFinished = false; - var item: Data = undefined; - if (!messageFinished) { - item = clientMessage.readData(); - } - var publishTime: any = undefined; - if (!messageFinished) { - publishTime = clientMessage.readLong(); - } - var uuid: string = undefined; - if (!messageFinished) { - uuid = clientMessage.readString(); - } - handleEventTopic(item, publishTime, uuid); + static handle(clientMessage: ClientMessage, handleTopicEvent: (item: Data, publishTime: Long, uuid: UUID) => void = null): void { + const messageType = clientMessage.getMessageType(); + if (messageType === EVENT_TOPIC_MESSAGE_TYPE && handleTopicEvent !== null) { + const initialFrame = clientMessage.nextFrame(); + const publishTime = FixSizedTypesCodec.decodeLong(initialFrame.content, EVENT_TOPIC_PUBLISH_TIME_OFFSET); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, EVENT_TOPIC_UUID_OFFSET); + const item = DataCodec.decode(clientMessage); + handleTopicEvent(item, publishTime, uuid); + return; } } - } diff --git a/src/codec/TopicPublishCodec.ts b/src/codec/TopicPublishCodec.ts index fc8288b62..067f3227b 100644 --- a/src/codec/TopicPublishCodec.ts +++ b/src/codec/TopicPublishCodec.ts @@ -14,40 +14,32 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; -import {TopicMessageType} from './TopicMessageType'; +import {DataCodec} from './builtin/DataCodec'; -var REQUEST_TYPE = TopicMessageType.TOPIC_PUBLISH; -var RESPONSE_TYPE = 100; -var RETRYABLE = false; +// hex: 0x040100 +const REQUEST_MESSAGE_TYPE = 262400; +// hex: 0x040101 +const RESPONSE_MESSAGE_TYPE = 262401; +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class TopicPublishCodec { + static encodeRequest(name: string, message: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, message: Data) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeData(message); - return dataSize; - } - - static encodeRequest(name: string, message: Data) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, message)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendData(message); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, message); return clientMessage; } - -// Empty decodeResponse(ClientMessage), this message has no parameters to decode - - } diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index 6a8c04850..aab2ea5fe 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -14,49 +14,46 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +/*tslint:disable:max-line-length*/ import {BitsUtil} from '../BitsUtil'; -import {Data} from '../serialization/Data'; -import {TopicMessageType} from './TopicMessageType'; - -var REQUEST_TYPE = TopicMessageType.TOPIC_REMOVEMESSAGELISTENER; -var RESPONSE_TYPE = 101; -var RETRYABLE = true; - +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x040300 +const REQUEST_MESSAGE_TYPE = 262912; +// hex: 0x040301 +const RESPONSE_MESSAGE_TYPE = 262913; + +const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TopicRemoveMessageListenerResponseParams { + response: boolean; +} export class TopicRemoveMessageListenerCodec { + static encodeRequest(name: string, registrationId: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_REGISTRATION_ID_OFFSET, registrationId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); - static calculateSize(name: string, registrationId: string) { -// Calculates the request payload size - var dataSize: number = 0; - dataSize += BitsUtil.calculateSizeString(name); - dataSize += BitsUtil.calculateSizeString(registrationId); - return dataSize; - } - - static encodeRequest(name: string, registrationId: string) { -// Encode request into clientMessage - var clientMessage = ClientMessage.newClientMessage(this.calculateSize(name, registrationId)); - clientMessage.setMessageType(REQUEST_TYPE); - clientMessage.setRetryable(RETRYABLE); - clientMessage.appendString(name); - clientMessage.appendString(registrationId); - clientMessage.updateFrameLength(); + StringCodec.encode(clientMessage, name); return clientMessage; } - static decodeResponse(clientMessage: ClientMessage, toObjectFunction: (data: Data) => any = null) { - // Decode response from client message - var parameters: any = { - 'response': null - }; - - parameters['response'] = clientMessage.readBoolean(); + static decodeResponse(clientMessage: ClientMessage): TopicRemoveMessageListenerResponseParams { + const initialFrame = clientMessage.nextFrame(); - return parameters; + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; } - - } diff --git a/src/codec/TransactionCommitCodec.ts b/src/codec/TransactionCommitCodec.ts new file mode 100644 index 000000000..6052a415a --- /dev/null +++ b/src/codec/TransactionCommitCodec.ts @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; + +// hex: 0x150100 +const REQUEST_MESSAGE_TYPE = 1376512; +// hex: 0x150101 +const RESPONSE_MESSAGE_TYPE = 1376513; + +const REQUEST_TRANSACTION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export class TransactionCommitCodec { + static encodeRequest(transactionId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TRANSACTION_ID_OFFSET, transactionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + return clientMessage; + } +} diff --git a/src/codec/TransactionCreateCodec.ts b/src/codec/TransactionCreateCodec.ts new file mode 100644 index 000000000..55db6e088 --- /dev/null +++ b/src/codec/TransactionCreateCodec.ts @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; + +// hex: 0x150200 +const REQUEST_MESSAGE_TYPE = 1376768; +// hex: 0x150201 +const RESPONSE_MESSAGE_TYPE = 1376769; + +const REQUEST_TIMEOUT_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_DURABILITY_OFFSET = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_TRANSACTION_TYPE_OFFSET = REQUEST_DURABILITY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionCreateResponseParams { + response: UUID; +} + +export class TransactionCreateCodec { + static encodeRequest(timeout: Long, durability: number, transactionType: number, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_DURABILITY_OFFSET, durability); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_TRANSACTION_TYPE_OFFSET, transactionType); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionCreateResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionRollbackCodec.ts b/src/codec/TransactionRollbackCodec.ts new file mode 100644 index 000000000..4088aa684 --- /dev/null +++ b/src/codec/TransactionRollbackCodec.ts @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; + +// hex: 0x150300 +const REQUEST_MESSAGE_TYPE = 1377024; +// hex: 0x150301 +const RESPONSE_MESSAGE_TYPE = 1377025; + +const REQUEST_TRANSACTION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export class TransactionRollbackCodec { + static encodeRequest(transactionId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TRANSACTION_ID_OFFSET, transactionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + return clientMessage; + } +} diff --git a/src/codec/TransactionalListAddCodec.ts b/src/codec/TransactionalListAddCodec.ts new file mode 100644 index 000000000..109b253c4 --- /dev/null +++ b/src/codec/TransactionalListAddCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x110100 +const REQUEST_MESSAGE_TYPE = 1114368; +// hex: 0x110101 +const RESPONSE_MESSAGE_TYPE = 1114369; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalListAddResponseParams { + response: boolean; +} + +export class TransactionalListAddCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, item); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalListAddResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalListRemoveCodec.ts b/src/codec/TransactionalListRemoveCodec.ts new file mode 100644 index 000000000..26f05845d --- /dev/null +++ b/src/codec/TransactionalListRemoveCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x110200 +const REQUEST_MESSAGE_TYPE = 1114624; +// hex: 0x110201 +const RESPONSE_MESSAGE_TYPE = 1114625; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalListRemoveResponseParams { + response: boolean; +} + +export class TransactionalListRemoveCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, item); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalListRemoveResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalListSizeCodec.ts b/src/codec/TransactionalListSizeCodec.ts new file mode 100644 index 000000000..e1051656a --- /dev/null +++ b/src/codec/TransactionalListSizeCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x110300 +const REQUEST_MESSAGE_TYPE = 1114880; +// hex: 0x110301 +const RESPONSE_MESSAGE_TYPE = 1114881; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalListSizeResponseParams { + response: number; +} + +export class TransactionalListSizeCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalListSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMapContainsKeyCodec.ts b/src/codec/TransactionalMapContainsKeyCodec.ts new file mode 100644 index 000000000..a61220e8e --- /dev/null +++ b/src/codec/TransactionalMapContainsKeyCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E0100 +const REQUEST_MESSAGE_TYPE = 917760; +// hex: 0x0E0101 +const RESPONSE_MESSAGE_TYPE = 917761; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMapContainsKeyResponseParams { + response: boolean; +} + +export class TransactionalMapContainsKeyCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapContainsKeyResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMapContainsValueCodec.ts b/src/codec/TransactionalMapContainsValueCodec.ts new file mode 100644 index 000000000..28abb4a4e --- /dev/null +++ b/src/codec/TransactionalMapContainsValueCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E1200 +const REQUEST_MESSAGE_TYPE = 922112; +// hex: 0x0E1201 +const RESPONSE_MESSAGE_TYPE = 922113; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMapContainsValueResponseParams { + response: boolean; +} + +export class TransactionalMapContainsValueCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapContainsValueResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMapDeleteCodec.ts b/src/codec/TransactionalMapDeleteCodec.ts new file mode 100644 index 000000000..c5881cc2e --- /dev/null +++ b/src/codec/TransactionalMapDeleteCodec.ts @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E0C00 +const REQUEST_MESSAGE_TYPE = 920576; +// hex: 0x0E0C01 +const RESPONSE_MESSAGE_TYPE = 920577; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export class TransactionalMapDeleteCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } +} diff --git a/src/codec/TransactionalMapGetCodec.ts b/src/codec/TransactionalMapGetCodec.ts new file mode 100644 index 000000000..264baa8e0 --- /dev/null +++ b/src/codec/TransactionalMapGetCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0E0200 +const REQUEST_MESSAGE_TYPE = 918016; +// hex: 0x0E0201 +const RESPONSE_MESSAGE_TYPE = 918017; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapGetResponseParams { + response: Data; +} + +export class TransactionalMapGetCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapGetResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapGetForUpdateCodec.ts b/src/codec/TransactionalMapGetForUpdateCodec.ts new file mode 100644 index 000000000..774a2df5e --- /dev/null +++ b/src/codec/TransactionalMapGetForUpdateCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0E0300 +const REQUEST_MESSAGE_TYPE = 918272; +// hex: 0x0E0301 +const RESPONSE_MESSAGE_TYPE = 918273; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapGetForUpdateResponseParams { + response: Data; +} + +export class TransactionalMapGetForUpdateCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapGetForUpdateResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapIsEmptyCodec.ts b/src/codec/TransactionalMapIsEmptyCodec.ts new file mode 100644 index 000000000..9bd62163e --- /dev/null +++ b/src/codec/TransactionalMapIsEmptyCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0E0500 +const REQUEST_MESSAGE_TYPE = 918784; +// hex: 0x0E0501 +const RESPONSE_MESSAGE_TYPE = 918785; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMapIsEmptyResponseParams { + response: boolean; +} + +export class TransactionalMapIsEmptyCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapIsEmptyResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMapKeySetCodec.ts b/src/codec/TransactionalMapKeySetCodec.ts new file mode 100644 index 000000000..50987bfc6 --- /dev/null +++ b/src/codec/TransactionalMapKeySetCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E0E00 +const REQUEST_MESSAGE_TYPE = 921088; +// hex: 0x0E0E01 +const RESPONSE_MESSAGE_TYPE = 921089; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapKeySetResponseParams { + response: Data[]; +} + +export class TransactionalMapKeySetCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapKeySetResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts new file mode 100644 index 000000000..b040359bd --- /dev/null +++ b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; + +// hex: 0x0E0F00 +const REQUEST_MESSAGE_TYPE = 921344; +// hex: 0x0E0F01 +const RESPONSE_MESSAGE_TYPE = 921345; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapKeySetWithPredicateResponseParams { + response: Data[]; +} + +export class TransactionalMapKeySetWithPredicateCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapKeySetWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapPutCodec.ts b/src/codec/TransactionalMapPutCodec.ts new file mode 100644 index 000000000..5579f9b04 --- /dev/null +++ b/src/codec/TransactionalMapPutCodec.ts @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0E0600 +const REQUEST_MESSAGE_TYPE = 919040; +// hex: 0x0E0601 +const RESPONSE_MESSAGE_TYPE = 919041; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapPutResponseParams { + response: Data; +} + +export class TransactionalMapPutCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data, ttl: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapPutResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapPutIfAbsentCodec.ts b/src/codec/TransactionalMapPutIfAbsentCodec.ts new file mode 100644 index 000000000..635b2c118 --- /dev/null +++ b/src/codec/TransactionalMapPutIfAbsentCodec.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0E0800 +const REQUEST_MESSAGE_TYPE = 919552; +// hex: 0x0E0801 +const RESPONSE_MESSAGE_TYPE = 919553; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapPutIfAbsentResponseParams { + response: Data; +} + +export class TransactionalMapPutIfAbsentCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapPutIfAbsentResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapRemoveCodec.ts b/src/codec/TransactionalMapRemoveCodec.ts new file mode 100644 index 000000000..8ba0e0ef4 --- /dev/null +++ b/src/codec/TransactionalMapRemoveCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0E0B00 +const REQUEST_MESSAGE_TYPE = 920320; +// hex: 0x0E0B01 +const RESPONSE_MESSAGE_TYPE = 920321; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapRemoveResponseParams { + response: Data; +} + +export class TransactionalMapRemoveCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapRemoveResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapRemoveIfSameCodec.ts b/src/codec/TransactionalMapRemoveIfSameCodec.ts new file mode 100644 index 000000000..74b6788c7 --- /dev/null +++ b/src/codec/TransactionalMapRemoveIfSameCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E0D00 +const REQUEST_MESSAGE_TYPE = 920832; +// hex: 0x0E0D01 +const RESPONSE_MESSAGE_TYPE = 920833; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMapRemoveIfSameResponseParams { + response: boolean; +} + +export class TransactionalMapRemoveIfSameCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapRemoveIfSameResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMapReplaceCodec.ts b/src/codec/TransactionalMapReplaceCodec.ts new file mode 100644 index 000000000..0a8915a39 --- /dev/null +++ b/src/codec/TransactionalMapReplaceCodec.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x0E0900 +const REQUEST_MESSAGE_TYPE = 919808; +// hex: 0x0E0901 +const RESPONSE_MESSAGE_TYPE = 919809; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapReplaceResponseParams { + response: Data; +} + +export class TransactionalMapReplaceCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapReplaceResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapReplaceIfSameCodec.ts b/src/codec/TransactionalMapReplaceIfSameCodec.ts new file mode 100644 index 000000000..7181af27b --- /dev/null +++ b/src/codec/TransactionalMapReplaceIfSameCodec.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E0A00 +const REQUEST_MESSAGE_TYPE = 920064; +// hex: 0x0E0A01 +const RESPONSE_MESSAGE_TYPE = 920065; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMapReplaceIfSameResponseParams { + response: boolean; +} + +export class TransactionalMapReplaceIfSameCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, oldValue: Data, newValue: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, oldValue); + DataCodec.encode(clientMessage, newValue); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapReplaceIfSameResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMapSetCodec.ts b/src/codec/TransactionalMapSetCodec.ts new file mode 100644 index 000000000..eb264acd5 --- /dev/null +++ b/src/codec/TransactionalMapSetCodec.ts @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E0700 +const REQUEST_MESSAGE_TYPE = 919296; +// hex: 0x0E0701 +const RESPONSE_MESSAGE_TYPE = 919297; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export class TransactionalMapSetCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } +} diff --git a/src/codec/TransactionalMapSizeCodec.ts b/src/codec/TransactionalMapSizeCodec.ts new file mode 100644 index 000000000..6816dddb2 --- /dev/null +++ b/src/codec/TransactionalMapSizeCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0E0400 +const REQUEST_MESSAGE_TYPE = 918528; +// hex: 0x0E0401 +const RESPONSE_MESSAGE_TYPE = 918529; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMapSizeResponseParams { + response: number; +} + +export class TransactionalMapSizeCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMapValuesCodec.ts b/src/codec/TransactionalMapValuesCodec.ts new file mode 100644 index 000000000..e8b6e41a9 --- /dev/null +++ b/src/codec/TransactionalMapValuesCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0E1000 +const REQUEST_MESSAGE_TYPE = 921600; +// hex: 0x0E1001 +const RESPONSE_MESSAGE_TYPE = 921601; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapValuesResponseParams { + response: Data[]; +} + +export class TransactionalMapValuesCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapValuesResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMapValuesWithPredicateCodec.ts b/src/codec/TransactionalMapValuesWithPredicateCodec.ts new file mode 100644 index 000000000..c2d57597e --- /dev/null +++ b/src/codec/TransactionalMapValuesWithPredicateCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; + +// hex: 0x0E1100 +const REQUEST_MESSAGE_TYPE = 921856; +// hex: 0x0E1101 +const RESPONSE_MESSAGE_TYPE = 921857; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMapValuesWithPredicateResponseParams { + response: Data[]; +} + +export class TransactionalMapValuesWithPredicateCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, predicate: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, predicate); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMapValuesWithPredicateResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMultiMapGetCodec.ts b/src/codec/TransactionalMultiMapGetCodec.ts new file mode 100644 index 000000000..1df83976a --- /dev/null +++ b/src/codec/TransactionalMultiMapGetCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; + +// hex: 0x0F0200 +const REQUEST_MESSAGE_TYPE = 983552; +// hex: 0x0F0201 +const RESPONSE_MESSAGE_TYPE = 983553; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMultiMapGetResponseParams { + response: Data[]; +} + +export class TransactionalMultiMapGetCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapGetResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMultiMapPutCodec.ts b/src/codec/TransactionalMultiMapPutCodec.ts new file mode 100644 index 000000000..4e529a70c --- /dev/null +++ b/src/codec/TransactionalMultiMapPutCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0F0100 +const REQUEST_MESSAGE_TYPE = 983296; +// hex: 0x0F0101 +const RESPONSE_MESSAGE_TYPE = 983297; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMultiMapPutResponseParams { + response: boolean; +} + +export class TransactionalMultiMapPutCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapPutResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMultiMapRemoveCodec.ts b/src/codec/TransactionalMultiMapRemoveCodec.ts new file mode 100644 index 000000000..d95b1f705 --- /dev/null +++ b/src/codec/TransactionalMultiMapRemoveCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; + +// hex: 0x0F0300 +const REQUEST_MESSAGE_TYPE = 983808; +// hex: 0x0F0301 +const RESPONSE_MESSAGE_TYPE = 983809; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalMultiMapRemoveResponseParams { + response: Data[]; +} + +export class TransactionalMultiMapRemoveCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapRemoveResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts new file mode 100644 index 000000000..ea0002806 --- /dev/null +++ b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0F0400 +const REQUEST_MESSAGE_TYPE = 984064; +// hex: 0x0F0401 +const RESPONSE_MESSAGE_TYPE = 984065; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMultiMapRemoveEntryResponseParams { + response: boolean; +} + +export class TransactionalMultiMapRemoveEntryCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + DataCodec.encode(clientMessage, value); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapRemoveEntryResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMultiMapSizeCodec.ts b/src/codec/TransactionalMultiMapSizeCodec.ts new file mode 100644 index 000000000..d528a38e7 --- /dev/null +++ b/src/codec/TransactionalMultiMapSizeCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0F0600 +const REQUEST_MESSAGE_TYPE = 984576; +// hex: 0x0F0601 +const RESPONSE_MESSAGE_TYPE = 984577; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMultiMapSizeResponseParams { + response: number; +} + +export class TransactionalMultiMapSizeCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalMultiMapValueCountCodec.ts b/src/codec/TransactionalMultiMapValueCountCodec.ts new file mode 100644 index 000000000..393d5a6f0 --- /dev/null +++ b/src/codec/TransactionalMultiMapValueCountCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x0F0500 +const REQUEST_MESSAGE_TYPE = 984320; +// hex: 0x0F0501 +const RESPONSE_MESSAGE_TYPE = 984321; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalMultiMapValueCountResponseParams { + response: number; +} + +export class TransactionalMultiMapValueCountCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, key); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapValueCountResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalQueueOfferCodec.ts b/src/codec/TransactionalQueueOfferCodec.ts new file mode 100644 index 000000000..05af33ab4 --- /dev/null +++ b/src/codec/TransactionalQueueOfferCodec.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x120100 +const REQUEST_MESSAGE_TYPE = 1179904; +// hex: 0x120101 +const RESPONSE_MESSAGE_TYPE = 1179905; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalQueueOfferResponseParams { + response: boolean; +} + +export class TransactionalQueueOfferCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data, timeout: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, item); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalQueueOfferResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalQueuePeekCodec.ts b/src/codec/TransactionalQueuePeekCodec.ts new file mode 100644 index 000000000..5ecb9051d --- /dev/null +++ b/src/codec/TransactionalQueuePeekCodec.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x120400 +const REQUEST_MESSAGE_TYPE = 1180672; +// hex: 0x120401 +const RESPONSE_MESSAGE_TYPE = 1180673; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalQueuePeekResponseParams { + response: Data; +} + +export class TransactionalQueuePeekCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, timeout: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalQueuePeekResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalQueuePollCodec.ts b/src/codec/TransactionalQueuePollCodec.ts new file mode 100644 index 000000000..ff3413936 --- /dev/null +++ b/src/codec/TransactionalQueuePollCodec.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x120300 +const REQUEST_MESSAGE_TYPE = 1180416; +// hex: 0x120301 +const RESPONSE_MESSAGE_TYPE = 1180417; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalQueuePollResponseParams { + response: Data; +} + +export class TransactionalQueuePollCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, timeout: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalQueuePollResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalQueueSizeCodec.ts b/src/codec/TransactionalQueueSizeCodec.ts new file mode 100644 index 000000000..329117eac --- /dev/null +++ b/src/codec/TransactionalQueueSizeCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x120500 +const REQUEST_MESSAGE_TYPE = 1180928; +// hex: 0x120501 +const RESPONSE_MESSAGE_TYPE = 1180929; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalQueueSizeResponseParams { + response: number; +} + +export class TransactionalQueueSizeCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalQueueSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalQueueTakeCodec.ts b/src/codec/TransactionalQueueTakeCodec.ts new file mode 100644 index 000000000..b9d106613 --- /dev/null +++ b/src/codec/TransactionalQueueTakeCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x120200 +const REQUEST_MESSAGE_TYPE = 1180160; +// hex: 0x120201 +const RESPONSE_MESSAGE_TYPE = 1180161; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export interface TransactionalQueueTakeResponseParams { + response: Data; +} + +export class TransactionalQueueTakeCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalQueueTakeResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + return { + response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), + }; + } +} diff --git a/src/codec/TransactionalSetAddCodec.ts b/src/codec/TransactionalSetAddCodec.ts new file mode 100644 index 000000000..bf8c9fec7 --- /dev/null +++ b/src/codec/TransactionalSetAddCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x100100 +const REQUEST_MESSAGE_TYPE = 1048832; +// hex: 0x100101 +const RESPONSE_MESSAGE_TYPE = 1048833; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalSetAddResponseParams { + response: boolean; +} + +export class TransactionalSetAddCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, item); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalSetAddResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalSetRemoveCodec.ts b/src/codec/TransactionalSetRemoveCodec.ts new file mode 100644 index 000000000..dec37a012 --- /dev/null +++ b/src/codec/TransactionalSetRemoveCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; + +// hex: 0x100200 +const REQUEST_MESSAGE_TYPE = 1049088; +// hex: 0x100201 +const RESPONSE_MESSAGE_TYPE = 1049089; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalSetRemoveResponseParams { + response: boolean; +} + +export class TransactionalSetRemoveCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, item); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalSetRemoveResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/TransactionalSetSizeCodec.ts b/src/codec/TransactionalSetSizeCodec.ts new file mode 100644 index 000000000..2963aa9db --- /dev/null +++ b/src/codec/TransactionalSetSizeCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as Long from 'long'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x100300 +const REQUEST_MESSAGE_TYPE = 1049344; +// hex: 0x100301 +const RESPONSE_MESSAGE_TYPE = 1049345; + +const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export interface TransactionalSetSizeResponseParams { + response: number; +} + +export class TransactionalSetSizeCodec { + static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): TransactionalSetSizeResponseParams { + const initialFrame = clientMessage.nextFrame(); + + return { + response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), + }; + } +} diff --git a/src/codec/UUIDCodec.ts b/src/codec/builtin/ByteArrayCodec.ts similarity index 63% rename from src/codec/UUIDCodec.ts rename to src/codec/builtin/ByteArrayCodec.ts index d3bc73a79..f526d48db 100644 --- a/src/codec/UUIDCodec.ts +++ b/src/codec/builtin/ByteArrayCodec.ts @@ -14,13 +14,15 @@ * limitations under the License. */ -import ClientMessage = require('../ClientMessage'); -import {UUID} from '../core/UUID'; +import {Buffer} from 'safe-buffer'; +import {ClientMessage, Frame} from '../../ClientMessage'; -export class UUIDCodec { - static decode(clientMessage: ClientMessage, toObject: Function): UUID { - const most = clientMessage.readLong(); - const least = clientMessage.readLong(); - return new UUID(most, least); +export class ByteArrayCodec { + static encode(clientMessage: ClientMessage, bytes: Buffer): void { + clientMessage.addFrame(new Frame(bytes)); + } + + static decode(clientMessage: ClientMessage): Buffer { + return clientMessage.nextFrame().content; } } diff --git a/src/codec/builtin/CodecUtil.ts b/src/codec/builtin/CodecUtil.ts new file mode 100644 index 000000000..dd858809c --- /dev/null +++ b/src/codec/builtin/CodecUtil.ts @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientMessage, Frame, NULL_FRAME} from '../../ClientMessage'; + +export class CodecUtil { + static fastForwardToEndFrame(clientMessage: ClientMessage): void { + // We are starting from 1 because of the BEGIN_FRAME we read + // in the beginning of the decode method + let numberOfExpectedEndFrames = 1; + let frame: Frame; + while (numberOfExpectedEndFrames !== 0) { + frame = clientMessage.nextFrame(); + if (frame.isEndFrame()) { + numberOfExpectedEndFrames--; + } else if (frame.isBeginFrame()) { + numberOfExpectedEndFrames++; + } + } + } + + static encodeNullable(clientMessage: ClientMessage, value: T, encoder: (msg: ClientMessage, val: T) => void): void { + if (value == null) { + clientMessage.addFrame(NULL_FRAME.copy()); + } else { + encoder(clientMessage, value); + } + } + + static decodeNullable(clientMessage: ClientMessage, decoder: (msg: ClientMessage) => T): T { + return CodecUtil.nextFrameIsNullFrame(clientMessage) ? null : decoder(clientMessage); + } + + static nextFrameIsDataStructureEndFrame(clientMessage: ClientMessage): boolean { + return clientMessage.peekNextFrame().isEndFrame(); + } + + /** + * Returns whether the next frame is {@link NULL_FRAME} or not. + * If it is a {@link NULL_FRAME}, this method consumes the iterator + * by calling {@link ClientMessage#nextFrame} once to skip the {@link NULL_FRAME}. + */ + static nextFrameIsNullFrame(clientMessage: ClientMessage): boolean { + const isNull = clientMessage.peekNextFrame().isNullFrame(); + if (isNull) { + clientMessage.nextFrame(); + } + return isNull; + } +} diff --git a/src/codec/builtin/DataCodec.ts b/src/codec/builtin/DataCodec.ts new file mode 100644 index 000000000..a5d50b442 --- /dev/null +++ b/src/codec/builtin/DataCodec.ts @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientMessage, Frame, NULL_FRAME} from '../../ClientMessage'; +import {Data} from '../../serialization/Data'; +import {HeapData} from '../../serialization/HeapData'; +import {CodecUtil} from './CodecUtil'; + +export class DataCodec { + static encode(clientMessage: ClientMessage, data: Data): void { + clientMessage.addFrame(new Frame(data.toBuffer())); + } + + static encodeNullable(clientMessage: ClientMessage, data: Data): void { + if (data === null) { + clientMessage.addFrame(NULL_FRAME.copy()); + } else { + clientMessage.addFrame(new Frame(data.toBuffer())); + } + } + + static decode(clientMessage: ClientMessage): Data { + return new HeapData(clientMessage.nextFrame().content); + } + + static decodeNullable(clientMessage: ClientMessage): Data { + return CodecUtil.nextFrameIsNullFrame(clientMessage) ? null : this.decode(clientMessage); + } +} diff --git a/src/codec/builtin/EntryListCodec.ts b/src/codec/builtin/EntryListCodec.ts new file mode 100644 index 000000000..7c0576707 --- /dev/null +++ b/src/codec/builtin/EntryListCodec.ts @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; +import {CodecUtil} from './CodecUtil'; + +export class EntryListCodec { + static encode(clientMessage: ClientMessage, entries: Array<[K, V]>, + keyEncoder: (msg: ClientMessage, key: K) => void, + valueEncoder: (msg: ClientMessage, value: V) => void): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + for (let i = 0, n = entries.length; i < n; i++) { + keyEncoder(clientMessage, entries[i][0]); + valueEncoder(clientMessage, entries[i][1]); + } + clientMessage.addFrame(END_FRAME.copy()); + } + + static encodeNullable(clientMessage: ClientMessage, entries: Array<[K, V]>, + keyEncoder: (msg: ClientMessage, key: K) => void, + valueEncoder: (msg: ClientMessage, value: V) => void): void { + if (entries === null) { + clientMessage.addFrame(NULL_FRAME.copy()); + } else { + this.encode(clientMessage, entries, keyEncoder, valueEncoder); + } + } + + static decode(clientMessage: ClientMessage, + keyDecoder: (msg: ClientMessage) => K, + valueDecoder: (msg: ClientMessage) => V): Array<[K, V]> { + const result: Array<[K, V]> = []; + // begin frame + clientMessage.nextFrame(); + while (!CodecUtil.nextFrameIsDataStructureEndFrame(clientMessage)) { + const key = keyDecoder(clientMessage); + const value = valueDecoder(clientMessage); + result.push([key, value]); + } + // end frame + clientMessage.nextFrame(); + return result; + } + + static decodeNullable(clientMessage: ClientMessage, + keyDecoder: (msg: ClientMessage) => K, + valueDecoder: (msg: ClientMessage) => V): Array<[K, V]> { + return CodecUtil.nextFrameIsNullFrame(clientMessage) ? null : this.decode(clientMessage, keyDecoder, valueDecoder); + } +} diff --git a/src/codec/builtin/EntryListIntegerIntegerCodec.ts b/src/codec/builtin/EntryListIntegerIntegerCodec.ts new file mode 100644 index 000000000..20f6d9fa9 --- /dev/null +++ b/src/codec/builtin/EntryListIntegerIntegerCodec.ts @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Buffer} from 'safe-buffer'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, Frame} from '../../ClientMessage'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; + +const ENTRY_SIZE_IN_BYTES = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES; + +export class EntryListIntegerIntegerCodec { + static encode(clientMessage: ClientMessage, entries: Array<[number, number]>): void { + const entryCount = entries.length; + const frame = new Frame(Buffer.allocUnsafe(entryCount * ENTRY_SIZE_IN_BYTES)); + for (let i = 0; i < entryCount; i++) { + FixSizedTypesCodec.encodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES, entries[i][0]); + FixSizedTypesCodec.encodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES, entries[i][1]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): Array<[number, number]> { + const frame = clientMessage.nextFrame(); + const entryCount = frame.content.length / ENTRY_SIZE_IN_BYTES; + const result = new Array<[number, number]>(entryCount); + for (let i = 0; i < entryCount; i++) { + const key = FixSizedTypesCodec.decodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES); + const value = FixSizedTypesCodec.decodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES); + result[i] = [key, value]; + } + return result; + } +} diff --git a/src/codec/builtin/EntryListIntegerLongCodec.ts b/src/codec/builtin/EntryListIntegerLongCodec.ts new file mode 100644 index 000000000..aa9a14215 --- /dev/null +++ b/src/codec/builtin/EntryListIntegerLongCodec.ts @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, Frame} from '../../ClientMessage'; +import {Buffer} from 'safe-buffer'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; +import * as Long from 'long'; + +const ENTRY_SIZE_IN_BYTES = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.LONG_SIZE_IN_BYTES; + +export class EntryListIntegerLongCodec { + static encode(clientMessage: ClientMessage, entries: Array<[number, Long]>): void { + const entryCount = entries.length; + const frame = new Frame(Buffer.allocUnsafe(entryCount * ENTRY_SIZE_IN_BYTES)); + for (let i = 0; i < entryCount; i++) { + FixSizedTypesCodec.encodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES, entries[i][0]); + FixSizedTypesCodec.encodeLong(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES, entries[i][1]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): Array<[number, Long]> { + const frame = clientMessage.nextFrame(); + const entryCount = frame.content.length / ENTRY_SIZE_IN_BYTES; + const result = new Array<[number, Long]>(entryCount); + for (let i = 0; i < entryCount; i++) { + const key = FixSizedTypesCodec.decodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES); + const value = FixSizedTypesCodec.decodeLong(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES); + result[i] = [key, value]; + } + return result; + } +} diff --git a/src/codec/builtin/EntryListIntegerUUIDCodec.ts b/src/codec/builtin/EntryListIntegerUUIDCodec.ts new file mode 100644 index 000000000..f741f7792 --- /dev/null +++ b/src/codec/builtin/EntryListIntegerUUIDCodec.ts @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, Frame} from '../../ClientMessage'; +import {Buffer} from 'safe-buffer'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; +import {UUID} from '../../core/UUID'; + +const ENTRY_SIZE_IN_BYTES = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES; + +export class EntryListIntegerUUIDCodec { + static encode(clientMessage: ClientMessage, entries: Array<[number, UUID]>): void { + const entryCount = entries.length; + const frame = new Frame(Buffer.allocUnsafe(entryCount * ENTRY_SIZE_IN_BYTES)); + for (let i = 0; i < entryCount; i++) { + FixSizedTypesCodec.encodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES, entries[i][0]); + FixSizedTypesCodec.encodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES, entries[i][1]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): Array<[number, UUID]> { + const frame = clientMessage.nextFrame(); + const entryCount = frame.content.length / ENTRY_SIZE_IN_BYTES; + const result = new Array<[number, UUID]>(entryCount); + for (let i = 0; i < entryCount; i++) { + const key = FixSizedTypesCodec.decodeInt(frame.content, i * ENTRY_SIZE_IN_BYTES); + const value = FixSizedTypesCodec.decodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES); + result[i] = [key, value]; + } + return result; + } +} diff --git a/src/codec/builtin/EntryListLongByteArrayCodec.ts b/src/codec/builtin/EntryListLongByteArrayCodec.ts new file mode 100644 index 000000000..5e522f6bf --- /dev/null +++ b/src/codec/builtin/EntryListLongByteArrayCodec.ts @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BEGIN_FRAME, ClientMessage, END_FRAME} from '../../ClientMessage'; +import * as Long from 'long'; +import {Buffer} from 'safe-buffer'; +import {ByteArrayCodec} from './ByteArrayCodec'; +import {ListLongCodec} from './ListLongCodec'; +import {ListMultiFrameCodec} from './ListMultiFrameCodec'; + +export class EntryListLongByteArrayCodec { + static encode(clientMessage: ClientMessage, entries: Array<[Long, Buffer]>): void { + const entryCount = entries.length; + const keys = new Array(entryCount); + clientMessage.addFrame(BEGIN_FRAME.copy()); + for (let i = 0; i < entryCount; i++) { + keys[i] = entries[i][0]; + ByteArrayCodec.encode(clientMessage, entries[i][1]); + } + clientMessage.addFrame(END_FRAME.copy()); + ListLongCodec.encode(clientMessage, keys); + } + + static decode(clientMessage: ClientMessage): Array<[Long, Buffer]> { + const values = ListMultiFrameCodec.decode(clientMessage, ByteArrayCodec.decode); + const keys = ListLongCodec.decode(clientMessage); + + const result = new Array<[Long, Buffer]>(keys.length); + for (let i = 0; i < result.length; i++) { + result[i] = [keys[i], values[i]]; + } + return result; + } +} diff --git a/src/codec/builtin/EntryListUUIDListIntegerCodec.ts b/src/codec/builtin/EntryListUUIDListIntegerCodec.ts new file mode 100644 index 000000000..32a11e5d7 --- /dev/null +++ b/src/codec/builtin/EntryListUUIDListIntegerCodec.ts @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BEGIN_FRAME, ClientMessage, END_FRAME} from '../../ClientMessage'; +import {UUID} from '../../core/UUID'; +import {ListIntegerCodec} from './ListIntegerCodec'; +import {ListUUIDCodec} from './ListUUIDCodec'; +import {ListMultiFrameCodec} from './ListMultiFrameCodec'; + +export class EntryListUUIDListIntegerCodec { + static encode(clientMessage: ClientMessage, entries: Array<[UUID, number[]]>): void { + const entryCount = entries.length; + const keys = new Array(entryCount); + clientMessage.addFrame(BEGIN_FRAME.copy()); + for (let i = 0; i < entryCount; i++) { + keys[i] = entries[i][0]; + ListIntegerCodec.encode(clientMessage, entries[i][1]); + } + clientMessage.addFrame(END_FRAME.copy()); + ListUUIDCodec.encode(clientMessage, keys); + } + + static decode(clientMessage: ClientMessage): Array<[UUID, number[]]> { + const values = ListMultiFrameCodec.decode(clientMessage, ListIntegerCodec.decode); + const keys = ListUUIDCodec.decode(clientMessage); + + const result = new Array<[UUID, number[]]>(keys.length); + for (let i = 0; i < result.length; i++) { + result[i] = [keys[i], values[i]]; + } + return result; + } +} diff --git a/src/codec/builtin/EntryListUUIDLongCodec.ts b/src/codec/builtin/EntryListUUIDLongCodec.ts new file mode 100644 index 000000000..b4fe8304f --- /dev/null +++ b/src/codec/builtin/EntryListUUIDLongCodec.ts @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, Frame} from '../../ClientMessage'; +import {UUID} from '../../core/UUID'; +import * as Long from 'long'; +import {Buffer} from 'safe-buffer'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; + +const ENTRY_SIZE_IN_BYTES = BitsUtil.UUID_SIZE_IN_BYTES + BitsUtil.LONG_SIZE_IN_BYTES; + +export class EntryListUUIDLongCodec { + static encode(clientMessage: ClientMessage, entries: Array<[UUID, Long]>): void { + const entryCount = entries.length; + const frame = new Frame(Buffer.allocUnsafe(entryCount * ENTRY_SIZE_IN_BYTES)); + for (let i = 0; i < entryCount; i++) { + FixSizedTypesCodec.encodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES, entries[i][0]); + FixSizedTypesCodec.encodeLong(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES, entries[i][1]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): Array<[UUID, Long]> { + const frame = clientMessage.nextFrame(); + const entryCount = frame.content.length / ENTRY_SIZE_IN_BYTES; + const result = new Array<[UUID, Long]>(entryCount); + for (let i = 0; i < entryCount; i++) { + const key = FixSizedTypesCodec.decodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES); + const value = FixSizedTypesCodec.decodeLong(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES); + result[i] = [key, value]; + } + return result; + } +} diff --git a/src/codec/builtin/EntryListUUIDUUIDCodec.ts b/src/codec/builtin/EntryListUUIDUUIDCodec.ts new file mode 100644 index 000000000..4695eedaa --- /dev/null +++ b/src/codec/builtin/EntryListUUIDUUIDCodec.ts @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, Frame} from '../../ClientMessage'; +import {UUID} from '../../core/UUID'; +import {Buffer} from 'safe-buffer'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; + +const ENTRY_SIZE_IN_BYTES = BitsUtil.UUID_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES; + +export class EntryListUUIDUUIDCodec { + static encode(clientMessage: ClientMessage, entries: Array<[UUID, UUID]>): void { + const entryCount = entries.length; + const frame = new Frame(Buffer.allocUnsafe(entryCount * ENTRY_SIZE_IN_BYTES)); + for (let i = 0; i < entryCount; i++) { + FixSizedTypesCodec.encodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES, entries[i][0]); + FixSizedTypesCodec.encodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES, entries[i][1]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): Array<[UUID, UUID]> { + const frame = clientMessage.nextFrame(); + const entryCount = frame.content.length / ENTRY_SIZE_IN_BYTES; + const result = new Array<[UUID, UUID]>(entryCount); + for (let i = 0; i < entryCount; i++) { + const key = FixSizedTypesCodec.decodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES); + const value = FixSizedTypesCodec.decodeUUID(frame.content, i * ENTRY_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES); + result[i] = [key, value]; + } + return result; + } +} diff --git a/src/codec/builtin/ErrorsCodec.ts b/src/codec/builtin/ErrorsCodec.ts new file mode 100644 index 000000000..ca22579c8 --- /dev/null +++ b/src/codec/builtin/ErrorsCodec.ts @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +// Other codecs message types can be in range 0x000100 - 0xFFFFFF +// So, it is safe to supply a custom message type for exceptions in +// the range 0x000000 - 0x0000FF +import {ClientMessage} from '../../ClientMessage'; +import {ErrorHolder} from '../../protocol/ErrorHolder'; +import {ListMultiFrameCodec} from './ListMultiFrameCodec'; +import {ErrorHolderCodec} from '../custom/ErrorHolderCodec'; + +export const EXCEPTION_MESSAGE_TYPE = 0; + +export class ErrorsCodec { + static decode(clientMessage: ClientMessage): ErrorHolder[] { + // initial frame + clientMessage.nextFrame(); + return ListMultiFrameCodec.decode(clientMessage, ErrorHolderCodec.decode); + } +} diff --git a/src/codec/builtin/FixSizedTypesCodec.ts b/src/codec/builtin/FixSizedTypesCodec.ts new file mode 100644 index 000000000..6658233ac --- /dev/null +++ b/src/codec/builtin/FixSizedTypesCodec.ts @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Buffer} from 'safe-buffer'; +import * as Long from 'long'; +import {BitsUtil} from '../../BitsUtil'; +import {UUID} from '../../core/UUID'; + +export class FixSizedTypesCodec { + static encodeInt(buffer: Buffer, offset: number, value: number): void { + buffer.writeInt32LE(value, offset); + } + + static decodeInt(buffer: Buffer, offset: number): number { + return buffer.readInt32LE(offset); + } + + static encodeLong(buffer: Buffer, offset: number, value: any): void { + if (!Long.isLong(value)) { + value = Long.fromValue(value); + } + + buffer.writeInt32LE(value.low, offset); + buffer.writeInt32LE(value.high, offset + BitsUtil.INT_SIZE_IN_BYTES); + } + + static decodeLong(buffer: Buffer, offset: number): Long { + const low = buffer.readInt32LE(offset); + const high = buffer.readInt32LE(offset + BitsUtil.INT_SIZE_IN_BYTES); + return new Long(low, high); + } + + static encodeBoolean(buffer: Buffer, offset: number, value: boolean): void { + buffer.writeUInt8(value ? 1 : 0, offset); + } + + static decodeBoolean(buffer: Buffer, offset: number): boolean { + return buffer.readUInt8(offset) === 1; + } + + static encodeByte(buffer: Buffer, offset: number, value: number): void { + buffer.writeUInt8(value, offset); + } + + static decodeByte(buffer: Buffer, offset: number): number { + return buffer.readUInt8(offset); + } + + static encodeUUID(buffer: Buffer, offset: number, value: UUID): void { + const isNull = value === null; + this.encodeBoolean(buffer, offset, isNull); + if (isNull) { + return; + } + const mostSignificantBits = value.mostSignificant; + const leastSignificantBits = value.leastSignificant; + this.encodeLong(buffer, offset + BitsUtil.BOOLEAN_SIZE_IN_BYTES, mostSignificantBits); + this.encodeLong(buffer, offset + BitsUtil.BOOLEAN_SIZE_IN_BYTES + BitsUtil.LONG_SIZE_IN_BYTES, leastSignificantBits); + } + + static decodeUUID(buffer: Buffer, offset: number): UUID { + const isNull = this.decodeBoolean(buffer, offset); + if (isNull) { + return null; + } + const mostSignificantBits = this.decodeLong(buffer, offset + BitsUtil.BOOLEAN_SIZE_IN_BYTES); + const leastSignificantBits = this.decodeLong(buffer, + offset + BitsUtil.BOOLEAN_SIZE_IN_BYTES + BitsUtil.LONG_SIZE_IN_BYTES); + return new UUID(mostSignificantBits, leastSignificantBits); + } +} diff --git a/src/codec/builtin/ListIntegerCodec.ts b/src/codec/builtin/ListIntegerCodec.ts new file mode 100644 index 000000000..e18510dbf --- /dev/null +++ b/src/codec/builtin/ListIntegerCodec.ts @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientMessage, Frame} from '../../ClientMessage'; +import {BitsUtil} from '../../BitsUtil'; +import {Buffer} from 'safe-buffer'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; + +export class ListIntegerCodec { + static encode(clientMessage: ClientMessage, list: number[]): void { + const itemCount = list.length; + const frame = new Frame(Buffer.allocUnsafe(itemCount * BitsUtil.INT_SIZE_IN_BYTES)); + for (let i = 0; i < itemCount; i++) { + FixSizedTypesCodec.encodeInt(frame.content, i * BitsUtil.INT_SIZE_IN_BYTES, list[i]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): number[] { + const frame = clientMessage.nextFrame(); + const itemCount = frame.content.length / BitsUtil.INT_SIZE_IN_BYTES; + const result = new Array(itemCount); + for (let i = 0; i < itemCount; i++) { + result[i] = FixSizedTypesCodec.decodeInt(frame.content, i * BitsUtil.INT_SIZE_IN_BYTES); + } + return result; + } +} diff --git a/src/codec/builtin/ListLongCodec.ts b/src/codec/builtin/ListLongCodec.ts new file mode 100644 index 000000000..c96702de7 --- /dev/null +++ b/src/codec/builtin/ListLongCodec.ts @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientMessage, Frame} from '../../ClientMessage'; +import * as Long from 'long'; +import {BitsUtil} from '../../BitsUtil'; +import {Buffer} from 'safe-buffer'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; + +export class ListLongCodec { + static encode(clientMessage: ClientMessage, list: Long[]): void { + const itemCount = list.length; + const frame = new Frame(Buffer.allocUnsafe(itemCount * BitsUtil.LONG_SIZE_IN_BYTES)); + for (let i = 0; i < itemCount; i++) { + FixSizedTypesCodec.encodeLong(frame.content, i * BitsUtil.LONG_SIZE_IN_BYTES, list[i]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): Long[] { + const frame = clientMessage.nextFrame(); + const itemCount = frame.content.length / BitsUtil.LONG_SIZE_IN_BYTES; + const result = new Array(itemCount); + for (let i = 0; i < itemCount; i++) { + result[i] = FixSizedTypesCodec.decodeLong(frame.content, i * BitsUtil.LONG_SIZE_IN_BYTES); + } + return result; + } +} diff --git a/src/codec/builtin/ListMultiFrameCodec.ts b/src/codec/builtin/ListMultiFrameCodec.ts new file mode 100644 index 000000000..ddbc01a37 --- /dev/null +++ b/src/codec/builtin/ListMultiFrameCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; +import {CodecUtil} from './CodecUtil'; + +export class ListMultiFrameCodec { + static encode(clientMessage: ClientMessage, list: T[], encoder: (msg: ClientMessage, value: T) => void): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + for (let i = 0, n = list.length; i < n; i++) { + encoder(clientMessage, list[i]); + } + clientMessage.addFrame(END_FRAME.copy()); + } + + static encodeContainsNullable(clientMessage: ClientMessage, list: T[], + encoder: (msg: ClientMessage, value: T) => void): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + for (let i = 0, n = list.length; i < n; i++) { + const item = list[i]; + if (item === null) { + clientMessage.addFrame(NULL_FRAME.copy()); + } else { + encoder(clientMessage, list[i]); + } + } + clientMessage.addFrame(END_FRAME.copy()); + } + + static encodeNullable(clientMessage: ClientMessage, list: T[], encoder: (msg: ClientMessage, value: T) => void): void { + if (list === null) { + clientMessage.addFrame(NULL_FRAME.copy()); + } else { + this.encode(clientMessage, list, encoder); + } + } + + static decode(clientMessage: ClientMessage, decoder: (msg: ClientMessage) => T): T[] { + const result: T[] = []; + // begin frame + clientMessage.nextFrame(); + while (!CodecUtil.nextFrameIsDataStructureEndFrame(clientMessage)) { + result.push(decoder(clientMessage)); + } + // end frame + clientMessage.nextFrame(); + return result; + } +} diff --git a/src/codec/builtin/ListUUIDCodec.ts b/src/codec/builtin/ListUUIDCodec.ts new file mode 100644 index 000000000..e4afa0b68 --- /dev/null +++ b/src/codec/builtin/ListUUIDCodec.ts @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientMessage, Frame} from '../../ClientMessage'; +import {UUID} from '../../core/UUID'; +import {BitsUtil} from '../../BitsUtil'; +import {Buffer} from 'safe-buffer'; +import {FixSizedTypesCodec} from './FixSizedTypesCodec'; + +export class ListUUIDCodec { + static encode(clientMessage: ClientMessage, list: UUID[]): void { + const itemCount = list.length; + const frame = new Frame(Buffer.allocUnsafe(itemCount * BitsUtil.UUID_SIZE_IN_BYTES)); + for (let i = 0; i < itemCount; i++) { + FixSizedTypesCodec.encodeUUID(frame.content, i * BitsUtil.UUID_SIZE_IN_BYTES, list[i]); + } + clientMessage.addFrame(frame); + } + + static decode(clientMessage: ClientMessage): UUID[] { + const frame = clientMessage.nextFrame(); + const itemCount = frame.content.length / BitsUtil.UUID_SIZE_IN_BYTES; + const result = new Array(itemCount); + for (let i = 0; i < itemCount; i++) { + result[i] = FixSizedTypesCodec.decodeUUID(frame.content, i * BitsUtil.UUID_SIZE_IN_BYTES); + } + return result; + } +} diff --git a/src/core/EntryView.ts b/src/codec/builtin/LongArrayCodec.ts similarity index 63% rename from src/core/EntryView.ts rename to src/codec/builtin/LongArrayCodec.ts index f3a256400..2563ebbbb 100644 --- a/src/core/EntryView.ts +++ b/src/codec/builtin/LongArrayCodec.ts @@ -14,19 +14,16 @@ * limitations under the License. */ +import {ClientMessage} from '../../ClientMessage'; import * as Long from 'long'; +import {ListLongCodec} from './ListLongCodec'; -export class EntryView { - key: K; - value: V; - cost: Long; - creationTime: Long; - expirationTime: Long; - hits: Long; - lastAccessTime: Long; - lastStoreTime: Long; - lastUpdateTime: Long; - version: Long; - evictionCriteriaNumber: Long; - ttl: Long; +export class LongArrayCodec { + static encode(clientMessage: ClientMessage, array: Long[]): void { + ListLongCodec.encode(clientMessage, array); + } + + static decode(clientMessage: ClientMessage): Long[] { + return ListLongCodec.decode(clientMessage); + } } diff --git a/src/codec/builtin/MapCodec.ts b/src/codec/builtin/MapCodec.ts new file mode 100644 index 000000000..f1004bc17 --- /dev/null +++ b/src/codec/builtin/MapCodec.ts @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; +import {CodecUtil} from './CodecUtil'; + +export class MapCodec { + static encode(clientMessage: ClientMessage, map: Map, + keyEncoder: (msg: ClientMessage, key: K) => void, + valueEncoder: (msg: ClientMessage, value: V) => void): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + map.forEach((value, key) => { + keyEncoder(clientMessage, key); + valueEncoder(clientMessage, value); + }); + clientMessage.addFrame(END_FRAME.copy()); + } + + static encodeNullable(clientMessage: ClientMessage, map: Map, + keyEncoder: (msg: ClientMessage, key: K) => void, + valueEncoder: (msg: ClientMessage, value: V) => void): void { + if (map === null) { + clientMessage.addFrame(NULL_FRAME.copy()); + } else { + this.encode(clientMessage, map, keyEncoder, valueEncoder); + } + } + + static decode(clientMessage: ClientMessage, + keyDecoder: (msg: ClientMessage) => K, + valueDecoder: (msg: ClientMessage) => V): Map { + const result = new Map(); + // begin frame + clientMessage.nextFrame(); + while (!CodecUtil.nextFrameIsDataStructureEndFrame(clientMessage)) { + const key = keyDecoder(clientMessage); + const value = valueDecoder(clientMessage); + result.set(key, value); + } + // end frame + clientMessage.nextFrame(); + return result; + } + + static decodeNullable(clientMessage: ClientMessage, + keyDecoder: (msg: ClientMessage) => K, + valueDecoder: (msg: ClientMessage) => V): Map { + return CodecUtil.nextFrameIsNullFrame(clientMessage) ? null : this.decode(clientMessage, keyDecoder, valueDecoder); + } +} diff --git a/src/codec/builtin/StringCodec.ts b/src/codec/builtin/StringCodec.ts new file mode 100644 index 000000000..610a9b8d1 --- /dev/null +++ b/src/codec/builtin/StringCodec.ts @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientMessage, Frame} from '../../ClientMessage'; +import {Buffer} from 'safe-buffer'; + +export class StringCodec { + static encode(clientMessage: ClientMessage, value: string): void { + clientMessage.addFrame(new Frame(Buffer.from(value, 'utf8'))); + } + + static decode(clientMessage: ClientMessage): string { + const frame = clientMessage.nextFrame(); + return frame.content.toString('utf8'); + } +} diff --git a/src/codec/custom/AddressCodec.ts b/src/codec/custom/AddressCodec.ts new file mode 100644 index 000000000..0d1f16bac --- /dev/null +++ b/src/codec/custom/AddressCodec.ts @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {StringCodec} from '../builtin/StringCodec'; +import {Address} from '../../Address'; + +const PORT_OFFSET = 0; +const INITIAL_FRAME_SIZE = PORT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class AddressCodec { + static encode(clientMessage: ClientMessage, address: Address): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeInt(initialFrame.content, PORT_OFFSET, address.port); + clientMessage.addFrame(initialFrame); + + StringCodec.encode(clientMessage, address.host); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): Address { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const port: number = FixSizedTypesCodec.decodeInt(initialFrame.content, PORT_OFFSET); + const host: string = StringCodec.decode(clientMessage); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new Address(host, port); + } +} diff --git a/src/codec/custom/AnchorDataListHolderCodec.ts b/src/codec/custom/AnchorDataListHolderCodec.ts new file mode 100644 index 000000000..32722ff81 --- /dev/null +++ b/src/codec/custom/AnchorDataListHolderCodec.ts @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {ListIntegerCodec} from '../builtin/ListIntegerCodec'; +import {EntryListCodec} from '../builtin/EntryListCodec'; +import {DataCodec} from '../builtin/DataCodec'; +import {Data} from '../../serialization/Data'; +import {AnchorDataListHolder} from '../../protocol/AnchorDataListHolder'; + +export class AnchorDataListHolderCodec { + static encode(clientMessage: ClientMessage, anchorDataListHolder: AnchorDataListHolder): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + ListIntegerCodec.encode(clientMessage, anchorDataListHolder.anchorPageList); + EntryListCodec.encode(clientMessage, anchorDataListHolder.anchorDataList, DataCodec.encode, DataCodec.encode); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): AnchorDataListHolder { + // begin frame + clientMessage.nextFrame(); + const anchorPageList: number[] = ListIntegerCodec.decode(clientMessage); + const anchorDataList: Array<[Data, Data]> = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new AnchorDataListHolder(anchorPageList, anchorDataList); + } +} diff --git a/src/codec/custom/BitmapIndexOptionsCodec.ts b/src/codec/custom/BitmapIndexOptionsCodec.ts new file mode 100644 index 000000000..6f1f212a9 --- /dev/null +++ b/src/codec/custom/BitmapIndexOptionsCodec.ts @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {StringCodec} from '../builtin/StringCodec'; +import {BitmapIndexOptions} from '../../config/BitmapIndexOptions'; + +const UNIQUE_KEY_TRANSFORMATION_OFFSET = 0; +const INITIAL_FRAME_SIZE = UNIQUE_KEY_TRANSFORMATION_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class BitmapIndexOptionsCodec { + static encode(clientMessage: ClientMessage, bitmapIndexOptions: BitmapIndexOptions): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeInt(initialFrame.content, UNIQUE_KEY_TRANSFORMATION_OFFSET, bitmapIndexOptions.uniqueKeyTransformation); + clientMessage.addFrame(initialFrame); + + StringCodec.encode(clientMessage, bitmapIndexOptions.uniqueKey); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): BitmapIndexOptions { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const uniqueKeyTransformation: number = FixSizedTypesCodec.decodeInt(initialFrame.content, UNIQUE_KEY_TRANSFORMATION_OFFSET); + const uniqueKey: string = StringCodec.decode(clientMessage); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new BitmapIndexOptions(uniqueKey, uniqueKeyTransformation); + } +} diff --git a/src/codec/custom/DistributedObjectInfoCodec.ts b/src/codec/custom/DistributedObjectInfoCodec.ts new file mode 100644 index 000000000..22a2e5755 --- /dev/null +++ b/src/codec/custom/DistributedObjectInfoCodec.ts @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {StringCodec} from '../builtin/StringCodec'; +import {DistributedObjectInfo} from '../../DistributedObjectInfo'; + +export class DistributedObjectInfoCodec { + static encode(clientMessage: ClientMessage, distributedObjectInfo: DistributedObjectInfo): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + StringCodec.encode(clientMessage, distributedObjectInfo.serviceName); + StringCodec.encode(clientMessage, distributedObjectInfo.name); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): DistributedObjectInfo { + // begin frame + clientMessage.nextFrame(); + const serviceName: string = StringCodec.decode(clientMessage); + const name: string = StringCodec.decode(clientMessage); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new DistributedObjectInfo(serviceName, name); + } +} diff --git a/src/codec/custom/ErrorHolderCodec.ts b/src/codec/custom/ErrorHolderCodec.ts new file mode 100644 index 000000000..a088ed4e8 --- /dev/null +++ b/src/codec/custom/ErrorHolderCodec.ts @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {StringCodec} from '../builtin/StringCodec'; +import {StackTraceElement} from '../../protocol/StackTraceElement'; +import {ListMultiFrameCodec} from '../builtin/ListMultiFrameCodec'; +import {StackTraceElementCodec} from './StackTraceElementCodec'; +import {ErrorHolder} from '../../protocol/ErrorHolder'; + +const ERROR_CODE_OFFSET = 0; +const INITIAL_FRAME_SIZE = ERROR_CODE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class ErrorHolderCodec { + static encode(clientMessage: ClientMessage, errorHolder: ErrorHolder): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeInt(initialFrame.content, ERROR_CODE_OFFSET, errorHolder.errorCode); + clientMessage.addFrame(initialFrame); + + StringCodec.encode(clientMessage, errorHolder.className); + CodecUtil.encodeNullable(clientMessage, errorHolder.message, StringCodec.encode); + ListMultiFrameCodec.encode(clientMessage, errorHolder.stackTraceElements, StackTraceElementCodec.encode); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): ErrorHolder { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const errorCode: number = FixSizedTypesCodec.decodeInt(initialFrame.content, ERROR_CODE_OFFSET); + const className: string = StringCodec.decode(clientMessage); + const message: string = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); + const stackTraceElements: StackTraceElement[] = ListMultiFrameCodec.decode(clientMessage, StackTraceElementCodec.decode); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new ErrorHolder(errorCode, className, message, stackTraceElements); + } +} diff --git a/src/codec/custom/IndexConfigCodec.ts b/src/codec/custom/IndexConfigCodec.ts new file mode 100644 index 000000000..3331547de --- /dev/null +++ b/src/codec/custom/IndexConfigCodec.ts @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {StringCodec} from '../builtin/StringCodec'; +import {ListMultiFrameCodec} from '../builtin/ListMultiFrameCodec'; +import {BitmapIndexOptions} from '../../config/BitmapIndexOptions'; +import {BitmapIndexOptionsCodec} from './BitmapIndexOptionsCodec'; +import {IndexConfig} from '../../config/IndexConfig'; + +const TYPE_OFFSET = 0; +const INITIAL_FRAME_SIZE = TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class IndexConfigCodec { + static encode(clientMessage: ClientMessage, indexConfig: IndexConfig): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeInt(initialFrame.content, TYPE_OFFSET, indexConfig.type); + clientMessage.addFrame(initialFrame); + + CodecUtil.encodeNullable(clientMessage, indexConfig.name, StringCodec.encode); + ListMultiFrameCodec.encode(clientMessage, indexConfig.attributes, StringCodec.encode); + CodecUtil.encodeNullable(clientMessage, indexConfig.bitmapIndexOptions, BitmapIndexOptionsCodec.encode); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): IndexConfig { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const type: number = FixSizedTypesCodec.decodeInt(initialFrame.content, TYPE_OFFSET); + const name: string = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); + const attributes: string[] = ListMultiFrameCodec.decode(clientMessage, StringCodec.decode); + const bitmapIndexOptions: BitmapIndexOptions = CodecUtil.decodeNullable(clientMessage, BitmapIndexOptionsCodec.decode); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new IndexConfig(name, type, attributes, bitmapIndexOptions); + } +} diff --git a/src/codec/custom/MemberInfoCodec.ts b/src/codec/custom/MemberInfoCodec.ts new file mode 100644 index 000000000..d7bcb2ff9 --- /dev/null +++ b/src/codec/custom/MemberInfoCodec.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {UUID} from '../../core/UUID'; +import {Address} from '../../Address'; +import {AddressCodec} from './AddressCodec'; +import {MapCodec} from '../builtin/MapCodec'; +import {StringCodec} from '../builtin/StringCodec'; +import {MemberVersion} from '../../core/MemberVersion'; +import {MemberVersionCodec} from './MemberVersionCodec'; +import {MemberInfo} from '../../core/MemberInfo'; + +const UUID_OFFSET = 0; +const LITE_MEMBER_OFFSET = UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const INITIAL_FRAME_SIZE = LITE_MEMBER_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; + +export class MemberInfoCodec { + static encode(clientMessage: ClientMessage, memberInfo: MemberInfo): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeUUID(initialFrame.content, UUID_OFFSET, memberInfo.uuid); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, LITE_MEMBER_OFFSET, memberInfo.liteMember); + clientMessage.addFrame(initialFrame); + + AddressCodec.encode(clientMessage, memberInfo.address); + MapCodec.encode(clientMessage, memberInfo.attributes, StringCodec.encode, StringCodec.encode); + MemberVersionCodec.encode(clientMessage, memberInfo.version); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): MemberInfo { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const uuid: UUID = FixSizedTypesCodec.decodeUUID(initialFrame.content, UUID_OFFSET); + const liteMember: boolean = FixSizedTypesCodec.decodeBoolean(initialFrame.content, LITE_MEMBER_OFFSET); + const address: Address = AddressCodec.decode(clientMessage); + const attributes: Map = MapCodec.decode(clientMessage, StringCodec.decode, StringCodec.decode); + const version: MemberVersion = MemberVersionCodec.decode(clientMessage); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new MemberInfo(address, uuid, attributes, liteMember, version); + } +} diff --git a/src/codec/custom/MemberVersionCodec.ts b/src/codec/custom/MemberVersionCodec.ts new file mode 100644 index 000000000..df4b34ffd --- /dev/null +++ b/src/codec/custom/MemberVersionCodec.ts @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {MemberVersion} from '../../core/MemberVersion'; + +const MAJOR_OFFSET = 0; +const MINOR_OFFSET = MAJOR_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const PATCH_OFFSET = MINOR_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const INITIAL_FRAME_SIZE = PATCH_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export class MemberVersionCodec { + static encode(clientMessage: ClientMessage, memberVersion: MemberVersion): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeByte(initialFrame.content, MAJOR_OFFSET, memberVersion.major); + FixSizedTypesCodec.encodeByte(initialFrame.content, MINOR_OFFSET, memberVersion.minor); + FixSizedTypesCodec.encodeByte(initialFrame.content, PATCH_OFFSET, memberVersion.patch); + clientMessage.addFrame(initialFrame); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): MemberVersion { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const major: number = FixSizedTypesCodec.decodeByte(initialFrame.content, MAJOR_OFFSET); + const minor: number = FixSizedTypesCodec.decodeByte(initialFrame.content, MINOR_OFFSET); + const patch: number = FixSizedTypesCodec.decodeByte(initialFrame.content, PATCH_OFFSET); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new MemberVersion(major, minor, patch); + } +} diff --git a/src/codec/custom/PagingPredicateHolderCodec.ts b/src/codec/custom/PagingPredicateHolderCodec.ts new file mode 100644 index 000000000..8b73b773d --- /dev/null +++ b/src/codec/custom/PagingPredicateHolderCodec.ts @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {AnchorDataListHolder} from '../../protocol/AnchorDataListHolder'; +import {AnchorDataListHolderCodec} from './AnchorDataListHolderCodec'; +import {Data} from '../../serialization/Data'; +import {DataCodec} from '../builtin/DataCodec'; +import {PagingPredicateHolder} from '../../protocol/PagingPredicateHolder'; + +const PAGE_SIZE_OFFSET = 0; +const PAGE_OFFSET = PAGE_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const ITERATION_TYPE_ID_OFFSET = PAGE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const INITIAL_FRAME_SIZE = ITERATION_TYPE_ID_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +export class PagingPredicateHolderCodec { + static encode(clientMessage: ClientMessage, pagingPredicateHolder: PagingPredicateHolder): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeInt(initialFrame.content, PAGE_SIZE_OFFSET, pagingPredicateHolder.pageSize); + FixSizedTypesCodec.encodeInt(initialFrame.content, PAGE_OFFSET, pagingPredicateHolder.page); + FixSizedTypesCodec.encodeByte(initialFrame.content, ITERATION_TYPE_ID_OFFSET, pagingPredicateHolder.iterationTypeId); + clientMessage.addFrame(initialFrame); + + AnchorDataListHolderCodec.encode(clientMessage, pagingPredicateHolder.anchorDataListHolder); + CodecUtil.encodeNullable(clientMessage, pagingPredicateHolder.predicateData, DataCodec.encode); + CodecUtil.encodeNullable(clientMessage, pagingPredicateHolder.comparatorData, DataCodec.encode); + CodecUtil.encodeNullable(clientMessage, pagingPredicateHolder.partitionKeyData, DataCodec.encode); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): PagingPredicateHolder { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const pageSize: number = FixSizedTypesCodec.decodeInt(initialFrame.content, PAGE_SIZE_OFFSET); + const page: number = FixSizedTypesCodec.decodeInt(initialFrame.content, PAGE_OFFSET); + const iterationTypeId: number = FixSizedTypesCodec.decodeByte(initialFrame.content, ITERATION_TYPE_ID_OFFSET); + const anchorDataListHolder: AnchorDataListHolder = AnchorDataListHolderCodec.decode(clientMessage); + const predicateData: Data = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const comparatorData: Data = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const partitionKeyData: Data = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new PagingPredicateHolder(anchorDataListHolder, predicateData, comparatorData, pageSize, page, iterationTypeId, partitionKeyData); + } +} diff --git a/src/codec/custom/SimpleEntryViewCodec.ts b/src/codec/custom/SimpleEntryViewCodec.ts new file mode 100644 index 000000000..27b21acf3 --- /dev/null +++ b/src/codec/custom/SimpleEntryViewCodec.ts @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import * as Long from 'long'; +import {Data} from '../../serialization/Data'; +import {DataCodec} from '../builtin/DataCodec'; +import {SimpleEntryView} from '../../core/SimpleEntryView'; + +const COST_OFFSET = 0; +const CREATION_TIME_OFFSET = COST_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const EXPIRATION_TIME_OFFSET = CREATION_TIME_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const HITS_OFFSET = EXPIRATION_TIME_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const LAST_ACCESS_TIME_OFFSET = HITS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const LAST_STORED_TIME_OFFSET = LAST_ACCESS_TIME_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const LAST_UPDATE_TIME_OFFSET = LAST_STORED_TIME_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const VERSION_OFFSET = LAST_UPDATE_TIME_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const TTL_OFFSET = VERSION_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const MAX_IDLE_OFFSET = TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const INITIAL_FRAME_SIZE = MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +export class SimpleEntryViewCodec { + static encode(clientMessage: ClientMessage, simpleEntryView: SimpleEntryView): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeLong(initialFrame.content, COST_OFFSET, simpleEntryView.cost); + FixSizedTypesCodec.encodeLong(initialFrame.content, CREATION_TIME_OFFSET, simpleEntryView.creationTime); + FixSizedTypesCodec.encodeLong(initialFrame.content, EXPIRATION_TIME_OFFSET, simpleEntryView.expirationTime); + FixSizedTypesCodec.encodeLong(initialFrame.content, HITS_OFFSET, simpleEntryView.hits); + FixSizedTypesCodec.encodeLong(initialFrame.content, LAST_ACCESS_TIME_OFFSET, simpleEntryView.lastAccessTime); + FixSizedTypesCodec.encodeLong(initialFrame.content, LAST_STORED_TIME_OFFSET, simpleEntryView.lastStoredTime); + FixSizedTypesCodec.encodeLong(initialFrame.content, LAST_UPDATE_TIME_OFFSET, simpleEntryView.lastUpdateTime); + FixSizedTypesCodec.encodeLong(initialFrame.content, VERSION_OFFSET, simpleEntryView.version); + FixSizedTypesCodec.encodeLong(initialFrame.content, TTL_OFFSET, simpleEntryView.ttl); + FixSizedTypesCodec.encodeLong(initialFrame.content, MAX_IDLE_OFFSET, simpleEntryView.maxIdle); + clientMessage.addFrame(initialFrame); + + DataCodec.encode(clientMessage, simpleEntryView.key); + DataCodec.encode(clientMessage, simpleEntryView.value); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): SimpleEntryView { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const cost: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, COST_OFFSET); + const creationTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, CREATION_TIME_OFFSET); + const expirationTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, EXPIRATION_TIME_OFFSET); + const hits: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, HITS_OFFSET); + const lastAccessTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_ACCESS_TIME_OFFSET); + const lastStoredTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_STORED_TIME_OFFSET); + const lastUpdateTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_UPDATE_TIME_OFFSET); + const version: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, VERSION_OFFSET); + const ttl: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, TTL_OFFSET); + const maxIdle: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, MAX_IDLE_OFFSET); + const key: Data = DataCodec.decode(clientMessage); + const value: Data = DataCodec.decode(clientMessage); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new SimpleEntryView(key, value, cost, creationTime, expirationTime, hits, lastAccessTime, lastStoredTime, lastUpdateTime, version, ttl, maxIdle); + } +} diff --git a/src/codec/custom/StackTraceElementCodec.ts b/src/codec/custom/StackTraceElementCodec.ts new file mode 100644 index 000000000..c9379ab64 --- /dev/null +++ b/src/codec/custom/StackTraceElementCodec.ts @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/*tslint:disable:max-line-length*/ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {StringCodec} from '../builtin/StringCodec'; +import {StackTraceElement} from '../../protocol/StackTraceElement'; + +const LINE_NUMBER_OFFSET = 0; +const INITIAL_FRAME_SIZE = LINE_NUMBER_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class StackTraceElementCodec { + static encode(clientMessage: ClientMessage, stackTraceElement: StackTraceElement): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeInt(initialFrame.content, LINE_NUMBER_OFFSET, stackTraceElement.lineNumber); + clientMessage.addFrame(initialFrame); + + StringCodec.encode(clientMessage, stackTraceElement.className); + StringCodec.encode(clientMessage, stackTraceElement.methodName); + CodecUtil.encodeNullable(clientMessage, stackTraceElement.fileName, StringCodec.encode); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): StackTraceElement { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const lineNumber: number = FixSizedTypesCodec.decodeInt(initialFrame.content, LINE_NUMBER_OFFSET); + const className: string = StringCodec.decode(clientMessage); + const methodName: string = StringCodec.decode(clientMessage); + const fileName: string = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new StackTraceElement(className, methodName, fileName, lineNumber); + } +} diff --git a/src/config/BitmapIndexOptions.ts b/src/config/BitmapIndexOptions.ts new file mode 100644 index 000000000..de5cb4048 --- /dev/null +++ b/src/config/BitmapIndexOptions.ts @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {QueryConstants} from '../core/Predicate'; + +/** + * Defines an assortment of transformations which can be applied to + * {@link BitmapIndexOptions#uniqueKey unique key} values. + */ +export enum UniqueKeyTransformation { + /** + * Extracted unique key value is interpreted as an object value. + * Non-negative unique ID is assigned to every distinct object value. + */ + OBJECT = 0, + + /** + * Extracted unique key value is interpreted as a whole integer value of + * byte, short, int or long type. The extracted value is upcasted to + * long (if necessary) and unique non-negative ID is assigned to every + * distinct value. + */ + LONG = 1, + + /** + * Extracted unique key value is interpreted as a whole integer value of + * byte, short, int or long type. The extracted value is upcasted to + * long (if necessary) and the resulting value is used directly as an ID. + */ + RAW = 2, +} + +const DEFAULT_UNIQUE_KEY = QueryConstants.KEY_ATTRIBUTE_NAME; +const DEFAULT_UNIQUE_KEY_TRANSFORMATION = UniqueKeyTransformation.OBJECT; + +/** + * Configures indexing options specific to bitmap indexes. + */ +export class BitmapIndexOptions { + /** + * Unique key attribute configured in this index config. + * Defaults to {@code __key}. The unique key attribute is used as a source + * of values which uniquely identify each entry being inserted into an index. + */ + uniqueKey: string; + + /** + * Unique key transformation configured in this index. Defaults + * to {@link UniqueKeyTransformation#OBJECT OBJECT}. The transformation is + * applied to every value extracted from unique key attribute. + */ + uniqueKeyTransformation: UniqueKeyTransformation; + + constructor(uniqueKey: string = DEFAULT_UNIQUE_KEY, + uniqueKeyTransformation: UniqueKeyTransformation = DEFAULT_UNIQUE_KEY_TRANSFORMATION) { + this.uniqueKey = uniqueKey; + this.uniqueKeyTransformation = uniqueKeyTransformation; + } + + toString(): string { + return 'BitmapIndexOptions[' + + 'uniqueKey: ' + this.uniqueKey + + ', uniqueKeyTransformation: ' + this.uniqueKeyTransformation + + ']'; + } +} diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index 89fec0b25..29f471e90 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -22,7 +22,7 @@ import {SSLConfig} from './SSLConfig'; */ export class ClientNetworkConfig { /** - * Client tries to connect the members at these addresses. + * Array of candidate addresses that client will use to establish initial connection. */ addresses: string[] = []; @@ -31,24 +31,16 @@ export class ClientNetworkConfig { */ cloudConfig: ClientCloudConfig = new ClientCloudConfig(); - /** - * While client is trying to connect initially to one of the members in the {@link addresses}, - * all might be not available. Instead of giving up, throwing Exception and stopping client, it will - * attempt to retry as much as {@link connectionAttemptLimit} times. - */ - connectionAttemptLimit: number = 2; - /** - * Period for the next attempt to find a member to connect. - */ - connectionAttemptPeriod: number = 3000; /** * Timeout value in millis for nodes to accept client connection requests. */ connectionTimeout: number = 5000; + /** * true if redo operations are enabled (not implemented yet) */ redoOperation: boolean = false; + /** * If true, client will behave as smart client instead of dummy client. Smart client sends key based operations * to owner of the keys. Dummy client sends all operations to a single node. See http://docs.hazelcast.org to diff --git a/src/config/Config.ts b/src/config/Config.ts index 9e18cd54c..cff6c8b2d 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -19,8 +19,7 @@ import {ClientNetworkConfig} from './ClientNetworkConfig'; import {ConfigPatternMatcher} from './ConfigPatternMatcher'; import {EvictionPolicy} from './EvictionPolicy'; import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; -import {GroupConfig} from './GroupConfig'; -import {ImportConfig} from './ImportConfig'; +import {ImportConfig, ListenerImportConfig} from './ImportConfig'; import {InMemoryFormat} from './InMemoryFormat'; import {ListenerConfig} from './ListenerConfig'; import {NearCacheConfig} from './NearCacheConfig'; @@ -33,6 +32,13 @@ import {LogLevel} from '..'; import {ILogger} from '../logging/ILogger'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; import {StringSerializationPolicy} from './StringSerializationPolicy'; +import {ConnectionStrategyConfig, ReconnectMode} from './ConnectionStrategyConfig'; +import {LoadBalancer} from '../LoadBalancer'; +import {IndexConfig} from './IndexConfig'; +import {IndexType} from './IndexType'; +import {ConnectionRetryConfig} from './ConnectionRetryConfig'; + +const DEFAULT_CLUSTER_NAME = 'dev'; /** * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. @@ -54,22 +60,26 @@ export class ClientConfig { 'hazelcast.client.autopipelining.enabled': true, 'hazelcast.client.autopipelining.threshold.bytes': 8192, 'hazelcast.client.socket.no.delay': true, + 'hazelcast.client.shuffle.member.list': true, }; /** * Name of this client instance. */ instanceName: string; - groupConfig: GroupConfig = new GroupConfig(); networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); customLogger: ILogger; customCredentials: any = null; listeners: ListenerConfig = new ListenerConfig(); - listenerConfigs: ImportConfig[] = []; + listenerConfigs: ListenerImportConfig[] = []; serializationConfig: SerializationConfig = new SerializationConfig(); reliableTopicConfigs: { [name: string]: ReliableTopicConfig } = {}; nearCacheConfigs: { [name: string]: NearCacheConfig } = {}; flakeIdGeneratorConfigs: { [name: string]: FlakeIdGeneratorConfig } = {}; + connectionStrategyConfig: ConnectionStrategyConfig = new ConnectionStrategyConfig(); + clusterName: string = DEFAULT_CLUSTER_NAME; + labels = new Set(); + loadBalancer: LoadBalancer; private configPatternMatcher = new ConfigPatternMatcher(); @@ -132,8 +142,6 @@ export {TopicOverloadPolicy}; export {SerializationConfig}; -export {GroupConfig}; - export {ReliableTopicConfig}; export {EvictionPolicy}; @@ -151,3 +159,13 @@ export {SSLConfig}; export {JsonStringDeserializationPolicy}; export {StringSerializationPolicy}; + +export {IndexConfig}; + +export {IndexType}; + +export {ConnectionStrategyConfig}; + +export {ReconnectMode}; + +export {ConnectionRetryConfig}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index ff5ba5f19..613fcb66a 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -22,7 +22,7 @@ import {mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetS import {ClientConfig} from './Config'; import {EvictionPolicy} from './EvictionPolicy'; import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; -import {ImportConfig} from './ImportConfig'; +import {ImportConfig, ListenerImportConfig} from './ImportConfig'; import {InMemoryFormat} from './InMemoryFormat'; import {JsonConfigLocator} from './JsonConfigLocator'; import {NearCacheConfig} from './NearCacheConfig'; @@ -30,6 +30,9 @@ import {Properties} from './Properties'; import {ReliableTopicConfig} from './ReliableTopicConfig'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; import {StringSerializationPolicy} from './StringSerializationPolicy'; +import {ReconnectMode} from './ConnectionStrategyConfig'; +import {RandomLB} from '../util/RandomLB'; +import {RoundRobinLB} from '../util/RoundRobinLB'; export class ConfigBuilder { private clientConfig: ClientConfig = new ClientConfig(); @@ -62,32 +65,80 @@ export class ConfigBuilder { return this.configLocator.loadImported(path); }).map((buffer: Buffer) => { mergeJson(jsonObject, JSON.parse(buffer.toString())); - }).return(); + }).then(() => undefined); } } private handleConfig(jsonObject: any): void { for (const key in jsonObject) { - if (key === 'network') { - this.handleNetwork(jsonObject[key]); - } else if (key === 'group') { - this.handleGroup(jsonObject[key]); + const value = jsonObject[key]; + if (key === 'clusterName') { + this.clientConfig.clusterName = tryGetString(value); + } else if (key === 'instanceName') { + this.clientConfig.instanceName = tryGetString(value); } else if (key === 'properties') { - this.handleProperties(jsonObject[key]); + this.handleProperties(value); + } else if (key === 'clientLabels') { + this.handleClientLabels(value); + } else if (key === 'network') { + this.handleNetwork(value); + } else if (key === 'connectionStrategy') { + this.handleConnectionStrategy(value); } else if (key === 'listeners') { - this.handleListeners(jsonObject[key]); + this.handleListeners(value); } else if (key === 'serialization') { - this.handleSerialization(jsonObject[key]); + this.handleSerialization(value); } else if (key === 'nearCaches') { - this.handleNearCaches(jsonObject[key]); + this.handleNearCaches(value); } else if (key === 'reliableTopics') { - this.handleReliableTopics(jsonObject[key]); + this.handleReliableTopics(value); } else if (key === 'flakeIdGeneratorConfigs') { - this.handleFlakeIds(jsonObject[key]); + this.handleFlakeIds(value); + } else if (key === 'loadBalancer') { + this.handleLoadBalancer(value); } } } + private handleConnectionStrategy(jsonObject: any): void { + for (const key in jsonObject) { + const value = jsonObject[key]; + if (key === 'asyncStart') { + this.clientConfig.connectionStrategyConfig.asyncStart = tryGetBoolean(value); + } else if (key === 'reconnectMode') { + this.clientConfig.connectionStrategyConfig.reconnectMode = tryGetEnum(ReconnectMode, value); + } else if (key === 'connectionRetry') { + this.handleConnectionRetry(value); + } + } + } + + private handleConnectionRetry(jsonObject: any): void { + for (const key in jsonObject) { + const value = jsonObject[key]; + if (key === 'initialBackoffMillis') { + this.clientConfig.connectionStrategyConfig.connectionRetryConfig.initialBackoffMillis = tryGetNumber(value); + } else if (key === 'maxBackoffMillis') { + this.clientConfig.connectionStrategyConfig.connectionRetryConfig.maxBackoffMillis = tryGetNumber(value); + } else if (key === 'multiplier') { + this.clientConfig.connectionStrategyConfig.connectionRetryConfig.multiplier = tryGetNumber(value); + } else if (key === 'clusterConnectTimeoutMillis') { + this.clientConfig.connectionStrategyConfig.connectionRetryConfig + .clusterConnectTimeoutMillis = tryGetNumber(value); + } else if (key === 'jitter') { + this.clientConfig.connectionStrategyConfig.connectionRetryConfig.jitter = tryGetNumber(value); + } + } + } + + private handleClientLabels(jsonObject: any): void { + const labelsArray = tryGetArray(jsonObject); + for (const index in labelsArray) { + const label = labelsArray[index]; + this.clientConfig.labels.add(label); + } + } + private handleNetwork(jsonObject: any): void { for (const key in jsonObject) { if (key === 'clusterMembers') { @@ -96,10 +147,6 @@ export class ConfigBuilder { this.clientConfig.networkConfig.smartRouting = tryGetBoolean(jsonObject[key]); } else if (key === 'connectionTimeout') { this.clientConfig.networkConfig.connectionTimeout = tryGetNumber(jsonObject[key]); - } else if (key === 'connectionAttemptPeriod') { - this.clientConfig.networkConfig.connectionAttemptPeriod = tryGetNumber(jsonObject[key]); - } else if (key === 'connectionAttemptLimit') { - this.clientConfig.networkConfig.connectionAttemptLimit = tryGetNumber(jsonObject[key]); } else if (key === 'ssl') { this.handleSSL(jsonObject[key]); } else if (key === 'hazelcastCloud') { @@ -166,16 +213,6 @@ export class ConfigBuilder { } } - private handleGroup(jsonObject: any): void { - for (const key in jsonObject) { - if (key === 'name') { - this.clientConfig.groupConfig.name = tryGetString(jsonObject[key]); - } else if (key === 'password') { - this.clientConfig.groupConfig.password = tryGetString(jsonObject[key]); - } - } - } - private handleProperties(jsonObject: any): void { for (const key in jsonObject) { this.clientConfig.properties[key] = jsonObject[key]; @@ -185,8 +222,11 @@ export class ConfigBuilder { private handleListeners(jsonObject: any): void { const listenersArray = tryGetArray(jsonObject); for (const index in listenersArray) { - const listenerConfig = listenersArray[index]; - this.clientConfig.listenerConfigs.push(this.parseImportConfig(listenerConfig)); + const listener = listenersArray[index]; + const listenerConfig = {} as ListenerImportConfig; + listenerConfig.importConfig = this.parseImportConfig(listener); + listenerConfig.type = listener.type; + this.clientConfig.listenerConfigs.push(listenerConfig); } } @@ -299,4 +339,16 @@ export class ConfigBuilder { } } + private handleLoadBalancer(jsonObject: any): void { + for (const key in jsonObject) { + if (key === 'type') { + const loadBalancer = tryGetString(jsonObject[key]); + if (loadBalancer === 'random') { + this.clientConfig.loadBalancer = new RandomLB(); + } else if (loadBalancer === 'roundRobin') { + this.clientConfig.loadBalancer = new RoundRobinLB(); + } + } + } + } } diff --git a/src/config/ConfigPatternMatcher.ts b/src/config/ConfigPatternMatcher.ts index 092eebec5..aef3255f6 100644 --- a/src/config/ConfigPatternMatcher.ts +++ b/src/config/ConfigPatternMatcher.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -import {ConfigurationError} from '../HazelcastError'; - export class ConfigPatternMatcher { /** @@ -42,7 +40,7 @@ export class ConfigPatternMatcher { } }); if (duplicatePattern != null) { - throw new ConfigurationError('Found ambiguous configurations for item ' + itemName + ': "' + matchingPattern + + throw new TypeError('Found ambiguous configurations for item ' + itemName + ': "' + matchingPattern + '" vs "' + duplicatePattern + '". Please specify your configuration.'); } return matchingPattern; diff --git a/src/config/ConnectionRetryConfig.ts b/src/config/ConnectionRetryConfig.ts new file mode 100644 index 000000000..11480972c --- /dev/null +++ b/src/config/ConnectionRetryConfig.ts @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/** + * Connection Retry Config is controls the period among the retries and when should a client gave up + * retrying. Exponential behaviour can be chosen or jitter can be added to wait periods. + */ +export class ConnectionRetryConfig { + /** + * How long to wait after the first failure before retrying. Must be non-negative. + */ + initialBackoffMillis: number = 1000; + + /** + * When backoff reaches this upper bound, it does not increase any more. Must be non-negative. + */ + maxBackoffMillis: number = 30000; + + /** + * Timeout value in milliseconds for the client to give up to connect to the current cluster. + */ + clusterConnectTimeoutMillis: number = 20000; + + /** + * Factor with which to multiply backoff after a failed retry. Must be greater than or equal to 1. + */ + multiplier: number = 1; + + /** + * By how much to randomize backoffs. + * At each iteration calculated back-off is randomized via following method + * Random(-jitter * current_backoff, jitter * current_backoff) + * It must be in range [0.0, 1.0]. + */ + jitter: number = 0; +} diff --git a/src/config/ConnectionStrategyConfig.ts b/src/config/ConnectionStrategyConfig.ts new file mode 100644 index 000000000..97e908edb --- /dev/null +++ b/src/config/ConnectionStrategyConfig.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientOfflineError} from '../HazelcastError'; +import {ConnectionRetryConfig} from './ConnectionRetryConfig'; +import * as HazelcastClient from '../HazelcastClient'; + +/** + * Reconnect options. + */ +export enum ReconnectMode { + /** + * Prevent reconnect to cluster after a disconnect + */ + OFF = 'OFF', + + /** + * Reconnect to cluster by blocking invocations + */ + ON = 'ON', + + /** + * Reconnect to cluster without blocking invocations. Invocations will receive + * {@link ClientOfflineError} + */ + ASYNC = 'ASYNC', +} + +/** + * Connection strategy configuration is used for setting custom strategies and configuring strategy parameters. + */ +export class ConnectionStrategyConfig { + /** + * Set true for non blocking {@link HazelcastClient#newHazelcastClient}. The client creation won't wait to + * connect to cluster. The client instance will throw exception until it connects to cluster and become ready. + * If set to false, {@link HazelcastClient#newHazelcastClient} will block until a cluster connection established and it's + * ready to use client instance + */ + asyncStart: boolean = false; + + /** + * How a client reconnect to cluster after a disconnect can be configured. This parameter is used by default strategy and + * custom implementations may ignore it if configured. + */ + reconnectMode: ReconnectMode = ReconnectMode.ON; + + /** + * Connection Retry Config is controls the period among the retries and when should a client gave up + * retrying. Exponential behaviour can be chosen or jitter can be added to wait periods. + */ + connectionRetryConfig: ConnectionRetryConfig = new ConnectionRetryConfig(); +} diff --git a/src/config/ImportConfig.ts b/src/config/ImportConfig.ts index b7b47c833..d7cafcb51 100644 --- a/src/config/ImportConfig.ts +++ b/src/config/ImportConfig.ts @@ -18,3 +18,8 @@ export interface ImportConfig { path: string; exportedName: string; } + +export interface ListenerImportConfig { + importConfig: ImportConfig; + type: string; +} diff --git a/src/config/IndexConfig.ts b/src/config/IndexConfig.ts new file mode 100644 index 000000000..34f81ab4e --- /dev/null +++ b/src/config/IndexConfig.ts @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {IndexType} from './IndexType'; +import {BitmapIndexOptions} from './BitmapIndexOptions'; +import {IndexUtil} from '../util/IndexUtil'; + +/** + * Configuration of an index. Hazelcast support two types of indexes: sorted index and hash index. + * Sorted indexes could be used with equality and range predicates and have logarithmic search time. + * Hash indexes could be used with equality predicates and have constant search time assuming the hash + * function of the indexed field disperses the elements properly. + * + * Index could be created on one or more attributes. + * + * @see {@link IndexType} + */ +export class IndexConfig { + /** + * Default index type. + */ + public static readonly DEFAULT_TYPE = IndexType.SORTED; + + /** + * Name of the index. + */ + name: string; + + /** + * Type of the index. + */ + type: IndexType = IndexConfig.DEFAULT_TYPE; + + /** + * Indexed attributes. + */ + attributes: string[] = []; + + bitmapIndexOptions: BitmapIndexOptions; + + constructor(name?: string, type?: IndexType, attributes?: string[], bitmapIndexOptions?: BitmapIndexOptions) { + if (name) { + this.name = name; + } + + if (type) { + this.type = type; + } + + if (attributes) { + this.attributes = attributes; + } + if (bitmapIndexOptions) { + this.bitmapIndexOptions = bitmapIndexOptions; + } + } + + addAttribute(attribute: string): IndexConfig { + IndexUtil.validateAttribute(this, attribute); + this.attributes.push(attribute); + return this; + } + + toString(): string { + let bitmapIndexOptions: string; + if (this.bitmapIndexOptions == null) { + bitmapIndexOptions = undefined; + } else { + bitmapIndexOptions = this.bitmapIndexOptions.toString(); + } + + return 'IndexConfig[' + + 'name: ' + this.name + + ', type: ' + this.type + + ', attributes: ' + this.attributes + + ', bitmapIndexOptions: ' + bitmapIndexOptions + + ']'; + } +} diff --git a/src/config/GroupConfig.ts b/src/config/IndexType.ts similarity index 69% rename from src/config/GroupConfig.ts rename to src/config/IndexType.ts index 14c1e6615..b4cc586dd 100644 --- a/src/config/GroupConfig.ts +++ b/src/config/IndexType.ts @@ -15,16 +15,21 @@ */ /** - * Group configuration of the cluster that this client connects. - * A client will connect to only the cluster with these properties. + * Type of the index. */ -export class GroupConfig { +export enum IndexType { /** - * Cluster group name. + * Sorted index. Can be used with equality and range predicates. */ - name: string = 'dev'; + SORTED = 0, + + /** + * Hash index. Can be used with equality predicates. + */ + HASH = 1, + /** - * Cluster group password. + * Bitmap index. Can be used with equality predicates. */ - password: string = 'dev-pass'; + BITMAP = 2, } diff --git a/src/config/ListenerConfig.ts b/src/config/ListenerConfig.ts index 4d118b6f0..097e738ce 100644 --- a/src/config/ListenerConfig.ts +++ b/src/config/ListenerConfig.ts @@ -14,17 +14,29 @@ * limitations under the License. */ +import {MembershipListener} from '../core/MembershipListener'; +import {LifecycleState} from '../LifecycleService'; + /** * Configurations for LifecycleListeners. These are registered as soon as client started. */ export class ListenerConfig { - lifecycle: Function[] = []; + lifecycleListeners: Array<(state: LifecycleState) => void> = []; + membershipListeners: MembershipListener[] = []; + + addLifecycleListener(listener: (state: LifecycleState) => void): void { + this.lifecycleListeners.push(listener); + } + + addMembershipListener(listener: MembershipListener): void { + this.membershipListeners.push(listener); + } - addLifecycleListener(listener: Function): void { - this.lifecycle.push(listener); + getLifecycleListeners(): Array<(state: LifecycleState) => void> { + return this.lifecycleListeners; } - getLifecycleListeners(): Function[] { - return this.lifecycle; + getMembershipListeners(): MembershipListener[] { + return this.membershipListeners; } } diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts index 3b7f153dc..a4e8e9a65 100644 --- a/src/config/ReliableTopicConfig.ts +++ b/src/config/ReliableTopicConfig.ts @@ -18,7 +18,7 @@ import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; export class ReliableTopicConfig { name: string = 'default'; - readBatchSize: number = 25; + readBatchSize: number = 10; overloadPolicy: TopicOverloadPolicy = TopicOverloadPolicy.BLOCK; toString(): string { diff --git a/src/connection/AddressProvider.ts b/src/connection/AddressProvider.ts index 5871eb63a..0cb9bd3f1 100644 --- a/src/connection/AddressProvider.ts +++ b/src/connection/AddressProvider.ts @@ -15,9 +15,11 @@ */ import * as Promise from 'bluebird'; +import {Address} from '../Address'; /** - * Provides initial addresses for client to find and connect to a node + * Provides initial addresses for client to find and connect to a node & + * Translates given address if necessary when connecting a service */ export interface AddressProvider { @@ -26,4 +28,13 @@ export interface AddressProvider { */ loadAddresses(): Promise; + /** + * Translates the given address to another address specific to + * network or service + * + * @param address to be translated + * @return new address if given address is known, otherwise return null + */ + translate(address: Address): Promise

; + } diff --git a/src/connection/AddressTranslator.ts b/src/connection/AddressTranslator.ts deleted file mode 100644 index a58c7e9a3..000000000 --- a/src/connection/AddressTranslator.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import Address = require('../Address'); -import * as Promise from 'bluebird'; - -/** - * Address Translator is used for resolve private ip - * addresses of cloud services. - */ -export interface AddressTranslator { - - /** - * Translates the given address to another address specific to - * network or service - * - * @param address - * @return new address if given address is known, otherwise return null - */ - translate(address: Address): Promise
; - - /** - * Refreshes the internal lookup table if necessary. - */ - refresh(): Promise; -} diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts index 6f9e2be0d..4e407e81d 100644 --- a/src/connection/BasicSSLOptionsFactory.ts +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -65,7 +65,8 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { this.rejectUnauthorized = getBooleanOrUndefined(properties.rejectUnauthorized); this.ciphers = getStringOrUndefined(properties.ciphers); - return Promise.all(promises).return(); + return Promise.all(promises) + .then(() => undefined); } getSSLOptions(): any { diff --git a/src/connection/DefaultAddressProvider.ts b/src/connection/DefaultAddressProvider.ts index 26c9787d1..01e751e5f 100644 --- a/src/connection/DefaultAddressProvider.ts +++ b/src/connection/DefaultAddressProvider.ts @@ -17,6 +17,7 @@ import {AddressProvider} from './AddressProvider'; import {ClientNetworkConfig} from '../config/ClientNetworkConfig'; import * as Promise from 'bluebird'; +import {Address} from '../Address'; /** * Default address provider of Hazelcast. @@ -26,19 +27,21 @@ import * as Promise from 'bluebird'; export class DefaultAddressProvider implements AddressProvider { private networkConfig: ClientNetworkConfig; - private readonly noOtherAddressProviderExist: boolean; - constructor(networkConfig: ClientNetworkConfig, noOtherAddressProviderExist: boolean) { + constructor(networkConfig: ClientNetworkConfig) { this.networkConfig = networkConfig; - this.noOtherAddressProviderExist = noOtherAddressProviderExist; } loadAddresses(): Promise { const addresses: string[] = this.networkConfig.addresses; - if (addresses.length === 0 && this.noOtherAddressProviderExist) { - addresses.push('localhost:5701'); + if (addresses.length === 0) { + addresses.push('localhost'); } return Promise.resolve(addresses); } + + translate(address: Address): Promise
{ + return Promise.resolve(address); + } } diff --git a/src/core/Cluster.ts b/src/core/Cluster.ts new file mode 100644 index 000000000..1aa787eda --- /dev/null +++ b/src/core/Cluster.ts @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {MembershipListener} from './MembershipListener'; +import {UUID} from './UUID'; +import {Member} from './Member'; +import {MemberSelector} from './MemberSelector'; + +export interface Cluster { + /** + * Adds MembershipListener to listen for membership updates. + *

+ * The addMembershipListener method returns a register ID. This ID is needed to remove the MembershipListener using the + * {@link #removeMembershipListener} method. + *

+ * If the MembershipListener implements the {@link InitialMembershipListener} interface, it will also receive + * the {@link InitialMembershipEvent}. + *

+ * There is no check for duplicate registrations, so if you register the listener twice, it will get events twice. + * + * @param listener membership listener + * @return the registration ID + * @throws AssertionError if listener is null + * @see #removeMembershipListener + */ + addMembershipListener(listener: MembershipListener): UUID; + + /** + * Removes the specified MembershipListener. + *

+ * If the same MembershipListener is registered multiple times, it needs to be removed multiple times. + * + * This method can safely be called multiple times for the same registration ID; subsequent calls are ignored. + * + * @param registrationId the registrationId of MembershipListener to remove + * @return true if the registration is removed, false otherwise + * @throws AssertionError if the registration ID is null + * @see #addMembershipListener + */ + removeMembershipListener(registrationId: UUID): boolean; + + /** + * List of the current members in the cluster. + *

+ * Every member in the cluster returns the 'members' in the same order. + * To obtain the oldest member (the master) in the cluster, you can retrieve the first item in the list. + * + * @param memberSelector Optional {@link MemberSelector} instance to filter members to return. + * If not provided, the returned list will contain all the available cluster members. + * @return current members in the cluster + */ + getMembers(memberSelector?: MemberSelector): Member[]; +} diff --git a/src/core/ConnectionHeartbeatListener.ts b/src/core/ConnectionHeartbeatListener.ts deleted file mode 100644 index 2ef6ab7fa..000000000 --- a/src/core/ConnectionHeartbeatListener.ts +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {ClientConnection} from '../invocation/ClientConnection'; - -/** - * Listener interface for heartbeat service. - */ -export interface ConnectionHeartbeatListener { - /** - * Invoked when heartbeat of a server is restored after stopped. - * @param connection connection object associated with that server node. - */ - onHeartbeatRestored?: (connection?: ClientConnection) => void; - /** - * Invoked when heartbeat of a server node failed. - * @param connection connection object associated with that server node. - */ - onHeartbeatStopped?: (connection?: ClientConnection) => void; -} diff --git a/src/core/EventType.ts b/src/core/EventType.ts index adab57c05..7c3e64f20 100644 --- a/src/core/EventType.ts +++ b/src/core/EventType.ts @@ -20,10 +20,10 @@ export enum EventType { REMOVED = 1 << 1, UPDATED = 1 << 2, EVICTED = 1 << 3, - EVICT_ALL = 1 << 4, - CLEAR_ALL = 1 << 5, - MERGED = 1 << 6, - EXPIRED = 1 << 7, + EXPIRED = 1 << 4, + EVICT_ALL = 1 << 5, + CLEAR_ALL = 1 << 6, + MERGED = 1 << 7, INVALIDATION = 1 << 8, LOADED = 1 << 9, } diff --git a/src/core/InitialMembershipEvent.ts b/src/core/InitialMembershipEvent.ts new file mode 100644 index 000000000..565fc80d7 --- /dev/null +++ b/src/core/InitialMembershipEvent.ts @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {MembershipEvent} from './MembershipEvent'; +import {InitialMembershipListener} from './InitialMembershipListener'; +import {Member} from './Member'; + +/** + * An event that is sent when a {@link InitialMembershipListener} registers itself on a cluster. For more + * information, see the {@link InitialMembershipListener}. + * + * @see MembershipListener + * @see MembershipEvent + */ +export class InitialMembershipEvent { + members: Member[]; + + constructor(members: Member[]) { + this.members = members; + } +} diff --git a/src/core/InitialMembershipListener.ts b/src/core/InitialMembershipListener.ts new file mode 100644 index 000000000..51a608f11 --- /dev/null +++ b/src/core/InitialMembershipListener.ts @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {MembershipListener} from './MembershipListener'; +import {InitialMembershipEvent} from './InitialMembershipEvent'; + +/** + * The InitialMembershipListener is a {@link MembershipListener} that first receives a + * {@link InitialMembershipEvent} when it is registered so it immediately knows which members are available. After + * that event has been received, it will receive the normal MembershipEvents. + * + * When the InitialMembershipListener already is registered on a cluster and is registered again on the same + * Cluster instance, it will not receive an additional MembershipInitializeEvent. This is a once only event. + */ +export interface InitialMembershipListener extends MembershipListener { + /** + * Called when this listener is registered. + * + * @param event the MembershipInitializeEvent received when the listener is registered + */ + init(event: InitialMembershipEvent): void; +} diff --git a/src/core/Member.ts b/src/core/Member.ts index fa60cd6b5..e98d96ed0 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -14,7 +14,9 @@ * limitations under the License. */ -import Address = require('../Address'); +import {Address} from '../Address'; +import {UUID} from './UUID'; +import {MemberVersion} from './MemberVersion'; export class Member { /** @@ -24,34 +26,52 @@ export class Member { /** * Unique id of member in cluster. */ - uuid: string; + uuid: UUID; /** * true if member is a lite member. */ - isLiteMember: boolean; - attributes: { [id: string]: string }; + liteMember: boolean; + attributes: Map; + version: MemberVersion; - constructor(address: Address, uuid: string, isLiteMember = false, attributes: { [id: string]: string } = {}) { + constructor(address: Address, uuid: UUID, attributes: Map, liteMember: boolean, version: MemberVersion) { this.address = address; this.uuid = uuid; - this.isLiteMember = isLiteMember; this.attributes = attributes; + this.liteMember = liteMember; + this.version = version; } equals(other: Member): boolean { - if (other === this) { - return true; - } if (other == null) { return false; } - if (other.address.equals(this.address) && other.uuid === this.uuid && other.isLiteMember === this.isLiteMember) { - return true; + + if (!this.address.equals(other.address)) { + return false; } - return false; + + return this.uuid != null ? this.uuid.equals(other.uuid) : other.uuid === null; } toString(): string { - return 'Member[ uuid: ' + this.uuid.toString() + ', address: ' + this.address.toString() + ']'; + let memberStr = 'Member [' + + this.address.host + + ']:' + + this.address.port + + ' - ' + + this.uuid.toString(); + if (this.liteMember) { + memberStr += ' lite'; + } + return memberStr; + } + + id(): string { + let hashCode = this.address.toString(); + if (this.uuid) { + hashCode += this.uuid.toString(); + } + return hashCode; } } diff --git a/src/core/MemberAttributeEvent.ts b/src/core/MemberAttributeEvent.ts deleted file mode 100644 index b028bcc58..000000000 --- a/src/core/MemberAttributeEvent.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {Member} from './Member'; - -/** - * Event for member attribute changes. - */ -export class MemberAttributeEvent { - /** - * the member for this MemberAttributeEvent. - */ - member: Member; - - /** - * the key for this MemberAttributeEvent. - */ - key: string; - - /** - * the type of member attribute change for this MemberAttributeEvent. - */ - operationType: MemberAttributeOperationType; - - /** - * the value for this MemberAttributeEvent. - */ - value: string; - - constructor(member: Member, key: string, operationType: MemberAttributeOperationType, value: string) { - this.member = member; - this.key = key; - this.operationType = operationType; - this.value = value; - } -} - -/** - * Used to identify the type of member attribute change, either PUT or REMOVED. - * - */ -export enum MemberAttributeOperationType { - /** - * Indicates an attribute being put. - */ - PUT = 1, - - /** - * Indicates an attribute being removed. - */ - REMOVE = 2, -} diff --git a/src/core/MemberInfo.ts b/src/core/MemberInfo.ts new file mode 100644 index 000000000..f01dd89e2 --- /dev/null +++ b/src/core/MemberInfo.ts @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Address} from '../Address'; +import {UUID} from './UUID'; +import {MemberVersion} from './MemberVersion'; + +export class MemberInfo { + /** + * Network address of member. + */ + address: Address; + /** + * Unique id of member in cluster. + */ + uuid: UUID; + /** + * true if member is a lite member. + */ + liteMember: boolean; + attributes: Map; + version: MemberVersion; + + constructor(address: Address, uuid: UUID, attributes: Map, liteMember: boolean, version: MemberVersion) { + this.address = address; + this.uuid = uuid; + this.attributes = attributes; + this.liteMember = liteMember; + this.version = version; + } + + equals(other: MemberInfo): boolean { + if (other == null) { + return false; + } + + if (!this.address.equals(other.address)) { + return false; + } + + return this.uuid != null ? this.uuid.equals(other.uuid) : other.uuid === null; + } + + toString(): string { + return 'Member[uuid: ' + this.uuid.toString() + + ', address: ' + this.address.toString() + + ', liteMember: ' + this.liteMember + + ', memberListJoinVersion' + this.version + ']'; + } +} diff --git a/src/core/MemberSelectors.ts b/src/core/MemberSelectors.ts index a6c1be55a..ada4a9cbb 100644 --- a/src/core/MemberSelectors.ts +++ b/src/core/MemberSelectors.ts @@ -19,7 +19,7 @@ import {MemberSelector} from './MemberSelector'; export class DataMemberSelector implements MemberSelector { select(member: Member): boolean { - return !member.isLiteMember; + return !member.liteMember; } } diff --git a/src/codec/TopicMessageType.ts b/src/core/MemberVersion.ts similarity index 72% rename from src/codec/TopicMessageType.ts rename to src/core/MemberVersion.ts index d815fd38e..6a76bd3a8 100644 --- a/src/codec/TopicMessageType.ts +++ b/src/core/MemberVersion.ts @@ -14,9 +14,14 @@ * limitations under the License. */ -/* tslint:disable */ -export class TopicMessageType { - static TOPIC_PUBLISH = 0x0401; - static TOPIC_ADDMESSAGELISTENER = 0x0402; - static TOPIC_REMOVEMESSAGELISTENER = 0x0403; +export class MemberVersion { + major: number; + minor: number; + patch: number; + + constructor(major: number, minor: number, patch: number) { + this.major = major; + this.minor = minor; + this.patch = patch; + } } diff --git a/src/core/MembershipEvent.ts b/src/core/MembershipEvent.ts index 70c051b8f..a10466fc9 100644 --- a/src/core/MembershipEvent.ts +++ b/src/core/MembershipEvent.ts @@ -24,17 +24,17 @@ export class MembershipEvent { /** * the removed or added member. */ - private member: Member; + member: Member; /** * the membership event type. */ - private eventType: number; + eventType: number; /** * the members at the moment after this event. */ - private members: Member[]; + members: Member[]; constructor(member: Member, eventType: number, members: Member[]) { this.member = member; diff --git a/src/core/MembershipListener.ts b/src/core/MembershipListener.ts index ba3dc9a04..2cd7ef3be 100644 --- a/src/core/MembershipListener.ts +++ b/src/core/MembershipListener.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {MemberAttributeEvent} from './MemberAttributeEvent'; import {MembershipEvent} from './MembershipEvent'; /** @@ -32,10 +31,4 @@ export interface MembershipListener { * @param {MembershipEvent} membership event when an existing member leaves the cluster */ memberRemoved(membership: MembershipEvent): void; - - /** - * Invoked when an attribute of a member was changed. - * @param {MemberAttributeEvent} member attribute event when an attribute of a member was changed - */ - memberAttributeChanged(memberAttributeEvent: MemberAttributeEvent): void; } diff --git a/src/core/Predicate.ts b/src/core/Predicate.ts index c6ea673fb..d10848269 100644 --- a/src/core/Predicate.ts +++ b/src/core/Predicate.ts @@ -119,3 +119,15 @@ export enum IterationType { VALUE, ENTRY, } + +export enum QueryConstants { + /** + * Attribute name of the key. + */ + KEY_ATTRIBUTE_NAME = '__key', + + /** + * Attribute name of the "this". + */ + THIS_ATTRIBUTE_NAME = 'this', +} diff --git a/src/core/RestValue.ts b/src/core/RestValue.ts index 8d6053972..1a84d7b3c 100644 --- a/src/core/RestValue.ts +++ b/src/core/RestValue.ts @@ -17,7 +17,7 @@ import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../serialization/Serializable'; import {DataInput, DataOutput} from '../serialization/Data'; -export const REST_VALUE_FACTORY_ID = -37; +export const REST_VALUE_FACTORY_ID = -25; export const REST_VALUE_CLASS_ID = 1; export class RestValue implements IdentifiedDataSerializable { diff --git a/src/core/SimpleEntryView.ts b/src/core/SimpleEntryView.ts new file mode 100644 index 000000000..dd5b70438 --- /dev/null +++ b/src/core/SimpleEntryView.ts @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Long from 'long'; + +export class SimpleEntryView { + key: K; + value: V; + cost: Long; + creationTime: Long; + expirationTime: Long; + hits: Long; + lastAccessTime: Long; + lastStoredTime: Long; + lastUpdateTime: Long; + version: Long; + ttl: Long; + maxIdle: Long; + + constructor(key: K, value: V, cost: Long, creationTime: Long, expirationTime: Long, hits: Long, lastAccessTime: Long, + lastStoredTime: Long, lastUpdateTime: Long, version: Long, ttl: Long, + maxIdle: Long) { + this.key = key; + this.value = value; + this.cost = cost; + this.creationTime = creationTime; + this.expirationTime = expirationTime; + this.hits = hits; + this.lastAccessTime = lastAccessTime; + this.lastStoredTime = lastStoredTime; + this.lastUpdateTime = lastUpdateTime; + this.version = version; + this.ttl = ttl; + this.maxIdle = maxIdle; + } +} diff --git a/src/core/UUID.ts b/src/core/UUID.ts index b0688dc06..bd8e10137 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -15,10 +15,12 @@ */ import * as Long from 'long'; +import {pad} from '../Util'; export class UUID { readonly leastSignificant: Long; readonly mostSignificant: Long; + private cachedString: string; constructor(mostSig: Long, leastSig: Long) { this.mostSignificant = mostSig; @@ -34,6 +36,9 @@ export class UUID { /* tslint:disable:no-bitwise */ toString(): string { + if (this.cachedString) { + return this.cachedString; + } const mostHigh = this.mostSignificant.getHighBitsUnsigned(); // (32) 32 32 32 const mostLow = this.mostSignificant.getLowBitsUnsigned(); // 32 (32) 32 32 const leastHigh = this.leastSignificant.getHighBitsUnsigned(); // 32 32 (32) 32 @@ -43,7 +48,12 @@ export class UUID { const div2 = (mostLow >>> 16).toString(16); const div3 = (mostLow & ((1 << 16) - 1)).toString(16); const div4 = (leastHigh >>> 16).toString(16); - const div5 = (leastHigh & ((1 << 16) - 1)).toString(16) + leastLow.toString(16); - return div1 + '-' + div2 + '-' + div3 + '-' + div4 + '-' + div5; + const div5 = (leastHigh & ((1 << 16) - 1)).toString(16) + pad(leastLow.toString(16), 8, '0'); + this.cachedString = pad(div1, 8, '0') + '-' + + pad(div2, 4, '0') + '-' + + pad(div3, 4, '0') + '-' + + pad(div4, 4, '0') + '-' + + pad(div5, 12, '0'); + return this.cachedString; } } diff --git a/src/discovery/HazelcastCloudAddressProvider.ts b/src/discovery/HazelcastCloudAddressProvider.ts index 7cc42dba5..5f13b82ca 100644 --- a/src/discovery/HazelcastCloudAddressProvider.ts +++ b/src/discovery/HazelcastCloudAddressProvider.ts @@ -18,10 +18,12 @@ import {HazelcastCloudDiscovery} from './HazelcastCloudDiscovery'; import {AddressProvider} from '../connection/AddressProvider'; import * as Promise from 'bluebird'; import {ILogger} from '../logging/ILogger'; +import {Address} from '../Address'; export class HazelcastCloudAddressProvider implements AddressProvider { private readonly logger: ILogger; private readonly cloudDiscovery: HazelcastCloudDiscovery; + private privateToPublic: Map = new Map(); constructor(endpointUrl: string, connectionTimeoutMillis: number, logger: ILogger) { this.cloudDiscovery = new HazelcastCloudDiscovery(endpointUrl, connectionTimeoutMillis); @@ -37,4 +39,32 @@ export class HazelcastCloudAddressProvider implements AddressProvider { return []; }); } + + translate(address: Address): Promise

{ + if (address == null) { + return Promise.resolve(null); + } + let publicAddress = this.privateToPublic.get(address.toString()); + if (publicAddress != null) { + return Promise.resolve(publicAddress); + } + + return this.refresh().then(() => { + publicAddress = this.privateToPublic.get(address.toString()); + if (publicAddress != null) { + return publicAddress; + } else { + return null; + } + }); + } + + refresh(): Promise { + return this.cloudDiscovery.discoverNodes().then((res) => { + this.privateToPublic = res; + }).catch((e) => { + this.logger.warn('HazelcastCloudAddressTranslator', + 'Failed to load addresses from hazelcast.cloud : ' + e.message); + }); + } } diff --git a/src/discovery/HazelcastCloudAddressTranslator.ts b/src/discovery/HazelcastCloudAddressTranslator.ts deleted file mode 100644 index 3d72dd05b..000000000 --- a/src/discovery/HazelcastCloudAddressTranslator.ts +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {HazelcastCloudDiscovery} from './HazelcastCloudDiscovery'; -import {AddressTranslator} from '../connection/AddressTranslator'; -import * as Promise from 'bluebird'; -import Address = require('../Address'); -import {ILogger} from '../logging/ILogger'; - -export class HazelcastCloudAddressTranslator implements AddressTranslator { - private logger: ILogger; - private readonly hazelcastCloudDiscovery: HazelcastCloudDiscovery; - - private privateToPublic: Map = new Map(); - - constructor(endpointUrl: string, connectionTimeoutMillis: number, logger: ILogger) { - this.hazelcastCloudDiscovery = new HazelcastCloudDiscovery(endpointUrl, connectionTimeoutMillis); - this.logger = logger; - } - - translate(address: Address): Promise
{ - if (address == null) { - return Promise.resolve(null); - } - const publicAddress = this.privateToPublic.get(address.toString()); - if (publicAddress != null) { - return Promise.resolve(publicAddress); - } - - return this.refresh().then(() => { - if (this.privateToPublic.get(address.toString())) { - return this.privateToPublic.get(address.toString()); - } else { - return null; - } - }); - } - - refresh(): Promise { - return this.hazelcastCloudDiscovery.discoverNodes().then((res) => { - this.privateToPublic = res; - }).catch((e) => { - this.logger.warn('HazelcastCloudAddressTranslator', - 'Failed to load addresses from hazelcast.cloud : ' + e.message); - }); - } -} diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index 507838dcb..46586a89a 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import Address = require('../Address'); import {AddressHelper, DeferredPromise} from '../Util'; import {get} from 'https'; import {IncomingMessage} from 'http'; import * as Promise from 'bluebird'; import {Properties} from '../config/Properties'; import * as URL from 'url'; +import {Address} from '../Address'; /** * Discovery service that discover nodes via hazelcast.cloud diff --git a/src/index.ts b/src/index.ts index 293212a57..e10247fe7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import Address = require('./Address'); +import {Address} from './Address'; import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); import * as Aggregators from './aggregation/Aggregators'; import {ClientInfo} from './ClientInfo'; @@ -29,7 +29,6 @@ import {IMap} from './proxy/IMap'; import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; import {ClassDefinitionBuilder} from './serialization/portable/ClassDefinitionBuilder'; import {ClassDefinition, FieldDefinition} from './serialization/portable/ClassDefinition'; -import {MemberAttributeEvent, MemberAttributeOperationType} from './core/MemberAttributeEvent'; import {EvictionPolicy} from './config/EvictionPolicy'; import {InMemoryFormat} from './config/InMemoryFormat'; import {ItemEvent, ItemEventType} from './core/ItemListener'; @@ -39,6 +38,10 @@ import {LogLevel} from './logging/LoggingService'; import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializationPolicy'; import {HazelcastJsonValue} from './core/HazelcastJsonValue'; import {StringSerializationPolicy} from './config/StringSerializationPolicy'; +import {RoundRobinLB} from './util/RoundRobinLB'; +import {RandomLB} from './util/RandomLB'; +import { LoadBalancer } from './LoadBalancer'; +import { AbstractLoadBalancer } from './util/AbstractLoadBalancer'; export { HazelcastClient as Client, @@ -57,8 +60,6 @@ export { FieldDefinition, ClassDefinition, ClassDefinitionBuilder, - MemberAttributeEvent, - MemberAttributeOperationType, EvictionPolicy, InMemoryFormat, ItemEvent, @@ -69,4 +70,8 @@ export { JsonStringDeserializationPolicy, HazelcastJsonValue, StringSerializationPolicy, + LoadBalancer, + AbstractLoadBalancer, + RoundRobinLB, + RandomLB, }; diff --git a/src/invocation/ClientConnectionManager.ts b/src/invocation/ClientConnectionManager.ts deleted file mode 100644 index 803933a42..000000000 --- a/src/invocation/ClientConnectionManager.ts +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {Buffer} from 'safe-buffer'; -import * as Promise from 'bluebird'; -import {EventEmitter} from 'events'; -import HazelcastClient from '../HazelcastClient'; -import {ClientNotActiveError, HazelcastError, IllegalStateError} from '../HazelcastError'; -import {ClientConnection} from './ClientConnection'; -import {ConnectionAuthenticator} from './ConnectionAuthenticator'; -import * as net from 'net'; -import * as tls from 'tls'; -import {DeferredPromise, loadNameFromPath} from '../Util'; -import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; -import {AddressTranslator} from '../connection/AddressTranslator'; -import {AddressProvider} from '../connection/AddressProvider'; -import {ILogger} from '../logging/ILogger'; -import Address = require('../Address'); -import {SSLOptionsFactory} from '../connection/SSLOptionsFactory'; - -const EMIT_CONNECTION_CLOSED = 'connectionClosed'; -const EMIT_CONNECTION_OPENED = 'connectionOpened'; - -/** - * Maintains connections between the client and members of the cluster. - */ -export class ClientConnectionManager extends EventEmitter { - establishedConnections: { [address: string]: ClientConnection } = {}; - readonly addressProviders: AddressProvider[]; - private readonly client: HazelcastClient; - private pendingConnections: { [address: string]: Promise.Resolver } = {}; - private logger: ILogger; - private readonly addressTranslator: AddressTranslator; - - constructor(client: HazelcastClient, addressTranslator: AddressTranslator, addressProviders: AddressProvider[]) { - super(); - this.client = client; - this.logger = this.client.getLoggingService().getLogger(); - this.addressTranslator = addressTranslator; - this.addressProviders = addressProviders; - } - - getActiveConnections(): { [address: string]: ClientConnection } { - return this.establishedConnections; - } - - /** - * Returns the {@link ClientConnection} with given {@link Address}. If there is no such connection established, - * it first connects to the address and then return the {@link ClientConnection}. - * @param address - * @param asOwner Sets the connected node as owner of this client if true. - * @returns {Promise|Promise} - */ - getOrConnect(address: Address, asOwner: boolean = false): Promise { - const addressIndex = address.toString(); - - const establishedConnection = this.establishedConnections[addressIndex]; - if (establishedConnection) { - return Promise.resolve(establishedConnection); - } - - const pendingConnection = this.pendingConnections[addressIndex]; - if (pendingConnection) { - return pendingConnection.promise; - } - - const connectionResolver: Promise.Resolver = DeferredPromise(); - this.pendingConnections[addressIndex] = connectionResolver; - - const processResponseCallback = (data: Buffer) => { - this.client.getInvocationService().processResponse(data); - }; - - this.addressTranslator.translate(address).then((addr) => { - if (addr == null) { - throw new RangeError('Address Translator could not translate address ' + addr.toString()); - } - - this.triggerConnect(addr, asOwner).then((socket: net.Socket) => { - const clientConnection = new ClientConnection(this.client, addr, socket); - - return this.initiateCommunication(clientConnection).then(() => { - return clientConnection.registerResponseCallback(processResponseCallback); - }).then(() => { - return this.authenticate(clientConnection, asOwner); - }).then(() => { - this.establishedConnections[clientConnection.getAddress().toString()] = clientConnection; - this.onConnectionOpened(clientConnection); - connectionResolver.resolve(clientConnection); - }); - }).catch((e: any) => { - connectionResolver.reject(e); - }).finally(() => { - delete this.pendingConnections[addressIndex]; - }); - }); - - const connectionTimeout = this.client.getConfig().networkConfig.connectionTimeout; - if (connectionTimeout !== 0) { - return connectionResolver.promise.timeout(connectionTimeout, new HazelcastError( - 'Connection timed-out')).finally(() => { - delete this.pendingConnections[addressIndex]; - }); - } - return connectionResolver.promise; - } - - /** - * Destroys the connection with given node address. - * @param address - */ - destroyConnection(address: Address): void { - const addressStr = address.toString(); - if (this.pendingConnections.hasOwnProperty(addressStr)) { - this.pendingConnections[addressStr].reject(null); - } - if (this.establishedConnections.hasOwnProperty(addressStr)) { - const conn = this.establishedConnections[addressStr]; - delete this.establishedConnections[addressStr]; - conn.close(); - this.onConnectionClosed(conn); - } - } - - shutdown(): void { - for (const pending in this.pendingConnections) { - this.pendingConnections[pending].reject(new ClientNotActiveError('Client is shutting down!')); - } - for (const conn in this.establishedConnections) { - this.establishedConnections[conn].close(); - } - } - - private triggerConnect(address: Address, asOwner: boolean): Promise { - if (!asOwner) { - if (this.client.getClusterService().getOwnerConnection() == null) { - const error = new IllegalStateError('Owner connection is not available!'); - return Promise.reject(error); - } - } - - if (this.client.getConfig().networkConfig.sslConfig.enabled) { - if (this.client.getConfig().networkConfig.sslConfig.sslOptions) { - const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions; - return this.connectTLSSocket(address, opts); - } else if (this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig) { - const factoryConfig = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig; - const factoryProperties = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryProperties; - let factory: SSLOptionsFactory; - if (factoryConfig.path) { - factory = new (loadNameFromPath(factoryConfig.path, factoryConfig.exportedName))(); - } else { - factory = new BasicSSLOptionsFactory(); - } - return factory.init(factoryProperties).then(() => { - return this.connectTLSSocket(address, factory.getSSLOptions()); - }); - } else { - // the default behavior when ssl is enabled - const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions = { - checkServerIdentity: (): any => null, - rejectUnauthorized: true, - }; - return this.connectTLSSocket(address, opts); - } - } else { - return this.connectNetSocket(address); - } - } - - private connectTLSSocket(address: Address, configOpts: any): Promise { - const connectionResolver = DeferredPromise(); - const socket = tls.connect(address.port, address.host, configOpts); - socket.once('secureConnect', () => { - connectionResolver.resolve(socket); - }); - socket.on('error', (e: any) => { - this.logger.warn('ClientConnectionManager', 'Could not connect to address ' + address.toString(), e); - connectionResolver.reject(e); - if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { - this.destroyConnection(address); - } - }); - return connectionResolver.promise; - } - - private connectNetSocket(address: Address): Promise { - const connectionResolver = DeferredPromise(); - const socket = net.connect(address.port, address.host); - socket.once('connect', () => { - connectionResolver.resolve(socket); - }); - socket.on('error', (e: any) => { - this.logger.warn('ClientConnectionManager', 'Could not connect to address ' + address.toString(), e); - connectionResolver.reject(e); - if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { - this.destroyConnection(address); - } - }); - return connectionResolver.promise; - } - - private initiateCommunication(connection: ClientConnection): Promise { - // Send the protocol version - const buffer = Buffer.from('CB2'); - return connection.write(buffer); - } - - private onConnectionClosed(connection: ClientConnection): void { - this.emit(EMIT_CONNECTION_CLOSED, connection); - } - - private onConnectionOpened(connection: ClientConnection): void { - this.emit(EMIT_CONNECTION_OPENED, connection); - } - - private authenticate(connection: ClientConnection, ownerConnection: boolean): Promise { - const authenticator = new ConnectionAuthenticator(connection, this.client); - return authenticator.authenticate(ownerConnection); - } -} diff --git a/src/invocation/ClientEventRegistration.ts b/src/invocation/ClientEventRegistration.ts index 2315a1149..0417840d4 100644 --- a/src/invocation/ClientEventRegistration.ts +++ b/src/invocation/ClientEventRegistration.ts @@ -15,15 +15,16 @@ */ import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {ClientConnection} from './ClientConnection'; +import {ClientConnection} from '../network/ClientConnection'; +import {UUID} from '../core/UUID'; export class ClientEventRegistration { - readonly serverRegistrationId: string; + readonly serverRegistrationId: UUID; readonly correlationId: number; readonly subscriber: ClientConnection; readonly codec: ListenerMessageCodec; - constructor(serverRegistrationId: string, correlationId: number, subscriber: ClientConnection, codec: ListenerMessageCodec) { + constructor(serverRegistrationId: UUID, correlationId: number, subscriber: ClientConnection, codec: ListenerMessageCodec) { this.serverRegistrationId = serverRegistrationId; this.correlationId = correlationId; this.subscriber = subscriber; @@ -31,6 +32,6 @@ export class ClientEventRegistration { } toString(): string { - return this.serverRegistrationId; + return this.serverRegistrationId.toString(); } } diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 6057d60c5..a5f877df6 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -14,317 +14,288 @@ * limitations under the License. */ -import {ClientConnection} from './ClientConnection'; +import {ClientConnection} from '../network/ClientConnection'; import * as Promise from 'bluebird'; -import {ClientAddMembershipListenerCodec} from '../codec/ClientAddMembershipListenerCodec'; import {Member} from '../core/Member'; -import {LoggingService} from '../logging/LoggingService'; import {ClientInfo} from '../ClientInfo'; import HazelcastClient from '../HazelcastClient'; -import {IllegalStateError} from '../HazelcastError'; -import * as assert from 'assert'; +import {IllegalStateError, TargetDisconnectedError} from '../HazelcastError'; import {MemberSelector} from '../core/MemberSelector'; -import {AddressHelper, DeferredPromise} from '../Util'; -import {MemberAttributeEvent, MemberAttributeOperationType} from '../core/MemberAttributeEvent'; +import {assertNotNull, DeferredPromise} from '../Util'; import {MembershipListener} from '../core/MembershipListener'; import {MembershipEvent} from '../core/MembershipEvent'; import {UuidUtil} from '../util/UuidUtil'; import {ILogger} from '../logging/ILogger'; -import Address = require('../Address'); -import ClientMessage = require('../ClientMessage'); +import {UUID} from '../core/UUID'; +import {ClientConnectionManager} from '../network/ClientConnectionManager'; +import {InitialMembershipListener} from '../core/InitialMembershipListener'; +import {InitialMembershipEvent} from '../core/InitialMembershipEvent'; +import {MemberInfo} from '../core/MemberInfo'; +import {Cluster} from '../core/Cluster'; export enum MemberEvent { ADDED = 1, REMOVED = 2, } -/** - * Manages the relationship of this client with the cluster. - */ -export class ClusterService { +class MemberListSnapshot { + version: number; + readonly members: Map; + readonly memberList: Member[]; - /** - * The unique identifier of the owner server node. This node is responsible for resource cleanup - */ - public ownerUuid: string = null; + constructor(version: number, members: Map, memberList: Member[]) { + this.version = version; + this.members = members; + this.memberList = memberList; + } +} - /** - * The unique identifier of this client instance. Assigned by owner node on authentication - */ - public uuid: string = null; +const EMPTY_SNAPSHOT = new MemberListSnapshot(-1, new Map(), []); +const INITIAL_MEMBERS_TIMEOUT_IN_MILLIS = 120 * 1000; // 120 seconds - private knownAddresses: Address[] = []; - private members: Member[] = []; +/** + * Manages the relationship of this client with the cluster. + */ +export class ClusterService implements Cluster { private client: HazelcastClient; - private ownerConnection: ClientConnection; - private membershipListeners: Map = new Map(); + private memberListSnapshot: MemberListSnapshot = EMPTY_SNAPSHOT; + private listeners: Map = new Map(); private logger: ILogger; + private initialListFetched = DeferredPromise(); + private connectionManager: ClientConnectionManager; + private readonly labels: Set; constructor(client: HazelcastClient) { this.client = client; - this.logger = this.client.getLoggingService().getLogger(); - this.members = []; - } - - /** - * Starts cluster service. - * @returns - */ - start(): Promise { - this.initHeartbeatListener(); - this.initConnectionListener(); - return this.connectToCluster(); + this.labels = new Set(client.getConfig().labels); + this.logger = client.getLoggingService().getLogger(); + this.connectionManager = client.getConnectionManager(); } /** - * Connects to cluster. It uses the addresses provided in the configuration. - * @returns + * Gets the member with the given UUID. + * + * @param uuid The UUID of the member. + * @return The member that was found, or undefined if not found. */ - connectToCluster(): Promise { - return this.getPossibleMemberAddresses().then((res) => { - this.knownAddresses = []; - res.forEach((value) => { - this.knownAddresses = this.knownAddresses.concat(AddressHelper.getSocketAddresses(value)); - }); - - const attemptLimit = this.client.getConfig().networkConfig.connectionAttemptLimit; - const attemptPeriod = this.client.getConfig().networkConfig.connectionAttemptPeriod; - return this.tryConnectingToAddresses(0, attemptLimit, attemptPeriod); - }); - } - - getPossibleMemberAddresses(): Promise { - const addresses: Set = new Set(); - - this.getMembers().forEach(function (member): void { - addresses.add(member.address.toString()); - }); - - let providerAddresses: Set = new Set(); - const promises: Array> = []; - this.client.getConnectionManager().addressProviders.forEach((addressProvider) => { - promises.push(addressProvider.loadAddresses().then((res) => { - providerAddresses = new Set([...Array.from(providerAddresses), ...res]); - }).catch((err) => { - this.logger.warn('Error from AddressProvider: ' + addressProvider, err); - })); - }); - return Promise.all(promises).then(() => { - return Array.from(new Set([...Array.from(addresses), ...Array.from(providerAddresses)])); - }); + public getMember(uuid: UUID): Member { + assertNotNull(uuid); + return this.memberListSnapshot.members.get(uuid.toString()); } /** - * Returns the list of members in the cluster. - * @returns + * Returns a collection of the members that satisfy the given {@link MemberSelector}. + * + * @param selector {@link MemberSelector} instance to filter members to return + * @return members that satisfy the given {@link MemberSelector}. */ - getMembers(selector?: MemberSelector): Member[] { - if (selector === undefined) { - return this.members; - } else { - const members: Member[] = []; - this.members.forEach(function (member): void { - if (selector.select(member)) { - members.push(member); - } - }); + public getMembers(selector?: MemberSelector): Member[] { + const members = this.getMemberList(); + if (selector == null) { return members; } - } - getMember(uuid: string): Member { - for (const member of this.members) { - if (member.uuid === uuid) { - return member; + const selectedMembers: Member[] = []; + members.forEach((member) => { + if (selector.select(member)) { + selectedMembers.push(member); } - } - return null; + }); + return selectedMembers; } /** - * Returns the number of nodes in cluster. - * @returns {number} + * Gets the current number of members. + * + * @return The current number of members. */ - getSize(): number { - return this.members.length; + public getSize(): number { + return this.memberListSnapshot.members.size; } /** - * Returns information about this client. - * @returns {ClientInfo} + * @return The {@link ClientInfo} instance representing the local client. */ - getClientInfo(): ClientInfo { + public getLocalClient(): ClientInfo { + const connectionManager = this.client.getConnectionManager(); + const connection: ClientConnection = connectionManager.getRandomConnection(); + const localAddress = connection != null ? connection.getLocalAddress() : null; const info = new ClientInfo(); - info.uuid = this.uuid; - info.localAddress = this.getOwnerConnection().getLocalAddress(); + info.uuid = connectionManager.getClientUuid(); + info.localAddress = localAddress; + info.labels = this.labels; + info.name = this.client.getName(); return info; } /** - * Returns the connection associated with owner node of this client. - * @returns {ClientConnection} - */ - getOwnerConnection(): ClientConnection { - return this.ownerConnection; - } - - /** - * Adds MembershipListener to listen for membership updates. There is no check for duplicate registrations, - * so if you register the listener twice, it will get events twice. - * @param {MembershipListener} The listener to be registered + * @param listener The listener to be registered. * @return The registration ID */ - addMembershipListener(membershipListener: MembershipListener): string { - const registrationId = UuidUtil.generate().toString(); - this.membershipListeners.set(registrationId, membershipListener); + public addMembershipListener(listener: MembershipListener): UUID { + assertNotNull(listener); + + const registrationId = UuidUtil.generate(); + this.listeners.set(registrationId.toString(), listener); + + if (this.isInitialMembershipListener(listener)) { + const members = this.getMemberList(); + // if members are empty,it means initial event did not arrive yet + // it will be redirected to listeners when it arrives see #handleInitialMembershipEvent + if (members.length !== 0) { + const event = new InitialMembershipEvent(members); + listener.init(event); + } + } return registrationId; } /** - * Removes registered MembershipListener. - * @param {string} The registration ID - * @return {boolean} true if successfully removed, false otherwise + * @param registrationId The registrationId of the listener to be removed. + * @return true if successfully removed, false otherwise. */ - removeMembershipListener(registrationId: string): boolean { - if (registrationId === null) { - throw new RangeError('registrationId cannot be null'); + public removeMembershipListener(registrationId: UUID): boolean { + assertNotNull(registrationId); + return this.listeners.delete(registrationId.toString()); + } + + public start(configuredListeners: MembershipListener[]): void { + for (const listener of configuredListeners) { + this.addMembershipListener(listener); } - return this.membershipListeners.delete(registrationId); } - initMembershipListener(): Promise { - const request = ClientAddMembershipListenerCodec.encodeRequest(false); - - const handler = (m: ClientMessage) => { - const handleMember = this.handleMember.bind(this); - const handleMemberList = this.handleMemberList.bind(this); - const handleAttributeChange = this.handleMemberAttributeChange.bind(this); - ClientAddMembershipListenerCodec.handle(m, handleMember, handleMemberList, handleAttributeChange, null); - }; - return this.client.getInvocationService().invokeOnConnection(this.getOwnerConnection(), request, handler) - .then((resp: ClientMessage) => { - this.logger.trace('ClusterService', 'Registered listener with id ' - + ClientAddMembershipListenerCodec.decodeResponse(resp).response); + public waitInitialMemberListFetched(): Promise { + return this.initialListFetched.promise + .timeout(INITIAL_MEMBERS_TIMEOUT_IN_MILLIS) + .catch((error) => { + return Promise.reject(new IllegalStateError('Could not get initial member list from the cluster!', error)); }); } - private initHeartbeatListener(): void { - this.client.getHeartbeat().addListener({ - onHeartbeatStopped: this.onHeartbeatStopped.bind(this), - }); + public clearMemberListVersion(): void { + this.logger.trace('ClusterService', 'Resetting the member list version'); + if (this.memberListSnapshot !== EMPTY_SNAPSHOT) { + this.memberListSnapshot.version = 0; + } } - private initConnectionListener(): void { - this.client.getConnectionManager().on('connectionClosed', this.onConnectionClosed.bind(this)); + public reset(): void { + this.logger.trace('ClusterService', 'Resetting the cluster snapshot'); + this.initialListFetched = DeferredPromise(); + this.memberListSnapshot = EMPTY_SNAPSHOT; } - private onConnectionClosed(connection: ClientConnection): void { - this.logger.warn('ClusterService', 'Connection closed to ' + connection.toString()); - if (connection.isAuthenticatedAsOwner()) { - this.ownerConnection = null; - this.connectToCluster().catch(this.client.shutdown.bind(this.client)); + public handleMembersViewEvent(memberListVersion: number, memberInfos: MemberInfo[]): void { + if (this.memberListSnapshot === EMPTY_SNAPSHOT) { + this.applyInitialState(memberListVersion, memberInfos); + this.initialListFetched.resolve(); + return; } - } - private onHeartbeatStopped(connection: ClientConnection): void { - this.logger.warn('ClusterService', connection.toString() + ' stopped heartbeating.'); - if (connection.isAuthenticatedAsOwner()) { - this.client.getConnectionManager().destroyConnection(connection.getAddress()); + if (memberListVersion >= this.memberListSnapshot.version) { + const prevMembers = this.memberListSnapshot.memberList; + const snapshot = this.createSnapshot(memberListVersion, memberInfos); + this.memberListSnapshot = snapshot; + const currentMembers = snapshot.memberList; + const events = this.detectMembershipEvents(prevMembers, currentMembers); + this.fireEvents(events); } } - private tryConnectingToAddresses(index: number, remainingAttemptLimit: number, - attemptPeriod: number, cause?: Error): Promise { - this.logger.debug('ClusterService', 'Trying to connect to addresses, remaining attempt limit: ' + remainingAttemptLimit - + ', attempt period: ' + attemptPeriod); - if (this.knownAddresses.length <= index) { - remainingAttemptLimit = remainingAttemptLimit - 1; - if (remainingAttemptLimit === 0) { - const errorMessage = 'Unable to connect to any of the following addresses: ' + - this.knownAddresses.map((element: Address) => { - return element.toString(); - }).join(', '); - this.logger.debug('ClusterService', errorMessage); - const error = new IllegalStateError(errorMessage, cause); - return Promise.reject(error); - } else { - const deferred = DeferredPromise(); - setTimeout( - () => { - this.tryConnectingToAddresses(0, remainingAttemptLimit, attemptPeriod).then(() => { - deferred.resolve(); - }).catch((e) => { - deferred.reject(e); - }); - }, - attemptPeriod, - ); - return deferred.promise; - } - } else { - const currentAddress = this.knownAddresses[index]; - return this.client.getConnectionManager().getOrConnect(currentAddress, true).then((connection: ClientConnection) => { - connection.setAuthenticatedAsOwner(true); - this.ownerConnection = connection; - return this.initMembershipListener(); - }).catch((e) => { - this.logger.warn('ClusterService', e); - return this.tryConnectingToAddresses(index + 1, remainingAttemptLimit, attemptPeriod, e); + private fireEvents(events: MembershipEvent[]): void { + for (const event of events) { + this.listeners.forEach((listener) => { + if (event.eventType === MemberEvent.ADDED && listener.memberAdded) { + listener.memberAdded(event); + } else if (event.eventType === MemberEvent.REMOVED && listener.memberRemoved) { + listener.memberRemoved(event); + } }); } } - private handleMember(member: Member, eventType: number): void { - if (eventType === MemberEvent.ADDED) { - this.logger.info('ClusterService', member.toString() + ' added to cluster'); - this.memberAdded(member); - } else if (eventType === MemberEvent.REMOVED) { - this.logger.info('ClusterService', member.toString() + ' removed from cluster'); - this.memberRemoved(member); - } - this.client.getPartitionService().refresh(); + private isInitialMembershipListener(listener: MembershipListener): listener is InitialMembershipListener { + return (listener as InitialMembershipListener).init !== undefined; } - private handleMemberList(members: Member[]): void { - this.members = members; - this.client.getPartitionService().refresh(); - this.logger.info('ClusterService', 'Members received.', this.members); + private applyInitialState(memberListVersion: number, memberInfos: MemberInfo[]): void { + const snapshot = this.createSnapshot(memberListVersion, memberInfos); + this.memberListSnapshot = snapshot; + this.logger.info('ClusterService', this.membersString(snapshot)); + const members = snapshot.memberList; + const event = new InitialMembershipEvent(members); + this.listeners.forEach((listener) => { + if (this.isInitialMembershipListener(listener)) { + listener.init(event); + } + }); } - private handleMemberAttributeChange( - uuid: string, key: string, operationType: MemberAttributeOperationType, value: string): void { + private detectMembershipEvents(prevMembers: Member[], currentMembers: Member[]): MembershipEvent[] { + const newMembers = new Array(); + + const deadMembers = new Map(); + for (const member of prevMembers) { + deadMembers.set(member.id(), member); + } + + for (const member of currentMembers) { + if (!deadMembers.delete(member.id())) { + newMembers.push(member); + } + } - this.membershipListeners.forEach((membershipListener, registrationId) => { - if (membershipListener && membershipListener.memberAttributeChanged) { - const member = this.getMember(uuid); - const memberAttributeEvent = new MemberAttributeEvent(member, key, operationType, value); - membershipListener.memberAttributeChanged(memberAttributeEvent); + const events = new Array(deadMembers.size + newMembers.length); + let index = 0; + + // removal events should be added before added events + deadMembers.forEach((member) => { + events[index++] = new MembershipEvent(member, MemberEvent.REMOVED, currentMembers); + const connection: ClientConnection = this.connectionManager.getConnection(member.uuid); + if (connection != null) { + connection.close(null, new TargetDisconnectedError('The client has closed the connection to this ' + + 'member, after receiving a member left event from the cluster ' + connection)); } }); - } - private memberAdded(member: Member): void { - this.members.push(member); - this.membershipListeners.forEach((membershipListener, registrationId) => { - if (membershipListener && membershipListener.memberAdded) { - const membershipEvent = new MembershipEvent(member, MemberEvent.ADDED, this.members); - membershipListener.memberAdded(membershipEvent); + for (const member of newMembers) { + events[index++] = new MembershipEvent(member, MemberEvent.ADDED, currentMembers); + } + + if (events.length !== 0) { + if (this.memberListSnapshot.members.size !== 0) { + this.logger.info('ClusterService', this.membersString(this.memberListSnapshot)); } - }); + } + return events; } - private memberRemoved(member: Member): void { - const memberIndex = this.members.findIndex(member.equals, member); - if (memberIndex !== -1) { - const removedMemberList = this.members.splice(memberIndex, 1); - assert(removedMemberList.length === 1); + private createSnapshot(memberListVersion: number, memberInfos: MemberInfo[]): MemberListSnapshot { + const newMembers = new Map(); + const newMemberList = new Array(memberInfos.length); + let index = 0; + for (const memberInfo of memberInfos) { + const member = new Member(memberInfo.address, memberInfo.uuid, memberInfo.attributes, memberInfo.liteMember, + memberInfo.version); + newMembers.set(memberInfo.uuid.toString(), member); + newMemberList[index++] = member; } - this.client.getConnectionManager().destroyConnection(member.address); - this.membershipListeners.forEach((membershipListener, registrationId) => { - if (membershipListener && membershipListener.memberRemoved) { - const membershipEvent = new MembershipEvent(member, MemberEvent.REMOVED, this.members); - membershipListener.memberRemoved(membershipEvent); - } - }); + return new MemberListSnapshot(memberListVersion, newMembers, newMemberList); + } + + private membersString(snapshot: MemberListSnapshot): string { + const members = snapshot.memberList; + let logString = '\n\nMembers [' + members.length + '] {'; + for (const member of members) { + logString += '\n\t' + member.toString(); + } + logString += '\n}\n'; + return logString; + } + + private getMemberList(): Member[] { + return this.memberListSnapshot.memberList; } + } diff --git a/src/invocation/ConnectionAuthenticator.ts b/src/invocation/ConnectionAuthenticator.ts deleted file mode 100644 index 31fb9c90c..000000000 --- a/src/invocation/ConnectionAuthenticator.ts +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import {ClientAuthenticationCodec} from '../codec/ClientAuthenticationCodec'; -import HazelcastClient from '../HazelcastClient'; -import {ClientAuthenticationCustomCodec} from '../codec/ClientAuthenticationCustomCodec'; -import {ClientConnection} from './ClientConnection'; -import {ClusterService} from './ClusterService'; -import {AuthenticationError} from '../HazelcastError'; -import {ILogger} from '../logging/ILogger'; -import ClientMessage = require('../ClientMessage'); -import {BuildInfo} from '../BuildInfo'; - -const enum AuthenticationStatus { - AUTHENTICATED = 0, - CREDENTIALS_FAILED = 1, - SERIALIZATION_VERSION_MISMATCH = 2, -} - -export class ConnectionAuthenticator { - - private connection: ClientConnection; - private client: HazelcastClient; - private clusterService: ClusterService; - private logger: ILogger; - - constructor(connection: ClientConnection, client: HazelcastClient) { - this.connection = connection; - this.client = client; - this.logger = this.client.getLoggingService().getLogger(); - this.clusterService = this.client.getClusterService(); - } - - authenticate(asOwner: boolean): Promise { - const credentials: ClientMessage = this.createCredentials(asOwner); - return this.client.getInvocationService() - .invokeOnConnection(this.connection, credentials) - .then((msg: ClientMessage) => { - const authResponse = ClientAuthenticationCodec.decodeResponse(msg); - switch (authResponse.status) { - case AuthenticationStatus.AUTHENTICATED: - this.connection.setAddress(authResponse.address); - this.connection.setConnectedServerVersion(authResponse.serverHazelcastVersion); - if (asOwner) { - this.clusterService.uuid = authResponse.uuid; - this.clusterService.ownerUuid = authResponse.ownerUuid; - - } - this.logger.info('ConnectionAuthenticator', - 'Connection to ' + - this.connection.getAddress().toString() + ' authenticated'); - break; - case AuthenticationStatus.CREDENTIALS_FAILED: - this.logger.error('ConnectionAuthenticator', 'Invalid Credentials'); - throw new Error('Invalid Credentials, could not authenticate connection to ' + - this.connection.getAddress().toString()); - case AuthenticationStatus.SERIALIZATION_VERSION_MISMATCH: - this.logger.error('ConnectionAuthenticator', 'Serialization version mismatch'); - throw new Error('Serialization version mismatch, could not authenticate connection to ' + - this.connection.getAddress().toString()); - default: - this.logger.error('ConnectionAuthenticator', 'Unknown authentication status: ' - + authResponse.status); - throw new AuthenticationError('Unknown authentication status: ' + authResponse.status + - ' , could not authenticate connection to ' + - this.connection.getAddress().toString()); - } - }); - } - - createCredentials(asOwner: boolean): ClientMessage { - const groupConfig = this.client.getConfig().groupConfig; - const uuid: string = this.clusterService.uuid; - const ownerUuid: string = this.clusterService.ownerUuid; - - const customCredentials = this.client.getConfig().customCredentials; - - let clientMessage: ClientMessage; - - const clientVersion = BuildInfo.getClientVersion(); - - if (customCredentials != null) { - const credentialsPayload = this.client.getSerializationService().toData(customCredentials); - - clientMessage = ClientAuthenticationCustomCodec.encodeRequest( - credentialsPayload, uuid, ownerUuid, asOwner, 'NJS', 1, clientVersion); - } else { - clientMessage = ClientAuthenticationCodec.encodeRequest( - groupConfig.name, groupConfig.password, uuid, ownerUuid, asOwner, 'NJS', 1, clientVersion); - - } - - return clientMessage; - } -} diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 0b702b81a..eaccc5251 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -14,10 +14,8 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import * as assert from 'assert'; import * as Promise from 'bluebird'; -import {BitsUtil} from '../BitsUtil'; import HazelcastClient from '../HazelcastClient'; import { ClientNotActiveError, @@ -25,14 +23,18 @@ import { InvocationTimeoutError, IOError, RetryableHazelcastError, + TargetDisconnectedError, + TargetNotMemberError, } from '../HazelcastError'; -import {ClientConnection} from './ClientConnection'; +import {ClientConnection} from '../network/ClientConnection'; import {DeferredPromise} from '../Util'; import {ILogger} from '../logging/ILogger'; -import Address = require('../Address'); -import ClientMessage = require('../ClientMessage'); +import {ClientMessage} from '../ClientMessage'; +import {EXCEPTION_MESSAGE_TYPE} from '../codec/builtin/ErrorsCodec'; +import {ClientConnectionManager} from '../network/ClientConnectionManager'; +import {UUID} from '../core/UUID'; +import {PartitionService} from '../PartitionService'; -const EXCEPTION_MESSAGE_TYPE = 109; const MAX_FAST_INVOCATION_COUNT = 5; const PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS = 'hazelcast.client.invocation.retry.pause.millis'; const PROPERTY_INVOCATION_TIMEOUT_MILLIS = 'hazelcast.client.invocation.timeout.millis'; @@ -43,38 +45,52 @@ const PROPERTY_INVOCATION_TIMEOUT_MILLIS = 'hazelcast.client.invocation.timeout. export class Invocation { client: HazelcastClient; + invocationService: InvocationService; + /** - * Representatiton of the request in binary form. + * Representation of the request in binary form. */ request: ClientMessage; + /** * Partition id of the request. If request is not bound to a specific partition, should be set to -1. */ partitionId: number; + /** - * Address of the request. If request is not bound to any specific address, should be set to null. + * UUID of the request. If request is not bound to any specific UUID, should be set to null. */ - address: Address; + uuid: UUID; + /** * Deadline of validity. Client will not try to send this request to server after the deadline passes. */ deadline: number; + /** * Connection of the request. If request is not bound to any specific address, should be set to null. */ connection: ClientConnection; + /** * Promise managing object. */ deferred: Promise.Resolver; + invokeCount: number = 0; + /** * If this is an event listener registration, handler should be set to the function to be called on events. * Otherwise, should be set to null. */ handler: (...args: any[]) => any; + /** + * True if this invocation is urgent (can be invoked even in the client is in the disconnected state), false otherwise. + */ + urgent: boolean = false; + constructor(client: HazelcastClient, request: ClientMessage) { this.client = client; this.invocationService = client.getInvocationService(); @@ -82,10 +98,6 @@ export class Invocation { this.request = request; } - static isRetrySafeError(err: Error): boolean { - return err instanceof IOError || err instanceof HazelcastInstanceNotActiveError || err instanceof RetryableHazelcastError; - } - /** * @returns {boolean} */ @@ -93,8 +105,27 @@ export class Invocation { return this.hasOwnProperty('partitionId') && this.partitionId >= 0; } - isAllowedToRetryOnSelection(err: Error): boolean { - return (this.connection == null && this.address == null) || !(err instanceof IOError); + shouldRetry(err: Error): boolean { + if (this.connection != null && (err instanceof IOError || err instanceof TargetDisconnectedError)) { + return false; + } + + if (this.uuid != null && err instanceof TargetNotMemberError) { + // when invocation send to a specific member + // if target is no longer a member, we should not retry + // note that this exception could come from the server + return false; + } + + if (err instanceof IOError || err instanceof HazelcastInstanceNotActiveError || err instanceof RetryableHazelcastError) { + return true; + } + + if (err instanceof TargetDisconnectedError) { + return this.request.isRetryable(); + } + + return false; } } @@ -112,9 +143,13 @@ export class InvocationService { private readonly invocationTimeoutMillis: number; private logger: ILogger; private isShutdown: boolean; + private connectionManager: ClientConnectionManager; + private partitionService: PartitionService; constructor(hazelcastClient: HazelcastClient) { this.client = hazelcastClient; + this.connectionManager = hazelcastClient.getConnectionManager(); + this.partitionService = hazelcastClient.getPartitionService(); this.logger = this.client.getLoggingService().getLogger(); this.smartRoutingEnabled = hazelcastClient.getConfig().networkConfig.smartRouting; if (hazelcastClient.getConfig().networkConfig.smartRouting) { @@ -139,6 +174,11 @@ export class InvocationService { return invocation.deferred.promise; } + invokeUrgent(invocation: Invocation): Promise { + invocation.urgent = true; + return this.invoke(invocation); + } + /** * Invokes given invocation on specified connection. * @param connection @@ -169,14 +209,14 @@ export class InvocationService { } /** - * Invokes given invocation on the host with given address. + * Invokes given invocation on the host with given UUID. * @param request * @param target * @returns */ - invokeOnTarget(request: ClientMessage, target: Address): Promise { + invokeOnTarget(request: ClientMessage, target: UUID): Promise { const invocation = new Invocation(this.client, request); - invocation.address = target; + invocation.uuid = target; return this.invoke(invocation); } @@ -210,14 +250,13 @@ export class InvocationService { /** * Extract codec specific properties in a protocol message and resolves waiting promise. - * @param buffer + * @param clientMessage */ - processResponse(buffer: Buffer): void { - const clientMessage = new ClientMessage(buffer); + processResponse(clientMessage: ClientMessage): void { const correlationId = clientMessage.getCorrelationId(); const messageType = clientMessage.getMessageType(); - if (clientMessage.hasFlags(BitsUtil.LISTENER_FLAG)) { + if (clientMessage.startFrame.hasEventFlag()) { setImmediate(() => { if (this.eventHandlers[correlationId] !== undefined) { this.eventHandlers[correlationId].handler(clientMessage); @@ -238,60 +277,84 @@ export class InvocationService { } private invokeSmart(invocation: Invocation): void { - let invocationPromise: Promise; invocation.invokeCount++; + if (!invocation.urgent) { + const error = this.connectionManager.checkIfInvocationAllowed(); + if (error != null) { + this.notifyError(invocation, error); + return; + } + } + + let invocationPromise: Promise; if (invocation.hasOwnProperty('connection')) { invocationPromise = this.send(invocation, invocation.connection); - } else if (invocation.hasPartitionId()) { + invocationPromise.catch((err) => { + this.notifyError(invocation, err); + }); + return; + } + + if (invocation.hasPartitionId()) { invocationPromise = this.invokeOnPartitionOwner(invocation, invocation.partitionId); - } else if (invocation.hasOwnProperty('address')) { - invocationPromise = this.invokeOnAddress(invocation, invocation.address); + } else if (invocation.hasOwnProperty('uuid')) { + invocationPromise = this.invokeOnUuid(invocation, invocation.uuid); } else { - invocationPromise = this.invokeOnOwner(invocation); + invocationPromise = this.invokeOnRandomConnection(invocation); } - invocationPromise.catch((err) => { + + invocationPromise.catch(() => { + return this.invokeOnRandomConnection(invocation); + }).catch((err) => { this.notifyError(invocation, err); }); } private invokeNonSmart(invocation: Invocation): void { - let invocationPromise: Promise; invocation.invokeCount++; + if (!invocation.urgent) { + const error = this.connectionManager.checkIfInvocationAllowed(); + if (error != null) { + this.notifyError(invocation, error); + return; + } + } + + let invocationPromise: Promise; if (invocation.hasOwnProperty('connection')) { invocationPromise = this.send(invocation, invocation.connection); } else { - invocationPromise = this.invokeOnOwner(invocation); + invocationPromise = this.invokeOnRandomConnection(invocation); } invocationPromise.catch((err) => { this.notifyError(invocation, err); }); } - private invokeOnOwner(invocation: Invocation): Promise { - const owner = this.client.getClusterService().getOwnerConnection(); - if (owner == null) { - return Promise.reject(new IOError('Unisocket client\'s owner connection is not available.')); + private invokeOnRandomConnection(invocation: Invocation): Promise { + const connection = this.connectionManager.getRandomConnection(); + if (connection == null) { + return Promise.reject(new IOError('No connection found to invoke')); } - return this.send(invocation, owner); + return this.send(invocation, connection); } - private invokeOnAddress(invocation: Invocation, address: Address): Promise { - return this.client.getConnectionManager().getOrConnect(address).then((connection: ClientConnection) => { - return this.send(invocation, connection); - }).catch((e) => { - this.logger.debug('InvocationService', e); - throw new IOError(address.toString() + ' is not available.', e); - }); + private invokeOnUuid(invocation: Invocation, target: UUID): Promise { + const connection = this.connectionManager.getConnection(target); + if (connection == null) { + this.logger.trace('InvocationService', `Client is not connected to target: ${target}`); + return Promise.reject(new IOError('No connection found to invoke')); + } + return this.send(invocation, connection); } private invokeOnPartitionOwner(invocation: Invocation, partitionId: number): Promise { - const ownerAddress = this.client.getPartitionService().getAddressForPartition(partitionId); - return this.client.getConnectionManager().getOrConnect(ownerAddress).then((connection: ClientConnection) => { - return this.send(invocation, connection); - }).catch((e) => { - this.logger.debug('InvocationService', e); - throw new IOError(ownerAddress.toString() + '(partition owner) is not available.', e); - }); + const partitionOwner = this.partitionService.getPartitionOwner(partitionId); + if (partitionOwner == null) { + this.logger.trace('InvocationService', 'Partition owner is not assigned yet'); + return Promise.reject(new IOError('No connection found to invoke')); + } + return this.invokeOnUuid(invocation, partitionOwner); } private send(invocation: Invocation, connection: ClientConnection): Promise { @@ -304,7 +367,7 @@ export class InvocationService { } private write(invocation: Invocation, connection: ClientConnection): Promise { - return connection.write(invocation.request.getBuffer()); + return connection.write(invocation.request.toBuffer()); } private notifyError(invocation: Invocation, error: Error): void { @@ -330,17 +393,15 @@ export class InvocationService { */ private rejectIfNotRetryable(invocation: Invocation, error: Error): boolean { if (!this.client.getLifecycleService().isRunning()) { - invocation.deferred.reject(new ClientNotActiveError('Client is not active.', error)); - return true; - } - if (!invocation.isAllowedToRetryOnSelection(error)) { - invocation.deferred.reject(error); + invocation.deferred.reject(new ClientNotActiveError('Client is shutting down.', error)); return true; } - if (!Invocation.isRetrySafeError(error)) { + + if (!invocation.shouldRetry(error)) { invocation.deferred.reject(error); return true; } + if (invocation.deadline < Date.now()) { this.logger.trace('InvocationService', 'Error will not be retried because invocation timed out'); invocation.deferred.reject(new InvocationTimeoutError('Invocation ' + invocation.request.getCorrelationId() + ')' diff --git a/src/invocation/RegistrationKey.ts b/src/invocation/RegistrationKey.ts index 7c6e7ca1e..b159bd6c6 100644 --- a/src/invocation/RegistrationKey.ts +++ b/src/invocation/RegistrationKey.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import ClientMessage = require('../ClientMessage'); import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ClientMessage} from '../ClientMessage'; export class RegistrationKey { private readonly userRegistrationId: string; diff --git a/src/listener/ClusterViewListenerService.ts b/src/listener/ClusterViewListenerService.ts new file mode 100644 index 000000000..da9d49d5e --- /dev/null +++ b/src/listener/ClusterViewListenerService.ts @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import HazelcastClient from '../HazelcastClient'; +import {ClientConnectionManager} from '../network/ClientConnectionManager'; +import {PartitionService} from '../PartitionService'; +import {ClusterService} from '../invocation/ClusterService'; +import {ILogger} from '../logging/ILogger'; +import {ClientConnection} from '../network/ClientConnection'; +import {ClientAddClusterViewListenerCodec} from '../codec/ClientAddClusterViewListenerCodec'; +import {ClientMessage} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {Invocation} from '../invocation/InvocationService'; + +/** + * Adds cluster listener to one of the connections. If that connection is removed, + * it registers connection to any other connection + */ +export class ClusterViewListenerService { + + private readonly client: HazelcastClient; + private readonly clusterService: ClusterService; + private readonly connectionManager: ClientConnectionManager; + private readonly partitionService: PartitionService; + private readonly logger: ILogger; + private listenerAddedConnection: ClientConnection; + + constructor(client: HazelcastClient) { + this.client = client; + this.logger = client.getLoggingService().getLogger(); + this.connectionManager = client.getConnectionManager(); + this.partitionService = client.getPartitionService(); + this.clusterService = client.getClusterService(); + } + + public start(): void { + this.connectionManager.on('connectionAdded', this.connectionAdded.bind(this)); + this.connectionManager.on('connectionRemoved', this.connectionRemoved.bind(this)); + } + + private connectionAdded(connection: ClientConnection): void { + this.tryRegister(connection); + } + + private connectionRemoved(connection: ClientConnection): void { + this.tryRegisterToRandomConnection(connection); + } + + private tryRegister(connection: ClientConnection): void { + if (this.listenerAddedConnection != null) { + // already registering/registered to another connection + return; + } + this.listenerAddedConnection = connection; + + const request = ClientAddClusterViewListenerCodec.encodeRequest(); + const handler = this.createClusterViewEventHandler(connection); + const invocation = new Invocation(this.client, request); + invocation.connection = connection; + invocation.handler = handler; + + this.logger.trace('ClusterViewListenerService', `Register attempt of cluster view handler to ${connection}`); + this.client.getInvocationService().invokeUrgent(invocation) + .then(() => { + this.logger.trace('ClusterViewListenerService', `Registered cluster view handler to ${connection}`); + }) + .catch(() => { + // listener needs to be re-registered + this.tryRegisterToRandomConnection(connection); + }); + } + + private tryRegisterToRandomConnection(oldConnection: ClientConnection): void { + if (this.listenerAddedConnection !== oldConnection) { + // somebody else already trying to re-register + return; + } + this.listenerAddedConnection = null; + const newConnection = this.connectionManager.getRandomConnection(); + if (newConnection != null) { + this.tryRegister(newConnection); + } + } + + private createClusterViewEventHandler(connection: ClientConnection): (msg: ClientMessage) => void { + return (clientMessage: ClientMessage) => { + ClientAddClusterViewListenerCodec.handle(clientMessage, + this.clusterService.handleMembersViewEvent.bind(this.clusterService), + (version: number, partitions: Array<[UUID, number[]]>) => { + this.partitionService.handlePartitionViewEvent(connection, partitions, version); + }); + }; + } + +} diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index ee42c5e32..f8868f2ca 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -23,7 +23,7 @@ import {Invocation} from '../invocation/InvocationService'; import {PartitionService} from '../PartitionService'; import {RepairingHandler} from './RepairingHandler'; import {ILogger} from '../logging/ILogger'; -import ClientMessage = require('../ClientMessage'); +import {ClientMessage} from '../ClientMessage'; export class MetadataFetcher { @@ -53,7 +53,7 @@ export class MetadataFetcher { const promises = this.scanMembers(objectNames); return Promise.each(promises, (clientMessage: ClientMessage) => { this.processResponse(clientMessage, handlers); - }).return(); + }).then(() => undefined); } protected processResponse(responseMessage: ClientMessage, handlers: Map): void { @@ -87,7 +87,7 @@ export class MetadataFetcher { const members = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); const promises: Array> = []; members.forEach((member) => { - const request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.address); + const request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.uuid); const promise = this.client.getInvocationService().invoke(new Invocation(this.client, request)); promises.push(promise); }); diff --git a/src/nearcache/NearCacheManager.ts b/src/nearcache/NearCacheManager.ts index dc178038c..1f249dcbd 100644 --- a/src/nearcache/NearCacheManager.ts +++ b/src/nearcache/NearCacheManager.ts @@ -48,13 +48,20 @@ export class NearCacheManager { } public destroyAllNearCaches(): void { - for (const key of Array.from(this.caches.keys())) { - this.destroyNearCache(key); - } + this.caches.forEach((cache) => { + cache.clear(); + }); + this.caches.clear(); } public listAllNearCaches(): NearCache[] { return Array.from(this.caches.values()); } + public clearAllNearCaches(): void { + for (const nearCache of this.listAllNearCaches()) { + nearCache.clear(); + } + } + } diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index 9daf16814..a8da9eac5 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -26,11 +26,11 @@ export class RepairingHandler { private readonly nearCache: NearCache; private readonly partitionCount: number; private readonly partitionService: PartitionService; - private readonly localUuid: string; + private readonly localUuid: UUID; private readonly name: string; private containers: MetadataContainer[]; - constructor(name: string, partitionService: PartitionService, nearCache: NearCache, localUuid: string) { + constructor(name: string, partitionService: PartitionService, nearCache: NearCache, localUuid: UUID) { this.nearCache = nearCache; this.name = name; this.partitionService = partitionService; @@ -60,8 +60,10 @@ export class RepairingHandler { } } - handle(key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long): void { - if (this.localUuid !== sourceUuid) { + handle(key: Data, sourceUuid: UUID, partitionUuid: UUID, sequence: Long): void { + // apply invalidation if it's not originated by local member/client (because local + // Near Caches are invalidated immediately there is no need to invalidate them twice) + if (!this.localUuid.equals(sourceUuid)) { if (key == null) { this.nearCache.clear(); } else { @@ -73,7 +75,7 @@ export class RepairingHandler { this.checkOrRepairUuid(partitionId, partitionUuid); } - handleBatch(keys: any[], sourceUuids: string[], partitionUuids: UUID[], sequences: Long[]): void { + handleBatch(keys: any[], sourceUuids: UUID[], partitionUuids: UUID[], sequences: Long[]): void { for (let i = 0; i < keys.length; i++) { this.handle(keys[i], sourceUuids[i], partitionUuids[i], sequences[i]); } diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index ffeff1c22..c68107a2e 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -22,6 +22,7 @@ import {NearCache} from './NearCache'; import {RepairingHandler} from './RepairingHandler'; import * as Promise from 'bluebird'; import {ILogger} from '../logging/ILogger'; +import {UUID} from '../core/UUID'; const PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.reconciliation.interval.seconds'; const PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.min.reconciliation.interval.seconds'; @@ -33,7 +34,7 @@ export class RepairingTask { private handlers: Map; private reconcilliationInterval: number; private maxToleratedMissCount: number; - private localUuid: string; + private localUuid: UUID; private metadataFetcher: MetadataFetcher; private client: HazelcastClient; private partitionCount: number; diff --git a/src/invocation/ClientConnection.ts b/src/network/ClientConnection.ts similarity index 57% rename from src/invocation/ClientConnection.ts rename to src/network/ClientConnection.ts index 4f1bfbcf6..f685ce22e 100644 --- a/src/invocation/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -22,8 +22,11 @@ import {BitsUtil} from '../BitsUtil'; import {BuildInfo} from '../BuildInfo'; import HazelcastClient from '../HazelcastClient'; import {IOError} from '../HazelcastError'; -import Address = require('../Address'); import {DeferredPromise} from '../Util'; +import {Address} from '../Address'; +import {UUID} from '../core/UUID'; +import {ILogger} from '../logging/ILogger'; +import {ClientMessage, Frame, SIZE_OF_FRAME_LENGTH_AND_FLAGS} from '../ClientMessage'; const FROZEN_ARRAY = Object.freeze([]) as OutputQueueItem[]; const PROPERTY_PIPELINING_ENABLED = 'hazelcast.client.autopipelining.enabled'; @@ -146,77 +149,138 @@ export class DirectWriter extends EventEmitter { } } -export class FrameReader { +export class ClientMessageReader { private chunks: Buffer[] = []; private chunksTotalSize: number = 0; private frameSize: number = 0; + private flags: number = 0; + private clientMessage: ClientMessage = null; append(buffer: Buffer): void { this.chunksTotalSize += buffer.length; this.chunks.push(buffer); } - read(): Buffer { - if (this.chunksTotalSize < BitsUtil.INT_SIZE_IN_BYTES) { - return null; + read(): ClientMessage { + while (true) { + if (this.readFrame()) { + if (this.clientMessage.endFrame.isFinalFrame()) { + const message = this.clientMessage; + this.reset(); + return message; + } + } else { + return null; + } + } + } + + readFrame(): boolean { + if (this.chunksTotalSize < SIZE_OF_FRAME_LENGTH_AND_FLAGS) { + // we don't have even the frame length and flags ready + return false; } if (this.frameSize === 0) { - this.frameSize = this.readFrameSize(); + this.readFrameSizeAndFlags(); } if (this.chunksTotalSize < this.frameSize) { - return null; + return false; } - let frame = this.chunks.length === 1 ? this.chunks[0] : Buffer.concat(this.chunks, this.chunksTotalSize); + let buf = this.chunks.length === 1 ? this.chunks[0] : Buffer.concat(this.chunks, this.chunksTotalSize); if (this.chunksTotalSize > this.frameSize) { if (this.chunks.length === 1) { - this.chunks[0] = frame.slice(this.frameSize); + this.chunks[0] = buf.slice(this.frameSize); } else { - this.chunks = [frame.slice(this.frameSize)]; + this.chunks = [buf.slice(this.frameSize)]; } - frame = frame.slice(0, this.frameSize); + buf = buf.slice(SIZE_OF_FRAME_LENGTH_AND_FLAGS, this.frameSize); } else { this.chunks = []; + buf = buf.slice(SIZE_OF_FRAME_LENGTH_AND_FLAGS); } this.chunksTotalSize -= this.frameSize; this.frameSize = 0; - return frame; + // No need to reset flags since it will be overwritten on the next readFrameSizeAndFlags call. + const frame = new Frame(buf, this.flags); + if (this.clientMessage == null) { + this.clientMessage = ClientMessage.createForDecode(frame); + } else { + this.clientMessage.addFrame(frame); + } + return true; + } + + private reset(): void { + this.clientMessage = null; } - private readFrameSize(): number { - if (this.chunks[0].length >= BitsUtil.INT_SIZE_IN_BYTES) { - return this.chunks[0].readInt32LE(0); + private readFrameSizeAndFlags(): void { + if (this.chunks[0].length >= SIZE_OF_FRAME_LENGTH_AND_FLAGS) { + this.frameSize = this.chunks[0].readInt32LE(0); + this.flags = this.chunks[0].readUInt16LE(BitsUtil.INT_SIZE_IN_BYTES); + return; } let readChunksSize = 0; for (let i = 0; i < this.chunks.length; i++) { readChunksSize += this.chunks[i].length; - if (readChunksSize >= BitsUtil.INT_SIZE_IN_BYTES) { + if (readChunksSize >= SIZE_OF_FRAME_LENGTH_AND_FLAGS) { const merged = Buffer.concat(this.chunks.slice(0, i + 1), readChunksSize); - return merged.readInt32LE(0); + this.frameSize = merged.readInt32LE(0); + this.flags = merged.readUInt16LE(BitsUtil.INT_SIZE_IN_BYTES); + return; } } - throw new Error('Detected illegal internal call in FrameReader!'); + throw new Error('Detected illegal internal call in ClientMessageReader!'); + } +} + +export class FragmentedClientMessageHandler { + private readonly fragmentedMessages = new Map(); + + handleFragmentedMessage(clientMessage: ClientMessage, callback: Function): void { + const fragmentationFrame = clientMessage.startFrame; + const fragmentationId = clientMessage.getFragmentationId(); + clientMessage.dropFragmentationFrame(); + if (fragmentationFrame.hasBeginFragmentFlag()) { + this.fragmentedMessages.set(fragmentationId, clientMessage); + } else if (fragmentationFrame.hasEndFragmentFlag()) { + const mergedMessage = this.mergeIntoExistingClientMessage(fragmentationId, clientMessage); + callback(mergedMessage); + } else { + this.mergeIntoExistingClientMessage(fragmentationId, clientMessage); + } + } + + private mergeIntoExistingClientMessage(fragmentationId: number, clientMessage: ClientMessage): ClientMessage { + const existingMessage = this.fragmentedMessages.get(fragmentationId); + existingMessage.merge(clientMessage); + return existingMessage; } } export class ClientConnection { - private address: Address; + private readonly connectionId: number; + private remoteAddress: Address; + private remoteUuid: UUID; private readonly localAddress: Address; private lastReadTimeMillis: number; private lastWriteTimeMillis: number; - private heartbeating = true; private readonly client: HazelcastClient; private readonly startTime: number = Date.now(); private closedTime: number; + private closedReason: string; + private closedCause: Error; private connectedServerVersionString: string; private connectedServerVersion: number; - private authenticatedAsOwner: boolean; private readonly socket: net.Socket; private readonly writer: PipelinedWriter | DirectWriter; - private readonly reader: FrameReader; + private readonly reader: ClientMessageReader; + private readonly logger: ILogger; + private readonly fragmentedMessageHandler: FragmentedClientMessageHandler; - constructor(client: HazelcastClient, address: Address, socket: net.Socket) { + constructor(client: HazelcastClient, remoteAddress: Address, socket: net.Socket, connectionId: number) { const enablePipelining = client.getConfig().properties[PROPERTY_PIPELINING_ENABLED] as boolean; const pipeliningThreshold = client.getConfig().properties[PROPERTY_PIPELINING_THRESHOLD] as number; const noDelay = client.getConfig().properties[PROPERTY_NO_DELAY] as boolean; @@ -224,7 +288,7 @@ export class ClientConnection { this.client = client; this.socket = socket; - this.address = address; + this.remoteAddress = remoteAddress; this.localAddress = new Address(socket.localAddress, socket.localPort); this.lastReadTimeMillis = 0; this.closedTime = 0; @@ -234,7 +298,10 @@ export class ClientConnection { this.writer.on('write', () => { this.lastWriteTimeMillis = Date.now(); }); - this.reader = new FrameReader(); + this.reader = new ClientMessageReader(); + this.connectionId = connectionId; + this.logger = this.client.getLoggingService().getLogger(); + this.fragmentedMessageHandler = new FragmentedClientMessageHandler(); } /** @@ -249,12 +316,20 @@ export class ClientConnection { * Returns the address of remote node that is associated with this connection. * @returns */ - getAddress(): Address { - return this.address; + getRemoteAddress(): Address { + return this.remoteAddress; } - setAddress(address: Address): void { - this.address = address; + setRemoteAddress(address: Address): void { + this.remoteAddress = address; + } + + getRemoteUuid(): UUID { + return this.remoteUuid; + } + + setRemoteUuid(remoteUuid: UUID): void { + this.remoteUuid = remoteUuid; } write(buffer: Buffer): Promise { @@ -275,29 +350,24 @@ export class ClientConnection { /** * Closes this connection. */ - close(): void { - this.socket.end(); + close(reason: string, cause: Error): void { + if (this.closedTime !== 0) { + return; + } this.closedTime = Date.now(); - } - isAlive(): boolean { - return this.closedTime === 0; - } + this.closedCause = cause; + this.closedReason = reason; - isHeartbeating(): boolean { - return this.heartbeating; - } + this.logClose(); - setHeartbeating(heartbeating: boolean): void { - this.heartbeating = heartbeating; - } + this.socket.end(); - isAuthenticatedAsOwner(): boolean { - return this.authenticatedAsOwner; + this.client.getConnectionManager().onConnectionClose(this); } - setAuthenticatedAsOwner(asOwner: boolean): void { - this.authenticatedAsOwner = asOwner; + isAlive(): boolean { + return this.closedTime === 0; } getStartTime(): number { @@ -312,8 +382,20 @@ export class ClientConnection { return this.lastWriteTimeMillis; } + equals(other: ClientConnection): boolean { + if (other == null) { + return false; + } + + return this.connectionId === other.connectionId; + } + toString(): string { - return this.address.toString(); + return 'ClientConnection{' + + 'alive=' + this.isAlive() + + ', connectionId=' + this.connectionId + + ', remoteAddress=' + this.remoteAddress + + '}'; } /** @@ -324,16 +406,36 @@ export class ClientConnection { this.socket.on('data', (buffer: Buffer) => { this.lastReadTimeMillis = Date.now(); this.reader.append(buffer); - let frame = this.reader.read(); - while (frame !== null) { - callback(frame); - frame = this.reader.read(); + let clientMessage = this.reader.read(); + while (clientMessage !== null) { + if (clientMessage.startFrame.hasUnfragmentedMessageFlag()) { + callback(clientMessage); + } else { + this.fragmentedMessageHandler.handleFragmentedMessage(clientMessage, callback); + } + clientMessage = this.reader.read(); } }); - this.socket.on('error', (e: any) => { - if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { - this.client.getConnectionManager().destroyConnection(this.address); + } + + private logClose(): void { + let message = this.toString() + ' closed. Reason: '; + if (this.closedReason != null) { + message += this.closedReason; + } else if (this.closedCause != null) { + message += this.closedCause.name + '[' + this.closedCause.message + ']'; + } else { + message += 'Socket explicitly closed'; + } + + if (this.client.getLifecycleService().isRunning()) { + if (this.closedCause == null) { + this.logger.info('Connection', message); + } else { + this.logger.warn('Connection', message); } - }); + } else { + this.logger.trace('Connection', message); + } } } diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts new file mode 100644 index 000000000..b65dc11b6 --- /dev/null +++ b/src/network/ClientConnectionManager.ts @@ -0,0 +1,790 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Buffer} from 'safe-buffer'; +import * as Promise from 'bluebird'; +import {EventEmitter} from 'events'; +import HazelcastClient from '../HazelcastClient'; +import { + AuthenticationError, + ClientNotActiveError, + ClientNotAllowedInClusterError, + ClientOfflineError, + HazelcastError, + IllegalStateError, + InvalidConfigurationError, + IOError, +} from '../HazelcastError'; +import {ClientConnection} from './ClientConnection'; +import * as net from 'net'; +import * as tls from 'tls'; +import { + AddressHelper, + cancelRepetitionTask, + DeferredPromise, + loadNameFromPath, + scheduleWithRepetition, + shuffleArray, + Task, +} from '../Util'; +import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; +import {ILogger} from '../logging/ILogger'; +import {SSLOptionsFactory} from '../connection/SSLOptionsFactory'; +import {Address} from '../Address'; +import {HeartbeatManager} from '../HeartbeatManager'; +import {UuidUtil} from '../util/UuidUtil'; +import {WaitStrategy} from './WaitStrategy'; +import {ReconnectMode} from '../config/ConnectionStrategyConfig'; +import {LoadBalancer} from '../LoadBalancer'; +import {UUID} from '../core/UUID'; +import {ClientConfig} from '../config/Config'; +import {LifecycleState} from '../LifecycleService'; +import {ClientMessage} from '../ClientMessage'; +import {BuildInfo} from '../BuildInfo'; +import {ClientAuthenticationCustomCodec} from '../codec/ClientAuthenticationCustomCodec'; +import {ClientAuthenticationCodec, ClientAuthenticationResponseParams} from '../codec/ClientAuthenticationCodec'; +import {AuthenticationStatus} from '../protocol/AuthenticationStatus'; +import {Invocation} from '../invocation/InvocationService'; +import {Member} from '../core/Member'; + +const CONNECTION_REMOVED_EVENT_NAME = 'connectionRemoved'; +const CONNECTION_ADDED_EVENT_NAME = 'connectionAdded'; + +const CLIENT_TYPE = 'NJS'; +const SERIALIZATION_VERSION = 1; +const SET_TIMEOUT_MAX_DELAY = 2147483647; +const BINARY_PROTOCOL_VERSION = Buffer.from('CP2'); + +enum ClientState { + /** + * Clients start with this state. Once a client connects to a cluster, + * it directly switches to {@link #INITIALIZED_ON_CLUSTER} instead of + * {@link #CONNECTED_TO_CLUSTER} because on startup a client has no + * local state to send to the cluster. + */ + INITIAL = 0, + + /** + * When a client switches to a new cluster, it moves to this state. + * It means that the client has connected to a new cluster but not sent + * its local state to the new cluster yet. + */ + CONNECTED_TO_CLUSTER = 1, + + /** + * When a client sends its local state to the cluster it has connected, + * it switches to this state. When a client loses all connections to + * the current cluster and connects to a new cluster, its state goes + * back to {@link #CONNECTED_TO_CLUSTER}. + *

+ * Invocations are allowed in this state. + */ + INITIALIZED_ON_CLUSTER = 2, +} + +/** + * Maintains connections between the client and members of the cluster. + */ +export class ClientConnectionManager extends EventEmitter { + + private connectionIdCounter = 0; + private alive = false; + + private readonly logger: ILogger; + private readonly client: HazelcastClient; + private readonly labels: string[]; + private readonly shuffleMemberList: boolean; + private readonly asyncStart: boolean; + private readonly reconnectMode: ReconnectMode; + private readonly isSmartRoutingEnabled: boolean; + private connectionTimeoutMillis: number; + private heartbeatManager: HeartbeatManager; + private authenticationTimeout: number; + private clientUuid = UuidUtil.generate(false); + private waitStrategy: WaitStrategy; + private loadBalancer: LoadBalancer; + private activeConnections = new Map(); + private pendingConnections = new Map>(); + private clusterId: UUID; + private clientState = ClientState.INITIAL; + private connectToClusterTaskSubmitted: boolean; + private reconnectToMembersTask: Task; + private connectingAddresses = new Set

(); + + constructor(client: HazelcastClient) { + super(); + this.client = client; + this.loadBalancer = client.getLoadBalancer(); + this.labels = Array.from(client.getConfig().labels); + this.logger = this.client.getLoggingService().getLogger(); + this.connectionTimeoutMillis = this.initConnectionTimeoutMillis(); + this.heartbeatManager = new HeartbeatManager(client, this); + this.authenticationTimeout = this.heartbeatManager.getHeartbeatTimeout(); + this.shuffleMemberList = client.getConfig().properties['hazelcast.client.shuffle.member.list'] as boolean; + this.isSmartRoutingEnabled = client.getConfig().networkConfig.smartRouting; + this.waitStrategy = this.initWaitStrategy(client.getConfig()); + const connectionStrategyConfig = client.getConfig().connectionStrategyConfig; + this.asyncStart = connectionStrategyConfig.asyncStart; + this.reconnectMode = connectionStrategyConfig.reconnectMode; + } + + public start(): Promise { + if (this.alive) { + return Promise.resolve(); + } + this.alive = true; + + this.heartbeatManager.start(); + return this.connectToCluster() + .then(() => { + if (this.isSmartRoutingEnabled) { + this.reconnectToMembersTask = scheduleWithRepetition(this.reconnectToMembers.bind(this), 1000, 1000); + } + }); + } + + public connectToAllClusterMembers(): Promise { + if (!this.isSmartRoutingEnabled) { + return Promise.resolve(); + } + + const members = this.client.getClusterService().getMembers(); + return this.tryConnectToAllClusterMembers(members); + } + + public shutdown(): void { + if (!this.alive) { + return; + } + + this.alive = false; + if (this.isSmartRoutingEnabled) { + cancelRepetitionTask(this.reconnectToMembersTask); + } + this.pendingConnections.forEach((pending) => { + pending.reject(new ClientNotActiveError('Hazelcast client is shutting down')); + }); + + this.activeConnections.forEach((connection) => { + connection.close('Hazelcast client is shutting down', null); + }); + + this.removeAllListeners(CONNECTION_REMOVED_EVENT_NAME); + this.removeAllListeners(CONNECTION_ADDED_EVENT_NAME); + this.heartbeatManager.shutdown(); + } + + public getConnection(uuid: UUID): ClientConnection { + return this.activeConnections.get(uuid.toString()); + } + + public checkIfInvocationAllowed(): Error { + const state = this.clientState; + if (state === ClientState.INITIALIZED_ON_CLUSTER && this.activeConnections.size > 0) { + return null; + } + + let error: Error; + if (state === ClientState.INITIAL) { + if (this.asyncStart) { + error = new ClientOfflineError(); + } else { + error = new IOError('No connection found to cluster since the client is starting.'); + } + } else if (this.reconnectMode === ReconnectMode.ASYNC) { + error = new ClientOfflineError(); + } else { + error = new IOError('No connection found to cluster.'); + } + return error; + } + + public getActiveConnections(): ClientConnection[] { + return Array.from(this.activeConnections.values()); + } + + public isAlive(): boolean { + return this.alive; + } + + public getClientUuid(): UUID { + return this.clientUuid; + } + + public getOrConnect(address: Address): Promise { + if (!this.client.getLifecycleService().isRunning()) { + return Promise.reject(new ClientNotActiveError('Client is not active.')); + } + + const connection = this.getConnectionFromAddress(address); + if (connection) { + return Promise.resolve(connection); + } + + const addressKey = address.toString(); + const pendingConnection = this.pendingConnections.get(addressKey); + if (pendingConnection) { + return pendingConnection.promise; + } + + const connectionResolver: Promise.Resolver = DeferredPromise(); + this.pendingConnections.set(addressKey, connectionResolver); + + const processResponseCallback = (msg: ClientMessage) => { + this.client.getInvocationService().processResponse(msg); + }; + + let translatedAddress: Address; + let clientConnection: ClientConnection; + this.translate(address) + .then((translated) => { + translatedAddress = translated; + if (translatedAddress == null) { + throw new RangeError(`Address Translator could not translate address ${address}`); + } + return this.triggerConnect(translatedAddress); + }) + .then((socket) => { + clientConnection = new ClientConnection(this.client, translatedAddress, socket, this.connectionIdCounter++); + return this.initiateCommunication(socket); + }) + .then(() => clientConnection.registerResponseCallback(processResponseCallback)) + .then(() => this.authenticateOnCluster(clientConnection)) + .then(() => connectionResolver.resolve(clientConnection)) + .catch((error) => connectionResolver.reject(error)); + + return connectionResolver.promise + .timeout(this.connectionTimeoutMillis, new HazelcastError(`Connection timed out to address ${address}.`)) + .finally(() => this.pendingConnections.delete(addressKey)); + } + + public getRandomConnection(): ClientConnection { + if (this.isSmartRoutingEnabled) { + const member = this.loadBalancer.next(); + if (member != null) { + const connection = this.getConnection(member.uuid); + if (connection != null) { + return connection; + } + } + } + + const iterator = this.activeConnections.values(); + const next = iterator.next(); + if (!next.done) { + return next.value; + } else { + return null; + } + } + + public onConnectionClose(connection: ClientConnection): void { + const endpoint = connection.getRemoteAddress(); + const memberUuid = connection.getRemoteUuid(); + + if (endpoint == null) { + this.logger.trace('ConnectionManager', 'Destroying ' + connection + + ', but it has endpoint set to null -> not removing it from a connection map'); + return; + } + + if (memberUuid != null && this.activeConnections.delete(memberUuid.toString())) { + this.logger.info('ConnectionManager', 'Removed connection to endpoint: ' + + endpoint + ':' + memberUuid + ', connection: ' + connection); + if (this.activeConnections.size === 0) { + if (this.clientState === ClientState.INITIALIZED_ON_CLUSTER) { + this.emitLifecycleEvent(LifecycleState.DISCONNECTED); + } + this.triggerClusterReconnection(); + } + + this.emitConnectionRemovedEvent(connection); + } else { + this.logger.trace('ConnectionManager', 'Destroying a connection, but there is no mapping ' + + endpoint + ':' + memberUuid + '->' + connection + ' in the connection map.)'); + } + } + + private initWaitStrategy(config: ClientConfig): WaitStrategy { + const connectionStrategyConfig = config.connectionStrategyConfig; + const retryConfig = connectionStrategyConfig.connectionRetryConfig; + return new WaitStrategy(retryConfig.initialBackoffMillis, retryConfig.maxBackoffMillis, retryConfig.multiplier, + retryConfig.clusterConnectTimeoutMillis, retryConfig.jitter, this.logger); + } + + private initConnectionTimeoutMillis(): number { + const networkConfig = this.client.getConfig().networkConfig; + const connTimeout = networkConfig.connectionTimeout; + return connTimeout === 0 ? SET_TIMEOUT_MAX_DELAY : connTimeout; + } + + private connectToCluster(): Promise { + if (this.asyncStart) { + return this.submitConnectToClusterTask(); + } else { + return this.doConnectToCluster(); + } + } + + private submitConnectToClusterTask(): Promise { + if (this.connectToClusterTaskSubmitted) { + return Promise.resolve(); + } + + this.doConnectToCluster() + .then(() => { + this.connectToClusterTaskSubmitted = false; + if (this.activeConnections.size === 0) { + this.logger.warn('ConnectionManager', 'No connection to cluster ' + this.clusterId); + return this.submitConnectToClusterTask(); + } + }) + .catch((error: Error) => { + this.logger.warn('ConnectionManager', 'Could not connect to any cluster, shutting down ' + + 'the client: ' + error.message); + this.shutdownClient(); + }); + + this.connectToClusterTaskSubmitted = true; + return Promise.resolve(); + } + + private doConnectToCluster(): Promise { + const triedAddresses = new Set(); + this.waitStrategy.reset(); + return this.tryConnectingToAddresses(triedAddresses) + .then((isConnected) => { + if (isConnected) { + return; + } + this.logger.info('ConnectionManager', 'Unable to connect any address from the cluster ' + + 'with the name: ' + this.client.getConfig().clusterName + + '. The following addresses were tried: ' + + Array.from(triedAddresses)); + + const message = this.client.getLifecycleService().isRunning() + ? 'Unable to connect any cluster.' : 'Client is being shutdown.'; + throw new IllegalStateError(message); + }); + } + + private tryConnectingToAddresses(triedAddresses: Set): Promise { + return this.getPossibleMemberAddresses() + .then((addresses) => { + return this.tryConnectingToAddress(0, addresses, triedAddresses); + }) + .then((isConnected) => { + if (isConnected) { + return true; + } + // If the address providers load no addresses (which seems to be possible), + // then the above loop is not entered and the lifecycle check is missing, + // hence we need to repeat the same check at this point. + if (!this.client.getLifecycleService().isRunning()) { + return Promise.reject(new ClientNotActiveError('Client is not active.')); + } + return this.waitStrategy.sleep() + .then((notTimedOut) => { + if (notTimedOut) { + return this.tryConnectingToAddresses(triedAddresses); + } + return false; + }); + }) + .catch(ClientNotAllowedInClusterError, InvalidConfigurationError, (error: Error) => { + this.logger.warn('ConnectionManager', 'Stopped trying on the cluster: ' + + this.client.getConfig().clusterName + ' reason: ' + error.message); + return false; + }); + } + + private tryConnectingToAddress(index: number, addresses: Address[], triedAddresses: Set): Promise { + if (index >= addresses.length) { + return Promise.resolve(false); + } + const address = addresses[index]; + if (!this.client.getLifecycleService().isRunning()) { + return Promise.reject(new ClientNotActiveError('Client is not active.')); + } + triedAddresses.add(address.toString()); + return this.connect(address) + .then((connection) => { + if (connection != null) { + return true; + } + return this.tryConnectingToAddress(index + 1, addresses, triedAddresses); + }); + } + + private connect(address: Address): Promise { + this.logger.info('ConnectionManager', 'Trying to connect to ' + address); + return this.getOrConnect(address) + .catch((error) => { + this.logger.warn('ConnectionManager', 'Error during initial connection to ' + address + ' ' + + error); + return null; + }); + } + + private emitLifecycleEvent(state: LifecycleState): void { + this.client.getLifecycleService().emitLifecycleEvent(state); + } + + private getPossibleMemberAddresses(): Promise { + const addresses = this.client.getClusterService().getMembers() + .map(((member) => member.address.toString())); + + if (this.shuffleMemberList) { + shuffleArray(addresses); + } + + const addressProvider = this.client.getAddressProvider(); + + return addressProvider.loadAddresses() + .catch((error: Error) => { + this.logger.warn('ConnectionManager', 'Error from AddressProvider ' + addressProvider + + ', error: ' + error.message); + return new Array(); + }) + .then((providerAddresses) => { + if (this.shuffleMemberList) { + shuffleArray(providerAddresses); + } + const allAddresses = Array.from(new Set([...addresses, ...providerAddresses])); + const result: Address[] = []; + for (const address of allAddresses) { + result.push(...AddressHelper.getSocketAddresses(address)); + } + return result; + }); + } + + private getConnectionFromAddress(address: Address): ClientConnection { + for (const connection of this.getActiveConnections()) { + if (connection.getRemoteAddress().equals(address)) { + return connection; + } + } + return null; + } + + private initiateCommunication(socket: net.Socket): Promise { + // Send the protocol version + const deferred = DeferredPromise(); + socket.write(BINARY_PROTOCOL_VERSION as any, (err: Error) => { + if (err) { + deferred.reject(err); + } + deferred.resolve(); + }); + + return deferred.promise; + } + + private triggerConnect(translatedAddress: Address): Promise { + if (this.client.getConfig().networkConfig.sslConfig.enabled) { + if (this.client.getConfig().networkConfig.sslConfig.sslOptions) { + const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions; + return this.connectTLSSocket(translatedAddress, opts); + } else if (this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig) { + const factoryConfig = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig; + const factoryProperties = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryProperties; + let factory: SSLOptionsFactory; + if (factoryConfig.path) { + factory = new (loadNameFromPath(factoryConfig.path, factoryConfig.exportedName))(); + } else { + factory = new BasicSSLOptionsFactory(); + } + return factory.init(factoryProperties).then(() => { + return this.connectTLSSocket(translatedAddress, factory.getSSLOptions()); + }); + } else { + // the default behavior when ssl is enabled + const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions = { + checkServerIdentity: (): any => null, + rejectUnauthorized: true, + }; + return this.connectTLSSocket(translatedAddress, opts); + } + } else { + return this.connectNetSocket(translatedAddress); + } + } + + private connectTLSSocket(address: Address, configOpts: any): Promise { + const connectionResolver = DeferredPromise(); + const socket = tls.connect(address.port, address.host, configOpts); + socket.once('secureConnect', () => { + connectionResolver.resolve(socket); + }); + socket.on('error', (e: any) => { + this.logger.warn('ConnectionManager', 'Could not connect to address ' + address.toString(), e); + connectionResolver.reject(e); + if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { + const connection = this.getConnectionFromAddress(address); + if (connection != null) { + this.onConnectionClose(connection); + } + } + }); + return connectionResolver.promise; + } + + private connectNetSocket(address: Address): Promise { + const connectionResolver = DeferredPromise(); + const socket = net.connect(address.port, address.host); + socket.once('connect', () => { + connectionResolver.resolve(socket); + }); + socket.on('error', (e: any) => { + this.logger.warn('ConnectionManager', 'Could not connect to address ' + address.toString(), e); + connectionResolver.reject(e); + if (e.code === 'EPIPE' || e.code === 'ECONNRESET') { + const connection = this.getConnectionFromAddress(address); + if (connection != null) { + this.onConnectionClose(connection); + } + } + }); + return connectionResolver.promise; + } + + private emitConnectionAddedEvent(connection: ClientConnection): void { + this.emit(CONNECTION_ADDED_EVENT_NAME, connection); + } + + private emitConnectionRemovedEvent(connection: ClientConnection): void { + this.emit(CONNECTION_REMOVED_EVENT_NAME, connection); + } + + private translate(target: Address): Promise
{ + const addressProvider = this.client.getAddressProvider(); + return addressProvider.translate(target) + .catch((error: Error) => { + this.logger.warn('ConnectionManager', 'Failed to translate address ' + target + + ' via address provider ' + error.message); + return Promise.reject(error); + }); + } + + private triggerClusterReconnection(): void { + if (this.reconnectMode === ReconnectMode.OFF) { + this.logger.info('ConnectionManager', 'RECONNECT MODE is off. Shutting down the client.'); + this.shutdownClient(); + return; + } + + if (this.client.getLifecycleService().isRunning()) { + this.submitConnectToClusterTask(); + } + } + + private shutdownClient(): void { + try { + this.client.getLifecycleService().shutdown(); + } catch (e) { + this.logger.error('ConnectionManager', `Error during client shutdown ${e}`); + } + } + + // This method makes sure that the smart client has connection to all cluster members. + // This is called periodically. + private reconnectToMembers(): void { + if (!this.client.getLifecycleService().isRunning()) { + return; + } + + for (const member of this.client.getClusterService().getMembers()) { + const address = member.address; + + if (this.getConnectionFromAddress(address) == null) { + if (this.connectingAddresses.has(address)) { + continue; + } + if (this.getConnection(member.uuid) == null) { + this.connectingAddresses.add(address); + this.getOrConnect(address) + .catch(() => { + // no-op + }) + .finally(() => { + this.connectingAddresses.delete(address); + }); + } + } + } + } + + private authenticateOnCluster(connection: ClientConnection): Promise { + const request = this.encodeAuthenticationRequest(); + const invocation = new Invocation(this.client, request); + invocation.connection = connection; + return this.client.getInvocationService() + .invokeUrgent(invocation) + .timeout(this.authenticationTimeout) + .catch((e) => { + connection.close('Failed to authenticate connection', e); + throw e; + }) + .then((responseMessage) => { + const response = ClientAuthenticationCodec.decodeResponse(responseMessage); + if (response.status === AuthenticationStatus.AUTHENTICATED) { + this.handleSuccessfulAuth(connection, response); + } else { + let error: Error; + switch (response.status) { + case AuthenticationStatus.CREDENTIALS_FAILED: + error = new AuthenticationError('Authentication failed. The configured cluster name on ' + + 'the client does not match the one configured in the cluster or ' + + 'the credentials set in the client security config could not be authenticated'); + break; + case AuthenticationStatus.SERIALIZATION_VERSION_MISMATCH: + error = new IllegalStateError('Server serialization version ' + + 'does not match to client.'); + break; + case AuthenticationStatus.NOT_ALLOWED_IN_CLUSTER: + error = new ClientNotAllowedInClusterError('Client is not allowed in the cluster'); + break; + default: + error = new AuthenticationError('Authentication status code not supported. Status: ' + + response.status); + } + connection.close('Failed to authenticate connection', error); + return Promise.reject(error); + } + }); + } + + private handleSuccessfulAuth(connection: ClientConnection, response: ClientAuthenticationResponseParams): void { + this.checkPartitionCount(response.partitionCount); + connection.setConnectedServerVersion(response.serverHazelcastVersion); + connection.setRemoteAddress(response.address); + connection.setRemoteUuid(response.memberUuid); + + const newClusterId = response.clusterId; + + const initialConnection = this.activeConnections.size === 0; + const changedCluster = initialConnection && this.clusterId != null && !newClusterId.equals(this.clusterId); + if (changedCluster) { + this.logger.warn('ConnectionManager', 'Switching from current cluster: ' + this.clusterId + + ' to new cluster: ' + newClusterId); + this.client.onClusterRestart(); + } + + this.activeConnections.set(response.memberUuid.toString(), connection); + if (initialConnection) { + this.clusterId = newClusterId; + if (changedCluster) { + this.clientState = ClientState.CONNECTED_TO_CLUSTER; + this.initializeClientOnCluster(newClusterId); + } else { + this.clientState = ClientState.INITIALIZED_ON_CLUSTER; + this.emitLifecycleEvent(LifecycleState.CONNECTED); + } + } + + this.logger.info('ConnectionManager', 'Authenticated with server ' + + response.address + ':' + response.memberUuid + ', server version: ' + response.serverHazelcastVersion + + ', local address: ' + connection.getLocalAddress()); + this.emitConnectionAddedEvent(connection); + + // It could happen that this connection is already closed and + // onConnectionClose() is called even before the block + // above is executed. In this case, now we have a closed but registered + // connection. We do a final check here to remove this connection + // if needed. + if (!connection.isAlive()) { + this.onConnectionClose(connection); + } + + } + + private encodeAuthenticationRequest(): ClientMessage { + const clusterName = this.client.getConfig().clusterName; + const clientVersion = BuildInfo.getClientVersion(); + const customCredentials = this.client.getConfig().customCredentials; + const clientName = this.client.getName(); + + let clientMessage: ClientMessage; + if (customCredentials != null) { + const credentialsPayload = this.client.getSerializationService().toData(customCredentials).toBuffer(); + + clientMessage = ClientAuthenticationCustomCodec.encodeRequest(clusterName, credentialsPayload, this.clientUuid, + CLIENT_TYPE, SERIALIZATION_VERSION, clientVersion, clientName, this.labels); + } else { + clientMessage = ClientAuthenticationCodec.encodeRequest(clusterName, null, null, this.clientUuid, + CLIENT_TYPE, SERIALIZATION_VERSION, clientVersion, clientName, this.labels); + } + + return clientMessage; + } + + private checkPartitionCount(newPartitionCount: number): void { + const partitionService = this.client.getPartitionService(); + if (!partitionService.checkAndSetPartitionCount(newPartitionCount)) { + throw new ClientNotAllowedInClusterError('Client can not work with this cluster because it has a different ' + + 'partition count. Expected partition count: ' + partitionService.getPartitionCount() + + ', member partition count: ' + newPartitionCount); + } + } + + private initializeClientOnCluster(targetClusterId: UUID): Promise { + if (!targetClusterId.equals(this.clusterId)) { + this.logger.warn('ConnectionManager', 'Won\'t send client state to cluster: ' + targetClusterId + + ' because switched to a new cluster: ' + this.clusterId); + return; + } + + return this.client.sendStateToCluster() + .then(() => { + if (targetClusterId.equals(this.clusterId)) { + this.logger.trace('ConnectionManager', 'Client state is sent to cluster: ' + + targetClusterId); + + this.clientState = ClientState.INITIALIZED_ON_CLUSTER; + this.emitLifecycleEvent(LifecycleState.CONNECTED); + } else { + this.logger.warn('ConnectionManager', 'Cannot set client state to initialized on ' + + 'cluster because current cluster id: ' + this.clusterId + ' is different than expected cluster id: ' + + targetClusterId); + } + }) + .catch((error: Error) => { + const clusterName = this.client.getConfig().clusterName; + this.logger.warn('ConnectionManager', 'Failure during sending state to the cluster: ' + + error.message); + if (targetClusterId.equals(this.clusterId)) { + this.logger.warn('ConnectionManager', 'Retrying sending state to the cluster: ' + + targetClusterId + ', name: ' + clusterName); + return this.initializeClientOnCluster(targetClusterId); + } + }); + } + + private tryConnectToAllClusterMembers(members: Member[]): Promise { + const promises: Array> = []; + + for (const member of members) { + promises.push(this.getOrConnect(member.address) + .catch(() => { + // No-op + })); + } + + return Promise.all(promises) + .then(() => undefined); + } +} diff --git a/src/network/WaitStrategy.ts b/src/network/WaitStrategy.ts new file mode 100644 index 000000000..3c2aecc4f --- /dev/null +++ b/src/network/WaitStrategy.ts @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ILogger} from '../logging/ILogger'; +import * as Promise from 'bluebird'; + +export class WaitStrategy { + private readonly initialBackoffMillis: number; + private readonly maxBackoffMillis: number; + private readonly multiplier: number; + private readonly jitter: number; + private readonly clusterConnectTimeoutMillis: number; + private logger: ILogger; + private attempt: number; + private currentBackoffMillis: number; + private clusterConnectAttemptBegin: number; + + constructor(initialBackoffMillis: number, maxBackoffMillis: number, multiplier: number, clusterConnectTimeoutMillis: number, + jitter: number, logger: ILogger) { + this.initialBackoffMillis = initialBackoffMillis; + this.maxBackoffMillis = maxBackoffMillis; + this.multiplier = multiplier; + this.clusterConnectTimeoutMillis = clusterConnectTimeoutMillis; + this.jitter = jitter; + this.logger = logger; + } + + public reset(): void { + this.attempt = 0; + this.clusterConnectAttemptBegin = Date.now(); + this.currentBackoffMillis = Math.min(this.maxBackoffMillis, this.initialBackoffMillis); + } + + public sleep(): Promise { + this.attempt++; + const currentTimeMillis = Date.now(); + const timePassed = currentTimeMillis - this.clusterConnectAttemptBegin; + if (timePassed > this.clusterConnectTimeoutMillis) { + this.logger.warn('WaitStrategy', 'Unable to get live cluster connection, cluster connect timeout (' + + this.clusterConnectTimeoutMillis + ' millis) is reached. Attempt ' + this.attempt); + return Promise.resolve(false); + } + + // random_between + // Random(-jitter * current_backoff, jitter * current_backoff) + let actualSleepTime = this.currentBackoffMillis + + this.currentBackoffMillis * this.jitter * (2.0 * Math.random() - 1.0); + + actualSleepTime = Math.min(actualSleepTime, this.clusterConnectTimeoutMillis - timePassed); + this.logger.warn('WaitStrategy', 'Unable to get live cluster connection, retry in ' + + actualSleepTime + ' ms, attempt: ' + this.attempt + ', cluster connect timeout: ' + + this.clusterConnectTimeoutMillis + ' ms, max backoff millis: ' + this.maxBackoffMillis); + + return Promise.delay(actualSleepTime) + .then(() => { + this.currentBackoffMillis = Math.min(Math.round(currentTimeMillis * this.multiplier), this.maxBackoffMillis); + return true; + }); + } +} diff --git a/src/protocol/AnchorDataListHolder.ts b/src/protocol/AnchorDataListHolder.ts new file mode 100644 index 000000000..f7904b4e3 --- /dev/null +++ b/src/protocol/AnchorDataListHolder.ts @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {Data} from '../serialization/Data'; +import {SerializationService} from '../serialization/SerializationService'; + +export class AnchorDataListHolder { + anchorPageList: number[]; + anchorDataList: Array<[Data, Data]>; + + constructor(anchorPageList: number[], anchorDataList: Array<[Data, Data]>) { + this.anchorPageList = anchorPageList; + this.anchorDataList = anchorDataList; + } + + asAnchorList(serializationService: SerializationService): Array<[number, [K, V]]> { + const anchorObjectList = new Array<[number, [K, V]]>(this.anchorDataList.length); + for (let i = 0; i < this.anchorDataList.length; i++) { + const dataEntry = this.anchorDataList[i]; + const pageNumber = this.anchorPageList[i]; + + const key: K = serializationService.toObject(dataEntry[0]); + const value: V = serializationService.toObject(dataEntry[1]); + anchorObjectList[i] = [pageNumber, [key, value]]; + } + + return anchorObjectList; + } +} diff --git a/src/codec/FlakeIdGeneratorMessageType.ts b/src/protocol/AuthenticationStatus.ts similarity index 74% rename from src/codec/FlakeIdGeneratorMessageType.ts rename to src/protocol/AuthenticationStatus.ts index e208854f9..a37e61cd2 100644 --- a/src/codec/FlakeIdGeneratorMessageType.ts +++ b/src/protocol/AuthenticationStatus.ts @@ -14,7 +14,12 @@ * limitations under the License. */ -/* tslint:disable */ -export class FlakeIdGeneratorMessageType { - static FLAKEIDGENERATOR_NEWIDBATCH = 0x1f01; +/** + * Status codes of authentication results. + */ +export enum AuthenticationStatus { + AUTHENTICATED = 0, + CREDENTIALS_FAILED = 1, + SERIALIZATION_VERSION_MISMATCH = 2, + NOT_ALLOWED_IN_CLUSTER = 3, } diff --git a/src/protocol/ClientProtocolErrorCodes.ts b/src/protocol/ClientProtocolErrorCodes.ts index 1b4086717..33cd40e53 100644 --- a/src/protocol/ClientProtocolErrorCodes.ts +++ b/src/protocol/ClientProtocolErrorCodes.ts @@ -29,79 +29,85 @@ export class ClientProtocolErrorCodes { static readonly CLASS_NOT_FOUND = 11; static readonly CONCURRENT_MODIFICATION = 12; static readonly CONFIG_MISMATCH = 13; - static readonly CONFIGURATION = 14; - static readonly DISTRIBUTED_OBJECT_DESTROYED = 15; - static readonly DUPLICATE_INSTANCE_NAME = 16; - static readonly EOF = 17; - static readonly ENTRY_PROCESSOR = 18; - static readonly EXECUTION = 19; - static readonly HAZELCAST = 20; - static readonly HAZELCAST_INSTANCE_NOT_ACTIVE = 21; - static readonly HAZELCAST_OVERLOAD = 22; - static readonly HAZELCAST_SERIALIZATION = 23; - static readonly IO = 24; - static readonly ILLEGAL_ARGUMENT = 25; - static readonly ILLEGAL_ACCESS_EXCEPTION = 26; - static readonly ILLEGAL_ACCESS_ERROR = 27; - static readonly ILLEGAL_MONITOR_STATE = 28; - static readonly ILLEGAL_STATE = 29; - static readonly ILLEGAL_THREAD_STATE = 30; - static readonly INDEX_OUT_OF_BOUNDS = 31; - static readonly INTERRUPTED = 32; - static readonly INVALID_ADDRESS = 33; - static readonly INVALID_CONFIGURATION = 34; - static readonly MEMBER_LEFT = 35; - static readonly NEGATIVE_ARRAY_SIZE = 36; - static readonly NO_SUCH_ELEMENT = 37; - static readonly NOT_SERIALIZABLE = 38; - static readonly NULL_POINTER = 39; - static readonly OPERATION_TIMEOUT = 40; - static readonly PARTITION_MIGRATING = 41; - static readonly QUERY = 42; - static readonly QUERY_RESULT_SIZE_EXCEEDED = 43; - static readonly QUORUM = 44; - static readonly REACHED_MAX_SIZE = 45; - static readonly REJECTED_EXECUTION = 46; - static readonly REMOTE_MAP_REDUCE = 47; - static readonly RESPONSE_ALREADY_SENT = 48; - static readonly RETRYABLE_HAZELCAST = 49; - static readonly RETRYABLE_IO = 50; - static readonly RUNTIME = 51; - static readonly SECURITY = 52; - static readonly SOCKET = 53; - static readonly STALE_SEQUENCE = 54; - static readonly TARGET_DISCONNECTED = 55; - static readonly TARGET_NOT_MEMBER = 56; - static readonly TIMEOUT = 57; - static readonly TOPIC_OVERLOAD = 58; - static readonly TOPOLOGY_CHANGED = 59; - static readonly TRANSACTION = 60; - static readonly TRANSACTION_NOT_ACTIVE = 61; - static readonly TRANSACTION_TIMED_OUT = 62; - static readonly URI_SYNTAX = 63; - static readonly UTF_DATA_FORMAT = 64; - static readonly UNSUPPORTED_OPERATION = 65; - static readonly WRONG_TARGET = 66; - static readonly XA = 67; - static readonly ACCESS_CONTROL = 68; - static readonly LOGIN = 69; - static readonly UNSUPPORTED_CALLBACK = 70; - static readonly NO_DATA_MEMBER = 71; - static readonly REPLICATED_MAP_CANT_BE_CREATED = 72; - static readonly MAX_MESSAGE_SIZE_EXCEEDED = 73; - static readonly WAN_REPLICATION_QUEUE_FULL = 74; - static readonly ASSERTION_ERROR = 75; - static readonly OUT_OF_MEMORY_ERROR = 76; - static readonly STACK_OVERFLOW_ERROR = 77; - static readonly NATIVE_OUT_OF_MEMORY_ERROR = 78; - static readonly SERVICE_NOT_FOUND = 79; - static readonly STALE_TASK_ID = 80; - static readonly DUPLICATE_TASK = 81; - static readonly STALE_TASK = 82; - static readonly LOCAL_MEMBER_RESET = 83; - static readonly INDETERMINATE_OPERATION_STATE = 84; - static readonly FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION = 85; - static readonly TARGET_NOT_REPLICA_EXCEPTION = 86; - static readonly MUTATION_DISALLOWED_EXCEPTION = 87; - static readonly CONSISTENCY_LOST_EXCEPTION = 88; + static readonly DISTRIBUTED_OBJECT_DESTROYED = 14; + static readonly EOF = 15; + static readonly ENTRY_PROCESSOR = 16; + static readonly EXECUTION = 17; + static readonly HAZELCAST = 18; + static readonly HAZELCAST_INSTANCE_NOT_ACTIVE = 19; + static readonly HAZELCAST_OVERLOAD = 20; + static readonly HAZELCAST_SERIALIZATION = 21; + static readonly IO = 22; + static readonly ILLEGAL_ARGUMENT = 23; + static readonly ILLEGAL_ACCESS_EXCEPTION = 24; + static readonly ILLEGAL_ACCESS_ERROR = 25; + static readonly ILLEGAL_MONITOR_STATE = 26; + static readonly ILLEGAL_STATE = 27; + static readonly ILLEGAL_THREAD_STATE = 28; + static readonly INDEX_OUT_OF_BOUNDS = 29; + static readonly INTERRUPTED = 30; + static readonly INVALID_ADDRESS = 31; + static readonly INVALID_CONFIGURATION = 32; + static readonly MEMBER_LEFT = 33; + static readonly NEGATIVE_ARRAY_SIZE = 34; + static readonly NO_SUCH_ELEMENT = 35; + static readonly NOT_SERIALIZABLE = 36; + static readonly NULL_POINTER = 37; + static readonly OPERATION_TIMEOUT = 38; + static readonly PARTITION_MIGRATING = 39; + static readonly QUERY = 40; + static readonly QUERY_RESULT_SIZE_EXCEEDED = 41; + static readonly SPLIT_BRAIN_PROTECTION = 42; + static readonly REACHED_MAX_SIZE = 43; + static readonly REJECTED_EXECUTION = 44; + static readonly RESPONSE_ALREADY_SENT = 45; + static readonly RETRYABLE_HAZELCAST = 46; + static readonly RETRYABLE_IO = 47; + static readonly RUNTIME = 48; + static readonly SECURITY = 49; + static readonly SOCKET = 50; + static readonly STALE_SEQUENCE = 51; + static readonly TARGET_DISCONNECTED = 52; + static readonly TARGET_NOT_MEMBER = 53; + static readonly TIMEOUT = 54; + static readonly TOPIC_OVERLOAD = 55; + static readonly TRANSACTION = 56; + static readonly TRANSACTION_NOT_ACTIVE = 57; + static readonly TRANSACTION_TIMED_OUT = 58; + static readonly URI_SYNTAX = 59; + static readonly UTF_DATA_FORMAT = 60; + static readonly UNSUPPORTED_OPERATION = 61; + static readonly WRONG_TARGET = 62; + static readonly XA = 63; + static readonly ACCESS_CONTROL = 64; + static readonly LOGIN = 65; + static readonly UNSUPPORTED_CALLBACK = 66; + static readonly NO_DATA_MEMBER = 67; + static readonly REPLICATED_MAP_CANT_BE_CREATED = 68; + static readonly MAX_MESSAGE_SIZE_EXCEEDED = 69; + static readonly WAN_REPLICATION_QUEUE_FULL = 70; + static readonly ASSERTION_ERROR = 71; + static readonly OUT_OF_MEMORY_ERROR = 72; + static readonly STACK_OVERFLOW_ERROR = 73; + static readonly NATIVE_OUT_OF_MEMORY_ERROR = 74; + static readonly SERVICE_NOT_FOUND = 75; + static readonly STALE_TASK_ID = 76; + static readonly DUPLICATE_TASK = 77; + static readonly STALE_TASK = 78; + static readonly LOCAL_MEMBER_RESET = 79; + static readonly INDETERMINATE_OPERATION_STATE = 80; + static readonly FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION = 81; + static readonly TARGET_NOT_REPLICA_EXCEPTION = 82; + static readonly MUTATION_DISALLOWED_EXCEPTION = 83; + static readonly CONSISTENCY_LOST_EXCEPTION = 84; + static readonly SESSION_EXPIRED_EXCEPTION = 85; + static readonly WAIT_KEY_CANCELLED_EXCEPTION = 86; + static readonly LOCK_ACQUIRE_LIMIT_REACHED_EXCEPTION = 87; + static readonly LOCK_OWNERSHIP_LOST_EXCEPTION = 88; + static readonly CP_GROUP_DESTROYED_EXCEPTION = 89; + static readonly CANNOT_REPLICATE_EXCEPTION = 90; + static readonly LEADER_DEMOTED_EXCEPTION = 91; + static readonly STALE_APPEND_REQUEST_EXCEPTION = 92; + static readonly NOT_LEADER_EXCEPTION = 93; + static readonly VERSION_MISMATCH_EXCEPTION = 94; } diff --git a/src/protocol/ErrorCodec.ts b/src/protocol/ErrorCodec.ts deleted file mode 100644 index 2b7157dcd..000000000 --- a/src/protocol/ErrorCodec.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import ClientMessage = require('../ClientMessage'); -import {StackTraceElementCodec} from './StackTraceElementCodec'; - -export class ErrorCodec { - - errorCode: number = null; - className: string = null; - message: string = null; - stackTrace: StackTraceElementCodec[] = []; - causeErrorCode: number = null; - causeClassName: string = null; - - static decode(clientMessage: ClientMessage): ErrorCodec { - const exception = new ErrorCodec(); - - exception.errorCode = clientMessage.readInt32(); - exception.className = clientMessage.readString(); - - const isMessageNull = clientMessage.readBoolean(); - if (!isMessageNull) { - exception.message = clientMessage.readString(); - } - - const stackTraceDepth = clientMessage.readInt32(); - exception.stackTrace = []; - for (let i = 0; i < stackTraceDepth; i++) { - exception.stackTrace.push(StackTraceElementCodec.decode(clientMessage)); - } - - exception.causeErrorCode = clientMessage.readInt32(); - - const causeClassNameNull = clientMessage.readBoolean(); - - if (!causeClassNameNull) { - exception.causeClassName = clientMessage.readString(); - } - - return exception; - } - -} diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index 3e8e28d57..9346bfa91 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import ClientMessage = require('../ClientMessage'); import { AuthenticationError, CallerNotMemberError, @@ -23,10 +22,8 @@ import { ClassNotFoundError, ConcurrentModificationError, ConfigMismatchError, - ConfigurationError, ConsistencyLostError, DistributedObjectDestroyedError, - DuplicateInstanceNameError, HazelcastError, HazelcastInstanceNotActiveError, IllegalStateError, @@ -37,7 +34,7 @@ import { NodeIdOutOfRangeError, PartitionMigratingError, QueryError, - QuorumError, + SplitBrainProtectionError, RetryableHazelcastError, RetryableIOError, StaleSequenceError, @@ -53,7 +50,9 @@ import { HazelcastSerializationError, } from '../HazelcastError'; import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; -import {ErrorCodec} from './ErrorCodec'; +import {ClientMessage} from '../ClientMessage'; +import {ErrorsCodec} from '../codec/builtin/ErrorsCodec'; +import {ErrorHolder} from './ErrorHolder'; type ErrorFactory = (msg: string, cause: Error) => Error; @@ -71,9 +70,7 @@ export class ClientErrorFactory { this.register(ClientProtocolErrorCodes.CLASS_NOT_FOUND, (m, c) => new ClassNotFoundError(m, c)); this.register(ClientProtocolErrorCodes.CONCURRENT_MODIFICATION, (m, c) => new ConcurrentModificationError(m, c)); this.register(ClientProtocolErrorCodes.CONFIG_MISMATCH, (m, c) => new ConfigMismatchError(m, c)); - this.register(ClientProtocolErrorCodes.CONFIGURATION, (m, c) => new ConfigurationError(m, c)); this.register(ClientProtocolErrorCodes.DISTRIBUTED_OBJECT_DESTROYED, (m, c) => new DistributedObjectDestroyedError(m, c)); - this.register(ClientProtocolErrorCodes.DUPLICATE_INSTANCE_NAME, (m, c) => new DuplicateInstanceNameError(m, c)); this.register(ClientProtocolErrorCodes.EOF, (m, c) => new IOError(m, c)); this.register(ClientProtocolErrorCodes.HAZELCAST, (m, c) => new HazelcastError(m, c)); this.register(ClientProtocolErrorCodes.HAZELCAST_INSTANCE_NOT_ACTIVE, @@ -96,7 +93,7 @@ export class ClientErrorFactory { this.register(ClientProtocolErrorCodes.PARTITION_MIGRATING, (m, c) => new PartitionMigratingError(m, c)); this.register(ClientProtocolErrorCodes.QUERY, (m, c) => new QueryError(m, c)); this.register(ClientProtocolErrorCodes.QUERY_RESULT_SIZE_EXCEEDED, (m, c) => new QueryError(m, c)); - this.register(ClientProtocolErrorCodes.QUORUM, (m, c) => new QuorumError(m, c)); + this.register(ClientProtocolErrorCodes.SPLIT_BRAIN_PROTECTION, (m, c) => new SplitBrainProtectionError(m, c)); this.register(ClientProtocolErrorCodes.RETRYABLE_HAZELCAST, (m, c) => new RetryableHazelcastError(m, c)); this.register(ClientProtocolErrorCodes.RETRYABLE_IO, (m, c) => new RetryableIOError(m, c)); this.register(ClientProtocolErrorCodes.SOCKET, (m, c) => new IOError(m, c)); @@ -116,17 +113,24 @@ export class ClientErrorFactory { } createErrorFromClientMessage(clientMessage: ClientMessage): Error { - const errorCodec = ErrorCodec.decode(clientMessage); - return this.createError(errorCodec.errorCode, errorCodec.className, errorCodec.message, null); + const errorHolders = ErrorsCodec.decode(clientMessage); + return this.createError(errorHolders, 0); } - createError(errorCode: number, className: string, message: string, cause: Error): Error { - const factoryFunc = this.codeToErrorConstructor.get(errorCode); + createError(errorHolders: ErrorHolder[], errorHolderIdx: number): Error { + if (errorHolderIdx === errorHolders.length) { + return null; + } + + const errorHolder = errorHolders[errorHolderIdx]; + const factoryFunc = this.codeToErrorConstructor.get(errorHolder.errorCode); + let error: Error; if (factoryFunc != null) { - return factoryFunc(message, cause); + error = factoryFunc(errorHolder.message, this.createError(errorHolders, errorHolderIdx + 1)); } else { - return new UndefinedErrorCodeError(message, className); + error = new UndefinedErrorCodeError(errorHolder.message, errorHolder.className); } + return error; } private register(code: number, errorFactory: ErrorFactory): void { diff --git a/src/connection/DefaultAddressTranslator.ts b/src/protocol/ErrorHolder.ts similarity index 57% rename from src/connection/DefaultAddressTranslator.ts rename to src/protocol/ErrorHolder.ts index bdcd28cf2..1f8098738 100644 --- a/src/connection/DefaultAddressTranslator.ts +++ b/src/protocol/ErrorHolder.ts @@ -14,19 +14,18 @@ * limitations under the License. */ -import {AddressTranslator} from './AddressTranslator'; -import * as Promise from 'bluebird'; -import Address = require('../Address'); +import {StackTraceElement} from './StackTraceElement'; -/** - * Default Address Translator is a no-op. It always returns the given address. - */ -export class DefaultAddressTranslator implements AddressTranslator { - refresh(): Promise { - return Promise.resolve(); - } +export class ErrorHolder { + errorCode: number; + className: string; + message: string; + stackTraceElements: StackTraceElement[]; - translate(address: Address): Promise
{ - return Promise.resolve(address); + constructor(errorCode: number, className: string, message: string, stackTraceElements: StackTraceElement[]) { + this.errorCode = errorCode; + this.className = className; + this.message = message; + this.stackTraceElements = stackTraceElements; } } diff --git a/src/protocol/PagingPredicateHolder.ts b/src/protocol/PagingPredicateHolder.ts new file mode 100644 index 000000000..1f89f1eae --- /dev/null +++ b/src/protocol/PagingPredicateHolder.ts @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {AnchorDataListHolder} from './AnchorDataListHolder'; +import {Data} from '../serialization/Data'; +import {Predicate} from '../core/Predicate'; +import {SerializationService} from '../serialization/SerializationService'; +import {PagingPredicate} from '../serialization/DefaultPredicates'; + +export class PagingPredicateHolder { + anchorDataListHolder: AnchorDataListHolder; + predicateData: Data; + comparatorData: Data; + pageSize: number; + page: number; + iterationTypeId: number; + partitionKeyData: Data; + + constructor(anchorDataListHolder: AnchorDataListHolder, predicateData: Data, comparatorData: Data, + pageSize: number, page: number, iterationTypeId: number, partitionKeyData: Data) { + this.anchorDataListHolder = anchorDataListHolder; + this.predicateData = predicateData; + this.comparatorData = comparatorData; + this.pageSize = pageSize; + this.page = page; + this.iterationTypeId = iterationTypeId; + this.partitionKeyData = partitionKeyData; + } + + static of(predicate: PagingPredicate, serializationService: SerializationService): PagingPredicateHolder { + if (predicate == null) { + return null; + } + + return this.buildHolder(serializationService, predicate); + } + + private static buildHolder(serializationService: SerializationService, predicate: PagingPredicate): PagingPredicateHolder { + const anchorList = predicate.getAnchorList(); + const anchorDataList = new Array<[Data, Data]>(anchorList.length); + const pageList = new Array(anchorList.length); + + for (let i = 0; i < anchorList.length; i++) { + const item = anchorList[i]; + pageList[i] = item[0]; + const anchorEntry = item[1]; + anchorDataList[i] = [serializationService.toData(anchorEntry[0]), serializationService.toData(anchorEntry[1])]; + } + + const anchorDataListHolder = new AnchorDataListHolder(pageList, anchorDataList); + const predicateData = serializationService.toData(predicate.getPredicate()); + const comparatorData = serializationService.toData(predicate.getComparator()); + return new PagingPredicateHolder(anchorDataListHolder, predicateData, comparatorData, predicate.getPageSize(), + predicate.getPage(), predicate.getIterationType().valueOf(), null); + } +} diff --git a/src/codec/DistributedObjectInfoCodec.ts b/src/protocol/StackTraceElement.ts similarity index 62% rename from src/codec/DistributedObjectInfoCodec.ts rename to src/protocol/StackTraceElement.ts index 01eee5ec1..287142fdd 100644 --- a/src/codec/DistributedObjectInfoCodec.ts +++ b/src/protocol/StackTraceElement.ts @@ -14,15 +14,16 @@ * limitations under the License. */ -/* tslint:disable */ -import ClientMessage = require('../ClientMessage'); +export class StackTraceElement { + className: string; + methodName: string; + fileName: string; + lineNumber: number; -class DistributedObjectInfoCodec { - static decode(clientMessage: ClientMessage, toObjectFunction: Function): any { - var serviceName = clientMessage.readString(); - var name = clientMessage.readString(); - return {key: serviceName, value: name}; + constructor(className: string, methodName: string, fileName: string, lineNumber: number) { + this.className = className; + this.methodName = methodName; + this.fileName = fileName; + this.lineNumber = lineNumber; } } - -export = DistributedObjectInfoCodec diff --git a/src/protocol/StackTraceElementCodec.ts b/src/protocol/StackTraceElementCodec.ts deleted file mode 100644 index d3be23d3b..000000000 --- a/src/protocol/StackTraceElementCodec.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import ClientMessage = require('../ClientMessage'); - -export class StackTraceElementCodec { - declaringClass: string = null; - methodName: string = null; - fileName: string = null; - lineNumber: number = null; - - static decode(payload: ClientMessage): StackTraceElementCodec { - const stackTraceElement = new StackTraceElementCodec(); - - stackTraceElement.declaringClass = payload.readString(); - stackTraceElement.methodName = payload.readString(); - - const fileNameNull = payload.readBoolean(); - if (!fileNameNull) { - stackTraceElement.fileName = payload.readString(); - } - stackTraceElement.lineNumber = payload.readInt32(); - return stackTraceElement; - } -} diff --git a/src/proxy/AtomicLongProxy.ts b/src/proxy/AtomicLongProxy.ts deleted file mode 100644 index 80a08b115..000000000 --- a/src/proxy/AtomicLongProxy.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import * as Long from 'long'; -import {AtomicLongAddAndGetCodec} from '../codec/AtomicLongAddAndGetCodec'; -import {AtomicLongCompareAndSetCodec} from '../codec/AtomicLongCompareAndSetCodec'; -import {AtomicLongDecrementAndGetCodec} from '../codec/AtomicLongDecrementAndGetCodec'; -import {AtomicLongGetAndAddCodec} from '../codec/AtomicLongGetAndAddCodec'; -import {AtomicLongGetAndIncrementCodec} from '../codec/AtomicLongGetAndIncrementCodec'; -import {AtomicLongGetAndSetCodec} from '../codec/AtomicLongGetAndSetCodec'; -import {AtomicLongGetCodec} from '../codec/AtomicLongGetCodec'; -import {AtomicLongIncrementAndGetCodec} from '../codec/AtomicLongIncrementAndGetCodec'; -import {AtomicLongSetCodec} from '../codec/AtomicLongSetCodec'; -import {IAtomicLong} from './IAtomicLong'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; - -export class AtomicLongProxy extends PartitionSpecificProxy implements IAtomicLong { - addAndGet(delta: Long | number): Promise { - return this.encodeInvoke(AtomicLongAddAndGetCodec, delta); - } - - compareAndSet(expect: Long | number, update: Long | number): Promise { - return this.encodeInvoke(AtomicLongCompareAndSetCodec, expect, update); - } - - decrementAndGet(): Promise { - return this.encodeInvoke(AtomicLongDecrementAndGetCodec); - } - - get(): Promise { - return this.encodeInvoke(AtomicLongGetCodec); - } - - getAndAdd(delta: Long | number): Promise { - return this.encodeInvoke(AtomicLongGetAndAddCodec, delta); - } - - getAndSet(newValue: Long | number): Promise { - return this.encodeInvoke(AtomicLongGetAndSetCodec, newValue); - } - - incrementAndGet(): Promise { - return this.encodeInvoke(AtomicLongIncrementAndGetCodec); - } - - getAndIncrement(): Promise { - return this.encodeInvoke(AtomicLongGetAndIncrementCodec); - } - - set(newValue: Long | number): Promise { - return this.encodeInvoke(AtomicLongSetCodec, newValue); - } - -} diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 90e38fd57..b2b805b4a 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -18,8 +18,9 @@ import * as Promise from 'bluebird'; import {BuildInfo} from '../BuildInfo'; import HazelcastClient from '../HazelcastClient'; import {Data} from '../serialization/Data'; -import Address = require('../Address'); -import ClientMessage = require('../ClientMessage'); +import {Address} from '../Address'; +import {ClientMessage} from '../ClientMessage'; +import {UUID} from '../core/UUID'; /** * Common super class for any proxy. @@ -67,6 +68,17 @@ export class BaseProxy { }); } + /** + * Destroys this client proxy instance locally without issuing distributed + * object destroy request to the cluster as the destroy method does. + *

+ * The local destruction operation still may perform some communication + * with the cluster; for example, to unregister remote event subscriptions. + */ + destroyLocally(): Promise { + return this.postDestroy(); + } + protected postDestroy(): Promise { return Promise.resolve(); } @@ -78,9 +90,9 @@ export class BaseProxy { * @param codecArguments * @returns */ - protected encodeInvokeOnKey(codec: any, partitionKey: any, ...codecArguments: any[]): Promise { + protected encodeInvokeOnKey(codec: any, partitionKey: any, ...codecArguments: any[]): Promise { const partitionId: number = this.client.getPartitionService().getPartitionId(partitionKey); - return this.encodeInvokeOnPartition(codec, partitionId, ...codecArguments); + return this.encodeInvokeOnPartition(codec, partitionId, ...codecArguments); } /** @@ -89,16 +101,14 @@ export class BaseProxy { * @param codecArguments * @returns */ - protected encodeInvokeOnRandomTarget(codec: any, ...codecArguments: any[]): Promise { + protected encodeInvokeOnRandomTarget(codec: any, ...codecArguments: any[]): Promise { const clientMessage = codec.encodeRequest(this.name, ...codecArguments); - const invocationResponse = this.client.getInvocationService().invokeOnRandomTarget(clientMessage); - return this.createPromise(codec, invocationResponse); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage); } - protected encodeInvokeOnAddress(codec: any, address: Address, ...codecArguments: any[]): Promise { + protected encodeInvokeOnTarget(codec: any, target: UUID, ...codecArguments: any[]): Promise { const clientMessage = codec.encodeRequest(this.name, ...codecArguments); - const invocation: Promise = this.client.getInvocationService().invokeOnTarget(clientMessage, address); - return this.createPromise(codec, invocation); + return this.client.getInvocationService().invokeOnTarget(clientMessage, target); } /** @@ -108,12 +118,9 @@ export class BaseProxy { * @param codecArguments * @returns */ - protected encodeInvokeOnPartition(codec: any, partitionId: number, ...codecArguments: any[]): Promise { + protected encodeInvokeOnPartition(codec: any, partitionId: number, ...codecArguments: any[]): Promise { const clientMessage = codec.encodeRequest(this.name, ...codecArguments); - const invocationResponse: Promise = this.client.getInvocationService() - .invokeOnPartition(clientMessage, partitionId); - - return this.createPromise(codec, invocationResponse); + return this.client.getInvocationService().invokeOnPartition(clientMessage, partitionId); } /** @@ -141,20 +148,4 @@ export class BaseProxy { } return BuildInfo.UNKNOWN_VERSION_ID; } - - private createPromise(codec: any, promise: Promise): Promise { - const toObject = this.toObject.bind(this); - return promise.then(function (clientMessage: ClientMessage): any { - if (codec.decodeResponse) { - const raw = codec.decodeResponse(clientMessage, toObject); - - const response = raw.response; - if (typeof response === 'undefined') { - return raw; - } else { - return response; - } - } - }); - } } diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/FlakeIdGeneratorProxy.ts index 82ea61604..feb8c5683 100644 --- a/src/proxy/FlakeIdGeneratorProxy.ts +++ b/src/proxy/FlakeIdGeneratorProxy.ts @@ -32,9 +32,11 @@ export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator super(client, serviceName, name); this.config = client.getConfig().getFlakeIdGeneratorConfig(name); this.autoBatcher = new AutoBatcher(() => { - return this.encodeInvokeOnRandomTarget(FlakeIdGeneratorNewIdBatchCodec, this.config.prefetchCount).then((re: any) => { - return new Batch(this.config.prefetchValidityMillis, re.base, re.increment, re.batchSize); - }); + return this.encodeInvokeOnRandomTarget(FlakeIdGeneratorNewIdBatchCodec, this.config.prefetchCount) + .then((clientMessage) => { + const response = FlakeIdGeneratorNewIdBatchCodec.decodeResponse(clientMessage); + return new Batch(this.config.prefetchValidityMillis, response.base, response.increment, response.batchSize); + }); }); } diff --git a/src/proxy/IAtomicLong.ts b/src/proxy/IAtomicLong.ts deleted file mode 100644 index 1713c642e..000000000 --- a/src/proxy/IAtomicLong.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import * as Long from 'long'; -import {DistributedObject} from '../DistributedObject'; - -export interface IAtomicLong extends DistributedObject { - addAndGet(delta: Long | number): Promise; - - compareAndSet(expect: Long | number, update: Long | number): Promise; - - decrementAndGet(): Promise; - - get(): Promise; - - getAndAdd(delta: Long | number): Promise; - - getAndSet(newValue: Long | number): Promise; - - incrementAndGet(): Promise; - - getAndIncrement(): Promise; - - set(newValue: Long | number): Promise; -} diff --git a/src/proxy/ILock.ts b/src/proxy/ILock.ts deleted file mode 100644 index 731a2fbd0..000000000 --- a/src/proxy/ILock.ts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; - -export interface ILock extends DistributedObject { - - /** - * Acquires this lock, waiting indefinitely for it to become available. - * The returned promise will be resolved as soon as this lock is acquired. - * If lease time is specified then this lock will be held for - * the specified amount of time and then released automatically. - * Otherwise it will be held indefinitely up until the user invokes `unlock`. - * @param leaseMillis period of time in milliseconds for which this lock should be held. - */ - lock(leaseMillis?: number): Promise; - - /** - * Tries to acquire this lock within a specified timeout. - * The returned promise will be resolved either when this lock is acquired or when timeout is reached. - * Setting timeout to -1 will make this method wait for the lock availability indefinitely. - * If lease time is specified then this lock will be held for - * the specified amount of time and then released automatically. - * Otherwise it will be held indefinitely up until the user invokes `unlock`. - * @param timeoutMillis period of time in milliseconds to wait for this lock to become available. - * @param leaseMillis period of time in milliseconds for which this lock should be held. - * @returns `true` if this lock was obtained in the specified time period, `false` otherwise. - */ - tryLock(timeoutMillis?: number, leaseMillis?: number): Promise; - - /** - * Unlocks the lock. - */ - unlock(): Promise; - - /** - * Forcefully unlocks the lock. - * Usually, the same client has to call `unlock` the same amount of times - * as the amount of times it has called `lock`, otherwise the lock will remain in locked state. - * This method will disregard the acquire count and release this lock immediately. - */ - forceUnlock(): Promise; - - /** - * @returns `true` if this lock is currently in the locked state, `false` otherwise. - */ - isLocked(): Promise; - - /** - * @returns `true` if this lock is currently held by this client, `false` otherwise. - */ - isLockedByThisClient(): Promise; - - /** - * @returns the number of times this lock was acquired by its owner, - * i.e. how many times the `unlock` method should be invoked for the lock to become free. - */ - getLockCount(): Promise; - - /** - * @returns the number of milliseconds in which the lease for this lock will expire. - */ - getRemainingLeaseTime(): Promise; -} diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index a3bf2003d..6b35b7612 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -16,12 +16,14 @@ import * as Promise from 'bluebird'; import {Aggregator} from '../aggregation/Aggregator'; -import {EntryView} from '../core/EntryView'; +import {SimpleEntryView} from '../core/SimpleEntryView'; import {MapListener} from '../core/MapListener'; import {Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../DistributedObject'; import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; +import {IndexType} from '../config/IndexType'; +import {IndexConfig} from '../config/IndexConfig'; export interface IMap extends DistributedObject { @@ -57,14 +59,55 @@ export interface IMap extends DistributedObject { aggregateWithPredicate(aggregator: Aggregator, predicate: Predicate): Promise; /** - * Adds an index to this map for the specified entries so that queries can run faster. - * @param attribute index attribute of value - * @param ordered `true` if index should be ordered, `false` otherwise. + * Adds an index to this map for the specified entries so + * that queries can run faster. + *

+ * Let's say your map values are Employee objects. + * 

+     *   class Employee implements Portable {
+     *     active: boolean = false;
+     *     age: number;
+     *     name: string = null;
+     *     // other fields
+     *
+     *     // portable implementation
+     *   }
+     *
+ * If you are querying your values mostly based on age and active then + * you may consider indexing these fields. + * 
+     *   const imap = client.getMap('employees');
+     *   const ageIndex = new IndexConfig();
+     *   ageIndex.type = IndexType.SORTED;
+     *   ageIndex.addAttribute('age');
+     *   const activeIndex = new IndexConfig();
+     *   activeIndex.type = IndexType.HASH;
+     *   activeIndex.addAttribute('active');
+     *   imap.addIndex(ageIndex);  // Sorted index for range queries
+     *   imap.addIndex(activeIndex); // Hash index for equality predicates
+     *
+ * Index attribute should either have a getter method or be public. + * You should also make sure to add the indexes before adding + * entries to this map. + *

+ * Time to Index + *

+ * Indexing time is executed in parallel on each partition by operation threads. The Map + * is not blocked during this operation. + *

+ * The time taken in proportional to the size of the Map and the number Members. + *

+ * Searches while indexes are being built + *

+ * Until the index finishes being created, any searches for the attribute will use a full Map scan, + * thus avoiding using a partially built index and returning incorrect results. + * + * @param indexConfig Index configuration. */ - addIndex(attribute: string, ordered: boolean): Promise; + addIndex(indexConfig: IndexConfig): Promise; /** - * This method checks whether the map has an item asssociated with key + * This method checks whether the map has an item associated with key * @param key * @throws {RangeError} if key is undefined or null * @return `true` if the map contains the key, `false` otherwise. @@ -119,9 +162,10 @@ export interface IMap extends DistributedObject { * @param key * @param value * @throws {RangeError} if key is undefined or null - * @return value associated with key, `undefined` if the key did not exist before. + * @return value associated with key, `undefined` if the key did not exist before. If optional value is specified, + * a boolean representing whether or not entry is removed is returned. */ - remove(key: K, value?: V): Promise; + remove(key: K, value?: V): Promise; /** * Removes specified key from map. Unlike {@link remove} this method does not return deleted value. @@ -298,7 +342,7 @@ export interface IMap extends DistributedObject { * @param key * @throws {RangeError} if key is null or undefined. */ - getEntryView(key: K): Promise>; + getEntryView(key: K): Promise>; /** * Tries to acquire the lock for the specified key. diff --git a/src/proxy/ISemaphore.ts b/src/proxy/ISemaphore.ts deleted file mode 100644 index 819dea48d..000000000 --- a/src/proxy/ISemaphore.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import {DistributedObject} from '../DistributedObject'; -import Long = require('long'); - -export interface ISemaphore extends DistributedObject { - /** - * Try to initialize this ISemaphore instance with the given permit count. - * @param permits - */ - init(permits: number): Promise; - - /** - * Acquires the given number of permits if they are available, and returns - * immediately, reducing the number of available permits by the given amount. - * If insufficient permits are available returned promise is not resolved - * until until there are sufficient number of available permits or this - * {ISemaphore} is destroyed. - * @param permits - */ - acquire(permits?: number): Promise; - - /** - * Returns the current number of permits currently available in this semaphore. - * This message is idempotent. - */ - availablePermits(): Promise; - - /** - * Acquires and returns all permits that are immediately available. - */ - drainPermits(): Promise; - - /** - * Shrinks the number of available permits by the indicated reduction. - * @param reduction - */ - reducePermits(reduction: number): Promise; - - /** - * Releases the given number of permits, increasing the number of available - * permits by that amount. There is no requirement that a thread that releases a - * permit must have acquired that permit by calling one of the acquire()acquire - * methods. Correct usage of a semaphore is established by programming convention - * in the application - */ - release(permits?: number): Promise; - - /** - * Acquires the given number of permits, if they are available, and returns - * immediately, with the value true, reducing the number of available permits - * by the given amount. If insufficient permits are available then this - * method will return immediately with the value false and the number of - * available permits is unchanged. - * @param permits - * @param timeout - */ - tryAcquire(permits: number, timeout: Long | number): Promise; -} diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index bbb018e57..72d2147bb 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -42,95 +42,160 @@ import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {IList} from './IList'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import ClientMessage = require('../ClientMessage'); +import {ClientMessage} from '../ClientMessage'; +import {UUID} from '../core/UUID'; export class ListProxy extends PartitionSpecificProxy implements IList { add(element: E): Promise { - return this.encodeInvoke(ListAddCodec, this.toData(element)); + return this.encodeInvoke(ListAddCodec, this.toData(element)) + .then((clientMessage) => { + const response = ListAddAllCodec.decodeResponse(clientMessage); + return response.response; + }); } addAll(elements: E[]): Promise { - return this.encodeInvoke(ListAddAllCodec, this.serializeList(elements)); + return this.encodeInvoke(ListAddAllCodec, this.serializeList(elements)) + .then((clientMessage) => { + const response = ListAddAllCodec.decodeResponse(clientMessage); + return response.response; + }); } addAllAt(index: number, elements: E[]): Promise { - return this.encodeInvoke(ListAddAllWithIndexCodec, index, this.serializeList(elements)); + return this.encodeInvoke(ListAddAllWithIndexCodec, index, this.serializeList(elements)) + .then((clientMessage) => { + const response = ListAddAllWithIndexCodec.decodeResponse(clientMessage); + return response.response; + }); } addAt(index: number, element: E): Promise { - return this.encodeInvoke(ListAddWithIndexCodec, index, this.toData(element)); + return this.encodeInvoke(ListAddWithIndexCodec, index, this.toData(element)) + .then(() => undefined); } clear(): Promise { - return this.encodeInvoke(ListClearCodec); + return this.encodeInvoke(ListClearCodec) + .then(() => undefined); } contains(entry: E): Promise { - return this.encodeInvoke(ListContainsCodec, this.toData(entry)); + return this.encodeInvoke(ListContainsCodec, this.toData(entry)) + .then((clientMessage) => { + const response = ListContainsCodec.decodeResponse(clientMessage); + return response.response; + }); } containsAll(elements: E[]): Promise { - return this.encodeInvoke(ListContainsAllCodec, this.serializeList(elements)); + return this.encodeInvoke(ListContainsAllCodec, this.serializeList(elements)) + .then((clientMessage) => { + const response = ListContainsAllCodec.decodeResponse(clientMessage); + return response.response; + }); } isEmpty(): Promise { - return this.encodeInvoke(ListIsEmptyCodec); + return this.encodeInvoke(ListIsEmptyCodec) + .then((clientMessage) => { + const response = ListIsEmptyCodec.decodeResponse(clientMessage); + return response.response; + }); } remove(entry: E): Promise { - return this.encodeInvoke(ListRemoveCodec, this.toData(entry)); + return this.encodeInvoke(ListRemoveCodec, this.toData(entry)) + .then((clientMessage) => { + const response = ListRemoveCodec.decodeResponse(clientMessage); + return response.response; + }); } removeAll(elements: E[]): Promise { - return this.encodeInvoke(ListCompareAndRemoveAllCodec, this.serializeList(elements)); + return this.encodeInvoke(ListCompareAndRemoveAllCodec, this.serializeList(elements)) + .then((clientMessage) => { + const response = ListCompareAndRemoveAllCodec.decodeResponse(clientMessage); + return response.response; + }); } retainAll(elements: E[]): Promise { - return this.encodeInvoke(ListCompareAndRetainAllCodec, this.serializeList(elements)); + return this.encodeInvoke(ListCompareAndRetainAllCodec, this.serializeList(elements)) + .then((clientMessage) => { + const response = ListCompareAndRetainAllCodec.decodeResponse(clientMessage); + return response.response; + }); } removeAt(index: number): Promise { - return this.encodeInvoke(ListRemoveWithIndexCodec, index); + return this.encodeInvoke(ListRemoveWithIndexCodec, index) + .then((clientMessage) => { + const response = ListRemoveWithIndexCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } get(index: number): Promise { - return this.encodeInvoke(ListGetCodec, index); + return this.encodeInvoke(ListGetCodec, index) + .then((clientMessage) => { + const response = ListGetCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } set(index: number, element: E): Promise { - return this.encodeInvoke(ListSetCodec, index, this.toData(element)); + return this.encodeInvoke(ListSetCodec, index, this.toData(element)) + .then((clientMessage) => { + const response = ListSetCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } indexOf(element: E): Promise { - return this.encodeInvoke(ListIndexOfCodec, this.toData(element)); + return this.encodeInvoke(ListIndexOfCodec, this.toData(element)) + .then((clientMessage) => { + const response = ListIndexOfCodec.decodeResponse(clientMessage); + return response.response; + }); } lastIndexOf(element: E): Promise { - return this.encodeInvoke(ListLastIndexOfCodec, this.toData(element)); + return this.encodeInvoke(ListLastIndexOfCodec, this.toData(element)) + .then((clientMessage) => { + const response = ListLastIndexOfCodec.decodeResponse(clientMessage); + return response.response; + }); } size(): Promise { - return this.encodeInvoke(ListSizeCodec); + return this.encodeInvoke(ListSizeCodec) + .then((clientMessage) => { + const response = ListSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } subList(start: number, end: number): Promise> { - return this.encodeInvoke(ListSubCodec, start, end).then((encoded: Data[]) => { - return new ReadOnlyLazyList(encoded, this.client.getSerializationService()); - }); + return this.encodeInvoke(ListSubCodec, start, end) + .then((clientMessage) => { + const response = ListSubCodec.decodeResponse(clientMessage); + return new ReadOnlyLazyList(response.response, this.client.getSerializationService()); + }); } toArray(): Promise { - return this.encodeInvoke(ListGetAllCodec).then((elements: Data[]) => { - return elements.map((element) => { - return this.toObject(element); + return this.encodeInvoke(ListGetAllCodec) + .then((clientMessage) => { + const response = ListGetAllCodec.decodeResponse(clientMessage); + return response.response.map(this.toObject.bind(this)); }); - }); } addItemListener(listener: ItemListener, includeValue: boolean): Promise { const listenerHandler = (message: ClientMessage) => { - ListAddListenerCodec.handle(message, (element: Data, uuid: string, eventType: number) => { + ListAddListenerCodec.handle(message, (element: Data, uuid: UUID, eventType: number) => { const responseObject = element ? this.toObject(element) : null; const member = this.client.getClusterService().getMember(uuid); @@ -163,10 +228,10 @@ export class ListProxy extends PartitionSpecificProxy implements IList { encodeAddRequest(localOnly: boolean): ClientMessage { return ListAddListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return ListAddListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return ListRemoveListenerCodec.encodeRequest(name, listenerId); }, }; diff --git a/src/proxy/LockProxy.ts b/src/proxy/LockProxy.ts deleted file mode 100644 index dba3d76b1..000000000 --- a/src/proxy/LockProxy.ts +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import {ILock} from './ILock'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; - -import * as Long from 'long'; -import {LockForceUnlockCodec} from '../codec/LockForceUnlockCodec'; -import {LockGetLockCountCodec} from '../codec/LockGetLockCountCodec'; -import {LockGetRemainingLeaseTimeCodec} from '../codec/LockGetRemainingLeaseTimeCodec'; -import {LockIsLockedByCurrentThreadCodec} from '../codec/LockIsLockedByCurrentThreadCodec'; -import {LockIsLockedCodec} from '../codec/LockIsLockedCodec'; -import {LockLockCodec} from '../codec/LockLockCodec'; -import {LockTryLockCodec} from '../codec/LockTryLockCodec'; -import {LockUnlockCodec} from '../codec/LockUnlockCodec'; -import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; - -export class LockProxy extends PartitionSpecificProxy implements ILock { - - private lockReferenceIdGenerator: LockReferenceIdGenerator = this.client.getLockReferenceIdGenerator(); - - lock(leaseMillis: number = -1): Promise { - return this.encodeInvoke(LockLockCodec, leaseMillis, 1, this.nextSequence()); - } - - tryLock(timeoutMillis: number = 0, leaseMillis: number = -1): Promise { - return this.encodeInvoke(LockTryLockCodec, 1, - leaseMillis, timeoutMillis, this.nextSequence()); - } - - unlock(): Promise { - return this.encodeInvoke(LockUnlockCodec, 1, this.nextSequence()); - } - - forceUnlock(): Promise { - return this.encodeInvoke(LockForceUnlockCodec, this.nextSequence()); - } - - isLocked(): Promise { - return this.encodeInvoke(LockIsLockedCodec); - } - - isLockedByThisClient(): Promise { - return this.encodeInvoke(LockIsLockedByCurrentThreadCodec, 1); - } - - getLockCount(): Promise { - return this.encodeInvoke(LockGetLockCountCodec); - } - - getRemainingLeaseTime(): Promise { - return this.encodeInvoke(LockGetRemainingLeaseTimeCodec).then(function (long): number { - return long.toNumber(); - }); - } - - private nextSequence(): Long { - return this.lockReferenceIdGenerator.getNextReferenceId(); - } -} diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 9a4f4ed21..4e7fbfeb6 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -67,7 +67,7 @@ import {MapValuesCodec} from '../codec/MapValuesCodec'; import {MapValuesWithPagingPredicateCodec} from '../codec/MapValuesWithPagingPredicateCodec'; import {MapValuesWithPredicateCodec} from '../codec/MapValuesWithPredicateCodec'; import {EventType} from '../core/EventType'; -import {EntryView} from '../core/EntryView'; +import {SimpleEntryView} from '../core/SimpleEntryView'; import {MapEvent, MapListener} from '../core/MapListener'; import {IterationType, Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; @@ -76,17 +76,26 @@ import {Data} from '../serialization/Data'; import {PagingPredicate} from '../serialization/DefaultPredicates'; import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; import * as SerializationUtil from '../serialization/SerializationUtil'; -import {assertArray, assertNotNull, getSortedQueryResultSet} from '../Util'; +import {assertArray, assertNotNull} from '../Util'; import {BaseProxy} from './BaseProxy'; import {IMap} from './IMap'; import {EntryEvent} from '../core/EntryListener'; -import ClientMessage = require('../ClientMessage'); +import {UUID} from '../core/UUID'; +import {ClientMessage} from '../ClientMessage'; +import {IndexConfig} from '../config/IndexConfig'; +import {IndexUtil} from '../util/IndexUtil'; +import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; +import {MapEntriesWithPagingPredicateCodec} from '../codec/MapEntriesWithPagingPredicateCodec'; export class MapProxy extends BaseProxy implements IMap { aggregate(aggregator: Aggregator): Promise { assertNotNull(aggregator); const aggregatorData = this.toData(aggregator); - return this.encodeInvokeOnRandomTarget(MapAggregateCodec, aggregatorData); + return this.encodeInvokeOnRandomTarget(MapAggregateCodec, aggregatorData) + .then((clientMessage) => { + const response = MapAggregateCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } aggregateWithPredicate(aggregator: Aggregator, predicate: Predicate): Promise { @@ -95,7 +104,11 @@ export class MapProxy extends BaseProxy implements IMap { this.checkNotPagingPredicate(predicate); const aggregatorData = this.toData(aggregator); const predicateData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapAggregateWithPredicateCodec, aggregatorData, predicateData); + return this.encodeInvokeOnRandomTarget(MapAggregateWithPredicateCodec, aggregatorData, predicateData) + .then((clientMessage) => { + const response = MapAggregateWithPredicateCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } executeOnKeys(keys: K[], entryProcessor: IdentifiedDataSerializable | Portable): Promise { @@ -108,7 +121,10 @@ export class MapProxy extends BaseProxy implements IMap { const keysData = SerializationUtil.serializeList(this.toData.bind(this), keys); const proData = this.toData(entryProcessor); return this.encodeInvokeOnRandomTarget(MapExecuteOnKeysCodec, proData, keysData) - .then>(SerializationUtil.deserializeEntryList.bind(this, toObject)); + .then>((clientMessage) => { + const response = MapExecuteOnKeysCodec.decodeResponse(clientMessage); + return SerializationUtil.deserializeEntryList(toObject, response.response); + }); } } @@ -125,86 +141,90 @@ export class MapProxy extends BaseProxy implements IMap { assertNotNull(entryProcessor); const proData = this.toData(entryProcessor); const toObject = this.toObject.bind(this); - if (predicate == null) { - return this.encodeInvokeOnRandomTarget>(MapExecuteOnAllKeysCodec, proData) - .then>(SerializationUtil.deserializeEntryList.bind(this, toObject)); + return this.encodeInvokeOnRandomTarget(MapExecuteOnAllKeysCodec, proData) + .then>((clientMessage) => { + const response = MapExecuteOnAllKeysCodec.decodeResponse(clientMessage); + return SerializationUtil.deserializeEntryList(toObject, response.response); + }); } else { const predData = this.toData(predicate); return this.encodeInvokeOnRandomTarget(MapExecuteWithPredicateCodec, proData, predData) - .then>(SerializationUtil.deserializeEntryList.bind(this, toObject)); + .then>((clientMessage) => { + const response = MapExecuteWithPredicateCodec.decodeResponse(clientMessage); + return SerializationUtil.deserializeEntryList(toObject, response.response); + }); } } entrySetWithPredicate(predicate: Predicate): Promise { assertNotNull(predicate); + const toObject = this.toObject.bind(this); if (predicate instanceof PagingPredicate) { predicate.setIterationType(IterationType.ENTRY); - const pData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget( - MapValuesWithPagingPredicateCodec, pData, - ).then(function (rawValues: Array<[Data, Data]>): any[] { - const deserValues = rawValues.map<[K, V]>(function (ite: [Data, Data]): [K, V] { - return [toObject(ite[0]), toObject(ite[1])]; + const serializationService = this.client.getSerializationService(); + const pagingPredicateHolder = PagingPredicateHolder.of(predicate, serializationService); + return this.encodeInvokeOnRandomTarget(MapEntriesWithPagingPredicateCodec, pagingPredicateHolder) + .then((clientMessage) => { + const response = MapEntriesWithPagingPredicateCodec.decodeResponse(clientMessage); + predicate.setAnchorList(response.anchorDataList.asAnchorList(serializationService)); + return SerializationUtil.deserializeEntryList(toObject, response.response); }); - return getSortedQueryResultSet(deserValues, predicate); - }); } else { const pData = this.toData(predicate); - const deserializedSet: Array<[K, V]> = []; - return this.encodeInvokeOnRandomTarget(MapEntriesWithPredicateCodec, pData).then( - function (entrySet: Array<[Data, Data]>): Array<[K, V]> { - entrySet.forEach(function (entry): void { - deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); - }); - return deserializedSet; + return this.encodeInvokeOnRandomTarget(MapEntriesWithPredicateCodec, pData) + .then((clientMessage) => { + const response = MapEntriesWithPredicateCodec.decodeResponse(clientMessage); + return SerializationUtil.deserializeEntryList(toObject, response.response); }); } } keySetWithPredicate(predicate: Predicate): Promise { assertNotNull(predicate); + const toObject = this.toObject.bind(this); if (predicate instanceof PagingPredicate) { predicate.setIterationType(IterationType.KEY); - const predData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapKeySetWithPagingPredicateCodec, predData).then( - function (rawValues: Data[]): any[] { - const deserValues = rawValues.map<[K, V]>(function (ite: Data): [K, V] { - return [toObject(ite), null]; - }); - return getSortedQueryResultSet(deserValues, predicate); + const serializationService = this.client.getSerializationService(); + const pagingPredicateHolder = PagingPredicateHolder.of(predicate, serializationService); + return this.encodeInvokeOnRandomTarget(MapKeySetWithPagingPredicateCodec, pagingPredicateHolder) + .then((clientMessage) => { + const response = MapKeySetWithPagingPredicateCodec.decodeResponse(clientMessage); + predicate.setAnchorList(response.anchorDataList.asAnchorList(serializationService)); + return response.response.map(toObject); }); } else { const predicateData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapKeySetWithPredicateCodec, predicateData).then( - function (entrySet: Data[]): K[] { - return entrySet.map(toObject); + return this.encodeInvokeOnRandomTarget(MapKeySetWithPredicateCodec, predicateData) + .then((clientMessage) => { + const response = MapKeySetWithPredicateCodec.decodeResponse(clientMessage); + return response.response.map(toObject); }); } } valuesWithPredicate(predicate: Predicate): Promise> { assertNotNull(predicate); - const toObject = this.toObject.bind(this); if (predicate instanceof PagingPredicate) { predicate.setIterationType(IterationType.VALUE); - const predData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget( - MapValuesWithPagingPredicateCodec, predData, - ).then((rawValues: Array<[Data, Data]>) => { - const desValues = rawValues.map<[K, V]>(function (ite: [Data, Data]): [K, V] { - return [toObject(ite[0]), toObject(ite[1])]; + const serializationService = this.client.getSerializationService(); + const pagingPredicateHolder = PagingPredicateHolder.of(predicate, serializationService); + return this.encodeInvokeOnRandomTarget(MapValuesWithPagingPredicateCodec, pagingPredicateHolder) + .then((clientMessage) => { + const response = MapValuesWithPagingPredicateCodec.decodeResponse(clientMessage); + predicate.setAnchorList(response.anchorDataList.asAnchorList(serializationService)); + return new ReadOnlyLazyList(response.response, serializationService); }); - return new ReadOnlyLazyList(getSortedQueryResultSet(desValues, predicate), this.client.getSerializationService()); - }); } else { const predicateData = this.toData(predicate); - return this.encodeInvokeOnRandomTarget(MapValuesWithPredicateCodec, predicateData).then((rawValues: Data[]) => { - return new ReadOnlyLazyList(rawValues, this.client.getSerializationService()); - }); + return this.encodeInvokeOnRandomTarget(MapValuesWithPredicateCodec, predicateData) + .then((clientMessage) => { + const response = MapValuesWithPredicateCodec.decodeResponse(clientMessage); + return new ReadOnlyLazyList(response.response, this.client.getSerializationService()); + }); } } @@ -222,7 +242,11 @@ export class MapProxy extends BaseProxy implements IMap { containsValue(value: V): Promise { assertNotNull(value); const valueData = this.toData(value); - return this.encodeInvokeOnRandomTarget(MapContainsValueCodec, valueData); + return this.encodeInvokeOnRandomTarget(MapContainsValueCodec, valueData) + .then((clientMessage) => { + const response = MapContainsValueCodec.decodeResponse(clientMessage); + return response.response; + }); } put(key: K, value: V, ttl: number = -1): Promise { @@ -256,22 +280,31 @@ export class MapProxy extends BaseProxy implements IMap { return this.getInternal(keyData); } - remove(key: K, value: V = null): Promise { + remove(key: K, value: V = null): Promise { assertNotNull(key); const keyData = this.toData(key); return this.removeInternal(keyData, value); } size(): Promise { - return this.encodeInvokeOnRandomTarget(MapSizeCodec); + return this.encodeInvokeOnRandomTarget(MapSizeCodec) + .then((clientMessage) => { + const response = MapSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } clear(): Promise { - return this.encodeInvokeOnRandomTarget(MapClearCodec); + return this.encodeInvokeOnRandomTarget(MapClearCodec) + .then(() => undefined); } isEmpty(): Promise { - return this.encodeInvokeOnRandomTarget(MapIsEmptyCodec); + return this.encodeInvokeOnRandomTarget(MapIsEmptyCodec) + .then((clientMessage) => { + const response = MapIsEmptyCodec.decodeResponse(clientMessage); + return response.response; + }); } getAll(keys: K[]): Promise { @@ -291,7 +324,6 @@ export class MapProxy extends BaseProxy implements IMap { } const result: Array<[any, any]> = []; return this.getAllInternal(partitionsToKeys, result).then(function (): Array<[any, any]> { - return result; }); } @@ -303,14 +335,11 @@ export class MapProxy extends BaseProxy implements IMap { } entrySet(): Promise { - const deserializedSet: Array<[K, V]> = []; - const toObject = this.toObject.bind(this); - return this.encodeInvokeOnRandomTarget(MapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>): Array<[K, V]> { - entrySet.forEach(function (entry): void { - deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); + return this.encodeInvokeOnRandomTarget(MapEntrySetCodec) + .then((clientMessage) => { + const response = MapEntrySetCodec.decodeResponse(clientMessage); + return SerializationUtil.deserializeEntryList(this.toObject.bind(this), response.response); }); - return deserializedSet; - }); } evict(key: K): Promise { @@ -320,51 +349,63 @@ export class MapProxy extends BaseProxy implements IMap { } evictAll(): Promise { - return this.encodeInvokeOnRandomTarget(MapEvictAllCodec); + return this.encodeInvokeOnRandomTarget(MapEvictAllCodec) + .then(() => undefined); } flush(): Promise { - return this.encodeInvokeOnRandomTarget(MapFlushCodec); + return this.encodeInvokeOnRandomTarget(MapFlushCodec) + .then(() => undefined); } lock(key: K, ttl: number = -1): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapLockCodec, keyData, keyData, 0, ttl, 0); + return this.encodeInvokeOnKey(MapLockCodec, keyData, keyData, 0, ttl, 0) + .then(() => undefined); } isLocked(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapIsLockedCodec, keyData, keyData); + return this.encodeInvokeOnKey(MapIsLockedCodec, keyData, keyData) + .then((clientMessage) => { + const response = MapIsLockedCodec.decodeResponse(clientMessage); + return response.response; + }); } unlock(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapUnlockCodec, keyData, keyData, 0, 0); + return this.encodeInvokeOnKey(MapUnlockCodec, keyData, keyData, 0, 0) + .then(() => undefined); } forceUnlock(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapForceUnlockCodec, keyData, keyData, 0); + return this.encodeInvokeOnKey(MapForceUnlockCodec, keyData, keyData, 0) + .then(() => undefined); } keySet(): Promise { - const toObject = this.toObject.bind(this); - return this.encodeInvokeOnRandomTarget(MapKeySetCodec).then(function (entrySet): K[] { - return entrySet.map(toObject); - }); + return this.encodeInvokeOnRandomTarget(MapKeySetCodec) + .then((clientMessage) => { + const response = MapKeySetCodec.decodeResponse(clientMessage); + return response.response.map(this.toObject.bind(this)); + }); } loadAll(keys: K[] = null, replaceExistingValues: boolean = true): Promise { if (keys == null) { - return this.encodeInvokeOnRandomTarget(MapLoadAllCodec, replaceExistingValues); + return this.encodeInvokeOnRandomTarget(MapLoadAllCodec, replaceExistingValues) + .then(() => undefined); } else { const toData = this.toData.bind(this); const keysData: Data[] = keys.map(toData); - return this.encodeInvokeOnRandomTarget(MapLoadGivenKeysCodec, keysData, replaceExistingValues); + return this.encodeInvokeOnRandomTarget(MapLoadGivenKeysCodec, keysData, replaceExistingValues) + .then(() => undefined); } } @@ -411,25 +452,46 @@ export class MapProxy extends BaseProxy implements IMap { } values(): Promise> { - return this.encodeInvokeOnRandomTarget(MapValuesCodec).then((valuesData) => { - return new ReadOnlyLazyList(valuesData, this.client.getSerializationService()); - }); + return this.encodeInvokeOnRandomTarget(MapValuesCodec) + .then((clientMessage) => { + const response = MapValuesCodec.decodeResponse(clientMessage); + return new ReadOnlyLazyList(response.response, this.client.getSerializationService()); + }); } - getEntryView(key: K): Promise> { + getEntryView(key: K): Promise> { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey>(MapGetEntryViewCodec, keyData, keyData, 0); + return this.encodeInvokeOnKey(MapGetEntryViewCodec, keyData, keyData, 0) + .then((clientMessage) => { + const response = MapGetEntryViewCodec.decodeResponse(clientMessage); + const dataEntryView = response.response; + if (dataEntryView == null) { + return null; + } + + return new SimpleEntryView(this.toObject(dataEntryView.key), this.toObject(dataEntryView.value), + dataEntryView.cost, dataEntryView.creationTime, dataEntryView.expirationTime, dataEntryView.hits, + dataEntryView.lastAccessTime, dataEntryView.lastStoredTime, dataEntryView.lastUpdateTime, + dataEntryView.version, dataEntryView.ttl, response.maxIdle); + }); } - addIndex(attribute: string, ordered: boolean): Promise { - return this.encodeInvokeOnRandomTarget(MapAddIndexCodec, attribute, ordered); + addIndex(indexConfig: IndexConfig): Promise { + assertNotNull(indexConfig); + const normalizedConfig = IndexUtil.validateAndNormalize(this.name, indexConfig); + return this.encodeInvokeOnRandomTarget(MapAddIndexCodec, normalizedConfig) + .then(() => undefined); } tryLock(key: K, timeout: number = 0, lease: number = -1): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapTryLockCodec, keyData, keyData, 0, lease, timeout, 0); + return this.encodeInvokeOnKey(MapTryLockCodec, keyData, keyData, 0, lease, timeout, 0) + .then((clientMessage) => { + const response = MapTryLockCodec.decodeResponse(clientMessage); + return response.response; + }); } tryPut(key: K, value: V, timeout: number): Promise { @@ -455,22 +517,35 @@ export class MapProxy extends BaseProxy implements IMap { } protected executeOnKeyInternal(keyData: Data, proData: Data): Promise { - return this.encodeInvokeOnKey(MapExecuteOnKeyCodec, keyData, proData, keyData, 1); + return this.encodeInvokeOnKey(MapExecuteOnKeyCodec, keyData, proData, keyData, 1) + .then((clientMessage) => { + const response = MapExecuteOnKeyCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } protected containsKeyInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapContainsKeyCodec, keyData, keyData, 0); + return this.encodeInvokeOnKey(MapContainsKeyCodec, keyData, keyData, 0) + .then((clientMessage) => { + const response = MapContainsKeyCodec.decodeResponse(clientMessage); + return response.response; + }); } protected putInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapPutCodec, keyData, keyData, valueData, 0, ttl); + return this.encodeInvokeOnKey(MapPutCodec, keyData, keyData, valueData, 0, ttl) + .then((clientMessage) => { + const response = MapPutCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } protected putAllInternal(partitionsToKeysData: { [id: string]: Array<[Data, Data]> }): Promise { const partitionPromises: Array> = []; for (const partition in partitionsToKeysData) { partitionPromises.push( - this.encodeInvokeOnPartition(MapPutAllCodec, Number(partition), partitionsToKeysData[partition]), + this.encodeInvokeOnPartition(MapPutAllCodec, Number(partition), partitionsToKeysData[partition]) + .then(() => undefined), ); } return Promise.all(partitionPromises).then(function (): any { @@ -479,25 +554,38 @@ export class MapProxy extends BaseProxy implements IMap { } protected getInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapGetCodec, keyData, keyData, 0); + return this.encodeInvokeOnKey(MapGetCodec, keyData, keyData, 0) + .then((clientMessage) => { + const response = MapGetCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } - protected removeInternal(keyData: Data, value: V = null): Promise { + protected removeInternal(keyData: Data, value: V = null): Promise { if (value == null) { - return this.encodeInvokeOnKey(MapRemoveCodec, keyData, keyData, 0); + return this.encodeInvokeOnKey(MapRemoveCodec, keyData, keyData, 0) + .then((clientMessage) => { + const response = MapRemoveCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } else { const valueData = this.toData(value); - return this.encodeInvokeOnKey(MapRemoveIfSameCodec, keyData, keyData, valueData, 0); + return this.encodeInvokeOnKey(MapRemoveIfSameCodec, keyData, keyData, valueData, 0) + .then((clientMessage) => { + const response = MapRemoveIfSameCodec.decodeResponse(clientMessage); + return response.response; + }); } } protected getAllInternal(partitionsToKeys: { [id: string]: any }, result: any[] = []): Promise> { const partitionPromises: Array>> = []; for (const partition in partitionsToKeys) { - partitionPromises.push(this.encodeInvokeOnPartition>( - MapGetAllCodec, - Number(partition), - partitionsToKeys[partition]), + partitionPromises.push(this.encodeInvokeOnPartition(MapGetAllCodec, Number(partition), partitionsToKeys[partition]) + .then((clientMessage) => { + const response = MapGetAllCodec.decodeResponse(clientMessage); + return response.response; + }), ); } const toObject = this.toObject.bind(this); @@ -512,39 +600,66 @@ export class MapProxy extends BaseProxy implements IMap { } protected deleteInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapDeleteCodec, keyData, keyData, 0); + return this.encodeInvokeOnKey(MapDeleteCodec, keyData, keyData, 0) + .then(() => undefined); } protected evictInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapEvictCodec, keyData, keyData, 0); + return this.encodeInvokeOnKey(MapEvictCodec, keyData, keyData, 0) + .then((clientMessage) => { + const response = MapEvictCodec.decodeResponse(clientMessage); + return response.response; + }); } protected putIfAbsentInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapPutIfAbsentCodec, keyData, keyData, valueData, 0, ttl); + return this.encodeInvokeOnKey(MapPutIfAbsentCodec, keyData, keyData, valueData, 0, ttl) + .then((clientMessage) => { + const response = MapPutIfAbsentCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } protected putTransientInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapPutTransientCodec, keyData, keyData, valueData, 0, ttl); + return this.encodeInvokeOnKey(MapPutTransientCodec, keyData, keyData, valueData, 0, ttl) + .then(() => undefined); } protected replaceInternal(keyData: Data, newValueData: Data): Promise { - return this.encodeInvokeOnKey(MapReplaceCodec, keyData, keyData, newValueData, 0); + return this.encodeInvokeOnKey(MapReplaceCodec, keyData, keyData, newValueData, 0) + .then((clientMessage) => { + const response = MapReplaceCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } protected replaceIfSameInternal(keyData: Data, oldValueData: Data, newValueData: Data): Promise { - return this.encodeInvokeOnKey(MapReplaceIfSameCodec, keyData, keyData, oldValueData, newValueData, 0); + return this.encodeInvokeOnKey(MapReplaceIfSameCodec, keyData, keyData, oldValueData, newValueData, 0) + .then((clientMessage) => { + const response = MapReplaceIfSameCodec.decodeResponse(clientMessage); + return response.response; + }); } protected setInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapSetCodec, keyData, keyData, valueData, 0, ttl); + return this.encodeInvokeOnKey(MapSetCodec, keyData, keyData, valueData, 0, ttl) + .then(() => undefined); } protected tryPutInternal(keyData: Data, valueData: Data, timeout: number): Promise { - return this.encodeInvokeOnKey(MapTryPutCodec, keyData, keyData, valueData, 0, timeout); + return this.encodeInvokeOnKey(MapTryPutCodec, keyData, keyData, valueData, 0, timeout) + .then((clientMessage) => { + const response = MapTryPutCodec.decodeResponse(clientMessage); + return response.response; + }); } protected tryRemoveInternal(keyData: Data, timeout: number): Promise { - return this.encodeInvokeOnKey(MapTryRemoveCodec, keyData, keyData, 0, timeout); + return this.encodeInvokeOnKey(MapTryRemoveCodec, keyData, keyData, 0, timeout) + .then((clientMessage) => { + const response = MapTryRemoveCodec.decodeResponse(clientMessage); + return response.response; + }); } private addEntryListenerInternal( @@ -571,7 +686,7 @@ export class MapProxy extends BaseProxy implements IMap { const toObject = this.toObject.bind(this); const entryEventHandler = ( /* tslint:disable-next-line:no-shadowed-variable */ - key: K, value: V, oldValue: V, mergingValue: V, eventType: number, uuid: string, numberOfAffectedEntries: number) => { + key: K, value: V, oldValue: V, mergingValue: V, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; @@ -635,7 +750,7 @@ export class MapProxy extends BaseProxy implements IMap { } return this.client.getListenerService() .registerListener(codec, (m: ClientMessage) => { - listenerHandler(m, entryEventHandler, toObject); + listenerHandler(m, entryEventHandler); }); } @@ -644,10 +759,10 @@ export class MapProxy extends BaseProxy implements IMap { encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddEntryListenerToKeyCodec.encodeRequest(name, keyData, includeValue, flags, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return MapAddEntryListenerToKeyCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; @@ -660,10 +775,10 @@ export class MapProxy extends BaseProxy implements IMap { return MapAddEntryListenerToKeyWithPredicateCodec.encodeRequest(name, keyData, predicateData, includeValue, flags, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return MapAddEntryListenerToKeyWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; @@ -675,10 +790,10 @@ export class MapProxy extends BaseProxy implements IMap { encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddEntryListenerWithPredicateCodec.encodeRequest(name, predicateData, includeValue, flags, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return MapAddEntryListenerWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; @@ -689,10 +804,10 @@ export class MapProxy extends BaseProxy implements IMap { encodeAddRequest(localOnly: boolean): ClientMessage { return MapAddEntryListenerCodec.encodeRequest(name, includeValue, flags, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return MapAddEntryListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 41ca5386f..d7b589416 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -28,26 +28,28 @@ import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; import {Data} from '../serialization/Data'; -import {MultiMapAddEntryListenerCodec} from './../codec/MultiMapAddEntryListenerCodec'; -import {MultiMapAddEntryListenerToKeyCodec} from './../codec/MultiMapAddEntryListenerToKeyCodec'; -import {MultiMapClearCodec} from './../codec/MultiMapClearCodec'; -import {MultiMapContainsEntryCodec} from './../codec/MultiMapContainsEntryCodec'; -import {MultiMapContainsKeyCodec} from './../codec/MultiMapContainsKeyCodec'; -import {MultiMapContainsValueCodec} from './../codec/MultiMapContainsValueCodec'; -import {MultiMapEntrySetCodec} from './../codec/MultiMapEntrySetCodec'; -import {MultiMapGetCodec} from './../codec/MultiMapGetCodec'; -import {MultiMapKeySetCodec} from './../codec/MultiMapKeySetCodec'; -import {MultiMapPutCodec} from './../codec/MultiMapPutCodec'; -import {MultiMapRemoveCodec} from './../codec/MultiMapRemoveCodec'; -import {MultiMapRemoveEntryCodec} from './../codec/MultiMapRemoveEntryCodec'; -import {MultiMapRemoveEntryListenerCodec} from './../codec/MultiMapRemoveEntryListenerCodec'; -import {MultiMapSizeCodec} from './../codec/MultiMapSizeCodec'; -import {MultiMapValueCountCodec} from './../codec/MultiMapValueCountCodec'; -import {MultiMapValuesCodec} from './../codec/MultiMapValuesCodec'; +import {MultiMapAddEntryListenerCodec} from '../codec/MultiMapAddEntryListenerCodec'; +import {MultiMapAddEntryListenerToKeyCodec} from '../codec/MultiMapAddEntryListenerToKeyCodec'; +import {MultiMapClearCodec} from '../codec/MultiMapClearCodec'; +import {MultiMapContainsEntryCodec} from '../codec/MultiMapContainsEntryCodec'; +import {MultiMapContainsKeyCodec} from '../codec/MultiMapContainsKeyCodec'; +import {MultiMapContainsValueCodec} from '../codec/MultiMapContainsValueCodec'; +import {MultiMapEntrySetCodec} from '../codec/MultiMapEntrySetCodec'; +import {MultiMapGetCodec} from '../codec/MultiMapGetCodec'; +import {MultiMapKeySetCodec} from '../codec/MultiMapKeySetCodec'; +import {MultiMapPutCodec} from '../codec/MultiMapPutCodec'; +import {MultiMapRemoveCodec} from '../codec/MultiMapRemoveCodec'; +import {MultiMapRemoveEntryCodec} from '../codec/MultiMapRemoveEntryCodec'; +import {MultiMapRemoveEntryListenerCodec} from '../codec/MultiMapRemoveEntryListenerCodec'; +import {MultiMapSizeCodec} from '../codec/MultiMapSizeCodec'; +import {MultiMapValueCountCodec} from '../codec/MultiMapValueCountCodec'; +import {MultiMapValuesCodec} from '../codec/MultiMapValuesCodec'; import {BaseProxy} from './BaseProxy'; import {MultiMap} from './MultiMap'; -import ClientMessage = require('../ClientMessage'); import {MapEvent} from '../core/MapListener'; +import {ClientMessage} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import * as SerializationUtil from '../serialization/SerializationUtil'; export class MultiMapProxy extends BaseProxy implements MultiMap { @@ -61,91 +63,128 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { put(key: K, value: V): Promise { const keyData = this.toData(key); const valueData = this.toData(value); - return this.encodeInvokeOnKey(MultiMapPutCodec, keyData, keyData, valueData, 1); + return this.encodeInvokeOnKey(MultiMapPutCodec, keyData, keyData, valueData, 1) + .then((clientMessage) => { + const response = MultiMapPutCodec.decodeResponse(clientMessage); + return response.response; + }); } get(key: K): Promise> { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapGetCodec, keyData, keyData, 1).then((data: Data[]) => { - return new ReadOnlyLazyList(data, this.client.getSerializationService()); - }); + return this.encodeInvokeOnKey(MultiMapGetCodec, keyData, keyData, 1) + .then((clientMessage) => { + const response = MultiMapGetCodec.decodeResponse(clientMessage); + return new ReadOnlyLazyList(response.response, this.client.getSerializationService()); + }); } remove(key: K, value: V): Promise { const keyData = this.toData(key); const valueData = this.toData(value); - return this.encodeInvokeOnKey(MultiMapRemoveEntryCodec, keyData, keyData, valueData, 1); + return this.encodeInvokeOnKey(MultiMapRemoveEntryCodec, keyData, keyData, valueData, 1) + .then((clientMessage) => { + const response = MultiMapRemoveEntryCodec.decodeResponse(clientMessage); + return response.response; + }); } removeAll(key: K): Promise> { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapRemoveCodec, keyData, keyData, 1).then((data: Data[]) => { - return new ReadOnlyLazyList(data, this.client.getSerializationService()); - }); + return this.encodeInvokeOnKey(MultiMapRemoveCodec, keyData, keyData, 1) + .then((clientMessage) => { + const response = MultiMapRemoveCodec.decodeResponse(clientMessage); + return new ReadOnlyLazyList(response.response, this.client.getSerializationService()); + }); } keySet(): Promise { - return this.encodeInvokeOnRandomTarget(MultiMapKeySetCodec) - .then(this.deserializeList); + return this.encodeInvokeOnRandomTarget(MultiMapKeySetCodec) + .then((clientMessage) => { + const response = MultiMapKeySetCodec.decodeResponse(clientMessage); + return this.deserializeList(response.response); + }); } values(): Promise> { - return this.encodeInvokeOnRandomTarget(MultiMapValuesCodec).then((data: Data[]) => { - return new ReadOnlyLazyList(data, this.client.getSerializationService()); - }); + return this.encodeInvokeOnRandomTarget(MultiMapValuesCodec) + .then((clientMessage) => { + const response = MultiMapValuesCodec.decodeResponse(clientMessage); + return new ReadOnlyLazyList(response.response, this.client.getSerializationService()); + }); } entrySet(): Promise> { - return this.encodeInvokeOnRandomTarget>(MultiMapEntrySetCodec) - .then>((entrySet: Array<[Data, Data]>) => { - return entrySet.map((entry: any[]) => { - return [this.toObject(entry[0]), this.toObject(entry[1])] as [K, V]; - }); + return this.encodeInvokeOnRandomTarget(MultiMapEntrySetCodec) + .then((clientMessage) => { + const response = MultiMapEntrySetCodec.decodeResponse(clientMessage); + return SerializationUtil.deserializeEntryList(this.toObject.bind(this), response.response); }); } containsKey(key: K): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapContainsKeyCodec, keyData, keyData, 1); + return this.encodeInvokeOnKey(MultiMapContainsKeyCodec, keyData, keyData, 1) + .then((clientMessage) => { + const response = MultiMapContainsKeyCodec.decodeResponse(clientMessage); + return response.response; + }); } containsValue(value: V): Promise { const valueData = this.toData(value); - return this.encodeInvokeOnRandomTarget(MultiMapContainsValueCodec, valueData); + return this.encodeInvokeOnRandomTarget(MultiMapContainsValueCodec, valueData) + .then((clientMessage) => { + const response = MultiMapContainsValueCodec.decodeResponse(clientMessage); + return response.response; + }); } containsEntry(key: K, value: V): Promise { const keyData = this.toData(key); const valueData = this.toData(value); - return this.encodeInvokeOnKey(MultiMapContainsEntryCodec, keyData, keyData, valueData, 1); + return this.encodeInvokeOnKey(MultiMapContainsEntryCodec, keyData, keyData, valueData, 1) + .then((clientMessage) => { + const response = MultiMapContainsEntryCodec.decodeResponse(clientMessage); + return response.response; + }); } size(): Promise { - return this.encodeInvokeOnRandomTarget(MultiMapSizeCodec); + return this.encodeInvokeOnRandomTarget(MultiMapSizeCodec) + .then((clientMessage) => { + const response = MultiMapSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } clear(): Promise { - return this.encodeInvokeOnRandomTarget(MultiMapClearCodec); + return this.encodeInvokeOnRandomTarget(MultiMapClearCodec) + .then(() => undefined); } valueCount(key: K): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapValueCountCodec, keyData, keyData, 1); + return this.encodeInvokeOnKey(MultiMapValueCountCodec, keyData, keyData, 1) + .then((clientMessage) => { + const response = MultiMapValueCountCodec.decodeResponse(clientMessage); + return response.response; + }); } addEntryListener(listener: EntryListener, key?: K, includeValue: boolean = true): Promise { const toObject = this.toObject.bind(this); /* tslint:disable: no-shadowed-variable */ - const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, eventType: number, uuid: string, - numberOfAffectedEntries: number) => { + const entryEventHandler = (keyData: Data, valueData: Data, oldValueData: Data, mergingValueData: Data, eventType: number, + uuid: UUID, numberOfAffectedEntries: number) => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; - key = toObject(key); - value = toObject(value); - oldValue = toObject(oldValue); - mergingValue = toObject(mergingValue); + key = toObject(keyData); + const value = toObject(valueData); + const oldValue = toObject(oldValueData); + const mergingValue = toObject(mergingValueData); const entryEvent = new EntryEvent(name, key, value, oldValue, mergingValue, member); @@ -174,14 +213,14 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { if (key) { const keyData = this.toData(key); const handler = (m: ClientMessage) => { - MultiMapAddEntryListenerToKeyCodec.handle(m, entryEventHandler, toObject); + MultiMapAddEntryListenerToKeyCodec.handle(m, entryEventHandler); }; const codec = this.createEntryListenerToKey(this.name, keyData, includeValue); return this.client.getListenerService().registerListener(codec, handler); } else { const listenerHandler = (m: ClientMessage) => { - MultiMapAddEntryListenerCodec.handle(m, entryEventHandler, toObject); + MultiMapAddEntryListenerCodec.handle(m, entryEventHandler); }; const codec = this.createEntryListener(this.name, includeValue); @@ -195,28 +234,38 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { lock(key: K, leaseMillis: number = -1): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapLockCodec, keyData, keyData, 1, leaseMillis, this.nextSequence()); + return this.encodeInvokeOnKey(MultiMapLockCodec, keyData, keyData, 1, leaseMillis, this.nextSequence()) + .then(() => undefined); } isLocked(key: K): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapIsLockedCodec, keyData, keyData); + return this.encodeInvokeOnKey(MultiMapIsLockedCodec, keyData, keyData) + .then((clientMessage) => { + const response = MultiMapIsLockedCodec.decodeResponse(clientMessage); + return response.response; + }); } tryLock(key: K, timeoutMillis: number = 0, leaseMillis: number = -1): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapTryLockCodec, keyData, keyData, 1, leaseMillis, - timeoutMillis, this.nextSequence()); + return this.encodeInvokeOnKey(MultiMapTryLockCodec, keyData, keyData, 1, leaseMillis, timeoutMillis, this.nextSequence()) + .then((clientMessage) => { + const response = MultiMapTryLockCodec.decodeResponse(clientMessage); + return response.response; + }); } unlock(key: K): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapUnlockCodec, keyData, keyData, 1, this.nextSequence()); + return this.encodeInvokeOnKey(MultiMapUnlockCodec, keyData, keyData, 1, this.nextSequence()) + .then(() => undefined); } forceUnlock(key: K): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapForceUnlockCodec, keyData, keyData, this.nextSequence()); + return this.encodeInvokeOnKey(MultiMapForceUnlockCodec, keyData, keyData, this.nextSequence()) + .then(() => undefined); } private nextSequence(): Long { @@ -228,10 +277,10 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { encodeAddRequest(localOnly: boolean): ClientMessage { return MultiMapAddEntryListenerToKeyCodec.encodeRequest(name, keyData, includeValue, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return MultiMapAddEntryListenerToKeyCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return MultiMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; @@ -242,10 +291,10 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { encodeAddRequest(localOnly: boolean): ClientMessage { return MultiMapAddEntryListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return MultiMapAddEntryListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return MultiMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index a8c125ddf..5b6c7d119 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -15,7 +15,6 @@ */ import * as Promise from 'bluebird'; -import {MapAddNearCacheEntryListenerCodec} from '../codec/MapAddNearCacheEntryListenerCodec'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; import {EventType} from '../core/EventType'; @@ -26,8 +25,8 @@ import {NearCache} from '../nearcache/NearCache'; import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetectorImpl'; import {Data} from '../serialization/Data'; import {MapProxy} from './MapProxy'; -import {BuildInfo} from '../BuildInfo'; -import ClientMessage = require('../ClientMessage'); +import {ClientMessage} from '../ClientMessage'; +import * as Long from 'long'; export class NearCachedMapProxy extends MapProxy { @@ -132,8 +131,8 @@ export class NearCachedMapProxy extends MapProxy { return super.tryRemoveInternal(keyData, timeout).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } - protected removeInternal(keyData: Data, value: V): Promise { - return super.removeInternal(keyData, value).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); + protected removeInternal(keyData: Data, value: V): Promise { + return super.removeInternal(keyData, value).then(this.invalidateCacheEntryAndReturn.bind(this, keyData)); } protected getAllInternal(partitionsToKeys: { [id: string]: any }, result: any[] = []): Promise { @@ -208,65 +207,23 @@ export class NearCachedMapProxy extends MapProxy { private addNearCacheInvalidationListener(): Promise { const codec = this.createInvalidationListenerCodec(this.name, EventType.INVALIDATION); - if (this.supportsRepairableNearCache()) { - return this.createNearCacheEventHandler().then((handler) => { - return this.client.getListenerService().registerListener(codec, handler); - }); - } else { - return this.client.getListenerService().registerListener(codec, this.createPre38NearCacheEventHandler()); - } + return this.createNearCacheEventHandler().then((handler) => { + return this.client.getListenerService().registerListener(codec, handler); + }); } private createInvalidationListenerCodec(name: string, flags: number): ListenerMessageCodec { - if (this.supportsRepairableNearCache()) { - return { - encodeAddRequest(localOnly: boolean): ClientMessage { - return MapAddNearCacheInvalidationListenerCodec.encodeRequest(name, flags, localOnly); - - }, - decodeAddResponse(msg: ClientMessage): string { - return MapAddNearCacheInvalidationListenerCodec.decodeResponse(msg).response; - }, - encodeRemoveRequest(listenerId: string): ClientMessage { - return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - }, - }; - } else { - return { - encodeAddRequest(localOnly: boolean): ClientMessage { - return MapAddNearCacheEntryListenerCodec.encodeRequest(name, flags, localOnly); - }, - decodeAddResponse(msg: ClientMessage): string { - return MapAddNearCacheEntryListenerCodec.decodeResponse(msg).response; - }, - encodeRemoveRequest(listenerId: string): ClientMessage { - return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); - }, - }; - } - } - - private supportsRepairableNearCache(): boolean { - return this.getConnectedServerVersion() >= BuildInfo.calculateServerVersion(3, 8, 0); - } - - private createPre38NearCacheEventHandler(): Function { - const nearCache = this.nearCache; - const handle = function (keyData: Data): void { - if (keyData == null) { - nearCache.clear(); - } else { - nearCache.invalidate(keyData); - } - }; - const handleBatch = function (keys: Data[]): void { - keys.forEach((key: Data) => { - nearCache.invalidate(key); - }); - }; - - return function (m: ClientMessage): void { - MapAddNearCacheEntryListenerCodec.handle(m, handle, handleBatch); + return { + encodeAddRequest(localOnly: boolean): ClientMessage { + return MapAddNearCacheInvalidationListenerCodec.encodeRequest(name, flags, localOnly); + + }, + decodeAddResponse(msg: ClientMessage): UUID { + return MapAddNearCacheInvalidationListenerCodec.decodeResponse(msg).response; + }, + encodeRemoveRequest(listenerId: UUID): ClientMessage { + return MapRemoveEntryListenerCodec.encodeRequest(name, listenerId); + }, }; } @@ -275,10 +232,10 @@ export class NearCachedMapProxy extends MapProxy { return repairingTask.registerAndGetHandler(this.getName(), this.nearCache).then((repairingHandler) => { const staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); this.nearCache.setStaleReadDetector(staleReadDetector); - const handle = function (key: Data, sourceUuid: string, partitionUuid: UUID, sequence: Long): void { + const handle = function (key: Data, sourceUuid: UUID, partitionUuid: UUID, sequence: Long): void { repairingHandler.handle(key, sourceUuid, partitionUuid, sequence); }; - const handleBatch = function (keys: Data[], sourceUuids: string[], partititonUuids: UUID[], sequences: Long[]): void { + const handleBatch = function (keys: Data[], sourceUuids: UUID[], partititonUuids: UUID[], sequences: Long[]): void { repairingHandler.handleBatch(keys, sourceUuids, partititonUuids, sequences); }; diff --git a/src/proxy/PNCounterProxy.ts b/src/proxy/PNCounterProxy.ts index 6fc8a47dd..0c0402894 100644 --- a/src/proxy/PNCounterProxy.ts +++ b/src/proxy/PNCounterProxy.ts @@ -25,13 +25,14 @@ import {NoDataMemberInClusterError} from '../HazelcastError'; import {randomInt} from '../Util'; import {BaseProxy} from './BaseProxy'; import {PNCounter} from './PNCounter'; -import Address = require('../Address'); +import {Address} from '../Address'; +import {Member} from '../core/Member'; export class PNCounterProxy extends BaseProxy implements PNCounter { - private static readonly EMPTY_ARRAY: Address[] = []; + private static readonly EMPTY_ARRAY: Member[] = []; private lastObservedVectorClock: VectorClock = new VectorClock(); private maximumReplicaCount: number = 0; - private currentTargetReplicaAddress: Address; + private currentTargetReplicaAddress: Member; get(): Promise { return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterGetCodec); @@ -80,8 +81,8 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { return Promise.resolve(); } - private invokeInternal(excludedAddresses: Address[], lastError: any, codec: any, ...codecArgs: any[]): Promise { - return this.getCRDTOperationTarget(excludedAddresses).then((target: Address) => { + private invokeInternal(excludedAddresses: Member[], lastError: any, codec: any, ...codecArgs: any[]): Promise { + return this.getCRDTOperationTarget(excludedAddresses).then((target) => { if (target == null) { if (lastError) { throw lastError; @@ -103,24 +104,28 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { }); } - private encodeInvokeInternal(target: Address, codec: any, ...codecArguments: any[]): Promise { - return this.encodeInvokeOnAddress(codec, target, ...codecArguments, this.lastObservedVectorClock.entrySet(), target); + private encodeInvokeInternal(target: Member, codec: any, ...codecArguments: any[]): Promise { + return this.encodeInvokeOnTarget(codec, target.uuid, ...codecArguments, + this.lastObservedVectorClock.entrySet(), target.uuid) + .then((clientMessage) => { + return codec.decodeResponse(clientMessage); + }); } - private getCRDTOperationTarget(excludedAddresses: Address[]): Promise

{ + private getCRDTOperationTarget(excludedAddresses: Member[]): Promise { if (this.currentTargetReplicaAddress != null && !excludedAddresses.some(this.currentTargetReplicaAddress.equals.bind(this.currentTargetReplicaAddress))) { return Promise.resolve(this.currentTargetReplicaAddress); } else { - return this.chooseTargetReplica(excludedAddresses).then((target: Address) => { + return this.chooseTargetReplica(excludedAddresses).then((target) => { this.currentTargetReplicaAddress = target; return target; }); } } - private chooseTargetReplica(excludedAddresses: Address[]): Promise
{ - return this.getReplicaAddresses(excludedAddresses).then((replicaAddresses: Address[]) => { + private chooseTargetReplica(excludedAddresses: Member[]): Promise { + return this.getReplicaAddresses(excludedAddresses).then((replicaAddresses) => { if (replicaAddresses.length === 0) { return null; } @@ -128,13 +133,13 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { }); } - private getReplicaAddresses(excludedAddresses: Address[]): Promise { + private getReplicaAddresses(excludedAddresses: Member[]): Promise { const dataMembers = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); return this.getMaxConfiguredReplicaCount().then((replicaCount: number) => { const currentCount = Math.min(replicaCount, dataMembers.length); - const replicaAddresses: Address[] = []; + const replicaAddresses: Member[] = []; for (let i = 0; i < currentCount; i++) { - const memberAddress = dataMembers[i].address; + const memberAddress = dataMembers[i]; if (!excludedAddresses.some(memberAddress.equals.bind(memberAddress))) { replicaAddresses.push(memberAddress); } @@ -147,10 +152,12 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { if (this.maximumReplicaCount > 0) { return Promise.resolve(this.maximumReplicaCount); } else { - return this.encodeInvokeOnRandomTarget(PNCounterGetConfiguredReplicaCountCodec).then((count: number) => { - this.maximumReplicaCount = count; - return this.maximumReplicaCount; - }); + return this.encodeInvokeOnRandomTarget(PNCounterGetConfiguredReplicaCountCodec) + .then((clientMessage) => { + const response = PNCounterGetConfiguredReplicaCountCodec.decodeResponse(clientMessage); + this.maximumReplicaCount = response.response; + return this.maximumReplicaCount; + }); } } diff --git a/src/proxy/PartitionSpecificProxy.ts b/src/proxy/PartitionSpecificProxy.ts index e45d0988c..36f01b441 100644 --- a/src/proxy/PartitionSpecificProxy.ts +++ b/src/proxy/PartitionSpecificProxy.ts @@ -17,6 +17,7 @@ import * as Promise from 'bluebird'; import HazelcastClient from '../HazelcastClient'; import {BaseProxy} from './BaseProxy'; +import {ClientMessage} from '../ClientMessage'; export class PartitionSpecificProxy extends BaseProxy { @@ -27,7 +28,7 @@ export class PartitionSpecificProxy extends BaseProxy { this.partitionId = this.client.getPartitionService().getPartitionId(this.getPartitionKey()); } - protected encodeInvoke(codec: any, ...codecArguments: any[]): Promise { - return this.encodeInvokeOnPartition(codec, this.partitionId, ...codecArguments); + protected encodeInvoke(codec: any, ...codecArguments: any[]): Promise { + return this.encodeInvokeOnPartition(codec, this.partitionId, ...codecArguments); } } diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 1b780e7b0..7d64ad376 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -19,16 +19,12 @@ import {ClientAddDistributedObjectListenerCodec} from '../codec/ClientAddDistrib import {ClientCreateProxyCodec} from '../codec/ClientCreateProxyCodec'; import {ClientDestroyProxyCodec} from '../codec/ClientDestroyProxyCodec'; import {ClientRemoveDistributedObjectListenerCodec} from '../codec/ClientRemoveDistributedObjectListenerCodec'; -import {Member} from '../core/Member'; import {DistributedObject} from '../DistributedObject'; import HazelcastClient from '../HazelcastClient'; -import {ClientNotActiveError, HazelcastError} from '../HazelcastError'; import {Invocation} from '../invocation/InvocationService'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {AtomicLongProxy} from './AtomicLongProxy'; import {FlakeIdGeneratorProxy} from './FlakeIdGeneratorProxy'; import {ListProxy} from './ListProxy'; -import {LockProxy} from './LockProxy'; import {MapProxy} from './MapProxy'; import {MultiMapProxy} from './MultiMapProxy'; import {NearCachedMapProxy} from './NearCachedMapProxy'; @@ -36,14 +32,19 @@ import {PNCounterProxy} from './PNCounterProxy'; import {QueueProxy} from './QueueProxy'; import {ReplicatedMapProxy} from './ReplicatedMapProxy'; import {RingbufferProxy} from './ringbuffer/RingbufferProxy'; -import {SemaphoreProxy} from './SemaphoreProxy'; import {SetProxy} from './SetProxy'; import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; import {DistributedObjectEvent, DistributedObjectListener} from '../core/DistributedObjectListener'; import {DeferredPromise} from '../Util'; import {ILogger} from '../logging/ILogger'; -import Address = require('../Address'); -import ClientMessage = require('../ClientMessage'); +import {ClientMessage} from '../ClientMessage'; +import {UUID} from '../core/UUID'; +import {ClientCreateProxiesCodec} from '../codec/ClientCreateProxiesCodec'; +import {BaseProxy} from './BaseProxy'; +import {Ringbuffer} from './Ringbuffer'; + +export const NAMESPACE_SEPARATOR = '/'; +const RINGBUFFER_PREFIX = '_hz_rb_'; export class ProxyManager { public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; @@ -54,14 +55,12 @@ export class ProxyManager { public static readonly MULTIMAP_SERVICE: string = 'hz:impl:multiMapService'; public static readonly RINGBUFFER_SERVICE: string = 'hz:impl:ringbufferService'; public static readonly REPLICATEDMAP_SERVICE: string = 'hz:impl:replicatedMapService'; - public static readonly SEMAPHORE_SERVICE: string = 'hz:impl:semaphoreService'; - public static readonly ATOMICLONG_SERVICE: string = 'hz:impl:atomicLongService'; public static readonly FLAKEID_SERVICE: string = 'hz:impl:flakeIdGeneratorService'; public static readonly PNCOUNTER_SERVICE: string = 'hz:impl:PNCounterService'; public static readonly RELIABLETOPIC_SERVICE: string = 'hz:impl:reliableTopicService'; public readonly service: { [serviceName: string]: any } = {}; - private readonly proxies: { [namespace: string]: Promise; } = {}; + private readonly proxies = new Map>(); private readonly client: HazelcastClient; private readonly logger: ILogger; private readonly invocationTimeoutMillis: number; @@ -79,127 +78,117 @@ export class ProxyManager { this.service[ProxyManager.SET_SERVICE] = SetProxy; this.service[ProxyManager.QUEUE_SERVICE] = QueueProxy; this.service[ProxyManager.LIST_SERVICE] = ListProxy; - this.service[ProxyManager.LOCK_SERVICE] = LockProxy; this.service[ProxyManager.MULTIMAP_SERVICE] = MultiMapProxy; this.service[ProxyManager.RINGBUFFER_SERVICE] = RingbufferProxy; this.service[ProxyManager.REPLICATEDMAP_SERVICE] = ReplicatedMapProxy; - this.service[ProxyManager.SEMAPHORE_SERVICE] = SemaphoreProxy; - this.service[ProxyManager.ATOMICLONG_SERVICE] = AtomicLongProxy; this.service[ProxyManager.FLAKEID_SERVICE] = FlakeIdGeneratorProxy; this.service[ProxyManager.PNCOUNTER_SERVICE] = PNCounterProxy; this.service[ProxyManager.RELIABLETOPIC_SERVICE] = ReliableTopicProxy; } public getOrCreateProxy(name: string, serviceName: string, createAtServer = true): Promise { - const fullName = serviceName + name; - if (this.proxies[fullName]) { - return this.proxies[fullName]; + const fullName = serviceName + NAMESPACE_SEPARATOR + name; + if (this.proxies.has(fullName)) { + return this.proxies.get(fullName); } const deferred = DeferredPromise(); - let newProxy: DistributedObject; - if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().getNearCacheConfig(name)) { - newProxy = new NearCachedMapProxy(this.client, serviceName, name); - } else if (serviceName === ProxyManager.RELIABLETOPIC_SERVICE) { - newProxy = new ReliableTopicProxy(this.client, serviceName, name); - if (createAtServer) { - (newProxy as ReliableTopicProxy).setRingbuffer().then(() => { - return this.createProxy(newProxy); - }).then(function (): void { - deferred.resolve(newProxy); - }); - } - this.proxies[fullName] = deferred.promise; - return deferred.promise; + this.proxies.set(fullName, deferred.promise); + + let createProxyPromise: Promise; + if (createAtServer) { + createProxyPromise = this.createProxy(name, serviceName); } else { - newProxy = new this.service[serviceName](this.client, serviceName, name); + createProxyPromise = Promise.resolve(); } - if (createAtServer) { - this.createProxy(newProxy).then(function (): void { - deferred.resolve(newProxy); + createProxyPromise + .then(() => { + return this.initializeLocalProxy(name, serviceName, createAtServer); + }) + .then((localProxy) => { + deferred.resolve(localProxy); + }) + .catch((error) => { + this.proxies.delete(fullName); + deferred.reject(error); }); - } - this.proxies[fullName] = deferred.promise; return deferred.promise; } - destroyProxy(name: string, serviceName: string): Promise { - delete this.proxies[serviceName + name]; + public createDistributedObjectsOnCluster(): Promise { + const proxyEntries = new Array<[string, string]>(this.proxies.size); + let index = 0; + this.proxies.forEach((_, namespace) => { + const separatorIndex = namespace.indexOf(NAMESPACE_SEPARATOR); + const serviceName = namespace.substring(0, separatorIndex); + const name = namespace.substring(separatorIndex + 1); + proxyEntries[index++] = [name, serviceName]; + }); + if (proxyEntries.length === 0) { + return Promise.resolve(); + } + const request = ClientCreateProxiesCodec.encodeRequest(proxyEntries); + request.setPartitionId(-1); + const invocation = new Invocation(this.client, request); + return this.client.getInvocationService() + .invokeUrgent(invocation) + .then(() => undefined); + } + + public getDistributedObjects(): Promise { + const promises = new Array>(this.proxies.size); + let index = 0; + this.proxies.forEach((proxy) => { + promises[index++] = proxy; + }); + return Promise.all(promises); + } + + public destroyProxy(name: string, serviceName: string): Promise { + this.proxies.delete(serviceName + NAMESPACE_SEPARATOR + name); const clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); clientMessage.setPartitionId(-1); - return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).return(); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage) + .then(() => undefined); + } + + public destroyProxyLocally(namespace: string): Promise { + const proxy = this.proxies.get(namespace); + if (proxy != null) { + this.proxies.delete(namespace); + return proxy.then((distributedObject) => { + return (distributedObject as BaseProxy).destroyLocally(); + }); + } + return Promise.resolve(); } - addDistributedObjectListener(distributedObjectListener: DistributedObjectListener): Promise { + public addDistributedObjectListener(distributedObjectListener: DistributedObjectListener): Promise { const handler = function (clientMessage: ClientMessage): void { const converterFunc = (objectName: string, serviceName: string, eventType: string) => { eventType = eventType.toLowerCase(); const distributedObjectEvent = new DistributedObjectEvent(eventType, serviceName, objectName); distributedObjectListener(distributedObjectEvent); }; - ClientAddDistributedObjectListenerCodec.handle(clientMessage, converterFunc, null); + ClientAddDistributedObjectListenerCodec.handle(clientMessage, converterFunc); }; const codec = this.createDistributedObjectListener(); return this.client.getListenerService().registerListener(codec, handler); } - removeDistributedObjectListener(listenerId: string): Promise { + public removeDistributedObjectListener(listenerId: string): Promise { return this.client.getListenerService().deregisterListener(listenerId); } - protected isRetryable(error: HazelcastError): boolean { - if (error instanceof ClientNotActiveError) { - return false; - } - return true; + public destroy(): void { + this.proxies.clear(); } - private createProxy(proxyObject: DistributedObject): Promise { - const promise = DeferredPromise(); - this.initializeProxy(proxyObject, promise, Date.now() + this.invocationTimeoutMillis); - return promise.promise; - } - - private findNextAddress(): Address { - const members = this.client.getClusterService().getMembers(); - let liteMember: Member = null; - for (const member of members) { - if (member != null && member.isLiteMember === false) { - return member.address; - } else if (member != null && member.isLiteMember) { - liteMember = member; - } - } - - if (liteMember != null) { - return liteMember.address; - } else { - return null; - } - } - - private initializeProxy(proxyObject: DistributedObject, promise: Promise.Resolver, deadline: number): void { - if (Date.now() <= deadline) { - const address: Address = this.findNextAddress(); - const request = ClientCreateProxyCodec.encodeRequest(proxyObject.getName(), proxyObject.getServiceName(), address); - const invocation = new Invocation(this.client, request); - invocation.address = address; - this.client.getInvocationService().invoke(invocation).then((response) => { - promise.resolve(response); - }).catch((error) => { - if (this.isRetryable(error)) { - this.logger.warn('ProxyManager', 'Create proxy request for ' + proxyObject.getName() + - ' failed. Retrying in ' + this.invocationRetryPauseMillis + 'ms. ' + error); - setTimeout(this.initializeProxy.bind(this, proxyObject, promise, deadline), this.invocationRetryPauseMillis); - } else { - this.logger.warn('ProxyManager', 'Create proxy request for ' + proxyObject.getName() + ' failed ' + error); - } - }); - } else { - promise.reject('Create proxy request timed-out for ' + proxyObject.getName()); - } + private createProxy(name: string, serviceName: string): Promise { + const request = ClientCreateProxyCodec.encodeRequest(name, serviceName); + return this.client.getInvocationService().invokeOnRandomTarget(request); } private createDistributedObjectListener(): ListenerMessageCodec { @@ -207,12 +196,34 @@ export class ProxyManager { encodeAddRequest(localOnly: boolean): ClientMessage { return ClientAddDistributedObjectListenerCodec.encodeRequest(localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return ClientAddDistributedObjectListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return ClientRemoveDistributedObjectListenerCodec.encodeRequest(listenerId); }, }; } + + private initializeLocalProxy(name: string, serviceName: string, createAtServer: boolean): Promise { + let localProxy: DistributedObject; + + if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().getNearCacheConfig(name)) { + localProxy = new NearCachedMapProxy(this.client, serviceName, name); + } else { + // This call may throw ClientOfflineError for partition specific proxies with async start + localProxy = new this.service[serviceName](this.client, serviceName, name); + } + + if (serviceName === ProxyManager.RELIABLETOPIC_SERVICE) { + return this.getOrCreateProxy(RINGBUFFER_PREFIX + name, ProxyManager.RINGBUFFER_SERVICE, createAtServer) + .then((ringbuffer) => { + (localProxy as ReliableTopicProxy).setRingbuffer((ringbuffer as Ringbuffer)); + return localProxy; + }); + } else { + return Promise.resolve(localProxy); + } + + } } diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index 38df3381a..ee89e2070 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -41,7 +41,8 @@ import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {IQueue} from './IQueue'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import ClientMessage = require('../ClientMessage'); +import {ClientMessage} from '../ClientMessage'; +import {UUID} from '../core/UUID'; export class QueueProxy extends PartitionSpecificProxy implements IQueue { @@ -61,12 +62,16 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { items.forEach(function (item): void { rawList.push(toData(item)); }); - return this.encodeInvoke(QueueAddAllCodec, rawList); + return this.encodeInvoke(QueueAddAllCodec, rawList) + .then((clientMessage) => { + const response = QueueAddAllCodec.decodeResponse(clientMessage); + return response.response; + }); } addItemListener(listener: ItemListener, includeValue: boolean): Promise { const handler = (message: ClientMessage) => { - QueueAddListenerCodec.handle(message, (item: Data, uuid: string, eventType: number) => { + QueueAddListenerCodec.handle(message, (item: Data, uuid: UUID, eventType: number) => { let responseObject: E; if (item == null) { responseObject = null; @@ -90,27 +95,44 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } clear(): Promise { - return this.encodeInvoke(QueueClearCodec); + return this.encodeInvoke(QueueClearCodec) + .then(() => undefined); } contains(item: E): Promise { const itemData = this.toData(item); - return this.encodeInvoke(QueueContainsCodec, itemData); + return this.encodeInvoke(QueueContainsCodec, itemData) + .then((clientMessage) => { + const response = QueueContainsCodec.decodeResponse(clientMessage); + return response.response; + }); } containsAll(items: E[]): Promise { const toData = this.toData.bind(this); const rawItems: Data[] = items.map(toData); - return this.encodeInvoke(QueueContainsAllCodec, rawItems); + return this.encodeInvoke(QueueContainsAllCodec, rawItems) + .then((clientMessage) => { + const response = QueueContainsAllCodec.decodeResponse(clientMessage); + return response.response; + }); } drainTo(arr: E[], maxElements: number = null): Promise { const toObject = this.toObject.bind(this); let promise: Promise; if (maxElements === null) { - promise = this.encodeInvoke(QueueDrainToCodec); + promise = this.encodeInvoke(QueueDrainToCodec) + .then((clientMessage) => { + const response = QueueDrainToCodec.decodeResponse(clientMessage); + return response.response; + }); } else { - promise = this.encodeInvoke(QueueDrainToMaxSizeCodec, maxElements); + promise = this.encodeInvoke(QueueDrainToMaxSizeCodec, maxElements) + .then((clientMessage) => { + const response = QueueDrainToMaxSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } return promise.then(function (rawArr: Data[]): number { rawArr.forEach(function (rawItem): void { @@ -121,40 +143,69 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } isEmpty(): Promise { - return this.encodeInvoke(QueueIsEmptyCodec); + return this.encodeInvoke(QueueIsEmptyCodec) + .then((clientMessage) => { + const response = QueueIsEmptyCodec.decodeResponse(clientMessage); + return response.response; + }); } offer(item: E, time: number = 0): Promise { const itemData = this.toData(item); - return this.encodeInvoke(QueueOfferCodec, itemData, time); + return this.encodeInvoke(QueueOfferCodec, itemData, time) + .then((clientMessage) => { + const response = QueueOfferCodec.decodeResponse(clientMessage); + return response.response; + }); } peek(): Promise { - return this.encodeInvoke(QueuePeekCodec); + return this.encodeInvoke(QueuePeekCodec) + .then((clientMessage) => { + const response = QueuePeekCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } poll(time: number = 0): Promise { - return this.encodeInvoke(QueuePollCodec, time); + return this.encodeInvoke(QueuePollCodec, time) + .then((clientMessage) => { + const response = QueuePollCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } put(item: E): Promise { const itemData = this.toData(item); - return this.encodeInvoke(QueuePutCodec, itemData); + return this.encodeInvoke(QueuePutCodec, itemData) + .then(() => undefined); } remainingCapacity(): Promise { - return this.encodeInvoke(QueueRemainingCapacityCodec); + return this.encodeInvoke(QueueRemainingCapacityCodec) + .then((clientMessage) => { + const response = QueueRemainingCapacityCodec.decodeResponse(clientMessage); + return response.response; + }); } remove(item: E): Promise { const itemData = this.toData(item); - return this.encodeInvoke(QueueRemoveCodec, itemData); + return this.encodeInvoke(QueueRemoveCodec, itemData) + .then((clientMessage) => { + const response = QueueRemoveCodec.decodeResponse(clientMessage); + return response.response; + }); } removeAll(items: E[]): Promise { const toData = this.toData.bind(this); const rawItems = items.map(toData); - return this.encodeInvoke(QueueCompareAndRemoveAllCodec, rawItems); + return this.encodeInvoke(QueueCompareAndRemoveAllCodec, rawItems) + .then((clientMessage) => { + const response = QueueCompareAndRemoveAllCodec.decodeResponse(clientMessage); + return response.response; + }); } removeItemListener(registrationId: string): Promise { @@ -164,26 +215,35 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { retainAll(items: E[]): Promise { const toData = this.toData.bind(this); const rawItems = items.map(toData); - return this.encodeInvoke(QueueCompareAndRetainAllCodec, rawItems); + return this.encodeInvoke(QueueCompareAndRetainAllCodec, rawItems) + .then((clientMessage) => { + const response = QueueCompareAndRetainAllCodec.decodeResponse(clientMessage); + return response.response; + }); } size(): Promise { - return this.encodeInvoke(QueueSizeCodec); + return this.encodeInvoke(QueueSizeCodec) + .then((clientMessage) => { + const response = QueueSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } take(): Promise { - return this.encodeInvoke(QueueTakeCodec); + return this.encodeInvoke(QueueTakeCodec) + .then((clientMessage) => { + const response = QueueTakeCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } toArray(): Promise { - const arr: E[] = []; - const toObject = this.toObject.bind(this); - return this.encodeInvoke(QueueIteratorCodec).then(function (dataArray): E[] { - dataArray.forEach(function (data): void { - arr.push(toObject(data)); + return this.encodeInvoke(QueueIteratorCodec) + .then((clientMessage) => { + const response = QueueIteratorCodec.decodeResponse(clientMessage); + return response.response.map(this.toObject.bind(this)); }); - return arr; - }); } private createEntryListener(name: string, includeValue: boolean): ListenerMessageCodec { @@ -191,10 +251,10 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { encodeAddRequest(localOnly: boolean): ClientMessage { return QueueAddListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return QueueAddListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return QueueRemoveListenerCodec.encodeRequest(name, listenerId); }, }; diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index f182e56f8..bbf1539a4 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -46,7 +46,9 @@ import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {MapEvent} from '../core/MapListener'; /* tslint:enable:max-line-length */ import Long = require('long'); -import ClientMessage = require('../ClientMessage'); +import {UUID} from '../core/UUID'; +import {ClientMessage} from '../ClientMessage'; +import * as SerializationUtil from '../serialization/SerializationUtil'; export class ReplicatedMapProxy extends PartitionSpecificProxy implements ReplicatedMap { @@ -57,47 +59,76 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements const valueData: Data = this.toData(value); const keyData: Data = this.toData(key); - return this.encodeInvokeOnKey(ReplicatedMapPutCodec, keyData, keyData, valueData, ttl); + return this.encodeInvokeOnKey(ReplicatedMapPutCodec, keyData, keyData, valueData, ttl) + .then((clientMessage) => { + const response = ReplicatedMapPutCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } clear(): Promise { - return this.encodeInvokeOnRandomTarget(ReplicatedMapClearCodec); + return this.encodeInvokeOnRandomTarget(ReplicatedMapClearCodec) + .then(() => undefined); } get(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(ReplicatedMapGetCodec, keyData, keyData); + return this.encodeInvokeOnKey(ReplicatedMapGetCodec, keyData, keyData) + .then((clientMessage) => { + const response = ReplicatedMapGetCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } containsKey(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(ReplicatedMapContainsKeyCodec, keyData, keyData); + return this.encodeInvokeOnKey(ReplicatedMapContainsKeyCodec, keyData, keyData) + .then((clientMessage) => { + const response = ReplicatedMapContainsKeyCodec.decodeResponse(clientMessage); + return response.response; + }); } containsValue(value: V): Promise { assertNotNull(value); const valueData = this.toData(value); - return this.encodeInvoke(ReplicatedMapContainsValueCodec, valueData); + return this.encodeInvoke(ReplicatedMapContainsValueCodec, valueData) + .then((clientMessage) => { + const response = ReplicatedMapContainsValueCodec.decodeResponse(clientMessage); + return response.response; + }); } size(): Promise { - return this.encodeInvoke(ReplicatedMapSizeCodec); + return this.encodeInvoke(ReplicatedMapSizeCodec) + .then((clientMessage) => { + const response = ReplicatedMapSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } isEmpty(): Promise { - return this.encodeInvoke(ReplicatedMapIsEmptyCodec); + return this.encodeInvoke(ReplicatedMapIsEmptyCodec) + .then((clientMessage) => { + const response = ReplicatedMapIsEmptyCodec.decodeResponse(clientMessage); + return response.response; + }); } remove(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(ReplicatedMapRemoveCodec, keyData, keyData); + return this.encodeInvokeOnKey(ReplicatedMapRemoveCodec, keyData, keyData) + .then((clientMessage) => { + const response = ReplicatedMapRemoveCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } putAll(pairs: Array<[K, V]>): Promise { @@ -111,32 +142,38 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements entries.push([keyData, valueData]); } - return this.encodeInvokeOnRandomTarget(ReplicatedMapPutAllCodec, entries); + return this.encodeInvokeOnRandomTarget(ReplicatedMapPutAllCodec, entries) + .then(() => undefined); } keySet(): Promise { const toObject = this.toObject.bind(this); - return this.encodeInvoke(ReplicatedMapKeySetCodec).then(function (keySet): K[] { - return keySet.map(toObject); - }); + return this.encodeInvoke(ReplicatedMapKeySetCodec) + .then((clientMessage) => { + const response = ReplicatedMapKeySetCodec.decodeResponse(clientMessage); + return response.response.map(toObject); + }); } values(comparator?: ArrayComparator): Promise> { - const toObject = this.toObject.bind(this); - return this.encodeInvoke(ReplicatedMapValuesCodec).then((valuesData: Data[]) => { - if (comparator) { - const desValues = valuesData.map(toObject); - return new ReadOnlyLazyList(desValues.sort(comparator), this.client.getSerializationService()); - } - return new ReadOnlyLazyList(valuesData, this.client.getSerializationService()); - }); + return this.encodeInvoke(ReplicatedMapValuesCodec) + .then((clientMessage) => { + const response = ReplicatedMapValuesCodec.decodeResponse(clientMessage); + const valuesData = response.response; + if (comparator) { + const desValues = valuesData.map(this.toObject.bind(this)); + return new ReadOnlyLazyList(desValues.sort(comparator), this.client.getSerializationService()); + } + return new ReadOnlyLazyList(valuesData, this.client.getSerializationService()); + }); } entrySet(): Promise> { - const toObject = this.toObject.bind(this); - return this.encodeInvoke(ReplicatedMapEntrySetCodec).then(function (entrySet: Array<[Data, Data]>): Array<[K, V]> { - return entrySet.map<[K, V]>((entry) => [toObject(entry[0]), toObject(entry[1])]); - }); + return this.encodeInvoke(ReplicatedMapEntrySetCodec) + .then((clientMessage) => { + const response = ReplicatedMapEntrySetCodec.decodeResponse(clientMessage); + return SerializationUtil.deserializeEntryList(this.toObject.bind(this), response.response); + }); } addEntryListenerToKeyWithPredicate(listener: EntryListener, key: K, predicate: Predicate): Promise { @@ -164,7 +201,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements const toObject = this.toObject.bind(this); /* tslint:disable-next-line:no-shadowed-variable */ const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, - event: number, uuid: string, numberOfAffectedEntries: number) => { + event: number, uuid: UUID, numberOfAffectedEntries: number) => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; @@ -226,10 +263,10 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements encodeAddRequest(localOnly: boolean): ClientMessage { return ReplicatedMapAddEntryListenerCodec.encodeRequest(name, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return ReplicatedMapAddEntryListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; @@ -240,10 +277,10 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements encodeAddRequest(localOnly: boolean): ClientMessage { return ReplicatedMapAddEntryListenerToKeyCodec.encodeRequest(name, keyData, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return ReplicatedMapAddEntryListenerToKeyCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; @@ -254,10 +291,10 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements encodeAddRequest(localOnly: boolean): ClientMessage { return ReplicatedMapAddEntryListenerWithPredicateCodec.encodeRequest(name, predicateData, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return ReplicatedMapAddEntryListenerWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; @@ -269,10 +306,10 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements return ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.encodeRequest(name, keyData, predicateData, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return ReplicatedMapRemoveEntryListenerCodec.encodeRequest(name, listenerId); }, }; diff --git a/src/proxy/SemaphoreProxy.ts b/src/proxy/SemaphoreProxy.ts deleted file mode 100644 index 70d4a95ec..000000000 --- a/src/proxy/SemaphoreProxy.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import {SemaphoreAcquireCodec} from '../codec/SemaphoreAcquireCodec'; -import {SemaphoreAvailablePermitsCodec} from '../codec/SemaphoreAvailablePermitsCodec'; -import {SemaphoreDrainPermitsCodec} from '../codec/SemaphoreDrainPermitsCodec'; -import {SemaphoreInitCodec} from '../codec/SemaphoreInitCodec'; -import {SemaphoreReducePermitsCodec} from '../codec/SemaphoreReducePermitsCodec'; -import {SemaphoreReleaseCodec} from '../codec/SemaphoreReleaseCodec'; -import {SemaphoreTryAcquireCodec} from '../codec/SemaphoreTryAcquireCodec'; -import {assertNotNegative} from '../Util'; -import {ISemaphore} from './ISemaphore'; -import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import Long = require('long'); - -export class SemaphoreProxy extends PartitionSpecificProxy implements ISemaphore { - - init(permits: number): Promise { - assertNotNegative(permits, 'Permits cannot be negative.'); - return this.encodeInvoke(SemaphoreInitCodec, permits); - } - - acquire(permits: number = 1): Promise { - assertNotNegative(permits, 'Permits cannot be negative.'); - return this.encodeInvoke(SemaphoreAcquireCodec, permits); - } - - availablePermits(): Promise { - return this.encodeInvoke(SemaphoreAvailablePermitsCodec); - } - - drainPermits(): Promise { - return this.encodeInvoke(SemaphoreDrainPermitsCodec); - } - - reducePermits(reduction: number): Promise { - assertNotNegative(reduction, 'Reduction cannot be negative.'); - return this.encodeInvoke(SemaphoreReducePermitsCodec, reduction); - } - - release(permits: number = 1): Promise { - assertNotNegative(permits, 'Permits cannot be negative.'); - return this.encodeInvoke(SemaphoreReleaseCodec, permits); - } - - tryAcquire(permits: number, timeout: Long | number = 0): Promise { - assertNotNegative(permits, 'Permits cannot be negative.'); - return this.encodeInvoke(SemaphoreTryAcquireCodec, permits, timeout); - } -} diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index f32e0093f..270735e35 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -33,61 +33,99 @@ import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {ISet} from './ISet'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import ClientMessage = require('../ClientMessage'); +import {ClientMessage} from '../ClientMessage'; +import {UUID} from '../core/UUID'; export class SetProxy extends PartitionSpecificProxy implements ISet { add(entry: E): Promise { - return this.encodeInvoke(SetAddCodec, this.toData(entry)); + return this.encodeInvoke(SetAddCodec, this.toData(entry)) + .then((clientMessage) => { + const response = SetAddCodec.decodeResponse(clientMessage); + return response.response; + }); } addAll(items: E[]): Promise { - return this.encodeInvoke(SetAddAllCodec, this.serializeList(items)); + return this.encodeInvoke(SetAddAllCodec, this.serializeList(items)) + .then((clientMessage) => { + const response = SetAddAllCodec.decodeResponse(clientMessage); + return response.response; + }); } toArray(): Promise { - return this.encodeInvoke(SetGetAllCodec).then((items: Data[]) => { - return items.map((item) => { - return this.toObject(item); + return this.encodeInvoke(SetGetAllCodec) + .then((clientMessage) => { + const response = SetGetAllCodec.decodeResponse(clientMessage); + return response.response.map(this.toObject.bind(this)); }); - }); } clear(): Promise { - return this.encodeInvoke(SetClearCodec); + return this.encodeInvoke(SetClearCodec) + .then(() => undefined); } contains(entry: E): Promise { - return this.encodeInvoke(SetContainsCodec, this.toData(entry)); + return this.encodeInvoke(SetContainsCodec, this.toData(entry)) + .then((clientMessage) => { + const response = SetContainsCodec.decodeResponse(clientMessage); + return response.response; + }); } containsAll(items: E[]): Promise { - return this.encodeInvoke(SetContainsAllCodec, this.serializeList(items)); + return this.encodeInvoke(SetContainsAllCodec, this.serializeList(items)) + .then((clientMessage) => { + const response = SetContainsAllCodec.decodeResponse(clientMessage); + return response.response; + }); } isEmpty(): Promise { - return this.encodeInvoke(SetIsEmptyCodec); + return this.encodeInvoke(SetIsEmptyCodec) + .then((clientMessage) => { + const response = SetIsEmptyCodec.decodeResponse(clientMessage); + return response.response; + }); } remove(entry: E): Promise { - return this.encodeInvoke(SetRemoveCodec, this.toData(entry)); + return this.encodeInvoke(SetRemoveCodec, this.toData(entry)) + .then((clientMessage) => { + const response = SetRemoveCodec.decodeResponse(clientMessage); + return response.response; + }); } removeAll(items: E[]): Promise { - return this.encodeInvoke(SetCompareAndRemoveAllCodec, this.serializeList(items)); + return this.encodeInvoke(SetCompareAndRemoveAllCodec, this.serializeList(items)) + .then((clientMessage) => { + const response = SetCompareAndRemoveAllCodec.decodeResponse(clientMessage); + return response.response; + }); } retainAll(items: E[]): Promise { - return this.encodeInvoke(SetCompareAndRetainAllCodec, this.serializeList(items)); + return this.encodeInvoke(SetCompareAndRetainAllCodec, this.serializeList(items)) + .then((clientMessage) => { + const response = SetCompareAndRetainAllCodec.decodeResponse(clientMessage); + return response.response; + }); } size(): Promise { - return this.encodeInvoke(SetSizeCodec); + return this.encodeInvoke(SetSizeCodec) + .then((clientMessage) => { + const response = SetSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } addItemListener(listener: ItemListener, includeValue: boolean = true): Promise { const handler = (message: ClientMessage) => { - SetAddListenerCodec.handle(message, (item: Data, uuid: string, eventType: number) => { + SetAddListenerCodec.handle(message, (item: Data, uuid: UUID, eventType: number) => { const responseObject = this.toObject(item); const member = this.client.getClusterService().getMember(uuid); const name = this.name; @@ -119,10 +157,10 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { encodeAddRequest(localOnly: boolean): ClientMessage { return SetAddListenerCodec.encodeRequest(name, includeValue, localOnly); }, - decodeAddResponse(msg: ClientMessage): string { + decodeAddResponse(msg: ClientMessage): UUID { return SetAddListenerCodec.decodeResponse(msg).response; }, - encodeRemoveRequest(listenerId: string): ClientMessage { + encodeRemoveRequest(listenerId: UUID): ClientMessage { return SetRemoveListenerCodec.encodeRequest(name, listenerId); }, }; diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index 79bf0362e..87dfbbb5a 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -34,35 +34,61 @@ import Long = require('long'); export class RingbufferProxy extends PartitionSpecificProxy implements Ringbuffer { capacity(): Promise { - return this.encodeInvoke(RingbufferCapacityCodec); + return this.encodeInvoke(RingbufferCapacityCodec) + .then((clientMessage) => { + const response = RingbufferCapacityCodec.decodeResponse(clientMessage); + return response.response; + }); } size(): Promise { - return this.encodeInvoke(RingbufferSizeCodec); + return this.encodeInvoke(RingbufferSizeCodec) + .then((clientMessage) => { + const response = RingbufferSizeCodec.decodeResponse(clientMessage); + return response.response; + }); } tailSequence(): Promise { - return this.encodeInvoke(RingbufferTailSequenceCodec); + return this.encodeInvoke(RingbufferTailSequenceCodec) + .then((clientMessage) => { + const response = RingbufferTailSequenceCodec.decodeResponse(clientMessage); + return response.response; + }); } headSequence(): Promise { - return this.encodeInvoke(RingbufferHeadSequenceCodec); + return this.encodeInvoke(RingbufferHeadSequenceCodec) + .then((clientMessage) => { + const response = RingbufferHeadSequenceCodec.decodeResponse(clientMessage); + return response.response; + }); } remainingCapacity(): Promise { - return this.encodeInvoke(RingbufferRemainingCapacityCodec); + return this.encodeInvoke(RingbufferRemainingCapacityCodec) + .then((clientMessage) => { + const response = RingbufferRemainingCapacityCodec.decodeResponse(clientMessage); + return response.response; + }); } add(item: E, overflowPolicy: OverflowPolicy = OverflowPolicy.OVERWRITE): Promise { - return this.encodeInvoke(RingbufferAddCodec, overflowPolicy, this.toData(item)); + return this.encodeInvoke(RingbufferAddCodec, overflowPolicy, this.toData(item)) + .then((clientMessage) => { + const response = RingbufferAddCodec.decodeResponse(clientMessage); + return response.response; + }); } addAll(items: E[], overflowPolicy: OverflowPolicy = OverflowPolicy.OVERWRITE): Promise { - const dataList = items.map((item) => { - return this.toData(item); - }); + const dataList = items.map(this.toData.bind(this)); - return this.encodeInvoke(RingbufferAddAllCodec, dataList, overflowPolicy); + return this.encodeInvoke(RingbufferAddAllCodec, dataList, overflowPolicy) + .then((clientMessage) => { + const response = RingbufferAddAllCodec.decodeResponse(clientMessage); + return response.response; + }); } readOne(sequence: number | Long): Promise { @@ -70,7 +96,11 @@ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbu throw new RangeError('Sequence number should not be less than zero, was: ' + sequence); } - return this.encodeInvoke(RingbufferReadOneCodec, sequence); + return this.encodeInvoke(RingbufferReadOneCodec, sequence) + .then((clientMessage) => { + const response = RingbufferReadOneCodec.decodeResponse(clientMessage); + return this.toObject(response.response); + }); } readMany(sequence: number | Long, minCount: number, maxCount: number, filter: any = null): Promise> { @@ -87,9 +117,11 @@ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbu throw new RangeError('Min count ' + minCount + 'was larger than max count ' + maxCount); } - return this.encodeInvoke(RingbufferReadManyCodec, sequence, minCount, maxCount, this.toData(filter)) - .then>((raw: any) => { - return new LazyReadResultSet(this.client.getSerializationService(), raw.readCount, raw.items, raw.itemSeqs); + return this.encodeInvoke(RingbufferReadManyCodec, sequence, minCount, maxCount, this.toData(filter)) + .then((clientMessage) => { + const response = RingbufferReadManyCodec.decodeResponse(clientMessage); + return new LazyReadResultSet(this.client.getSerializationService(), response.readCount, + response.items, response.itemSeqs); }); } } diff --git a/src/proxy/topic/Message.ts b/src/proxy/topic/Message.ts index a29838a46..c6d0b9fae 100644 --- a/src/proxy/topic/Message.ts +++ b/src/proxy/topic/Message.ts @@ -15,7 +15,7 @@ */ import Long = require('long'); -import Address = require('../../Address'); +import {Address} from '../../Address'; export class Message { messageObject: T; diff --git a/src/proxy/topic/ReliableTopicMessage.ts b/src/proxy/topic/ReliableTopicMessage.ts index 63e0eca36..f30c03048 100644 --- a/src/proxy/topic/ReliableTopicMessage.ts +++ b/src/proxy/topic/ReliableTopicMessage.ts @@ -17,9 +17,9 @@ import * as Long from 'long'; import {Data, DataInput, DataOutput} from '../../serialization/Data'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../../serialization/Serializable'; -import Address = require('../../Address'); +import {Address} from '../../Address'; -export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -18; +export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -9; export const RELIABLE_TOPIC_CLASS_ID = 2; export class ReliableTopicMessage implements IdentifiedDataSerializable { diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 969b5fea9..2bf77edc6 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -30,7 +30,6 @@ import {MessageListener} from './MessageListener'; import {TopicOverloadPolicy} from './TopicOverloadPolicy'; import Long = require('long'); -export const RINGBUFFER_PREFIX = '_hz_rb_'; export const TOPIC_INITIAL_BACKOFF = 100; export const TOPIC_MAX_BACKOFF = 2000; @@ -44,7 +43,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { constructor(client: HazelcastClient, serviceName: string, name: string) { super(client, serviceName, name); - this.localAddress = client.getClusterService().getClientInfo().localAddress; + this.localAddress = client.getClusterService().getLocalClient().localAddress; const config = client.getConfig().getReliableTopicConfig(name); this.batchSize = config.readBatchSize; this.overloadPolicy = config.overloadPolicy; @@ -52,10 +51,8 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { this.name = name; } - setRingbuffer(): Promise { - return this.client.getRingbuffer(RINGBUFFER_PREFIX + this.name).then((buffer) => { - this.ringbuffer = buffer; - }); + setRingbuffer(ringbuffer: Ringbuffer): void { + this.ringbuffer = ringbuffer; } addMessageListener(listener: MessageListener): string { diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index 07d909b64..adca57e23 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -382,8 +382,14 @@ export class PagingPredicate extends AbstractPredicate { constructor(internalPredicate: Predicate, pageSize: number, comparator: Comparator) { super(); - this.internalPredicate = internalPredicate; + if (pageSize <= 0) { + throw new TypeError('Page size should be greater than 0!'); + } this.pageSize = pageSize; + if (internalPredicate instanceof PagingPredicate) { + throw new TypeError('Nested paging predicate is not supported!'); + } + this.internalPredicate = internalPredicate; this.comparatorObject = comparator; } @@ -452,6 +458,18 @@ export class PagingPredicate extends AbstractPredicate { } } + setAnchorList(anchorList: Array<[number, [any, any]]>): void { + this.anchorList = anchorList; + } + + getPredicate(): Predicate { + return this.internalPredicate; + } + + getAnchorList(): Array<[number, [any, any]]> { + return this.anchorList; + } + getPage(): number { return this.page; } diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index 1ea00fbe7..52b0ed195 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -144,7 +144,7 @@ export class FloatSerializer implements Serializer { export class DateSerializer implements Serializer { getId(): number { - return -22; + return -25; } read(input: DataInput): any { @@ -323,7 +323,7 @@ export class FloatArraySerializer implements Serializer { export class JavaClassSerializer implements Serializer { getId(): number { - return -21; + return -24; } read(input: DataInput): any { @@ -338,7 +338,7 @@ export class JavaClassSerializer implements Serializer { export class LinkedListSerializer implements Serializer { getId(): number { - return -27; + return -30; } read(input: DataInput): any { @@ -360,7 +360,7 @@ export class LinkedListSerializer implements Serializer { export class ArrayListSerializer extends LinkedListSerializer { getId(): number { - return -26; + return -29; } } diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index ddb8eb749..2183b939c 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -235,16 +235,15 @@ export class ObjectDataOutput implements DataOutput { } private writeUTFStandard(val: string): void { - const len = (val != null) ? val.length : BitsUtil.NULL_ARRAY_LENGTH; + const len = (val != null) ? Buffer.byteLength(val, 'utf8') : BitsUtil.NULL_ARRAY_LENGTH; this.writeInt(len); if (len === BitsUtil.NULL_ARRAY_LENGTH) { return; } - const byteLen = Buffer.byteLength(val, 'utf8'); - this.ensureAvailable(byteLen); - this.buffer.write(val, this.pos, this.pos + byteLen, 'utf8'); - this.pos += byteLen; + this.ensureAvailable(len); + this.buffer.write(val, this.pos, this.pos + len, 'utf8'); + this.pos += len; } private writeUTFLegacy(val: string): void { @@ -604,18 +603,10 @@ export class ObjectDataInput implements DataInput { return null; } - // max char size in UTF-8 is 4 bytes, see RFC3629 - // TODO: change to `maxByteLen = len;` in future when string serialization in client protocol changes - const maxByteLen = len * 4; - const available = this.available(); - const readByteLen = maxByteLen > available ? available : maxByteLen; - - const readStr = this.buffer.toString('utf8', readPos, readPos + readByteLen); - const result = readStr.substring(0, len); + const result = this.buffer.toString('utf8', readPos, readPos + len); if (pos === undefined) { - const realByteLen = Buffer.byteLength(result, 'utf8'); - this.pos += realByteLen; + this.pos += len; } return result; diff --git a/src/serialization/PredicateFactory.ts b/src/serialization/PredicateFactory.ts index ebdbd7b7e..9628a0a64 100644 --- a/src/serialization/PredicateFactory.ts +++ b/src/serialization/PredicateFactory.ts @@ -18,7 +18,7 @@ import {Predicate} from '../core/Predicate'; import {DataInput, DataOutput} from './Data'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; -export const PREDICATE_FACTORY_ID = -32; +export const PREDICATE_FACTORY_ID = -20; export abstract class AbstractPredicate implements Predicate { diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts index ad0a9f74f..ec157afc0 100644 --- a/src/statistics/Statistics.ts +++ b/src/statistics/Statistics.ts @@ -15,7 +15,7 @@ */ import HazelcastClient from '../HazelcastClient'; -import {ClientConnection} from '../invocation/ClientConnection'; +import {ClientConnection} from '../network/ClientConnection'; import {Properties} from '../config/Properties'; import {ClientStatisticsCodec} from '../codec/ClientStatisticsCodec'; import * as Util from '../Util'; @@ -23,7 +23,8 @@ import {Task} from '../Util'; import * as os from 'os'; import {BuildInfo} from '../BuildInfo'; import {ILogger} from '../logging/ILogger'; -import Address = require('../Address'); +import * as Long from 'long'; +import {Buffer} from 'safe-buffer'; /** * This class is the main entry point for collecting and sending the client @@ -37,9 +38,6 @@ export class Statistics { private static readonly PERIOD_SECONDS = 'hazelcast.client.statistics.period.seconds'; private static readonly NEAR_CACHE_CATEGORY_PREFIX: string = 'nc.'; - private static readonly FEATURE_SUPPORTED_SINCE_VERSION_STRING: string = '3.9'; - private static readonly FEATURE_SUPPORTED_SINCE_VERSION: number = BuildInfo.calculateServerVersionFromString( - Statistics.FEATURE_SUPPORTED_SINCE_VERSION_STRING); private static readonly STAT_SEPARATOR: string = ','; private static readonly KEY_VALUE_SEPARATOR: string = '='; private static readonly ESCAPE_CHAR: string = '\\'; @@ -49,7 +47,6 @@ export class Statistics { private readonly properties: Properties; private readonly logger: ILogger; private client: HazelcastClient; - private ownerAddress: Address; private task: Task; constructor(clientInstance: HazelcastClient) { @@ -94,57 +91,31 @@ export class Statistics { */ schedulePeriodicStatisticsSendTask(periodSeconds: number): Task { return Util.scheduleWithRepetition(() => { - const ownerConnection: ClientConnection = this.getOwnerConnection(); - if (ownerConnection == null) { - this.logger.trace('Statistics', 'Can not send client statistics to the server. No owner connection.'); + const collectionTimestamp = Long.fromNumber(Date.now()); + + const connection = this.client.getConnectionManager().getRandomConnection(); + if (connection == null) { + this.logger.trace('Statistics', 'Can not send client statistics to the server. No connection found.'); return; } const stats: string[] = []; - this.fillMetrics(stats, ownerConnection); + this.fillMetrics(stats, connection); this.addNearCacheStats(stats); - this.sendStats(stats.join(''), ownerConnection); + this.sendStats(collectionTimestamp, stats.join(''), connection); }, 0, periodSeconds * 1000); } - sendStats(newStats: string, ownerConnection: ClientConnection): void { - const request = ClientStatisticsCodec.encodeRequest(newStats); - this.logger.trace('Statistics', 'Trying to send statistics to ' + - this.client.getClusterService().ownerUuid + ' from ' + ownerConnection.getLocalAddress().toString()); - this.client.getInvocationService().invokeOnConnection(ownerConnection, request).catch((err) => { - this.logger.trace('Statistics', 'Could not send stats ', err); - }); - } - - /** - * @return the owner connection to the server for the client only if the server supports the client statistics feature - */ - private getOwnerConnection(): ClientConnection { - const connection = this.client.getClusterService().getOwnerConnection(); - if (connection == null) { - return null; - } - - const ownerConnectionAddress: Address = connection.getAddress(); - const serverVersion: number = connection.getConnectedServerVersion(); - if (serverVersion < Statistics.FEATURE_SUPPORTED_SINCE_VERSION) { - - // do not print too many logs if connected to an old version server - if (this.ownerAddress == null || !ownerConnectionAddress.equals(this.ownerAddress)) { - this.logger.trace('Statistics', 'Client statistics can not be sent to server ' - + ownerConnectionAddress + ' since, connected ' - + 'owner server version is less than the minimum supported server version ' + - Statistics.FEATURE_SUPPORTED_SINCE_VERSION_STRING); - - } - // cache the last connected server address for decreasing the log prints - this.ownerAddress = ownerConnectionAddress; - return null; - } - return connection; + sendStats(collectionTimestamp: Long, newStats: string, connection: ClientConnection): void { + const request = ClientStatisticsCodec.encodeRequest(collectionTimestamp, newStats, Buffer.allocUnsafe(0)); + this.client.getInvocationService() + .invokeOnConnection(connection, request) + .catch((err) => { + this.logger.trace('Statistics', 'Could not send stats ', err); + }); } private registerMetrics(): void { @@ -202,15 +173,14 @@ export class Statistics { this.addStat(stats, name, Statistics.EMPTY_STAT_VALUE, keyPrefix); } - private fillMetrics(stats: string[], ownerConnection: ClientConnection): void { + private fillMetrics(stats: string[], connection: ClientConnection): void { this.addStat(stats, 'lastStatisticsCollectionTime', Date.now()); this.addStat(stats, 'enterprise', 'false'); - this.addStat(stats, 'clientType', this.client.getClusterService().getClientInfo().type); + this.addStat(stats, 'clientType', this.client.getClusterService().getLocalClient().type); this.addStat(stats, 'clientVersion', BuildInfo.getClientVersion()); - this.addStat(stats, 'clusterConnectionTimestamp', ownerConnection.getStartTime()); - this.addStat(stats, 'clientAddress', ownerConnection.getLocalAddress().toString()); + this.addStat(stats, 'clusterConnectionTimestamp', connection.getStartTime()); + this.addStat(stats, 'clientAddress', connection.getLocalAddress().toString()); this.addStat(stats, 'clientName', this.client.getName()); - this.addStat(stats, 'credentials.principal', this.client.getConfig().groupConfig.name); for (const gaugeName in this.allGauges) { const gaugeValueFunc = this.allGauges[gaugeName]; diff --git a/src/util/AbstractLoadBalancer.ts b/src/util/AbstractLoadBalancer.ts new file mode 100644 index 000000000..3721c8edc --- /dev/null +++ b/src/util/AbstractLoadBalancer.ts @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {LoadBalancer} from '../LoadBalancer'; +import {InitialMembershipListener} from '../core/InitialMembershipListener'; +import {Cluster} from '../core/Cluster'; +import {ClientConfig} from '../config/Config'; +import {InitialMembershipEvent} from '../core/InitialMembershipEvent'; +import {MembershipEvent} from '../core/MembershipEvent'; +import {Member} from '../core/Member'; + +export abstract class AbstractLoadBalancer implements LoadBalancer, InitialMembershipListener { + private members: Member[]; + private cluster: Cluster; + + public abstract next(): Member; + + public initLoadBalancer(cluster: Cluster, config: ClientConfig): void { + this.cluster = cluster; + cluster.addMembershipListener(this); + } + + public init(event: InitialMembershipEvent): void { + this.setMembers(); + } + + public memberAdded(membership: MembershipEvent): void { + this.setMembers(); + } + + public memberRemoved(membership: MembershipEvent): void { + this.setMembers(); + } + + protected getMembers(): Member[] { + return this.members; + } + + private setMembers(): void { + this.members = this.cluster.getMembers(); + } +} diff --git a/src/util/IndexUtil.ts b/src/util/IndexUtil.ts new file mode 100644 index 000000000..b87f10355 --- /dev/null +++ b/src/util/IndexUtil.ts @@ -0,0 +1,175 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {IndexConfig} from '../config/IndexConfig'; +import {IndexType} from '../config/IndexType'; +import {BitmapIndexOptions} from '../config/BitmapIndexOptions'; + +/** + * Maximum number of attributes allowed in the index. + */ +const MAX_ATTRIBUTES = 255; + +/** + * Pattern to stripe away "this." prefix. + */ +const THIS_PATTERN = new RegExp('^this\\.'); + +export class IndexUtil { + /** + * Validate provided index config and normalize it's name and attribute names. + * + * @param mapName Name of the map + * @param config Index config. + * @return Normalized index config. + * @throws TypeError If index configuration is invalid. + */ + static validateAndNormalize(mapName: string, config: IndexConfig): IndexConfig { + // Validate attributes + const originalAttributeNames = config.attributes; + + if (originalAttributeNames.length === 0) { + throw new TypeError('Index must have at least one attribute: ' + config.toString()); + } + + if (originalAttributeNames.length > MAX_ATTRIBUTES) { + throw new TypeError('Index cannot have more than ' + MAX_ATTRIBUTES + ' attributes: ' + config.toString()); + } + + if (config.type === IndexType.BITMAP && originalAttributeNames.length > 1) { + throw new TypeError('Composite bitmap indexes are not supported: ' + config.toString()); + } + + const normalizedAttributeNames = new Array(originalAttributeNames.length); + for (let i = 0; i < originalAttributeNames.length; i++) { + let originalAttributeName = originalAttributeNames[i]; + this.validateAttribute(config, originalAttributeName); + + originalAttributeName = originalAttributeName.trim(); + const normalizedAttributeName = this.canonicalizeAttribute(originalAttributeName); + + const existingIdx = normalizedAttributeNames.indexOf(normalizedAttributeName); + + if (existingIdx !== -1) { + const duplicateOriginalAttributeName = originalAttributeNames[existingIdx]; + + if (duplicateOriginalAttributeName === originalAttributeName) { + throw new TypeError('Duplicate attribute name [attributeName= ' + + originalAttributeName + ', indexConfig=' + config.toString() + ']'); + } else { + throw new TypeError('Duplicate attribute names [attributeName1=' + + duplicateOriginalAttributeName + ', attributeName2=' + + originalAttributeName + ', indexConfig=' + config.toString() + ']'); + } + } + + normalizedAttributeNames[i] = normalizedAttributeName; + } + + // Construct final index + let name = config.name; + + if (name != null && name.trim().length === 0) { + name = null; + } + + const normalizedConfig = this.buildNormalizedConfig(mapName, config.type, name, normalizedAttributeNames); + if (config.type === IndexType.BITMAP) { + let uniqueKey = config.bitmapIndexOptions.uniqueKey; + const uniqueKeyTransformation = config.bitmapIndexOptions.uniqueKeyTransformation; + + this.validateAttribute(config, uniqueKey); + uniqueKey = this.canonicalizeAttribute(uniqueKey); + + normalizedConfig.bitmapIndexOptions.uniqueKey = uniqueKey; + normalizedConfig.bitmapIndexOptions.uniqueKeyTransformation = uniqueKeyTransformation; + } + return normalizedConfig; + } + + /** + * Validate attribute name. + * + * @param config Index config. + * @param attributeName Attribute name. + */ + static validateAttribute(config: IndexConfig, attributeName: string): void { + if (attributeName == null) { + throw new TypeError('Attribute name cannot be null: ' + config); + } + + const attributeName0 = attributeName.trim(); + + if (attributeName0.length === 0) { + throw new TypeError('Attribute name cannot be empty: ' + config); + } + + if (attributeName0.endsWith('.')) { + throw new TypeError('Attribute name cannot end with dot [config= ' + config + + ', attribute=' + attributeName + ']'); + } + } + + /** + * Produces canonical attribute representation by stripping an unnecessary + * "this." qualifier from the passed attribute, if any. + * + * @param attribute the attribute to canonicalize. + * @return the canonical attribute representation. + */ + static canonicalizeAttribute(attribute: string): string { + return attribute.replace(THIS_PATTERN, ''); + } + + private static buildNormalizedConfig(mapName: string, indexType: IndexType, indexName: string, + normalizedAttributeNames: string[]): IndexConfig { + const newConfig = new IndexConfig(); + newConfig.bitmapIndexOptions = new BitmapIndexOptions(); + newConfig.type = indexType; + + let name = indexName == null ? mapName + '_' + this.getIndexTypeName(indexType) : null; + + for (const normalizedAttributeName of normalizedAttributeNames) { + newConfig.addAttribute(normalizedAttributeName); + + if (name != null) { + name += '_' + normalizedAttributeName; + } + } + + if (name != null) { + indexName = name; + } + + newConfig.name = indexName; + + return newConfig; + } + + private static getIndexTypeName(indexType: IndexType): string { + switch (indexType) { + case IndexType.SORTED: + return 'sorted'; + case IndexType.HASH: + return 'hash'; + case IndexType.BITMAP: + return 'bitmap'; + default: + throw new TypeError('Unsupported index type: ' + indexType); + } + } + +} diff --git a/src/util/RandomLB.ts b/src/util/RandomLB.ts new file mode 100644 index 000000000..31f18d804 --- /dev/null +++ b/src/util/RandomLB.ts @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {AbstractLoadBalancer} from './AbstractLoadBalancer'; +import {Member} from '../core/Member'; +import {randomInt} from '../Util'; + +/** + * A {@link LoadBalancer} that selects a random member to route to. + */ +export class RandomLB extends AbstractLoadBalancer { + next(): Member { + const members = this.getMembers(); + if (members == null || members.length === 0) { + return null; + } + const index = randomInt(members.length); + return members[index]; + } +} diff --git a/src/util/RoundRobinLB.ts b/src/util/RoundRobinLB.ts new file mode 100644 index 000000000..57c9646ec --- /dev/null +++ b/src/util/RoundRobinLB.ts @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {AbstractLoadBalancer} from './AbstractLoadBalancer'; +import {randomInt} from '../Util'; +import {Member} from '../core/Member'; + +// tslint:disable-next-line:no-bitwise +const INITIAL_SEED_CAP = 1 << 16; + +/** + * A {@link LoadBalancer} implementation that relies on using round robin + * to a next member to send a request to. + */ +export class RoundRobinLB extends AbstractLoadBalancer { + private index: number; + + constructor() { + super(); + this.index = randomInt(INITIAL_SEED_CAP); + } + + next(): Member { + const members = this.getMembers(); + if (members == null || members.length === 0) { + return null; + } + + const length = members.length; + const idx = (this.index++) % length; + return members[idx]; + } +} diff --git a/src/util/UuidUtil.ts b/src/util/UuidUtil.ts index 61ae47753..e50ac49f2 100644 --- a/src/util/UuidUtil.ts +++ b/src/util/UuidUtil.ts @@ -25,9 +25,9 @@ function randomUInt(): number { } export class UuidUtil { - static generate(): UUID { - const mostS = new Long(randomUInt(), randomUInt(), true); - const leastS = new Long(randomUInt(), randomUInt(), true); + static generate(isUnsigned: boolean = true): UUID { + const mostS = new Long(randomUInt(), randomUInt(), isUnsigned); + const leastS = new Long(randomUInt(), randomUInt(), isUnsigned); return new UUID(mostS, leastS); } } diff --git a/test/AddressHelperTest.js b/test/AddressHelperTest.js deleted file mode 100644 index 146f8907c..000000000 --- a/test/AddressHelperTest.js +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var Controller = require('./RC'); -var expect = require('chai').expect; - -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; - -describe('AddressHelper', function () { - this.timeout(30000); - - var cluster; - var client; - - before(function () { - return Controller.createCluster(null, null).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.networkConfig.addresses = ['127.0.0.2', '127.0.0.1:5701']; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (res) { - client = res; - }); - }); - - after(function () { - client.shutdown(); - return Controller.shutdownCluster(cluster.id); - }); - - - it('should try all addresses', function () { - var knownAddresses = client.getClusterService().knownAddresses.map(function (address) { - return address.toString(); - }); - - expect(knownAddresses).to.have.members(['127.0.0.2:5701', '127.0.0.2:5702', '127.0.0.2:5703', '127.0.0.1:5701']); - }); -}); diff --git a/test/AutoPipeliningDisabledTest.js b/test/AutoPipeliningDisabledTest.js index 6d285c29b..126554c5c 100644 --- a/test/AutoPipeliningDisabledTest.js +++ b/test/AutoPipeliningDisabledTest.js @@ -27,11 +27,12 @@ describe('AutoPipeliningDisabledTest', function () { let client; let map; - const createClient = () => { + const createClient = (clusterId) => { const cfg = new Config.ClientConfig(); + cfg.clusterName = clusterId; cfg.properties['hazelcast.client.autopipelining.enabled'] = false; return HazelcastClient.newHazelcastClient(cfg); - } + }; before(function () { this.timeout(32000); @@ -39,7 +40,7 @@ describe('AutoPipeliningDisabledTest', function () { cluster = c; return Controller.startMember(cluster.id); }).then(_ => { - return createClient(); + return createClient(cluster.id); }).then(c => { client = c; }); @@ -57,7 +58,7 @@ describe('AutoPipeliningDisabledTest', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('basic map operations work fine', function () { diff --git a/test/ClientMessageTest.js b/test/ClientMessageTest.js deleted file mode 100644 index 2012e6855..000000000 --- a/test/ClientMessageTest.js +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - - -var ClientMessage = require("../lib/ClientMessage"); -var expect = require('chai').expect; -var Buffer = require('safe-buffer').Buffer; -var Long = require('long'); - -describe('ClientMessageTest', function () { - - var message; - var buffer; - - beforeEach(function () { - buffer = Buffer.alloc(20); - message = new ClientMessage(buffer); - message.cursor = 0; - }); - - it('should append byte', function () { - message.appendByte(0x3); - expect(message.cursor).to.equal(1); - expect(buffer[0]).to.equal(0x3); - }); - - it('should append boolean', function () { - message.appendBoolean(true); - expect(message.cursor).to.equal(1); - expect(buffer[0]).to.equal(0x1); - }); - - it('should append int32', function () { - message.appendInt32(0x1234); - expect(message.cursor).to.equal(4); - expect(buffer[0]).to.equal(0x34); - expect(buffer[1]).to.equal(0x12); - }); - - it('should append uint8', function () { - message.appendUint8(0xAF); - expect(message.cursor).to.equal(1); - expect(buffer[0]).to.equal(0xAF); - }); - - it('should append long', function () { - message.appendLong(0x12345678); - expect(message.cursor).to.equal(8); - expect(buffer[0]).to.equal(0x78); - expect(buffer[1]).to.equal(0x56); - expect(buffer[2]).to.equal(0x34); - expect(buffer[3]).to.equal(0x12); - }); - - it('should append utf8 string', function () { - //0x61 0x62 0x63 0xC2 0xA9 0xE2 0x98 0xBA 0xF0 0xA9 0xB8 0xBD - message.appendString('abc©☺𩸽'); - expect(message.cursor).to.equal(16); - expect(buffer[0]).to.equal(0x0C); - expect(buffer[1]).to.equal(0x00); - expect(buffer[2]).to.equal(0x00); - expect(buffer[3]).to.equal(0x00); - expect(buffer[4]).to.equal(0x61); - expect(buffer[5]).to.equal(0x62); - expect(buffer[6]).to.equal(0x63); - expect(buffer[7]).to.equal(0xC2); - expect(buffer[8]).to.equal(0xA9); - expect(buffer[9]).to.equal(0xE2); - expect(buffer[10]).to.equal(0x98); - expect(buffer[11]).to.equal(0xBA); - expect(buffer[12]).to.equal(0xF0); - expect(buffer[13]).to.equal(0xA9); - expect(buffer[14]).to.equal(0xB8); - expect(buffer[15]).to.equal(0xBD); - }); - - it('should append buffer', function () { - message.appendBuffer(Buffer.from('abc©☺𩸽')); - expect(message.cursor).to.equal(16); - expect(buffer[0]).to.equal(0x0C); - expect(buffer[1]).to.equal(0x00); - expect(buffer[2]).to.equal(0x00); - expect(buffer[3]).to.equal(0x00); - expect(buffer[4]).to.equal(0x61); - expect(buffer[5]).to.equal(0x62); - expect(buffer[6]).to.equal(0x63); - expect(buffer[7]).to.equal(0xC2); - expect(buffer[8]).to.equal(0xA9); - expect(buffer[9]).to.equal(0xE2); - expect(buffer[10]).to.equal(0x98); - expect(buffer[11]).to.equal(0xBA); - expect(buffer[12]).to.equal(0xF0); - expect(buffer[13]).to.equal(0xA9); - expect(buffer[14]).to.equal(0xB8); - expect(buffer[15]).to.equal(0xBD); - }); - - it('should read byte', function () { - message.appendByte(0x3); - message.cursor = 0; - expect(message.readByte()).to.equal(0x3); - }); - - it('should read boolean', function () { - message.appendBoolean(true); - message.cursor = 0; - expect(message.readBoolean()).to.be.true; - }); - - it('should read int32', function () { - message.appendInt32(0x1234); - message.cursor = 0; - expect(message.readInt32()).to.equal(0x1234); - }); - - it('should read uint8', function () { - message.appendUint8(0xAF); - message.cursor = 0; - expect(message.readUInt8()).to.equal(0xAF); - }); - - it('should read long', function () { - message.appendLong(0x12345678); - message.cursor = 0; - expect(message.readLong()).to.deep.equal(Long.fromValue(0x12345678)); - }); - - it('should read utf8 string', function () { - message.appendString('abc©☺𩸽'); - message.cursor = 0; - expect(message.readString()).to.equal('abc©☺𩸽'); - }); - - it('should read buffer', function () { - message.appendBuffer(Buffer.from('abc©☺𩸽')); - message.cursor = 0; - expect(message.readBuffer()).to.deep.equal(Buffer.from('abc©☺𩸽')); - }); -}); diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index 2e0d1427f..4cf62f329 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -18,9 +18,10 @@ var Controller = require('./RC'); var expect = require('chai').expect; var MapProxy = require('../lib/proxy/MapProxy').MapProxy; -var ConnectionManager = require('../lib/invocation/ClientConnectionManager').ClientConnectionManager; -var ClientConnection = require('../lib/invocation/ClientConnection').ClientConnection; +var ConnectionManager = require('../lib/network/ClientConnectionManager').ClientConnectionManager; +var ClientConnection = require('../lib/network/ClientConnection').ClientConnection; var HazelcastClient = require('../.').Client; +var Config = require('../.').Config; var sinon = require('sinon'); var assert = require('chai').assert; var sandbox = sinon.createSandbox(); @@ -32,15 +33,18 @@ describe('Generic proxy test', function () { var list; afterEach(function () { - sandbox.restore(); - if (map && list) { - map.destroy(); - list.destroy(); - client.shutdown(); - return Controller.shutdownCluster(cluster.id); - } + sandbox.restore(); + if (map && list) { + return map.destroy() + .then(function () { + return list.destroy(); + }) + .then(function () { + client.shutdown(); + return Controller.terminateCluster(cluster.id); + }); } - ); + }); it('Client without active connection should return unknown version', function () { var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); @@ -71,7 +75,9 @@ describe('Generic proxy test', function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient(); + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(config); }).then(function (res) { client = res; return client.getMap('Furkan').then(function (m) { @@ -80,7 +86,8 @@ describe('Generic proxy test', function () { }).then(function (l) { list = l; expect(list.getServiceName()).to.be.equal('hz:impl:listService'); + expect(map.getServiceName()).to.be.equal('hz:impl:mapService'); }); }); }); -}) +}); diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index 91a85aaf9..9283a7e74 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -27,7 +27,7 @@ describe('Client reconnect', function () { afterEach(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('member restarts, while map.put in progress', function () { @@ -40,6 +40,7 @@ describe('Client reconnect', function () { }).then(function (m) { member = m; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; return HazelcastClient.newHazelcastClient(cfg); @@ -70,6 +71,7 @@ describe('Client reconnect', function () { }).then(function (m) { member = m; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; cfg.networkConfig.connectionTimeout = 10000; @@ -106,6 +108,7 @@ describe('Client reconnect', function () { }).then(function (m) { member = m; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; return HazelcastClient.newHazelcastClient(cfg); diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 72cb1d864..8b28a10fb 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -18,39 +18,32 @@ var Controller = require('./RC'); var expect = require('chai').expect; var HazelcastClient = require('../.').Client; var Config = require('../.').Config; -var Address = require('../.').Address; -var Promise = require('bluebird'); -var Address = require('../.').Address; describe('ClusterService', function () { this.timeout(25000); var cluster; - var ownerMember; + var member1; var client; - beforeEach(function (done) { - Controller.createCluster(null, null).then(function (res) { + beforeEach(function () { + return Controller.createCluster(null, null).then(function (res) { cluster = res; - Controller.startMember(cluster.id).then(function (res) { - ownerMember = res; - var cfg = new Config.ClientConfig(); - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 5000; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (res) { - client = res; - done(); - }).catch(function (err) { - done(err); - }); - }).catch(function (err) { - done(err); + return Controller.startMember(cluster.id); + }).then(function (res) { + member1 = res; + var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; + cfg.properties['hazelcast.client.heartbeat.timeout'] = 5000; + return HazelcastClient.newHazelcastClient(cfg); + }).then(function (res) { + client = res; }); }); afterEach(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('should know when a new member joins to cluster', function (done) { @@ -88,17 +81,18 @@ describe('ClusterService', function () { }); }); - it('getMembers returns correct list after a member is removed', function (done) { - this.timeout(20000); + it('getMemberList returns correct list after a member is removed', function (done) { var member2; var member3; var membershipListener = { memberRemoved: function (membershipEvent) { - var remainingMemberList = client.getClusterService().getMembers(); + var remainingMemberList = client.getClusterService().getMemberList(); expect(remainingMemberList).to.have.length(2); - expect(remainingMemberList[0].address.port).to.equal(ownerMember.port); - expect(remainingMemberList[1].address.port).to.equal(member3.port); + var portList = remainingMemberList.map(function (member) { + return member.address.port; + }); + expect(portList).to.have.members([member1.port, member3.port]); done(); } }; @@ -114,40 +108,41 @@ describe('ClusterService', function () { }); }); - it('should throw with message containing wrong host addresses in config', function () { + it('should throw when wrong host addresses given in config', function (done) { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 2000; cfg.networkConfig.addresses = [ '0.0.0.0:5709', '0.0.0.1:5710' ]; var falseStart = false; - return HazelcastClient.newHazelcastClient(cfg).catch(function (err) { - Promise.all(cfg.networkConfig.addresses.map(function (address) { - return expect(err.message).to.include(address.toString()); - })); + HazelcastClient.newHazelcastClient(cfg).catch(function (err) { + done(); }).then(function (client) { if (client) { falseStart = true; return client.shutdown(); - } else { - return; } }).then(function () { if (falseStart) { - throw Error('Client falsely started with wrong addresses') + done(Error('Client falsely started with wrong addresses')); } }); }); - it('should throw with wrong group name', function (done) { + it('should throw with wrong cluster name', function (done) { var cfg = new Config.ClientConfig(); - cfg.groupConfig.name = 'wrong'; + cfg.clusterName = 'wrong'; + cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 2000; + HazelcastClient.newHazelcastClient(cfg).then(function (newClient) { newClient.shutdown(); - done(new Error('Client falsely started with wrong group name')); + done(new Error('Client falsely started with wrong cluster name')); }).catch(function (err) { done(); }); }); -}); +}) +; diff --git a/test/ConnectionManagerTest.js b/test/ConnectionManagerTest.js index 6fff47ed1..afcb96133 100644 --- a/test/ConnectionManagerTest.js +++ b/test/ConnectionManagerTest.js @@ -25,6 +25,7 @@ var Config = require('../.').Config; var Hazelcast = require('../.').Client; var Controller = require('./RC'); var Errors = require('../').HazelcastErrors; +var Address = require('../.').Address; describe('ConnectionManager', function () { @@ -56,7 +57,7 @@ describe('ConnectionManager', function () { }); after(function () { - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); @@ -74,11 +75,12 @@ describe('ConnectionManager', function () { it('gives up connecting after timeout', function () { var timeoutTime = 1000; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.networkConfig.connectionTimeout = timeoutTime; startUnresponsiveServer(9999); return Hazelcast.newHazelcastClient(cfg).then(function (cl) { client = cl; - return client.getConnectionManager().getOrConnect({'host': 'localhost', 'port': 9999}); + return client.getConnectionManager().getOrConnect(new Address('localhost',9999)); }).should.eventually.be.rejected; }); @@ -87,6 +89,7 @@ describe('ConnectionManager', function () { var timeoutTime = 0; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.networkConfig.connectionTimeout = timeoutTime; startUnresponsiveServer(9999); @@ -96,7 +99,7 @@ describe('ConnectionManager', function () { Hazelcast.newHazelcastClient(cfg).then(function (cl) { client = cl; - return client.getConnectionManager().getOrConnect({'host': 'localhost', 'port': 9999}); + return client.getConnectionManager().getOrConnect(new Address('localhost',9999)); }).then(function (value) { clearTimeout(scheduled); done(new Error('Client should be retrying!')); @@ -114,6 +117,7 @@ describe('ConnectionManager', function () { var cfg = new Config.ClientConfig(); cfg.networkConfig.connectionTimeout = timeoutTime; cfg.networkConfig.addresses = ['127.0.0.1:9999']; + cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 2000; startUnresponsiveServer(9999); return expect(Hazelcast.newHazelcastClient(cfg)).to.be.rejectedWith(Errors.IllegalStateError); }); diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 5ddad18af..ab54ba338 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -75,6 +75,7 @@ configParams.forEach(function (cfg) { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { + cfg.clusterName = cluster.id; return HazelcastClient.newHazelcastClient(cfg); }).then(function (res) { client = res; @@ -91,7 +92,7 @@ configParams.forEach(function (cfg) { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('getDistributedObject returns empty array when there is no distributed object', function () { @@ -105,10 +106,11 @@ configParams.forEach(function (cfg) { it('getLocalEndpoint returns correct info', function () { var info = client.getLocalEndpoint(); - expect(info.localAddress.host).to.equal(client.clusterService.getOwnerConnection().localAddress.host); - expect(info.localAddress.port).to.equal(client.clusterService.getOwnerConnection().localAddress.port); - expect(info.uuid).to.equal(client.clusterService.uuid); + expect(info.localAddress.host).to.equal(client.getConnectionManager().getRandomConnection().localAddress.host); + expect(info.localAddress.port).to.equal(client.getConnectionManager().getRandomConnection().localAddress.port); + expect(info.uuid).to.deep.equal(client.getConnectionManager().getClientUuid()); expect(info.type).to.equal('NodeJS'); + expect(info.labels).to.deep.equal(new Set()); }); it('getDistributedObjects returns all dist objects', function (done) { diff --git a/test/LifecycleServiceTest.js b/test/LifecycleServiceTest.js index 289b8bf02..1f0172aba 100644 --- a/test/LifecycleServiceTest.js +++ b/test/LifecycleServiceTest.js @@ -31,21 +31,26 @@ describe('LifecycleService', function () { }); after(function () { - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - it('client should emit starting, started, shuttingDown and shutdown events in order', function (done) { + it('client should emit STARTING, STARTED, CONNECTED, SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events in order', function (done) { var cfg = new Config.ClientConfig(); - var expectedState = 'starting'; + cfg.clusterName = cluster.id; + var expectedState = 'STARTING'; cfg.listeners.addLifecycleListener( function (state) { - if (state === 'starting' && expectedState === 'starting') { - expectedState = 'started' - } else if (state === 'started' && expectedState === 'started') { - expectedState = 'shuttingDown'; - } else if (state === 'shuttingDown' && expectedState === 'shuttingDown') { - expectedState = 'shutdown'; - } else if (state === 'shutdown' && expectedState === 'shutdown') { + if (state === 'STARTING' && expectedState === 'STARTING') { + expectedState = 'STARTED' + } else if (state === 'STARTED' && expectedState === 'STARTED') { + expectedState = 'CONNECTED'; + } else if (state === 'CONNECTED' && expectedState === 'CONNECTED') { + expectedState = 'SHUTTING_DOWN'; + } else if (state === 'SHUTTING_DOWN' && expectedState === 'SHUTTING_DOWN') { + expectedState = 'DISCONNECTED'; + } else if (state === 'DISCONNECTED' && expectedState === 'DISCONNECTED') { + expectedState = 'SHUTDOWN'; + } else if (state === 'SHUTDOWN' && expectedState === 'SHUTDOWN') { done(); } else { done('Got lifecycle event ' + state + ' instead of ' + expectedState); @@ -57,35 +62,50 @@ describe('LifecycleService', function () { }); }); - it('client should emit starting, started, shuttingDown and shutdown events in order (via import config)', function (done) { + it('client should emit STARTING, STARTED, CONNECTED, SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events in order (via import config)', function (done) { var cfg = new Config.ClientConfig(); - var expectedState = 'starting'; + cfg.clusterName = cluster.id; + var expectedState = 'STARTING'; exports.lifecycleListener = function (state) { - if (state === 'starting' && expectedState === 'starting') { - expectedState = 'started' - } else if (state === 'started' && expectedState === 'started') { - expectedState = 'shuttingDown'; - } else if (state === 'shuttingDown' && expectedState === 'shuttingDown') { - expectedState = 'shutdown'; - } else if (state === 'shutdown' && expectedState === 'shutdown') { + if (state === 'STARTING' && expectedState === 'STARTING') { + expectedState = 'STARTED' + } else if (state === 'STARTED' && expectedState === 'STARTED') { + expectedState = 'CONNECTED'; + } else if (state === 'CONNECTED' && expectedState === 'CONNECTED') { + expectedState = 'SHUTTING_DOWN'; + } else if (state === 'SHUTTING_DOWN' && expectedState === 'SHUTTING_DOWN') { + expectedState = 'DISCONNECTED'; + } else if (state === 'DISCONNECTED' && expectedState === 'DISCONNECTED') { + expectedState = 'SHUTDOWN'; + } else if (state === 'SHUTDOWN' && expectedState === 'SHUTDOWN') { done(); } else { done('Got lifecycle event ' + state + ' instead of ' + expectedState); } }; - cfg.listenerConfigs.push({path: __filename, exportedName: 'lifecycleListener'}); + cfg.listenerConfigs.push({ + type: 'lifecycle', + importConfig: { + path: __filename, + exportedName: 'lifecycleListener' + } + }); HazelcastClient.newHazelcastClient(cfg).then(function (client) { client.shutdown(); }); }); - it('event listener should get shuttingDown and shutdown events when added after startup', function (done) { - var expectedState = 'shuttingDown'; - HazelcastClient.newHazelcastClient().then(function (client) { + it('event listener should get SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events when added after startup', function (done) { + var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + var expectedState = 'SHUTTING_DOWN'; + HazelcastClient.newHazelcastClient(cfg).then(function (client) { client.lifecycleService.on('lifecycleEvent', function (state) { - if (state === 'shuttingDown' && expectedState === 'shuttingDown') { - expectedState = 'shutdown'; - } else if (state === 'shutdown' && expectedState === 'shutdown') { + if (state === 'SHUTTING_DOWN' && expectedState === 'SHUTTING_DOWN') { + expectedState = 'DISCONNECTED'; + } else if (state === 'DISCONNECTED' && expectedState === 'DISCONNECTED') { + expectedState = 'SHUTDOWN'; + } else if (state === 'SHUTDOWN' && expectedState === 'SHUTDOWN') { done(); } else { done('Got lifecycle event ' + state + ' instead of ' + expectedState); @@ -96,16 +116,22 @@ describe('LifecycleService', function () { }); it('isRunning returns correct values at lifecycle stages', function (done) { - HazelcastClient.newHazelcastClient().then(function (client) { + var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + HazelcastClient.newHazelcastClient(cfg).then(function (client) { client.lifecycleService.on('lifecycleEvent', function (state) { - if (state === 'starting') { + if (state === 'STARTING') { expect(client.lifecycleService.isRunning()).to.be.false; - } else if (state === 'started') { + } else if (state === 'STARTED') { expect(client.lifecycleService.isRunning()).to.be.true; - } else if (state === 'shuttingDown') { + } else if (state === 'CONNECTED') { + expect(client.lifecycleService.isRunning()).to.be.true; + } else if (state === 'SHUTTING_DOWN') { + expect(client.lifecycleService.isRunning()).to.be.false; + } else if (state === 'DISCONNECTED') { expect(client.lifecycleService.isRunning()).to.be.false; - } else if (state === 'shutdown') { + } else if (state === 'SHUTDOWN') { expect(client.lifecycleService.isRunning()).to.be.false; done(); } else { @@ -116,12 +142,4 @@ describe('LifecycleService', function () { client.shutdown(); }); }); - - it('emitLifecycleEvent throws for invalid event', function (done) { - HazelcastClient.newHazelcastClient().then(function (client) { - expect(client.lifecycleService.emitLifecycleEvent.bind(client.lifecycleService, 'invalid')).to.throw(Error); - client.shutdown(); - done(); - }); - }) }); diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index 249aeb767..fb4c6ff2d 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -32,18 +32,24 @@ var Util = require('./Util'); return Promise.resolve(cluster.id); }).then(function (clusterId) { return RC.startMember(clusterId) - }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.networkConfig.smartRouting = isSmartService; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (res) { - client = res; }); }); + beforeEach(function () { + var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + cfg.networkConfig.smartRouting = isSmartService; + return HazelcastClient.newHazelcastClient(cfg).then(function (c) { + client = c; + }); + }); + + afterEach(function () { + return client.shutdown(); + }); + after(function () { - client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('listener is invoked when a new object is created', function (done) { @@ -88,11 +94,12 @@ var Util = require('./Util'); }); it('listener is not invoked when listener was already removed by user', function (done) { - this.timeout(3000); - client.addDistributedObjectListener(function (distributedObjectEvent) { - done('Should not have run!'); + client.addDistributedObjectListener(function () { + done(new Error('Should not have run!')); }).then(function (listenerId) { return client.removeDistributedObjectListener(listenerId) + }).then(function () { + return client.getMap('testMap'); }).then(function () { setTimeout(done, 1000); }); diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 65b8d172f..1580ed1d3 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -52,6 +52,7 @@ describe('Listeners on reconnect', function () { }).then(function (m) { members[2] = m; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; cfg.networkConfig.smartRouting = isSmart; @@ -67,8 +68,8 @@ describe('Listeners on reconnect', function () { expect(entryEvent.name).to.equal('testmap'); expect(entryEvent.key).to.equal('keyx'); expect(entryEvent.value).to.equal('valx'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -127,6 +128,7 @@ describe('Listeners on reconnect', function () { Controller.startMember(cluster.id).then(function (m) { member = m; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.networkConfig.smartRouting = isSmart; cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; return HazelcastClient.newHazelcastClient(cfg); @@ -141,8 +143,8 @@ describe('Listeners on reconnect', function () { expect(entryEvent.name).to.equal('testmap'); expect(entryEvent.key).to.equal('keyx'); expect(entryEvent.value).to.equal('valx'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -158,6 +160,7 @@ describe('Listeners on reconnect', function () { }).then(function () { return Util.promiseWaitMilliseconds(5000); }).then(function () { + console.log("here"); return map.put('keyx', 'valx'); }); }); diff --git a/test/LoggingTest.js b/test/LoggingTest.js index 2ed3d4c31..66e7fa0df 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -73,7 +73,7 @@ describe('Logging Test', function () { }); after(function () { - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); beforeEach(function () { @@ -94,6 +94,7 @@ describe('Logging Test', function () { loggingHappened = true; }); var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.customLogger = winstonAdapter; return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { client = hz; @@ -103,6 +104,7 @@ describe('Logging Test', function () { it('no logging', function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.logging.level'] = LogLevel.OFF; return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { client = hz; @@ -111,7 +113,9 @@ describe('Logging Test', function () { }); it('default logging in case of empty property', function () { - return HazelcastClient.newHazelcastClient().then(function (hz) { + var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { client = hz; return sinon.assert.called(console.log); }); @@ -119,6 +123,7 @@ describe('Logging Test', function () { it('default logging in case of default property', function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.logging.level'] = LogLevel.INFO; return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { client = hz; @@ -128,12 +133,14 @@ describe('Logging Test', function () { it('error in case of unknown property value', function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.customLogger = 'unknw'; return expect(HazelcastClient.newHazelcastClient.bind(this, cfg)).to.throw(Error); }); it('default logging, default level', function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; return HazelcastClient.newHazelcastClient(cfg).then(function (cl) { client = cl; return sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); @@ -142,6 +149,7 @@ describe('Logging Test', function () { it('default logging, error level', function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.logging.level'] = LogLevel.ERROR; return HazelcastClient.newHazelcastClient(cfg).then(function (cl) { client = cl; @@ -151,6 +159,7 @@ describe('Logging Test', function () { it('default logging, trace level', function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.logging.level'] = LogLevel.TRACE; return HazelcastClient.newHazelcastClient(cfg).then(function (cl) { client = cl; diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index 9ecfc27f7..ce26223ca 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -33,6 +33,7 @@ describe('Lost connection', function () { oldMember = m; }).then(function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.heartbeat.interval'] = 500; cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; return HazelcastClient.newHazelcastClient(cfg); @@ -43,10 +44,10 @@ describe('Lost connection', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); - it('M2 starts, M1 goes down, client sets M2 as owner', function (done) { + it('M2 starts, M1 goes down, client connects to M2', function (done) { this.timeout(32000); var newMember; var membershipListener = { @@ -55,8 +56,9 @@ describe('Lost connection', function () { return Util.promiseWaitMilliseconds(4000); }).then(function () { try { - expect(client.clusterService.getOwnerConnection().address.host).to.be.eq(newMember.host); - expect(client.clusterService.getOwnerConnection().address.port).to.be.eq(newMember.port); + const address = client.getConnectionManager().getRandomConnection().getRemoteAddress(); + expect(address.host).to.equal(newMember.host); + expect(address.port).to.equal(newMember.port); done(); } catch (e) { done(e); diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index b67074eb2..dcb022e5b 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -15,6 +15,7 @@ */ var HazelcastClient = require('../.').Client; +var Config = require('../.').Config; var Controller = require('./RC'); var expect = require('chai').expect; var DeferredPromise = require('../lib/Util').DeferredPromise; @@ -32,7 +33,9 @@ describe('MembershipListener', function () { return Controller.startMember(cluster.id) }).then(function (res) { member = res; - return HazelcastClient.newHazelcastClient(); + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(config); }).then(function (res) { client = res; }); @@ -40,7 +43,7 @@ describe('MembershipListener', function () { afterEach(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('sees member added event', function () { @@ -61,7 +64,7 @@ describe('MembershipListener', function () { expect(membershipEvent.member.address.host).to.equal(newMember.host); expect(membershipEvent.member.address.port).to.equal(newMember.port); expect(membershipEvent.eventType).to.equal(MemberEvent.ADDED); - expect(membershipEvent.members).to.equal(client.clusterService.getMembers()); + expect(membershipEvent.members).to.deep.equal(client.clusterService.getMemberList()); }); }); @@ -92,7 +95,7 @@ describe('MembershipListener', function () { expect(membershipEvent.member.address.host).to.equal(newMember.host); expect(membershipEvent.member.address.port).to.equal(newMember.port); expect(membershipEvent.eventType).to.equal(MemberEvent.ADDED); - expect(membershipEvent.members).to.equal(client.clusterService.getMembers()); + expect(membershipEvent.members).to.deep.equal(client.clusterService.getMemberList()); expect(listenedSecondListener).to.be.true; }); @@ -137,62 +140,7 @@ describe('MembershipListener', function () { expect(membershipEvent.member.address.host).to.equal(newMember.host); expect(membershipEvent.member.address.port).to.equal(newMember.port); expect(membershipEvent.eventType).to.equal(MemberEvent.REMOVED); - expect(membershipEvent.members).to.equal(client.clusterService.getMembers()); - }); - }); - - it('sees member attribute change put event', function () { - var attributeChangePromise = new DeferredPromise(); - - var membershipListener = { - memberAttributeChanged: function (memberAttributeEvent) { - attributeChangePromise.resolve(memberAttributeEvent); - } - }; - client.clusterService.addMembershipListener(membershipListener); - - var script = 'function attrs() { ' + - 'return instance_0.getCluster().getLocalMember().setIntAttribute("test", 123); }; result=attrs();'; - return Controller.executeOnController(cluster.id, script, 1).then(function () { - return attributeChangePromise.promise; - }).then(function (memberAttributeEvent) { - expect(memberAttributeEvent.operationType === MemberAttributeOperationType.PUT); - expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); - expect(memberAttributeEvent.key).to.equal('test'); - expect(memberAttributeEvent.value).to.equal('123'); - }); - }); - - it('sees member attribute change remove event', function () { - var attributeRemovePromise = new DeferredPromise(); - var attributeAddPromise = new DeferredPromise(); - var membershipListener = { - memberAttributeChanged: function (memberAttributeEvent) { - if (memberAttributeEvent.operationType === MemberAttributeOperationType.PUT) { - attributeAddPromise.resolve(memberAttributeEvent); - } else if (memberAttributeEvent.operationType === MemberAttributeOperationType.REMOVE) { - attributeRemovePromise.resolve(memberAttributeEvent); - } else { - attributeAddPromise.reject(undefined); - } - } - }; - client.clusterService.addMembershipListener(membershipListener); - - var addScript = 'function attrs() { ' + - 'return instance_0.getCluster().getLocalMember().setIntAttribute("test", 123); }; result=attrs();'; - var removeScript = 'function attrs() { ' + - 'return instance_0.getCluster().getLocalMember().removeAttribute("test"); }; result=attrs();'; - return Controller.executeOnController(cluster.id, addScript, 1).then(function () { - return attributeAddPromise.promise; - }).then(function () { - return Controller.executeOnController(cluster.id, removeScript, 1); - }).then(function () { - return attributeRemovePromise.promise; - }).then(function (memberAttributeEvent) { - expect(memberAttributeEvent.operationType === MemberAttributeOperationType.REMOVE); - expect(memberAttributeEvent.member.uuid).to.equal(member.uuid); - expect(memberAttributeEvent.key, 'test3'); + expect(membershipEvent.members).to.deep.equal(client.clusterService.getMemberList()); }); }); }); diff --git a/test/RC.js b/test/RC.js index ccab106a3..a1edecf95 100644 --- a/test/RC.js +++ b/test/RC.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var RemoteController = require('hazelcast-remote-controller'); +var RemoteController = require('./remote_controller/Controller'); var DeferredPromise = require('../lib/Util').DeferredPromise; var controller = new RemoteController('localhost', 9701); diff --git a/test/Util.js b/test/Util.js index f5a01c956..523eda604 100644 --- a/test/Util.js +++ b/test/Util.js @@ -16,6 +16,8 @@ var expect = require('chai').expect; var BuildInfo = require('../lib/BuildInfo').BuildInfo; +var UuidUtil = require('../lib/util/UuidUtil').UuidUtil; + var promiseLater = function (time, func) { if (func === undefined) { func = function () { @@ -81,7 +83,7 @@ exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { if (process.env['SERVER_VERSION']) { var actNumber = BuildInfo.calculateServerVersionFromString(process.env['SERVER_VERSION']); } else if (client != null) { - var actNumber = client.getClusterService().getOwnerConnection().getConnectedServerVersion(); + var actNumber = client.getConnectionManager().getRandomConnection().getConnectedServerVersion(); } else { return; } @@ -103,11 +105,9 @@ exports.getRandomInt = function (lowerLim, upperLim) { return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; }; -exports.findMemberByAddress = function (client, address) { - return client.getClusterService().getMembers().find(function (m) { - return m.address.equals(address); - }); -}; - exports.promiseLater = promiseLater; exports.expectAlmostEqual = expectAlmostEqual; + +exports.randomString = function () { + return UuidUtil.generate().toString(); +}; diff --git a/test/atomiclong/AtomicLongTest.js b/test/atomiclong/AtomicLongTest.js deleted file mode 100644 index c3af86728..000000000 --- a/test/atomiclong/AtomicLongTest.js +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var expect = require("chai").expect; -var Long = require("long"); -var HazelcastClient = require("../../lib/index.js").Client; -var Controller = require('./../RC'); -var Util = require('./../Util'); - -function expectLongEq(expected, l) { - return expect(l.toString()).to.equal(Long.fromValue(expected).toString()); -} - -describe("AtomicLong Proxy", function () { - - var cluster; - var client; - var l; - - before(function () { - this.timeout(10000); - return Controller.createCluster().then(function (response) { - cluster = response; - return Controller.startMember(cluster.id); - }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { - client = hazelcastClient; - }); - }); - }); - - beforeEach(function () { - return client.getAtomicLong('along').then(function (al) { - l = al; - }); - }); - - afterEach(function () { - return l.destroy(); - }); - - after(function () { - client.shutdown(); - return Controller.shutdownCluster(cluster.id); - }); - - it('get return 0 initially', function () { - return l.get().then(function (v) { - return expectLongEq(0, v); - }); - }); - - it('addAndGet returns added value', function () { - return l.addAndGet(33).then(function (v) { - return expectLongEq(33, v); - }); - }); - - it('addAndGet adds', function () { - return l.addAndGet(33).then(function () { - return l.get(); - }).then(function (v) { - return expectLongEq(33, v); - }); - }); - - it('getAndAdd returns old val', function () { - return l.getAndAdd(123).then(function (v) { - return expectLongEq(0, v); - }); - }); - - it('getAndAdd adds', function () { - return l.getAndAdd(123).then(function () { - return l.get(); - }).then(function (v) { - return expectLongEq(123, v); - }); - }); - - it('decrementAndGet decrements', function () { - return l.decrementAndGet().then(function (v) { - return expectLongEq(-1, v); - }); - }); - - it('compareAndSet sets the value when comdition is true', function () { - return l.set('99999999999999').then(function () { - return l.compareAndSet('99999999999999', 13); - }).then(function (v) { - expect(v).to.be.true; - return l.get(); - }).then(function (v) { - return expectLongEq(13, v); - }); - }); - - it('compareAndSet has no efffect the value when comdition is false', function () { - return l.set('99999999999999').then(function () { - return l.compareAndSet(13, 13); - }).then(function (v) { - expect(v).to.be.false; - return l.get(); - }).then(function (v) { - return expectLongEq('99999999999999', v); - }); - }); - - it('set', function () { - return l.set('99999999999999').then(function () { - return l.get(); - }).then(function (v) { - return expectLongEq('99999999999999', v); - }); - }); - - it('getAndSet returns old value', function () { - return l.getAndSet(-123).then(function (v) { - return expectLongEq(0, v); - }); - }); - - it('getAndSet sets the value', function () { - return l.getAndSet(-123).then(function (v) { - return l.get(); - }).then(function (v) { - return expectLongEq(-123, v); - }); - }); - - it('incrementAndGet increments', function () { - return l.incrementAndGet().then(function (v) { - return expectLongEq(1, v); - }); - }); - - it('getAndIncrement returns old value', function () { - return l.getAndIncrement().then(function (v) { - return expectLongEq(0, v); - }); - }); - - it('getAndIncrement increments the value', function () { - return l.getAndIncrement(1).then(function (v) { - return l.get(); - }).then(function (v) { - return expectLongEq(1, v); - }); - }); -}); diff --git a/test/connection/FrameReaderTest.js b/test/connection/ClientMessageReaderTest.js similarity index 68% rename from test/connection/FrameReaderTest.js rename to test/connection/ClientMessageReaderTest.js index bdf219d6e..3a34e4535 100644 --- a/test/connection/FrameReaderTest.js +++ b/test/connection/ClientMessageReaderTest.js @@ -19,29 +19,31 @@ const Buffer = require('safe-buffer').Buffer; const expect = require('chai').expect; -const FrameReader = require('../../lib/invocation/ClientConnection').FrameReader; +const ClientMessageReader = require('../../lib/network/ClientConnection').ClientMessageReader; +const cm = require('../../lib/ClientMessage'); +const headerSize = cm.SIZE_OF_FRAME_LENGTH_AND_FLAGS; -describe('FrameReader', function () { +describe('ClientMessageReader', function () { let reader; beforeEach(() => { - reader = new FrameReader; + reader = new ClientMessageReader(); }); - it('reads single message (without copying it)', () => { + it('reads single message', () => { const buffer = prepareMessage(8); reader.append(buffer); - expect(reader.read()).to.be.equal(buffer); + expect(reader.read().startFrame.content).to.be.deep.equal(buffer.slice(headerSize)); }); it('reads multiple messages', () => { const buffer = Buffer.concat([prepareMessage(8), prepareMessage(8)]); reader.append(buffer); - expect(reader.read()).to.be.deep.equal(buffer.slice(0, 8)); - expect(reader.read()).to.be.deep.equal(buffer.slice(8)); + expect(reader.read().startFrame.content).to.be.deep.equal(buffer.slice(headerSize, headerSize + 8)); + expect(reader.read().startFrame.content).to.be.deep.equal(buffer.slice(2 * headerSize + 8)); }); it('reads chunked message', () => { @@ -56,7 +58,7 @@ describe('FrameReader', function () { } reader.append(buffer.slice(pos)); - expect(reader.read()).to.be.deep.equal(Buffer.from(buffer)); + expect(reader.read().startFrame.content).to.be.deep.equal(buffer.slice(headerSize)); }); it('reads chunked message with small first chunk', () => { @@ -66,7 +68,7 @@ describe('FrameReader', function () { expect(reader.read()).to.be.equal(null); reader.append(buffer.slice(2)); - expect(reader.read()).to.be.deep.equal(Buffer.from(buffer)); + expect(reader.read().startFrame.content).to.be.deep.equal(buffer.slice(headerSize)); }); it('returns slices for multiple messages in single chunk', () => { @@ -76,7 +78,7 @@ describe('FrameReader', function () { const read = reader.read(); buffer.writeInt32LE(42, 4); - expect(read).to.be.deep.equal(buffer.slice(0, 8)); + expect(read.startFrame.content).to.be.deep.equal(buffer.slice(headerSize, headerSize + 8)); }); it('returns null on read initially', () => { @@ -92,8 +94,9 @@ describe('FrameReader', function () { }); const prepareMessage = (size) => { - const buffer = Buffer.allocUnsafe(size); - buffer.writeInt32LE(size); + const buffer = Buffer.allocUnsafe(cm.SIZE_OF_FRAME_LENGTH_AND_FLAGS + size); + buffer.writeInt32LE(buffer.length, 0); + buffer.writeUInt16LE(1 << 15 | 1 << 14 | 1 << 13, 4); return buffer; } diff --git a/test/connection/DirectWriterTest.js b/test/connection/DirectWriterTest.js index 28f2e6ba7..f15ca1954 100644 --- a/test/connection/DirectWriterTest.js +++ b/test/connection/DirectWriterTest.js @@ -22,7 +22,7 @@ const sinon = require('sinon'); const expect = require('chai').expect; const DeferredPromise = require('../../lib/Util').DeferredPromise; -const DirectWriter = require('../../lib/invocation/ClientConnection').DirectWriter; +const DirectWriter = require('../../lib/network/ClientConnection').DirectWriter; describe('DirectWriter', function () { diff --git a/test/connection/FragmentedClientMessageHandlerTest.js b/test/connection/FragmentedClientMessageHandlerTest.js new file mode 100644 index 000000000..5c65e37cd --- /dev/null +++ b/test/connection/FragmentedClientMessageHandlerTest.js @@ -0,0 +1,165 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const Buffer = require('safe-buffer').Buffer; +const expect = require('chai').expect; +const crypto = require('crypto'); + +const FragmentedClientMessageHandler = require('../../lib/network/ClientConnection').FragmentedClientMessageHandler; +const ClientMessageReader = require('../../lib/network/ClientConnection').ClientMessageReader; +const cm = require('../../lib/ClientMessage'); +const FixSizedTypesCodec = require('../../lib/codec/builtin/FixSizedTypesCodec').FixSizedTypesCodec; + +describe('FragmentedClientMessageHandler', function () { + + let reader; + let handler; + + beforeEach(() => { + reader = new ClientMessageReader(); + handler = new FragmentedClientMessageHandler(); + }); + + it('handles fragmented message', function (done) { + const message = createMessage(10, 9); + const fragments = split(48, message, 42); + + expect(fragments).to.have.lengthOf(3); + reader.append(writeFragments(fragments)); + + const fragment0 = reader.read(); + const fragment1 = reader.read(); + const fragment2 = reader.read(); + + expect(fragment0.startFrame.hasBeginFragmentFlag()).to.be.true; + expect(fragment0.startFrame.hasEndFragmentFlag()).to.be.false; + + expect(fragment1.startFrame.hasBeginFragmentFlag()).to.be.false; + expect(fragment1.startFrame.hasEndFragmentFlag()).to.be.false; + + expect(fragment2.startFrame.hasBeginFragmentFlag()).to.be.false; + expect(fragment2.startFrame.hasEndFragmentFlag()).to.be.true; + + // Should add to map + handler.handleFragmentedMessage(fragment0, () => done(new Error("It should just add to map."))); + const fragmentedMessage = handler.fragmentedMessages.get(42); + compareMessages(fragments[0].startFrame.next, fragmentedMessage.startFrame); + let endFrame = fragmentedMessage.endFrame; + + // Should merge with the above message + handler.handleFragmentedMessage(fragment1, () => done(new Error("It should just merge."))); + compareMessages(fragments[1].startFrame.next, endFrame.next); + endFrame = fragmentedMessage.endFrame; + + // Should merge with the above message and run the callback + handler.handleFragmentedMessage(fragment2, () => { + compareMessages(fragments[2].startFrame.next, endFrame.next); + done(); + }); + + }); + + const compareMessages = (frame1, frame2) => { + expect(frame1).to.not.be.null; + while (frame1 != null) { + expect(frame1.content).to.deep.equal(frame2.content); + + frame1 = frame1.next; + frame2 = frame2.next; + } + expect(frame2).to.be.null; + }; + + const writeFragments = (fragments) => { + const buffers = []; + let totalLength = 0; + for (let i = 0; i < fragments.length; i++) { + const fragment = fragments[i]; + const buffer = fragment.toBuffer(); + buffers.push(buffer); + totalLength += buffer.length; + } + return Buffer.concat(buffers, totalLength); + }; + + const createMessage = (frameLength, frameCount) => { + const message = cm.ClientMessage.createForEncode(); + for (let i = 0; i < frameCount; i++) { + message.addFrame(new cm.Frame(crypto.randomBytes(frameLength))); + } + return message; + }; + + const readState = { + BEGINNING: 0, + MIDDLE: 1, + }; + + const split = (maxTotalFrameLength, clientMessage, fragmentId) => { + const fragments = []; + + let length = 0; + let fragment = null; + let state = readState.BEGINNING; + + while (clientMessage.hasNextFrame()) { + const frame = clientMessage.peekNextFrame(); + const frameLength = frame.getLength(); + length += frameLength; + + if (frameLength > maxTotalFrameLength) { + clientMessage.nextFrame(); + if (state === readState.MIDDLE) { + fragments.push(fragment); + } + fragment = createFragment(fragmentId); + fragment.addFrame(frame.copy()); + fragments.push(fragment); + state = readState.BEGINNING; + length = 0; + } else if (length <= maxTotalFrameLength) { + clientMessage.nextFrame(); + if (state === readState.BEGINNING) { + fragment = createFragment(fragmentId); + } + fragment.addFrame(frame.copy()); + state = readState.MIDDLE; + } else { + fragments.push(fragment); + state = readState.BEGINNING; + length = 0; + } + } + if (state === readState.MIDDLE) { + fragments.push(fragment); + } + + fragments[0].startFrame.flags |= 1 << 15; + fragments[fragments.length - 1].startFrame.flags |= 1 << 14; + return fragments; + } + + const createFragment = (fragmentId) => { + const fragment = cm.ClientMessage.createForEncode(); + const frame = new cm.Frame(Buffer.allocUnsafe(8)); + FixSizedTypesCodec.encodeLong(frame.content, 0, fragmentId); + fragment.addFrame(frame); + return fragment; + } + +}); diff --git a/test/connection/PipelinedWriterTest.js b/test/connection/PipelinedWriterTest.js index 700562cc5..263ea57f5 100644 --- a/test/connection/PipelinedWriterTest.js +++ b/test/connection/PipelinedWriterTest.js @@ -23,10 +23,9 @@ const expect = require('chai').expect; const Promise = require('bluebird'); const DeferredPromise = require('../../lib/Util').DeferredPromise; -const PipelinedWriter = require('../../lib/invocation/ClientConnection').PipelinedWriter; +const PipelinedWriter = require('../../lib/network/ClientConnection').PipelinedWriter; describe('PipelinedWriter', function () { - let writer; let mockSocket; diff --git a/test/declarative_config/ConfigBuilderTest.js b/test/declarative_config/ConfigBuilderTest.js index be464232e..e0829bb63 100644 --- a/test/declarative_config/ConfigBuilderTest.js +++ b/test/declarative_config/ConfigBuilderTest.js @@ -19,15 +19,16 @@ var path = require('path'); var ConfigBuilder = require('../../').ConfigBuilder; var Config = require('../../').Config; var AddressHelper = require("../../lib/Util").AddressHelper; +var ReconnectMode = require('../../lib/config/ConnectionStrategyConfig').ReconnectMode; describe('ConfigBuilder Test', function () { - var configFull; + var fullConfig; before(function () { var configBuilder = new ConfigBuilder(); process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, 'configurations/full.json'); return configBuilder.loadConfig().then(function () { - configFull = configBuilder.build(); + fullConfig = configBuilder.build(); }); }); @@ -35,8 +36,37 @@ describe('ConfigBuilder Test', function () { delete process.env['HAZELCAST_CLIENT_CONFIG']; }); + it('clusterName', function () { + expect(fullConfig.clusterName).to.equal('testCluster'); + }); + + it('instanceName', function () { + expect(fullConfig.instanceName).to.equal('clientName'); + }); + + it('clientLabels', function () { + var labels = fullConfig.labels; + expect(labels.size).to.equal(2); + expect(labels.has('label1')).to.be.true; + expect(labels.has('label2')).to.be.true; + }); + + it('connectionStrategy', function () { + var connectionStrategyConfig = fullConfig.connectionStrategyConfig; + expect(connectionStrategyConfig.asyncStart).to.be.true; + expect(connectionStrategyConfig.reconnectMode).to.equal(ReconnectMode.ASYNC); + + var connectionRetryConfig = connectionStrategyConfig.connectionRetryConfig; + expect(connectionRetryConfig.initialBackoffMillis).to.equal(2000); + expect(connectionRetryConfig.maxBackoffMillis).to.equal(60000); + expect(connectionRetryConfig.multiplier).to.equal(3); + expect(connectionRetryConfig.clusterConnectTimeoutMillis).to.equal(5000); + expect(connectionRetryConfig.jitter).to.equal(0.5); + + }); + it('networkConfig', function () { - var networkCfg = configFull.networkConfig; + var networkCfg = fullConfig.networkConfig; var addresses0 = AddressHelper.getSocketAddresses(networkCfg.addresses[0]); expect(addresses0[0].host).to.equal('127.0.0.9'); @@ -61,8 +91,6 @@ describe('ConfigBuilder Test', function () { expect(address1.port).to.equal(5702); expect(networkCfg.smartRouting).to.be.false; expect(networkCfg.connectionTimeout).to.equal(6000); - expect(networkCfg.connectionAttemptPeriod).to.equal(4000); - expect(networkCfg.connectionAttemptLimit).to.equal(3); expect(networkCfg.sslConfig.enabled).to.be.true; expect(networkCfg.sslConfig.sslOptions).to.be.null; expect(networkCfg.sslConfig.sslOptionsFactoryConfig.path).to.equal('path/to/file'); @@ -70,14 +98,8 @@ describe('ConfigBuilder Test', function () { expect(networkCfg.sslConfig.sslOptionsFactoryProperties['userDefinedProperty1']).to.equal('userDefinedValue'); }); - it('group', function () { - var groupCfg = configFull.groupConfig; - expect(groupCfg.name).to.equal('hazel'); - expect(groupCfg.password).to.equal('cast'); - }); - it('properties', function () { - var properties = configFull.properties; + var properties = fullConfig.properties; expect(properties['hazelcast.client.heartbeat.interval']).to.equal(1000); expect(properties['hazelcast.client.heartbeat.timeout']).to.equal(10000); expect(properties['hazelcast.client.invocation.retry.pause.millis']).to.equal(4000); @@ -92,10 +114,11 @@ describe('ConfigBuilder Test', function () { expect(properties['hazelcast.client.autopipelining.enabled']).to.be.false; expect(properties['hazelcast.client.autopipelining.threshold.bytes']).to.equal(1024); expect(properties['hazelcast.client.socket.no.delay']).to.be.false; + expect(properties['hazelcast.client.shuffle.member.list']).to.be.false; }); it('serialization', function () { - var serializationCfg = configFull.serializationConfig; + var serializationCfg = fullConfig.serializationConfig; expect(serializationCfg.defaultNumberType).to.equal('integer'); expect(serializationCfg.isBigEndian).to.equal(false); expect(serializationCfg.portableVersion).to.equal(1); @@ -120,7 +143,7 @@ describe('ConfigBuilder Test', function () { }); it('nearCaches', function () { - var nearCacheConfigs = configFull.nearCacheConfigs; + var nearCacheConfigs = fullConfig.nearCacheConfigs; expect(nearCacheConfigs['nc-map'].name).to.equal('nc-map'); expect(nearCacheConfigs['nc-map'].invalidateOnChange).to.be.false; expect(nearCacheConfigs['nc-map'].maxIdleSeconds).to.equal(2); @@ -143,7 +166,7 @@ describe('ConfigBuilder Test', function () { }); it('reliableTopics', function () { - var rtConfigs = configFull.reliableTopicConfigs; + var rtConfigs = fullConfig.reliableTopicConfigs; expect(rtConfigs['rt1'].name).to.equal('rt1'); expect(rtConfigs['rt1'].readBatchSize).to.equal(35); expect(rtConfigs['rt1'].overloadPolicy).to.equal(Config.TopicOverloadPolicy.DISCARD_NEWEST); @@ -154,15 +177,17 @@ describe('ConfigBuilder Test', function () { }); it('listenerConfig', function () { - var listenerConfig = configFull.listenerConfigs; - expect(listenerConfig[0].exportedName).to.equal('listener'); - expect(listenerConfig[0].path).to.equal('path/to/file'); - expect(listenerConfig[1].exportedName).to.equal('listener2'); - expect(listenerConfig[1].path).to.equal('path/to/file'); + var listenerConfig = fullConfig.listenerConfigs; + expect(listenerConfig[0].type).to.equal('lifecycle'); + expect(listenerConfig[0].importConfig.exportedName).to.equal('listener'); + expect(listenerConfig[0].importConfig.path).to.equal('path/to/file'); + expect(listenerConfig[1].type).to.equal('membership'); + expect(listenerConfig[1].importConfig.exportedName).to.equal('listener2'); + expect(listenerConfig[1].importConfig.path).to.equal('path/to/file'); }); it('flakeIdGeneratorConfigs', function () { - var flakeIdConfigs = configFull.flakeIdGeneratorConfigs; + var flakeIdConfigs = fullConfig.flakeIdGeneratorConfigs; expect(flakeIdConfigs['flakeid'].name).to.equal('flakeid'); expect(flakeIdConfigs['flakeid'].prefetchCount).to.equal(123); expect(150000).to.be.equal(flakeIdConfigs['flakeid'].prefetchValidityMillis); @@ -170,4 +195,9 @@ describe('ConfigBuilder Test', function () { expect(flakeIdConfigs['flakeid2'].prefetchCount).to.equal(1234); expect(1900000).to.be.equal(flakeIdConfigs['flakeid2'].prefetchValidityMillis); }) + + it('loadBalancer', function () { + var loadBalancer = fullConfig.loadBalancer; + expect(loadBalancer.constructor.name).to.equal('RandomLB'); + }); }); diff --git a/test/declarative_config/ConfigLocationTest.js b/test/declarative_config/ConfigLocationTest.js index 23536122d..476f5e74e 100644 --- a/test/declarative_config/ConfigLocationTest.js +++ b/test/declarative_config/ConfigLocationTest.js @@ -39,34 +39,30 @@ describe('ConfigLocationTest', function () { //create a hazelcast-client.json at current working directory so we can be sure it is ignored. fs.writeFileSync(DEFAULT_JSON_LOCATION, '' + '{' + - ' "group": {' + - ' "name": "wrongName"' + - ' }' + + ' "clusterName": "wrongName"' + '}'); process.env[ENV_VARIABLE_NAME] = path.join(__dirname, 'configurations/full.json'); var configBuilder = new ConfigBuilder(); return configBuilder.loadConfig().then(function () { - return expect(configBuilder.build().groupConfig.name).equals('hazel'); + return expect(configBuilder.build().clusterName).equals('testCluster'); }); }); it('Prefers default location json file over default config', function () { fs.writeFileSync(DEFAULT_JSON_LOCATION, '' + '{' + - ' "group": {' + - ' "name": "newName"' + - ' }' + + ' "clusterName": "newName"' + '}'); var configBuilder = new ConfigBuilder(); return configBuilder.loadConfig().then(function () { - return expect(configBuilder.build().groupConfig.name).equals('newName'); + return expect(configBuilder.build().clusterName).equals('newName'); }); }); it('Starts with default configuration if no config', function () { var configBuilder = new ConfigBuilder(); return configBuilder.loadConfig().then(function () { - return expect(configBuilder.build().groupConfig.name).equals('dev'); + return expect(configBuilder.build().clusterName).equals('dev'); }); }); diff --git a/test/declarative_config/configurations/full.json b/test/declarative_config/configurations/full.json index bc72b3684..8e6a653c5 100644 --- a/test/declarative_config/configurations/full.json +++ b/test/declarative_config/configurations/full.json @@ -1,8 +1,6 @@ { - "group": { - "name": "hazel", - "password": "cast" - }, + "clusterName": "testCluster", + "instanceName": "clientName", "properties": { "hazelcast.client.heartbeat.interval": 1000, "hazelcast.client.heartbeat.timeout": 10000, @@ -17,8 +15,13 @@ "hazelcast.logging.level": 3, "hazelcast.client.autopipelining.enabled": false, "hazelcast.client.autopipelining.threshold.bytes": 1024, - "hazelcast.client.socket.no.delay": false + "hazelcast.client.socket.no.delay": false, + "hazelcast.client.shuffle.member.list": false }, + "clientLabels": [ + "label1", + "label2" + ], "network": { "clusterMembers": [ "127.0.0.9", @@ -26,8 +29,6 @@ ], "smartRouting": false, "connectionTimeout": 6000, - "connectionAttemptPeriod": 4000, - "connectionAttemptLimit": 3, "ssl": { "enabled": true, "sslOptions": null, @@ -44,6 +45,17 @@ "enabled": false } }, + "connectionStrategy": { + "asyncStart": true, + "reconnectMode": "async", + "connectionRetry": { + "initialBackoffMillis": 2000, + "maxBackoffMillis": 60000, + "multiplier": 3, + "clusterConnectTimeoutMillis": 5000, + "jitter": 0.5 + } + }, "listeners": [ { "type": "lifecycle", @@ -51,7 +63,7 @@ "exportedName": "listener" }, { - "type": "lifecycle", + "type": "membership", "path": "path/to/file", "exportedName": "listener2" } @@ -130,6 +142,9 @@ "prefetchValidityMillis": 1900000 } ], + "loadBalancer": { + "type": "random" + }, "import": [ "near-cache.json" ] diff --git a/test/discovery/HazelcastCloudDiscoveryTest.js b/test/discovery/HazelcastCloudDiscoveryTest.js index 268e3091b..5c716add2 100644 --- a/test/discovery/HazelcastCloudDiscoveryTest.js +++ b/test/discovery/HazelcastCloudDiscoveryTest.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var Address = require('../../lib/Address'); +var Address = require('../../lib/Address').Address; var expect = require('chai').expect; var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; diff --git a/test/discovery/HazelcastCloudProviderTest.js b/test/discovery/HazelcastCloudProviderTest.js index 59ed245f7..6342733df 100644 --- a/test/discovery/HazelcastCloudProviderTest.js +++ b/test/discovery/HazelcastCloudProviderTest.js @@ -17,7 +17,7 @@ var IllegalStateError = require('../../').HazelcastErrors.IllegalStateError; -var Address = require('../../lib/Address'); +var Address = require('../../lib/Address').Address; var sinon = require('sinon'); var expect = require('chai').expect; var LoggingService = require('../../lib/logging/LoggingService').LoggingService; @@ -37,6 +37,9 @@ describe('HazelcastCloudProvider Test', function () { expectedAddresses.set('10.0.0.1:5702', new Address('198.51.100.1', 5702)); expectedAddresses.set('10.0.0.2:5701', new Address('198.51.100.2', 5701)); + }); + + beforeEach(() => { var logger = new LoggingService(null, LogLevel.INFO).getLogger(); hazelcastCloudDiscovery = new HazelcastCloudDiscovery(); sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(() => Promise.resolve(expectedAddresses)); @@ -45,7 +48,10 @@ describe('HazelcastCloudProvider Test', function () { }); afterEach(function () { - HazelcastCloudDiscovery.prototype.discoverNodes.restore(); + if (HazelcastCloudDiscovery.prototype.discoverNodes.restore + && HazelcastCloudDiscovery.prototype.discoverNodes.restore.sinon) { + HazelcastCloudDiscovery.prototype.discoverNodes.restore(); + } }); @@ -56,6 +62,7 @@ describe('HazelcastCloudProvider Test', function () { }); it('loadAddresses_whenErrorIsThrown', function () { + HazelcastCloudDiscovery.prototype.discoverNodes.restore(); sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(function () { return Promise.reject(new IllegalStateError('Expected exception')); }); @@ -65,4 +72,40 @@ describe('HazelcastCloudProvider Test', function () { }); }); + it('translate_whenAddressIsNull_thenReturnNull', function () { + return provider.translate(null).then((res) => { + return expect(res).to.be.null; + }); + }); + + it('translate', function () { + return provider.translate('10.0.0.1:5701').then((res) => { + expect('198.51.100.1').to.equal(res.host); + expect(5701).to.equal(res.port); + }); + }); + + it('refresh_and_translate', function () { + return provider.refresh().then( + provider.translate('10.0.0.1:5701').then((res) => { + expect('198.51.100.1').to.equal(res.host); + expect(5701).to.equal(res.port); + })); + }); + + it('translate_whenNotFound_thenReturnNull', function () { + var notAvailableAddress = new Address('127.0.0.3', 5701); + return provider.translate(notAvailableAddress).then((res) => { + return expect(res).to.be.null; + }); + }); + + it('refresh_whenException_thenLogWarning', function () { + HazelcastCloudDiscovery.prototype.discoverNodes.restore(); + sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(function () { + return Promise.reject(new IllegalStateError('Expected exception')); + }); + provider.refresh(); + }); + }); diff --git a/test/discovery/HazelcastCloudTranslatorTest.js b/test/discovery/HazelcastCloudTranslatorTest.js deleted file mode 100644 index ef14a9765..000000000 --- a/test/discovery/HazelcastCloudTranslatorTest.js +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; - -var Address = require('../../lib/Address'); -var sinon = require('sinon'); -var expect = require('chai').expect; -var LoggingService = require('../../lib/logging/LoggingService').LoggingService; -var Promise = require('bluebird'); -var IllegalStateError = require('../../lib/HazelcastError').IllegalStateError; - -var HazelcastCloudAddressTranslator = require('../../lib/discovery/HazelcastCloudAddressTranslator').HazelcastCloudAddressTranslator; -var LogLevel = require('../../lib/').LogLevel; - -describe('HazelcastCloudTranslator Test', function () { - - var lookup = new Map(); - var privateAddress; - var publicAddress; - var translator; - var hazelcastCloudDiscovery; - - before(function () { - privateAddress = '127.0.0.1:5701'; - publicAddress = new Address('192.168.0.1', 5701); - lookup.set(privateAddress, publicAddress); - lookup.set('127.0.0.2:5701', new Address('192.168.0.2', 5701)); - - var logger = new LoggingService(null, LogLevel.INFO).getLogger(); - hazelcastCloudDiscovery = new HazelcastCloudDiscovery(); - - translator = new HazelcastCloudAddressTranslator(hazelcastCloudDiscovery, null, logger); - }); - - beforeEach(function () { - sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(() => Promise.resolve(lookup)); - }); - - afterEach(function () { - HazelcastCloudDiscovery.prototype.discoverNodes.restore(); - }); - - it('translate_whenAddressIsNull_thenReturnNull', function () { - return translator.translate(null).then((res) => { - expect(res).to.be.null; - }); - }); - - it('translate', function () { - return translator.translate(privateAddress).then((res) => { - expect(publicAddress.host).to.equal(res.host); - expect(publicAddress.port).to.equal(res.port); - }); - }); - - it('refresh_and_translate', function () { - return translator.refresh().then( - translator.translate(privateAddress).then((res) => { - expect(publicAddress.host).to.equal(res.host); - expect(publicAddress.port).to.equal(res.port); - })); - }); - - it('translate_whenNotFound_thenReturnNull', function () { - var notAvailableAddress = new Address('127.0.0.3', 5701); - return translator.translate(notAvailableAddress).then((res) => { - expect(res).to.be.null; - }); - }); - - it('refresh_whenException_thenLogWarning', function () { - HazelcastCloudDiscovery.prototype.discoverNodes.restore(); - sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(function () { - return Promise.reject(new IllegalStateError('Expected exception')); - }); - translator.refresh(); - }); - -}); diff --git a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js index c601f8cd8..36c6da213 100644 --- a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js +++ b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js @@ -30,14 +30,10 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { var client; var flakeIdGenerator; - before(function () { - Util.markServerVersionAtLeast(this, null, '3.10'); - }); - afterEach(function () { return flakeIdGenerator.destroy().then(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); }); @@ -64,6 +60,7 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { }).then(function () { var cfg = new Config.ClientConfig(); cfg.networkConfig.smartRouting = false; + cfg.clusterName = cluster.id; return HazelcastClient.newHazelcastClient(cfg); }).then(function (value) { client = value; @@ -93,7 +90,9 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { }).then(function () { return assignOverflowedNodeId(cluster.id, 1); }).then(function () { - return HazelcastClient.newHazelcastClient(); + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { client = cl; return client.getFlakeIdGenerator('test'); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index aa8cb491d..453c73813 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -39,6 +39,7 @@ describe("FlakeIdGeneratorProxyTest", function () { return Controller.startMember(cluster.id); }).then(function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; var flakeConfig = new Config.FlakeIdGeneratorConfig(); flakeConfig.prefetchValidityMillis = SHORT_TERM_VALIDITY_MILLIS; flakeConfig.prefetchCount = SHORT_TERM_BATCH_SIZE; @@ -50,17 +51,13 @@ describe("FlakeIdGeneratorProxyTest", function () { }); }); - beforeEach(function () { - Util.markServerVersionAtLeast(this, client, '3.10'); - }); - afterEach(function () { return flakeIdGenerator.destroy(); }); after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function addToListFunction(l) { diff --git a/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js index f222e3a9a..bd68329c1 100644 --- a/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js +++ b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js @@ -34,6 +34,7 @@ describe('HazelcastJsonValue with HazelcastJsonValueSerializer', function () { return RC.startMember(cluster.id); }).then(function () { var config = new Config(); + config.clusterName = cluster.id; config.serializationConfig .jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; return Client.newHazelcastClient(config).then(function (hazelcastClient) { @@ -54,7 +55,7 @@ describe('HazelcastJsonValue with HazelcastJsonValueSerializer', function () { after(function () { client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('storing JavaScript objects', function () { diff --git a/test/hazelcast_json_value/HJVJsonSerializerTest.js b/test/hazelcast_json_value/HJVJsonSerializerTest.js index 87984f970..d9841cd3f 100644 --- a/test/hazelcast_json_value/HJVJsonSerializerTest.js +++ b/test/hazelcast_json_value/HJVJsonSerializerTest.js @@ -18,6 +18,7 @@ var chai = require('chai'); chai.use(require('chai-as-promised')); var expect = require('chai').expect; var Client = require('../../.').Client; +const Config = require('../../.').Config; var RC = require('./../RC'); var HazelcastJsonValue = require('../../.').HazelcastJsonValue; @@ -33,7 +34,9 @@ describe('HazelcastJsonValue with JsonSerializer', function () { cluster = response; return RC.startMember(cluster.id); }).then(function () { - return Client.newHazelcastClient().then(function (hazelcastClient) { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -51,7 +54,7 @@ describe('HazelcastJsonValue with JsonSerializer', function () { after(function () { client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('storing JavaScript objects', function () { diff --git a/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js index cfc3a1551..bad7e1cf4 100644 --- a/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js +++ b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js @@ -18,10 +18,10 @@ var chai = require('chai'); chai.use(require('chai-as-promised')); var expect = require('chai').expect; var Client = require('../../.').Client; +const Config = require('../../.').Config; var RC = require('./../RC'); var Predicates = require('../../.').Predicates; var HazelcastJsonValue = require('../../.').HazelcastJsonValue; -var Util = require('../Util'); describe('HazelcastJsonValue query test', function () { var cluster; @@ -30,12 +30,13 @@ describe('HazelcastJsonValue query test', function () { var object = { 'a': 1 }; before(function () { - Util.markServerVersionAtLeast(this, null, '3.12'); return RC.createCluster().then(function (response) { cluster = response; return RC.startMember(cluster.id); }).then(function () { - return Client.newHazelcastClient().then(function (hazelcastClient) { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -56,7 +57,7 @@ describe('HazelcastJsonValue query test', function () { return; } client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('querying over JavaScript objects', function () { diff --git a/test/heartbeat/HeartbeatFromClientTest.js b/test/heartbeat/HeartbeatFromClientTest.js index 43ab22a50..2e0b5331a 100644 --- a/test/heartbeat/HeartbeatFromClientTest.js +++ b/test/heartbeat/HeartbeatFromClientTest.js @@ -34,7 +34,7 @@ describe('Heartbeat', function () { }); afterEach(function () { - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('client sends heartbeat periodically even when server continuously pushes messages', function () { @@ -49,6 +49,7 @@ describe('Heartbeat', function () { var pushTask; var clientConfig = new Config.ClientConfig(); + clientConfig.clusterName = cluster.id; clientConfig.properties['hazelcast.client.heartbeat.interval'] = 1000; return RC.startMember(cluster.id).then(function (m) { member = m; @@ -84,6 +85,8 @@ describe('Heartbeat', function () { }).then(function () { clearInterval(pushTask); expect(connectionClosedEventCount).to.equal(0); + client1.shutdown(); + client2.shutdown(); }); }); }); diff --git a/test/heartbeat/HeartbeatFromServerTest.js b/test/heartbeat/HeartbeatFromServerTest.js index facbc5d55..5ca39a061 100644 --- a/test/heartbeat/HeartbeatFromServerTest.js +++ b/test/heartbeat/HeartbeatFromServerTest.js @@ -20,6 +20,7 @@ var Config = require('../../').Config; var Util = require('../Util'); var DeferredPromise = require('../../lib/Util').DeferredPromise; var Address = require('../../').Address; +var TargetDisconnectedError = require('../../lib/HazelcastError').TargetDisconnectedError; describe('Heartbeat', function () { this.timeout(50000); @@ -33,14 +34,15 @@ describe('Heartbeat', function () { }); afterEach(function () { - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - it('Heartbeat stopped fired when second member stops heartbeating', function (done) { + it('connectionRemoved fired when second member stops heartbeating', function (done) { var client; var memberAddedPromise = new DeferredPromise(); RC.startMember(cluster.id).then(function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.heartbeat.interval'] = 500; cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; return HazelcastClient.newHazelcastClient(cfg); @@ -56,28 +58,42 @@ describe('Heartbeat', function () { }; client.clusterService.addMembershipListener(membershipListener); - client.heartbeat.addListener({ - onHeartbeatStopped: function (connection) { - client.shutdown(); - done(); - } - }) }).then(function () { return RC.startMember(cluster.id); }).then(function (member2) { + client.getConnectionManager().once('connectionRemoved', function (connection) { + var remoteAddress = connection.getRemoteAddress(); + if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { + if (connection.closedReason === 'Heartbeat timed out' + && connection.closedCause instanceof TargetDisconnectedError) { + done(); + client.shutdown(); + } else { + done(new Error('Connection does not closed due to heartbeat timeout. Reason: ' + + connection.closedReason + ', cause: ' + connection.closedCause)); + } + } else { + done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is removed instead of ' + + member2.host + ':' + member2.port)) + } + }); + + return memberAddedPromise.promise.then(function () { - simulateHeartbeatLost(client, member2.host + ':' + member2.port, 2000); + simulateHeartbeatLost(client, new Address(member2.host, member2.port), 2000); }) }).catch(done); }); - it('Heartbeat restored fired when second member comes back', function (done) { + it('connectionAdded fired when second member comes back', function (done) { var client; var member1; var member2; + var memberAddedPromise = new DeferredPromise(); RC.startMember(cluster.id).then(function (m) { member1 = m; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.heartbeat.interval'] = 500; cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; return HazelcastClient.newHazelcastClient(cfg); @@ -85,50 +101,48 @@ describe('Heartbeat', function () { client = resp; var membershipListener = { memberAdded: function (membershipEvent) { - warmUpConnectionToAddressWithRetry(client, membershipEvent.member.address, 3).then(function () { - simulateHeartbeatLost(client, membershipEvent.member.address, 2000); - }).catch(done); + memberAddedPromise.resolve(); } }; client.clusterService.addMembershipListener(membershipListener); - client.heartbeat.addListener({ - onHeartbeatRestored: function (connection) { - client.shutdown(); - done(); - } - }); return RC.startMember(cluster.id); }).then(function (resp) { member2 = resp; - }).catch(done); - }); - - it('emits shutdown when lost connection to cluster', function (done) { - var member; - RC.startMember(cluster.id).then(function (m) { - member = m; - var cfg = new Config.ClientConfig(); - cfg.properties['hazelcast.client.heartbeat.interval'] = 500; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (client) { - var expected = 'shuttingDown'; - client.lifecycleService.on('lifecycleEvent', function (state) { - if (state === 'shuttingDown' && expected === 'shuttingDown') { - expected = 'shutdown'; - } else if (state === 'shutdown' && expected === 'shutdown') { + return memberAddedPromise.promise; + }).then(function () { + return warmUpConnectionToAddressWithRetry(client, new Address(member2.host, member2.port), 3); + }).then(() => { + client.getConnectionManager().once('connectionRemoved', function (connection) { + var remoteAddress = connection.getRemoteAddress(); + if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { + if (!(connection.closedReason === 'Heartbeat timed out' + || connection.closedCause instanceof TargetDisconnectedError)) { + done(new Error('Connection does not closed due to heartbeat timeout. Reason: ' + + connection.closedReason + ', cause: ' + connection.closedCause)); + } + } else { + done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is removed instead of ' + + member2.host + ':' + member2.port)) + } + }); + client.getConnectionManager().once('connectionAdded', function (connection) { + var remoteAddress = connection.getRemoteAddress(); + if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { done(); + client.shutdown(); } else { - done('Expected ' + expected + '. Got ' + state); + done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is added instead of ' + + member2.host + ':' + member2.port)) } }); - RC.terminateMember(cluster.id, member.uuid); - }); + simulateHeartbeatLost(client, new Address(member2.host, member2.port), 2000); + }).catch(done); }); function simulateHeartbeatLost(client, address, timeout) { - client.connectionManager.establishedConnections[address].lastReadTimeMillis = client.connectionManager.establishedConnections[address].getLastReadTimeMillis() - timeout; + var connection = client.connectionManager.getConnectionFromAddress(address); + connection.lastReadTimeMillis = connection.getLastReadTimeMillis() - timeout; } function warmUpConnectionToAddressWithRetry(client, address, retryCount) { diff --git a/test/heartbeat/short-heartbeat.xml b/test/heartbeat/short-heartbeat.xml index e31fc94ff..eb92704ef 100644 --- a/test/heartbeat/short-heartbeat.xml +++ b/test/heartbeat/short-heartbeat.xml @@ -14,9 +14,10 @@ ~ limitations under the License. --> - + 8 diff --git a/test/integration/ClientLabelTest.js b/test/integration/ClientLabelTest.js new file mode 100644 index 000000000..9b64c6091 --- /dev/null +++ b/test/integration/ClientLabelTest.js @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const expect = require('chai').expect; +const Client = require('../../.').Client; +const Config = require('../../.').Config; +const Controller = require('../RC'); + +describe('ClientLabelTest', function () { + + this.timeout(32000); + + let cluster; + let client; + + before(function () { + return Controller.createCluster(null, null) + .then((c) => { + cluster = c; + return Controller.startMember(cluster.id); + }); + }); + + afterEach(function () { + return client.shutdown(); + }); + + after(function () { + return Controller.terminateCluster(cluster.id); + }); + + + it('labels should be received on member side', function () { + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + config.labels.add("testLabel"); + + return Client.newHazelcastClient(config) + .then((c) => { + client = c; + + const script = 'var client = instance_0.getClientService().getConnectedClients().iterator().next();\n' + + 'result = client.getLabels().iterator().next();\n'; + + return Controller.executeOnController(cluster.id, script, 1); + }) + .then((res) => { + expect(res.result).to.not.be.null; + + expect(res.result.toString()).to.equal('testLabel'); + }); + }); + +}); diff --git a/test/integration/ConnectionStrategyTest.js b/test/integration/ConnectionStrategyTest.js new file mode 100644 index 000000000..96176bd7b --- /dev/null +++ b/test/integration/ConnectionStrategyTest.js @@ -0,0 +1,239 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const chai = require('chai'); +const chaiAsPromised = require('chai-as-promised'); +chai.use(chaiAsPromised); + +const expect = require('chai').expect; +const Client = require('../../.').Client; +const Config = require('../../.').Config; +const Controller = require('../RC'); +const TestUtil = require('../Util'); +const Errors = require('../../.').HazelcastErrors; +const Util = require('../../lib/Util'); +const ReconnectMode = require('../../lib/config/ConnectionStrategyConfig').ReconnectMode; +const LifecycleState = require('../../lib/LifecycleService').LifecycleState; + +describe('ConnectionStrategyTest', function () { + + this.timeout(32000); + + let cluster; + let client; + + + beforeEach(function () { + client = null; + cluster = null; + }); + + afterEach(function () { + if (client != null) { + client.shutdown(); + } + + if (cluster != null) { + return Controller.terminateCluster(cluster.id); + } + }); + + it('client with async start throws when there is no cluster', function () { + const config = new Config.ClientConfig(); + config.connectionStrategyConfig.asyncStart = true; + + return Client.newHazelcastClient(config) + .then((c) => { + client = c; + return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); + }); + }); + + it('client with async start throws after shutdown when there is no cluster', function () { + const config = new Config.ClientConfig(); + config.connectionStrategyConfig.asyncStart = true; + + return Client.newHazelcastClient(config) + .then((c) => { + client = c; + client.shutdown(); + return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientNotActiveError); + }) + }); + + it('client with async start connects to cluster', function () { + const config = new Config.ClientConfig(); + + config.networkConfig.addresses.push('localhost:5701'); + + const connected = Util.DeferredPromise(); + config.listeners.addLifecycleListener((state) => { + if (state === LifecycleState.CONNECTED) { + connected.resolve(); + } + }); + + config.connectionStrategyConfig.asyncStart = true; + + return Controller.createCluster(null, null) + .then((c) => { + cluster = c; + config.clusterName = cluster.id; + + return Client.newHazelcastClient(config); + }) + .then((c) => { + client = c; + + expect(client.getLifecycleService().isRunning()).to.be.true; + return Controller.startMember(cluster.id); + }) + .then(() => { + return connected.promise; + }) + .then(() => { + return client.getMap(TestUtil.randomString()); + }); + }); + + it('client with OFF reconnect mode does not reconnect when the member dies and another starts', function () { + const config = new Config.ClientConfig(); + + config.connectionStrategyConfig.reconnectMode = ReconnectMode.OFF; + config.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = Number.MAX_SAFE_INTEGER; + + const shutdown = Util.DeferredPromise(); + config.listeners.addLifecycleListener((state) => { + if (state === LifecycleState.SHUTDOWN) { + shutdown.resolve(); + } + }); + + let map; + let member; + + return Controller.createCluster(null, null) + .then((c) => { + cluster = c; + config.clusterName = cluster.id; + return Controller.startMember(cluster.id); + }) + .then((m) => { + member = m; + return Client.newHazelcastClient(config); + }) + .then((c) => { + client = c; + return client.getMap(TestUtil.randomString()); + }) + .then((m) => { + map = m; + // No exception at this point + return map.put(1, 5); + }) + .then(() => { + return Controller.shutdownMember(cluster.id, member.uuid); + }) + .then(() => { + return Controller.startMember(cluster.id); + }) + .then(() => { + return shutdown.promise; + }) + .then(() => { + return expect(map.put(1, 5)).to.be.rejectedWith(Errors.ClientNotActiveError); + }) + }); + + it('client with ASYNC reconnect mode reconnects when the member dies and another starts ', function () { + const config = new Config.ClientConfig(); + + config.connectionStrategyConfig.reconnectMode = ReconnectMode.ASYNC; + config.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = Number.MAX_SAFE_INTEGER; + + const disconnected = Util.DeferredPromise(); + const reconnected = Util.DeferredPromise(); + config.listeners.addLifecycleListener((state) => { + if (state === LifecycleState.DISCONNECTED) { + disconnected.resolve(); + } + }); + + let member; + let map; + + return Controller.createCluster(null, null) + .then((c) => { + cluster = c; + config.clusterName = cluster.id; + return Controller.startMember(cluster.id); + }) + .then((m) => { + member = m; + return Client.newHazelcastClient(config); + }) + .then((c) => { + client = c; + return client.getMap(TestUtil.randomString()); + }) + .then((m) => { + map = m; + + // No exception at this point + return map.put(1, 5); + }) + .then(() => { + return Controller.shutdownMember(cluster.id, member.uuid); + }) + .then(() => { + return disconnected.promise; + }) + .then(() => { + return expect(map.put(1, 5)).to.be.rejectedWith(Errors.ClientOfflineError); + }) + .then(() => { + client.getLifecycleService().on('lifecycleEvent', (state) => { + if (state === LifecycleState.CONNECTED) { + reconnected.resolve(); + } + }); + + return Controller.startMember(cluster.id); + }) + .then((m) => { + return reconnected.promise; + }) + .then(() => { + expect(client.getLifecycleService().isRunning()).to.be.true; + + return map.put(1, 2); + }) + }); + + it('client with async start should should reject get partition specific proxy calls when there is no cluster', function () { + const config = new Config.ClientConfig(); + config.connectionStrategyConfig.asyncStart = true; + + return Client.newHazelcastClient(config) + .then((c) => { + client = c; + return expect(client.getList(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); + }); + }); + +}); diff --git a/test/integration/DistributedObjectsTest.js b/test/integration/DistributedObjectsTest.js new file mode 100644 index 000000000..bb596a6be --- /dev/null +++ b/test/integration/DistributedObjectsTest.js @@ -0,0 +1,190 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const chai = require('chai'); +const chaiAsPromised = require('chai-as-promised'); +chai.use(chaiAsPromised); + +const expect = require('chai').expect; +const Client = require('../../.').Client; +const Config = require('../../.').Config; +const Controller = require('../RC'); +const Util = require('../Util'); + +describe('DistributedObjectsTest', function () { + + this.timeout(32000); + + let cluster; + let client; + + const toNamespace = (distributedObjects) => { + return distributedObjects.map((distObj) => distObj.getServiceName() + distObj.getName()); + } + + beforeEach(function () { + return Controller.createCluster(null, null) + .then((c) => { + cluster = c; + return Controller.startMember(cluster.id); + }) + .then(() => { + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return Client.newHazelcastClient(config); + }) + .then((c) => { + client = c; + }); + }); + + afterEach(function () { + client.shutdown(); + return Controller.terminateCluster(cluster.id); + }); + + it('get distributed objects with no object on cluster', function () { + return client.getDistributedObjects() + .then((objects) => { + expect(objects).to.have.lengthOf(0); + }); + }); + + it('get distributed objects', function () { + let map, set, queue; + + return client.getMap(Util.randomString()) + .then((m) => { + map = m; + return client.getSet(Util.randomString()); + }) + .then((s) => { + set = s; + return client.getQueue(Util.randomString()); + }) + .then((q) => { + queue = q; + return client.getDistributedObjects(); + }) + .then((objects) => { + expect(objects).to.have.deep.members([map, set, queue]); + return client.getDistributedObjects(); + }) + .then((objects) => { + // Make sure that live objects are not deleted + expect(objects).to.have.deep.members([map, set, queue]); + }); + }); + + it('get distributed objects creates local instances of received proxies', function () { + let map, set, queue; + let otherClient; + + return client.getMap(Util.randomString()) + .then((m) => { + map = m; + return client.getSet(Util.randomString()); + }) + .then((s) => { + set = s; + return client.getQueue(Util.randomString()); + }) + .then((q) => { + queue = q; + return client.getDistributedObjects(); + }) + .then((objects) => { + expect(objects).to.have.deep.members([map, set, queue]); + + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + + return Client.newHazelcastClient(config); + }) + .then((c) => { + otherClient = c; + return otherClient.getDistributedObjects(); + }) + .then((objects) => { + // Proxies have different clients, therefore deep equality check fails. + // Namespace check should be enough + expect(toNamespace(objects)).to.have.deep.members(toNamespace([map, set, queue])); + return otherClient.getDistributedObjects(); + }) + .then((objects) => { + // Make sure that live objects are not deleted + expect(toNamespace(objects)).to.have.deep.members(toNamespace([map, set, queue])); + otherClient.shutdown(); + }); + }); + + it('get distributed objects should clear local instances of destroyed proxies', function () { + let map, set, queue; + let otherClient; + + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + + return Client.newHazelcastClient(config) + .then((c) => { + otherClient = c; + return client.getMap(Util.randomString()) + }) + .then((m) => { + map = m; + return otherClient.getSet(Util.randomString()); + }) + .then((s) => { + set = s; + return client.getQueue(Util.randomString()); + }) + .then((q) => { + queue = q; + return client.getDistributedObjects(); + }) + .then((objects) => { + expect(toNamespace(objects)).to.have.deep.members(toNamespace([map, set, queue])); + return map.destroy(); + }) + .then(() => { + return client.getDistributedObjects(); + }) + .then((objects) => { + expect(toNamespace(objects)).to.have.deep.members(toNamespace([set, queue])); + return set.destroy(); + }) + .then(() => { + return client.getDistributedObjects(); + }) + .then((objects) => { + expect(toNamespace(objects)).to.have.deep.members(toNamespace([queue])); + return queue.destroy(); + }) + .then(() => { + return client.getDistributedObjects(); + }) + .then((objects) => { + expect(objects).to.have.lengthOf(0); + return otherClient.getDistributedObjects(); + }) + .then((objects) => { + expect(objects).to.have.lengthOf(0); + otherClient.shutdown(); + }); + }); +}); diff --git a/test/integration/InitialMembershipListenerTest.js b/test/integration/InitialMembershipListenerTest.js new file mode 100644 index 000000000..ba845ee2a --- /dev/null +++ b/test/integration/InitialMembershipListenerTest.js @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const chai = require('chai'); +const chaiAsPromised = require('chai-as-promised'); +chai.use(chaiAsPromised); + +const expect = require('chai').expect; +const Client = require('../../.').Client; +const Config = require('../../.').Config; +const Controller = require('../RC'); +const Util = require('../../lib/Util'); + +describe('InitialMembershipListenerTest', function () { + + this.timeout(32000); + + let cluster; + let initialMember; + let client; + + beforeEach(function () { + return Controller.createCluster(null, null) + .then((c) => { + cluster = c; + return Controller.startMember(cluster.id); + }) + .then((m) => { + initialMember = m; + }) + }); + + afterEach(function () { + if (client != null) { + client.shutdown(); + } + + return Controller.terminateCluster(cluster.id); + }); + + it('receives available member when added before client start', function (done) { + const config = new Config.ClientConfig(); + const membershipListener = { + init: (event) => { + const members = event.members; + expect(members).to.have.lengthOf(1); + const member = members[0]; + expect(member.address.host).to.equal(initialMember.host); + expect(member.address.port).to.equal(initialMember.port); + done(); + } + }; + + config.clusterName = cluster.id; + config.listeners.addMembershipListener(membershipListener); + + Client.newHazelcastClient(config) + .then((c) => { + client = c; + }) + }); + + it('receives available member when added after client start', function (done) { + const config = new Config.ClientConfig(); + const membershipListener = { + init: (event) => { + const members = event.members; + expect(members).to.have.lengthOf(1); + const member = members[0]; + expect(member.address.host).to.equal(initialMember.host); + expect(member.address.port).to.equal(initialMember.port); + done(); + } + }; + + config.clusterName = cluster.id; + Client.newHazelcastClient(config) + .then((c) => { + client = c; + + client.getClusterService().addMembershipListener(membershipListener); + }); + }); + + it('receives events after initial event', function (done) { + let newMember; + let newMemberResolved = Util.DeferredPromise(); + + const config = new Config.ClientConfig(); + const membershipListener = { + init: (event) => { + const members = event.members; + expect(members).to.have.lengthOf(1); + const member = members[0]; + expect(member.address.host).to.equal(initialMember.host); + expect(member.address.port).to.equal(initialMember.port); + }, + memberAdded: (event) => { + newMemberResolved.promise + .then(() => { + const member = event.member; + expect(member.address.host).to.equal(newMember.host); + expect(member.address.port).to.equal(newMember.port); + done(); + }) + .catch((e) => { + done(e); + }); + } + }; + + config.clusterName = cluster.id; + config.listeners.addMembershipListener(membershipListener); + + Client.newHazelcastClient(config) + .then((c) => { + client = c; + + return Controller.startMember(cluster.id); + }) + .then((m) => { + newMember = m; + newMemberResolved.resolve(); + }) + .catch((e) => { + done(e); + }); + }); + +}); diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index 7979ada8c..3b67f7b95 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -16,8 +16,8 @@ var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; +var Config = require("../../lib/index.js").Config; var Controller = require('./../RC'); -var Util = require('./../Util'); var ItemEventType = require('../../lib/core/ItemListener').ItemEventType; describe("List Proxy", function () { @@ -32,7 +32,9 @@ describe("List Proxy", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -50,7 +52,7 @@ describe("List Proxy", function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); diff --git a/test/lock/LockProxyTest.js b/test/lock/LockProxyTest.js deleted file mode 100644 index 33ddcfefc..000000000 --- a/test/lock/LockProxyTest.js +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; -var Controller = require('./../RC'); -var Util = require('./../Util'); -var Promise = require('bluebird'); - -describe("Lock Proxy", function () { - - var cluster; - var clientOne; - var clientTwo; - - var lockOne; - var lockTwo; - - before(function () { - this.timeout(10000); - return Controller.createCluster().then(function (response) { - cluster = response; - return Controller.startMember(cluster.id); - }).then(function () { - return Promise.all([ - HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { - clientOne = hazelcastClient; - }), - HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { - clientTwo = hazelcastClient; - }) - ]); - }); - }); - - beforeEach(function () { - return clientOne.getLock('test').then(function (lock) { - lockOne = lock; - return clientTwo.getLock('test'); - }).then(function (lock) { - lockTwo = lock; - }); - }); - - afterEach(function () { - return Promise.all([lockOne.destroy(), lockTwo.destroy()]); - }); - - after(function () { - clientOne.shutdown(); - clientTwo.shutdown(); - return Controller.shutdownCluster(cluster.id); - }); - - it("locks and unlocks", function () { - this.timeout(10000); - var startTime = Date.now(); - return lockOne.lock().then(function () { - setTimeout(function () { - lockOne.unlock(); - }, 1000); - return lockTwo.lock() - }).then(function () { - var elapsed = Date.now() - startTime; - expect(elapsed).to.be.greaterThan(1000); - }); - }); - - it("unlocks after lease expired", function () { - this.timeout(10000); - var startTime = Date.now(); - return lockOne.lock(1000).then(function () { - return lockTwo.lock(); - }).then(function () { - var elapsed = Date.now() - startTime; - expect(elapsed).to.be.greaterThan(1000); - }); - }); - - it("gives up attempt to lock after timeout is exceeded", function () { - this.timeout(10000); - return lockOne.lock().then(function () { - return lockTwo.tryLock(1000); - }).then(function (acquired) { - expect(acquired).to.be.false; - }); - }); - - it("acquires lock before timeout is exceeded", function () { - this.timeout(10000); - var startTime = Date.now(); - return lockOne.lock(1000).then(function () { - return lockTwo.tryLock(2000); - }).then(function (acquired) { - var elasped = Date.now() - startTime; - expect(acquired).to.be.true; - expect(elasped).to.be.greaterThan(995); - }) - }); - - it("acquires the lock before timeout and unlocks after lease expired", function () { - this.timeout(10000); - var startTime = Date.now(); - return lockOne.lock(1000).then(function () { - return lockTwo.tryLock(2000, 1000); - }).then(function () { - var elapsed = Date.now() - startTime; - expect(elapsed).to.be.at.least(1000); - return lockOne.lock(2000); - }).then(function () { - var elapsed = Date.now() - startTime; - expect(elapsed).to.be.at.least(1000); - }); - }); - - it("correctly reports lock status when unlocked", function () { - return lockOne.isLocked().then(function (locked) { - expect(locked).to.be.false; - }); - }); - - it("correctly reports lock status when locked", function () { - return lockOne.lock().then(function () { - return lockOne.isLocked(); - }).then(function (locked) { - expect(locked).to.be.true; - return lockTwo.isLocked(); - }).then(function (locked) { - expect(locked).to.be.true; - }); - }); - - it("correctly reports remaining lease time", function () { - return lockOne.lock(1000).then(function () { - return Util.promiseWaitMilliseconds(30) - }).then(function (remaining) { - return lockOne.getRemainingLeaseTime(); - }).then(function (remaining) { - expect(remaining).to.be.lessThan(971); - }) - }); - - - it("correctly reports that lock is being held by a specific client", function () { - return lockOne.lock().then(function () { - return lockOne.isLockedByThisClient(); - }).then(function (locked) { - expect(locked).to.be.true; - return lockTwo.isLockedByThisClient(); - }).then(function (locked) { - expect(locked).to.be.false; - }); - }); - - it("correctly reports lock acquire count", function () { - return lockOne.lock().then(function () { - return lockOne.getLockCount(); - }).then(function (count) { - expect(count).to.equal(1); - return lockOne.lock(); - }).then(function () { - return lockOne.getLockCount(); - }).then(function (count) { - expect(count).to.equal(2); - }); - }); - - it("force unlocks", function () { - return lockOne.lock().then(function () { - return lockOne.lock(); - }).then(function () { - return lockOne.lock(); - }).then(function () { - return lockOne.unlock() - }).then(function () { - return lockOne.isLocked(); - }).then(function (locked) { - expect(locked).to.be.true; - return lockOne.forceUnlock(); - }).then(function () { - return lockOne.isLocked(); - }).then(function (locked) { - expect(locked).to.be.false; - }); - }); -}); diff --git a/test/map/MapAggregatorsDoubleTest.js b/test/map/MapAggregatorsDoubleTest.js index ffabad07c..602c2babb 100644 --- a/test/map/MapAggregatorsDoubleTest.js +++ b/test/map/MapAggregatorsDoubleTest.js @@ -16,11 +16,11 @@ var Controller = require('../RC'); var Client = require('../../').Client; +var Config = require('../../.').Config; var Aggregators = require('../../').Aggregators; var Predicates = require('../../').Predicates; var _fillMap = require('../Util').fillMap; var expect = require('chai').expect; -var Util = require('../Util'); describe('MapAggregatorsDoubleTest', function () { var cluster; @@ -32,7 +32,9 @@ describe('MapAggregatorsDoubleTest', function () { cluster = cl; return Controller.startMember(cluster.id); }).then(function () { - return Client.newHazelcastClient(); + var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; return client.getMap('aggregatorsMap'); @@ -43,11 +45,10 @@ describe('MapAggregatorsDoubleTest', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); beforeEach(function () { - Util.markServerVersionAtLeast(this, client, '3.8'); return _fillMap(map, 50, 'key', 0); }); diff --git a/test/map/MapAggregatorsIntTest.js b/test/map/MapAggregatorsIntTest.js index 5770e78af..0c4997a34 100644 --- a/test/map/MapAggregatorsIntTest.js +++ b/test/map/MapAggregatorsIntTest.js @@ -21,7 +21,6 @@ var Aggregators = require('../../').Aggregators; var Predicates = require('../../').Predicates; var _fillMap = require('../Util').fillMap; var expect = require('chai').expect; -var Util = require('../Util'); describe('MapAggregatorsIntTest', function () { var cluster; @@ -29,12 +28,13 @@ describe('MapAggregatorsIntTest', function () { var map; before(function () { - var cfg = new Config.ClientConfig(); - cfg.serializationConfig.defaultNumberType = 'integer'; return Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function () { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + cfg.serializationConfig.defaultNumberType = 'integer'; return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; @@ -46,11 +46,10 @@ describe('MapAggregatorsIntTest', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); beforeEach(function () { - Util.markServerVersionAtLeast(this, client, '3.8'); return _fillMap(map, 50, 'key', 0); }); diff --git a/test/map/MapAggregatorsLongTest.js b/test/map/MapAggregatorsLongTest.js index c14fda5cd..dc6205860 100644 --- a/test/map/MapAggregatorsLongTest.js +++ b/test/map/MapAggregatorsLongTest.js @@ -21,7 +21,6 @@ var Aggregators = require('../../').Aggregators; var Predicates = require('../../').Predicates; var Long = require('long'); var expect = require('chai').expect; -var Util = require('../Util'); describe('MapAggregatorsLongTest', function () { var cluster; @@ -30,12 +29,13 @@ describe('MapAggregatorsLongTest', function () { var entryCount = 50; before(function () { - var cfg = new Config.ClientConfig(); - cfg.serializationConfig.defaultNumberType = 'long'; return Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function () { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + cfg.serializationConfig.defaultNumberType = 'long'; return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; @@ -47,11 +47,10 @@ describe('MapAggregatorsLongTest', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); beforeEach(function () { - Util.markServerVersionAtLeast(this, client, '3.8'); var entries = []; for (var i = 0; i < entryCount; i++) { entries.push(['key' + i, Long.fromNumber(i)]); diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index cd032b827..0f1719708 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -31,8 +31,9 @@ describe('Entry Processor', function () { var client; var map; - function _createConfig() { + function _createConfig(clusterName) { var cfg = new Config.ClientConfig(); + cfg.clusterName = clusterName; cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); return cfg; } @@ -42,7 +43,7 @@ describe('Entry Processor', function () { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { - var cfg = _createConfig(); + var cfg = _createConfig(cluster.id); return Client.newHazelcastClient(cfg); }).then(function (cli) { client = cli; @@ -51,7 +52,7 @@ describe('Entry Processor', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); beforeEach(function () { diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index 693b79280..72fcce2af 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -15,6 +15,7 @@ */ var Client = require('../../.').Client; +const Config = require('../../.').Config; var Controller = require('../RC'); var expect = require('chai').expect; var Promise = require('bluebird'); @@ -65,7 +66,9 @@ describe('Map Partition Aware', function () { return Promise.all(members); }).then(function (m) { members = m; - return Client.newHazelcastClient(); + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; }); @@ -74,7 +77,7 @@ describe('Map Partition Aware', function () { after(function () { this.timeout(30000); client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); beforeEach(function () { diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index fc08c76a4..24f47543d 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -33,8 +33,9 @@ describe("Predicates", function () { var client; var map; - function _createConfig() { + function _createConfig(clusterName) { var cfg = new Config.ClientConfig(); + cfg.clusterName = clusterName; cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); return cfg; } @@ -49,7 +50,7 @@ describe("Predicates", function () { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { - return HazelcastClient.newHazelcastClient(_createConfig()).then(function (hazelcastClient) { + return HazelcastClient.newHazelcastClient(_createConfig(cluster.id)).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -68,7 +69,7 @@ describe("Predicates", function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function _fillMap(size) { diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index c576bb723..1a69869ea 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -33,17 +33,16 @@ function createController(nearCacheEnabled) { } } -function createClient(nearCacheEnabled) { +function createClient(nearCacheEnabled, clusterName) { + const cfg = new Config.ClientConfig(); + cfg.clusterName = clusterName; if (nearCacheEnabled) { - var cfg = new Config.ClientConfig(); var ncc = new Config.NearCacheConfig(); ncc.name = 'test'; ncc.timeToLiveSeconds = 1; cfg.nearCacheConfigs['test'] = ncc; - return HazelcastClient.newHazelcastClient(cfg); - } else { - return HazelcastClient.newHazelcastClient() } + return HazelcastClient.newHazelcastClient(cfg); } describe('MapProxy', function () { @@ -61,7 +60,7 @@ describe('MapProxy', function () { cluster = res; return Controller.startMember(cluster.id); }).then(function (m) { - return createClient(nearCacheEnabled).then(function (hazelcastClient) { + return createClient(nearCacheEnabled, cluster.id).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -80,7 +79,7 @@ describe('MapProxy', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function _generateLockScript(mapName, keyName) { @@ -473,7 +472,7 @@ describe('MapProxy', function () { expect(entry.expirationTime.isZero()).to.be.false; expect(entry.hits.isZero()).to.be.false; expect(entry.lastAccessTime.isZero()).to.be.false; - expect(entry.lastStoreTime.isZero()).to.be.true; + expect(entry.lastStoredTime.isZero()).to.be.true; expect(entry.lastUpdateTime.isZero()).to.be.false; expect(entry.version.isZero()).to.be.true; expect(entry.ttl.isZero()).to.be.false; @@ -491,9 +490,18 @@ describe('MapProxy', function () { }); it('addIndex', function () { + const orderedIndexCfg = new Config.IndexConfig(); + orderedIndexCfg.name = 'length'; + orderedIndexCfg.addAttribute('this'); + + const unorderedIndexCfg = new Config.IndexConfig(); + unorderedIndexCfg.name = 'length'; + unorderedIndexCfg.type = Config.IndexType.HASH; + unorderedIndexCfg.addAttribute('this'); + return Promise.all([ - map.addIndex('length', false), - map.addIndex('length', true) + map.addIndex(orderedIndexCfg), + map.addIndex(unorderedIndexCfg) ]); }); @@ -563,9 +571,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key10'); - expect(entryEvent.value).to.be.undefined; - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); + expect(entryEvent.oldValue).be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -584,9 +592,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key10'); - expect(entryEvent.value).to.be.undefined; - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -606,7 +614,7 @@ describe('MapProxy', function () { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key10'); expect(entryEvent.value).to.equal('val10'); - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -625,9 +633,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key10'); - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); - expect(entryEvent.oldValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -647,8 +655,8 @@ describe('MapProxy', function () { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key10'); expect(entryEvent.value).to.equal('val10'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -667,9 +675,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key0'); - expect(entryEvent.value).to.be.undefined; - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -688,9 +696,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key1'); - expect(entryEvent.value).to.be.undefined; - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -709,9 +717,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key1'); - expect(entryEvent.value).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); expect(entryEvent.oldValue).to.equal('val1'); - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -730,9 +738,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key1'); - expect(entryEvent.value).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); expect(entryEvent.oldValue).to.equal('val1'); - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { @@ -787,9 +795,9 @@ describe('MapProxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('expiringKey'); - expect(entryEvent.value).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); expect(entryEvent.oldValue).to.equal('expiringValue'); - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index 9355793da..fa5b6d1ac 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -16,11 +16,11 @@ var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; +const Config = require("../../lib/index.js").Config; var Controller = require('./../RC'); var fs = require('fs'); var _fillMap = require('../Util').fillMap; var promiseWaitMilliseconds = require('../Util').promiseWaitMilliseconds; -var Util = require('../Util'); describe('MapStore', function () { var cluster; @@ -33,7 +33,9 @@ describe('MapStore', function () { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -53,7 +55,7 @@ describe('MapStore', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('loadAll with no arguments loads all keys', function () { @@ -172,15 +174,14 @@ describe('MapStore', function () { }); it('addEntryListener on map entryLoaded includeValue=true', function (done) { - Util.markServerVersionAtLeast(this, client, '3.11'); var listenerObj = { loaded: function (entryEvent) { try { expect(entryEvent.name).to.equal('mapstore-test'); expect(entryEvent.key).to.equal('some-key'); expect(entryEvent.value).to.equal('some-value'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); done(); } catch (err) { diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index a7d3fbf51..64a1d3337 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -51,10 +51,13 @@ describe('NearCachedMapStress', function () { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { + cfg.clusterName = cluster.id; return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; client1 = cl; - return HazelcastClient.newHazelcastClient(); + return HazelcastClient.newHazelcastClient(config); }).then(function (cl) { validatingClient = cl; }); @@ -63,7 +66,7 @@ describe('NearCachedMapStress', function () { after(function () { client1.shutdown(); validatingClient.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function completeOperation() { diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 883014b19..eed5fecad 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -34,15 +34,16 @@ describe("NearCachedMap", function () { before(function () { this.timeout(32000); - var cfg = new Config.ClientConfig(); - var ncc = new Config.NearCacheConfig(); - ncc.name = 'nc-map'; - ncc.invalidateOnChange = invalidateOnChange; - cfg.nearCacheConfigs['ncc-map'] = ncc; + const cfg = new Config.ClientConfig(); return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { cluster = res; return Controller.startMember(cluster.id); }).then(function (member) { + cfg.clusterName = cluster.id; + var ncc = new Config.NearCacheConfig(); + ncc.name = 'nc-map'; + ncc.invalidateOnChange = invalidateOnChange; + cfg.nearCacheConfigs['ncc-map'] = ncc; return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { client1 = hazelcastClient; }); @@ -71,7 +72,7 @@ describe("NearCachedMap", function () { after(function () { client1.shutdown(); client2.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function getNearCacheStats(map) { diff --git a/test/map/hazelcast_identifiedfactory.xml b/test/map/hazelcast_identifiedfactory.xml index b329e0abe..e54ee6579 100644 --- a/test/map/hazelcast_identifiedfactory.xml +++ b/test/map/hazelcast_identifiedfactory.xml @@ -15,9 +15,10 @@ ~ limitations under the License. --> - + diff --git a/test/map/hazelcast_mapstore.xml b/test/map/hazelcast_mapstore.xml index 25110a433..388a8bc56 100644 --- a/test/map/hazelcast_mapstore.xml +++ b/test/map/hazelcast_mapstore.xml @@ -14,9 +14,10 @@ ~ limitations under the License. --> - + com.hazelcast.client.test.SampleMapStore diff --git a/test/map/hazelcast_nearcache_batchinvalidation_false.xml b/test/map/hazelcast_nearcache_batchinvalidation_false.xml index 062544723..af725b40a 100644 --- a/test/map/hazelcast_nearcache_batchinvalidation_false.xml +++ b/test/map/hazelcast_nearcache_batchinvalidation_false.xml @@ -15,15 +15,10 @@ ~ limitations under the License. --> - - - + false diff --git a/test/multimap/MultiMapProxyListenersTest.js b/test/multimap/MultiMapProxyListenersTest.js index f3217e717..097de4afd 100644 --- a/test/multimap/MultiMapProxyListenersTest.js +++ b/test/multimap/MultiMapProxyListenersTest.js @@ -16,6 +16,7 @@ var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; +const Config = require("../../lib/index.js").Config; var Controller = require('./../RC'); var Util = require('./../Util'); @@ -34,7 +35,9 @@ describe("MultiMap Proxy Listener", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { client = hazelcastClient; }) }); @@ -52,7 +55,7 @@ describe("MultiMap Proxy Listener", function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function Listener(eventName, doneCallback, expectedName, expectedKey, expectedValue, expectedOldValue, @@ -76,7 +79,7 @@ describe("MultiMap Proxy Listener", function () { // Add tests it("listens for add with value excluded", function (done) { - var listener = new Listener("added", done, "test", "foo", undefined, undefined, undefined); + var listener = new Listener("added", done, "test", "foo", null, null, null); map.addEntryListener(listener, null, false).then(function () { map.put("foo", "bar"); @@ -85,7 +88,7 @@ describe("MultiMap Proxy Listener", function () { it("listens for add with value included", function (done) { - var listener = new Listener("added", done, "test", "foo", "bar", undefined, undefined); + var listener = new Listener("added", done, "test", "foo", "bar", null, null); map.addEntryListener(listener, null, true).then(function () { map.put("foo", "bar"); @@ -93,7 +96,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for add to specific key", function (done) { - var listener = new Listener("added", done, "test", "foo", undefined, undefined, undefined); + var listener = new Listener("added", done, "test", "foo", null, null, null); map.addEntryListener(listener, "foo", false).then(function () { map.put("foo", "bar"); @@ -119,7 +122,7 @@ describe("MultiMap Proxy Listener", function () { // Remove tests it("listens for remove with value excluded", function (done) { - var listener = new Listener("removed", done, "test", "foo", undefined, undefined, undefined); + var listener = new Listener("removed", done, "test", "foo", null, null, null); map.addEntryListener(listener, null, false).then(function () { return map.put("foo", "bar"); @@ -129,7 +132,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for remove with value included", function (done) { - var listener = new Listener("removed", done, "test", "foo", undefined, "bar", undefined); + var listener = new Listener("removed", done, "test", "foo", null, "bar", null); map.addEntryListener(listener, null, true).then(function () { return map.put("foo", "bar"); @@ -139,7 +142,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for remove on specific key", function (done) { - var listener = new Listener("added", done, "test", "foo", undefined, undefined, undefined); + var listener = new Listener("added", done, "test", "foo", null, null, null); map.addEntryListener(listener, "foo", false).then(function () { return map.put("foo", "bar"); diff --git a/test/multimap/MultiMapProxyLockTest.js b/test/multimap/MultiMapProxyLockTest.js index 9a927060e..9495abdb0 100644 --- a/test/multimap/MultiMapProxyLockTest.js +++ b/test/multimap/MultiMapProxyLockTest.js @@ -16,6 +16,7 @@ var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; +const Config = require("../../lib/index.js").Config; var Controller = require('./../RC'); var Util = require('./../Util'); var Promise = require('bluebird'); @@ -35,11 +36,13 @@ describe("MultiMap Proxy Lock", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; return Promise.all([ - HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { clientOne = hazelcastClient; }), - HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { clientTwo = hazelcastClient; }) ]); @@ -62,7 +65,7 @@ describe("MultiMap Proxy Lock", function () { after(function () { clientOne.shutdown(); clientTwo.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); diff --git a/test/multimap/MultiMapProxyTest.js b/test/multimap/MultiMapProxyTest.js index 69443f308..de93b4e22 100644 --- a/test/multimap/MultiMapProxyTest.js +++ b/test/multimap/MultiMapProxyTest.js @@ -16,6 +16,7 @@ var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; +const Config = require("../../lib/index.js").Config; var Controller = require('./../RC'); var Util = require('./../Util'); var Promise = require('bluebird'); @@ -33,7 +34,9 @@ describe("MultiMap Proxy", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { client = hazelcastClient; }) }); @@ -51,7 +54,7 @@ describe("MultiMap Proxy", function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it("adds and retrieves a single item", function () { diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index bc0f5b9d6..29c31e8fe 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -22,7 +22,6 @@ var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); var DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortInvalidationMetadataEntryProcessor'); var Promise = require('bluebird'); var expect = require('chai').expect; -var Util = require('../Util'); describe('Invalidation metadata distortion', function () { @@ -43,7 +42,7 @@ describe('Invalidation metadata distortion', function () { }); after(function () { - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); afterEach(function () { @@ -53,6 +52,7 @@ describe('Invalidation metadata distortion', function () { function createConfig(withNearCache) { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; if (withNearCache) { var ncc = new Config.NearCacheConfig(); ncc.name = mapName; @@ -74,8 +74,6 @@ describe('Invalidation metadata distortion', function () { it('lost invalidation', function (done) { - Util.markServerVersionAtLeast(this, client, '3.8'); - this.timeout(13000); var stopTest = false; var map; diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index 02fe5fac4..fe25cec98 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -36,6 +36,7 @@ describe('LostInvalidation', function () { function createConfig() { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; var ncConfig = new Config.NearCacheConfig(); ncConfig.name = mapName; cfg.nearCacheConfigs[mapName] = ncConfig; @@ -57,7 +58,10 @@ describe('LostInvalidation', function () { beforeEach(function () { return HazelcastClient.newHazelcastClient(createConfig()).then(function (resp) { client = resp; - return HazelcastClient.newHazelcastClient(); + + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg); }).then(function (resp) { modifyingClient = resp; }); @@ -69,12 +73,10 @@ describe('LostInvalidation', function () { }); after(function () { - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('client eventually receives an update for which the invalidation event was dropped', function () { - Util.markServerVersionAtLeast(this, client, '3.8'); - var key = 'key'; var value = 'val'; var updatedval = 'updatedval'; @@ -106,7 +108,6 @@ describe('LostInvalidation', function () { }); it('lost invalidation stress test', function () { - Util.markServerVersionAtLeast(this, client, '3.8'); var invalidationHandlerStub; var map; var entries = []; @@ -155,7 +156,7 @@ describe('LostInvalidation', function () { function blockInvalidationEvents(client, nearCachedMap, notifyAfterNumberOfEvents) { var listenerId = nearCachedMap.invalidationListenerId; - var clientRegistrationKey = client.getListenerService().activeRegistrations.get(listenerId).get(client.clusterService.getOwnerConnection()); + var clientRegistrationKey = client.getListenerService().activeRegistrations.get(listenerId).get(client.getConnectionManager().getRandomConnection()); var correlationId = clientRegistrationKey.correlationId; var handler = client.getInvocationService().eventHandlers[correlationId].handler; var numberOfBlockedInvalidations = 0; diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index e972b7f8f..e366c613f 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -19,10 +19,8 @@ var HazelcastClient = require('../../').Client; var expect = require('chai').expect; var Config = require('../../').Config; var fs = require('fs'); -var Long = require('long'); var Util = require('../Util'); var DeferredPromise = require('../../lib/Util').DeferredPromise; -var Address = require('../../.').Address; describe('MigratedData', function () { this.timeout(20000); @@ -36,6 +34,7 @@ describe('MigratedData', function () { function createConfig() { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; var ncConfig = new Config.NearCacheConfig(); ncConfig.name = mapName; cfg.nearCacheConfigs[mapName] = ncConfig; @@ -67,14 +66,14 @@ describe('MigratedData', function () { }); after(function () { - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', function () { - Util.markServerVersionAtLeast(this, client, '3.8'); var map; var survivingMember; var key = 1; + var partitionService = client.getPartitionService(); return client.getMap(mapName).then(function (mp) { map = mp; return map.put(key, 1); @@ -83,10 +82,11 @@ describe('MigratedData', function () { }).then(function () { return map.get(key); }).then(function () { - var partitionService = client.getPartitionService(); + return waitForPartitionTableEvent(partitionService); + }).then(function () { var partitionIdForKey = partitionService.getPartitionId(key); - var addressForKey = partitionService.getAddressForPartition(partitionIdForKey); - if (addressForKey.equals(new Address(member1.host, member1.port))) { + var keyOwner = partitionService.getPartitionOwner(partitionIdForKey).toString(); + if (keyOwner === member1.uuid) { survivingMember = member2; return RC.terminateMember(cluster.id, member1.uuid); } else { @@ -94,9 +94,8 @@ describe('MigratedData', function () { return RC.terminateMember(cluster.id, member2.uuid); } }).then(function () { - var partitionService = client.getPartitionService(); var partitionIdForKey = partitionService.getPartitionId(key); - return waitUntilPartitionMovesTo(partitionService, partitionIdForKey, new Address(survivingMember.host, survivingMember.port)); + return waitUntilPartitionMovesTo(partitionService, partitionIdForKey, survivingMember.uuid); }).then(function () { return Util.promiseWaitMilliseconds(1500); }).then(function () { @@ -109,15 +108,32 @@ describe('MigratedData', function () { }) }); - function waitUntilPartitionMovesTo(partitionService, partitionId, address) { + function waitForPartitionTableEvent(partitionService) { + var deferred = DeferredPromise(); + var expectedPartitionCount = partitionService.partitionCount; + + function checkPartitionTable(remainingTries) { + if (partitionService.partitionTable.partitions.size === expectedPartitionCount) { + deferred.resolve(); + } else if (remainingTries > 0) { + setTimeout(checkPartitionTable, 1000, remainingTries - 1); + } else { + deferred.reject(new Error('Partition table is not received!')); + } + } + checkPartitionTable(10); + return deferred.promise; + } + + function waitUntilPartitionMovesTo(partitionService, partitionId, uuid) { var deferred = DeferredPromise(); (function resolveOrTimeout(remainingTries) { - if (partitionService.getAddressForPartition(partitionId).equals(address)) { + if (partitionService.getPartitionOwner(partitionId).toString() === uuid) { deferred.resolve(); } else if (remainingTries > 0) { setTimeout(resolveOrTimeout, 1000, remainingTries - 1); } else { - deferred.reject(new Error('Partition ' + partitionId + ' was not moved to ' + address.toString())); + deferred.reject(new Error('Partition ' + partitionId + ' was not moved to ' + uuid)); } })(20); return deferred.promise; diff --git a/test/nearcache/NearCacheSimpleInvalidationTest.js b/test/nearcache/NearCacheSimpleInvalidationTest.js index 087b5299a..fbf70580a 100644 --- a/test/nearcache/NearCacheSimpleInvalidationTest.js +++ b/test/nearcache/NearCacheSimpleInvalidationTest.js @@ -31,6 +31,7 @@ describe('NearCacheSimpleInvalidation', function () { function createClientConfig() { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; var ncConfig = new Config.NearCacheConfig(); ncConfig.name = mapName; cfg.nearCacheConfigs[mapName] = ncConfig; @@ -52,7 +53,9 @@ describe('NearCacheSimpleInvalidation', function () { return HazelcastClient.newHazelcastClient(createClientConfig()); }).then(function (cl) { client = cl; - return HazelcastClient.newHazelcastClient(); + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { updaterClient = cl; }); @@ -61,7 +64,7 @@ describe('NearCacheSimpleInvalidation', function () { after(function () { client.shutdown(); updaterClient.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('client observes outside invalidations', function () { diff --git a/test/nearcache/NearCacheTest.js b/test/nearcache/NearCacheTest.js index deb87691b..2bf10161a 100644 --- a/test/nearcache/NearCacheTest.js +++ b/test/nearcache/NearCacheTest.js @@ -66,7 +66,9 @@ describe('NearCacheImpl', function () { cluster = res; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient(); + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg); }).then(function (cl) { client = cl; }); @@ -74,7 +76,7 @@ describe('NearCacheImpl', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); describe('CacheRecord', function () { diff --git a/test/nearcache/hazelcast_eventual_nearcache.xml b/test/nearcache/hazelcast_eventual_nearcache.xml index 69e616c82..d056f722b 100644 --- a/test/nearcache/hazelcast_eventual_nearcache.xml +++ b/test/nearcache/hazelcast_eventual_nearcache.xml @@ -15,9 +15,10 @@ ~ limitations under the License. --> - + false diff --git a/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml index 062544723..42dbd1859 100644 --- a/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml +++ b/test/nearcache/hazelcast_nearcache_batchinvalidation_false.xml @@ -20,9 +20,10 @@ Please see the schema for how to configure Hazelcast at https://hazelcast.com/schema/config/hazelcast-config-3.7.xsd or the documentation at https://hazelcast.org/documentation/ --> - + false diff --git a/test/nearcache/impl/RepairingTaskTest.js b/test/nearcache/impl/RepairingTaskTest.js index 8693f002f..e65ae8ad1 100644 --- a/test/nearcache/impl/RepairingTaskTest.js +++ b/test/nearcache/impl/RepairingTaskTest.js @@ -42,11 +42,12 @@ describe('RepairingTask', function () { }); after(function () { - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function startClientWithReconciliationInterval(reconciliationInterval) { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; var nccConfig = new Config.NearCacheConfig(); nccConfig.name = 'test'; cfg.nearCacheConfigs['test'] = nccConfig; diff --git a/test/pncounter/PNCounterBasicTest.js b/test/pncounter/PNCounterBasicTest.js index 264c29817..dc4ad49e1 100644 --- a/test/pncounter/PNCounterBasicTest.js +++ b/test/pncounter/PNCounterBasicTest.js @@ -17,7 +17,7 @@ var expect = require('chai').expect; var RC = require('../RC'); var Client = require('../../').Client; -var Util = require('../Util'); +var Config = require('../../').Config; describe('PNCounterBasicTest', function () { @@ -30,7 +30,9 @@ describe('PNCounterBasicTest', function () { cluster = cl; return RC.startMember(cluster.id); }).then(function (member) { - return Client.newHazelcastClient(); + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; }); @@ -38,11 +40,10 @@ describe('PNCounterBasicTest', function () { after(function () { client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { - Util.markServerVersionAtLeast(this, client, '3.10'); return client.getPNCounter('pncounter').then(function (counter) { pncounter = counter; }) diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index cc3ce40ea..a515fc4aa 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -19,31 +19,27 @@ chai.use(require('chai-as-promised')); var expect = require('chai').expect; var RC = require('../RC'); var Client = require('../../').Client; +const Config = require('../../').Config; var Errors = require('../..').HazelcastErrors; var fs = require('fs'); var path = require('path'); -var Util = require('../Util'); describe('PNCounterConsistencyTest', function () { var cluster; - var member1; var client; - before(function () { - Util.markServerVersionAtLeast(this, null, '3.10'); - }); - beforeEach(function () { this.timeout(10000); return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')).then(function (cl) { cluster = cl; return RC.startMember(cluster.id); - }).then(function (value) { - member1 = value; + }).then(function () { return RC.startMember(cluster.id); - }).then(function (value) { - return Client.newHazelcastClient(); + }).then(function () { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg); }).then(function (value) { client = value; }); @@ -52,34 +48,30 @@ describe('PNCounterConsistencyTest', function () { afterEach(function () { this.timeout(10000); client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () { - Util.markServerVersionAtLeast(this, client, '3.10'); var pncounter; return client.getPNCounter('pncounter').then(function (counter) { pncounter = counter; return pncounter.getAndAdd(3) }).then(function () { var currentReplicaAddress = pncounter.currentTargetReplicaAddress; - var currentReplicaMember = Util.findMemberByAddress(client, currentReplicaAddress); - return RC.terminateMember(cluster.id, currentReplicaMember.uuid); + return RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); }).then(function () { return expect(pncounter.addAndGet(10)).to.be.rejectedWith(Errors.ConsistencyLostError); }); }); it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () { - Util.markServerVersionAtLeast(this, client, '3.10'); var pncounter; return client.getPNCounter('pncounter').then(function (counter) { pncounter = counter; return pncounter.getAndAdd(3); }).then(function () { var currentReplicaAddress = pncounter.currentTargetReplicaAddress; - var currentReplicaMember = Util.findMemberByAddress(client, currentReplicaAddress); - return RC.terminateMember(cluster.id, currentReplicaMember.uuid); + return RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); }).then(function () { return pncounter.reset(); }).then(function () { diff --git a/test/pncounter/PNCounterWithLiteMembersTest.js b/test/pncounter/PNCounterWithLiteMembersTest.js index 8ad817a80..b08a66b69 100644 --- a/test/pncounter/PNCounterWithLiteMembersTest.js +++ b/test/pncounter/PNCounterWithLiteMembersTest.js @@ -19,10 +19,10 @@ chai.use(require('chai-as-promised')); var expect = chai.expect; var Controller = require('../RC'); var Client = require('../..').Client; +const Config = require('../..').Config; var Errors = require('../..').HazelcastErrors; var fs = require('fs'); var path = require('path'); -var Util = require('../Util'); describe('PNCounterWithLiteMembersTest', function () { @@ -35,7 +35,9 @@ describe('PNCounterWithLiteMembersTest', function () { cluster = cl; return Controller.startMember(cluster.id); }).then(function () { - return Client.newHazelcastClient(); + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg); }).then(function (cl) { client = cl; }); @@ -43,11 +45,10 @@ describe('PNCounterWithLiteMembersTest', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); beforeEach(function () { - Util.markServerVersionAtLeast(this, client, '3.10'); return client.getPNCounter('pncounter').then(function (counter) { pncounter = counter; }); diff --git a/test/pncounter/hazelcast_crdtreplication_delayed.xml b/test/pncounter/hazelcast_crdtreplication_delayed.xml index 7b111b712..1352d7a81 100644 --- a/test/pncounter/hazelcast_crdtreplication_delayed.xml +++ b/test/pncounter/hazelcast_crdtreplication_delayed.xml @@ -14,9 +14,10 @@ ~ limitations under the License. --> - + 1000000 100000 diff --git a/test/pncounter/hazelcast_litemember.xml b/test/pncounter/hazelcast_litemember.xml index 0ba55052e..d4282cb4f 100644 --- a/test/pncounter/hazelcast_litemember.xml +++ b/test/pncounter/hazelcast_litemember.xml @@ -14,8 +14,9 @@ ~ limitations under the License. --> - + diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index f8d015a89..23ac8e80d 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -24,6 +24,7 @@ var Promise = require('bluebird'); var fs = require('fs'); var HazelcastClient = require('../../').Client; +var Config = require('../../').Config; var ItemEventType = require('../../').ItemEventType; describe("Queue Proxy", function () { @@ -39,7 +40,9 @@ describe("Queue Proxy", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -69,7 +72,7 @@ describe("Queue Proxy", function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('size', function () { diff --git a/test/queue/hazelcast_queue.xml b/test/queue/hazelcast_queue.xml index c49224fa5..cfe548d76 100644 --- a/test/queue/hazelcast_queue.xml +++ b/test/queue/hazelcast_queue.xml @@ -14,9 +14,10 @@ ~ limitations under the License. --> - + 15 diff --git a/test/remote_controller/Controller.js b/test/remote_controller/Controller.js new file mode 100644 index 000000000..c6c187843 --- /dev/null +++ b/test/remote_controller/Controller.js @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +var thrift = require('thrift'); +var RemoteController = require('./RemoteController'); + +function HzRemoteController(host, port) { + + var transport = thrift.TBufferedTransport(); + var protocol = thrift.TBinaryProtocol(); + + var connection = thrift.createConnection('localhost', 9701, { + transport: transport, + protocol: protocol + }); + + connection.on('error', function(err) { + console.log(err); + }); + + this.client = thrift.createClient(RemoteController, connection); +} + +HzRemoteController.prototype.ping = function(callback) { + return this.client.ping(callback); +}; + +HzRemoteController.prototype.clean = function(callback) { + return this.client.clean(callback); +}; + +HzRemoteController.prototype.exit = function(callback) { + return this.client.exit(callback); +}; + +HzRemoteController.prototype.createCluster = function(hzVersion, xmlConfig, callback) { + return this.client.createCluster(hzVersion, xmlConfig, callback); +}; + +HzRemoteController.prototype.startMember = function(clusterId, callback) { + return this.client.startMember(clusterId, callback); +}; + +HzRemoteController.prototype.shutdownMember = function(clusterId, memberId, callback) { + return this.client.shutdownMember(clusterId, memberId, callback); +}; + +HzRemoteController.prototype.terminateMember = function(clusterId, memberId, callback) { + return this.client.terminateMember(clusterId, memberId, callback); +}; + +HzRemoteController.prototype.shutdownCluster = function(clusterId, callback) { + return this.client.shutdownCluster(clusterId, callback); +}; + +HzRemoteController.prototype.terminateCluster = function(clusterId, callback) { + return this.client.terminateCluster(clusterId, callback); +}; + +HzRemoteController.prototype.splitMemberFromCluster = function(memberId, callback) { + return this.client.splitMemberFromCluster(memberId, callback); +}; + +HzRemoteController.prototype.mergeMemberToCluster = function(clusterId, memberId, callback) { + return this.client.mergeMemberToCluster(clusterId, memberId, callback); +}; + +HzRemoteController.prototype.executeOnController = function(clusterId, script, lang, callback) { + return this.client.executeOnController(clusterId, script, lang, callback); +}; + +module.exports = HzRemoteController; diff --git a/test/remote_controller/RemoteController.js b/test/remote_controller/RemoteController.js new file mode 100644 index 000000000..9bc7d340f --- /dev/null +++ b/test/remote_controller/RemoteController.js @@ -0,0 +1,2893 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +// +// Autogenerated by Thrift Compiler (0.13.0) +// +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING +// +"use strict"; + +var thrift = require('thrift'); +var Thrift = thrift.Thrift; +var Q = thrift.Q; + +var ttypes = require('./remote-controller_types'); +//HELPER FUNCTIONS AND STRUCTURES + +var RemoteController_ping_args = function(args) { +}; +RemoteController_ping_args.prototype = {}; +RemoteController_ping_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + if (ftype == Thrift.Type.STOP) { + break; + } + input.skip(ftype); + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_ping_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_ping_args'); + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_ping_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_ping_result.prototype = {}; +RemoteController_ping_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_ping_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_ping_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_clean_args = function(args) { +}; +RemoteController_clean_args.prototype = {}; +RemoteController_clean_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + if (ftype == Thrift.Type.STOP) { + break; + } + input.skip(ftype); + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_clean_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_clean_args'); + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_clean_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_clean_result.prototype = {}; +RemoteController_clean_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_clean_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_clean_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_exit_args = function(args) { +}; +RemoteController_exit_args.prototype = {}; +RemoteController_exit_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + if (ftype == Thrift.Type.STOP) { + break; + } + input.skip(ftype); + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_exit_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_exit_args'); + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_exit_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_exit_result.prototype = {}; +RemoteController_exit_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_exit_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_exit_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_createCluster_args = function(args) { + this.hzVersion = null; + this.xmlconfig = null; + if (args) { + if (args.hzVersion !== undefined && args.hzVersion !== null) { + this.hzVersion = args.hzVersion; + } + if (args.xmlconfig !== undefined && args.xmlconfig !== null) { + this.xmlconfig = args.xmlconfig; + } + } +}; +RemoteController_createCluster_args.prototype = {}; +RemoteController_createCluster_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.hzVersion = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.xmlconfig = input.readString(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_createCluster_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_createCluster_args'); + if (this.hzVersion !== null && this.hzVersion !== undefined) { + output.writeFieldBegin('hzVersion', Thrift.Type.STRING, 1); + output.writeString(this.hzVersion); + output.writeFieldEnd(); + } + if (this.xmlconfig !== null && this.xmlconfig !== undefined) { + output.writeFieldBegin('xmlconfig', Thrift.Type.STRING, 2); + output.writeString(this.xmlconfig); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_createCluster_result = function(args) { + this.success = null; + this.serverException = null; + if (args instanceof ttypes.ServerException) { + this.serverException = args; + return; + } + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = new ttypes.Cluster(args.success); + } + if (args.serverException !== undefined && args.serverException !== null) { + this.serverException = args.serverException; + } + } +}; +RemoteController_createCluster_result.prototype = {}; +RemoteController_createCluster_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.STRUCT) { + this.success = new ttypes.Cluster(); + this.success.read(input); + } else { + input.skip(ftype); + } + break; + case 1: + if (ftype == Thrift.Type.STRUCT) { + this.serverException = new ttypes.ServerException(); + this.serverException.read(input); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_createCluster_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_createCluster_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.STRUCT, 0); + this.success.write(output); + output.writeFieldEnd(); + } + if (this.serverException !== null && this.serverException !== undefined) { + output.writeFieldBegin('serverException', Thrift.Type.STRUCT, 1); + this.serverException.write(output); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_startMember_args = function(args) { + this.clusterId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + } +}; +RemoteController_startMember_args.prototype = {}; +RemoteController_startMember_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_startMember_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_startMember_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_startMember_result = function(args) { + this.success = null; + this.serverException = null; + if (args instanceof ttypes.ServerException) { + this.serverException = args; + return; + } + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = new ttypes.Member(args.success); + } + if (args.serverException !== undefined && args.serverException !== null) { + this.serverException = args.serverException; + } + } +}; +RemoteController_startMember_result.prototype = {}; +RemoteController_startMember_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.STRUCT) { + this.success = new ttypes.Member(); + this.success.read(input); + } else { + input.skip(ftype); + } + break; + case 1: + if (ftype == Thrift.Type.STRUCT) { + this.serverException = new ttypes.ServerException(); + this.serverException.read(input); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_startMember_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_startMember_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.STRUCT, 0); + this.success.write(output); + output.writeFieldEnd(); + } + if (this.serverException !== null && this.serverException !== undefined) { + output.writeFieldBegin('serverException', Thrift.Type.STRUCT, 1); + this.serverException.write(output); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_shutdownMember_args = function(args) { + this.clusterId = null; + this.memberId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + if (args.memberId !== undefined && args.memberId !== null) { + this.memberId = args.memberId; + } + } +}; +RemoteController_shutdownMember_args.prototype = {}; +RemoteController_shutdownMember_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.memberId = input.readString(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_shutdownMember_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_shutdownMember_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + if (this.memberId !== null && this.memberId !== undefined) { + output.writeFieldBegin('memberId', Thrift.Type.STRING, 2); + output.writeString(this.memberId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_shutdownMember_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_shutdownMember_result.prototype = {}; +RemoteController_shutdownMember_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_shutdownMember_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_shutdownMember_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_terminateMember_args = function(args) { + this.clusterId = null; + this.memberId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + if (args.memberId !== undefined && args.memberId !== null) { + this.memberId = args.memberId; + } + } +}; +RemoteController_terminateMember_args.prototype = {}; +RemoteController_terminateMember_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.memberId = input.readString(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_terminateMember_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_terminateMember_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + if (this.memberId !== null && this.memberId !== undefined) { + output.writeFieldBegin('memberId', Thrift.Type.STRING, 2); + output.writeString(this.memberId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_terminateMember_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_terminateMember_result.prototype = {}; +RemoteController_terminateMember_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_terminateMember_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_terminateMember_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_suspendMember_args = function(args) { + this.clusterId = null; + this.memberId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + if (args.memberId !== undefined && args.memberId !== null) { + this.memberId = args.memberId; + } + } +}; +RemoteController_suspendMember_args.prototype = {}; +RemoteController_suspendMember_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.memberId = input.readString(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_suspendMember_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_suspendMember_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + if (this.memberId !== null && this.memberId !== undefined) { + output.writeFieldBegin('memberId', Thrift.Type.STRING, 2); + output.writeString(this.memberId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_suspendMember_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_suspendMember_result.prototype = {}; +RemoteController_suspendMember_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_suspendMember_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_suspendMember_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_resumeMember_args = function(args) { + this.clusterId = null; + this.memberId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + if (args.memberId !== undefined && args.memberId !== null) { + this.memberId = args.memberId; + } + } +}; +RemoteController_resumeMember_args.prototype = {}; +RemoteController_resumeMember_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.memberId = input.readString(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_resumeMember_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_resumeMember_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + if (this.memberId !== null && this.memberId !== undefined) { + output.writeFieldBegin('memberId', Thrift.Type.STRING, 2); + output.writeString(this.memberId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_resumeMember_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_resumeMember_result.prototype = {}; +RemoteController_resumeMember_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_resumeMember_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_resumeMember_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_shutdownCluster_args = function(args) { + this.clusterId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + } +}; +RemoteController_shutdownCluster_args.prototype = {}; +RemoteController_shutdownCluster_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_shutdownCluster_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_shutdownCluster_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_shutdownCluster_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_shutdownCluster_result.prototype = {}; +RemoteController_shutdownCluster_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_shutdownCluster_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_shutdownCluster_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_terminateCluster_args = function(args) { + this.clusterId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + } +}; +RemoteController_terminateCluster_args.prototype = {}; +RemoteController_terminateCluster_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_terminateCluster_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_terminateCluster_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_terminateCluster_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + } +}; +RemoteController_terminateCluster_result.prototype = {}; +RemoteController_terminateCluster_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_terminateCluster_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_terminateCluster_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 0); + output.writeBool(this.success); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_splitMemberFromCluster_args = function(args) { + this.memberId = null; + if (args) { + if (args.memberId !== undefined && args.memberId !== null) { + this.memberId = args.memberId; + } + } +}; +RemoteController_splitMemberFromCluster_args.prototype = {}; +RemoteController_splitMemberFromCluster_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.memberId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_splitMemberFromCluster_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_splitMemberFromCluster_args'); + if (this.memberId !== null && this.memberId !== undefined) { + output.writeFieldBegin('memberId', Thrift.Type.STRING, 1); + output.writeString(this.memberId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_splitMemberFromCluster_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = new ttypes.Cluster(args.success); + } + } +}; +RemoteController_splitMemberFromCluster_result.prototype = {}; +RemoteController_splitMemberFromCluster_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.STRUCT) { + this.success = new ttypes.Cluster(); + this.success.read(input); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_splitMemberFromCluster_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_splitMemberFromCluster_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.STRUCT, 0); + this.success.write(output); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_mergeMemberToCluster_args = function(args) { + this.clusterId = null; + this.memberId = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + if (args.memberId !== undefined && args.memberId !== null) { + this.memberId = args.memberId; + } + } +}; +RemoteController_mergeMemberToCluster_args.prototype = {}; +RemoteController_mergeMemberToCluster_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.memberId = input.readString(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_mergeMemberToCluster_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_mergeMemberToCluster_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + if (this.memberId !== null && this.memberId !== undefined) { + output.writeFieldBegin('memberId', Thrift.Type.STRING, 2); + output.writeString(this.memberId); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_mergeMemberToCluster_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = new ttypes.Cluster(args.success); + } + } +}; +RemoteController_mergeMemberToCluster_result.prototype = {}; +RemoteController_mergeMemberToCluster_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.STRUCT) { + this.success = new ttypes.Cluster(); + this.success.read(input); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_mergeMemberToCluster_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_mergeMemberToCluster_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.STRUCT, 0); + this.success.write(output); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_executeOnController_args = function(args) { + this.clusterId = null; + this.script = null; + this.lang = null; + if (args) { + if (args.clusterId !== undefined && args.clusterId !== null) { + this.clusterId = args.clusterId; + } + if (args.script !== undefined && args.script !== null) { + this.script = args.script; + } + if (args.lang !== undefined && args.lang !== null) { + this.lang = args.lang; + } + } +}; +RemoteController_executeOnController_args.prototype = {}; +RemoteController_executeOnController_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.clusterId = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.script = input.readString(); + } else { + input.skip(ftype); + } + break; + case 3: + if (ftype == Thrift.Type.I32) { + this.lang = input.readI32(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_executeOnController_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_executeOnController_args'); + if (this.clusterId !== null && this.clusterId !== undefined) { + output.writeFieldBegin('clusterId', Thrift.Type.STRING, 1); + output.writeString(this.clusterId); + output.writeFieldEnd(); + } + if (this.script !== null && this.script !== undefined) { + output.writeFieldBegin('script', Thrift.Type.STRING, 2); + output.writeString(this.script); + output.writeFieldEnd(); + } + if (this.lang !== null && this.lang !== undefined) { + output.writeFieldBegin('lang', Thrift.Type.I32, 3); + output.writeI32(this.lang); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_executeOnController_result = function(args) { + this.success = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = new ttypes.Response(args.success); + } + } +}; +RemoteController_executeOnController_result.prototype = {}; +RemoteController_executeOnController_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.STRUCT) { + this.success = new ttypes.Response(); + this.success.read(input); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_executeOnController_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_executeOnController_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.STRUCT, 0); + this.success.write(output); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteControllerClient = exports.Client = function(output, pClass) { + this.output = output; + this.pClass = pClass; + this._seqid = 0; + this._reqs = {}; +}; +RemoteControllerClient.prototype = {}; +RemoteControllerClient.prototype.seqid = function() { return this._seqid; }; +RemoteControllerClient.prototype.new_seqid = function() { return this._seqid += 1; }; + +RemoteControllerClient.prototype.ping = function(callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_ping(); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_ping(); + } +}; + +RemoteControllerClient.prototype.send_ping = function() { + var output = new this.pClass(this.output); + var args = new RemoteController_ping_args(); + try { + output.writeMessageBegin('ping', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_ping = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_ping_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('ping failed: unknown result'); +}; + +RemoteControllerClient.prototype.clean = function(callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_clean(); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_clean(); + } +}; + +RemoteControllerClient.prototype.send_clean = function() { + var output = new this.pClass(this.output); + var args = new RemoteController_clean_args(); + try { + output.writeMessageBegin('clean', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_clean = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_clean_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('clean failed: unknown result'); +}; + +RemoteControllerClient.prototype.exit = function(callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_exit(); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_exit(); + } +}; + +RemoteControllerClient.prototype.send_exit = function() { + var output = new this.pClass(this.output); + var args = new RemoteController_exit_args(); + try { + output.writeMessageBegin('exit', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_exit = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_exit_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('exit failed: unknown result'); +}; + +RemoteControllerClient.prototype.createCluster = function(hzVersion, xmlconfig, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_createCluster(hzVersion, xmlconfig); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_createCluster(hzVersion, xmlconfig); + } +}; + +RemoteControllerClient.prototype.send_createCluster = function(hzVersion, xmlconfig) { + var output = new this.pClass(this.output); + var params = { + hzVersion: hzVersion, + xmlconfig: xmlconfig + }; + var args = new RemoteController_createCluster_args(params); + try { + output.writeMessageBegin('createCluster', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_createCluster = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_createCluster_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.serverException) { + return callback(result.serverException); + } + if (null !== result.success) { + return callback(null, result.success); + } + return callback('createCluster failed: unknown result'); +}; + +RemoteControllerClient.prototype.startMember = function(clusterId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_startMember(clusterId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_startMember(clusterId); + } +}; + +RemoteControllerClient.prototype.send_startMember = function(clusterId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId + }; + var args = new RemoteController_startMember_args(params); + try { + output.writeMessageBegin('startMember', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_startMember = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_startMember_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.serverException) { + return callback(result.serverException); + } + if (null !== result.success) { + return callback(null, result.success); + } + return callback('startMember failed: unknown result'); +}; + +RemoteControllerClient.prototype.shutdownMember = function(clusterId, memberId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_shutdownMember(clusterId, memberId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_shutdownMember(clusterId, memberId); + } +}; + +RemoteControllerClient.prototype.send_shutdownMember = function(clusterId, memberId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId, + memberId: memberId + }; + var args = new RemoteController_shutdownMember_args(params); + try { + output.writeMessageBegin('shutdownMember', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_shutdownMember = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_shutdownMember_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('shutdownMember failed: unknown result'); +}; + +RemoteControllerClient.prototype.terminateMember = function(clusterId, memberId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_terminateMember(clusterId, memberId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_terminateMember(clusterId, memberId); + } +}; + +RemoteControllerClient.prototype.send_terminateMember = function(clusterId, memberId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId, + memberId: memberId + }; + var args = new RemoteController_terminateMember_args(params); + try { + output.writeMessageBegin('terminateMember', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_terminateMember = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_terminateMember_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('terminateMember failed: unknown result'); +}; + +RemoteControllerClient.prototype.suspendMember = function(clusterId, memberId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_suspendMember(clusterId, memberId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_suspendMember(clusterId, memberId); + } +}; + +RemoteControllerClient.prototype.send_suspendMember = function(clusterId, memberId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId, + memberId: memberId + }; + var args = new RemoteController_suspendMember_args(params); + try { + output.writeMessageBegin('suspendMember', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_suspendMember = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_suspendMember_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('suspendMember failed: unknown result'); +}; + +RemoteControllerClient.prototype.resumeMember = function(clusterId, memberId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_resumeMember(clusterId, memberId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_resumeMember(clusterId, memberId); + } +}; + +RemoteControllerClient.prototype.send_resumeMember = function(clusterId, memberId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId, + memberId: memberId + }; + var args = new RemoteController_resumeMember_args(params); + try { + output.writeMessageBegin('resumeMember', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_resumeMember = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_resumeMember_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('resumeMember failed: unknown result'); +}; + +RemoteControllerClient.prototype.shutdownCluster = function(clusterId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_shutdownCluster(clusterId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_shutdownCluster(clusterId); + } +}; + +RemoteControllerClient.prototype.send_shutdownCluster = function(clusterId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId + }; + var args = new RemoteController_shutdownCluster_args(params); + try { + output.writeMessageBegin('shutdownCluster', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_shutdownCluster = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_shutdownCluster_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('shutdownCluster failed: unknown result'); +}; + +RemoteControllerClient.prototype.terminateCluster = function(clusterId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_terminateCluster(clusterId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_terminateCluster(clusterId); + } +}; + +RemoteControllerClient.prototype.send_terminateCluster = function(clusterId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId + }; + var args = new RemoteController_terminateCluster_args(params); + try { + output.writeMessageBegin('terminateCluster', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_terminateCluster = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_terminateCluster_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('terminateCluster failed: unknown result'); +}; + +RemoteControllerClient.prototype.splitMemberFromCluster = function(memberId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_splitMemberFromCluster(memberId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_splitMemberFromCluster(memberId); + } +}; + +RemoteControllerClient.prototype.send_splitMemberFromCluster = function(memberId) { + var output = new this.pClass(this.output); + var params = { + memberId: memberId + }; + var args = new RemoteController_splitMemberFromCluster_args(params); + try { + output.writeMessageBegin('splitMemberFromCluster', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_splitMemberFromCluster = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_splitMemberFromCluster_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('splitMemberFromCluster failed: unknown result'); +}; + +RemoteControllerClient.prototype.mergeMemberToCluster = function(clusterId, memberId, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_mergeMemberToCluster(clusterId, memberId); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_mergeMemberToCluster(clusterId, memberId); + } +}; + +RemoteControllerClient.prototype.send_mergeMemberToCluster = function(clusterId, memberId) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId, + memberId: memberId + }; + var args = new RemoteController_mergeMemberToCluster_args(params); + try { + output.writeMessageBegin('mergeMemberToCluster', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_mergeMemberToCluster = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_mergeMemberToCluster_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('mergeMemberToCluster failed: unknown result'); +}; + +RemoteControllerClient.prototype.executeOnController = function(clusterId, script, lang, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_executeOnController(clusterId, script, lang); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_executeOnController(clusterId, script, lang); + } +}; + +RemoteControllerClient.prototype.send_executeOnController = function(clusterId, script, lang) { + var output = new this.pClass(this.output); + var params = { + clusterId: clusterId, + script: script, + lang: lang + }; + var args = new RemoteController_executeOnController_args(params); + try { + output.writeMessageBegin('executeOnController', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_executeOnController = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_executeOnController_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.success) { + return callback(null, result.success); + } + return callback('executeOnController failed: unknown result'); +}; +var RemoteControllerProcessor = exports.Processor = function(handler) { + this._handler = handler; +}; +RemoteControllerProcessor.prototype.process = function(input, output) { + var r = input.readMessageBegin(); + if (this['process_' + r.fname]) { + return this['process_' + r.fname].call(this, r.rseqid, input, output); + } else { + input.skip(Thrift.Type.STRUCT); + input.readMessageEnd(); + var x = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN_METHOD, 'Unknown function ' + r.fname); + output.writeMessageBegin(r.fname, Thrift.MessageType.EXCEPTION, r.rseqid); + x.write(output); + output.writeMessageEnd(); + output.flush(); + } +}; +RemoteControllerProcessor.prototype.process_ping = function(seqid, input, output) { + var args = new RemoteController_ping_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.ping.length === 0) { + Q.fcall(this._handler.ping.bind(this._handler) + ).then(function(result) { + var result_obj = new RemoteController_ping_result({success: result}); + output.writeMessageBegin("ping", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("ping", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.ping(function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_ping_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("ping", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("ping", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_clean = function(seqid, input, output) { + var args = new RemoteController_clean_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.clean.length === 0) { + Q.fcall(this._handler.clean.bind(this._handler) + ).then(function(result) { + var result_obj = new RemoteController_clean_result({success: result}); + output.writeMessageBegin("clean", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("clean", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.clean(function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_clean_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("clean", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("clean", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_exit = function(seqid, input, output) { + var args = new RemoteController_exit_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.exit.length === 0) { + Q.fcall(this._handler.exit.bind(this._handler) + ).then(function(result) { + var result_obj = new RemoteController_exit_result({success: result}); + output.writeMessageBegin("exit", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("exit", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.exit(function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_exit_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("exit", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("exit", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_createCluster = function(seqid, input, output) { + var args = new RemoteController_createCluster_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.createCluster.length === 2) { + Q.fcall(this._handler.createCluster.bind(this._handler), + args.hzVersion, + args.xmlconfig + ).then(function(result) { + var result_obj = new RemoteController_createCluster_result({success: result}); + output.writeMessageBegin("createCluster", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + if (err instanceof ttypes.ServerException) { + result = new RemoteController_createCluster_result(err); + output.writeMessageBegin("createCluster", Thrift.MessageType.REPLY, seqid); + } else { + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("createCluster", Thrift.MessageType.EXCEPTION, seqid); + } + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.createCluster(args.hzVersion, args.xmlconfig, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined') || err instanceof ttypes.ServerException) { + result_obj = new RemoteController_createCluster_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("createCluster", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("createCluster", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_startMember = function(seqid, input, output) { + var args = new RemoteController_startMember_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.startMember.length === 1) { + Q.fcall(this._handler.startMember.bind(this._handler), + args.clusterId + ).then(function(result) { + var result_obj = new RemoteController_startMember_result({success: result}); + output.writeMessageBegin("startMember", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + if (err instanceof ttypes.ServerException) { + result = new RemoteController_startMember_result(err); + output.writeMessageBegin("startMember", Thrift.MessageType.REPLY, seqid); + } else { + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("startMember", Thrift.MessageType.EXCEPTION, seqid); + } + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.startMember(args.clusterId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined') || err instanceof ttypes.ServerException) { + result_obj = new RemoteController_startMember_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("startMember", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("startMember", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_shutdownMember = function(seqid, input, output) { + var args = new RemoteController_shutdownMember_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.shutdownMember.length === 2) { + Q.fcall(this._handler.shutdownMember.bind(this._handler), + args.clusterId, + args.memberId + ).then(function(result) { + var result_obj = new RemoteController_shutdownMember_result({success: result}); + output.writeMessageBegin("shutdownMember", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("shutdownMember", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.shutdownMember(args.clusterId, args.memberId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_shutdownMember_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("shutdownMember", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("shutdownMember", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_terminateMember = function(seqid, input, output) { + var args = new RemoteController_terminateMember_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.terminateMember.length === 2) { + Q.fcall(this._handler.terminateMember.bind(this._handler), + args.clusterId, + args.memberId + ).then(function(result) { + var result_obj = new RemoteController_terminateMember_result({success: result}); + output.writeMessageBegin("terminateMember", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("terminateMember", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.terminateMember(args.clusterId, args.memberId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_terminateMember_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("terminateMember", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("terminateMember", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_suspendMember = function(seqid, input, output) { + var args = new RemoteController_suspendMember_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.suspendMember.length === 2) { + Q.fcall(this._handler.suspendMember.bind(this._handler), + args.clusterId, + args.memberId + ).then(function(result) { + var result_obj = new RemoteController_suspendMember_result({success: result}); + output.writeMessageBegin("suspendMember", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("suspendMember", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.suspendMember(args.clusterId, args.memberId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_suspendMember_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("suspendMember", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("suspendMember", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_resumeMember = function(seqid, input, output) { + var args = new RemoteController_resumeMember_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.resumeMember.length === 2) { + Q.fcall(this._handler.resumeMember.bind(this._handler), + args.clusterId, + args.memberId + ).then(function(result) { + var result_obj = new RemoteController_resumeMember_result({success: result}); + output.writeMessageBegin("resumeMember", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("resumeMember", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.resumeMember(args.clusterId, args.memberId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_resumeMember_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("resumeMember", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("resumeMember", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_shutdownCluster = function(seqid, input, output) { + var args = new RemoteController_shutdownCluster_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.shutdownCluster.length === 1) { + Q.fcall(this._handler.shutdownCluster.bind(this._handler), + args.clusterId + ).then(function(result) { + var result_obj = new RemoteController_shutdownCluster_result({success: result}); + output.writeMessageBegin("shutdownCluster", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("shutdownCluster", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.shutdownCluster(args.clusterId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_shutdownCluster_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("shutdownCluster", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("shutdownCluster", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_terminateCluster = function(seqid, input, output) { + var args = new RemoteController_terminateCluster_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.terminateCluster.length === 1) { + Q.fcall(this._handler.terminateCluster.bind(this._handler), + args.clusterId + ).then(function(result) { + var result_obj = new RemoteController_terminateCluster_result({success: result}); + output.writeMessageBegin("terminateCluster", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("terminateCluster", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.terminateCluster(args.clusterId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_terminateCluster_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("terminateCluster", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("terminateCluster", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_splitMemberFromCluster = function(seqid, input, output) { + var args = new RemoteController_splitMemberFromCluster_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.splitMemberFromCluster.length === 1) { + Q.fcall(this._handler.splitMemberFromCluster.bind(this._handler), + args.memberId + ).then(function(result) { + var result_obj = new RemoteController_splitMemberFromCluster_result({success: result}); + output.writeMessageBegin("splitMemberFromCluster", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("splitMemberFromCluster", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.splitMemberFromCluster(args.memberId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_splitMemberFromCluster_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("splitMemberFromCluster", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("splitMemberFromCluster", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_mergeMemberToCluster = function(seqid, input, output) { + var args = new RemoteController_mergeMemberToCluster_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.mergeMemberToCluster.length === 2) { + Q.fcall(this._handler.mergeMemberToCluster.bind(this._handler), + args.clusterId, + args.memberId + ).then(function(result) { + var result_obj = new RemoteController_mergeMemberToCluster_result({success: result}); + output.writeMessageBegin("mergeMemberToCluster", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("mergeMemberToCluster", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.mergeMemberToCluster(args.clusterId, args.memberId, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_mergeMemberToCluster_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("mergeMemberToCluster", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("mergeMemberToCluster", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; +RemoteControllerProcessor.prototype.process_executeOnController = function(seqid, input, output) { + var args = new RemoteController_executeOnController_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.executeOnController.length === 3) { + Q.fcall(this._handler.executeOnController.bind(this._handler), + args.clusterId, + args.script, + args.lang + ).then(function(result) { + var result_obj = new RemoteController_executeOnController_result({success: result}); + output.writeMessageBegin("executeOnController", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("executeOnController", Thrift.MessageType.EXCEPTION, seqid); + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.executeOnController(args.clusterId, args.script, args.lang, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined')) { + result_obj = new RemoteController_executeOnController_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("executeOnController", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("executeOnController", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; diff --git a/test/remote_controller/remote-controller_types.js b/test/remote_controller/remote-controller_types.js new file mode 100644 index 000000000..94024b2c1 --- /dev/null +++ b/test/remote_controller/remote-controller_types.js @@ -0,0 +1,295 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +// +// Autogenerated by Thrift Compiler (0.13.0) +// +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING +// +"use strict"; + +var thrift = require('thrift'); +var Thrift = thrift.Thrift; +var Q = thrift.Q; + +var ttypes = module.exports = {}; +ttypes.Lang = { + 'JAVASCRIPT' : 1, + 'GROOVY' : 2, + 'PYTHON' : 3, + 'RUBY' : 4 +}; +var Cluster = module.exports.Cluster = function(args) { + this.id = null; + if (args) { + if (args.id !== undefined && args.id !== null) { + this.id = args.id; + } + } +}; +Cluster.prototype = {}; +Cluster.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.id = input.readString(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +Cluster.prototype.write = function(output) { + output.writeStructBegin('Cluster'); + if (this.id !== null && this.id !== undefined) { + output.writeFieldBegin('id', Thrift.Type.STRING, 1); + output.writeString(this.id); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var Member = module.exports.Member = function(args) { + this.uuid = null; + this.host = null; + this.port = null; + if (args) { + if (args.uuid !== undefined && args.uuid !== null) { + this.uuid = args.uuid; + } + if (args.host !== undefined && args.host !== null) { + this.host = args.host; + } + if (args.port !== undefined && args.port !== null) { + this.port = args.port; + } + } +}; +Member.prototype = {}; +Member.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.uuid = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.host = input.readString(); + } else { + input.skip(ftype); + } + break; + case 3: + if (ftype == Thrift.Type.I32) { + this.port = input.readI32(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +Member.prototype.write = function(output) { + output.writeStructBegin('Member'); + if (this.uuid !== null && this.uuid !== undefined) { + output.writeFieldBegin('uuid', Thrift.Type.STRING, 1); + output.writeString(this.uuid); + output.writeFieldEnd(); + } + if (this.host !== null && this.host !== undefined) { + output.writeFieldBegin('host', Thrift.Type.STRING, 2); + output.writeString(this.host); + output.writeFieldEnd(); + } + if (this.port !== null && this.port !== undefined) { + output.writeFieldBegin('port', Thrift.Type.I32, 3); + output.writeI32(this.port); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var Response = module.exports.Response = function(args) { + this.success = null; + this.message = null; + this.result = null; + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = args.success; + } + if (args.message !== undefined && args.message !== null) { + this.message = args.message; + } + if (args.result !== undefined && args.result !== null) { + this.result = args.result; + } + } +}; +Response.prototype = {}; +Response.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.BOOL) { + this.success = input.readBool(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.message = input.readString(); + } else { + input.skip(ftype); + } + break; + case 3: + if (ftype == Thrift.Type.STRING) { + this.result = input.readBinary(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +Response.prototype.write = function(output) { + output.writeStructBegin('Response'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.BOOL, 1); + output.writeBool(this.success); + output.writeFieldEnd(); + } + if (this.message !== null && this.message !== undefined) { + output.writeFieldBegin('message', Thrift.Type.STRING, 2); + output.writeString(this.message); + output.writeFieldEnd(); + } + if (this.result !== null && this.result !== undefined) { + output.writeFieldBegin('result', Thrift.Type.STRING, 3); + output.writeBinary(this.result); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var ServerException = module.exports.ServerException = function(args) { + Thrift.TException.call(this, "ServerException"); + this.name = "ServerException"; + this.message = null; + if (args) { + if (args.message !== undefined && args.message !== null) { + this.message = args.message; + } + } +}; +Thrift.inherits(ServerException, Thrift.TException); +ServerException.prototype.name = 'ServerException'; +ServerException.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.message = input.readString(); + } else { + input.skip(ftype); + } + break; + case 0: + input.skip(ftype); + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +ServerException.prototype.write = function(output) { + output.writeStructBegin('ServerException'); + if (this.message !== null && this.message !== undefined) { + output.writeFieldBegin('message', Thrift.Type.STRING, 1); + output.writeString(this.message); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 8f3196058..28d45a9c4 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -18,6 +18,7 @@ var expect = require('chai').expect; var HazelcastClient = require('../../lib/index.js').Client; +var Config = require('../../lib/index.js').Config; var Controller = require('./../RC'); var Util = require('./../Util'); var fs = require('fs'); @@ -39,7 +40,9 @@ describe('ReplicatedMap Proxy', function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -57,7 +60,7 @@ describe('ReplicatedMap Proxy', function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('puts one entry and gets one entry', function () { @@ -107,13 +110,12 @@ describe('ReplicatedMap Proxy', function () { }); }); - // TODO(zemd): need to be verified separately due to strange NullPointerException from the server - // it('should not contain the key', function () { - // return rm.containsKey('key') - // .then(function (res) { - // expect(res).to.equal(false); - // }); - // }); + it('should not contain the key', function () { + return rm.containsKey('key') + .then(function (res) { + expect(res).to.equal(false); + }); + }); it('should contain the value', function () { return rm.put('key', 'value', ONE_HOUR) @@ -284,8 +286,8 @@ describe('ReplicatedMap Proxy', function () { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('new-key'); expect(entryEvent.value).to.equal('value'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; @@ -314,9 +316,9 @@ describe('ReplicatedMap Proxy', function () { try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key-to-remove'); - expect(entryEvent.value).to.be.undefined; + expect(entryEvent.value).to.be.equal(null); expect(entryEvent.oldValue).to.equal('value'); - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; @@ -348,7 +350,7 @@ describe('ReplicatedMap Proxy', function () { expect(entryEvent.key).to.equal('key-to-update'); expect(entryEvent.value).to.equal('value2'); expect(entryEvent.oldValue).to.equal('value1'); - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; @@ -419,8 +421,8 @@ describe('ReplicatedMap Proxy', function () { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key1'); expect(entryEvent.value).to.equal('value'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; @@ -455,8 +457,8 @@ describe('ReplicatedMap Proxy', function () { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key10'); expect(entryEvent.value).to.equal('val10'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); } catch (err) { error = err; @@ -484,8 +486,8 @@ describe('ReplicatedMap Proxy', function () { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key'); expect(entryEvent.value).to.be.equal('value'); - expect(entryEvent.oldValue).to.be.undefined; - expect(entryEvent.mergingValue).to.be.undefined; + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); expect(entryEvent.member).to.not.be.equal(null); } catch (err) { diff --git a/test/replicatedmap/hazelcast_replicatedmap.xml b/test/replicatedmap/hazelcast_replicatedmap.xml index 8dc8a700d..bba6593d4 100644 --- a/test/replicatedmap/hazelcast_replicatedmap.xml +++ b/test/replicatedmap/hazelcast_replicatedmap.xml @@ -14,9 +14,10 @@ ~ limitations under the License. --> - + OBJECT true diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js index 5b8d12162..91de53e0b 100644 --- a/test/rest_value/RestValueTest.js +++ b/test/rest_value/RestValueTest.js @@ -18,13 +18,13 @@ const expect = require('chai').expect; const HazelcastClient = require('../../lib').Client; +const Config = require('../../lib').Config; const Controller = require('../RC'); const fs = require('fs'); const http = require('http'); const querystring = require('querystring'); const DeferredPromise = require('../../lib/Util').DeferredPromise; const Buffer = require('safe-buffer').Buffer; -const Util = require('../Util'); describe('RestValueTest', function () { @@ -40,19 +40,17 @@ describe('RestValueTest', function () { return Controller.startMember(cluster.id); }).then(m => { member = m; - return HazelcastClient.newHazelcastClient(); + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(config); }).then(c => { client = c; }); }); - beforeEach(function () { - Util.markServerVersionAtLeast(this, client, '3.8'); - }); - after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('client should receive REST events from server as RestValue', function (done) { diff --git a/test/rest_value/hazelcast_rest.xml b/test/rest_value/hazelcast_rest.xml index a3ce874c3..134804f7c 100644 --- a/test/rest_value/hazelcast_rest.xml +++ b/test/rest_value/hazelcast_rest.xml @@ -14,10 +14,13 @@ ~ limitations under the License. --> - - - true - + + + + + + diff --git a/test/ringbuffer/RingbufferTest.js b/test/ringbuffer/RingbufferTest.js index f53a66330..787b85268 100644 --- a/test/ringbuffer/RingbufferTest.js +++ b/test/ringbuffer/RingbufferTest.js @@ -16,6 +16,7 @@ var expect = require("chai").expect; var HazelcastClient = require('../../').Client; +const Config = require('../../').Config; var Controller = require('./../RC'); var Util = require('./../Util'); var fs = require('fs'); @@ -35,7 +36,9 @@ describe("Ringbuffer Proxy", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -53,7 +56,7 @@ describe("Ringbuffer Proxy", function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it("adds one item and reads back", function () { diff --git a/test/ringbuffer/hazelcast_ringbuffer.xml b/test/ringbuffer/hazelcast_ringbuffer.xml index db1fc1970..64d4b0921 100644 --- a/test/ringbuffer/hazelcast_ringbuffer.xml +++ b/test/ringbuffer/hazelcast_ringbuffer.xml @@ -14,9 +14,10 @@ ~ limitations under the License. --> - + 3 diff --git a/test/semaphore/SemaphoreProxyTest.js b/test/semaphore/SemaphoreProxyTest.js deleted file mode 100644 index 9e58649b7..000000000 --- a/test/semaphore/SemaphoreProxyTest.js +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var expect = require('chai').expect; -var HazelcastClient = require('../../lib/index.js').Client; -var Controller = require('./../RC'); - -describe("Semaphore Proxy", function () { - - var cluster; - var client1; - var client2; - - var semaphore; - - before(function () { - this.timeout(10000); - return Controller.createCluster().then(function (response) { - cluster = response; - return Controller.startMember(cluster.id); - }).then(function () { - return HazelcastClient.newHazelcastClient(); - }).then(function (cli) { - client1 = cli; - return HazelcastClient.newHazelcastClient(); - }).then(function (clie) { - client2 = clie; - }); - }); - - beforeEach(function () { - return client1.getSemaphore('test').then(function (s) { - semaphore = s; - }); - }); - - afterEach(function () { - return semaphore.destroy(); - }); - - after(function () { - client1.shutdown(); - client2.shutdown(); - return Controller.shutdownCluster(cluster.id); - }); - - it('inits semaphore with 10 permits', function () { - return semaphore.init(10) - .then(function (res) { - expect(res).to.equal(true); - return semaphore.availablePermits() - }) - .then(function (res) { - expect(res).to.equal(10); - }); - }); - - it('acquires 10 permits ', function () { - return semaphore.init(10) - .then(function (res) { - expect(res).to.equal(true); - return semaphore.acquire(10); - }) - .then(function () { - return semaphore.availablePermits(); - }) - .then(function (res) { - expect(res).to.equal(0); - }); - }); - - it('drain', function () { - return semaphore.init(10) - .then(function (res) { - expect(res).to.equal(true); - return semaphore.drainPermits(10); - }) - .then(function (res) { - expect(res).to.equal(10); - return semaphore.availablePermits(); - }) - .then(function (res) { - expect(res).to.equal(0); - }); - }); - - it('reduces permits', function () { - return semaphore.init(10) - .then(function (res) { - expect(res).to.equal(true); - return semaphore.reducePermits(10); - }) - .then(function () { - return semaphore.availablePermits(); - }) - .then(function (res) { - expect(res).to.equal(0); - }); - }); - - it('releases 5 permits', function () { - return semaphore.init(10) - .then(function (res) { - expect(res).to.equal(true); - return semaphore.acquire(10); - }) - .then(function () { - return semaphore.availablePermits(); - }) - .then(function (res) { - expect(res).to.equal(0); - return semaphore.release(5) - }) - .then(function () { - return semaphore.availablePermits(); - }) - .then(function (res) { - expect(res).to.equal(5); - }); - }); - - it('try acquire', function () { - return semaphore.init(10) - .then(function (res) { - expect(res).to.equal(true); - return semaphore.tryAcquire(10); - }) - .then(function (res) { - expect(res).to.equal(true); - return semaphore.availablePermits(); - }) - .then(function (res) { - expect(res).to.equal(0); - }); - }); - - it('only one client proceeds when two clients race for 1 permit', function (done) { - var sem1; - var sem2; - client1.getSemaphore("race").then(function (s) { - sem1 = s; - return client2.getSemaphore("race"); - }).then(function (s) { - sem2 = s; - return sem1.init(1); - }).then(function () { - return sem2.acquire(); - }).then(function () { - sem1.acquire().then(function () { - done(new Error("first client should not be able to acquire the semaphore")); - }); - setTimeout(done, 1000); - }); - }); - - it('client is able to proceed after sufficient number of permits is available', function (done) { - var sem1; - var sem2; - client1.getSemaphore("proceed").then(function (s) { - sem1 = s; - return client2.getSemaphore("proceed"); - }).then(function (s) { - sem2 = s; - return sem1.init(1); - }).then(function () { - return sem1.acquire(); - }).then(function () { - sem2.acquire().then(done); - sem1.release(); - }); - }); - - it('tryAcquire returns false after timeout', function () { - return semaphore.init(1).then(function () { - return semaphore.acquire(1); - }).then(function () { - return semaphore.tryAcquire(1, 1000); - }).then(function (res) { - return expect(res).to.be.false; - }); - }); -}); diff --git a/test/serialization/1.serialization.compatibility.binary b/test/serialization/1.serialization.compatibility.binary index d58ca8a06d4f846d77a85fd8b82bdf0560f20b10..28cc44519758568e40b0dd10608f85550cd964e9 100644 GIT binary patch delta 587 zcmezSaVyKb%X=6%Y-M6*dR{yI;IF)f_6w^#f!J&Ng;m~vpG`M?#iYVq`<$uW(OwgX zwYEFjYu7#Be(NHuB@3g;^pDqAO;{Kh7(AvwtQRkze)t-z7EqKiMA@9tW4e8MXw~)w z*IAPpahaZ#Av+V5jL)b4)X>*td(MzxGkNm#H=6oN lj4!71Yw24_z7PRMc2;6pqF!!dNrs+NX1Ysia%OH~4glm*@YetU delta 6521 zcmeHLYfMvT82(OaweD0{wNily9VHHi6i^m3;}l47vZ4F{W4vUuV$pIbSgHbvE7>31 z4;LKjiQ;APhb-cc#f>x(N+xRJpT!7xiH1ZaTm%t8fq8+m=R2o`wpN@>_Nz^v@AiJ* zd;3n`_dVxSYa=r@STFspUJ^ifzVdoA3n=W@o9FKD=05M0L`is_dti$Ap)&I_3n=WF zm*zlzU)P@8d4tl6{6%CR@9l3FUtJbV<4Wm)o)&#s~Af zU5k#nGpGauU?C6!W}z3kpk}twm-y=L2@#bL0mK11h>LHu->y?;`w(ZZJFE&|+~o-h z+rK@kO7yXvn@T%7w43w3hXj-CBPPv{j4zwUy3S^4sebOR`#oEm;B)s>9^eL6#bo*t z@s>k&xGj%idbtYFsE$C&s0kcBY%H#+^n>Tx$AP-=(eBr>Cq3X+EX% zJpTyYY-wF-M15op2^IENFOn>boS@If1{YoAr#I%93JnEZW~(fCMGwf5G9E1+AmO-^ z9G8)vot=?3DRCa%0*O5m^fhH}I9 z0xyRMCcv+PLrN?p+0!9rQ<1JjJY8GSNrIp61Ra&XlXfbmMcVxl&Tj=G& zGd1W^rr{Nl7u+s*ojz~-h2X4zkY!d=gAn`*B42D39#ZZ=EDzUo%CDcDR zIPJ{r!XUyqdCkD`vE681ky5lHmtuDWHf~*-fbq+51=>++2l^M(CiH&;{OjSq)98k& z<2+M|hLXXY0q9>CZ4V6&cuKlQ0iM&e$W+nT^bD&34511<$8dJBl$RE_$6`7}Da1gw zlN`>`DvMr)wL!Wzt^l6^%${H-rHZYtAS8KKZf^3XW5==nR5(eWKT$f}JHQS8DUYJ2 zJQk_MJDG)J9r`-2Og#C~y0eSA)lqXb*6b+9r&J^A01%g~E9ubBG(j*l`dz;!e0KN_5nN;1DG~KdP$nq2g2tT*$>i z%GxS{o3gfoC~FT;ZmQ{C>ct>+RiD63U3HJBt2#v8aI5+BR(nCJu3ou~1{C+CiK$x- z#EkM#2}!2VVBMud0(NFZ(59KRZ12okG+DU#|Mwi=9c*o0IRKJoB&LSAhd8&4vKb}I zWSHv`LL9vO8hS8eXm-CsQ%XkACM@0B7`P+$(o2jLg7tpNw({U?^E=#2f9F5Wbs>$kGNcd4@d!SVNe5jv)<%&M-IRqzF-t^kc?V ze7QJk)u3}-F^)(_o?u3cZmJz26{~Y|XC)s$wki3ka~IW?%A_&|D32Ri+Ne2?om7t+ zGo0#5_fuZ<3?dwUuAs-wUmX+s9>t_kg9r7u$OZZB=sR2FoF+@VfYWTyN;$qxnPh_= zf{Vl$2hoSrh;f9}x5|kFXa=qUZNOdNAKrO{WyCu0-vgWk=#P%+IV1W)hj31GLlE6TDF@LX@t{zhDWx90!$n!UL0jWXzqeHM z;w4noDg{mz=nvE?#Y>phb@o-M1y1+ScT}mpu9G_(9iL?D#htod9UfuqR{8f}N=*_A z{XWcSz3wZ>od9immHEF5axVTeALMFaNeZm|&~+SMqB2b8eB%zULT { + const cfg = configBuilder.build(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg); + }) + .then(function (cl) { + client = cl; + expect(client.getSerializationService().findSerializerFor(m).getId()).to.be.equal(10); + var map; + return client.getMap('musicians').then(function (mp) { + map = mp; + return map.put('neyzen', m); + }).then(function () { + return map.get('neyzen'); + }).then(function (res) { + expect(res.name).to.be.equal('Furkan'); + }); }); - }); }); }); diff --git a/test/serialization/config/FactoriesTest.js b/test/serialization/config/FactoriesTest.js index c8f94c73d..4c0eead64 100644 --- a/test/serialization/config/FactoriesTest.js +++ b/test/serialization/config/FactoriesTest.js @@ -21,6 +21,7 @@ var path = require('path'); var Client = require('../../../').Client; var Foo = require('./Foo').Foo; var Address = require('./Address').Address; +const ConfigBuilder = require('../../../').ConfigBuilder; describe('Factories', function () { var cluster; @@ -36,7 +37,7 @@ describe('Factories', function () { after(function () { delete process.env['HAZELCAST_CLIENT_CONFIG']; - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); afterEach(function () { @@ -46,25 +47,32 @@ describe('Factories', function () { }); it('should be configured declaratively', function () { - return Client.newHazelcastClient().then(function (cl) { - client = cl; - var map; - return client.getMap('furkan').then(function (mp) { - map = mp; - return map.put('foo', new Foo("elma")); - }).then(function () { - return map.put('address', new Address('Sahibiata', 42000, 'Konya', 'Turkey')) - }).then(function () { - return map.get('foo'); - }).then(function (res) { - expect(res.foo).to.be.equal('elma'); - return map.get('address'); - }).then(function (res) { - expect(res.street).to.be.equal('Sahibiata'); - expect(res.zipCode).to.be.equal(42000); - expect(res.city).to.be.equal('Konya'); - expect(res.state).to.be.equal('Turkey'); + const configBuilder = new ConfigBuilder(); + return configBuilder.loadConfig() + .then(() => { + const cfg = configBuilder.build(); + cfg.clusterName = cluster.id; + return Client.newHazelcastClient(cfg); + }) + .then(function (cl) { + client = cl; + var map; + return client.getMap('furkan').then(function (mp) { + map = mp; + return map.put('foo', new Foo("elma")); + }).then(function () { + return map.put('address', new Address('Sahibiata', 42000, 'Konya', 'Turkey')) + }).then(function () { + return map.get('foo'); + }).then(function (res) { + expect(res.foo).to.be.equal('elma'); + return map.get('address'); + }).then(function (res) { + expect(res.street).to.be.equal('Sahibiata'); + expect(res.zipCode).to.be.equal(42000); + expect(res.city).to.be.equal('Konya'); + expect(res.state).to.be.equal('Turkey'); + }); }); - }); }); }); diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index 10f1ac2fb..f9331f285 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -19,6 +19,7 @@ var Controller = require('./../RC'); var Util = require('./../Util'); var HazelcastClient = require("../../lib/index.js").Client; +var Config = require("../../lib/index.js").Config; var ItemEventType = require('../../lib/core/ItemListener').ItemEventType; describe("Set Proxy", function () { @@ -33,7 +34,9 @@ describe("Set Proxy", function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient().then(function (hazelcastClient) { + const config = new Config.ClientConfig(); + config.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -51,7 +54,7 @@ describe("Set Proxy", function () { after(function () { client.shutdown(); - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index e430579b7..b559ab9b4 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -25,7 +25,6 @@ var Config = require('../..').Config; var HzErrors = require('../..').HazelcastErrors; var markEnterprise = require('../Util').markEnterprise; var Path = require('path'); -var Util = require('../Util'); describe('SSL Client Authentication Test', function () { var cluster; @@ -56,15 +55,18 @@ describe('SSL Client Authentication Test', function () { cert: fs.readFileSync(Path.join(__dirname, cert)) }; var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + cfg.networkConfig.addresses.push('127.0.0.1:5701'); cfg.networkConfig.sslConfig.enabled = true; cfg.networkConfig.sslConfig.sslOptions = sslOpts; - cfg.networkConfig.connectionAttemptLimit = 1; - cfg.networkConfig.connectionTimeout = 1000; + cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 1000; return cfg; } function createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory(key, cert, ca) { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; + cfg.networkConfig.addresses.push('127.0.0.1:5701'); cfg.networkConfig.sslConfig.enabled = true; cfg.networkConfig.sslConfig.sslOptionsFactoryConfig = { exportedName: 'BasicSSLOptionsFactory' @@ -76,7 +78,7 @@ describe('SSL Client Authentication Test', function () { rejectUnauthorized: true, servername: 'foo.bar.com' }; - cfg.networkConfig.connectionAttemptLimit = 1; + cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 1000; return cfg; } @@ -93,11 +95,10 @@ describe('SSL Client Authentication Test', function () { before(function () { markEnterprise(this); - Util.markServerVersionAtLeast(this, null, '3.8.1'); }); afterEach(function () { - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); it('ma:required, they both know each other should connect', function () { diff --git a/test/ssl/ClientSSLTest.js b/test/ssl/ClientSSLTest.js index d43c2290e..8f176c502 100644 --- a/test/ssl/ClientSSLTest.js +++ b/test/ssl/ClientSSLTest.js @@ -20,7 +20,6 @@ var expect = chai.expect; var fs = require('fs'); var Promise = require('bluebird'); var path = require('path'); -var Util = require('../Util'); var markEnterprise = require('../Util').markEnterprise; var Controller = require('./../RC'); @@ -37,20 +36,18 @@ describe("Client with SSL enabled", function () { beforeEach(function () { this.timeout(20000); - markEnterprise(this); - Util.markServerVersionAtLeast(this, null, '3.8.1'); + //markEnterprise(this); serverConfig = fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8'); }); afterEach(function () { this.timeout(20000); - markEnterprise(this); - Util.markServerVersionAtLeast(this, null, '3.8.1'); + //markEnterprise(this); if (client) { client.shutdown(); client = null; } - return Controller.shutdownCluster(cluster.id); + return Controller.terminateCluster(cluster.id); }); function createCluster(sConfig) { @@ -66,7 +63,10 @@ describe("Client with SSL enabled", function () { .replace('[password]', 'password'); return createCluster(sConfig).then(function () { var clientConfig = new Config.ClientConfig(); + clientConfig.clusterName = cluster.id; clientConfig.networkConfig.sslConfig.enabled = true; + clientConfig.networkConfig.addresses.push('127.0.0.1:5701'); + clientConfig.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 1000; return expect(HazelcastClient.newHazelcastClient(clientConfig)).to.be.rejectedWith(Errors.IllegalStateError); }) }); @@ -77,7 +77,9 @@ describe("Client with SSL enabled", function () { .replace('[password]', '123456'); return createCluster(sConfig).then(function () { var clientConfig = new Config.ClientConfig(); + clientConfig.clusterName = cluster.id; clientConfig.networkConfig.sslConfig.enabled = true; + clientConfig.networkConfig.addresses.push('127.0.0.1:5701'); return HazelcastClient.newHazelcastClient(clientConfig); }).then(function (hazelcastClient) { client = hazelcastClient; diff --git a/test/ssl/hazelcast-ma-optional.xml b/test/ssl/hazelcast-ma-optional.xml index d8c3950e1..6524c8b6d 100644 --- a/test/ssl/hazelcast-ma-optional.xml +++ b/test/ssl/hazelcast-ma-optional.xml @@ -15,33 +15,11 @@ ~ limitations under the License. --> - - - dev - dev-pass - - http://localhost:8080/mancenter + - 5701 - - - 0 - - - - 224.7.7.7 - 54327 - - - 127.0.0.1 - - - 127.0.0.1 com.hazelcast.nio.ssl.ClasspathSSLContextFactory @@ -59,5 +37,4 @@ - diff --git a/test/ssl/hazelcast-ma-required.xml b/test/ssl/hazelcast-ma-required.xml index d1977aa91..c435f4ef6 100644 --- a/test/ssl/hazelcast-ma-required.xml +++ b/test/ssl/hazelcast-ma-required.xml @@ -15,33 +15,11 @@ ~ limitations under the License. --> - - - dev - dev-pass - - http://localhost:8080/mancenter + - 5701 - - - 0 - - - - 224.7.7.7 - 54327 - - - 127.0.0.1 - - - 127.0.0.1 com.hazelcast.nio.ssl.ClasspathSSLContextFactory @@ -59,5 +37,4 @@ - diff --git a/test/ssl/hazelcast-ssl.xml b/test/ssl/hazelcast-ssl.xml index 3ef39f0e1..1d248dec3 100644 --- a/test/ssl/hazelcast-ssl.xml +++ b/test/ssl/hazelcast-ssl.xml @@ -15,33 +15,11 @@ ~ limitations under the License. --> - - - dev - dev-pass - - http://localhost:8080/mancenter + - 5701 - - - 0 - - - - 224.7.7.7 - 54327 - - - 127.0.0.1 - - - 127.0.0.1 com.hazelcast.nio.ssl.ClasspathSSLContextFactory @@ -59,5 +37,4 @@ - diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index 447100d9e..2b11c6aaf 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -14,6 +14,7 @@ * limitations under the License. */ + var Statistics = require("../../lib/statistics/Statistics").Statistics; var expect = require('chai').expect; var BuildInfo = require('../../lib/BuildInfo').BuildInfo; @@ -32,13 +33,13 @@ describe('Statistics with default period', function () { var map; before(function () { - TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { return RC.startMember(cluster.id); }).then(function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; var ncc = new Config.NearCacheConfig(); ncc.name = 'nearCachedMap*'; ncc.invalidateOnChange = false; @@ -51,9 +52,8 @@ describe('Statistics with default period', function () { }); after(function () { - TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { @@ -86,9 +86,9 @@ describe('Statistics with default period', function () { expect(extractBooleanStatValue(stats, 'enterprise')).to.be.false; expect(extractStringStatValue(stats, 'clientType')).to.equal('NodeJS'); expect(extractStringStatValue(stats, 'clientVersion')).to.equal(BuildInfo.getClientVersion()); - var ownerConnection = client.getClusterService().getOwnerConnection(); - expect(extractIntStatValue(stats, 'clusterConnectionTimestamp')).to.equal(ownerConnection.getStartTime()); - expect(extractStringStatValue(stats, 'clientAddress')).to.equal(ownerConnection.getLocalAddress().toString()); + const connection = client.getConnectionManager().getRandomConnection(); + expect(extractIntStatValue(stats, 'clusterConnectionTimestamp')).to.equal(connection.getStartTime()); + expect(extractStringStatValue(stats, 'clientAddress')).to.equal(connection.getLocalAddress().toString()); expect(extractStringStatValue(stats, 'os.committedVirtualMemorySize')).to.equal(''); expect(extractStringStatValue(stats, 'os.freeSwapSpaceSize')).to.equal(''); expect(extractStringStatValue(stats, 'os.maxFileDescriptorCount')).to.equal(''); @@ -140,13 +140,13 @@ describe('Statistics with non-default period', function () { var client; before(function () { - TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { return RC.startMember(cluster.id); }).then(function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.statistics.enabled'] = true; cfg.properties['hazelcast.client.statistics.period.seconds'] = 2; return Client.newHazelcastClient(cfg).then(function (cl) { @@ -156,9 +156,8 @@ describe('Statistics with non-default period', function () { }); after(function () { - TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('should not change before period', function () { @@ -193,13 +192,13 @@ describe('Statistics with negative period', function () { var cluster; before(function () { - TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { return RC.startMember(cluster.id); }).then(function () { var cfg = new Config.ClientConfig(); + cfg.clusterName = cluster.id; cfg.properties['hazelcast.client.statistics.enabled'] = true; cfg.properties['hazelcast.client.statistics.period.seconds'] = -2; return Client.newHazelcastClient(cfg) @@ -209,9 +208,8 @@ describe('Statistics with negative period', function () { }); after(function () { - TestUtil.markServerVersionAtLeast(this, null, '3.9.0'); client.shutdown(); - return RC.shutdownCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('should be enabled via configuration', function () { @@ -224,14 +222,15 @@ describe('Statistics with negative period', function () { }); function getClientStatisticsFromServer(cluster, client) { - var clientUuid = client.getClusterService().uuid; + var clientUuid = client.getConnectionManager().getClientUuid(); var script = - 'clients=instance_0.getClientService().getConnectedClients().toArray()\n' + - 'for(i=0;i - - - + 3 10 diff --git a/test/unit/AddressHelperTest.js b/test/unit/AddressHelperTest.js new file mode 100644 index 000000000..8c123df9a --- /dev/null +++ b/test/unit/AddressHelperTest.js @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const AddressHelper = require('../../lib/Util').AddressHelper; +const expect = require('chai').expect; + +describe('AddressHelper', function () { + const v4Address = '127.0.0.1'; + const v6Address = '2001:0db8:85a3:0000:0000:8a2e:0370:7334'; + const port = 8080; + const defaultPort = 5701; + + it('should return a single address when the port is specified', function () { + const addresses = AddressHelper.getSocketAddresses(`${v4Address}:${port}`); + expect(addresses.length).to.equal(1); + + const address = addresses[0]; + expect(address.host).to.equal(v4Address); + expect(address.port).to.equal(port); + }); + + it('should return multiple addresses when the port is not specified', function () { + const addresses = AddressHelper.getSocketAddresses(`${v4Address}`); + expect(addresses.length).to.equal(3); + + for (let i = 0; i < 3; i++) { + expect(addresses[i].host).to.equal(v4Address); + expect(addresses[i].port).to.equal(defaultPort + i); + } + }); + + it('should return a single address when the port is specified with IPv6 address', function () { + const addresses = AddressHelper.getSocketAddresses(`[${v6Address}]:${port}`); + expect(addresses.length).to.equal(1); + + const address = addresses[0]; + expect(address.host).to.equal(v6Address); + expect(address.port).to.equal(port); + }); + + it('should return multiple addresses when the port is not specified with IPv6 address', function () { + const addresses = AddressHelper.getSocketAddresses(v6Address); + expect(addresses.length).to.equal(3); + + for (let i = 0; i < 3; i++) { + expect(addresses[i].host).to.equal(v6Address); + expect(addresses[i].port).to.equal(defaultPort + i); + } + }); +}); diff --git a/test/unit/LoadBalancerTest.js b/test/unit/LoadBalancerTest.js new file mode 100644 index 000000000..7dd17ad2d --- /dev/null +++ b/test/unit/LoadBalancerTest.js @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const RandomLB = require('../../lib').RandomLB; +const RoundRobinLB = require('../../lib').RoundRobinLB; +const expect = require('chai').expect; + +describe('LoadBalancerTest', function () { + + const mockMembers = [0, 1, 2]; + const mockCluster = { + addMembershipListener: function () {}, + getMembers: function () { + return mockMembers; + } + } + + it('RandomLB with no members', function () { + const lb = new RandomLB(); + const member = lb.next(); + expect(member).to.be.null; + }); + + it('RandomLB with members', function () { + const lb = new RandomLB(); + lb.initLoadBalancer(mockCluster); + lb.init(); + + const members = new Set(); + for (let i = 0; i < 10; i++) { + members.add(lb.next()); + } + + expect(members.size).to.be.below(4); + members.forEach((member) => { + expect(mockMembers).to.include(member); + }); + }); + + it('RoundRobinLB with no members', function () { + const lb = new RoundRobinLB(); + const member = lb.next(); + expect(member).to.be.null; + }); + + it('RoundRobinLB with members', function () { + const lb = new RoundRobinLB(); + lb.initLoadBalancer(mockCluster); + lb.init(); + + const members = []; + for (let i = 0; i < 10; i++) { + members.push(lb.next()); + } + + const firstMember = members[0]; + expect(mockMembers).to.include(firstMember); + + for (let i = 1; i < 10; i++) { + const member = members[i]; + expect(mockMembers[(firstMember + i) % mockMembers.length]).to.equal(member); + } + }); +}); diff --git a/test/unit/UuidTest.js b/test/unit/UuidTest.js new file mode 100644 index 000000000..c62af52cf --- /dev/null +++ b/test/unit/UuidTest.js @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const UUID = require('../../lib/core/UUID').UUID; +const expect = require('chai').expect; +const Long = require('long'); + +describe('UUID', function () { + it('with small most significant high bits', function () { + const uuid = new UUID(new Long(-99999, 1), new Long(213231, -213321)); + // Should pad first part with zeros + expect(uuid.toString()).to.equal("00000001-fffe-7961-fffc-beb7000340ef"); + }); + + it('with negative most significant high bits', function () { + const uuid = new UUID(new Long(123, -123), new Long(-213231, 213321)); + expect(uuid.toString()).to.equal("ffffff85-0000-007b-0003-4149fffcbf11"); + }); + + it('with small most significant low bits', function () { + const uuid = new UUID(new Long(941112, 91233112), new Long(213231, -213321)); + // Should pad second part with zeros + expect(uuid.toString()).to.equal("05701b58-000e-5c38-fffc-beb7000340ef"); + + const smallerUuid = new UUID(new Long(1112, 91233112), new Long(213231, -213321)); + // Should also pad third part with zeros + expect(smallerUuid.toString()).to.equal("05701b58-0000-0458-fffc-beb7000340ef"); + }); + + it('with negative most significant low bits', function () { + const uuid = new UUID(new Long(-941112, 91233112), new Long(213231, -213321)); + expect(uuid.toString()).to.equal("05701b58-fff1-a3c8-fffc-beb7000340ef"); + }); + + it('with small least significant high bits', function () { + const uuid = new UUID(new Long(-99999, 1), new Long(34561234, 912333)); + // Should pad fourth part with zeros + expect(uuid.toString()).to.equal("00000001-fffe-7961-000d-ebcd020f5cd2"); + + const smallerUuid = new UUID(new Long(-99999, 1), new Long(34561234, 33)); + // Should also pad beginning(first 4 chars) of fifth part with zeros + expect(smallerUuid.toString()).to.equal("00000001-fffe-7961-0000-0021020f5cd2"); + }); + + it('with negative least significant high bits', function () { + const uuid = new UUID(new Long(42, -42), new Long(56789123, -1)); + expect(uuid.toString()).to.equal("ffffffd6-0000-002a-ffff-ffff03628883"); + }); + + it('with small least significant low bits', function () { + const uuid = new UUID(new Long(56701010, -9123123), new Long(99, -42)); + // Should pad end(last 8 chars) of fifth part with zeros + expect(uuid.toString()).to.equal("ff74cacd-0361-3052-ffff-ffd600000063"); + }); + + it('with negative least significant low bits', function () { + const uuid = new UUID(new Long(-56701010, 9123123), new Long(-99, 42)); + expect(uuid.toString()).to.equal("008b3533-fc9e-cfae-0000-002affffff9d"); + }); +}); diff --git a/test/unit/protocol/ClientMessageFramingTest.js b/test/unit/protocol/ClientMessageFramingTest.js new file mode 100644 index 000000000..df0308999 --- /dev/null +++ b/test/unit/protocol/ClientMessageFramingTest.js @@ -0,0 +1,266 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const cm = require('../../../lib/ClientMessage'); +const expect = require('chai').expect; +const Buffer = require('safe-buffer').Buffer; +const Long = require('long'); +const HeapData = require('../../../lib/serialization/HeapData').HeapData; +const UUID = require('../../../lib/core/UUID').UUID; +const ErrorHolder = require('../../../lib/protocol/ErrorHolder').ErrorHolder; + +const FixSizedTypesCodec = require('../../../lib/codec/builtin/FixSizedTypesCodec').FixSizedTypesCodec; +const StringCodec = require('../../../lib/codec/builtin/StringCodec').StringCodec; +const ByteArrayCodec = require('../../../lib/codec/builtin/ByteArrayCodec').ByteArrayCodec; +const DataCodec = require('../../../lib/codec/builtin/DataCodec').DataCodec; +const EntryListCodec = require('../../../lib/codec/builtin/EntryListCodec').EntryListCodec; +const EntryListIntegerLongCodec = require('../../../lib/codec/builtin/EntryListIntegerLongCodec').EntryListIntegerLongCodec; +const EntryListIntegerUUIDCodec = require('../../../lib/codec/builtin/EntryListIntegerUUIDCodec').EntryListIntegerUUIDCodec; +const EntryListUUIDListIntegerCodec = require('../../../lib/codec/builtin/EntryListUUIDListIntegerCodec').EntryListUUIDListIntegerCodec; +const EntryListUUIDLongCodec = require('../../../lib/codec/builtin/EntryListUUIDLongCodec').EntryListUUIDLongCodec; +const ListMultiFrameCodec = require('../../../lib/codec/builtin/ListMultiFrameCodec').ListMultiFrameCodec; +const ErrorHolderCodec = require('../../../lib/codec/custom/ErrorHolderCodec').ErrorHolderCodec; +const ErrorsCodec = require('../../../lib/codec/builtin/ErrorsCodec').ErrorsCodec; +const ListIntegerCodec = require('../../../lib/codec/builtin/ListIntegerCodec').ListIntegerCodec; +const ListLongCodec = require('../../../lib/codec/builtin/ListLongCodec').ListLongCodec; +const ListUUIDCodec = require('../../../lib/codec/builtin/ListUUIDCodec').ListUUIDCodec; +const MapCodec = require('../../../lib/codec/builtin/MapCodec').MapCodec; +const CodecUtil = require('../../../lib/codec/builtin/CodecUtil').CodecUtil; + +describe('ClientMessageFramingTest', function () { + let message; + let buffer; + + beforeEach(function () { + buffer = Buffer.allocUnsafe(20); + message = new cm.ClientMessage.createForEncode(); + message.addFrame(new cm.Frame(buffer)); + }); + + it('encode/decode byte', function () { + FixSizedTypesCodec.encodeByte(buffer, 0, 3); + const content = message.nextFrame().content; + const decodedByte = FixSizedTypesCodec.decodeByte(content, 0); + expect(decodedByte).to.equal(3); + }); + + it('encode/decode boolean', function () { + FixSizedTypesCodec.encodeBoolean(buffer, 0, true); + const content = message.nextFrame().content; + const decodedBool = FixSizedTypesCodec.decodeBoolean(content, 0); + expect(decodedBool).to.equal(true); + }); + + it('encode/decode int', function () { + FixSizedTypesCodec.encodeInt(buffer, 0, 1234); + const content = message.nextFrame().content; + const decodedInt = FixSizedTypesCodec.decodeInt(content, 0); + expect(decodedInt).to.equal(1234); + }); + + it('encode/decode UUID', function () { + const uuid = new UUID(Long.fromNumber(0xCAFE), Long.fromNumber(0xBABE)); + FixSizedTypesCodec.encodeUUID(buffer, 0, uuid); + const content = message.nextFrame().content; + const decodedUuid = FixSizedTypesCodec.decodeUUID(content, 0); + expect(decodedUuid).to.deep.equal(uuid); + }); + + it('encode/decode number as long', function () { + FixSizedTypesCodec.encodeLong(buffer, 0, 12345678); + const content = message.nextFrame().content; + const decodedLong = FixSizedTypesCodec.decodeLong(content, 0); + expect(decodedLong.toNumber()).to.equal(12345678); + }); + + it('encode/decode Long as long', function () { + FixSizedTypesCodec.encodeLong(buffer, 0, Long.fromNumber(12345678)); + const content = message.nextFrame().content; + const decodedLong = FixSizedTypesCodec.decodeLong(content, 0); + expect(decodedLong.toNumber()).to.equal(12345678); + }); + + it('encode/decode buffer', function () { + const buf = Buffer.from('abc©☺𩸽'); + ByteArrayCodec.encode(message, buf); + // Initial frame + message.nextFrame(); + const decodedBuffer = ByteArrayCodec.decode(message); + expect(decodedBuffer).to.equal(buf); + }); + + it('encode/decode data', function () { + const data = new HeapData(Buffer.from('123456789')); + DataCodec.encode(message, data); + // Initial frame + message.nextFrame(); + const decodedData = DataCodec.decode(message); + expect(decodedData.toBuffer()).to.equal(data.toBuffer()); + }); + + it('encode/decode generic entry list', function () { + const entries = [['a', '1'], ['b', '2'], ['c', '3']]; + EntryListCodec.encode(message, entries, StringCodec.encode, StringCodec.encode); + EntryListCodec.encodeNullable(message, null, StringCodec.encode, StringCodec.encode); + // Initial frame + message.nextFrame(); + const decodedEntries = EntryListCodec.decode(message, StringCodec.decode, StringCodec.decode); + expect(decodedEntries).to.deep.equal(entries); + const nullEntry = EntryListCodec.decodeNullable(message, StringCodec.decode, StringCodec.decode); + expect(nullEntry).to.be.null; + }); + + it('encode/decode number-Long entry list', function () { + const entries = [[111, Long.fromNumber(-111)], [-222, Long.fromNumber(222)], [333, Long.fromNumber(-333)]]; + EntryListIntegerLongCodec.encode(message, entries); + // Initial frame + message.nextFrame(); + const decodedEntries = EntryListIntegerLongCodec.decode(message); + expect(decodedEntries).to.deep.equal(entries); + }); + + it('encode/decode number-UUID entry list', function () { + const uuid = new UUID(Long.fromNumber(0xCAFE), Long.fromNumber(0xBABE)); + const entries = [[1, uuid], [3, uuid], [5, uuid]]; + EntryListIntegerUUIDCodec.encode(message, entries); + // Initial frame + message.nextFrame(); + const decodedEntries = EntryListIntegerUUIDCodec.decode(message); + expect(decodedEntries).to.deep.equal(entries); + }); + + it('encode/decode UUID-number array entry list', function () { + const uuid = new UUID(Long.fromNumber(0xCAFE), Long.fromNumber(0xBABE)); + const entries = [[uuid, [1, 2]], [uuid, [3, 4]], [uuid, [5, 6]]]; + EntryListUUIDListIntegerCodec.encode(message, entries); + // Initial frame + message.nextFrame(); + const decodedEntries = EntryListUUIDListIntegerCodec.decode(message); + expect(decodedEntries).to.deep.equal(entries); + }); + + it('encode/decode UUID-Long entry list', function () { + const uuid = new UUID(Long.fromNumber(0xCAFE), Long.fromNumber(0xBABE)); + const entries = [[uuid, Long.fromNumber(1)], [uuid, Long.fromNumber(2)], [uuid, Long.fromNumber(3)]]; + EntryListUUIDLongCodec.encode(message, entries); + // Initial frame + message.nextFrame(); + const decodedEntries = EntryListUUIDLongCodec.decode(message); + expect(decodedEntries).to.deep.equal(entries); + }); + + it('decode server errors', function () { + const holder = new ErrorHolder(-12345, 'class', 'message', []); + ListMultiFrameCodec.encode(message, [holder], ErrorHolderCodec.encode); + const decodedErrors = ErrorsCodec.decode(message); + expect(decodedErrors).to.deep.equal([holder]); + }); + + it('encode/decode number array', function () { + const array = [0xCAFE, 0xBABE, -9999999]; + ListIntegerCodec.encode(message, array); + // Initial frame + message.nextFrame(); + const decodedArray = ListIntegerCodec.decode(message); + expect(decodedArray).to.deep.equal(array); + }); + + it('encode/decode Long array', function () { + const array = [Long.fromNumber(1), Long.fromNumber(-2), Long.fromNumber(555)]; + ListLongCodec.encode(message, array); + // Initial frame + message.nextFrame(); + const decodedArray = ListLongCodec.decode(message); + expect(decodedArray).to.deep.equal(array); + }); + + it('encode/decode generic array', function () { + const array = ['a', 'b', 'c']; + ListMultiFrameCodec.encode(message, array, StringCodec.encode); + // Initial frame + message.nextFrame(); + const decodedArray = ListMultiFrameCodec.decode(message, StringCodec.decode); + expect(decodedArray).to.deep.equal(array); + }); + + it('encode/decode UUID array', function () { + const uuid = new UUID(Long.fromNumber(0xCAFE), Long.fromNumber(0xBABE)); + const array = [uuid, uuid, uuid]; + ListUUIDCodec.encode(message, array); + // Initial frame + message.nextFrame(); + const decodedArray = ListUUIDCodec.decode(message); + expect(decodedArray).to.deep.equal(array); + }); + + it('encode/decode generic Map', function () { + const map = new Map(); + map.set('a', 'b'); + map.set('c', 'd'); + map.set('e', 'f'); + MapCodec.encode(message, map, StringCodec.encode, StringCodec.encode); + // Initial frame + message.nextFrame(); + const decodedMap = MapCodec.decode(message, StringCodec.decode, StringCodec.decode); + expect(decodedMap).to.deep.equal(map); + }); + + it('encode/decode string', function () { + const str = 'abc©☺𩸽🐶😁'; + StringCodec.encode(message, str); + // Initial frame + message.nextFrame(); + const decodedString = StringCodec.decode(message); + expect(decodedString).to.equal(str); + }); + + it('fastForwardToEndFrame ', function () { + const holder = new ErrorHolder(-12345, 'class', 'message', []); + ErrorHolderCodec.encode(message, holder); // Assuming a new error holder parameter is added to custom type + message.addFrame(cm.END_FRAME.copy()); + CodecUtil.fastForwardToEndFrame(message); + expect(message.peekNextFrame()).to.be.null; + }); + + it('encode/decode nullable', function () { + CodecUtil.encodeNullable(message, 'a', StringCodec.encode); + CodecUtil.encodeNullable(message, null, StringCodec.encode); + // Initial frame + message.nextFrame(); + const decodedString = CodecUtil.decodeNullable(message, StringCodec.decode); + expect(decodedString).to.equal('a'); + expect(CodecUtil.decodeNullable(message, StringCodec.decode)).to.be.null; + }); + + it('nextFrameIsDataStructureEndFrame', function () { + expect(CodecUtil.nextFrameIsDataStructureEndFrame(message)).to.be.false; + message.addFrame(cm.END_FRAME.copy()); + // Initial frame + message.nextFrame(); + expect(CodecUtil.nextFrameIsDataStructureEndFrame(message)).to.be.true; + }); + + it('nextFrameIsNullFrame', function () { + expect(CodecUtil.nextFrameIsNullFrame(message)).to.be.false; + message.addFrame(cm.NULL_FRAME.copy()); + // Initial frame + message.nextFrame(); + expect(CodecUtil.nextFrameIsNullFrame(message)).to.be.true; + expect(message.peekNextFrame()).to.be.null; + }); +}); diff --git a/test/unit/protocol/ClientMessageTest.js b/test/unit/protocol/ClientMessageTest.js new file mode 100644 index 000000000..630500f7c --- /dev/null +++ b/test/unit/protocol/ClientMessageTest.js @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const cm = require('../../../lib/ClientMessage'); +const expect = require('chai').expect; +const Buffer = require('safe-buffer').Buffer; +const Long = require('long'); +const CodecUtil = require('../../../lib/codec/builtin/CodecUtil').CodecUtil; + +const ClientMessage = cm.ClientMessage; +const Frame = cm.Frame; +const BEGIN_FRAME = cm.BEGIN_FRAME; +const END_FRAME = cm.END_FRAME; + + +describe('ClientMessage', function () { + it('should be encoded and decoded', function () { + const cmEncode = ClientMessage.createForEncode(); + + cmEncode.addFrame(Frame.createInitialFrame(50)); + cmEncode.setMessageType(1); + cmEncode.setCorrelationId(Long.fromString('1234567812345678')); + cmEncode.setPartitionId(11223344); + + const cmDecode = ClientMessage.createForDecode(cmEncode.startFrame); + + expect(cmEncode.getMessageType()).to.equal(cmDecode.getMessageType()); + expect(cmEncode.getHeaderFlags()).to.equal(cmDecode.getHeaderFlags()); + expect(cmEncode.getCorrelationId()).to.equal(cmDecode.getCorrelationId()); + expect(cmEncode.getPartitionId()).to.equal(cmDecode.getPartitionId()); + expect(cmEncode.getTotalFrameLength()).to.equal(cmDecode.getTotalFrameLength()); + }); + + it('should be copied with new correlation id and share the non-header frames', function () { + const originalMessage = ClientMessage.createForEncode(); + + originalMessage.addFrame(Frame.createInitialFrame(50)); + originalMessage.setMessageType(1); + originalMessage.setCorrelationId(Long.fromString('1234567812345678')); + originalMessage.setPartitionId(11223344); + originalMessage.setRetryable(true); + originalMessage.addFrame(Frame.createInitialFrame(20)); + + const copyMessage = originalMessage.copyWithNewCorrelationId(); + + // get the frame after the start frame for comparison + originalMessage.nextFrame(); + copyMessage.nextFrame(); + + const originalFrame = originalMessage.nextFrame(); + const copyFrame = copyMessage.nextFrame(); + + expect(originalFrame.content).to.equal(copyFrame.content); + expect(originalFrame.flags).to.equal(copyFrame.flags); + + expect(originalMessage.getMessageType()).to.equal(copyMessage.getMessageType()); + expect(originalMessage.getHeaderFlags()).to.equal(copyMessage.getHeaderFlags()); + expect(originalMessage.getPartitionId()).to.equal(copyMessage.getPartitionId()); + expect(originalMessage.getTotalFrameLength()).to.equal(copyMessage.getTotalFrameLength()); + expect(copyMessage.getCorrelationId()).to.equal(-1); + }); + + it('should be fast forwardable when extended', function () { + const clientMessage = ClientMessage.createForEncode(); + + clientMessage.addFrame(BEGIN_FRAME.copy()); + + // New custom-typed parameter with its own begin and end frames + clientMessage.addFrame(BEGIN_FRAME.copy()); + clientMessage.addFrame(new Frame(Buffer.allocUnsafe(0))); + clientMessage.addFrame(END_FRAME.copy()); + + clientMessage.addFrame(END_FRAME.copy()); + + // begin frame + clientMessage.nextFrame(); + CodecUtil.fastForwardToEndFrame(clientMessage); + + expect(clientMessage.hasNextFrame()).to.be.false; + }); +}); diff --git a/tslint.json b/tslint.json index d2a63957c..981efc8ca 100644 --- a/tslint.json +++ b/tslint.json @@ -56,6 +56,10 @@ true, "call-signature", "property-declaration" + ], + "variable-name": [ + true, + "allow-leading-underscore" ] } } From bc3ca900221161c718a7fde00717bc6c2c3c99e4 Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Fri, 19 Jun 2020 12:06:08 +0300 Subject: [PATCH 266/685] Remove StringSerializationPolicy (#532) IMDG 4.0 supports standard UTF-8 encoding/decoding out of the box. So, there is no need to have a configuration element for that. --- DOCUMENTATION.md | 25 --- config-schema.json | 7 - hazelcast-client-default.json | 1 - hazelcast-client-full.json | 1 - src/config/Config.ts | 3 - src/config/ConfigBuilder.ts | 4 - src/config/SerializationConfig.ts | 2 - src/config/StringSerializationPolicy.ts | 39 ---- src/index.ts | 2 - src/serialization/ObjectData.ts | 133 ++----------- src/serialization/SerializationService.ts | 9 +- test/declarative_config/ConfigBuilderTest.js | 2 - .../configurations/full.json | 3 +- test/serialization/DefaultSerializersTest.js | 26 +-- test/serialization/ObjectDataTest.js | 188 +++++++++--------- 15 files changed, 124 insertions(+), 321 deletions(-) delete mode 100644 src/config/StringSerializationPolicy.ts diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 193eec977..97b8deab8 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -29,7 +29,6 @@ * [4.3. Custom Serialization](#43-custom-serialization) * [4.4. Global Serialization](#44-global-serialization) * [4.5. JSON Serialization](#45-json-serialization) - * [4.6. String Serialization](#46-string-serialization) * [5. Setting Up Client Network](#5-setting-up-client-network) * [5.1. Providing Member Addresses](#51-providing-member-addresses) * [5.2. Setting Smart Routing](#52-setting-smart-routing) @@ -1160,30 +1159,6 @@ config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeseriali } ``` -## 4.6. String Serialization - -Starting from version v3.12 Hazelcast Node.js client follows UTF-8 standard (RFC 3629) for string data type serialization of 4 byte UTF characters, like less common CJK characters and emoji. This may lead to compatibility issues with Hazelcast IMDG 3.x and other client libraries for string and JSON values. Such issues are represented by `Malformed byte sequence` (error code 64) errors on members and other clients. - -In case if you encounter these error messages, you can switch to the legacy mode of string serialization that provides full compatibility with Hazelcast IMDG 3.x members and other client libraries. - -Below is the configuration required to use the legacy string serialization. - -**Programmatic Configuration:** - -```javascript -config.serializationConfig.stringSerializationPolicy = StringSerializationPolicy.LEGACY; -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "stringSerializationPolicy": "legacy" - } -} -``` - # 5. Setting Up Client Network All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let's first give the examples for these two approaches. Then we will look at its sub-elements and attributes. diff --git a/config-schema.json b/config-schema.json index 130fed9da..4626d9027 100644 --- a/config-schema.json +++ b/config-schema.json @@ -239,13 +239,6 @@ ], "default": "eager" }, - "stringSerialization": { - "enum": [ - "standard", - "legacy" - ], - "default": "standard" - }, "isBigEndian": { "type": "boolean", "default": false diff --git a/hazelcast-client-default.json b/hazelcast-client-default.json index 7c7d92c98..7ab40aa18 100644 --- a/hazelcast-client-default.json +++ b/hazelcast-client-default.json @@ -52,7 +52,6 @@ "defaultNumberType": "double", "isBigEndian": true, "jsonStringDeserializationPolicy": "eager", - "stringSerialization": "standard", "dataSerializableFactories": [], "portableFactories": [], "portableVersion": 0, diff --git a/hazelcast-client-full.json b/hazelcast-client-full.json index 69a9f5b6b..7f7157c4f 100644 --- a/hazelcast-client-full.json +++ b/hazelcast-client-full.json @@ -73,7 +73,6 @@ "defaultNumberType": "double", "isBigEndian": true, "jsonStringDeserializationPolicy": "eager", - "stringSerialization": "standard", "dataSerializableFactories": [ { "path": "path/to/file", diff --git a/src/config/Config.ts b/src/config/Config.ts index cff6c8b2d..3670b9a14 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -31,7 +31,6 @@ import {Statistics} from '../statistics/Statistics'; import {LogLevel} from '..'; import {ILogger} from '../logging/ILogger'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; -import {StringSerializationPolicy} from './StringSerializationPolicy'; import {ConnectionStrategyConfig, ReconnectMode} from './ConnectionStrategyConfig'; import {LoadBalancer} from '../LoadBalancer'; import {IndexConfig} from './IndexConfig'; @@ -158,8 +157,6 @@ export {SSLConfig}; export {JsonStringDeserializationPolicy}; -export {StringSerializationPolicy}; - export {IndexConfig}; export {IndexType}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 613fcb66a..f87f50d67 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -29,7 +29,6 @@ import {NearCacheConfig} from './NearCacheConfig'; import {Properties} from './Properties'; import {ReliableTopicConfig} from './ReliableTopicConfig'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; -import {StringSerializationPolicy} from './StringSerializationPolicy'; import {ReconnectMode} from './ConnectionStrategyConfig'; import {RandomLB} from '../util/RandomLB'; import {RoundRobinLB} from '../util/RoundRobinLB'; @@ -258,9 +257,6 @@ export class ConfigBuilder { } else if (key === 'jsonStringDeserializationPolicy') { this.clientConfig.serializationConfig .jsonStringDeserializationPolicy = tryGetEnum(JsonStringDeserializationPolicy, jsonObject[key]); - } else if (key === 'stringSerializationPolicy') { - this.clientConfig.serializationConfig - .stringSerializationPolicy = tryGetEnum(StringSerializationPolicy, jsonObject[key]); } } } diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index b9c1e0bd4..3f94345b8 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -17,7 +17,6 @@ import {IdentifiedDataSerializableFactory, PortableFactory} from '../serialization/Serializable'; import {ImportConfig} from './ImportConfig'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; -import {StringSerializationPolicy} from './StringSerializationPolicy'; export class SerializationConfig { defaultNumberType: string = 'double'; @@ -32,5 +31,4 @@ export class SerializationConfig { globalSerializer: any = null; globalSerializerConfig: ImportConfig = null; jsonStringDeserializationPolicy: JsonStringDeserializationPolicy = JsonStringDeserializationPolicy.EAGER; - stringSerializationPolicy: StringSerializationPolicy = StringSerializationPolicy.STANDARD; } diff --git a/src/config/StringSerializationPolicy.ts b/src/config/StringSerializationPolicy.ts deleted file mode 100644 index 65f0a7b7c..000000000 --- a/src/config/StringSerializationPolicy.ts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/** - * Using this policy, one can control the - * serialization type of strings. - */ -export enum StringSerializationPolicy { - /** - * Strings are serialized and deserialized - * according to UTF-8 standard (RFC 3629). - * - * May lead to server-side compatibility - * issues with IMDG 3.x for 4 byte characters, - * like less common CJK characters and emoji. - */ - STANDARD, - - /** - * 4 byte characters are represented as - * 6 bytes during serialization/deserialization - * (non-standard UTF-8). Provides full compatibility - * with IMDG 3.x members and other clients. - */ - LEGACY, -} diff --git a/src/index.ts b/src/index.ts index e10247fe7..23f8446e1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -37,7 +37,6 @@ import {EntryEvent} from './core/EntryListener'; import {LogLevel} from './logging/LoggingService'; import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializationPolicy'; import {HazelcastJsonValue} from './core/HazelcastJsonValue'; -import {StringSerializationPolicy} from './config/StringSerializationPolicy'; import {RoundRobinLB} from './util/RoundRobinLB'; import {RandomLB} from './util/RandomLB'; import { LoadBalancer } from './LoadBalancer'; @@ -69,7 +68,6 @@ export { LogLevel, JsonStringDeserializationPolicy, HazelcastJsonValue, - StringSerializationPolicy, LoadBalancer, AbstractLoadBalancer, RoundRobinLB, diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 2183b939c..3eb55eed2 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -31,15 +31,13 @@ const MASK_4BYTE = (1 << 32) - 1; export class ObjectDataOutput implements DataOutput { protected buffer: Buffer; protected bigEndian: boolean; - private standardUTF: boolean; private service: SerializationService; private pos: number; - constructor(service: SerializationService, isBigEndian: boolean, isStandardUTF: boolean) { + constructor(service: SerializationService, isBigEndian: boolean) { this.buffer = Buffer.allocUnsafe(OUTPUT_BUFFER_INITIAL_SIZE); this.service = service; this.bigEndian = isBigEndian; - this.standardUTF = isStandardUTF; this.pos = 0; } @@ -196,11 +194,15 @@ export class ObjectDataOutput implements DataOutput { } writeUTF(val: string): void { - if (this.standardUTF) { - this.writeUTFStandard(val); - } else { - this.writeUTFLegacy(val); + const len = (val != null) ? Buffer.byteLength(val, 'utf8') : BitsUtil.NULL_ARRAY_LENGTH; + this.writeInt(len); + if (len === BitsUtil.NULL_ARRAY_LENGTH) { + return; } + + this.ensureAvailable(len); + this.buffer.write(val, this.pos, this.pos + len, 'utf8'); + this.pos += len; } writeUTFArray(val: string[]): void { @@ -233,37 +235,6 @@ export class ObjectDataOutput implements DataOutput { arr.forEach(boundFunc); } } - - private writeUTFStandard(val: string): void { - const len = (val != null) ? Buffer.byteLength(val, 'utf8') : BitsUtil.NULL_ARRAY_LENGTH; - this.writeInt(len); - if (len === BitsUtil.NULL_ARRAY_LENGTH) { - return; - } - - this.ensureAvailable(len); - this.buffer.write(val, this.pos, this.pos + len, 'utf8'); - this.pos += len; - } - - private writeUTFLegacy(val: string): void { - const len = (val != null) ? val.length : BitsUtil.NULL_ARRAY_LENGTH; - this.writeInt(len); - this.ensureAvailable(len * 3); - for (let i = 0; i < len; i++) { - const ch = val.charCodeAt(i); - if (ch <= 0x007F) { - this.writeByte(ch); - } else if (ch <= 0x07FF) { - this.write(0xC0 | ch >> 6 & 0x1F); - this.write(0x80 | ch & 0x3F); - } else { - this.write(0xE0 | ch >> 12 & 0x0F); - this.write(0x80 | ch >> 6 & 0x3F); - this.write(0x80 | ch & 0x3F); - } - } - } } export class PositionalObjectDataOutput extends ObjectDataOutput implements PositionalDataOutput { @@ -324,16 +295,13 @@ export class ObjectDataInput implements DataInput { private offset: number; private service: SerializationService; private bigEndian: boolean; - private standardUTF: boolean; private pos: number; - constructor(buffer: Buffer, offset: number, serializationService: SerializationService, - isBigEndian: boolean, isStandardUTF: boolean) { + constructor(buffer: Buffer, offset: number, serializationService: SerializationService, isBigEndian: boolean) { this.buffer = buffer; this.offset = offset; this.service = serializationService; this.bigEndian = isBigEndian; - this.standardUTF = isStandardUTF; this.pos = this.offset; } @@ -497,11 +465,19 @@ export class ObjectDataInput implements DataInput { } readUTF(pos?: number): string { - if (this.standardUTF) { - return this.readUTFStandard(pos); - } else { - return this.readUTFLegacy(pos); + const len = this.readInt(pos); + const readPos = this.addOrUndefined(pos, 4) || this.pos; + if (len === BitsUtil.NULL_ARRAY_LENGTH) { + return null; + } + + const result = this.buffer.toString('utf8', readPos, readPos + len); + + if (pos === undefined) { + this.pos += len; } + + return result; } readUTFArray(pos?: number): string[] { @@ -547,71 +523,6 @@ export class ObjectDataInput implements DataInput { assert(pos + numOfBytes <= this.buffer.length); } - private readUTFLegacy(pos?: number): string { - const len = this.readInt(pos); - let readingIndex = this.addOrUndefined(pos, 4); - if (len === BitsUtil.NULL_ARRAY_LENGTH) { - return null; - } - let result: string = ''; - let leadingByte: number; - for (let i = 0; i < len; i++) { - let charCode: number; - leadingByte = this.readByte(readingIndex) & MASK_1BYTE; - readingIndex = this.addOrUndefined(readingIndex, 1); - - const b = leadingByte & 0xFF; - switch (b >> 4) { - /* tslint:disable:no-switch-case-fall-through */ - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - charCode = leadingByte; - break; - case 12: - case 13: - const first = (b & 0x1F) << 6; - const second = this.readByte(readingIndex) & 0x3F; - readingIndex = this.addOrUndefined(readingIndex, 1); - charCode = first | second; - break; - case 14: - const first2 = (b & 0x0F) << 12; - const second2 = (this.readByte(readingIndex) & 0x3F) << 6; - readingIndex = this.addOrUndefined(readingIndex, 1); - const third2 = this.readByte(readingIndex) & 0x3F; - readingIndex = this.addOrUndefined(readingIndex, 1); - charCode = (first2 | second2 | third2); - break; - default: - throw new RangeError('Malformed UTF8 string'); - } - result += String.fromCharCode(charCode); - } - return result; - } - - private readUTFStandard(pos?: number): string { - const len = this.readInt(pos); - const readPos = this.addOrUndefined(pos, 4) || this.pos; - if (len === BitsUtil.NULL_ARRAY_LENGTH) { - return null; - } - - const result = this.buffer.toString('utf8', readPos, readPos + len); - - if (pos === undefined) { - this.pos += len; - } - - return result; - } - private addOrUndefined(base: number, adder: number): number { if (base === undefined) { return undefined; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 1297635d7..7e6677bfc 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -56,7 +56,6 @@ import {PREDICATE_FACTORY_ID, PredicateFactory} from './PredicateFactory'; import {IdentifiedDataSerializableFactory} from './Serializable'; import HazelcastClient from '../HazelcastClient'; import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; -import {StringSerializationPolicy} from '../config/StringSerializationPolicy'; import {RestValueFactory, REST_VALUE_FACTORY_ID} from '../core/RestValue'; export interface SerializationService { @@ -83,13 +82,11 @@ export class SerializationServiceV1 implements SerializationService { private serializerNameToId: { [name: string]: number }; private numberType: string; private serializationConfig: SerializationConfig; - private isStandardUTF: boolean; private client: HazelcastClient; constructor(client: HazelcastClient, serializationConfig: SerializationConfig) { this.client = client; this.serializationConfig = serializationConfig; - this.isStandardUTF = this.serializationConfig.stringSerializationPolicy === StringSerializationPolicy.STANDARD; this.registry = {}; this.serializerNameToId = {}; this.registerDefaultSerializers(); @@ -109,8 +106,7 @@ export class SerializationServiceV1 implements SerializationService { if (this.isData(object)) { return object as Data; } - const dataOutput: DataOutput = - new PositionalObjectDataOutput(this, this.serializationConfig.isBigEndian, this.isStandardUTF); + const dataOutput = new PositionalObjectDataOutput(this, this.serializationConfig.isBigEndian); const serializer = this.findSerializerFor(object); // Check if object is partition aware if (object != null && object.getPartitionKey) { @@ -133,8 +129,7 @@ export class SerializationServiceV1 implements SerializationService { return data; } const serializer = this.findSerializerById(data.getType()); - const dataInput = - new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serializationConfig.isBigEndian, this.isStandardUTF); + const dataInput = new ObjectDataInput(data.toBuffer(), DATA_OFFSET, this, this.serializationConfig.isBigEndian); return serializer.read(dataInput); } diff --git a/test/declarative_config/ConfigBuilderTest.js b/test/declarative_config/ConfigBuilderTest.js index e0829bb63..bb6f48d60 100644 --- a/test/declarative_config/ConfigBuilderTest.js +++ b/test/declarative_config/ConfigBuilderTest.js @@ -124,8 +124,6 @@ describe('ConfigBuilder Test', function () { expect(serializationCfg.portableVersion).to.equal(1); expect(serializationCfg.jsonStringDeserializationPolicy) .to.equal(Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION); - expect(serializationCfg.stringSerializationPolicy) - .to.equal(Config.StringSerializationPolicy.LEGACY); expect(serializationCfg.dataSerializableFactoryConfigs[0].path).to.equal('path/to/file'); expect(serializationCfg.dataSerializableFactoryConfigs[0].exportedName).to.equal('exportedName'); diff --git a/test/declarative_config/configurations/full.json b/test/declarative_config/configurations/full.json index 8e6a653c5..6f2c037c6 100644 --- a/test/declarative_config/configurations/full.json +++ b/test/declarative_config/configurations/full.json @@ -102,8 +102,7 @@ "typeId": 3 } ], - "jsonStringDeserializationPolicy": "no_deserialization", - "stringSerializationPolicy": "legacy" + "jsonStringDeserializationPolicy": "no_deserialization" }, "nearCaches": [ { diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index b480c77e6..0a098558c 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -19,12 +19,10 @@ var Long = require('long'); var Config = require('../../.').Config; var SerializationService = require('../../lib/serialization/SerializationService'); var Predicates = require('../../.').Predicates; -var StringSerializationPolicy = require('../../.').StringSerializationPolicy; var RestValue = require('../../lib/core/RestValue').RestValue; describe('Default serializers Test', function () { - var isStandardUTFValues = [true, false]; var restValue = new RestValue(); restValue.value = '{"test":"data"}'; restValue.contentType = 'text/plain'; @@ -70,22 +68,14 @@ describe('Default serializers Test', function () { restValue ]; - isStandardUTFValues.forEach(function(isStandardUTF) { - parameters.forEach(function (obj) { - it( - 'type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) - + ', value: ' + JSON.stringify(obj) + ', isStandardUTF: ' + isStandardUTF, - function () { - var serializationConfig = new Config.ClientConfig().serializationConfig; - serializationConfig.stringSerializationPolicy = isStandardUTF - ? StringSerializationPolicy.STANDARD - : StringSerializationPolicy.LEGACY; - var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig); - var serialized = serializationService.toData(obj); - expect(serializationService.toObject(serialized)).to.deep.equal(obj); - } - ); - }); + parameters.forEach(function (obj) { + it('type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) + ', value: ' + JSON.stringify(obj), function () { + var serializationConfig = new Config.ClientConfig().serializationConfig; + var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig); + var serialized = serializationService.toData(obj); + expect(serializationService.toObject(serialized)).to.deep.equal(obj); + } + ); }); var defaultNumberTypes = [ diff --git a/test/serialization/ObjectDataTest.js b/test/serialization/ObjectDataTest.js index fb1598bb0..ecbae76ba 100644 --- a/test/serialization/ObjectDataTest.js +++ b/test/serialization/ObjectDataTest.js @@ -23,108 +23,102 @@ var ODOut = ObjectData.ObjectDataOutput; describe('ObjectData Test', function () { - var isStandardUTFValues = [true, false]; - - isStandardUTFValues.forEach(function(isStandardUTF) { - var out = new ODOut(null, true, isStandardUTF); - var label = ' - ' + (isStandardUTF ? 'standard' : 'legacy') + ' string serialization'; + var out = new ODOut(null, true); + before(function () { + out.write(15); + out.write(Buffer.from(['t'.charCodeAt(0), 'e'.charCodeAt(0), 's'.charCodeAt(0), 't'.charCodeAt(0)])); + out.writeBoolean(true); + out.writeBooleanArray([true, false, false, true, true]); + out.writeByte(255 | 0); + out.writeByteArray([0 | 0, 1 | 0, 65535 | 0]); + out.writeBytes('bytes'); + out.writeChar('∂'); + out.writeCharArray(['h', 'a', 'z', 'e', 'l']); + out.writeChars('cast'); + out.writeDouble(435437.23); + out.writeDoubleArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); + out.writeFloat(3.4); + out.writeFloatArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); + out.writeInt(9876543); + out.writeIntArray([1, -2, 0, 54]); + out.writeLong(new Long(255, 255)); + out.writeLongArray([new Long(255, 255), Long.fromNumber(-2)]); + out.writeShort(32767); + out.writeZeroBytes(6); + out.writeShortArray([-32768, 0, 32767]); + out.writeUTF('selamœ∑®ßåç∫˙˜'); + out.writeUTFArray([ + '', + 'istanbul', + 'üsküdar', + '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' + ]); + }); - before(function () { - out.write(15); - out.write(Buffer.from(['t'.charCodeAt(0), 'e'.charCodeAt(0), 's'.charCodeAt(0), 't'.charCodeAt(0)])); - out.writeBoolean(true); - out.writeBooleanArray([true, false, false, true, true]); - out.writeByte(255 | 0); - out.writeByteArray([0 | 0, 1 | 0, 65535 | 0]); - out.writeBytes('bytes'); - out.writeChar('∂'); - out.writeCharArray(['h', 'a', 'z', 'e', 'l']); - out.writeChars('cast'); - out.writeDouble(435437.23); - out.writeDoubleArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); - out.writeFloat(3.4); - out.writeFloatArray([21.2, 0, -34253.2, -436, 41, 0.444444444444444444]); - out.writeInt(9876543); - out.writeIntArray([1, -2, 0, 54]); - out.writeLong(new Long(255, 255)); - out.writeLongArray([new Long(255, 255), Long.fromNumber(-2)]); - out.writeShort(32767); - out.writeZeroBytes(6); - out.writeShortArray([-32768, 0, 32767]); - out.writeUTF('selamœ∑®ßåç∫˙˜'); - out.writeUTFArray([ - '', - 'istanbul', - 'üsküdar', - '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' - ]); + it('read', function () { + var inp = new ODInp(out.toBuffer(), 0, null, true); + expect(inp.read()).to.equal(15); + expect(inp.read()).to.equal('t'.charCodeAt(0)); + expect(inp.read()).to.equal('e'.charCodeAt(0)); + expect(inp.read()).to.equal('s'.charCodeAt(0)); + expect(inp.read()).to.equal('t'.charCodeAt(0)); + expect(inp.readBoolean()).to.be.true; + expect(inp.readBooleanArray()).to.deep.equal([true, false, false, true, true]); + expect(inp.readByte()).to.equal(255); + expect(inp.readByteArray()).to.deep.equal([0, 1, 255]); + var readBytes = []; + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + readBytes.push(inp.readByte()); + expect(String.fromCharCode.apply(null, readBytes)).to.equal('bytes'); + expect(inp.readChar()).to.equal('∂'); + expect(inp.readCharArray()).to.deep.equal(['h', 'a', 'z', 'e', 'l']); + expect(inp.readCharArray().join('')).to.equal('cast'); + expect(inp.readDouble()).to.equals(435437.23); + inp.readDoubleArray().forEach(function (fl, index) { + expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); }); - - it('read' + label, function () { - var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); - expect(inp.read()).to.equal(15); - expect(inp.read()).to.equal('t'.charCodeAt(0)); - expect(inp.read()).to.equal('e'.charCodeAt(0)); - expect(inp.read()).to.equal('s'.charCodeAt(0)); - expect(inp.read()).to.equal('t'.charCodeAt(0)); - expect(inp.readBoolean()).to.be.true; - expect(inp.readBooleanArray()).to.deep.equal([true, false, false, true, true]); - expect(inp.readByte()).to.equal(255); - expect(inp.readByteArray()).to.deep.equal([0, 1, 255]); - var readBytes = []; - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - expect(String.fromCharCode.apply(null, readBytes)).to.equal('bytes'); - expect(inp.readChar()).to.equal('∂'); - expect(inp.readCharArray()).to.deep.equal(['h', 'a', 'z', 'e', 'l']); - expect(inp.readCharArray().join('')).to.equal('cast'); - expect(inp.readDouble()).to.equals(435437.23); - inp.readDoubleArray().forEach(function (fl, index) { - expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); - }); - expect(inp.readFloat()).to.be.closeTo(3.4, 0.0001); - inp.readFloatArray().forEach(function (fl, index) { - expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); - }); - expect(inp.readInt()).to.equal(9876543); - expect(inp.readIntArray()).to.deep.equal([1, -2, 0, 54]); - expect(inp.readLong()).to.deep.equal(new Long(255, 255)); - expect(inp.readLongArray()).to.deep.equal([new Long(255, 255), new Long(4294967294, 4294967295)]); - expect(inp.readShort()).to.equal(32767); - inp.skipBytes(6); - expect(inp.readShortArray()).to.deep.equal([-32768, 0, 32767]); - expect(inp.readUTF()).to.equal('selamœ∑®ßåç∫˙˜'); - expect(inp.readUTFArray()).to.deep.equal([ - '', - 'istanbul', - 'üsküdar', - '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' - ]); - inp.reset(); - expect(inp.read()).to.equal(15); + expect(inp.readFloat()).to.be.closeTo(3.4, 0.0001); + inp.readFloatArray().forEach(function (fl, index) { + expect(fl).to.be.closeTo([21.2, 0, -34253.2, -436, 41, 0.444444444444444444][index], 0.001); }); + expect(inp.readInt()).to.equal(9876543); + expect(inp.readIntArray()).to.deep.equal([1, -2, 0, 54]); + expect(inp.readLong()).to.deep.equal(new Long(255, 255)); + expect(inp.readLongArray()).to.deep.equal([new Long(255, 255), new Long(4294967294, 4294967295)]); + expect(inp.readShort()).to.equal(32767); + inp.skipBytes(6); + expect(inp.readShortArray()).to.deep.equal([-32768, 0, 32767]); + expect(inp.readUTF()).to.equal('selamœ∑®ßåç∫˙˜'); + expect(inp.readUTFArray()).to.deep.equal([ + '', + 'istanbul', + 'üsküdar', + '∑@√≤¬µç√ç¨ç¬|¨®¨i$üsküdar fatih' + ]); + inp.reset(); + expect(inp.read()).to.equal(15); + }); - it('read from pos' + label, function () { - var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); - inp.read(); - expect(inp.read(0)).to.equal(15); - }); + it('read from pos', function () { + var inp = new ODInp(out.toBuffer(), 0, null, true); + inp.read(); + expect(inp.read(0)).to.equal(15); + }); - it('position' + label, function () { - var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); - inp.read(); - inp.position(0); - expect(inp.read()).to.equal(15); - }); + it('position', function () { + var inp = new ODInp(out.toBuffer(), 0, null, true); + inp.read(); + inp.position(0); + expect(inp.read()).to.equal(15); + }); - it('non integer position does not affect' + label, function () { - var inp = new ODInp(out.toBuffer(), 0, null, true, isStandardUTF); - inp.read(); - inp.position(0.5); - expect(inp.read()).to.equal('t'.charCodeAt(0)); - }); + it('non integer position does not affect', function () { + var inp = new ODInp(out.toBuffer(), 0, null, true); + inp.read(); + inp.position(0.5); + expect(inp.read()).to.equal('t'.charCodeAt(0)); }); }); From 1d5c363324e131faf403bf27941798e9dec3e88f Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Fri, 19 Jun 2020 18:10:59 +0300 Subject: [PATCH 267/685] Remove safe-buffer dependency (#533) We decided set the minimum supported Node.js version to 8. Therefore, there is no need to use safe-buffer polyfill for the missing methods. This PR removes this dependency. --- package.json | 6 ++++-- src/BitsUtil.ts | 2 -- src/ClientMessage.ts | 1 - src/codec/ClientAuthenticationCustomCodec.ts | 1 - src/codec/ClientStatisticsCodec.ts | 1 - src/codec/builtin/ByteArrayCodec.ts | 1 - src/codec/builtin/EntryListIntegerIntegerCodec.ts | 1 - src/codec/builtin/EntryListIntegerLongCodec.ts | 1 - src/codec/builtin/EntryListIntegerUUIDCodec.ts | 1 - src/codec/builtin/EntryListLongByteArrayCodec.ts | 1 - src/codec/builtin/EntryListUUIDLongCodec.ts | 1 - src/codec/builtin/EntryListUUIDUUIDCodec.ts | 1 - src/codec/builtin/FixSizedTypesCodec.ts | 1 - src/codec/builtin/ListIntegerCodec.ts | 1 - src/codec/builtin/ListLongCodec.ts | 1 - src/codec/builtin/ListUUIDCodec.ts | 1 - src/codec/builtin/StringCodec.ts | 1 - src/network/ClientConnection.ts | 1 - src/network/ClientConnectionManager.ts | 1 - src/serialization/Data.ts | 1 - src/serialization/HeapData.ts | 1 - src/serialization/ObjectData.ts | 1 - src/serialization/SerializationService.ts | 1 - src/statistics/Statistics.ts | 1 - test/connection/ClientMessageReaderTest.js | 1 - test/connection/DirectWriterTest.js | 1 - test/connection/FragmentedClientMessageHandlerTest.js | 1 - test/connection/PipelinedWriterTest.js | 1 - test/rest_value/RestValueTest.js | 1 - test/serialization/APortable.js | 2 -- test/serialization/AnIdentifiedDataSerializable.js | 2 -- test/serialization/BinaryCompatibilityTest.js | 1 - test/serialization/ObjectDataTest.js | 1 - test/serialization/ReferenceObjects.js | 1 - test/unit/protocol/ClientMessageFramingTest.js | 1 - test/unit/protocol/ClientMessageTest.js | 1 - 36 files changed, 4 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index 1e0c2b4a9..e8014d799 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "main": "lib/index.js", "dependencies": { "bluebird": "3.5.4", - "long": "3.2.0", - "safe-buffer": "5.1.2" + "long": "3.2.0" }, "devDependencies": { "@types/bluebird": "3.5.21", @@ -27,6 +26,9 @@ "typescript": "2.5.2", "winston": "2.3.1" }, + "engines": { + "node": ">=8" + }, "scripts": { "clean": "rimraf lib typings *.jar *.log", "compile": "tsc", diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index 402f9098d..0158a1567 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -15,8 +15,6 @@ */ /* tslint:disable:no-bitwise */ -import {Buffer} from 'safe-buffer'; - export class BitsUtil { static BYTE_SIZE_IN_BYTES: number = 1; static BOOLEAN_SIZE_IN_BYTES: number = 1; diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 177ac9bc1..1ec75ff03 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -15,7 +15,6 @@ */ /* tslint:disable:no-bitwise */ -import {Buffer} from 'safe-buffer'; import {BitsUtil} from './BitsUtil'; import {ClientConnection} from './network/ClientConnection'; import {FixSizedTypesCodec} from './codec/builtin/FixSizedTypesCodec'; diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 956f8adf6..8093d5ef6 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -21,7 +21,6 @@ import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} import {UUID} from '../core/UUID'; import {CodecUtil} from './builtin/CodecUtil'; import {StringCodec} from './builtin/StringCodec'; -import {Buffer} from 'safe-buffer'; import {ByteArrayCodec} from './builtin/ByteArrayCodec'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; import {Address} from '../Address'; diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts index 908d58823..077eb3954 100644 --- a/src/codec/ClientStatisticsCodec.ts +++ b/src/codec/ClientStatisticsCodec.ts @@ -20,7 +20,6 @@ import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; -import {Buffer} from 'safe-buffer'; import {ByteArrayCodec} from './builtin/ByteArrayCodec'; // hex: 0x000C00 diff --git a/src/codec/builtin/ByteArrayCodec.ts b/src/codec/builtin/ByteArrayCodec.ts index f526d48db..b78971488 100644 --- a/src/codec/builtin/ByteArrayCodec.ts +++ b/src/codec/builtin/ByteArrayCodec.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import {ClientMessage, Frame} from '../../ClientMessage'; export class ByteArrayCodec { diff --git a/src/codec/builtin/EntryListIntegerIntegerCodec.ts b/src/codec/builtin/EntryListIntegerIntegerCodec.ts index 20f6d9fa9..3306f2571 100644 --- a/src/codec/builtin/EntryListIntegerIntegerCodec.ts +++ b/src/codec/builtin/EntryListIntegerIntegerCodec.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, Frame} from '../../ClientMessage'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; diff --git a/src/codec/builtin/EntryListIntegerLongCodec.ts b/src/codec/builtin/EntryListIntegerLongCodec.ts index aa9a14215..c8f0eb14d 100644 --- a/src/codec/builtin/EntryListIntegerLongCodec.ts +++ b/src/codec/builtin/EntryListIntegerLongCodec.ts @@ -16,7 +16,6 @@ import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, Frame} from '../../ClientMessage'; -import {Buffer} from 'safe-buffer'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; import * as Long from 'long'; diff --git a/src/codec/builtin/EntryListIntegerUUIDCodec.ts b/src/codec/builtin/EntryListIntegerUUIDCodec.ts index f741f7792..e269e8433 100644 --- a/src/codec/builtin/EntryListIntegerUUIDCodec.ts +++ b/src/codec/builtin/EntryListIntegerUUIDCodec.ts @@ -16,7 +16,6 @@ import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, Frame} from '../../ClientMessage'; -import {Buffer} from 'safe-buffer'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; import {UUID} from '../../core/UUID'; diff --git a/src/codec/builtin/EntryListLongByteArrayCodec.ts b/src/codec/builtin/EntryListLongByteArrayCodec.ts index 5e522f6bf..3b1947860 100644 --- a/src/codec/builtin/EntryListLongByteArrayCodec.ts +++ b/src/codec/builtin/EntryListLongByteArrayCodec.ts @@ -16,7 +16,6 @@ import {BEGIN_FRAME, ClientMessage, END_FRAME} from '../../ClientMessage'; import * as Long from 'long'; -import {Buffer} from 'safe-buffer'; import {ByteArrayCodec} from './ByteArrayCodec'; import {ListLongCodec} from './ListLongCodec'; import {ListMultiFrameCodec} from './ListMultiFrameCodec'; diff --git a/src/codec/builtin/EntryListUUIDLongCodec.ts b/src/codec/builtin/EntryListUUIDLongCodec.ts index b4fe8304f..bbcc23820 100644 --- a/src/codec/builtin/EntryListUUIDLongCodec.ts +++ b/src/codec/builtin/EntryListUUIDLongCodec.ts @@ -18,7 +18,6 @@ import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, Frame} from '../../ClientMessage'; import {UUID} from '../../core/UUID'; import * as Long from 'long'; -import {Buffer} from 'safe-buffer'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; const ENTRY_SIZE_IN_BYTES = BitsUtil.UUID_SIZE_IN_BYTES + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/builtin/EntryListUUIDUUIDCodec.ts b/src/codec/builtin/EntryListUUIDUUIDCodec.ts index 4695eedaa..00c39d1f0 100644 --- a/src/codec/builtin/EntryListUUIDUUIDCodec.ts +++ b/src/codec/builtin/EntryListUUIDUUIDCodec.ts @@ -17,7 +17,6 @@ import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, Frame} from '../../ClientMessage'; import {UUID} from '../../core/UUID'; -import {Buffer} from 'safe-buffer'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; const ENTRY_SIZE_IN_BYTES = BitsUtil.UUID_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/builtin/FixSizedTypesCodec.ts b/src/codec/builtin/FixSizedTypesCodec.ts index 6658233ac..ed9e701bc 100644 --- a/src/codec/builtin/FixSizedTypesCodec.ts +++ b/src/codec/builtin/FixSizedTypesCodec.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import * as Long from 'long'; import {BitsUtil} from '../../BitsUtil'; import {UUID} from '../../core/UUID'; diff --git a/src/codec/builtin/ListIntegerCodec.ts b/src/codec/builtin/ListIntegerCodec.ts index e18510dbf..ba7474dfa 100644 --- a/src/codec/builtin/ListIntegerCodec.ts +++ b/src/codec/builtin/ListIntegerCodec.ts @@ -16,7 +16,6 @@ import {ClientMessage, Frame} from '../../ClientMessage'; import {BitsUtil} from '../../BitsUtil'; -import {Buffer} from 'safe-buffer'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; export class ListIntegerCodec { diff --git a/src/codec/builtin/ListLongCodec.ts b/src/codec/builtin/ListLongCodec.ts index c96702de7..1d49649f7 100644 --- a/src/codec/builtin/ListLongCodec.ts +++ b/src/codec/builtin/ListLongCodec.ts @@ -17,7 +17,6 @@ import {ClientMessage, Frame} from '../../ClientMessage'; import * as Long from 'long'; import {BitsUtil} from '../../BitsUtil'; -import {Buffer} from 'safe-buffer'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; export class ListLongCodec { diff --git a/src/codec/builtin/ListUUIDCodec.ts b/src/codec/builtin/ListUUIDCodec.ts index e4afa0b68..f9e1a7a63 100644 --- a/src/codec/builtin/ListUUIDCodec.ts +++ b/src/codec/builtin/ListUUIDCodec.ts @@ -17,7 +17,6 @@ import {ClientMessage, Frame} from '../../ClientMessage'; import {UUID} from '../../core/UUID'; import {BitsUtil} from '../../BitsUtil'; -import {Buffer} from 'safe-buffer'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; export class ListUUIDCodec { diff --git a/src/codec/builtin/StringCodec.ts b/src/codec/builtin/StringCodec.ts index 610a9b8d1..d081b87bf 100644 --- a/src/codec/builtin/StringCodec.ts +++ b/src/codec/builtin/StringCodec.ts @@ -15,7 +15,6 @@ */ import {ClientMessage, Frame} from '../../ClientMessage'; -import {Buffer} from 'safe-buffer'; export class StringCodec { static encode(clientMessage: ClientMessage, value: string): void { diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index f685ce22e..1a4c6c192 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import * as Promise from 'bluebird'; import * as net from 'net'; import {EventEmitter} from 'events'; diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index b65dc11b6..958a8aea3 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import HazelcastClient from '../HazelcastClient'; diff --git a/src/serialization/Data.ts b/src/serialization/Data.ts index 27d09504a..594ab4f34 100644 --- a/src/serialization/Data.ts +++ b/src/serialization/Data.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import * as Long from 'long'; export interface Data { diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index c1bfb6b09..2380dea6b 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import murmur = require('../invocation/Murmur'); import {Data} from './Data'; diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 3eb55eed2..037ea6e9b 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -15,7 +15,6 @@ */ /* tslint:disable:no-bitwise */ -import {Buffer} from 'safe-buffer'; import * as assert from 'assert'; import * as Long from 'long'; import {BitsUtil} from '../BitsUtil'; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 7e6677bfc..f63ed6ba8 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {Buffer} from 'safe-buffer'; import {AggregatorFactory} from '../aggregation/AggregatorFactory'; import {ClusterDataFactory} from '../ClusterDataFactory'; import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts index ec157afc0..e9051ad32 100644 --- a/src/statistics/Statistics.ts +++ b/src/statistics/Statistics.ts @@ -24,7 +24,6 @@ import * as os from 'os'; import {BuildInfo} from '../BuildInfo'; import {ILogger} from '../logging/ILogger'; import * as Long from 'long'; -import {Buffer} from 'safe-buffer'; /** * This class is the main entry point for collecting and sending the client diff --git a/test/connection/ClientMessageReaderTest.js b/test/connection/ClientMessageReaderTest.js index 3a34e4535..d560dd45d 100644 --- a/test/connection/ClientMessageReaderTest.js +++ b/test/connection/ClientMessageReaderTest.js @@ -16,7 +16,6 @@ 'use strict'; -const Buffer = require('safe-buffer').Buffer; const expect = require('chai').expect; const ClientMessageReader = require('../../lib/network/ClientConnection').ClientMessageReader; diff --git a/test/connection/DirectWriterTest.js b/test/connection/DirectWriterTest.js index f15ca1954..568a44e00 100644 --- a/test/connection/DirectWriterTest.js +++ b/test/connection/DirectWriterTest.js @@ -16,7 +16,6 @@ 'use strict'; -const Buffer = require('safe-buffer').Buffer; const Socket = require('net').Socket; const sinon = require('sinon'); const expect = require('chai').expect; diff --git a/test/connection/FragmentedClientMessageHandlerTest.js b/test/connection/FragmentedClientMessageHandlerTest.js index 5c65e37cd..03845f135 100644 --- a/test/connection/FragmentedClientMessageHandlerTest.js +++ b/test/connection/FragmentedClientMessageHandlerTest.js @@ -16,7 +16,6 @@ 'use strict'; -const Buffer = require('safe-buffer').Buffer; const expect = require('chai').expect; const crypto = require('crypto'); diff --git a/test/connection/PipelinedWriterTest.js b/test/connection/PipelinedWriterTest.js index 263ea57f5..e0c7db6e9 100644 --- a/test/connection/PipelinedWriterTest.js +++ b/test/connection/PipelinedWriterTest.js @@ -16,7 +16,6 @@ 'use strict'; -const Buffer = require('safe-buffer').Buffer; const Socket = require('net').Socket; const sinon = require('sinon'); const expect = require('chai').expect; diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js index 91de53e0b..f3c2b3502 100644 --- a/test/rest_value/RestValueTest.js +++ b/test/rest_value/RestValueTest.js @@ -24,7 +24,6 @@ const fs = require('fs'); const http = require('http'); const querystring = require('querystring'); const DeferredPromise = require('../../lib/Util').DeferredPromise; -const Buffer = require('safe-buffer').Buffer; describe('RestValueTest', function () { diff --git a/test/serialization/APortable.js b/test/serialization/APortable.js index ea6a3d736..856dcb26b 100644 --- a/test/serialization/APortable.js +++ b/test/serialization/APortable.js @@ -14,8 +14,6 @@ * limitations under the License. */ -var Buffer = require('safe-buffer').Buffer; - function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, doubles, shorts, floats, ints, longs, strings, portables, identifiedDataSerializable, customStreamSerializableObject, customByteArraySerializableObject, data) { if (arguments.length === 0) return; diff --git a/test/serialization/AnIdentifiedDataSerializable.js b/test/serialization/AnIdentifiedDataSerializable.js index 496447ce2..2dc4d8ab0 100644 --- a/test/serialization/AnIdentifiedDataSerializable.js +++ b/test/serialization/AnIdentifiedDataSerializable.js @@ -14,8 +14,6 @@ * limitations under the License. */ -var Buffer = require('safe-buffer').Buffer; - function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, doubles, shorts, floats, ints , longs, strings, portable, identifiedDataSerializable, customStreamSerializable, customByteArraySerializableObject, data) { if (arguments.length === 0) return; diff --git a/test/serialization/BinaryCompatibilityTest.js b/test/serialization/BinaryCompatibilityTest.js index 13f30f8c0..f01d75b39 100644 --- a/test/serialization/BinaryCompatibilityTest.js +++ b/test/serialization/BinaryCompatibilityTest.js @@ -14,7 +14,6 @@ * limitations under the License. */ -var Buffer = require('safe-buffer').Buffer; var fs = require('fs'); var ObjectDataInput = require('../../lib/serialization/ObjectData').ObjectDataInput; var HeapData = require('../../lib/serialization/HeapData').HeapData; diff --git a/test/serialization/ObjectDataTest.js b/test/serialization/ObjectDataTest.js index ecbae76ba..e5fcdfc63 100644 --- a/test/serialization/ObjectDataTest.js +++ b/test/serialization/ObjectDataTest.js @@ -14,7 +14,6 @@ * limitations under the License. */ -var Buffer = require('safe-buffer').Buffer; var expect = require('chai').expect; var Long = require('long'); var ObjectData = require('../../lib/serialization/ObjectData'); diff --git a/test/serialization/ReferenceObjects.js b/test/serialization/ReferenceObjects.js index 7245397ce..63ee35e66 100644 --- a/test/serialization/ReferenceObjects.js +++ b/test/serialization/ReferenceObjects.js @@ -14,7 +14,6 @@ * limitations under the License. */ -var Buffer = require('safe-buffer').Buffer; var Long = require('long'); var AnInnerPortable = require('./AnInnerPortable'); var AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); diff --git a/test/unit/protocol/ClientMessageFramingTest.js b/test/unit/protocol/ClientMessageFramingTest.js index df0308999..2f10763f5 100644 --- a/test/unit/protocol/ClientMessageFramingTest.js +++ b/test/unit/protocol/ClientMessageFramingTest.js @@ -18,7 +18,6 @@ const cm = require('../../../lib/ClientMessage'); const expect = require('chai').expect; -const Buffer = require('safe-buffer').Buffer; const Long = require('long'); const HeapData = require('../../../lib/serialization/HeapData').HeapData; const UUID = require('../../../lib/core/UUID').UUID; diff --git a/test/unit/protocol/ClientMessageTest.js b/test/unit/protocol/ClientMessageTest.js index 630500f7c..c0c4388eb 100644 --- a/test/unit/protocol/ClientMessageTest.js +++ b/test/unit/protocol/ClientMessageTest.js @@ -18,7 +18,6 @@ const cm = require('../../../lib/ClientMessage'); const expect = require('chai').expect; -const Buffer = require('safe-buffer').Buffer; const Long = require('long'); const CodecUtil = require('../../../lib/codec/builtin/CodecUtil').CodecUtil; From 0fb29190ddb170222a90014f260de8b2f30d942b Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Tue, 23 Jun 2020 10:49:09 +0300 Subject: [PATCH 268/685] Improve ListenerServiceTest (#547) * Improve ListenerServiceTest There were some small additions done in #546. This PR ports these changes to master. * fix typo in scripts --- scripts/dev-test-rc.sh | 6 +++--- scripts/download-rc.bat | 6 +++--- scripts/download-rc.sh | 6 +++--- test/ListenerServiceTest.js | 16 +++++++--------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 4e1ed617a..23827930f 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -21,10 +21,10 @@ fi if [[ ${HZ_TEST_VERSION} == *-SNAPSHOT ]] then TEST_REPO=${SNAPSHOT_REPO} - ENTRERPRISE_TEST_REPO=${ENTERPRISE_SNAPSHOT_REPO} + ENTERPRISE_TEST_REPO=${ENTERPRISE_SNAPSHOT_REPO} else TEST_REPO=${RELEASE_REPO} - ENTRERPRISE_TEST_REPO=${ENTERPRISE_RELEASE_REPO} + ENTERPRISE_TEST_REPO=${ENTERPRISE_RELEASE_REPO} fi if [ -f "hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar" ]; then @@ -65,7 +65,7 @@ if [ -n "${HAZELCAST_ENTERPRISE_KEY}" ]; then echo "hazelcast-enterprise-tests.jar already exists, not downloading from maven." else echo "Downloading: hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" - mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTRERPRISE_TEST_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar + mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTERPRISE_TEST_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar if [ $? -ne 0 ]; then echo "Failed to download hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" exit 1 diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 521343f3c..17e8bf30d 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -21,10 +21,10 @@ if errorlevel 1 ( echo %HZ_TEST_VERSION% | findstr /r ".*-SNAPSHOT" >nul 2>&1 if errorlevel 1 ( set TEST_REPO=%RELEASE_REPO% - set ENTRERPRISE_TEST_REPO=%ENTERPRISE_RELEASE_REPO% + set ENTERPRISE_TEST_REPO=%ENTERPRISE_RELEASE_REPO% ) else ( set TEST_REPO=%SNAPSHOT_REPO% - set ENTRERPRISE_TEST_REPO=%ENTERPRISE_SNAPSHOT_REPO% + set ENTERPRISE_TEST_REPO=%ENTERPRISE_SNAPSHOT_REPO% ) if exist hazelcast-remote-controller-%HAZELCAST_RC_VERSION%.jar ( @@ -67,7 +67,7 @@ if defined HAZELCAST_ENTERPRISE_KEY ( echo hazelcast-enterprise-test.jar already exists, not downloading from maven. ) else ( echo Downloading: hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:%HAZELCAST_ENTERPRISE_VERSION%:jar:tests - call mvn -q dependency:get -DrepoUrl=%ENTRERPRISE_TEST_REPO% -Dartifact=com.hazelcast:hazelcast-enterprise:%HAZELCAST_TEST_VERSION%:jar:tests -Ddest=hazelcast-enterprise-%HAZELCAST_TEST_VERSION%-tests.jar + call mvn -q dependency:get -DrepoUrl=%ENTERPRISE_TEST_REPO% -Dartifact=com.hazelcast:hazelcast-enterprise:%HAZELCAST_TEST_VERSION%:jar:tests -Ddest=hazelcast-enterprise-%HAZELCAST_TEST_VERSION%-tests.jar if errorlevel 1 ( echo Failed download hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:%HAZELCAST_TEST_VERSION%:jar:tests exit 1 diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 54e5525af..19504cb42 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -23,10 +23,10 @@ fi if [[ ${HZ_TEST_VERSION} == *-SNAPSHOT ]] then TEST_REPO=${SNAPSHOT_REPO} - ENTRERPRISE_TEST_REPO=${ENTERPRISE_SNAPSHOT_REPO} + ENTERPRISE_TEST_REPO=${ENTERPRISE_SNAPSHOT_REPO} else TEST_REPO=${RELEASE_REPO} - ENTRERPRISE_TEST_REPO=${ENTERPRISE_RELEASE_REPO} + ENTERPRISE_TEST_REPO=${ENTERPRISE_RELEASE_REPO} fi if [ -f "hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar" ]; then @@ -69,7 +69,7 @@ if [ -n "${HAZELCAST_ENTERPRISE_KEY}" ]; then echo "hazelcast-enterprise-tests.jar already exists, not downloading from maven." else echo "Downloading: hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" - mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTRERPRISE_TEST_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar + mvn -q org.apache.maven.plugins:maven-dependency-plugin:2.8:get -DrepoUrl=${ENTERPRISE_TEST_REPO} -Dartifact=com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests -Ddest=hazelcast-enterprise-${HAZELCAST_TEST_VERSION}-tests.jar if [ $? -ne 0 ]; then echo "Failed to download hazelcast enterprise test jar com.hazelcast:hazelcast-enterprise:${HAZELCAST_TEST_VERSION}:jar:tests" exit 1 diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index fb4c6ff2d..910c78a17 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -53,20 +53,17 @@ var Util = require('./Util'); }); it('listener is invoked when a new object is created', function (done) { - var map; var listenerId; client.addDistributedObjectListener(function (distributedObjectEvent) { expect(distributedObjectEvent.objectName).to.eq('mapToListen'); expect(distributedObjectEvent.serviceName).to.eq('hz:impl:mapService'); expect(distributedObjectEvent.eventType).to.eq('created'); - client.removeDistributedObjectListener(listenerId); - done(); + client.removeDistributedObjectListener(listenerId).then(function () { + done(); + }); }).then(function (id) { listenerId = id; - client.getMap('mapToListen').then(function (mp) { - map = mp; - map.destroy(); - }); + client.getMap('mapToListen'); }); }); @@ -78,8 +75,9 @@ var Util = require('./Util'); expect(distributedObjectEvent.objectName).to.eq('mapToRemove'); expect(distributedObjectEvent.serviceName).to.eq('hz:impl:mapService'); expect(distributedObjectEvent.eventType).to.eq('destroyed'); - client.removeDistributedObjectListener(listenerId); - done(); + client.removeDistributedObjectListener(listenerId).then(function () { + done(); + }); } else if (distributedObjectEvent.eventType === 'created' && distributedObjectEvent.objectName === 'mapToRemove') { Util.promiseWaitMilliseconds(1000).then(function () { map.destroy(); From c4d58e6968caa8af92bf50b4fd0461dd3b310bcc Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Mon, 20 Jul 2020 11:25:50 +0300 Subject: [PATCH 269/685] Remove unused codes from codecs (#545) --- src/codec/ClientAddClusterViewListenerCodec.ts | 2 +- src/codec/ClientAddDistributedObjectListenerCodec.ts | 2 +- src/codec/ClientAddPartitionLostListenerCodec.ts | 3 +-- src/codec/ClientAuthenticationCodec.ts | 4 ++-- src/codec/ClientAuthenticationCustomCodec.ts | 4 ++-- src/codec/ClientCreateProxiesCodec.ts | 2 +- src/codec/ClientCreateProxyCodec.ts | 2 +- src/codec/ClientDeployClassesCodec.ts | 2 +- src/codec/ClientDestroyProxyCodec.ts | 2 +- src/codec/ClientGetDistributedObjectsCodec.ts | 2 +- src/codec/ClientLocalBackupListenerCodec.ts | 2 +- src/codec/ClientPingCodec.ts | 2 +- src/codec/ClientRemoveDistributedObjectListenerCodec.ts | 2 +- src/codec/ClientRemovePartitionLostListenerCodec.ts | 2 +- src/codec/ClientStatisticsCodec.ts | 2 +- src/codec/ClientTriggerPartitionAssignmentCodec.ts | 2 +- src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 2 +- src/codec/ListAddAllCodec.ts | 2 +- src/codec/ListAddAllWithIndexCodec.ts | 2 +- src/codec/ListAddCodec.ts | 2 +- src/codec/ListAddListenerCodec.ts | 2 +- src/codec/ListAddWithIndexCodec.ts | 2 +- src/codec/ListClearCodec.ts | 2 +- src/codec/ListCompareAndRemoveAllCodec.ts | 2 +- src/codec/ListCompareAndRetainAllCodec.ts | 2 +- src/codec/ListContainsAllCodec.ts | 2 +- src/codec/ListContainsCodec.ts | 2 +- src/codec/ListGetAllCodec.ts | 2 +- src/codec/ListGetCodec.ts | 2 +- src/codec/ListIndexOfCodec.ts | 2 +- src/codec/ListIsEmptyCodec.ts | 2 +- src/codec/ListIteratorCodec.ts | 2 +- src/codec/ListLastIndexOfCodec.ts | 2 +- src/codec/ListListIteratorCodec.ts | 2 +- src/codec/ListRemoveCodec.ts | 2 +- src/codec/ListRemoveListenerCodec.ts | 2 +- src/codec/ListRemoveWithIndexCodec.ts | 2 +- src/codec/ListSetCodec.ts | 2 +- src/codec/ListSizeCodec.ts | 2 +- src/codec/ListSubCodec.ts | 2 +- src/codec/MapAddEntryListenerCodec.ts | 2 +- src/codec/MapAddEntryListenerToKeyCodec.ts | 2 +- src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts | 2 +- src/codec/MapAddEntryListenerWithPredicateCodec.ts | 2 +- src/codec/MapAddIndexCodec.ts | 2 +- src/codec/MapAddInterceptorCodec.ts | 2 +- src/codec/MapAddNearCacheInvalidationListenerCodec.ts | 2 +- src/codec/MapAddPartitionLostListenerCodec.ts | 2 +- src/codec/MapAggregateCodec.ts | 2 +- src/codec/MapAggregateWithPredicateCodec.ts | 2 +- src/codec/MapClearCodec.ts | 2 +- src/codec/MapContainsKeyCodec.ts | 2 +- src/codec/MapContainsValueCodec.ts | 2 +- src/codec/MapDeleteCodec.ts | 2 +- src/codec/MapEntriesWithPagingPredicateCodec.ts | 2 +- src/codec/MapEntriesWithPredicateCodec.ts | 2 +- src/codec/MapEntrySetCodec.ts | 2 +- src/codec/MapEventJournalReadCodec.ts | 2 +- src/codec/MapEventJournalSubscribeCodec.ts | 2 +- src/codec/MapEvictAllCodec.ts | 2 +- src/codec/MapEvictCodec.ts | 2 +- src/codec/MapExecuteOnAllKeysCodec.ts | 2 +- src/codec/MapExecuteOnKeyCodec.ts | 2 +- src/codec/MapExecuteOnKeysCodec.ts | 2 +- src/codec/MapExecuteWithPredicateCodec.ts | 2 +- src/codec/MapFetchEntriesCodec.ts | 2 +- src/codec/MapFetchKeysCodec.ts | 2 +- src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts | 2 +- src/codec/MapFetchWithQueryCodec.ts | 2 +- src/codec/MapFlushCodec.ts | 2 +- src/codec/MapForceUnlockCodec.ts | 2 +- src/codec/MapGetAllCodec.ts | 2 +- src/codec/MapGetCodec.ts | 2 +- src/codec/MapGetEntryViewCodec.ts | 2 +- src/codec/MapIsEmptyCodec.ts | 2 +- src/codec/MapIsLockedCodec.ts | 2 +- src/codec/MapKeySetCodec.ts | 2 +- src/codec/MapKeySetWithPagingPredicateCodec.ts | 2 +- src/codec/MapKeySetWithPredicateCodec.ts | 2 +- src/codec/MapLoadAllCodec.ts | 2 +- src/codec/MapLoadGivenKeysCodec.ts | 2 +- src/codec/MapLockCodec.ts | 2 +- src/codec/MapProjectCodec.ts | 2 +- src/codec/MapProjectWithPredicateCodec.ts | 2 +- src/codec/MapPutAllCodec.ts | 2 +- src/codec/MapPutCodec.ts | 2 +- src/codec/MapPutIfAbsentCodec.ts | 2 +- src/codec/MapPutIfAbsentWithMaxIdleCodec.ts | 2 +- src/codec/MapPutTransientCodec.ts | 2 +- src/codec/MapPutTransientWithMaxIdleCodec.ts | 2 +- src/codec/MapPutWithMaxIdleCodec.ts | 2 +- src/codec/MapRemoveAllCodec.ts | 2 +- src/codec/MapRemoveCodec.ts | 2 +- src/codec/MapRemoveEntryListenerCodec.ts | 2 +- src/codec/MapRemoveIfSameCodec.ts | 2 +- src/codec/MapRemoveInterceptorCodec.ts | 2 +- src/codec/MapRemovePartitionLostListenerCodec.ts | 2 +- src/codec/MapReplaceCodec.ts | 2 +- src/codec/MapReplaceIfSameCodec.ts | 2 +- src/codec/MapSetCodec.ts | 2 +- src/codec/MapSetTtlCodec.ts | 2 +- src/codec/MapSetWithMaxIdleCodec.ts | 2 +- src/codec/MapSizeCodec.ts | 2 +- src/codec/MapSubmitToKeyCodec.ts | 2 +- src/codec/MapTryLockCodec.ts | 2 +- src/codec/MapTryPutCodec.ts | 2 +- src/codec/MapTryRemoveCodec.ts | 2 +- src/codec/MapUnlockCodec.ts | 2 +- src/codec/MapValuesCodec.ts | 2 +- src/codec/MapValuesWithPagingPredicateCodec.ts | 2 +- src/codec/MapValuesWithPredicateCodec.ts | 2 +- src/codec/MultiMapAddEntryListenerCodec.ts | 2 +- src/codec/MultiMapAddEntryListenerToKeyCodec.ts | 2 +- src/codec/MultiMapClearCodec.ts | 2 +- src/codec/MultiMapContainsEntryCodec.ts | 2 +- src/codec/MultiMapContainsKeyCodec.ts | 2 +- src/codec/MultiMapContainsValueCodec.ts | 2 +- src/codec/MultiMapDeleteCodec.ts | 2 +- src/codec/MultiMapEntrySetCodec.ts | 2 +- src/codec/MultiMapForceUnlockCodec.ts | 2 +- src/codec/MultiMapGetCodec.ts | 2 +- src/codec/MultiMapIsLockedCodec.ts | 2 +- src/codec/MultiMapKeySetCodec.ts | 2 +- src/codec/MultiMapLockCodec.ts | 2 +- src/codec/MultiMapPutCodec.ts | 2 +- src/codec/MultiMapRemoveCodec.ts | 2 +- src/codec/MultiMapRemoveEntryCodec.ts | 2 +- src/codec/MultiMapRemoveEntryListenerCodec.ts | 2 +- src/codec/MultiMapSizeCodec.ts | 2 +- src/codec/MultiMapTryLockCodec.ts | 2 +- src/codec/MultiMapUnlockCodec.ts | 2 +- src/codec/MultiMapValueCountCodec.ts | 2 +- src/codec/MultiMapValuesCodec.ts | 2 +- src/codec/PNCounterAddCodec.ts | 2 +- src/codec/PNCounterGetCodec.ts | 2 +- src/codec/PNCounterGetConfiguredReplicaCountCodec.ts | 2 +- src/codec/QueueAddAllCodec.ts | 2 +- src/codec/QueueAddListenerCodec.ts | 2 +- src/codec/QueueClearCodec.ts | 2 +- src/codec/QueueCompareAndRemoveAllCodec.ts | 2 +- src/codec/QueueCompareAndRetainAllCodec.ts | 2 +- src/codec/QueueContainsAllCodec.ts | 2 +- src/codec/QueueContainsCodec.ts | 2 +- src/codec/QueueDrainToCodec.ts | 2 +- src/codec/QueueDrainToMaxSizeCodec.ts | 2 +- src/codec/QueueIsEmptyCodec.ts | 2 +- src/codec/QueueIteratorCodec.ts | 2 +- src/codec/QueueOfferCodec.ts | 2 +- src/codec/QueuePeekCodec.ts | 2 +- src/codec/QueuePollCodec.ts | 2 +- src/codec/QueuePutCodec.ts | 2 +- src/codec/QueueRemainingCapacityCodec.ts | 2 +- src/codec/QueueRemoveCodec.ts | 2 +- src/codec/QueueRemoveListenerCodec.ts | 2 +- src/codec/QueueSizeCodec.ts | 2 +- src/codec/QueueTakeCodec.ts | 2 +- src/codec/ReplicatedMapAddEntryListenerCodec.ts | 2 +- src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts | 2 +- .../ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts | 2 +- src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts | 2 +- src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts | 2 +- src/codec/ReplicatedMapClearCodec.ts | 2 +- src/codec/ReplicatedMapContainsKeyCodec.ts | 2 +- src/codec/ReplicatedMapContainsValueCodec.ts | 2 +- src/codec/ReplicatedMapEntrySetCodec.ts | 2 +- src/codec/ReplicatedMapGetCodec.ts | 2 +- src/codec/ReplicatedMapIsEmptyCodec.ts | 2 +- src/codec/ReplicatedMapKeySetCodec.ts | 2 +- src/codec/ReplicatedMapPutAllCodec.ts | 2 +- src/codec/ReplicatedMapPutCodec.ts | 2 +- src/codec/ReplicatedMapRemoveCodec.ts | 2 +- src/codec/ReplicatedMapRemoveEntryListenerCodec.ts | 2 +- src/codec/ReplicatedMapSizeCodec.ts | 2 +- src/codec/ReplicatedMapValuesCodec.ts | 2 +- src/codec/RingbufferAddAllCodec.ts | 2 +- src/codec/RingbufferAddCodec.ts | 2 +- src/codec/RingbufferCapacityCodec.ts | 2 +- src/codec/RingbufferHeadSequenceCodec.ts | 2 +- src/codec/RingbufferReadManyCodec.ts | 2 +- src/codec/RingbufferReadOneCodec.ts | 2 +- src/codec/RingbufferRemainingCapacityCodec.ts | 2 +- src/codec/RingbufferSizeCodec.ts | 2 +- src/codec/RingbufferTailSequenceCodec.ts | 2 +- src/codec/SetAddAllCodec.ts | 2 +- src/codec/SetAddCodec.ts | 2 +- src/codec/SetAddListenerCodec.ts | 2 +- src/codec/SetClearCodec.ts | 2 +- src/codec/SetCompareAndRemoveAllCodec.ts | 2 +- src/codec/SetCompareAndRetainAllCodec.ts | 2 +- src/codec/SetContainsAllCodec.ts | 2 +- src/codec/SetContainsCodec.ts | 2 +- src/codec/SetGetAllCodec.ts | 2 +- src/codec/SetIsEmptyCodec.ts | 2 +- src/codec/SetRemoveCodec.ts | 2 +- src/codec/SetRemoveListenerCodec.ts | 2 +- src/codec/SetSizeCodec.ts | 2 +- src/codec/TopicAddMessageListenerCodec.ts | 2 +- src/codec/TopicPublishCodec.ts | 2 +- src/codec/TopicRemoveMessageListenerCodec.ts | 2 +- src/codec/TransactionCommitCodec.ts | 2 +- src/codec/TransactionCreateCodec.ts | 2 +- src/codec/TransactionRollbackCodec.ts | 2 +- src/codec/TransactionalListAddCodec.ts | 2 +- src/codec/TransactionalListRemoveCodec.ts | 2 +- src/codec/TransactionalListSizeCodec.ts | 2 +- src/codec/TransactionalMapContainsKeyCodec.ts | 2 +- src/codec/TransactionalMapContainsValueCodec.ts | 2 +- src/codec/TransactionalMapDeleteCodec.ts | 2 +- src/codec/TransactionalMapGetCodec.ts | 2 +- src/codec/TransactionalMapGetForUpdateCodec.ts | 2 +- src/codec/TransactionalMapIsEmptyCodec.ts | 2 +- src/codec/TransactionalMapKeySetCodec.ts | 2 +- src/codec/TransactionalMapKeySetWithPredicateCodec.ts | 2 +- src/codec/TransactionalMapPutCodec.ts | 2 +- src/codec/TransactionalMapPutIfAbsentCodec.ts | 2 +- src/codec/TransactionalMapRemoveCodec.ts | 2 +- src/codec/TransactionalMapRemoveIfSameCodec.ts | 2 +- src/codec/TransactionalMapReplaceCodec.ts | 2 +- src/codec/TransactionalMapReplaceIfSameCodec.ts | 2 +- src/codec/TransactionalMapSetCodec.ts | 2 +- src/codec/TransactionalMapSizeCodec.ts | 2 +- src/codec/TransactionalMapValuesCodec.ts | 2 +- src/codec/TransactionalMapValuesWithPredicateCodec.ts | 2 +- src/codec/TransactionalMultiMapGetCodec.ts | 2 +- src/codec/TransactionalMultiMapPutCodec.ts | 2 +- src/codec/TransactionalMultiMapRemoveCodec.ts | 2 +- src/codec/TransactionalMultiMapRemoveEntryCodec.ts | 2 +- src/codec/TransactionalMultiMapSizeCodec.ts | 2 +- src/codec/TransactionalMultiMapValueCountCodec.ts | 2 +- src/codec/TransactionalQueueOfferCodec.ts | 2 +- src/codec/TransactionalQueuePeekCodec.ts | 2 +- src/codec/TransactionalQueuePollCodec.ts | 2 +- src/codec/TransactionalQueueSizeCodec.ts | 2 +- src/codec/TransactionalQueueTakeCodec.ts | 2 +- src/codec/TransactionalSetAddCodec.ts | 2 +- src/codec/TransactionalSetRemoveCodec.ts | 2 +- src/codec/TransactionalSetSizeCodec.ts | 2 +- 237 files changed, 239 insertions(+), 240 deletions(-) diff --git a/src/codec/ClientAddClusterViewListenerCodec.ts b/src/codec/ClientAddClusterViewListenerCodec.ts index 0f1b1c07e..939cc16bf 100644 --- a/src/codec/ClientAddClusterViewListenerCodec.ts +++ b/src/codec/ClientAddClusterViewListenerCodec.ts @@ -27,7 +27,7 @@ import {UUID} from '../core/UUID'; // hex: 0x000300 const REQUEST_MESSAGE_TYPE = 768; // hex: 0x000301 -const RESPONSE_MESSAGE_TYPE = 769; +// RESPONSE_MESSAGE_TYPE = 769 // hex: 0x000302 const EVENT_MEMBERS_VIEW_MESSAGE_TYPE = 770; // hex: 0x000303 diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index c7318826c..ffe34f8f9 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x000900 const REQUEST_MESSAGE_TYPE = 2304; // hex: 0x000901 -const RESPONSE_MESSAGE_TYPE = 2305; +// RESPONSE_MESSAGE_TYPE = 2305 // hex: 0x000902 const EVENT_DISTRIBUTED_OBJECT_MESSAGE_TYPE = 2306; diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 7ac49efd6..345f123bf 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -19,12 +19,11 @@ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; import {UUID} from '../core/UUID'; -import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x000600 const REQUEST_MESSAGE_TYPE = 1536; // hex: 0x000601 -const RESPONSE_MESSAGE_TYPE = 1537; +// RESPONSE_MESSAGE_TYPE = 1537 // hex: 0x000602 const EVENT_PARTITION_LOST_MESSAGE_TYPE = 1538; diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index ee3d861b0..2f0c4a218 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -19,8 +19,8 @@ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; import {UUID} from '../core/UUID'; -import {CodecUtil} from './builtin/CodecUtil'; import {StringCodec} from './builtin/StringCodec'; +import {CodecUtil} from './builtin/CodecUtil'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; import {Address} from '../Address'; import {AddressCodec} from './custom/AddressCodec'; @@ -28,7 +28,7 @@ import {AddressCodec} from './custom/AddressCodec'; // hex: 0x000100 const REQUEST_MESSAGE_TYPE = 256; // hex: 0x000101 -const RESPONSE_MESSAGE_TYPE = 257; +// RESPONSE_MESSAGE_TYPE = 257 const REQUEST_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_SERIALIZATION_VERSION_OFFSET = REQUEST_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 8093d5ef6..456f6d95e 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -19,17 +19,17 @@ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; import {UUID} from '../core/UUID'; -import {CodecUtil} from './builtin/CodecUtil'; import {StringCodec} from './builtin/StringCodec'; import {ByteArrayCodec} from './builtin/ByteArrayCodec'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; import {Address} from '../Address'; import {AddressCodec} from './custom/AddressCodec'; +import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x000200 const REQUEST_MESSAGE_TYPE = 512; // hex: 0x000201 -const RESPONSE_MESSAGE_TYPE = 513; +// RESPONSE_MESSAGE_TYPE = 513 const REQUEST_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_SERIALIZATION_VERSION_OFFSET = REQUEST_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/ClientCreateProxiesCodec.ts b/src/codec/ClientCreateProxiesCodec.ts index 62d30775f..fcab2237b 100644 --- a/src/codec/ClientCreateProxiesCodec.ts +++ b/src/codec/ClientCreateProxiesCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x000E00 const REQUEST_MESSAGE_TYPE = 3584; // hex: 0x000E01 -const RESPONSE_MESSAGE_TYPE = 3585; +// RESPONSE_MESSAGE_TYPE = 3585 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ClientCreateProxyCodec.ts b/src/codec/ClientCreateProxyCodec.ts index 81d8fc39f..a0c2e5a0e 100644 --- a/src/codec/ClientCreateProxyCodec.ts +++ b/src/codec/ClientCreateProxyCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x000400 const REQUEST_MESSAGE_TYPE = 1024; // hex: 0x000401 -const RESPONSE_MESSAGE_TYPE = 1025; +// RESPONSE_MESSAGE_TYPE = 1025 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index 4b8fea707..4c8d6362e 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -24,7 +24,7 @@ import {ByteArrayCodec} from './builtin/ByteArrayCodec'; // hex: 0x000D00 const REQUEST_MESSAGE_TYPE = 3328; // hex: 0x000D01 -const RESPONSE_MESSAGE_TYPE = 3329; +// RESPONSE_MESSAGE_TYPE = 3329 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ClientDestroyProxyCodec.ts b/src/codec/ClientDestroyProxyCodec.ts index 184046746..d091a4b23 100644 --- a/src/codec/ClientDestroyProxyCodec.ts +++ b/src/codec/ClientDestroyProxyCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x000500 const REQUEST_MESSAGE_TYPE = 1280; // hex: 0x000501 -const RESPONSE_MESSAGE_TYPE = 1281; +// RESPONSE_MESSAGE_TYPE = 1281 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index 9428c87ba..254cdbbc6 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -24,7 +24,7 @@ import {DistributedObjectInfoCodec} from './custom/DistributedObjectInfoCodec'; // hex: 0x000800 const REQUEST_MESSAGE_TYPE = 2048; // hex: 0x000801 -const RESPONSE_MESSAGE_TYPE = 2049; +// RESPONSE_MESSAGE_TYPE = 2049 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ClientLocalBackupListenerCodec.ts b/src/codec/ClientLocalBackupListenerCodec.ts index c97059148..79d8de3c8 100644 --- a/src/codec/ClientLocalBackupListenerCodec.ts +++ b/src/codec/ClientLocalBackupListenerCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x000F00 const REQUEST_MESSAGE_TYPE = 3840; // hex: 0x000F01 -const RESPONSE_MESSAGE_TYPE = 3841; +// RESPONSE_MESSAGE_TYPE = 3841 // hex: 0x000F02 const EVENT_BACKUP_MESSAGE_TYPE = 3842; diff --git a/src/codec/ClientPingCodec.ts b/src/codec/ClientPingCodec.ts index 52cd51d07..9f371b703 100644 --- a/src/codec/ClientPingCodec.ts +++ b/src/codec/ClientPingCodec.ts @@ -21,7 +21,7 @@ import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; // hex: 0x000B00 const REQUEST_MESSAGE_TYPE = 2816; // hex: 0x000B01 -const RESPONSE_MESSAGE_TYPE = 2817; +// RESPONSE_MESSAGE_TYPE = 2817 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index 88c3867a4..2fdf5c94d 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -23,7 +23,7 @@ import {UUID} from '../core/UUID'; // hex: 0x000A00 const REQUEST_MESSAGE_TYPE = 2560; // hex: 0x000A01 -const RESPONSE_MESSAGE_TYPE = 2561; +// RESPONSE_MESSAGE_TYPE = 2561 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index 04f3bfc66..6663aae49 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -23,7 +23,7 @@ import {UUID} from '../core/UUID'; // hex: 0x000700 const REQUEST_MESSAGE_TYPE = 1792; // hex: 0x000701 -const RESPONSE_MESSAGE_TYPE = 1793; +// RESPONSE_MESSAGE_TYPE = 1793 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts index 077eb3954..c385fc7b3 100644 --- a/src/codec/ClientStatisticsCodec.ts +++ b/src/codec/ClientStatisticsCodec.ts @@ -25,7 +25,7 @@ import {ByteArrayCodec} from './builtin/ByteArrayCodec'; // hex: 0x000C00 const REQUEST_MESSAGE_TYPE = 3072; // hex: 0x000C01 -const RESPONSE_MESSAGE_TYPE = 3073; +// RESPONSE_MESSAGE_TYPE = 3073 const REQUEST_TIMESTAMP_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMESTAMP_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/ClientTriggerPartitionAssignmentCodec.ts b/src/codec/ClientTriggerPartitionAssignmentCodec.ts index cd687a4b3..b5ab94fdb 100644 --- a/src/codec/ClientTriggerPartitionAssignmentCodec.ts +++ b/src/codec/ClientTriggerPartitionAssignmentCodec.ts @@ -21,7 +21,7 @@ import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; // hex: 0x001000 const REQUEST_MESSAGE_TYPE = 4096; // hex: 0x001001 -const RESPONSE_MESSAGE_TYPE = 4097; +// RESPONSE_MESSAGE_TYPE = 4097 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts index 65d1ecf28..08f50dd02 100644 --- a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x1C0100 const REQUEST_MESSAGE_TYPE = 1835264; // hex: 0x1C0101 -const RESPONSE_MESSAGE_TYPE = 1835265; +// RESPONSE_MESSAGE_TYPE = 1835265 const REQUEST_BATCH_SIZE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 14c8b784d..01e6dcbb8 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050600 const REQUEST_MESSAGE_TYPE = 329216; // hex: 0x050601 -const RESPONSE_MESSAGE_TYPE = 329217; +// RESPONSE_MESSAGE_TYPE = 329217 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index 9e628ba94..c7f8fb8f9 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050E00 const REQUEST_MESSAGE_TYPE = 331264; // hex: 0x050E01 -const RESPONSE_MESSAGE_TYPE = 331265; +// RESPONSE_MESSAGE_TYPE = 331265 const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index 68d0b2f64..a660906ca 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050400 const REQUEST_MESSAGE_TYPE = 328704; // hex: 0x050401 -const RESPONSE_MESSAGE_TYPE = 328705; +// RESPONSE_MESSAGE_TYPE = 328705 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index 5e0f497d4..484ce33f2 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x050B00 const REQUEST_MESSAGE_TYPE = 330496; // hex: 0x050B01 -const RESPONSE_MESSAGE_TYPE = 330497; +// RESPONSE_MESSAGE_TYPE = 330497 // hex: 0x050B02 const EVENT_ITEM_MESSAGE_TYPE = 330498; diff --git a/src/codec/ListAddWithIndexCodec.ts b/src/codec/ListAddWithIndexCodec.ts index c129083f7..7a3771e75 100644 --- a/src/codec/ListAddWithIndexCodec.ts +++ b/src/codec/ListAddWithIndexCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x051100 const REQUEST_MESSAGE_TYPE = 332032; // hex: 0x051101 -const RESPONSE_MESSAGE_TYPE = 332033; +// RESPONSE_MESSAGE_TYPE = 332033 const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListClearCodec.ts b/src/codec/ListClearCodec.ts index f9fdaff65..201996abf 100644 --- a/src/codec/ListClearCodec.ts +++ b/src/codec/ListClearCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x050900 const REQUEST_MESSAGE_TYPE = 329984; // hex: 0x050901 -const RESPONSE_MESSAGE_TYPE = 329985; +// RESPONSE_MESSAGE_TYPE = 329985 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index bafde2cc7..7a302cdfc 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050700 const REQUEST_MESSAGE_TYPE = 329472; // hex: 0x050701 -const RESPONSE_MESSAGE_TYPE = 329473; +// RESPONSE_MESSAGE_TYPE = 329473 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 27a241256..91876d140 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050800 const REQUEST_MESSAGE_TYPE = 329728; // hex: 0x050801 -const RESPONSE_MESSAGE_TYPE = 329729; +// RESPONSE_MESSAGE_TYPE = 329729 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index 4a39b02af..632659c45 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050300 const REQUEST_MESSAGE_TYPE = 328448; // hex: 0x050301 -const RESPONSE_MESSAGE_TYPE = 328449; +// RESPONSE_MESSAGE_TYPE = 328449 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index 289a6c655..316c406fa 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050200 const REQUEST_MESSAGE_TYPE = 328192; // hex: 0x050201 -const RESPONSE_MESSAGE_TYPE = 328193; +// RESPONSE_MESSAGE_TYPE = 328193 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index 3f4c40bcc..dc262ebf4 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050A00 const REQUEST_MESSAGE_TYPE = 330240; // hex: 0x050A01 -const RESPONSE_MESSAGE_TYPE = 330241; +// RESPONSE_MESSAGE_TYPE = 330241 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index 1f11125ae..cae4a3cd0 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -26,7 +26,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x050F00 const REQUEST_MESSAGE_TYPE = 331520; // hex: 0x050F01 -const RESPONSE_MESSAGE_TYPE = 331521; +// RESPONSE_MESSAGE_TYPE = 331521 const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index 809ab1a9e..1d376fcd4 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x051400 const REQUEST_MESSAGE_TYPE = 332800; // hex: 0x051401 -const RESPONSE_MESSAGE_TYPE = 332801; +// RESPONSE_MESSAGE_TYPE = 332801 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index 2b754ce5a..28f88ed0c 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x050D00 const REQUEST_MESSAGE_TYPE = 331008; // hex: 0x050D01 -const RESPONSE_MESSAGE_TYPE = 331009; +// RESPONSE_MESSAGE_TYPE = 331009 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 587c618f6..8060a824f 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x051600 const REQUEST_MESSAGE_TYPE = 333312; // hex: 0x051601 -const RESPONSE_MESSAGE_TYPE = 333313; +// RESPONSE_MESSAGE_TYPE = 333313 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index f4d96ac2e..a36d20047 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x051300 const REQUEST_MESSAGE_TYPE = 332544; // hex: 0x051301 -const RESPONSE_MESSAGE_TYPE = 332545; +// RESPONSE_MESSAGE_TYPE = 332545 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index fbe1232bd..24199440a 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x051700 const REQUEST_MESSAGE_TYPE = 333568; // hex: 0x051701 -const RESPONSE_MESSAGE_TYPE = 333569; +// RESPONSE_MESSAGE_TYPE = 333569 const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index ce53ddedf..ecaa96c02 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x050500 const REQUEST_MESSAGE_TYPE = 328960; // hex: 0x050501 -const RESPONSE_MESSAGE_TYPE = 328961; +// RESPONSE_MESSAGE_TYPE = 328961 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index 5dfdee061..23ebba5c2 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x050C00 const REQUEST_MESSAGE_TYPE = 330752; // hex: 0x050C01 -const RESPONSE_MESSAGE_TYPE = 330753; +// RESPONSE_MESSAGE_TYPE = 330753 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index 0c3171179..712f849c0 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -26,7 +26,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x051200 const REQUEST_MESSAGE_TYPE = 332288; // hex: 0x051201 -const RESPONSE_MESSAGE_TYPE = 332289; +// RESPONSE_MESSAGE_TYPE = 332289 const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 9284c9ef9..0bc325a9f 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -26,7 +26,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x051000 const REQUEST_MESSAGE_TYPE = 331776; // hex: 0x051001 -const RESPONSE_MESSAGE_TYPE = 331777; +// RESPONSE_MESSAGE_TYPE = 331777 const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index 3ff459352..270ffbb7b 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x050100 const REQUEST_MESSAGE_TYPE = 327936; // hex: 0x050101 -const RESPONSE_MESSAGE_TYPE = 327937; +// RESPONSE_MESSAGE_TYPE = 327937 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index c3a5cc0fa..4c1f7362d 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x051500 const REQUEST_MESSAGE_TYPE = 333056; // hex: 0x051501 -const RESPONSE_MESSAGE_TYPE = 333057; +// RESPONSE_MESSAGE_TYPE = 333057 const REQUEST_FROM_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TO_OFFSET = REQUEST_FROM_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index 2e348d03e..866bc535c 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x011900 const REQUEST_MESSAGE_TYPE = 71936; // hex: 0x011901 -const RESPONSE_MESSAGE_TYPE = 71937; +// RESPONSE_MESSAGE_TYPE = 71937 // hex: 0x011902 const EVENT_ENTRY_MESSAGE_TYPE = 71938; diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index 56eb108a7..a431215f3 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x011800 const REQUEST_MESSAGE_TYPE = 71680; // hex: 0x011801 -const RESPONSE_MESSAGE_TYPE = 71681; +// RESPONSE_MESSAGE_TYPE = 71681 // hex: 0x011802 const EVENT_ENTRY_MESSAGE_TYPE = 71682; diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index f6f8bda86..d231b7024 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x011600 const REQUEST_MESSAGE_TYPE = 71168; // hex: 0x011601 -const RESPONSE_MESSAGE_TYPE = 71169; +// RESPONSE_MESSAGE_TYPE = 71169 // hex: 0x011602 const EVENT_ENTRY_MESSAGE_TYPE = 71170; diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index ea7c5c3de..4d734d4bf 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x011700 const REQUEST_MESSAGE_TYPE = 71424; // hex: 0x011701 -const RESPONSE_MESSAGE_TYPE = 71425; +// RESPONSE_MESSAGE_TYPE = 71425 // hex: 0x011702 const EVENT_ENTRY_MESSAGE_TYPE = 71426; diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index e3e14e6ee..bbca6ab09 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -24,7 +24,7 @@ import {IndexConfigCodec} from './custom/IndexConfigCodec'; // hex: 0x012900 const REQUEST_MESSAGE_TYPE = 76032; // hex: 0x012901 -const RESPONSE_MESSAGE_TYPE = 76033; +// RESPONSE_MESSAGE_TYPE = 76033 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index 928581181..df5c5c290 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -24,7 +24,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x011400 const REQUEST_MESSAGE_TYPE = 70656; // hex: 0x011401 -const RESPONSE_MESSAGE_TYPE = 70657; +// RESPONSE_MESSAGE_TYPE = 70657 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index e01e6d574..9f2989a78 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -31,7 +31,7 @@ import {ListLongCodec} from './builtin/ListLongCodec'; // hex: 0x013F00 const REQUEST_MESSAGE_TYPE = 81664; // hex: 0x013F01 -const RESPONSE_MESSAGE_TYPE = 81665; +// RESPONSE_MESSAGE_TYPE = 81665 // hex: 0x013F02 const EVENT_I_MAP_INVALIDATION_MESSAGE_TYPE = 81666; // hex: 0x013F03 diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index 9ed0d0fd7..adf94e646 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -24,7 +24,7 @@ import {UUID} from '../core/UUID'; // hex: 0x011B00 const REQUEST_MESSAGE_TYPE = 72448; // hex: 0x011B01 -const RESPONSE_MESSAGE_TYPE = 72449; +// RESPONSE_MESSAGE_TYPE = 72449 // hex: 0x011B02 const EVENT_MAP_PARTITION_LOST_MESSAGE_TYPE = 72450; diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index c4e6d42eb..2b502ddc8 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -25,7 +25,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x013900 const REQUEST_MESSAGE_TYPE = 80128; // hex: 0x013901 -const RESPONSE_MESSAGE_TYPE = 80129; +// RESPONSE_MESSAGE_TYPE = 80129 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index 46a48ba43..1cf5c399b 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -25,7 +25,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x013A00 const REQUEST_MESSAGE_TYPE = 80384; // hex: 0x013A01 -const RESPONSE_MESSAGE_TYPE = 80385; +// RESPONSE_MESSAGE_TYPE = 80385 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapClearCodec.ts b/src/codec/MapClearCodec.ts index e5467de9b..e04698bf1 100644 --- a/src/codec/MapClearCodec.ts +++ b/src/codec/MapClearCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x012D00 const REQUEST_MESSAGE_TYPE = 77056; // hex: 0x012D01 -const RESPONSE_MESSAGE_TYPE = 77057; +// RESPONSE_MESSAGE_TYPE = 77057 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 1d2c2995f..19170ed04 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010600 const REQUEST_MESSAGE_TYPE = 67072; // hex: 0x010601 -const RESPONSE_MESSAGE_TYPE = 67073; +// RESPONSE_MESSAGE_TYPE = 67073 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 6a6c1166b..1bd108625 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010700 const REQUEST_MESSAGE_TYPE = 67328; // hex: 0x010701 -const RESPONSE_MESSAGE_TYPE = 67329; +// RESPONSE_MESSAGE_TYPE = 67329 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MapDeleteCodec.ts b/src/codec/MapDeleteCodec.ts index 0c21396ce..3df5bd4c2 100644 --- a/src/codec/MapDeleteCodec.ts +++ b/src/codec/MapDeleteCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010900 const REQUEST_MESSAGE_TYPE = 67840; // hex: 0x010901 -const RESPONSE_MESSAGE_TYPE = 67841; +// RESPONSE_MESSAGE_TYPE = 67841 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index a49e2065c..2f389d630 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -29,7 +29,7 @@ import {AnchorDataListHolderCodec} from './custom/AnchorDataListHolderCodec'; // hex: 0x013600 const REQUEST_MESSAGE_TYPE = 79360; // hex: 0x013601 -const RESPONSE_MESSAGE_TYPE = 79361; +// RESPONSE_MESSAGE_TYPE = 79361 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index 42fccf9f0..1a7b0673e 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -25,7 +25,7 @@ import {EntryListCodec} from './builtin/EntryListCodec'; // hex: 0x012800 const REQUEST_MESSAGE_TYPE = 75776; // hex: 0x012801 -const RESPONSE_MESSAGE_TYPE = 75777; +// RESPONSE_MESSAGE_TYPE = 75777 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index 124a31b9b..d32670183 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -25,7 +25,7 @@ import {Data} from '../serialization/Data'; // hex: 0x012500 const REQUEST_MESSAGE_TYPE = 75008; // hex: 0x012501 -const RESPONSE_MESSAGE_TYPE = 75009; +// RESPONSE_MESSAGE_TYPE = 75009 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index 1ce284c3e..7ae8a882b 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -29,7 +29,7 @@ import {LongArrayCodec} from './builtin/LongArrayCodec'; // hex: 0x014200 const REQUEST_MESSAGE_TYPE = 82432; // hex: 0x014201 -const RESPONSE_MESSAGE_TYPE = 82433; +// RESPONSE_MESSAGE_TYPE = 82433 const REQUEST_START_SEQUENCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_MIN_SIZE_OFFSET = REQUEST_START_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index d29494aaa..7a44ef946 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x014100 const REQUEST_MESSAGE_TYPE = 82176; // hex: 0x014101 -const RESPONSE_MESSAGE_TYPE = 82177; +// RESPONSE_MESSAGE_TYPE = 82177 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_OLDEST_SEQUENCE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MapEvictAllCodec.ts b/src/codec/MapEvictAllCodec.ts index 1e6c23a5a..b72204c9b 100644 --- a/src/codec/MapEvictAllCodec.ts +++ b/src/codec/MapEvictAllCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x011F00 const REQUEST_MESSAGE_TYPE = 73472; // hex: 0x011F01 -const RESPONSE_MESSAGE_TYPE = 73473; +// RESPONSE_MESSAGE_TYPE = 73473 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index 8dbd52f1a..e72858fd8 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x011E00 const REQUEST_MESSAGE_TYPE = 73216; // hex: 0x011E01 -const RESPONSE_MESSAGE_TYPE = 73217; +// RESPONSE_MESSAGE_TYPE = 73217 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index 50059136d..6dd29802f 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -25,7 +25,7 @@ import {EntryListCodec} from './builtin/EntryListCodec'; // hex: 0x013000 const REQUEST_MESSAGE_TYPE = 77824; // hex: 0x013001 -const RESPONSE_MESSAGE_TYPE = 77825; +// RESPONSE_MESSAGE_TYPE = 77825 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index c7a3c2a26..9ac243762 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x012E00 const REQUEST_MESSAGE_TYPE = 77312; // hex: 0x012E01 -const RESPONSE_MESSAGE_TYPE = 77313; +// RESPONSE_MESSAGE_TYPE = 77313 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index 06e8c6cc2..9a8ffcd52 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -26,7 +26,7 @@ import {EntryListCodec} from './builtin/EntryListCodec'; // hex: 0x013200 const REQUEST_MESSAGE_TYPE = 78336; // hex: 0x013201 -const RESPONSE_MESSAGE_TYPE = 78337; +// RESPONSE_MESSAGE_TYPE = 78337 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 95f342476..87f8ca0ec 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -25,7 +25,7 @@ import {EntryListCodec} from './builtin/EntryListCodec'; // hex: 0x013100 const REQUEST_MESSAGE_TYPE = 78080; // hex: 0x013101 -const RESPONSE_MESSAGE_TYPE = 78081; +// RESPONSE_MESSAGE_TYPE = 78081 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index 2405e48f6..368d1900a 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -27,7 +27,7 @@ import {Data} from '../serialization/Data'; // hex: 0x013800 const REQUEST_MESSAGE_TYPE = 79872; // hex: 0x013801 -const RESPONSE_MESSAGE_TYPE = 79873; +// RESPONSE_MESSAGE_TYPE = 79873 const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index f477e14a7..3f4b2ccef 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x013700 const REQUEST_MESSAGE_TYPE = 79616; // hex: 0x013701 -const RESPONSE_MESSAGE_TYPE = 79617; +// RESPONSE_MESSAGE_TYPE = 79617 const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index e0749f1af..735b80715 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -29,7 +29,7 @@ import {EntryListIntegerUUIDCodec} from './builtin/EntryListIntegerUUIDCodec'; // hex: 0x013D00 const REQUEST_MESSAGE_TYPE = 81152; // hex: 0x013D01 -const RESPONSE_MESSAGE_TYPE = 81153; +// RESPONSE_MESSAGE_TYPE = 81153 const REQUEST_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index b05abe5fc..a2ddb3ac7 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -27,7 +27,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x014000 const REQUEST_MESSAGE_TYPE = 81920; // hex: 0x014001 -const RESPONSE_MESSAGE_TYPE = 81921; +// RESPONSE_MESSAGE_TYPE = 81921 const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapFlushCodec.ts b/src/codec/MapFlushCodec.ts index d854c99fe..13def5e09 100644 --- a/src/codec/MapFlushCodec.ts +++ b/src/codec/MapFlushCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x010A00 const REQUEST_MESSAGE_TYPE = 68096; // hex: 0x010A01 -const RESPONSE_MESSAGE_TYPE = 68097; +// RESPONSE_MESSAGE_TYPE = 68097 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapForceUnlockCodec.ts b/src/codec/MapForceUnlockCodec.ts index 55c860c62..068f3deda 100644 --- a/src/codec/MapForceUnlockCodec.ts +++ b/src/codec/MapForceUnlockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x013300 const REQUEST_MESSAGE_TYPE = 78592; // hex: 0x013301 -const RESPONSE_MESSAGE_TYPE = 78593; +// RESPONSE_MESSAGE_TYPE = 78593 const REQUEST_REFERENCE_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index 5935580a5..499dcedae 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -26,7 +26,7 @@ import {EntryListCodec} from './builtin/EntryListCodec'; // hex: 0x012300 const REQUEST_MESSAGE_TYPE = 74496; // hex: 0x012301 -const RESPONSE_MESSAGE_TYPE = 74497; +// RESPONSE_MESSAGE_TYPE = 74497 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index 93f52e2c5..cc70900b7 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x010200 const REQUEST_MESSAGE_TYPE = 66048; // hex: 0x010201 -const RESPONSE_MESSAGE_TYPE = 66049; +// RESPONSE_MESSAGE_TYPE = 66049 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index 9dbaf86f2..99b9fc228 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -29,7 +29,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x011D00 const REQUEST_MESSAGE_TYPE = 72960; // hex: 0x011D01 -const RESPONSE_MESSAGE_TYPE = 72961; +// RESPONSE_MESSAGE_TYPE = 72961 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index dbd1137d3..d29636414 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x012B00 const REQUEST_MESSAGE_TYPE = 76544; // hex: 0x012B01 -const RESPONSE_MESSAGE_TYPE = 76545; +// RESPONSE_MESSAGE_TYPE = 76545 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index 04e345464..416fde9ac 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x011200 const REQUEST_MESSAGE_TYPE = 70144; // hex: 0x011201 -const RESPONSE_MESSAGE_TYPE = 70145; +// RESPONSE_MESSAGE_TYPE = 70145 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index a0bbcf91e..9cfc58bcd 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x012200 const REQUEST_MESSAGE_TYPE = 74240; // hex: 0x012201 -const RESPONSE_MESSAGE_TYPE = 74241; +// RESPONSE_MESSAGE_TYPE = 74241 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index c9c459194..6c8b9c17c 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -29,7 +29,7 @@ import {AnchorDataListHolderCodec} from './custom/AnchorDataListHolderCodec'; // hex: 0x013400 const REQUEST_MESSAGE_TYPE = 78848; // hex: 0x013401 -const RESPONSE_MESSAGE_TYPE = 78849; +// RESPONSE_MESSAGE_TYPE = 78849 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index 56c2097ea..7ec08d72f 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -25,7 +25,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x012600 const REQUEST_MESSAGE_TYPE = 75264; // hex: 0x012601 -const RESPONSE_MESSAGE_TYPE = 75265; +// RESPONSE_MESSAGE_TYPE = 75265 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapLoadAllCodec.ts b/src/codec/MapLoadAllCodec.ts index ceb31faac..a446bd486 100644 --- a/src/codec/MapLoadAllCodec.ts +++ b/src/codec/MapLoadAllCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x012000 const REQUEST_MESSAGE_TYPE = 73728; // hex: 0x012001 -const RESPONSE_MESSAGE_TYPE = 73729; +// RESPONSE_MESSAGE_TYPE = 73729 const REQUEST_REPLACE_EXISTING_VALUES_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REPLACE_EXISTING_VALUES_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; diff --git a/src/codec/MapLoadGivenKeysCodec.ts b/src/codec/MapLoadGivenKeysCodec.ts index 629ca2d78..2519b203a 100644 --- a/src/codec/MapLoadGivenKeysCodec.ts +++ b/src/codec/MapLoadGivenKeysCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x012100 const REQUEST_MESSAGE_TYPE = 73984; // hex: 0x012101 -const RESPONSE_MESSAGE_TYPE = 73985; +// RESPONSE_MESSAGE_TYPE = 73985 const REQUEST_REPLACE_EXISTING_VALUES_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REPLACE_EXISTING_VALUES_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; diff --git a/src/codec/MapLockCodec.ts b/src/codec/MapLockCodec.ts index 33f5a6e5e..de1d93168 100644 --- a/src/codec/MapLockCodec.ts +++ b/src/codec/MapLockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x011000 const REQUEST_MESSAGE_TYPE = 69632; // hex: 0x011001 -const RESPONSE_MESSAGE_TYPE = 69633; +// RESPONSE_MESSAGE_TYPE = 69633 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 90bf3aaec..94c7a84cc 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -25,7 +25,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x013B00 const REQUEST_MESSAGE_TYPE = 80640; // hex: 0x013B01 -const RESPONSE_MESSAGE_TYPE = 80641; +// RESPONSE_MESSAGE_TYPE = 80641 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index cb3b65b20..cf3a93dd0 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -25,7 +25,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x013C00 const REQUEST_MESSAGE_TYPE = 80896; // hex: 0x013C01 -const RESPONSE_MESSAGE_TYPE = 80897; +// RESPONSE_MESSAGE_TYPE = 80897 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapPutAllCodec.ts b/src/codec/MapPutAllCodec.ts index 44050630b..cd5707cb9 100644 --- a/src/codec/MapPutAllCodec.ts +++ b/src/codec/MapPutAllCodec.ts @@ -25,7 +25,7 @@ import {Data} from '../serialization/Data'; // hex: 0x012C00 const REQUEST_MESSAGE_TYPE = 76800; // hex: 0x012C01 -const RESPONSE_MESSAGE_TYPE = 76801; +// RESPONSE_MESSAGE_TYPE = 76801 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index bd010ca80..49007eaa7 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x010100 const REQUEST_MESSAGE_TYPE = 65792; // hex: 0x010101 -const RESPONSE_MESSAGE_TYPE = 65793; +// RESPONSE_MESSAGE_TYPE = 65793 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index ce71ab94d..4cff49e9a 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x010E00 const REQUEST_MESSAGE_TYPE = 69120; // hex: 0x010E01 -const RESPONSE_MESSAGE_TYPE = 69121; +// RESPONSE_MESSAGE_TYPE = 69121 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts index 155b51955..69883040a 100644 --- a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts +++ b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x014600 const REQUEST_MESSAGE_TYPE = 83456; // hex: 0x014601 -const RESPONSE_MESSAGE_TYPE = 83457; +// RESPONSE_MESSAGE_TYPE = 83457 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapPutTransientCodec.ts b/src/codec/MapPutTransientCodec.ts index e2e8f7fa8..d18e2403c 100644 --- a/src/codec/MapPutTransientCodec.ts +++ b/src/codec/MapPutTransientCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010D00 const REQUEST_MESSAGE_TYPE = 68864; // hex: 0x010D01 -const RESPONSE_MESSAGE_TYPE = 68865; +// RESPONSE_MESSAGE_TYPE = 68865 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapPutTransientWithMaxIdleCodec.ts b/src/codec/MapPutTransientWithMaxIdleCodec.ts index 669726765..93ca1111f 100644 --- a/src/codec/MapPutTransientWithMaxIdleCodec.ts +++ b/src/codec/MapPutTransientWithMaxIdleCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x014500 const REQUEST_MESSAGE_TYPE = 83200; // hex: 0x014501 -const RESPONSE_MESSAGE_TYPE = 83201; +// RESPONSE_MESSAGE_TYPE = 83201 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapPutWithMaxIdleCodec.ts b/src/codec/MapPutWithMaxIdleCodec.ts index dfcd45f3c..b85ac45f0 100644 --- a/src/codec/MapPutWithMaxIdleCodec.ts +++ b/src/codec/MapPutWithMaxIdleCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x014400 const REQUEST_MESSAGE_TYPE = 82944; // hex: 0x014401 -const RESPONSE_MESSAGE_TYPE = 82945; +// RESPONSE_MESSAGE_TYPE = 82945 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapRemoveAllCodec.ts b/src/codec/MapRemoveAllCodec.ts index 6ab577f96..a645c5636 100644 --- a/src/codec/MapRemoveAllCodec.ts +++ b/src/codec/MapRemoveAllCodec.ts @@ -24,7 +24,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x013E00 const REQUEST_MESSAGE_TYPE = 81408; // hex: 0x013E01 -const RESPONSE_MESSAGE_TYPE = 81409; +// RESPONSE_MESSAGE_TYPE = 81409 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index 0e6bb3ddd..460c52fde 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x010300 const REQUEST_MESSAGE_TYPE = 66304; // hex: 0x010301 -const RESPONSE_MESSAGE_TYPE = 66305; +// RESPONSE_MESSAGE_TYPE = 66305 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index b4b10be15..8d94852a6 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x011A00 const REQUEST_MESSAGE_TYPE = 72192; // hex: 0x011A01 -const RESPONSE_MESSAGE_TYPE = 72193; +// RESPONSE_MESSAGE_TYPE = 72193 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index 4242394c9..f28e61a0b 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010800 const REQUEST_MESSAGE_TYPE = 67584; // hex: 0x010801 -const RESPONSE_MESSAGE_TYPE = 67585; +// RESPONSE_MESSAGE_TYPE = 67585 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index 5d9318bd5..2dc081a3f 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x011500 const REQUEST_MESSAGE_TYPE = 70912; // hex: 0x011501 -const RESPONSE_MESSAGE_TYPE = 70913; +// RESPONSE_MESSAGE_TYPE = 70913 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index e49d5bfe5..eaf4a015b 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x011C00 const REQUEST_MESSAGE_TYPE = 72704; // hex: 0x011C01 -const RESPONSE_MESSAGE_TYPE = 72705; +// RESPONSE_MESSAGE_TYPE = 72705 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index 0b9d70945..3611ba10c 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x010400 const REQUEST_MESSAGE_TYPE = 66560; // hex: 0x010401 -const RESPONSE_MESSAGE_TYPE = 66561; +// RESPONSE_MESSAGE_TYPE = 66561 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index e2a19eb39..96b7e422f 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010500 const REQUEST_MESSAGE_TYPE = 66816; // hex: 0x010501 -const RESPONSE_MESSAGE_TYPE = 66817; +// RESPONSE_MESSAGE_TYPE = 66817 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapSetCodec.ts b/src/codec/MapSetCodec.ts index 6fcd2c5f4..17331fffe 100644 --- a/src/codec/MapSetCodec.ts +++ b/src/codec/MapSetCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010F00 const REQUEST_MESSAGE_TYPE = 69376; // hex: 0x010F01 -const RESPONSE_MESSAGE_TYPE = 69377; +// RESPONSE_MESSAGE_TYPE = 69377 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapSetTtlCodec.ts b/src/codec/MapSetTtlCodec.ts index f4c57bd54..ad17099e1 100644 --- a/src/codec/MapSetTtlCodec.ts +++ b/src/codec/MapSetTtlCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x014300 const REQUEST_MESSAGE_TYPE = 82688; // hex: 0x014301 -const RESPONSE_MESSAGE_TYPE = 82689; +// RESPONSE_MESSAGE_TYPE = 82689 const REQUEST_TTL_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapSetWithMaxIdleCodec.ts b/src/codec/MapSetWithMaxIdleCodec.ts index 7441759b6..d3b1c918e 100644 --- a/src/codec/MapSetWithMaxIdleCodec.ts +++ b/src/codec/MapSetWithMaxIdleCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x014700 const REQUEST_MESSAGE_TYPE = 83712; // hex: 0x014701 -const RESPONSE_MESSAGE_TYPE = 83713; +// RESPONSE_MESSAGE_TYPE = 83713 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index 7a6e8baec..cea6adeb9 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x012A00 const REQUEST_MESSAGE_TYPE = 76288; // hex: 0x012A01 -const RESPONSE_MESSAGE_TYPE = 76289; +// RESPONSE_MESSAGE_TYPE = 76289 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 2d04c6a10..088694e35 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x012F00 const REQUEST_MESSAGE_TYPE = 77568; // hex: 0x012F01 -const RESPONSE_MESSAGE_TYPE = 77569; +// RESPONSE_MESSAGE_TYPE = 77569 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index 2a1e0a3da..4490bb578 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x011100 const REQUEST_MESSAGE_TYPE = 69888; // hex: 0x011101 -const RESPONSE_MESSAGE_TYPE = 69889; +// RESPONSE_MESSAGE_TYPE = 69889 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_LEASE_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index a3ff35438..d3c880f63 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010C00 const REQUEST_MESSAGE_TYPE = 68608; // hex: 0x010C01 -const RESPONSE_MESSAGE_TYPE = 68609; +// RESPONSE_MESSAGE_TYPE = 68609 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index c355b03b4..b709f920c 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x010B00 const REQUEST_MESSAGE_TYPE = 68352; // hex: 0x010B01 -const RESPONSE_MESSAGE_TYPE = 68353; +// RESPONSE_MESSAGE_TYPE = 68353 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapUnlockCodec.ts b/src/codec/MapUnlockCodec.ts index c1c57e449..99f3705d7 100644 --- a/src/codec/MapUnlockCodec.ts +++ b/src/codec/MapUnlockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x011300 const REQUEST_MESSAGE_TYPE = 70400; // hex: 0x011301 -const RESPONSE_MESSAGE_TYPE = 70401; +// RESPONSE_MESSAGE_TYPE = 70401 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_REFERENCE_ID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 823144d2a..97991df81 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x012400 const REQUEST_MESSAGE_TYPE = 74752; // hex: 0x012401 -const RESPONSE_MESSAGE_TYPE = 74753; +// RESPONSE_MESSAGE_TYPE = 74753 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index 7b84b8456..58fe2e115 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -29,7 +29,7 @@ import {AnchorDataListHolderCodec} from './custom/AnchorDataListHolderCodec'; // hex: 0x013500 const REQUEST_MESSAGE_TYPE = 79104; // hex: 0x013501 -const RESPONSE_MESSAGE_TYPE = 79105; +// RESPONSE_MESSAGE_TYPE = 79105 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 77ff5cf24..8e04b099d 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -25,7 +25,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x012700 const REQUEST_MESSAGE_TYPE = 75520; // hex: 0x012701 -const RESPONSE_MESSAGE_TYPE = 75521; +// RESPONSE_MESSAGE_TYPE = 75521 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index 533cbaaf6..45278cdf9 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x020E00 const REQUEST_MESSAGE_TYPE = 134656; // hex: 0x020E01 -const RESPONSE_MESSAGE_TYPE = 134657; +// RESPONSE_MESSAGE_TYPE = 134657 // hex: 0x020E02 const EVENT_ENTRY_MESSAGE_TYPE = 134658; diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index 6b30b45c2..ac55faf5c 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x020D00 const REQUEST_MESSAGE_TYPE = 134400; // hex: 0x020D01 -const RESPONSE_MESSAGE_TYPE = 134401; +// RESPONSE_MESSAGE_TYPE = 134401 // hex: 0x020D02 const EVENT_ENTRY_MESSAGE_TYPE = 134402; diff --git a/src/codec/MultiMapClearCodec.ts b/src/codec/MultiMapClearCodec.ts index a550a17a1..fb5d38515 100644 --- a/src/codec/MultiMapClearCodec.ts +++ b/src/codec/MultiMapClearCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x020B00 const REQUEST_MESSAGE_TYPE = 133888; // hex: 0x020B01 -const RESPONSE_MESSAGE_TYPE = 133889; +// RESPONSE_MESSAGE_TYPE = 133889 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 3f254be10..22f4fc84c 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x020900 const REQUEST_MESSAGE_TYPE = 133376; // hex: 0x020901 -const RESPONSE_MESSAGE_TYPE = 133377; +// RESPONSE_MESSAGE_TYPE = 133377 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index 70dc91a22..6bb6bf993 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x020700 const REQUEST_MESSAGE_TYPE = 132864; // hex: 0x020701 -const RESPONSE_MESSAGE_TYPE = 132865; +// RESPONSE_MESSAGE_TYPE = 132865 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index f713a9ddc..f55739488 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x020800 const REQUEST_MESSAGE_TYPE = 133120; // hex: 0x020801 -const RESPONSE_MESSAGE_TYPE = 133121; +// RESPONSE_MESSAGE_TYPE = 133121 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapDeleteCodec.ts b/src/codec/MultiMapDeleteCodec.ts index c894aab63..b6d869c7b 100644 --- a/src/codec/MultiMapDeleteCodec.ts +++ b/src/codec/MultiMapDeleteCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x021600 const REQUEST_MESSAGE_TYPE = 136704; // hex: 0x021601 -const RESPONSE_MESSAGE_TYPE = 136705; +// RESPONSE_MESSAGE_TYPE = 136705 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index ecc85d7d3..18d1e4221 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -25,7 +25,7 @@ import {Data} from '../serialization/Data'; // hex: 0x020600 const REQUEST_MESSAGE_TYPE = 132608; // hex: 0x020601 -const RESPONSE_MESSAGE_TYPE = 132609; +// RESPONSE_MESSAGE_TYPE = 132609 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapForceUnlockCodec.ts b/src/codec/MultiMapForceUnlockCodec.ts index b90334a8b..37298d1ac 100644 --- a/src/codec/MultiMapForceUnlockCodec.ts +++ b/src/codec/MultiMapForceUnlockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x021400 const REQUEST_MESSAGE_TYPE = 136192; // hex: 0x021401 -const RESPONSE_MESSAGE_TYPE = 136193; +// RESPONSE_MESSAGE_TYPE = 136193 const REQUEST_REFERENCE_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index 90b183388..12ade2b29 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -27,7 +27,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x020200 const REQUEST_MESSAGE_TYPE = 131584; // hex: 0x020201 -const RESPONSE_MESSAGE_TYPE = 131585; +// RESPONSE_MESSAGE_TYPE = 131585 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index 43cb970a4..783f9012e 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x021200 const REQUEST_MESSAGE_TYPE = 135680; // hex: 0x021201 -const RESPONSE_MESSAGE_TYPE = 135681; +// RESPONSE_MESSAGE_TYPE = 135681 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 9670843b7..2651b4297 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x020400 const REQUEST_MESSAGE_TYPE = 132096; // hex: 0x020401 -const RESPONSE_MESSAGE_TYPE = 132097; +// RESPONSE_MESSAGE_TYPE = 132097 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapLockCodec.ts b/src/codec/MultiMapLockCodec.ts index 38e1efe98..cade52331 100644 --- a/src/codec/MultiMapLockCodec.ts +++ b/src/codec/MultiMapLockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x021000 const REQUEST_MESSAGE_TYPE = 135168; // hex: 0x021001 -const RESPONSE_MESSAGE_TYPE = 135169; +// RESPONSE_MESSAGE_TYPE = 135169 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index d105778e5..fe746449c 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x020100 const REQUEST_MESSAGE_TYPE = 131328; // hex: 0x020101 -const RESPONSE_MESSAGE_TYPE = 131329; +// RESPONSE_MESSAGE_TYPE = 131329 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index c20c433b0..6f3fa14ce 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -27,7 +27,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x020300 const REQUEST_MESSAGE_TYPE = 131840; // hex: 0x020301 -const RESPONSE_MESSAGE_TYPE = 131841; +// RESPONSE_MESSAGE_TYPE = 131841 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index b9bfb12f1..5650b885f 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x021500 const REQUEST_MESSAGE_TYPE = 136448; // hex: 0x021501 -const RESPONSE_MESSAGE_TYPE = 136449; +// RESPONSE_MESSAGE_TYPE = 136449 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 5ad002770..10d34dd86 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x020F00 const REQUEST_MESSAGE_TYPE = 134912; // hex: 0x020F01 -const RESPONSE_MESSAGE_TYPE = 134913; +// RESPONSE_MESSAGE_TYPE = 134913 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index 2a23c50b9..ea54025f2 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x020A00 const REQUEST_MESSAGE_TYPE = 133632; // hex: 0x020A01 -const RESPONSE_MESSAGE_TYPE = 133633; +// RESPONSE_MESSAGE_TYPE = 133633 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index 66c238ff8..e6d621a54 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x021100 const REQUEST_MESSAGE_TYPE = 135424; // hex: 0x021101 -const RESPONSE_MESSAGE_TYPE = 135425; +// RESPONSE_MESSAGE_TYPE = 135425 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_LEASE_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapUnlockCodec.ts b/src/codec/MultiMapUnlockCodec.ts index 767af7139..ea65af027 100644 --- a/src/codec/MultiMapUnlockCodec.ts +++ b/src/codec/MultiMapUnlockCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x021300 const REQUEST_MESSAGE_TYPE = 135936; // hex: 0x021301 -const RESPONSE_MESSAGE_TYPE = 135937; +// RESPONSE_MESSAGE_TYPE = 135937 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_REFERENCE_ID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index b9f47b458..20c86820d 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x020C00 const REQUEST_MESSAGE_TYPE = 134144; // hex: 0x020C01 -const RESPONSE_MESSAGE_TYPE = 134145; +// RESPONSE_MESSAGE_TYPE = 134145 const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index f3221231e..871def486 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x020500 const REQUEST_MESSAGE_TYPE = 132352; // hex: 0x020501 -const RESPONSE_MESSAGE_TYPE = 132353; +// RESPONSE_MESSAGE_TYPE = 132353 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts index 69a4dbd55..203738609 100644 --- a/src/codec/PNCounterAddCodec.ts +++ b/src/codec/PNCounterAddCodec.ts @@ -26,7 +26,7 @@ import {EntryListUUIDLongCodec} from './builtin/EntryListUUIDLongCodec'; // hex: 0x1D0200 const REQUEST_MESSAGE_TYPE = 1901056; // hex: 0x1D0201 -const RESPONSE_MESSAGE_TYPE = 1901057; +// RESPONSE_MESSAGE_TYPE = 1901057 const REQUEST_DELTA_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_GET_BEFORE_UPDATE_OFFSET = REQUEST_DELTA_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts index 05f4b1e38..29242ae97 100644 --- a/src/codec/PNCounterGetCodec.ts +++ b/src/codec/PNCounterGetCodec.ts @@ -26,7 +26,7 @@ import * as Long from 'long'; // hex: 0x1D0100 const REQUEST_MESSAGE_TYPE = 1900800; // hex: 0x1D0101 -const RESPONSE_MESSAGE_TYPE = 1900801; +// RESPONSE_MESSAGE_TYPE = 1900801 const REQUEST_TARGET_REPLICA_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TARGET_REPLICA_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts index c220f1933..b314dfd67 100644 --- a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x1D0300 const REQUEST_MESSAGE_TYPE = 1901312; // hex: 0x1D0301 -const RESPONSE_MESSAGE_TYPE = 1901313; +// RESPONSE_MESSAGE_TYPE = 1901313 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index 12c139524..233d53e32 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x031000 const REQUEST_MESSAGE_TYPE = 200704; // hex: 0x031001 -const RESPONSE_MESSAGE_TYPE = 200705; +// RESPONSE_MESSAGE_TYPE = 200705 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index e99a0835b..9ebe1b83b 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x031100 const REQUEST_MESSAGE_TYPE = 200960; // hex: 0x031101 -const RESPONSE_MESSAGE_TYPE = 200961; +// RESPONSE_MESSAGE_TYPE = 200961 // hex: 0x031102 const EVENT_ITEM_MESSAGE_TYPE = 200962; diff --git a/src/codec/QueueClearCodec.ts b/src/codec/QueueClearCodec.ts index 236c4571b..f95282cdd 100644 --- a/src/codec/QueueClearCodec.ts +++ b/src/codec/QueueClearCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x030F00 const REQUEST_MESSAGE_TYPE = 200448; // hex: 0x030F01 -const RESPONSE_MESSAGE_TYPE = 200449; +// RESPONSE_MESSAGE_TYPE = 200449 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index 0720e67ef..2f8824c33 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030D00 const REQUEST_MESSAGE_TYPE = 199936; // hex: 0x030D01 -const RESPONSE_MESSAGE_TYPE = 199937; +// RESPONSE_MESSAGE_TYPE = 199937 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index c9811f997..52b8237a5 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030E00 const REQUEST_MESSAGE_TYPE = 200192; // hex: 0x030E01 -const RESPONSE_MESSAGE_TYPE = 200193; +// RESPONSE_MESSAGE_TYPE = 200193 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index d59b88a67..798828e1d 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030C00 const REQUEST_MESSAGE_TYPE = 199680; // hex: 0x030C01 -const RESPONSE_MESSAGE_TYPE = 199681; +// RESPONSE_MESSAGE_TYPE = 199681 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index d6b67db06..6db81a329 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030B00 const REQUEST_MESSAGE_TYPE = 199424; // hex: 0x030B01 -const RESPONSE_MESSAGE_TYPE = 199425; +// RESPONSE_MESSAGE_TYPE = 199425 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index 98155ab1f..d6039f41d 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030900 const REQUEST_MESSAGE_TYPE = 198912; // hex: 0x030901 -const RESPONSE_MESSAGE_TYPE = 198913; +// RESPONSE_MESSAGE_TYPE = 198913 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index a36968644..7d3994612 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030A00 const REQUEST_MESSAGE_TYPE = 199168; // hex: 0x030A01 -const RESPONSE_MESSAGE_TYPE = 199169; +// RESPONSE_MESSAGE_TYPE = 199169 const REQUEST_MAX_SIZE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index a7aa2addc..3b8b9f8d1 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x031400 const REQUEST_MESSAGE_TYPE = 201728; // hex: 0x031401 -const RESPONSE_MESSAGE_TYPE = 201729; +// RESPONSE_MESSAGE_TYPE = 201729 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index 002976404..0a4f50e9d 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030800 const REQUEST_MESSAGE_TYPE = 198656; // hex: 0x030801 -const RESPONSE_MESSAGE_TYPE = 198657; +// RESPONSE_MESSAGE_TYPE = 198657 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index 2be1cb387..8de415968 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030100 const REQUEST_MESSAGE_TYPE = 196864; // hex: 0x030101 -const RESPONSE_MESSAGE_TYPE = 196865; +// RESPONSE_MESSAGE_TYPE = 196865 const REQUEST_TIMEOUT_MILLIS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MILLIS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index 10a7b8dd0..9a1e5aeed 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -25,7 +25,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x030700 const REQUEST_MESSAGE_TYPE = 198400; // hex: 0x030701 -const RESPONSE_MESSAGE_TYPE = 198401; +// RESPONSE_MESSAGE_TYPE = 198401 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index 543a6e695..f0e8110ff 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x030500 const REQUEST_MESSAGE_TYPE = 197888; // hex: 0x030501 -const RESPONSE_MESSAGE_TYPE = 197889; +// RESPONSE_MESSAGE_TYPE = 197889 const REQUEST_TIMEOUT_MILLIS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MILLIS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/QueuePutCodec.ts b/src/codec/QueuePutCodec.ts index 016aa155f..7f71e204b 100644 --- a/src/codec/QueuePutCodec.ts +++ b/src/codec/QueuePutCodec.ts @@ -24,7 +24,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030200 const REQUEST_MESSAGE_TYPE = 197120; // hex: 0x030201 -const RESPONSE_MESSAGE_TYPE = 197121; +// RESPONSE_MESSAGE_TYPE = 197121 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index b0c75b291..9e08df876 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x031300 const REQUEST_MESSAGE_TYPE = 201472; // hex: 0x031301 -const RESPONSE_MESSAGE_TYPE = 201473; +// RESPONSE_MESSAGE_TYPE = 201473 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index 3698016ef..cf3ffc87f 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x030400 const REQUEST_MESSAGE_TYPE = 197632; // hex: 0x030401 -const RESPONSE_MESSAGE_TYPE = 197633; +// RESPONSE_MESSAGE_TYPE = 197633 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index 06bc169c7..c589002fe 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x031200 const REQUEST_MESSAGE_TYPE = 201216; // hex: 0x031201 -const RESPONSE_MESSAGE_TYPE = 201217; +// RESPONSE_MESSAGE_TYPE = 201217 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index 75397212e..2cd12b31f 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x030300 const REQUEST_MESSAGE_TYPE = 197376; // hex: 0x030301 -const RESPONSE_MESSAGE_TYPE = 197377; +// RESPONSE_MESSAGE_TYPE = 197377 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index 6d44010fe..0c218b228 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -25,7 +25,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x030600 const REQUEST_MESSAGE_TYPE = 198144; // hex: 0x030601 -const RESPONSE_MESSAGE_TYPE = 198145; +// RESPONSE_MESSAGE_TYPE = 198145 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index 97bdba2ca..3ab31b654 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D0D00 const REQUEST_MESSAGE_TYPE = 855296; // hex: 0x0D0D01 -const RESPONSE_MESSAGE_TYPE = 855297; +// RESPONSE_MESSAGE_TYPE = 855297 // hex: 0x0D0D02 const EVENT_ENTRY_MESSAGE_TYPE = 855298; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index 27c5ade76..e52dc03b4 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D0C00 const REQUEST_MESSAGE_TYPE = 855040; // hex: 0x0D0C01 -const RESPONSE_MESSAGE_TYPE = 855041; +// RESPONSE_MESSAGE_TYPE = 855041 // hex: 0x0D0C02 const EVENT_ENTRY_MESSAGE_TYPE = 855042; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index d5bb26068..a324be15f 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D0A00 const REQUEST_MESSAGE_TYPE = 854528; // hex: 0x0D0A01 -const RESPONSE_MESSAGE_TYPE = 854529; +// RESPONSE_MESSAGE_TYPE = 854529 // hex: 0x0D0A02 const EVENT_ENTRY_MESSAGE_TYPE = 854530; diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 56388ad1d..310993007 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D0B00 const REQUEST_MESSAGE_TYPE = 854784; // hex: 0x0D0B01 -const RESPONSE_MESSAGE_TYPE = 854785; +// RESPONSE_MESSAGE_TYPE = 854785 // hex: 0x0D0B02 const EVENT_ENTRY_MESSAGE_TYPE = 854786; diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index 81ee04e33..e7bf9afa1 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D1200 const REQUEST_MESSAGE_TYPE = 856576; // hex: 0x0D1201 -const RESPONSE_MESSAGE_TYPE = 856577; +// RESPONSE_MESSAGE_TYPE = 856577 // hex: 0x0D1202 const EVENT_ENTRY_MESSAGE_TYPE = 856578; diff --git a/src/codec/ReplicatedMapClearCodec.ts b/src/codec/ReplicatedMapClearCodec.ts index 271de2c0e..66b23f19a 100644 --- a/src/codec/ReplicatedMapClearCodec.ts +++ b/src/codec/ReplicatedMapClearCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x0D0900 const REQUEST_MESSAGE_TYPE = 854272; // hex: 0x0D0901 -const RESPONSE_MESSAGE_TYPE = 854273; +// RESPONSE_MESSAGE_TYPE = 854273 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index bedd6ad68..aef48e0e7 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0D0400 const REQUEST_MESSAGE_TYPE = 852992; // hex: 0x0D0401 -const RESPONSE_MESSAGE_TYPE = 852993; +// RESPONSE_MESSAGE_TYPE = 852993 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index f94ccda1f..1252832bb 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0D0500 const REQUEST_MESSAGE_TYPE = 853248; // hex: 0x0D0501 -const RESPONSE_MESSAGE_TYPE = 853249; +// RESPONSE_MESSAGE_TYPE = 853249 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index 9e48edc58..6e5f20327 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -25,7 +25,7 @@ import {Data} from '../serialization/Data'; // hex: 0x0D1100 const REQUEST_MESSAGE_TYPE = 856320; // hex: 0x0D1101 -const RESPONSE_MESSAGE_TYPE = 856321; +// RESPONSE_MESSAGE_TYPE = 856321 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index 533bdac66..53a1d5e21 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -25,7 +25,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D0600 const REQUEST_MESSAGE_TYPE = 853504; // hex: 0x0D0601 -const RESPONSE_MESSAGE_TYPE = 853505; +// RESPONSE_MESSAGE_TYPE = 853505 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index a56dd4e41..2dfc736e0 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x0D0300 const REQUEST_MESSAGE_TYPE = 852736; // hex: 0x0D0301 -const RESPONSE_MESSAGE_TYPE = 852737; +// RESPONSE_MESSAGE_TYPE = 852737 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index 9ffa6b389..0befd04eb 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0D0F00 const REQUEST_MESSAGE_TYPE = 855808; // hex: 0x0D0F01 -const RESPONSE_MESSAGE_TYPE = 855809; +// RESPONSE_MESSAGE_TYPE = 855809 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapPutAllCodec.ts b/src/codec/ReplicatedMapPutAllCodec.ts index 079980459..2d2dc1dac 100644 --- a/src/codec/ReplicatedMapPutAllCodec.ts +++ b/src/codec/ReplicatedMapPutAllCodec.ts @@ -25,7 +25,7 @@ import {Data} from '../serialization/Data'; // hex: 0x0D0800 const REQUEST_MESSAGE_TYPE = 854016; // hex: 0x0D0801 -const RESPONSE_MESSAGE_TYPE = 854017; +// RESPONSE_MESSAGE_TYPE = 854017 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index d3933a013..93874df5e 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D0100 const REQUEST_MESSAGE_TYPE = 852224; // hex: 0x0D0101 -const RESPONSE_MESSAGE_TYPE = 852225; +// RESPONSE_MESSAGE_TYPE = 852225 const REQUEST_TTL_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index c99ffbc8a..6abb5df5c 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -25,7 +25,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0D0700 const REQUEST_MESSAGE_TYPE = 853760; // hex: 0x0D0701 -const RESPONSE_MESSAGE_TYPE = 853761; +// RESPONSE_MESSAGE_TYPE = 853761 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index d54398f07..70e7a7d1e 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x0D0E00 const REQUEST_MESSAGE_TYPE = 855552; // hex: 0x0D0E01 -const RESPONSE_MESSAGE_TYPE = 855553; +// RESPONSE_MESSAGE_TYPE = 855553 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index aa247ec3e..818bf701a 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x0D0200 const REQUEST_MESSAGE_TYPE = 852480; // hex: 0x0D0201 -const RESPONSE_MESSAGE_TYPE = 852481; +// RESPONSE_MESSAGE_TYPE = 852481 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index 3a9c21db8..cb3ec7bed 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0D1000 const REQUEST_MESSAGE_TYPE = 856064; // hex: 0x0D1001 -const RESPONSE_MESSAGE_TYPE = 856065; +// RESPONSE_MESSAGE_TYPE = 856065 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index ad33ee343..ef48ea022 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -27,7 +27,7 @@ import * as Long from 'long'; // hex: 0x170800 const REQUEST_MESSAGE_TYPE = 1509376; // hex: 0x170801 -const RESPONSE_MESSAGE_TYPE = 1509377; +// RESPONSE_MESSAGE_TYPE = 1509377 const REQUEST_OVERFLOW_POLICY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_OVERFLOW_POLICY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 3159155c4..bbb57039e 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -26,7 +26,7 @@ import * as Long from 'long'; // hex: 0x170600 const REQUEST_MESSAGE_TYPE = 1508864; // hex: 0x170601 -const RESPONSE_MESSAGE_TYPE = 1508865; +// RESPONSE_MESSAGE_TYPE = 1508865 const REQUEST_OVERFLOW_POLICY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_OVERFLOW_POLICY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index 775c8cda4..338b88567 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x170400 const REQUEST_MESSAGE_TYPE = 1508352; // hex: 0x170401 -const RESPONSE_MESSAGE_TYPE = 1508353; +// RESPONSE_MESSAGE_TYPE = 1508353 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index e7fe7c89e..1e79e1bcc 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x170300 const REQUEST_MESSAGE_TYPE = 1508096; // hex: 0x170301 -const RESPONSE_MESSAGE_TYPE = 1508097; +// RESPONSE_MESSAGE_TYPE = 1508097 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index 387f545e0..6e0f611e0 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -29,7 +29,7 @@ import {LongArrayCodec} from './builtin/LongArrayCodec'; // hex: 0x170900 const REQUEST_MESSAGE_TYPE = 1509632; // hex: 0x170901 -const RESPONSE_MESSAGE_TYPE = 1509633; +// RESPONSE_MESSAGE_TYPE = 1509633 const REQUEST_START_SEQUENCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_MIN_COUNT_OFFSET = REQUEST_START_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index 94f7926c5..7b1a477a9 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x170700 const REQUEST_MESSAGE_TYPE = 1509120; // hex: 0x170701 -const RESPONSE_MESSAGE_TYPE = 1509121; +// RESPONSE_MESSAGE_TYPE = 1509121 const REQUEST_SEQUENCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index 66ca9338f..c40f122d1 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x170500 const REQUEST_MESSAGE_TYPE = 1508608; // hex: 0x170501 -const RESPONSE_MESSAGE_TYPE = 1508609; +// RESPONSE_MESSAGE_TYPE = 1508609 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index b85bedffa..5ce141d52 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x170100 const REQUEST_MESSAGE_TYPE = 1507584; // hex: 0x170101 -const RESPONSE_MESSAGE_TYPE = 1507585; +// RESPONSE_MESSAGE_TYPE = 1507585 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index e3fda9ffb..2f09aca80 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x170200 const REQUEST_MESSAGE_TYPE = 1507840; // hex: 0x170201 -const RESPONSE_MESSAGE_TYPE = 1507841; +// RESPONSE_MESSAGE_TYPE = 1507841 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index b34ba20e1..5d304a3a4 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060600 const REQUEST_MESSAGE_TYPE = 394752; // hex: 0x060601 -const RESPONSE_MESSAGE_TYPE = 394753; +// RESPONSE_MESSAGE_TYPE = 394753 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index 496d4f298..0f595dc17 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060400 const REQUEST_MESSAGE_TYPE = 394240; // hex: 0x060401 -const RESPONSE_MESSAGE_TYPE = 394241; +// RESPONSE_MESSAGE_TYPE = 394241 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index 6d4b9e9ca..a59a43fc9 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -27,7 +27,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x060B00 const REQUEST_MESSAGE_TYPE = 396032; // hex: 0x060B01 -const RESPONSE_MESSAGE_TYPE = 396033; +// RESPONSE_MESSAGE_TYPE = 396033 // hex: 0x060B02 const EVENT_ITEM_MESSAGE_TYPE = 396034; diff --git a/src/codec/SetClearCodec.ts b/src/codec/SetClearCodec.ts index f0842ecf4..e1ca68641 100644 --- a/src/codec/SetClearCodec.ts +++ b/src/codec/SetClearCodec.ts @@ -22,7 +22,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x060900 const REQUEST_MESSAGE_TYPE = 395520; // hex: 0x060901 -const RESPONSE_MESSAGE_TYPE = 395521; +// RESPONSE_MESSAGE_TYPE = 395521 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index 38bda420e..31ba3a43b 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060700 const REQUEST_MESSAGE_TYPE = 395008; // hex: 0x060701 -const RESPONSE_MESSAGE_TYPE = 395009; +// RESPONSE_MESSAGE_TYPE = 395009 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index 859d3e559..b35f85e11 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060800 const REQUEST_MESSAGE_TYPE = 395264; // hex: 0x060801 -const RESPONSE_MESSAGE_TYPE = 395265; +// RESPONSE_MESSAGE_TYPE = 395265 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index e06efdb3d..baefaec4d 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -26,7 +26,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060300 const REQUEST_MESSAGE_TYPE = 393984; // hex: 0x060301 -const RESPONSE_MESSAGE_TYPE = 393985; +// RESPONSE_MESSAGE_TYPE = 393985 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index fb0dcddc8..5db201552 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060200 const REQUEST_MESSAGE_TYPE = 393728; // hex: 0x060201 -const RESPONSE_MESSAGE_TYPE = 393729; +// RESPONSE_MESSAGE_TYPE = 393729 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index 6d2c3c800..a3d0c4fc8 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060A00 const REQUEST_MESSAGE_TYPE = 395776; // hex: 0x060A01 -const RESPONSE_MESSAGE_TYPE = 395777; +// RESPONSE_MESSAGE_TYPE = 395777 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index fac3da6d5..8f78b69f0 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x060D00 const REQUEST_MESSAGE_TYPE = 396544; // hex: 0x060D01 -const RESPONSE_MESSAGE_TYPE = 396545; +// RESPONSE_MESSAGE_TYPE = 396545 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index cdf1827b2..ed9a01572 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -25,7 +25,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x060500 const REQUEST_MESSAGE_TYPE = 394496; // hex: 0x060501 -const RESPONSE_MESSAGE_TYPE = 394497; +// RESPONSE_MESSAGE_TYPE = 394497 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index 4c427d392..72b009b89 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x060C00 const REQUEST_MESSAGE_TYPE = 396288; // hex: 0x060C01 -const RESPONSE_MESSAGE_TYPE = 396289; +// RESPONSE_MESSAGE_TYPE = 396289 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index 348a1c505..3d9d64773 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -23,7 +23,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x060100 const REQUEST_MESSAGE_TYPE = 393472; // hex: 0x060101 -const RESPONSE_MESSAGE_TYPE = 393473; +// RESPONSE_MESSAGE_TYPE = 393473 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index 22db0e237..5642434df 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x040200 const REQUEST_MESSAGE_TYPE = 262656; // hex: 0x040201 -const RESPONSE_MESSAGE_TYPE = 262657; +// RESPONSE_MESSAGE_TYPE = 262657 // hex: 0x040202 const EVENT_TOPIC_MESSAGE_TYPE = 262658; diff --git a/src/codec/TopicPublishCodec.ts b/src/codec/TopicPublishCodec.ts index 067f3227b..64ee43f17 100644 --- a/src/codec/TopicPublishCodec.ts +++ b/src/codec/TopicPublishCodec.ts @@ -24,7 +24,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x040100 const REQUEST_MESSAGE_TYPE = 262400; // hex: 0x040101 -const RESPONSE_MESSAGE_TYPE = 262401; +// RESPONSE_MESSAGE_TYPE = 262401 const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index aab2ea5fe..2dfce56b9 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -24,7 +24,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x040300 const REQUEST_MESSAGE_TYPE = 262912; // hex: 0x040301 -const RESPONSE_MESSAGE_TYPE = 262913; +// RESPONSE_MESSAGE_TYPE = 262913 const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionCommitCodec.ts b/src/codec/TransactionCommitCodec.ts index 6052a415a..5da659d5f 100644 --- a/src/codec/TransactionCommitCodec.ts +++ b/src/codec/TransactionCommitCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x150100 const REQUEST_MESSAGE_TYPE = 1376512; // hex: 0x150101 -const RESPONSE_MESSAGE_TYPE = 1376513; +// RESPONSE_MESSAGE_TYPE = 1376513 const REQUEST_TRANSACTION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionCreateCodec.ts b/src/codec/TransactionCreateCodec.ts index 55db6e088..cb30da45d 100644 --- a/src/codec/TransactionCreateCodec.ts +++ b/src/codec/TransactionCreateCodec.ts @@ -24,7 +24,7 @@ import {UUID} from '../core/UUID'; // hex: 0x150200 const REQUEST_MESSAGE_TYPE = 1376768; // hex: 0x150201 -const RESPONSE_MESSAGE_TYPE = 1376769; +// RESPONSE_MESSAGE_TYPE = 1376769 const REQUEST_TIMEOUT_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_DURABILITY_OFFSET = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; diff --git a/src/codec/TransactionRollbackCodec.ts b/src/codec/TransactionRollbackCodec.ts index 4088aa684..93d736bcf 100644 --- a/src/codec/TransactionRollbackCodec.ts +++ b/src/codec/TransactionRollbackCodec.ts @@ -24,7 +24,7 @@ import * as Long from 'long'; // hex: 0x150300 const REQUEST_MESSAGE_TYPE = 1377024; // hex: 0x150301 -const RESPONSE_MESSAGE_TYPE = 1377025; +// RESPONSE_MESSAGE_TYPE = 1377025 const REQUEST_TRANSACTION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalListAddCodec.ts b/src/codec/TransactionalListAddCodec.ts index 109b253c4..921e5b874 100644 --- a/src/codec/TransactionalListAddCodec.ts +++ b/src/codec/TransactionalListAddCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x110100 const REQUEST_MESSAGE_TYPE = 1114368; // hex: 0x110101 -const RESPONSE_MESSAGE_TYPE = 1114369; +// RESPONSE_MESSAGE_TYPE = 1114369 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalListRemoveCodec.ts b/src/codec/TransactionalListRemoveCodec.ts index 26f05845d..a8c07a6bc 100644 --- a/src/codec/TransactionalListRemoveCodec.ts +++ b/src/codec/TransactionalListRemoveCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x110200 const REQUEST_MESSAGE_TYPE = 1114624; // hex: 0x110201 -const RESPONSE_MESSAGE_TYPE = 1114625; +// RESPONSE_MESSAGE_TYPE = 1114625 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalListSizeCodec.ts b/src/codec/TransactionalListSizeCodec.ts index e1051656a..314b4a964 100644 --- a/src/codec/TransactionalListSizeCodec.ts +++ b/src/codec/TransactionalListSizeCodec.ts @@ -25,7 +25,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x110300 const REQUEST_MESSAGE_TYPE = 1114880; // hex: 0x110301 -const RESPONSE_MESSAGE_TYPE = 1114881; +// RESPONSE_MESSAGE_TYPE = 1114881 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapContainsKeyCodec.ts b/src/codec/TransactionalMapContainsKeyCodec.ts index a61220e8e..ea49fc58d 100644 --- a/src/codec/TransactionalMapContainsKeyCodec.ts +++ b/src/codec/TransactionalMapContainsKeyCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E0100 const REQUEST_MESSAGE_TYPE = 917760; // hex: 0x0E0101 -const RESPONSE_MESSAGE_TYPE = 917761; +// RESPONSE_MESSAGE_TYPE = 917761 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapContainsValueCodec.ts b/src/codec/TransactionalMapContainsValueCodec.ts index 28abb4a4e..ecc5ede13 100644 --- a/src/codec/TransactionalMapContainsValueCodec.ts +++ b/src/codec/TransactionalMapContainsValueCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E1200 const REQUEST_MESSAGE_TYPE = 922112; // hex: 0x0E1201 -const RESPONSE_MESSAGE_TYPE = 922113; +// RESPONSE_MESSAGE_TYPE = 922113 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapDeleteCodec.ts b/src/codec/TransactionalMapDeleteCodec.ts index c5881cc2e..cc76acc13 100644 --- a/src/codec/TransactionalMapDeleteCodec.ts +++ b/src/codec/TransactionalMapDeleteCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E0C00 const REQUEST_MESSAGE_TYPE = 920576; // hex: 0x0E0C01 -const RESPONSE_MESSAGE_TYPE = 920577; +// RESPONSE_MESSAGE_TYPE = 920577 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapGetCodec.ts b/src/codec/TransactionalMapGetCodec.ts index 264baa8e0..743cab16a 100644 --- a/src/codec/TransactionalMapGetCodec.ts +++ b/src/codec/TransactionalMapGetCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0E0200 const REQUEST_MESSAGE_TYPE = 918016; // hex: 0x0E0201 -const RESPONSE_MESSAGE_TYPE = 918017; +// RESPONSE_MESSAGE_TYPE = 918017 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapGetForUpdateCodec.ts b/src/codec/TransactionalMapGetForUpdateCodec.ts index 774a2df5e..e51721f2f 100644 --- a/src/codec/TransactionalMapGetForUpdateCodec.ts +++ b/src/codec/TransactionalMapGetForUpdateCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0E0300 const REQUEST_MESSAGE_TYPE = 918272; // hex: 0x0E0301 -const RESPONSE_MESSAGE_TYPE = 918273; +// RESPONSE_MESSAGE_TYPE = 918273 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapIsEmptyCodec.ts b/src/codec/TransactionalMapIsEmptyCodec.ts index 9bd62163e..d378f51b5 100644 --- a/src/codec/TransactionalMapIsEmptyCodec.ts +++ b/src/codec/TransactionalMapIsEmptyCodec.ts @@ -25,7 +25,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x0E0500 const REQUEST_MESSAGE_TYPE = 918784; // hex: 0x0E0501 -const RESPONSE_MESSAGE_TYPE = 918785; +// RESPONSE_MESSAGE_TYPE = 918785 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapKeySetCodec.ts b/src/codec/TransactionalMapKeySetCodec.ts index 50987bfc6..f8dcba815 100644 --- a/src/codec/TransactionalMapKeySetCodec.ts +++ b/src/codec/TransactionalMapKeySetCodec.ts @@ -28,7 +28,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E0E00 const REQUEST_MESSAGE_TYPE = 921088; // hex: 0x0E0E01 -const RESPONSE_MESSAGE_TYPE = 921089; +// RESPONSE_MESSAGE_TYPE = 921089 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts index b040359bd..4c1c4a13e 100644 --- a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts +++ b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts @@ -28,7 +28,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x0E0F00 const REQUEST_MESSAGE_TYPE = 921344; // hex: 0x0E0F01 -const RESPONSE_MESSAGE_TYPE = 921345; +// RESPONSE_MESSAGE_TYPE = 921345 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapPutCodec.ts b/src/codec/TransactionalMapPutCodec.ts index 5579f9b04..7fd10c1cf 100644 --- a/src/codec/TransactionalMapPutCodec.ts +++ b/src/codec/TransactionalMapPutCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0E0600 const REQUEST_MESSAGE_TYPE = 919040; // hex: 0x0E0601 -const RESPONSE_MESSAGE_TYPE = 919041; +// RESPONSE_MESSAGE_TYPE = 919041 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapPutIfAbsentCodec.ts b/src/codec/TransactionalMapPutIfAbsentCodec.ts index 635b2c118..1b8236f5d 100644 --- a/src/codec/TransactionalMapPutIfAbsentCodec.ts +++ b/src/codec/TransactionalMapPutIfAbsentCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0E0800 const REQUEST_MESSAGE_TYPE = 919552; // hex: 0x0E0801 -const RESPONSE_MESSAGE_TYPE = 919553; +// RESPONSE_MESSAGE_TYPE = 919553 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapRemoveCodec.ts b/src/codec/TransactionalMapRemoveCodec.ts index 8ba0e0ef4..7f254582f 100644 --- a/src/codec/TransactionalMapRemoveCodec.ts +++ b/src/codec/TransactionalMapRemoveCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0E0B00 const REQUEST_MESSAGE_TYPE = 920320; // hex: 0x0E0B01 -const RESPONSE_MESSAGE_TYPE = 920321; +// RESPONSE_MESSAGE_TYPE = 920321 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapRemoveIfSameCodec.ts b/src/codec/TransactionalMapRemoveIfSameCodec.ts index 74b6788c7..d4c2a59fc 100644 --- a/src/codec/TransactionalMapRemoveIfSameCodec.ts +++ b/src/codec/TransactionalMapRemoveIfSameCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E0D00 const REQUEST_MESSAGE_TYPE = 920832; // hex: 0x0E0D01 -const RESPONSE_MESSAGE_TYPE = 920833; +// RESPONSE_MESSAGE_TYPE = 920833 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapReplaceCodec.ts b/src/codec/TransactionalMapReplaceCodec.ts index 0a8915a39..c4b6ccbe7 100644 --- a/src/codec/TransactionalMapReplaceCodec.ts +++ b/src/codec/TransactionalMapReplaceCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x0E0900 const REQUEST_MESSAGE_TYPE = 919808; // hex: 0x0E0901 -const RESPONSE_MESSAGE_TYPE = 919809; +// RESPONSE_MESSAGE_TYPE = 919809 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapReplaceIfSameCodec.ts b/src/codec/TransactionalMapReplaceIfSameCodec.ts index 7181af27b..7706e69ee 100644 --- a/src/codec/TransactionalMapReplaceIfSameCodec.ts +++ b/src/codec/TransactionalMapReplaceIfSameCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E0A00 const REQUEST_MESSAGE_TYPE = 920064; // hex: 0x0E0A01 -const RESPONSE_MESSAGE_TYPE = 920065; +// RESPONSE_MESSAGE_TYPE = 920065 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapSetCodec.ts b/src/codec/TransactionalMapSetCodec.ts index eb264acd5..02b017175 100644 --- a/src/codec/TransactionalMapSetCodec.ts +++ b/src/codec/TransactionalMapSetCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E0700 const REQUEST_MESSAGE_TYPE = 919296; // hex: 0x0E0701 -const RESPONSE_MESSAGE_TYPE = 919297; +// RESPONSE_MESSAGE_TYPE = 919297 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapSizeCodec.ts b/src/codec/TransactionalMapSizeCodec.ts index 6816dddb2..db4777b64 100644 --- a/src/codec/TransactionalMapSizeCodec.ts +++ b/src/codec/TransactionalMapSizeCodec.ts @@ -25,7 +25,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x0E0400 const REQUEST_MESSAGE_TYPE = 918528; // hex: 0x0E0401 -const RESPONSE_MESSAGE_TYPE = 918529; +// RESPONSE_MESSAGE_TYPE = 918529 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapValuesCodec.ts b/src/codec/TransactionalMapValuesCodec.ts index e8b6e41a9..c15a69610 100644 --- a/src/codec/TransactionalMapValuesCodec.ts +++ b/src/codec/TransactionalMapValuesCodec.ts @@ -28,7 +28,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0E1000 const REQUEST_MESSAGE_TYPE = 921600; // hex: 0x0E1001 -const RESPONSE_MESSAGE_TYPE = 921601; +// RESPONSE_MESSAGE_TYPE = 921601 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMapValuesWithPredicateCodec.ts b/src/codec/TransactionalMapValuesWithPredicateCodec.ts index c2d57597e..3e9bcedc5 100644 --- a/src/codec/TransactionalMapValuesWithPredicateCodec.ts +++ b/src/codec/TransactionalMapValuesWithPredicateCodec.ts @@ -28,7 +28,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x0E1100 const REQUEST_MESSAGE_TYPE = 921856; // hex: 0x0E1101 -const RESPONSE_MESSAGE_TYPE = 921857; +// RESPONSE_MESSAGE_TYPE = 921857 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMultiMapGetCodec.ts b/src/codec/TransactionalMultiMapGetCodec.ts index 1df83976a..baed2bc3b 100644 --- a/src/codec/TransactionalMultiMapGetCodec.ts +++ b/src/codec/TransactionalMultiMapGetCodec.ts @@ -28,7 +28,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x0F0200 const REQUEST_MESSAGE_TYPE = 983552; // hex: 0x0F0201 -const RESPONSE_MESSAGE_TYPE = 983553; +// RESPONSE_MESSAGE_TYPE = 983553 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMultiMapPutCodec.ts b/src/codec/TransactionalMultiMapPutCodec.ts index 4e529a70c..68e3fcc53 100644 --- a/src/codec/TransactionalMultiMapPutCodec.ts +++ b/src/codec/TransactionalMultiMapPutCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0F0100 const REQUEST_MESSAGE_TYPE = 983296; // hex: 0x0F0101 -const RESPONSE_MESSAGE_TYPE = 983297; +// RESPONSE_MESSAGE_TYPE = 983297 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMultiMapRemoveCodec.ts b/src/codec/TransactionalMultiMapRemoveCodec.ts index d95b1f705..f6e798185 100644 --- a/src/codec/TransactionalMultiMapRemoveCodec.ts +++ b/src/codec/TransactionalMultiMapRemoveCodec.ts @@ -28,7 +28,7 @@ import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; // hex: 0x0F0300 const REQUEST_MESSAGE_TYPE = 983808; // hex: 0x0F0301 -const RESPONSE_MESSAGE_TYPE = 983809; +// RESPONSE_MESSAGE_TYPE = 983809 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts index ea0002806..7ff2203f2 100644 --- a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts +++ b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0F0400 const REQUEST_MESSAGE_TYPE = 984064; // hex: 0x0F0401 -const RESPONSE_MESSAGE_TYPE = 984065; +// RESPONSE_MESSAGE_TYPE = 984065 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMultiMapSizeCodec.ts b/src/codec/TransactionalMultiMapSizeCodec.ts index d528a38e7..86f1c149d 100644 --- a/src/codec/TransactionalMultiMapSizeCodec.ts +++ b/src/codec/TransactionalMultiMapSizeCodec.ts @@ -25,7 +25,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x0F0600 const REQUEST_MESSAGE_TYPE = 984576; // hex: 0x0F0601 -const RESPONSE_MESSAGE_TYPE = 984577; +// RESPONSE_MESSAGE_TYPE = 984577 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalMultiMapValueCountCodec.ts b/src/codec/TransactionalMultiMapValueCountCodec.ts index 393d5a6f0..47dac13f6 100644 --- a/src/codec/TransactionalMultiMapValueCountCodec.ts +++ b/src/codec/TransactionalMultiMapValueCountCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x0F0500 const REQUEST_MESSAGE_TYPE = 984320; // hex: 0x0F0501 -const RESPONSE_MESSAGE_TYPE = 984321; +// RESPONSE_MESSAGE_TYPE = 984321 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalQueueOfferCodec.ts b/src/codec/TransactionalQueueOfferCodec.ts index 05af33ab4..27acbbd38 100644 --- a/src/codec/TransactionalQueueOfferCodec.ts +++ b/src/codec/TransactionalQueueOfferCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x120100 const REQUEST_MESSAGE_TYPE = 1179904; // hex: 0x120101 -const RESPONSE_MESSAGE_TYPE = 1179905; +// RESPONSE_MESSAGE_TYPE = 1179905 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalQueuePeekCodec.ts b/src/codec/TransactionalQueuePeekCodec.ts index 5ecb9051d..67db34c51 100644 --- a/src/codec/TransactionalQueuePeekCodec.ts +++ b/src/codec/TransactionalQueuePeekCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x120400 const REQUEST_MESSAGE_TYPE = 1180672; // hex: 0x120401 -const RESPONSE_MESSAGE_TYPE = 1180673; +// RESPONSE_MESSAGE_TYPE = 1180673 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalQueuePollCodec.ts b/src/codec/TransactionalQueuePollCodec.ts index ff3413936..70d9be2af 100644 --- a/src/codec/TransactionalQueuePollCodec.ts +++ b/src/codec/TransactionalQueuePollCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x120300 const REQUEST_MESSAGE_TYPE = 1180416; // hex: 0x120301 -const RESPONSE_MESSAGE_TYPE = 1180417; +// RESPONSE_MESSAGE_TYPE = 1180417 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalQueueSizeCodec.ts b/src/codec/TransactionalQueueSizeCodec.ts index 329117eac..58c8b1cc0 100644 --- a/src/codec/TransactionalQueueSizeCodec.ts +++ b/src/codec/TransactionalQueueSizeCodec.ts @@ -25,7 +25,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x120500 const REQUEST_MESSAGE_TYPE = 1180928; // hex: 0x120501 -const RESPONSE_MESSAGE_TYPE = 1180929; +// RESPONSE_MESSAGE_TYPE = 1180929 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalQueueTakeCodec.ts b/src/codec/TransactionalQueueTakeCodec.ts index b9d106613..1b2517608 100644 --- a/src/codec/TransactionalQueueTakeCodec.ts +++ b/src/codec/TransactionalQueueTakeCodec.ts @@ -28,7 +28,7 @@ import {CodecUtil} from './builtin/CodecUtil'; // hex: 0x120200 const REQUEST_MESSAGE_TYPE = 1180160; // hex: 0x120201 -const RESPONSE_MESSAGE_TYPE = 1180161; +// RESPONSE_MESSAGE_TYPE = 1180161 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalSetAddCodec.ts b/src/codec/TransactionalSetAddCodec.ts index bf8c9fec7..ad78913ee 100644 --- a/src/codec/TransactionalSetAddCodec.ts +++ b/src/codec/TransactionalSetAddCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x100100 const REQUEST_MESSAGE_TYPE = 1048832; // hex: 0x100101 -const RESPONSE_MESSAGE_TYPE = 1048833; +// RESPONSE_MESSAGE_TYPE = 1048833 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalSetRemoveCodec.ts b/src/codec/TransactionalSetRemoveCodec.ts index dec37a012..b87f0b6ef 100644 --- a/src/codec/TransactionalSetRemoveCodec.ts +++ b/src/codec/TransactionalSetRemoveCodec.ts @@ -27,7 +27,7 @@ import {DataCodec} from './builtin/DataCodec'; // hex: 0x100200 const REQUEST_MESSAGE_TYPE = 1049088; // hex: 0x100201 -const RESPONSE_MESSAGE_TYPE = 1049089; +// RESPONSE_MESSAGE_TYPE = 1049089 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; diff --git a/src/codec/TransactionalSetSizeCodec.ts b/src/codec/TransactionalSetSizeCodec.ts index 2963aa9db..f3194b2a0 100644 --- a/src/codec/TransactionalSetSizeCodec.ts +++ b/src/codec/TransactionalSetSizeCodec.ts @@ -25,7 +25,7 @@ import {StringCodec} from './builtin/StringCodec'; // hex: 0x100300 const REQUEST_MESSAGE_TYPE = 1049344; // hex: 0x100301 -const RESPONSE_MESSAGE_TYPE = 1049345; +// RESPONSE_MESSAGE_TYPE = 1049345 const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; From ef94dd78f9e47b02fb68865734bdc2580eddcdb0 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 21 Jul 2020 10:48:47 +0300 Subject: [PATCH 270/685] Update dependencies (#553) --- .eslintignore | 3 + .eslintrc.js | 42 + .gitignore | 5 + .mocharc.json | 4 + .npmignore | 26 +- .nvmrc | 1 - .nycrc.json | 4 + lib.es6.d.ts | 18650 ---------------- package.json | 121 +- src/BitsUtil.ts | 31 +- src/ClientInfo.ts | 2 +- src/ClientMessage.ts | 2 - src/HeartbeatManager.ts | 4 +- src/LoadBalancer.ts | 4 +- src/PartitionService.ts | 4 +- src/Util.ts | 86 +- src/aggregation/AggregatorFactory.ts | 1 - .../ClientAddClusterViewListenerCodec.ts | 2 +- ...ClientAddDistributedObjectListenerCodec.ts | 2 +- .../ClientAddPartitionLostListenerCodec.ts | 2 +- src/codec/ClientAuthenticationCodec.ts | 2 +- src/codec/ClientAuthenticationCustomCodec.ts | 2 +- src/codec/ClientCreateProxiesCodec.ts | 2 +- src/codec/ClientCreateProxyCodec.ts | 2 +- src/codec/ClientDeployClassesCodec.ts | 2 +- src/codec/ClientDestroyProxyCodec.ts | 2 +- src/codec/ClientGetDistributedObjectsCodec.ts | 2 +- src/codec/ClientLocalBackupListenerCodec.ts | 2 +- src/codec/ClientPingCodec.ts | 2 +- ...entRemoveDistributedObjectListenerCodec.ts | 2 +- .../ClientRemovePartitionLostListenerCodec.ts | 2 +- src/codec/ClientStatisticsCodec.ts | 2 +- .../ClientTriggerPartitionAssignmentCodec.ts | 2 +- src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 2 +- src/codec/ListAddAllCodec.ts | 2 +- src/codec/ListAddAllWithIndexCodec.ts | 2 +- src/codec/ListAddCodec.ts | 2 +- src/codec/ListAddListenerCodec.ts | 2 +- src/codec/ListAddWithIndexCodec.ts | 2 +- src/codec/ListClearCodec.ts | 2 +- src/codec/ListCompareAndRemoveAllCodec.ts | 2 +- src/codec/ListCompareAndRetainAllCodec.ts | 2 +- src/codec/ListContainsAllCodec.ts | 2 +- src/codec/ListContainsCodec.ts | 2 +- src/codec/ListGetAllCodec.ts | 2 +- src/codec/ListGetCodec.ts | 2 +- src/codec/ListIndexOfCodec.ts | 2 +- src/codec/ListIsEmptyCodec.ts | 2 +- src/codec/ListIteratorCodec.ts | 2 +- src/codec/ListLastIndexOfCodec.ts | 2 +- src/codec/ListListIteratorCodec.ts | 2 +- src/codec/ListRemoveCodec.ts | 2 +- src/codec/ListRemoveListenerCodec.ts | 2 +- src/codec/ListRemoveWithIndexCodec.ts | 2 +- src/codec/ListSetCodec.ts | 2 +- src/codec/ListSizeCodec.ts | 2 +- src/codec/ListSubCodec.ts | 2 +- src/codec/MapAddEntryListenerCodec.ts | 2 +- src/codec/MapAddEntryListenerToKeyCodec.ts | 2 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 2 +- .../MapAddEntryListenerWithPredicateCodec.ts | 2 +- src/codec/MapAddIndexCodec.ts | 2 +- src/codec/MapAddInterceptorCodec.ts | 2 +- ...apAddNearCacheInvalidationListenerCodec.ts | 2 +- src/codec/MapAddPartitionLostListenerCodec.ts | 2 +- src/codec/MapAggregateCodec.ts | 2 +- src/codec/MapAggregateWithPredicateCodec.ts | 2 +- src/codec/MapClearCodec.ts | 2 +- src/codec/MapContainsKeyCodec.ts | 2 +- src/codec/MapContainsValueCodec.ts | 2 +- src/codec/MapDeleteCodec.ts | 2 +- .../MapEntriesWithPagingPredicateCodec.ts | 2 +- src/codec/MapEntriesWithPredicateCodec.ts | 2 +- src/codec/MapEntrySetCodec.ts | 2 +- src/codec/MapEventJournalReadCodec.ts | 2 +- src/codec/MapEventJournalSubscribeCodec.ts | 2 +- src/codec/MapEvictAllCodec.ts | 2 +- src/codec/MapEvictCodec.ts | 2 +- src/codec/MapExecuteOnAllKeysCodec.ts | 2 +- src/codec/MapExecuteOnKeyCodec.ts | 2 +- src/codec/MapExecuteOnKeysCodec.ts | 2 +- src/codec/MapExecuteWithPredicateCodec.ts | 2 +- src/codec/MapFetchEntriesCodec.ts | 2 +- src/codec/MapFetchKeysCodec.ts | 2 +- ...FetchNearCacheInvalidationMetadataCodec.ts | 2 +- src/codec/MapFetchWithQueryCodec.ts | 2 +- src/codec/MapFlushCodec.ts | 2 +- src/codec/MapForceUnlockCodec.ts | 2 +- src/codec/MapGetAllCodec.ts | 2 +- src/codec/MapGetCodec.ts | 2 +- src/codec/MapGetEntryViewCodec.ts | 2 +- src/codec/MapIsEmptyCodec.ts | 2 +- src/codec/MapIsLockedCodec.ts | 2 +- src/codec/MapKeySetCodec.ts | 2 +- .../MapKeySetWithPagingPredicateCodec.ts | 2 +- src/codec/MapKeySetWithPredicateCodec.ts | 2 +- src/codec/MapLoadAllCodec.ts | 2 +- src/codec/MapLoadGivenKeysCodec.ts | 2 +- src/codec/MapLockCodec.ts | 2 +- src/codec/MapProjectCodec.ts | 2 +- src/codec/MapProjectWithPredicateCodec.ts | 2 +- src/codec/MapPutAllCodec.ts | 9 +- src/codec/MapPutCodec.ts | 2 +- src/codec/MapPutIfAbsentCodec.ts | 2 +- src/codec/MapPutIfAbsentWithMaxIdleCodec.ts | 2 +- src/codec/MapPutTransientCodec.ts | 2 +- src/codec/MapPutTransientWithMaxIdleCodec.ts | 2 +- src/codec/MapPutWithMaxIdleCodec.ts | 2 +- src/codec/MapRemoveAllCodec.ts | 2 +- src/codec/MapRemoveCodec.ts | 2 +- src/codec/MapRemoveEntryListenerCodec.ts | 2 +- src/codec/MapRemoveIfSameCodec.ts | 2 +- src/codec/MapRemoveInterceptorCodec.ts | 2 +- .../MapRemovePartitionLostListenerCodec.ts | 2 +- src/codec/MapReplaceCodec.ts | 2 +- src/codec/MapReplaceIfSameCodec.ts | 2 +- src/codec/MapSetCodec.ts | 2 +- src/codec/MapSetTtlCodec.ts | 2 +- src/codec/MapSetWithMaxIdleCodec.ts | 2 +- src/codec/MapSizeCodec.ts | 2 +- src/codec/MapSubmitToKeyCodec.ts | 2 +- src/codec/MapTryLockCodec.ts | 2 +- src/codec/MapTryPutCodec.ts | 2 +- src/codec/MapTryRemoveCodec.ts | 2 +- src/codec/MapUnlockCodec.ts | 2 +- src/codec/MapValuesCodec.ts | 2 +- .../MapValuesWithPagingPredicateCodec.ts | 2 +- src/codec/MapValuesWithPredicateCodec.ts | 2 +- src/codec/MultiMapAddEntryListenerCodec.ts | 2 +- .../MultiMapAddEntryListenerToKeyCodec.ts | 2 +- src/codec/MultiMapClearCodec.ts | 2 +- src/codec/MultiMapContainsEntryCodec.ts | 2 +- src/codec/MultiMapContainsKeyCodec.ts | 2 +- src/codec/MultiMapContainsValueCodec.ts | 2 +- src/codec/MultiMapDeleteCodec.ts | 2 +- src/codec/MultiMapEntrySetCodec.ts | 2 +- src/codec/MultiMapForceUnlockCodec.ts | 2 +- src/codec/MultiMapGetCodec.ts | 2 +- src/codec/MultiMapIsLockedCodec.ts | 2 +- src/codec/MultiMapKeySetCodec.ts | 2 +- src/codec/MultiMapLockCodec.ts | 2 +- src/codec/MultiMapPutAllCodec.ts | 43 + src/codec/MultiMapPutCodec.ts | 2 +- src/codec/MultiMapRemoveCodec.ts | 2 +- src/codec/MultiMapRemoveEntryCodec.ts | 2 +- src/codec/MultiMapRemoveEntryListenerCodec.ts | 2 +- src/codec/MultiMapSizeCodec.ts | 2 +- src/codec/MultiMapTryLockCodec.ts | 2 +- src/codec/MultiMapUnlockCodec.ts | 2 +- src/codec/MultiMapValueCountCodec.ts | 2 +- src/codec/MultiMapValuesCodec.ts | 2 +- src/codec/PNCounterAddCodec.ts | 2 +- src/codec/PNCounterGetCodec.ts | 2 +- ...PNCounterGetConfiguredReplicaCountCodec.ts | 2 +- src/codec/QueueAddAllCodec.ts | 2 +- src/codec/QueueAddListenerCodec.ts | 2 +- src/codec/QueueClearCodec.ts | 2 +- src/codec/QueueCompareAndRemoveAllCodec.ts | 2 +- src/codec/QueueCompareAndRetainAllCodec.ts | 2 +- src/codec/QueueContainsAllCodec.ts | 2 +- src/codec/QueueContainsCodec.ts | 2 +- src/codec/QueueDrainToCodec.ts | 2 +- src/codec/QueueDrainToMaxSizeCodec.ts | 2 +- src/codec/QueueIsEmptyCodec.ts | 2 +- src/codec/QueueIteratorCodec.ts | 2 +- src/codec/QueueOfferCodec.ts | 2 +- src/codec/QueuePeekCodec.ts | 2 +- src/codec/QueuePollCodec.ts | 2 +- src/codec/QueuePutCodec.ts | 2 +- src/codec/QueueRemainingCapacityCodec.ts | 2 +- src/codec/QueueRemoveCodec.ts | 2 +- src/codec/QueueRemoveListenerCodec.ts | 2 +- src/codec/QueueSizeCodec.ts | 2 +- src/codec/QueueTakeCodec.ts | 2 +- .../ReplicatedMapAddEntryListenerCodec.ts | 2 +- ...ReplicatedMapAddEntryListenerToKeyCodec.ts | 2 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 2 +- ...edMapAddEntryListenerWithPredicateCodec.ts | 2 +- ...icatedMapAddNearCacheEntryListenerCodec.ts | 2 +- src/codec/ReplicatedMapClearCodec.ts | 2 +- src/codec/ReplicatedMapContainsKeyCodec.ts | 2 +- src/codec/ReplicatedMapContainsValueCodec.ts | 2 +- src/codec/ReplicatedMapEntrySetCodec.ts | 2 +- src/codec/ReplicatedMapGetCodec.ts | 2 +- src/codec/ReplicatedMapIsEmptyCodec.ts | 2 +- src/codec/ReplicatedMapKeySetCodec.ts | 2 +- src/codec/ReplicatedMapPutAllCodec.ts | 2 +- src/codec/ReplicatedMapPutCodec.ts | 2 +- src/codec/ReplicatedMapRemoveCodec.ts | 2 +- .../ReplicatedMapRemoveEntryListenerCodec.ts | 2 +- src/codec/ReplicatedMapSizeCodec.ts | 2 +- src/codec/ReplicatedMapValuesCodec.ts | 2 +- src/codec/RingbufferAddAllCodec.ts | 2 +- src/codec/RingbufferAddCodec.ts | 2 +- src/codec/RingbufferCapacityCodec.ts | 2 +- src/codec/RingbufferHeadSequenceCodec.ts | 2 +- src/codec/RingbufferReadManyCodec.ts | 2 +- src/codec/RingbufferReadOneCodec.ts | 2 +- src/codec/RingbufferRemainingCapacityCodec.ts | 2 +- src/codec/RingbufferSizeCodec.ts | 2 +- src/codec/RingbufferTailSequenceCodec.ts | 2 +- src/codec/SetAddAllCodec.ts | 2 +- src/codec/SetAddCodec.ts | 2 +- src/codec/SetAddListenerCodec.ts | 2 +- src/codec/SetClearCodec.ts | 2 +- src/codec/SetCompareAndRemoveAllCodec.ts | 2 +- src/codec/SetCompareAndRetainAllCodec.ts | 2 +- src/codec/SetContainsAllCodec.ts | 2 +- src/codec/SetContainsCodec.ts | 2 +- src/codec/SetGetAllCodec.ts | 2 +- src/codec/SetIsEmptyCodec.ts | 2 +- src/codec/SetRemoveCodec.ts | 2 +- src/codec/SetRemoveListenerCodec.ts | 2 +- src/codec/SetSizeCodec.ts | 2 +- src/codec/TopicAddMessageListenerCodec.ts | 2 +- src/codec/TopicPublishCodec.ts | 2 +- src/codec/TopicRemoveMessageListenerCodec.ts | 2 +- src/codec/TransactionCommitCodec.ts | 2 +- src/codec/TransactionCreateCodec.ts | 2 +- src/codec/TransactionRollbackCodec.ts | 2 +- src/codec/TransactionalListAddCodec.ts | 2 +- src/codec/TransactionalListRemoveCodec.ts | 2 +- src/codec/TransactionalListSizeCodec.ts | 2 +- src/codec/TransactionalMapContainsKeyCodec.ts | 2 +- .../TransactionalMapContainsValueCodec.ts | 2 +- src/codec/TransactionalMapDeleteCodec.ts | 2 +- src/codec/TransactionalMapGetCodec.ts | 2 +- .../TransactionalMapGetForUpdateCodec.ts | 2 +- src/codec/TransactionalMapIsEmptyCodec.ts | 2 +- src/codec/TransactionalMapKeySetCodec.ts | 2 +- ...ransactionalMapKeySetWithPredicateCodec.ts | 2 +- src/codec/TransactionalMapPutCodec.ts | 2 +- src/codec/TransactionalMapPutIfAbsentCodec.ts | 2 +- src/codec/TransactionalMapRemoveCodec.ts | 2 +- .../TransactionalMapRemoveIfSameCodec.ts | 2 +- src/codec/TransactionalMapReplaceCodec.ts | 2 +- .../TransactionalMapReplaceIfSameCodec.ts | 2 +- src/codec/TransactionalMapSetCodec.ts | 2 +- src/codec/TransactionalMapSizeCodec.ts | 2 +- src/codec/TransactionalMapValuesCodec.ts | 2 +- ...ransactionalMapValuesWithPredicateCodec.ts | 2 +- src/codec/TransactionalMultiMapGetCodec.ts | 2 +- src/codec/TransactionalMultiMapPutCodec.ts | 2 +- src/codec/TransactionalMultiMapRemoveCodec.ts | 2 +- .../TransactionalMultiMapRemoveEntryCodec.ts | 2 +- src/codec/TransactionalMultiMapSizeCodec.ts | 2 +- .../TransactionalMultiMapValueCountCodec.ts | 2 +- src/codec/TransactionalQueueOfferCodec.ts | 2 +- src/codec/TransactionalQueuePeekCodec.ts | 2 +- src/codec/TransactionalQueuePollCodec.ts | 2 +- src/codec/TransactionalQueueSizeCodec.ts | 2 +- src/codec/TransactionalQueueTakeCodec.ts | 2 +- src/codec/TransactionalSetAddCodec.ts | 2 +- src/codec/TransactionalSetRemoveCodec.ts | 2 +- src/codec/TransactionalSetSizeCodec.ts | 2 +- src/codec/builtin/CodecUtil.ts | 2 +- src/codec/custom/AddressCodec.ts | 2 +- src/codec/custom/BitmapIndexOptionsCodec.ts | 2 +- .../custom/DistributedObjectInfoCodec.ts | 2 +- src/codec/custom/ErrorHolderCodec.ts | 2 +- src/codec/custom/IndexConfigCodec.ts | 2 +- .../custom/PagingPredicateHolderCodec.ts | 2 +- src/codec/custom/SimpleEntryViewCodec.ts | 2 +- src/codec/custom/StackTraceElementCodec.ts | 2 +- src/config/BitmapIndexOptions.ts | 4 +- src/config/ClientCloudConfig.ts | 2 +- src/config/ClientNetworkConfig.ts | 6 +- src/config/ConnectionRetryConfig.ts | 10 +- src/config/ConnectionStrategyConfig.ts | 8 +- src/config/FlakeIdGeneratorConfig.ts | 6 +- src/config/JsonConfigLocator.ts | 10 +- src/config/NearCacheConfig.ts | 12 +- src/config/ReliableTopicConfig.ts | 4 +- src/config/SSLConfig.ts | 2 +- src/config/SerializationConfig.ts | 6 +- src/core/Cluster.ts | 6 +- src/core/EventType.ts | 1 - src/core/InitialMembershipEvent.ts | 2 - src/core/UUID.ts | 14 +- src/core/VectorClock.ts | 4 - src/discovery/HazelcastCloudDiscovery.ts | 2 +- src/invocation/InvocationService.ts | 4 +- src/invocation/Murmur.ts | 23 +- src/listener/ClusterViewListenerService.ts | 2 +- src/nearcache/DataRecord.ts | 1 - src/nearcache/NearCache.ts | 9 +- src/nearcache/RepairingHandler.ts | 2 +- src/network/ClientConnection.ts | 10 +- src/network/ClientConnectionManager.ts | 8 +- src/protocol/PagingPredicateHolder.ts | 1 - src/proxy/BaseProxy.ts | 1 - src/proxy/IMap.ts | 1 - src/proxy/ListProxy.ts | 2 +- src/proxy/MapProxy.ts | 22 +- src/proxy/MultiMapProxy.ts | 15 +- src/proxy/PNCounterProxy.ts | 3 +- src/proxy/ProxyManager.ts | 2 +- src/proxy/QueueProxy.ts | 6 +- src/proxy/ReplicatedMap.ts | 2 +- src/proxy/ReplicatedMapProxy.ts | 6 +- src/proxy/Ringbuffer.ts | 6 +- src/proxy/SetProxy.ts | 4 +- src/proxy/flakeid/AutoBatcher.ts | 2 +- src/proxy/ringbuffer/ReadResultSet.ts | 4 +- .../topic/ReliableTopicListenerRunner.ts | 4 +- src/serialization/DefaultPredicates.ts | 2 +- src/serialization/DefaultSerializer.ts | 3 +- src/serialization/HeapData.ts | 8 +- src/serialization/ObjectData.ts | 3 - src/serialization/SerializationService.ts | 9 +- .../portable/ClassDefinitionBuilder.ts | 4 +- .../portable/DefaultPortableReader.ts | 18 +- .../portable/PortableSerializer.ts | 1 - src/statistics/Statistics.ts | 2 +- src/util/RoundRobinLB.ts | 1 - src/util/UuidUtil.ts | 3 +- test/LoggingTest.js | 10 +- test/mocha.opts | 1 - .../unit/protocol/ClientMessageFramingTest.js | 2 +- tsconfig.json | 6 +- tslint.json | 65 - 321 files changed, 592 insertions(+), 19317 deletions(-) create mode 100644 .eslintignore create mode 100644 .eslintrc.js create mode 100644 .mocharc.json delete mode 100644 .nvmrc create mode 100644 .nycrc.json delete mode 100644 lib.es6.d.ts create mode 100644 src/codec/MultiMapPutAllCodec.ts delete mode 100644 test/mocha.opts delete mode 100644 tslint.json diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..1261f4a31 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,3 @@ +node_modules +lib +coverage diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 000000000..50d669f8c --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +module.exports = { + root: true, + parser: '@typescript-eslint/parser', + plugins: [ + '@typescript-eslint', + ], + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/eslint-recommended', + 'plugin:@typescript-eslint/recommended', + ], + rules: { + '@typescript-eslint/interface-name-prefix': 0, + '@typescript-eslint/no-empty-interface': 0, + '@typescript-eslint/no-explicit-any': 0, + '@typescript-eslint/no-unused-vars': [ + 'error', + { + 'args': 'none', + } + ], + 'no-prototype-builtins': 0, + 'prefer-rest-params': 0, + 'max-len': [2, 130, 4] + } +}; diff --git a/.gitignore b/.gitignore index 494ea9a03..5a74a1f56 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,9 @@ docs/ # Mac desktop service store files *.DS_Store + package-lock.json + +# Coverage +.nyc_output/* +coverage diff --git a/.mocharc.json b/.mocharc.json new file mode 100644 index 000000000..8f858acc2 --- /dev/null +++ b/.mocharc.json @@ -0,0 +1,4 @@ +{ + "timeout": 8000, + "exit": true +} diff --git a/.npmignore b/.npmignore index d78d0f61f..9f6f07cae 100644 --- a/.npmignore +++ b/.npmignore @@ -1,16 +1,20 @@ -src/ -coverage/ .idea/ -tslint.json -*.iml -.editorconfig -.jshintrc -test/ -docs/ -code_samples/ +.nyc_output/ benchmark/ +code_samples/ +coverage/ +docs/ scripts/ +src/ +test/ +.editorconfig +.eslintignore +.eslintrc.js +.mocharc.json +.nycrc.json +DOCUMENTATION.md +download-remote-controller.js +*.iml +.editorconfig *.jar *.log -download-remote-controller.js -DOCUMENTATION.md diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index 2bf5ad044..000000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -stable diff --git a/.nycrc.json b/.nycrc.json new file mode 100644 index 000000000..e4d19e164 --- /dev/null +++ b/.nycrc.json @@ -0,0 +1,4 @@ +{ + "cache": "false", + "reporter": "cobertura" +} diff --git a/lib.es6.d.ts b/lib.es6.d.ts deleted file mode 100644 index 59cc51b5d..000000000 --- a/lib.es6.d.ts +++ /dev/null @@ -1,18650 +0,0 @@ -/*! ***************************************************************************** -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed 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 - -THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. -***************************************************************************** */ - -/// -declare type PropertyKey = string | number | symbol; - -interface Symbol { - /** Returns a string representation of an object. */ - toString(): string; - - /** Returns the primitive value of the specified object. */ - valueOf(): Object; - - [Symbol.toStringTag]: "Symbol"; -} - -interface SymbolConstructor { - /** - * A reference to the prototype. - */ - prototype: Symbol; - - /** - * Returns a new unique Symbol value. - * @param description Description of the new Symbol object. - */ - (description?: string|number): symbol; - - /** - * Returns a Symbol object from the global symbol registry matching the given key if found. - * Otherwise, returns a new symbol with this key. - * @param key key to search for. - */ - for(key: string): symbol; - - /** - * Returns a key from the global symbol registry matching the given Symbol if found. - * Otherwise, returns a undefined. - * @param sym Symbol to find the key for. - */ - keyFor(sym: symbol): string; - - // Well-known Symbols - - /** - * A method that determines if a constructor object recognizes an object as one of the - * constructor’s instances. Called by the semantics of the instanceof operator. - */ - hasInstance: symbol; - - /** - * A Boolean value that if true indicates that an object should flatten to its array elements - * by Array.prototype.concat. - */ - isConcatSpreadable: symbol; - - /** - * A method that returns the default iterator for an object. Called by the semantics of the - * for-of statement. - */ - iterator: symbol; - - /** - * A regular expression method that matches the regular expression against a string. Called - * by the String.prototype.match method. - */ - match: symbol; - - /** - * A regular expression method that replaces matched substrings of a string. Called by the - * String.prototype.replace method. - */ - replace: symbol; - - /** - * A regular expression method that returns the index within a string that matches the - * regular expression. Called by the String.prototype.search method. - */ - search: symbol; - - /** - * A function valued property that is the constructor function that is used to create - * derived objects. - */ - species: symbol; - - /** - * A regular expression method that splits a string at the indices that match the regular - * expression. Called by the String.prototype.split method. - */ - split: symbol; - - /** - * A method that converts an object to a corresponding primitive value. - * Called by the ToPrimitive abstract operation. - */ - toPrimitive: symbol; - - /** - * A String value that is used in the creation of the default string description of an object. - * Called by the built-in method Object.prototype.toString. - */ - toStringTag: symbol; - - /** - * An Object whose own property names are property names that are excluded from the 'with' - * environment bindings of the associated objects. - */ - unscopables: symbol; -} -declare var Symbol: SymbolConstructor; - -interface Object { - /** - * Determines whether an object has a property with the specified name. - * @param v A property name. - */ - hasOwnProperty(v: PropertyKey): boolean; - - /** - * Determines whether a specified property is enumerable. - * @param v A property name. - */ - propertyIsEnumerable(v: PropertyKey): boolean; -} - -interface ObjectConstructor { - /** - * Copy the values of all of the enumerable own properties from one or more source objects to a - * target object. Returns the target object. - * @param target The target object to copy to. - * @param source The source object from which to copy properties. - */ - assign(target: T, source: U): T & U; - - /** - * Copy the values of all of the enumerable own properties from one or more source objects to a - * target object. Returns the target object. - * @param target The target object to copy to. - * @param source1 The first source object from which to copy properties. - * @param source2 The second source object from which to copy properties. - */ - assign(target: T, source1: U, source2: V): T & U & V; - - /** - * Copy the values of all of the enumerable own properties from one or more source objects to a - * target object. Returns the target object. - * @param target The target object to copy to. - * @param source1 The first source object from which to copy properties. - * @param source2 The second source object from which to copy properties. - * @param source3 The third source object from which to copy properties. - */ - assign(target: T, source1: U, source2: V, source3: W): T & U & V & W; - - /** - * Copy the values of all of the enumerable own properties from one or more source objects to a - * target object. Returns the target object. - * @param target The target object to copy to. - * @param sources One or more source objects from which to copy properties - */ - assign(target: any, ...sources: any[]): any; - - /** - * Returns an array of all symbol properties found directly on object o. - * @param o Object to retrieve the symbols from. - */ - getOwnPropertySymbols(o: any): symbol[]; - - /** - * Returns true if the values are the same value, false otherwise. - * @param value1 The first value. - * @param value2 The second value. - */ - is(value1: any, value2: any): boolean; - - /** - * Sets the prototype of a specified object o to object proto or null. Returns the object o. - * @param o The object to change its prototype. - * @param proto The value of the new prototype or null. - */ - setPrototypeOf(o: any, proto: any): any; - - /** - * Gets the own property descriptor of the specified object. - * An own property descriptor is one that is defined directly on the object and is not - * inherited from the object's prototype. - * @param o Object that contains the property. - * @param p Name of the property. - */ - getOwnPropertyDescriptor(o: any, propertyKey: PropertyKey): PropertyDescriptor; - - /** - * Adds a property to an object, or modifies attributes of an existing property. - * @param o Object on which to add or modify the property. This can be a native JavaScript - * object (that is, a user-defined object or a built in object) or a DOM object. - * @param p The property name. - * @param attributes Descriptor for the property. It can be for a data property or an accessor - * property. - */ - defineProperty(o: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): any; -} - -interface Function { - /** - * Returns the name of the function. Function names are read-only and can not be changed. - */ - name: string; - - /** - * Determines whether the given value inherits from this function if this function was used - * as a constructor function. - * - * A constructor function can control which objects are recognized as its instances by - * 'instanceof' by overriding this method. - */ - [Symbol.hasInstance](value: any): boolean; -} - -interface NumberConstructor { - /** - * The value of Number.EPSILON is the difference between 1 and the smallest value greater than 1 - * that is representable as a Number value, which is approximately: - * 2.2204460492503130808472633361816 x 10‍−‍16. - */ - EPSILON: number; - - /** - * Returns true if passed value is finite. - * Unlike the global isFininte, Number.isFinite doesn't forcibly convert the parameter to a - * number. Only finite values of the type number, result in true. - * @param number A numeric value. - */ - isFinite(number: number): boolean; - - /** - * Returns true if the value passed is an integer, false otherwise. - * @param number A numeric value. - */ - isInteger(number: number): boolean; - - /** - * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a - * number). Unlike the global isNaN(), Number.isNaN() doesn't forcefully convert the parameter - * to a number. Only values of the type number, that are also NaN, result in true. - * @param number A numeric value. - */ - isNaN(number: number): boolean; - - /** - * Returns true if the value passed is a safe integer. - * @param number A numeric value. - */ - isSafeInteger(number: number): boolean; - - /** - * The value of the largest integer n such that n and n + 1 are both exactly representable as - * a Number value. - * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1. - */ - MAX_SAFE_INTEGER: number; - - /** - * The value of the smallest integer n such that n and n − 1 are both exactly representable as - * a Number value. - * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)). - */ - MIN_SAFE_INTEGER: number; - - /** - * Converts a string to a floating-point number. - * @param string A string that contains a floating-point number. - */ - parseFloat(string: string): number; - - /** - * Converts A string to an integer. - * @param s A string to convert into a number. - * @param radix A value between 2 and 36 that specifies the base of the number in numString. - * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal. - * All other strings are considered decimal. - */ - parseInt(string: string, radix?: number): number; -} - -interface Array { - /** Iterator */ - [Symbol.iterator](): IterableIterator; - - /** - * Returns an object whose properties have the value 'true' - * when they will be absent when used in a 'with' statement. - */ - [Symbol.unscopables](): { - copyWithin: boolean; - entries: boolean; - fill: boolean; - find: boolean; - findIndex: boolean; - keys: boolean; - values: boolean; - }; - - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, T]>; - - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: T, index: number, obj: Array) => boolean, thisArg?: any): T; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: T) => boolean, thisArg?: any): number; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: T, start?: number, end?: number): T[]; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): T[]; -} - -interface IArguments { - /** Iterator */ - [Symbol.iterator](): IterableIterator; -} - -interface ArrayConstructor { - /** - * Creates an array from an array-like object. - * @param arrayLike An array-like object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn: (v: T, k: number) => U, thisArg?: any): Array; - - /** - * Creates an array from an iterable object. - * @param iterable An iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(iterable: Iterable, mapfn: (v: T, k: number) => U, thisArg?: any): Array; - - /** - * Creates an array from an array-like object. - * @param arrayLike An array-like object to convert to an array. - */ - from(arrayLike: ArrayLike): Array; - - /** - * Creates an array from an iterable object. - * @param iterable An iterable object to convert to an array. - */ - from(iterable: Iterable): Array; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: T[]): Array; -} - -interface String { - /** Iterator */ - [Symbol.iterator](): IterableIterator; - - /** - * Returns a nonnegative integer Number less than 1114112 (0x110000) that is the code point - * value of the UTF-16 encoded code point starting at the string element at position pos in - * the String resulting from converting this object to a String. - * If there is no element at that position, the result is undefined. - * If a valid UTF-16 surrogate pair does not begin at pos, the result is the code unit at pos. - */ - codePointAt(pos: number): number; - - /** - * Returns true if searchString appears as a substring of the result of converting this - * object to a String, at one or more positions that are - * greater than or equal to position; otherwise, returns false. - * @param searchString search string - * @param position If position is undefined, 0 is assumed, so as to search all of the String. - */ - includes(searchString: string, position?: number): boolean; - - /** - * Returns true if the sequence of elements of searchString converted to a String is the - * same as the corresponding elements of this object (converted to a String) starting at - * endPosition – length(this). Otherwise returns false. - */ - endsWith(searchString: string, endPosition?: number): boolean; - - /** - * Returns the String value result of normalizing the string into the normalization form - * named by form as specified in Unicode Standard Annex #15, Unicode Normalization Forms. - * @param form Applicable values: "NFC", "NFD", "NFKC", or "NFKD", If not specified default - * is "NFC" - */ - normalize(form?: string): string; - - /** - * Returns a String value that is made from count copies appended together. If count is 0, - * T is the empty String is returned. - * @param count number of copies to append - */ - repeat(count: number): string; - - /** - * Returns true if the sequence of elements of searchString converted to a String is the - * same as the corresponding elements of this object (converted to a String) starting at - * position. Otherwise returns false. - */ - startsWith(searchString: string, position?: number): boolean; - - // Overloads for objects with methods of well-known symbols. - - /** - * Matches a string an object that supports being matched against, and returns an array containing the results of that search. - * @param matcher An object that supports being matched against. - */ - match(matcher: { [Symbol.match](string: string): RegExpMatchArray; }): RegExpMatchArray; - - /** - * Replaces text in a string, using an object that supports replacement within a string. - * @param searchValue A object can search for and replace matches within a string. - * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string. - */ - replace(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string; - - /** - * Replaces text in a string, using an object that supports replacement within a string. - * @param searchValue A object can search for and replace matches within a string. - * @param replacer A function that returns the replacement text. - */ - replace(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string; - - /** - * Finds the first substring match in a regular expression search. - * @param searcher An object which supports searching within a string. - */ - search(searcher: { [Symbol.search](string: string): number; }): number; - - /** - * Split a string into substrings using the specified separator and return them as an array. - * @param splitter An object that can split a string. - * @param limit A value used to limit the number of elements returned in the array. - */ - split(splitter: { [Symbol.split](string: string, limit?: number): string[]; }, limit?: number): string[]; - - /** - * Returns an HTML anchor element and sets the name attribute to the text value - * @param name - */ - anchor(name: string): string; - - /** Returns a HTML element */ - big(): string; - - /** Returns a HTML element */ - blink(): string; - - /** Returns a HTML element */ - bold(): string; - - /** Returns a HTML element */ - fixed(): string - - /** Returns a HTML element and sets the color attribute value */ - fontcolor(color: string): string - - /** Returns a HTML element and sets the size attribute value */ - fontsize(size: number): string; - - /** Returns a HTML element and sets the size attribute value */ - fontsize(size: string): string; - - /** Returns an HTML element */ - italics(): string; - - /** Returns an HTML element and sets the href attribute value */ - link(url: string): string; - - /** Returns a HTML element */ - small(): string; - - /** Returns a HTML element */ - strike(): string; - - /** Returns a HTML element */ - sub(): string; - - /** Returns a HTML element */ - sup(): string; -} - -interface StringConstructor { - /** - * Return the String value whose elements are, in order, the elements in the List elements. - * If length is 0, the empty string is returned. - */ - fromCodePoint(...codePoints: number[]): string; - - /** - * String.raw is intended for use as a tag function of a Tagged Template String. When called - * as such the first argument will be a well formed template call site object and the rest - * parameter will contain the substitution values. - * @param template A well-formed template string call site representation. - * @param substitutions A set of substitution values. - */ - raw(template: TemplateStringsArray, ...substitutions: any[]): string; -} - -interface IteratorResult { - done: boolean; - value?: T; -} - -interface Iterator { - next(value?: any): IteratorResult; - return?(value?: any): IteratorResult; - throw?(e?: any): IteratorResult; -} - -interface Iterable { - [Symbol.iterator](): Iterator; -} - -interface IterableIterator extends Iterator { - [Symbol.iterator](): IterableIterator; -} - -interface GeneratorFunction extends Function { - [Symbol.toStringTag]: "GeneratorFunction"; -} - -interface GeneratorFunctionConstructor { - /** - * Creates a new Generator function. - * @param args A list of arguments the function accepts. - */ - new (...args: string[]): GeneratorFunction; - (...args: string[]): GeneratorFunction; - prototype: GeneratorFunction; -} -declare var GeneratorFunction: GeneratorFunctionConstructor; - -interface Math { - /** - * Returns the number of leading zero bits in the 32-bit binary representation of a number. - * @param x A numeric expression. - */ - clz32(x: number): number; - - /** - * Returns the result of 32-bit multiplication of two numbers. - * @param x First number - * @param y Second number - */ - imul(x: number, y: number): number; - - /** - * Returns the sign of the x, indicating whether x is positive, negative or zero. - * @param x The numeric expression to test - */ - sign(x: number): number; - - /** - * Returns the base 10 logarithm of a number. - * @param x A numeric expression. - */ - log10(x: number): number; - - /** - * Returns the base 2 logarithm of a number. - * @param x A numeric expression. - */ - log2(x: number): number; - - /** - * Returns the natural logarithm of 1 + x. - * @param x A numeric expression. - */ - log1p(x: number): number; - - /** - * Returns the result of (e^x - 1) of x (e raised to the power of x, where e is the base of - * the natural logarithms). - * @param x A numeric expression. - */ - expm1(x: number): number; - - /** - * Returns the hyperbolic cosine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - cosh(x: number): number; - - /** - * Returns the hyperbolic sine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - sinh(x: number): number; - - /** - * Returns the hyperbolic tangent of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - tanh(x: number): number; - - /** - * Returns the inverse hyperbolic cosine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - acosh(x: number): number; - - /** - * Returns the inverse hyperbolic sine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - asinh(x: number): number; - - /** - * Returns the inverse hyperbolic tangent of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - atanh(x: number): number; - - /** - * Returns the square root of the sum of squares of its arguments. - * @param values Values to compute the square root for. - * If no arguments are passed, the result is +0. - * If there is only one argument, the result is the absolute value. - * If any argument is +Infinity or -Infinity, the result is +Infinity. - * If any argument is NaN, the result is NaN. - * If all arguments are either +0 or −0, the result is +0. - */ - hypot(...values: number[] ): number; - - /** - * Returns the integral part of the a numeric expression, x, removing any fractional digits. - * If x is already an integer, the result is x. - * @param x A numeric expression. - */ - trunc(x: number): number; - - /** - * Returns the nearest single precision float representation of a number. - * @param x A numeric expression. - */ - fround(x: number): number; - - /** - * Returns an implementation-dependent approximation to the cube root of number. - * @param x A numeric expression. - */ - cbrt(x: number): number; - - [Symbol.toStringTag]: "Math"; -} - -interface Date { - /** - * Converts a Date object to a string. - */ - [Symbol.toPrimitive](hint: "default"): string; - /** - * Converts a Date object to a string. - */ - [Symbol.toPrimitive](hint: "string"): string; - /** - * Converts a Date object to a number. - */ - [Symbol.toPrimitive](hint: "number"): number; - /** - * Converts a Date object to a string or number. - * - * @param hint The strings "number", "string", or "default" to specify what primitive to return. - * - * @throws {TypeError} If 'hint' was given something other than "number", "string", or "default". - * @returns A number if 'hint' was "number", a string if 'hint' was "string" or "default". - */ - [Symbol.toPrimitive](hint: string): string | number; -} - -interface RegExp { - /** - * Matches a string with this regular expression, and returns an array containing the results of - * that search. - * @param string A string to search within. - */ - [Symbol.match](string: string): RegExpMatchArray; - - /** - * Replaces text in a string, using this regular expression. - * @param string A String object or string literal whose contents matching against - * this regular expression will be replaced - * @param replaceValue A String object or string literal containing the text to replace for every - * successful match of this regular expression. - */ - [Symbol.replace](string: string, replaceValue: string): string; - - /** - * Replaces text in a string, using this regular expression. - * @param string A String object or string literal whose contents matching against - * this regular expression will be replaced - * @param replacer A function that returns the replacement text. - */ - [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; - - /** - * Finds the position beginning first substring match in a regular expression search - * using this regular expression. - * - * @param string The string to search within. - */ - [Symbol.search](string: string): number; - - /** - * Returns an array of substrings that were delimited by strings in the original input that - * match against this regular expression. - * - * If the regular expression contains capturing parentheses, then each time this - * regular expression matches, the results (including any undefined results) of the - * capturing parentheses are spliced. - * - * @param string string value to split - * @param limit if not undefined, the output array is truncated so that it contains no more - * than 'limit' elements. - */ - [Symbol.split](string: string, limit?: number): string[]; - - /** - * Returns a string indicating the flags of the regular expression in question. This field is read-only. - * The characters in this string are sequenced and concatenated in the following order: - * - * - "g" for global - * - "i" for ignoreCase - * - "m" for multiline - * - "u" for unicode - * - "y" for sticky - * - * If no flags are set, the value is the empty string. - */ - flags: string; - - /** - * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular - * expression. Default is false. Read-only. - */ - sticky: boolean; - - /** - * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular - * expression. Default is false. Read-only. - */ - unicode: boolean; -} - -interface RegExpConstructor { - [Symbol.species](): RegExpConstructor; -} - -interface Map { - clear(): void; - delete(key: K): boolean; - entries(): IterableIterator<[K, V]>; - forEach(callbackfn: (value: V, index: K, map: Map) => void, thisArg?: any): void; - get(key: K): V; - has(key: K): boolean; - keys(): IterableIterator; - set(key: K, value?: V): Map; - size: number; - values(): IterableIterator; - [Symbol.iterator]():IterableIterator<[K,V]>; - [Symbol.toStringTag]: "Map"; -} - -interface MapConstructor { - new (): Map; - new (): Map; - new (iterable: Iterable<[K, V]>): Map; - prototype: Map; -} -declare var Map: MapConstructor; - -interface WeakMap { - delete(key: K): boolean; - get(key: K): V; - has(key: K): boolean; - set(key: K, value?: V): WeakMap; - [Symbol.toStringTag]: "WeakMap"; -} - -interface WeakMapConstructor { - new (): WeakMap; - new (): WeakMap; - new (iterable: Iterable<[K, V]>): WeakMap; - prototype: WeakMap; -} -declare var WeakMap: WeakMapConstructor; - -interface Set { - add(value: T): Set; - clear(): void; - delete(value: T): boolean; - entries(): IterableIterator<[T, T]>; - forEach(callbackfn: (value: T, index: T, set: Set) => void, thisArg?: any): void; - has(value: T): boolean; - keys(): IterableIterator; - size: number; - values(): IterableIterator; - [Symbol.iterator]():IterableIterator; - [Symbol.toStringTag]: "Set"; -} - -interface SetConstructor { - new (): Set; - new (): Set; - new (iterable: Iterable): Set; - prototype: Set; -} -declare var Set: SetConstructor; - -interface WeakSet { - add(value: T): WeakSet; - delete(value: T): boolean; - has(value: T): boolean; - [Symbol.toStringTag]: "WeakSet"; -} - -interface WeakSetConstructor { - new (): WeakSet; - new (): WeakSet; - new (iterable: Iterable): WeakSet; - prototype: WeakSet; -} -declare var WeakSet: WeakSetConstructor; - -interface JSON { - [Symbol.toStringTag]: "JSON"; -} - -/** - * Represents a raw buffer of binary data, which is used to store data for the - * different typed arrays. ArrayBuffers cannot be read from or written to directly, - * but can be passed to a typed array or DataView Object to interpret the raw - * buffer as needed. - */ -interface ArrayBuffer { - [Symbol.toStringTag]: "ArrayBuffer"; -} - -interface DataView { - [Symbol.toStringTag]: "DataView"; -} - -/** - * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested - * number of bytes could not be allocated an exception is raised. - */ -interface Int8Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Int8Array"; -} - -interface Int8ArrayConstructor { - new (elements: Iterable): Int8Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array; -} - -/** - * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Uint8Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "UInt8Array"; -} - -interface Uint8ArrayConstructor { - new (elements: Iterable): Uint8Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array; -} - -/** - * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. - * If the requested number of bytes could not be allocated an exception is raised. - */ -interface Uint8ClampedArray { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Uint8ClampedArray"; -} - -interface Uint8ClampedArrayConstructor { - new (elements: Iterable): Uint8ClampedArray; - - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray; -} - -/** - * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Int16Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - - - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Int16Array"; -} - -interface Int16ArrayConstructor { - new (elements: Iterable): Int16Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array; -} - -/** - * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Uint16Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Uint16Array"; -} - -interface Uint16ArrayConstructor { - new (elements: Iterable): Uint16Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array; -} - -/** - * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Int32Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Int32Array"; -} - -interface Int32ArrayConstructor { - new (elements: Iterable): Int32Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array; -} - -/** - * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Uint32Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Uint32Array"; -} - -interface Uint32ArrayConstructor { - new (elements: Iterable): Uint32Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array; -} - -/** - * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number - * of bytes could not be allocated an exception is raised. - */ -interface Float32Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Float32Array"; -} - -interface Float32ArrayConstructor { - new (elements: Iterable): Float32Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array; -} - -/** - * A typed array of 64-bit float values. The contents are initialized to 0. If the requested - * number of bytes could not be allocated an exception is raised. - */ -interface Float64Array { - /** - * Returns an array of key, value pairs for every entry in the array - */ - entries(): IterableIterator<[number, number]>; - /** - * Returns an list of keys in the array - */ - keys(): IterableIterator; - /** - * Returns an list of values in the array - */ - values(): IterableIterator; - [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Float64Array"; -} - -interface Float64ArrayConstructor { - new (elements: Iterable): Float64Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: Iterable, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array; -} - -interface ProxyHandler { - getPrototypeOf? (target: T): any; - setPrototypeOf? (target: T, v: any): boolean; - isExtensible? (target: T): boolean; - preventExtensions? (target: T): boolean; - getOwnPropertyDescriptor? (target: T, p: PropertyKey): PropertyDescriptor; - has? (target: T, p: PropertyKey): boolean; - get? (target: T, p: PropertyKey, receiver: any): any; - set? (target: T, p: PropertyKey, value: any, receiver: any): boolean; - deleteProperty? (target: T, p: PropertyKey): boolean; - defineProperty? (target: T, p: PropertyKey, attributes: PropertyDescriptor): boolean; - enumerate? (target: T): PropertyKey[]; - ownKeys? (target: T): PropertyKey[]; - apply? (target: T, thisArg: any, argArray?: any): any; - construct? (target: T, thisArg: any, argArray?: any): any; -} - -interface ProxyConstructor { - revocable(target: T, handler: ProxyHandler): { proxy: T; revoke: () => void; }; - new (target: T, handler: ProxyHandler): T -} -declare var Proxy: ProxyConstructor; - -declare namespace Reflect { - function apply(target: Function, thisArgument: any, argumentsList: ArrayLike): any; - function construct(target: Function, argumentsList: ArrayLike, newTarget?: any): any; - function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean; - function deleteProperty(target: any, propertyKey: PropertyKey): boolean; - function enumerate(target: any): IterableIterator; - function get(target: any, propertyKey: PropertyKey, receiver?: any): any; - function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor; - function getPrototypeOf(target: any): any; - function has(target: any, propertyKey: string): boolean; - function has(target: any, propertyKey: symbol): boolean; - function isExtensible(target: any): boolean; - function ownKeys(target: any): Array; - function preventExtensions(target: any): boolean; - function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean; - function setPrototypeOf(target: any, proto: any): boolean; -} - -/** - * Represents the completion of an asynchronous operation - */ -interface Promise { - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): Promise; - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => void): Promise; - - /** - * Attaches a callback for only the rejection of the Promise. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of the callback. - */ - catch(onrejected?: (reason: any) => T | PromiseLike): Promise; - catch(onrejected?: (reason: any) => void): Promise; - - [Symbol.toStringTag]: "Promise"; -} - -interface PromiseConstructor { - /** - * A reference to the prototype. - */ - prototype: Promise; - - /** - * Creates a new Promise. - * @param executor A callback used to initialize the promise. This callback is passed two arguments: - * a resolve callback used resolve the promise with a value or the result of another promise, - * and a reject callback used to reject the promise with a provided reason or error. - */ - new (executor: (resolve: (value?: T | PromiseLike) => void, reject: (reason?: any) => void) => void): Promise; - - /** - * Creates a Promise that is resolved with an array of results when all of the provided Promises - * resolve, or rejected when any Promise is rejected. - * @param values An array of Promises. - * @returns A new Promise. - */ - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike, T4 | PromiseLike , T5 | PromiseLike, T6 | PromiseLike, T7 | PromiseLike, T8 | PromiseLike, T9 | PromiseLike, T10 | PromiseLike]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike, T4 | PromiseLike , T5 | PromiseLike, T6 | PromiseLike, T7 | PromiseLike, T8 | PromiseLike, T9 | PromiseLike]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike, T4 | PromiseLike , T5 | PromiseLike, T6 | PromiseLike, T7 | PromiseLike, T8 | PromiseLike]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike, T4 | PromiseLike , T5 | PromiseLike, T6 | PromiseLike, T7 | PromiseLike]): Promise<[T1, T2, T3, T4, T5, T6, T7]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike, T4 | PromiseLike , T5 | PromiseLike, T6 | PromiseLike]): Promise<[T1, T2, T3, T4, T5, T6]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike, T4 | PromiseLike , T5 | PromiseLike]): Promise<[T1, T2, T3, T4, T5]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike, T4 | PromiseLike ]): Promise<[T1, T2, T3, T4]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike, T3 | PromiseLike]): Promise<[T1, T2, T3]>; - all(values: [T1 | PromiseLike, T2 | PromiseLike]): Promise<[T1, T2]>; - all(values: Iterable>): Promise; - - /** - * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved - * or rejected. - * @param values An array of Promises. - * @returns A new Promise. - */ - race(values: Iterable>): Promise; - - /** - * Creates a new rejected promise for the provided reason. - * @param reason The reason the promise was rejected. - * @returns A new rejected Promise. - */ - reject(reason: any): Promise; - - /** - * Creates a new rejected promise for the provided reason. - * @param reason The reason the promise was rejected. - * @returns A new rejected Promise. - */ - reject(reason: any): Promise; - - /** - * Creates a new resolved promise for the provided value. - * @param value A promise. - * @returns A promise whose internal state matches the provided promise. - */ - resolve(value: T | PromiseLike): Promise; - - /** - * Creates a new resolved promise . - * @returns A resolved promise. - */ - resolve(): Promise; - - [Symbol.species]: Function; -} - -declare var Promise: PromiseConstructor; -///////////////////////////// -/// ECMAScript APIs -///////////////////////////// - -declare var NaN: number; -declare var Infinity: number; - -/** - * Evaluates JavaScript code and executes it. - * @param x A String value that contains valid JavaScript code. - */ -declare function eval(x: string): any; - -/** - * Converts A string to an integer. - * @param s A string to convert into a number. - * @param radix A value between 2 and 36 that specifies the base of the number in numString. - * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal. - * All other strings are considered decimal. - */ -declare function parseInt(s: string, radix?: number): number; - -/** - * Converts a string to a floating-point number. - * @param string A string that contains a floating-point number. - */ -declare function parseFloat(string: string): number; - -/** - * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a number). - * @param number A numeric value. - */ -declare function isNaN(number: number): boolean; - -/** - * Determines whether a supplied number is finite. - * @param number Any numeric value. - */ -declare function isFinite(number: number): boolean; - -/** - * Gets the unencoded version of an encoded Uniform Resource Identifier (URI). - * @param encodedURI A value representing an encoded URI. - */ -declare function decodeURI(encodedURI: string): string; - -/** - * Gets the unencoded version of an encoded component of a Uniform Resource Identifier (URI). - * @param encodedURIComponent A value representing an encoded URI component. - */ -declare function decodeURIComponent(encodedURIComponent: string): string; - -/** - * Encodes a text string as a valid Uniform Resource Identifier (URI) - * @param uri A value representing an encoded URI. - */ -declare function encodeURI(uri: string): string; - -/** - * Encodes a text string as a valid component of a Uniform Resource Identifier (URI). - * @param uriComponent A value representing an encoded URI component. - */ -declare function encodeURIComponent(uriComponent: string): string; - -interface PropertyDescriptor { - configurable?: boolean; - enumerable?: boolean; - value?: any; - writable?: boolean; - get? (): any; - set? (v: any): void; -} - -interface PropertyDescriptorMap { - [s: string]: PropertyDescriptor; -} - -interface Object { - /** The initial value of Object.prototype.constructor is the standard built-in Object constructor. */ - constructor: Function; - - /** Returns a string representation of an object. */ - toString(): string; - - /** Returns a date converted to a string using the current locale. */ - toLocaleString(): string; - - /** Returns the primitive value of the specified object. */ - valueOf(): Object; - - /** - * Determines whether an object has a property with the specified name. - * @param v A property name. - */ - hasOwnProperty(v: string): boolean; - - /** - * Determines whether an object exists in another object's prototype chain. - * @param v Another object whose prototype chain is to be checked. - */ - isPrototypeOf(v: Object): boolean; - - /** - * Determines whether a specified property is enumerable. - * @param v A property name. - */ - propertyIsEnumerable(v: string): boolean; -} - -interface ObjectConstructor { - new (value?: any): Object; - (): any; - (value: any): any; - - /** A reference to the prototype for a class of objects. */ - prototype: Object; - - /** - * Returns the prototype of an object. - * @param o The object that references the prototype. - */ - getPrototypeOf(o: any): any; - - /** - * Gets the own property descriptor of the specified object. - * An own property descriptor is one that is defined directly on the object and is not inherited from the object's prototype. - * @param o Object that contains the property. - * @param p Name of the property. - */ - getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; - - /** - * Returns the names of the own properties of an object. The own properties of an object are those that are defined directly - * on that object, and are not inherited from the object's prototype. The properties of an object include both fields (objects) and functions. - * @param o Object that contains the own properties. - */ - getOwnPropertyNames(o: any): string[]; - - /** - * Creates an object that has the specified prototype, and that optionally contains specified properties. - * @param o Object to use as a prototype. May be null - * @param properties JavaScript object that contains one or more property descriptors. - */ - create(o: any, properties?: PropertyDescriptorMap): any; - - /** - * Adds a property to an object, or modifies attributes of an existing property. - * @param o Object on which to add or modify the property. This can be a native JavaScript object (that is, a user-defined object or a built in object) or a DOM object. - * @param p The property name. - * @param attributes Descriptor for the property. It can be for a data property or an accessor property. - */ - defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; - - /** - * Adds one or more properties to an object, and/or modifies attributes of existing properties. - * @param o Object on which to add or modify the properties. This can be a native JavaScript object or a DOM object. - * @param properties JavaScript object that contains one or more descriptor objects. Each descriptor object describes a data property or an accessor property. - */ - defineProperties(o: any, properties: PropertyDescriptorMap): any; - - /** - * Prevents the modification of attributes of existing properties, and prevents the addition of new properties. - * @param o Object on which to lock the attributes. - */ - seal(o: T): T; - - /** - * Prevents the modification of existing property attributes and values, and prevents the addition of new properties. - * @param o Object on which to lock the attributes. - */ - freeze(o: T): T; - - /** - * Prevents the addition of new properties to an object. - * @param o Object to make non-extensible. - */ - preventExtensions(o: T): T; - - /** - * Returns true if existing property attributes cannot be modified in an object and new properties cannot be added to the object. - * @param o Object to test. - */ - isSealed(o: any): boolean; - - /** - * Returns true if existing property attributes and values cannot be modified in an object, and new properties cannot be added to the object. - * @param o Object to test. - */ - isFrozen(o: any): boolean; - - /** - * Returns a value that indicates whether new properties can be added to an object. - * @param o Object to test. - */ - isExtensible(o: any): boolean; - - /** - * Returns the names of the enumerable properties and methods of an object. - * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object. - */ - keys(o: any): string[]; -} - -/** - * Provides functionality common to all JavaScript objects. - */ -declare var Object: ObjectConstructor; - -/** - * Creates a new function. - */ -interface Function { - /** - * Calls the function, substituting the specified object for the this value of the function, and the specified array for the arguments of the function. - * @param thisArg The object to be used as the this object. - * @param argArray A set of arguments to be passed to the function. - */ - apply(thisArg: any, argArray?: any): any; - - /** - * Calls a method of an object, substituting another object for the current object. - * @param thisArg The object to be used as the current object. - * @param argArray A list of arguments to be passed to the method. - */ - call(thisArg: any, ...argArray: any[]): any; - - /** - * For a given function, creates a bound function that has the same body as the original function. - * The this object of the bound function is associated with the specified object, and has the specified initial parameters. - * @param thisArg An object to which the this keyword can refer inside the new function. - * @param argArray A list of arguments to be passed to the new function. - */ - bind(thisArg: any, ...argArray: any[]): any; - - prototype: any; - length: number; - - // Non-standard extensions - arguments: any; - caller: Function; -} - -interface FunctionConstructor { - /** - * Creates a new function. - * @param args A list of arguments the function accepts. - */ - new (...args: string[]): Function; - (...args: string[]): Function; - prototype: Function; -} - -declare var Function: FunctionConstructor; - -interface IArguments { - [index: number]: any; - length: number; - callee: Function; -} - -interface String { - /** Returns a string representation of a string. */ - toString(): string; - - /** - * Returns the character at the specified index. - * @param pos The zero-based index of the desired character. - */ - charAt(pos: number): string; - - /** - * Returns the Unicode value of the character at the specified location. - * @param index The zero-based index of the desired character. If there is no character at the specified index, NaN is returned. - */ - charCodeAt(index: number): number; - - /** - * Returns a string that contains the concatenation of two or more strings. - * @param strings The strings to append to the end of the string. - */ - concat(...strings: string[]): string; - - /** - * Returns the position of the first occurrence of a substring. - * @param searchString The substring to search for in the string - * @param position The index at which to begin searching the String object. If omitted, search starts at the beginning of the string. - */ - indexOf(searchString: string, position?: number): number; - - /** - * Returns the last occurrence of a substring in the string. - * @param searchString The substring to search for. - * @param position The index at which to begin searching. If omitted, the search begins at the end of the string. - */ - lastIndexOf(searchString: string, position?: number): number; - - /** - * Determines whether two strings are equivalent in the current locale. - * @param that String to compare to target string - */ - localeCompare(that: string): number; - - /** - * Matches a string with a regular expression, and returns an array containing the results of that search. - * @param regexp A variable name or string literal containing the regular expression pattern and flags. - */ - match(regexp: string): RegExpMatchArray; - - /** - * Matches a string with a regular expression, and returns an array containing the results of that search. - * @param regexp A regular expression object that contains the regular expression pattern and applicable flags. - */ - match(regexp: RegExp): RegExpMatchArray; - - /** - * Replaces text in a string, using a regular expression or search string. - * @param searchValue A string that represents the regular expression. - * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string. - */ - replace(searchValue: string, replaceValue: string): string; - - /** - * Replaces text in a string, using a regular expression or search string. - * @param searchValue A string that represents the regular expression. - * @param replacer A function that returns the replacement text. - */ - replace(searchValue: string, replacer: (substring: string, ...args: any[]) => string): string; - - /** - * Replaces text in a string, using a regular expression or search string. - * @param searchValue A Regular Expression object containing the regular expression pattern and applicable flags. - * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string. - */ - replace(searchValue: RegExp, replaceValue: string): string; - - /** - * Replaces text in a string, using a regular expression or search string. - * @param searchValue A Regular Expression object containing the regular expression pattern and applicable flags - * @param replacer A function that returns the replacement text. - */ - replace(searchValue: RegExp, replacer: (substring: string, ...args: any[]) => string): string; - - /** - * Finds the first substring match in a regular expression search. - * @param regexp The regular expression pattern and applicable flags. - */ - search(regexp: string): number; - - /** - * Finds the first substring match in a regular expression search. - * @param regexp The regular expression pattern and applicable flags. - */ - search(regexp: RegExp): number; - - /** - * Returns a section of a string. - * @param start The index to the beginning of the specified portion of stringObj. - * @param end The index to the end of the specified portion of stringObj. The substring includes the characters up to, but not including, the character indicated by end. - * If this value is not specified, the substring continues to the end of stringObj. - */ - slice(start?: number, end?: number): string; - - /** - * Split a string into substrings using the specified separator and return them as an array. - * @param separator A string that identifies character or characters to use in separating the string. If omitted, a single-element array containing the entire string is returned. - * @param limit A value used to limit the number of elements returned in the array. - */ - split(separator: string, limit?: number): string[]; - - /** - * Split a string into substrings using the specified separator and return them as an array. - * @param separator A Regular Express that identifies character or characters to use in separating the string. If omitted, a single-element array containing the entire string is returned. - * @param limit A value used to limit the number of elements returned in the array. - */ - split(separator: RegExp, limit?: number): string[]; - - /** - * Returns the substring at the specified location within a String object. - * @param start The zero-based index number indicating the beginning of the substring. - * @param end Zero-based index number indicating the end of the substring. The substring includes the characters up to, but not including, the character indicated by end. - * If end is omitted, the characters from start through the end of the original string are returned. - */ - substring(start: number, end?: number): string; - - /** Converts all the alphabetic characters in a string to lowercase. */ - toLowerCase(): string; - - /** Converts all alphabetic characters to lowercase, taking into account the host environment's current locale. */ - toLocaleLowerCase(): string; - - /** Converts all the alphabetic characters in a string to uppercase. */ - toUpperCase(): string; - - /** Returns a string where all alphabetic characters have been converted to uppercase, taking into account the host environment's current locale. */ - toLocaleUpperCase(): string; - - /** Removes the leading and trailing white space and line terminator characters from a string. */ - trim(): string; - - /** Returns the length of a String object. */ - length: number; - - // IE extensions - /** - * Gets a substring beginning at the specified location and having the specified length. - * @param from The starting position of the desired substring. The index of the first character in the string is zero. - * @param length The number of characters to include in the returned substring. - */ - substr(from: number, length?: number): string; - - /** Returns the primitive value of the specified object. */ - valueOf(): string; - - [index: number]: string; -} - -interface StringConstructor { - new (value?: any): String; - (value?: any): string; - prototype: String; - fromCharCode(...codes: number[]): string; -} - -/** - * Allows manipulation and formatting of text strings and determination and location of substrings within strings. - */ -declare var String: StringConstructor; - -interface Boolean { - /** Returns the primitive value of the specified object. */ - valueOf(): boolean; -} - -interface BooleanConstructor { - new (value?: any): Boolean; - (value?: any): boolean; - prototype: Boolean; -} - -declare var Boolean: BooleanConstructor; - -interface Number { - /** - * Returns a string representation of an object. - * @param radix Specifies a radix for converting numeric values to strings. This value is only used for numbers. - */ - toString(radix?: number): string; - - /** - * Returns a string representing a number in fixed-point notation. - * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive. - */ - toFixed(fractionDigits?: number): string; - - /** - * Returns a string containing a number represented in exponential notation. - * @param fractionDigits Number of digits after the decimal point. Must be in the range 0 - 20, inclusive. - */ - toExponential(fractionDigits?: number): string; - - /** - * Returns a string containing a number represented either in exponential or fixed-point notation with a specified number of digits. - * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive. - */ - toPrecision(precision?: number): string; - - /** Returns the primitive value of the specified object. */ - valueOf(): number; -} - -interface NumberConstructor { - new (value?: any): Number; - (value?: any): number; - prototype: Number; - - /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */ - MAX_VALUE: number; - - /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */ - MIN_VALUE: number; - - /** - * A value that is not a number. - * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function. - */ - NaN: number; - - /** - * A value that is less than the largest negative number that can be represented in JavaScript. - * JavaScript displays NEGATIVE_INFINITY values as -infinity. - */ - NEGATIVE_INFINITY: number; - - /** - * A value greater than the largest number that can be represented in JavaScript. - * JavaScript displays POSITIVE_INFINITY values as infinity. - */ - POSITIVE_INFINITY: number; -} - -/** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */ -declare var Number: NumberConstructor; - -interface TemplateStringsArray extends Array { - raw: string[]; -} - -interface Math { - /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */ - E: number; - /** The natural logarithm of 10. */ - LN10: number; - /** The natural logarithm of 2. */ - LN2: number; - /** The base-2 logarithm of e. */ - LOG2E: number; - /** The base-10 logarithm of e. */ - LOG10E: number; - /** Pi. This is the ratio of the circumference of a circle to its diameter. */ - PI: number; - /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */ - SQRT1_2: number; - /** The square root of 2. */ - SQRT2: number; - /** - * Returns the absolute value of a number (the value without regard to whether it is positive or negative). - * For example, the absolute value of -5 is the same as the absolute value of 5. - * @param x A numeric expression for which the absolute value is needed. - */ - abs(x: number): number; - /** - * Returns the arc cosine (or inverse cosine) of a number. - * @param x A numeric expression. - */ - acos(x: number): number; - /** - * Returns the arcsine of a number. - * @param x A numeric expression. - */ - asin(x: number): number; - /** - * Returns the arctangent of a number. - * @param x A numeric expression for which the arctangent is needed. - */ - atan(x: number): number; - /** - * Returns the angle (in radians) from the X axis to a point. - * @param y A numeric expression representing the cartesian y-coordinate. - * @param x A numeric expression representing the cartesian x-coordinate. - */ - atan2(y: number, x: number): number; - /** - * Returns the smallest number greater than or equal to its numeric argument. - * @param x A numeric expression. - */ - ceil(x: number): number; - /** - * Returns the cosine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - cos(x: number): number; - /** - * Returns e (the base of natural logarithms) raised to a power. - * @param x A numeric expression representing the power of e. - */ - exp(x: number): number; - /** - * Returns the greatest number less than or equal to its numeric argument. - * @param x A numeric expression. - */ - floor(x: number): number; - /** - * Returns the natural logarithm (base e) of a number. - * @param x A numeric expression. - */ - log(x: number): number; - /** - * Returns the larger of a set of supplied numeric expressions. - * @param values Numeric expressions to be evaluated. - */ - max(...values: number[]): number; - /** - * Returns the smaller of a set of supplied numeric expressions. - * @param values Numeric expressions to be evaluated. - */ - min(...values: number[]): number; - /** - * Returns the value of a base expression taken to a specified power. - * @param x The base value of the expression. - * @param y The exponent value of the expression. - */ - pow(x: number, y: number): number; - /** Returns a pseudorandom number between 0 and 1. */ - random(): number; - /** - * Returns a supplied numeric expression rounded to the nearest number. - * @param x The value to be rounded to the nearest number. - */ - round(x: number): number; - /** - * Returns the sine of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - sin(x: number): number; - /** - * Returns the square root of a number. - * @param x A numeric expression. - */ - sqrt(x: number): number; - /** - * Returns the tangent of a number. - * @param x A numeric expression that contains an angle measured in radians. - */ - tan(x: number): number; -} -/** An intrinsic object that provides basic mathematics functionality and constants. */ -declare var Math: Math; - -/** Enables basic storage and retrieval of dates and times. */ -interface Date { - /** Returns a string representation of a date. The format of the string depends on the locale. */ - toString(): string; - /** Returns a date as a string value. */ - toDateString(): string; - /** Returns a time as a string value. */ - toTimeString(): string; - /** Returns a value as a string value appropriate to the host environment's current locale. */ - toLocaleString(): string; - /** Returns a date as a string value appropriate to the host environment's current locale. */ - toLocaleDateString(): string; - /** Returns a time as a string value appropriate to the host environment's current locale. */ - toLocaleTimeString(): string; - /** Returns the stored time value in milliseconds since midnight, January 1, 1970 UTC. */ - valueOf(): number; - /** Gets the time value in milliseconds. */ - getTime(): number; - /** Gets the year, using local time. */ - getFullYear(): number; - /** Gets the year using Universal Coordinated Time (UTC). */ - getUTCFullYear(): number; - /** Gets the month, using local time. */ - getMonth(): number; - /** Gets the month of a Date object using Universal Coordinated Time (UTC). */ - getUTCMonth(): number; - /** Gets the day-of-the-month, using local time. */ - getDate(): number; - /** Gets the day-of-the-month, using Universal Coordinated Time (UTC). */ - getUTCDate(): number; - /** Gets the day of the week, using local time. */ - getDay(): number; - /** Gets the day of the week using Universal Coordinated Time (UTC). */ - getUTCDay(): number; - /** Gets the hours in a date, using local time. */ - getHours(): number; - /** Gets the hours value in a Date object using Universal Coordinated Time (UTC). */ - getUTCHours(): number; - /** Gets the minutes of a Date object, using local time. */ - getMinutes(): number; - /** Gets the minutes of a Date object using Universal Coordinated Time (UTC). */ - getUTCMinutes(): number; - /** Gets the seconds of a Date object, using local time. */ - getSeconds(): number; - /** Gets the seconds of a Date object using Universal Coordinated Time (UTC). */ - getUTCSeconds(): number; - /** Gets the milliseconds of a Date, using local time. */ - getMilliseconds(): number; - /** Gets the milliseconds of a Date object using Universal Coordinated Time (UTC). */ - getUTCMilliseconds(): number; - /** Gets the difference in minutes between the time on the local computer and Universal Coordinated Time (UTC). */ - getTimezoneOffset(): number; - /** - * Sets the date and time value in the Date object. - * @param time A numeric value representing the number of elapsed milliseconds since midnight, January 1, 1970 GMT. - */ - setTime(time: number): number; - /** - * Sets the milliseconds value in the Date object using local time. - * @param ms A numeric value equal to the millisecond value. - */ - setMilliseconds(ms: number): number; - /** - * Sets the milliseconds value in the Date object using Universal Coordinated Time (UTC). - * @param ms A numeric value equal to the millisecond value. - */ - setUTCMilliseconds(ms: number): number; - - /** - * Sets the seconds value in the Date object using local time. - * @param sec A numeric value equal to the seconds value. - * @param ms A numeric value equal to the milliseconds value. - */ - setSeconds(sec: number, ms?: number): number; - /** - * Sets the seconds value in the Date object using Universal Coordinated Time (UTC). - * @param sec A numeric value equal to the seconds value. - * @param ms A numeric value equal to the milliseconds value. - */ - setUTCSeconds(sec: number, ms?: number): number; - /** - * Sets the minutes value in the Date object using local time. - * @param min A numeric value equal to the minutes value. - * @param sec A numeric value equal to the seconds value. - * @param ms A numeric value equal to the milliseconds value. - */ - setMinutes(min: number, sec?: number, ms?: number): number; - /** - * Sets the minutes value in the Date object using Universal Coordinated Time (UTC). - * @param min A numeric value equal to the minutes value. - * @param sec A numeric value equal to the seconds value. - * @param ms A numeric value equal to the milliseconds value. - */ - setUTCMinutes(min: number, sec?: number, ms?: number): number; - /** - * Sets the hour value in the Date object using local time. - * @param hours A numeric value equal to the hours value. - * @param min A numeric value equal to the minutes value. - * @param sec A numeric value equal to the seconds value. - * @param ms A numeric value equal to the milliseconds value. - */ - setHours(hours: number, min?: number, sec?: number, ms?: number): number; - /** - * Sets the hours value in the Date object using Universal Coordinated Time (UTC). - * @param hours A numeric value equal to the hours value. - * @param min A numeric value equal to the minutes value. - * @param sec A numeric value equal to the seconds value. - * @param ms A numeric value equal to the milliseconds value. - */ - setUTCHours(hours: number, min?: number, sec?: number, ms?: number): number; - /** - * Sets the numeric day-of-the-month value of the Date object using local time. - * @param date A numeric value equal to the day of the month. - */ - setDate(date: number): number; - /** - * Sets the numeric day of the month in the Date object using Universal Coordinated Time (UTC). - * @param date A numeric value equal to the day of the month. - */ - setUTCDate(date: number): number; - /** - * Sets the month value in the Date object using local time. - * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively. - * @param date A numeric value representing the day of the month. If this value is not supplied, the value from a call to the getDate method is used. - */ - setMonth(month: number, date?: number): number; - /** - * Sets the month value in the Date object using Universal Coordinated Time (UTC). - * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively. - * @param date A numeric value representing the day of the month. If it is not supplied, the value from a call to the getUTCDate method is used. - */ - setUTCMonth(month: number, date?: number): number; - /** - * Sets the year of the Date object using local time. - * @param year A numeric value for the year. - * @param month A zero-based numeric value for the month (0 for January, 11 for December). Must be specified if numDate is specified. - * @param date A numeric value equal for the day of the month. - */ - setFullYear(year: number, month?: number, date?: number): number; - /** - * Sets the year value in the Date object using Universal Coordinated Time (UTC). - * @param year A numeric value equal to the year. - * @param month A numeric value equal to the month. The value for January is 0, and other month values follow consecutively. Must be supplied if numDate is supplied. - * @param date A numeric value equal to the day of the month. - */ - setUTCFullYear(year: number, month?: number, date?: number): number; - /** Returns a date converted to a string using Universal Coordinated Time (UTC). */ - toUTCString(): string; - /** Returns a date as a string value in ISO format. */ - toISOString(): string; - /** Used by the JSON.stringify method to enable the transformation of an object's data for JavaScript Object Notation (JSON) serialization. */ - toJSON(key?: any): string; -} - -interface DateConstructor { - new (): Date; - new (value: number): Date; - new (value: string): Date; - new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date; - (): string; - prototype: Date; - /** - * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970. - * @param s A date string - */ - parse(s: string): number; - /** - * Returns the number of milliseconds between midnight, January 1, 1970 Universal Coordinated Time (UTC) (or GMT) and the specified date. - * @param year The full year designation is required for cross-century date accuracy. If year is between 0 and 99 is used, then year is assumed to be 1900 + year. - * @param month The month as an number between 0 and 11 (January to December). - * @param date The date as an number between 1 and 31. - * @param hours Must be supplied if minutes is supplied. An number from 0 to 23 (midnight to 11pm) that specifies the hour. - * @param minutes Must be supplied if seconds is supplied. An number from 0 to 59 that specifies the minutes. - * @param seconds Must be supplied if milliseconds is supplied. An number from 0 to 59 that specifies the seconds. - * @param ms An number from 0 to 999 that specifies the milliseconds. - */ - UTC(year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): number; - now(): number; -} - -declare var Date: DateConstructor; - -interface RegExpMatchArray extends Array { - index?: number; - input?: string; -} - -interface RegExpExecArray extends Array { - index: number; - input: string; -} - -interface RegExp { - /** - * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search. - * @param string The String object or string literal on which to perform the search. - */ - exec(string: string): RegExpExecArray; - - /** - * Returns a Boolean value that indicates whether or not a pattern exists in a searched string. - * @param string String on which to perform the search. - */ - test(string: string): boolean; - - /** Returns a copy of the text of the regular expression pattern. Read-only. The regExp argument is a Regular expression object. It can be a variable name or a literal. */ - source: string; - - /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */ - global: boolean; - - /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */ - ignoreCase: boolean; - - /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */ - multiline: boolean; - - lastIndex: number; - - // Non-standard extensions - compile(): RegExp; -} - -interface RegExpConstructor { - new (pattern: string, flags?: string): RegExp; - (pattern: string, flags?: string): RegExp; - prototype: RegExp; - - // Non-standard extensions - $1: string; - $2: string; - $3: string; - $4: string; - $5: string; - $6: string; - $7: string; - $8: string; - $9: string; - lastMatch: string; -} - -declare var RegExp: RegExpConstructor; - -interface Error { - name: string; - message: string; -} - -interface ErrorConstructor { - new (message?: string): Error; - (message?: string): Error; - prototype: Error; -} - -declare var Error: ErrorConstructor; - -interface EvalError extends Error { -} - -interface EvalErrorConstructor { - new (message?: string): EvalError; - (message?: string): EvalError; - prototype: EvalError; -} - -declare var EvalError: EvalErrorConstructor; - -interface RangeError extends Error { -} - -interface RangeErrorConstructor { - new (message?: string): RangeError; - (message?: string): RangeError; - prototype: RangeError; -} - -declare var RangeError: RangeErrorConstructor; - -interface ReferenceError extends Error { -} - -interface ReferenceErrorConstructor { - new (message?: string): ReferenceError; - (message?: string): ReferenceError; - prototype: ReferenceError; -} - -declare var ReferenceError: ReferenceErrorConstructor; - -interface SyntaxError extends Error { -} - -interface SyntaxErrorConstructor { - new (message?: string): SyntaxError; - (message?: string): SyntaxError; - prototype: SyntaxError; -} - -declare var SyntaxError: SyntaxErrorConstructor; - -interface TypeError extends Error { -} - -interface TypeErrorConstructor { - new (message?: string): TypeError; - (message?: string): TypeError; - prototype: TypeError; -} - -declare var TypeError: TypeErrorConstructor; - -interface URIError extends Error { -} - -interface URIErrorConstructor { - new (message?: string): URIError; - (message?: string): URIError; - prototype: URIError; -} - -declare var URIError: URIErrorConstructor; - -interface JSON { - /** - * Converts a JavaScript Object Notation (JSON) string into an object. - * @param text A valid JSON string. - * @param reviver A function that transforms the results. This function is called for each member of the object. - * If a member contains nested objects, the nested objects are transformed before the parent object is. - */ - parse(text: string, reviver?: (key: any, value: any) => any): any; - /** - * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. - * @param value A JavaScript value, usually an object or array, to be converted. - */ - stringify(value: any): string; - /** - * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. - * @param value A JavaScript value, usually an object or array, to be converted. - * @param replacer A function that transforms the results. - */ - stringify(value: any, replacer: (key: string, value: any) => any): string; - /** - * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. - * @param value A JavaScript value, usually an object or array, to be converted. - * @param replacer Array that transforms the results. - */ - stringify(value: any, replacer: any[]): string; - /** - * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. - * @param value A JavaScript value, usually an object or array, to be converted. - * @param replacer A function that transforms the results. - * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read. - */ - stringify(value: any, replacer: (key: string, value: any) => any, space: string | number): string; - /** - * Converts a JavaScript value to a JavaScript Object Notation (JSON) string. - * @param value A JavaScript value, usually an object or array, to be converted. - * @param replacer Array that transforms the results. - * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read. - */ - stringify(value: any, replacer: any[], space: string | number): string; -} -/** - * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format. - */ -declare var JSON: JSON; - - -///////////////////////////// -/// ECMAScript Array API (specially handled by compiler) -///////////////////////////// - -interface Array { - /** - * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array. - */ - length: number; - /** - * Returns a string representation of an array. - */ - toString(): string; - toLocaleString(): string; - /** - * Appends new elements to an array, and returns the new length of the array. - * @param items New elements of the Array. - */ - push(...items: T[]): number; - /** - * Removes the last element from an array and returns it. - */ - pop(): T; - /** - * Combines two or more arrays. - * @param items Additional items to add to the end of array1. - */ - concat(...items: U[]): T[]; - /** - * Combines two or more arrays. - * @param items Additional items to add to the end of array1. - */ - concat(...items: T[]): T[]; - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - /** - * Reverses the elements in an Array. - */ - reverse(): T[]; - /** - * Removes the first element from an array and returns it. - */ - shift(): T; - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): T[]; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: T, b: T) => number): T[]; - - /** - * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. - * @param start The zero-based location in the array from which to start removing elements. - */ - splice(start: number): T[]; - - /** - * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. - * @param start The zero-based location in the array from which to start removing elements. - * @param deleteCount The number of elements to remove. - * @param items Elements to insert into the array in place of the deleted elements. - */ - splice(start: number, deleteCount: number, ...items: T[]): T[]; - - /** - * Inserts new elements at the start of an array. - * @param items Elements to insert at the start of the Array. - */ - unshift(...items: T[]): number; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0. - */ - indexOf(searchElement: T, fromIndex?: number): number; - - /** - * Returns the index of the last occurrence of a specified value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array. - */ - lastIndexOf(searchElement: T, fromIndex?: number): number; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void; - - /** - * Calls a defined callback function on each element of an array, and returns an array that contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[]; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[]; - - /** - * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. - */ - reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; - /** - * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; - /** - * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; - - [n: number]: T; -} - -interface ArrayConstructor { - new (arrayLength?: number): any[]; - new (arrayLength: number): T[]; - new (...items: T[]): T[]; - (arrayLength?: number): any[]; - (arrayLength: number): T[]; - (...items: T[]): T[]; - isArray(arg: any): arg is Array; - prototype: Array; -} - -declare var Array: ArrayConstructor; - -interface TypedPropertyDescriptor { - enumerable?: boolean; - configurable?: boolean; - writable?: boolean; - value?: T; - get?: () => T; - set?: (value: T) => void; -} - -declare type ClassDecorator = (target: TFunction) => TFunction | void; -declare type PropertyDecorator = (target: Object, propertyKey: string | symbol) => void; -declare type MethodDecorator = (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor) => TypedPropertyDescriptor | void; -declare type ParameterDecorator = (target: Object, propertyKey: string | symbol, parameterIndex: number) => void; - -declare type PromiseConstructorLike = new (executor: (resolve: (value?: T | PromiseLike) => void, reject: (reason?: any) => void) => void) => PromiseLike; - -interface PromiseLike { - /** - * Attaches callbacks for the resolution and/or rejection of the Promise. - * @param onfulfilled The callback to execute when the Promise is resolved. - * @param onrejected The callback to execute when the Promise is rejected. - * @returns A Promise for the completion of which ever callback is executed. - */ - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): PromiseLike; - then(onfulfilled?: (value: T) => TResult | PromiseLike, onrejected?: (reason: any) => void): PromiseLike; -} - -interface ArrayLike { - length: number; - [n: number]: T; -} - - -/** - * Represents a raw buffer of binary data, which is used to store data for the - * different typed arrays. ArrayBuffers cannot be read from or written to directly, - * but can be passed to a typed array or DataView Object to interpret the raw - * buffer as needed. - */ -interface ArrayBuffer { - /** - * Read-only. The length of the ArrayBuffer (in bytes). - */ - byteLength: number; - - /** - * Returns a section of an ArrayBuffer. - */ - slice(begin:number, end?:number): ArrayBuffer; -} - -interface ArrayBufferConstructor { - prototype: ArrayBuffer; - new (byteLength: number): ArrayBuffer; - isView(arg: any): arg is ArrayBufferView; -} -declare var ArrayBuffer: ArrayBufferConstructor; - -interface ArrayBufferView { - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; -} - -interface DataView { - buffer: ArrayBuffer; - byteLength: number; - byteOffset: number; - /** - * Gets the Float32 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getFloat32(byteOffset: number, littleEndian?: boolean): number; - - /** - * Gets the Float64 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getFloat64(byteOffset: number, littleEndian?: boolean): number; - - /** - * Gets the Int8 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getInt8(byteOffset: number): number; - - /** - * Gets the Int16 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getInt16(byteOffset: number, littleEndian?: boolean): number; - /** - * Gets the Int32 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getInt32(byteOffset: number, littleEndian?: boolean): number; - - /** - * Gets the Uint8 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getUint8(byteOffset: number): number; - - /** - * Gets the Uint16 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getUint16(byteOffset: number, littleEndian?: boolean): number; - - /** - * Gets the Uint32 value at the specified byte offset from the start of the view. There is - * no alignment constraint; multi-byte values may be fetched from any offset. - * @param byteOffset The place in the buffer at which the value should be retrieved. - */ - getUint32(byteOffset: number, littleEndian?: boolean): number; - - /** - * Stores an Float32 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setFloat32(byteOffset: number, value: number, littleEndian?: boolean): void; - - /** - * Stores an Float64 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setFloat64(byteOffset: number, value: number, littleEndian?: boolean): void; - - /** - * Stores an Int8 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - */ - setInt8(byteOffset: number, value: number): void; - - /** - * Stores an Int16 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setInt16(byteOffset: number, value: number, littleEndian?: boolean): void; - - /** - * Stores an Int32 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setInt32(byteOffset: number, value: number, littleEndian?: boolean): void; - - /** - * Stores an Uint8 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - */ - setUint8(byteOffset: number, value: number): void; - - /** - * Stores an Uint16 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setUint16(byteOffset: number, value: number, littleEndian?: boolean): void; - - /** - * Stores an Uint32 value at the specified byte offset from the start of the view. - * @param byteOffset The place in the buffer at which the value should be set. - * @param value The value to set. - * @param littleEndian If false or undefined, a big-endian value should be written, - * otherwise a little-endian value should be written. - */ - setUint32(byteOffset: number, value: number, littleEndian?: boolean): void; -} - -interface DataViewConstructor { - new (buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView; -} -declare var DataView: DataViewConstructor; - -/** - * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested - * number of bytes could not be allocated an exception is raised. - */ -interface Int8Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Int8Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Int8Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): Int8Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Int8Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Int8Array) => number, thisArg?: any): Int8Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int8Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int8Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Int8Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Int8Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Int8Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Int8Array; - - /** - * Gets a new Int8Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Int8Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} -interface Int8ArrayConstructor { - prototype: Int8Array; - new (length: number): Int8Array; - new (array: ArrayLike): Int8Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Int8Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array; - -} -declare var Int8Array: Int8ArrayConstructor; - -/** - * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Uint8Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Uint8Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Uint8Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): Uint8Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Uint8Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Uint8Array) => number, thisArg?: any): Uint8Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Uint8Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Uint8Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Uint8Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Uint8Array; - - /** - * Gets a new Uint8Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Uint8Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Uint8ArrayConstructor { - prototype: Uint8Array; - new (length: number): Uint8Array; - new (array: ArrayLike): Uint8Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Uint8Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array; - -} -declare var Uint8Array: Uint8ArrayConstructor; - -/** - * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. - * If the requested number of bytes could not be allocated an exception is raised. - */ -interface Uint8ClampedArray { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Uint8ClampedArray; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Uint8ClampedArray; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): Uint8ClampedArray; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => number, thisArg?: any): Uint8ClampedArray; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Uint8ClampedArray; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: Uint8ClampedArray, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Uint8ClampedArray; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Uint8ClampedArray) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Uint8ClampedArray; - - /** - * Gets a new Uint8ClampedArray view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Uint8ClampedArray; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Uint8ClampedArrayConstructor { - prototype: Uint8ClampedArray; - new (length: number): Uint8ClampedArray; - new (array: ArrayLike): Uint8ClampedArray; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Uint8ClampedArray; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray; -} -declare var Uint8ClampedArray: Uint8ClampedArrayConstructor; - -/** - * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Int16Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Int16Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Int16Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): Int16Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Int16Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Int16Array) => number, thisArg?: any): Int16Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int16Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int16Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Int16Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Int16Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Int16Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Int16Array; - - /** - * Gets a new Int16Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Int16Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Int16ArrayConstructor { - prototype: Int16Array; - new (length: number): Int16Array; - new (array: ArrayLike): Int16Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Int16Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array; - -} -declare var Int16Array: Int16ArrayConstructor; - -/** - * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Uint16Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Uint16Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Uint16Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): Uint16Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Uint16Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Uint16Array) => number, thisArg?: any): Uint16Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint16Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint16Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Uint16Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Uint16Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Uint16Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Uint16Array; - - /** - * Gets a new Uint16Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Uint16Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Uint16ArrayConstructor { - prototype: Uint16Array; - new (length: number): Uint16Array; - new (array: ArrayLike): Uint16Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Uint16Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array; - -} -declare var Uint16Array: Uint16ArrayConstructor; -/** - * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Int32Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Int32Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Int32Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): Int32Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Int32Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Int32Array) => number, thisArg?: any): Int32Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int32Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Int32Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Int32Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Int32Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Int32Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Int32Array; - - /** - * Gets a new Int32Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Int32Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Int32ArrayConstructor { - prototype: Int32Array; - new (length: number): Int32Array; - new (array: ArrayLike): Int32Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Int32Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array; -} -declare var Int32Array: Int32ArrayConstructor; - -/** - * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the - * requested number of bytes could not be allocated an exception is raised. - */ -interface Uint32Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Uint32Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Uint32Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): Uint32Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Uint32Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Uint32Array) => number, thisArg?: any): Uint32Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint32Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Uint32Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Uint32Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Uint32Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Uint32Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Uint32Array; - - /** - * Gets a new Uint32Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Uint32Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Uint32ArrayConstructor { - prototype: Uint32Array; - new (length: number): Uint32Array; - new (array: ArrayLike): Uint32Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Uint32Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array; -} -declare var Uint32Array: Uint32ArrayConstructor; - -/** - * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number - * of bytes could not be allocated an exception is raised. - */ -interface Float32Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Float32Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Float32Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): Float32Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Float32Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Float32Array) => number, thisArg?: any): Float32Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float32Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float32Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Float32Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Float32Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Float32Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Float32Array; - - /** - * Gets a new Float32Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Float32Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Float32ArrayConstructor { - prototype: Float32Array; - new (length: number): Float32Array; - new (array: ArrayLike): Float32Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Float32Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array; - -} -declare var Float32Array: Float32ArrayConstructor; - -/** - * A typed array of 64-bit float values. The contents are initialized to 0. If the requested - * number of bytes could not be allocated an exception is raised. - */ -interface Float64Array { - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * The ArrayBuffer instance referenced by the array. - */ - buffer: ArrayBuffer; - - /** - * The length in bytes of the array. - */ - byteLength: number; - - /** - * The offset in bytes of the array. - */ - byteOffset: number; - - /** - * Returns the this object after copying a section of the array identified by start and end - * to the same array starting at position target - * @param target If target is negative, it is treated as length+target where length is the - * length of the array. - * @param start If start is negative, it is treated as length+start. If end is negative, it - * is treated as length+end. - * @param end If not specified, length of the this object is used as its default value. - */ - copyWithin(target: number, start: number, end?: number): Float64Array; - - /** - * Determines whether all the members of an array satisfy the specified test. - * @param callbackfn A function that accepts up to three arguments. The every method calls - * the callbackfn function for each element in array1 until the callbackfn returns false, - * or until the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - every(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): boolean; - - /** - * Returns the this object after filling the section identified by start and end with value - * @param value value to fill array section with - * @param start index to start filling the array at. If start is negative, it is treated as - * length+start where length is the length of the array. - * @param end index to stop filling the array at. If end is negative, it is treated as - * length+end. - */ - fill(value: number, start?: number, end?: number): Float64Array; - - /** - * Returns the elements of an array that meet the condition specified in a callback function. - * @param callbackfn A function that accepts up to three arguments. The filter method calls - * the callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - filter(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): Float64Array; - - /** - * Returns the value of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - find(predicate: (value: number, index: number, obj: Array) => boolean, thisArg?: any): number; - - /** - * Returns the index of the first element in the array where predicate is true, and undefined - * otherwise. - * @param predicate find calls predicate once for each element of the array, in ascending - * order, until it finds one where predicate returns true. If such an element is found, find - * immediately returns that element value. Otherwise, find returns undefined. - * @param thisArg If provided, it will be used as the this value for each invocation of - * predicate. If it is not provided, undefined is used instead. - */ - findIndex(predicate: (value: number) => boolean, thisArg?: any): number; - - /** - * Performs the specified action for each element in an array. - * @param callbackfn A function that accepts up to three arguments. forEach calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - forEach(callbackfn: (value: number, index: number, array: Float64Array) => void, thisArg?: any): void; - - /** - * Returns the index of the first occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - indexOf(searchElement: number, fromIndex?: number): number; - - /** - * Adds all the elements of an array separated by the specified separator string. - * @param separator A string used to separate one element of an array from the next in the - * resulting String. If omitted, the array elements are separated with a comma. - */ - join(separator?: string): string; - - /** - * Returns the index of the last occurrence of a value in an array. - * @param searchElement The value to locate in the array. - * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the - * search starts at index 0. - */ - lastIndexOf(searchElement: number, fromIndex?: number): number; - - /** - * The length of the array. - */ - length: number; - - /** - * Calls a defined callback function on each element of an array, and returns an array that - * contains the results. - * @param callbackfn A function that accepts up to three arguments. The map method calls the - * callbackfn function one time for each element in the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - map(callbackfn: (value: number, index: number, array: Float64Array) => number, thisArg?: any): Float64Array; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array. The return value of - * the callback function is the accumulated result, and is provided as an argument in the next - * call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduce method calls the - * callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduce(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float64Array) => U, initialValue: U): U; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an - * argument instead of an array value. - */ - reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue?: number): number; - - /** - * Calls the specified callback function for all the elements in an array, in descending order. - * The return value of the callback function is the accumulated result, and is provided as an - * argument in the next call to the callback function. - * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls - * the callbackfn function one time for each element in the array. - * @param initialValue If initialValue is specified, it is used as the initial value to start - * the accumulation. The first call to the callbackfn function provides this value as an argument - * instead of an array value. - */ - reduceRight(callbackfn: (previousValue: U, currentValue: number, currentIndex: number, array: Float64Array) => U, initialValue: U): U; - - /** - * Reverses the elements in an Array. - */ - reverse(): Float64Array; - - /** - * Sets a value or an array of values. - * @param index The index of the location to set. - * @param value The value to set. - */ - set(index: number, value: number): void; - - /** - * Sets a value or an array of values. - * @param array A typed or untyped array of values to set. - * @param offset The index in the current array at which the values are to be written. - */ - set(array: ArrayLike, offset?: number): void; - - /** - * Returns a section of an array. - * @param start The beginning of the specified portion of the array. - * @param end The end of the specified portion of the array. - */ - slice(start?: number, end?: number): Float64Array; - - /** - * Determines whether the specified callback function returns true for any element of an array. - * @param callbackfn A function that accepts up to three arguments. The some method calls the - * callbackfn function for each element in array1 until the callbackfn returns true, or until - * the end of the array. - * @param thisArg An object to which the this keyword can refer in the callbackfn function. - * If thisArg is omitted, undefined is used as the this value. - */ - some(callbackfn: (value: number, index: number, array: Float64Array) => boolean, thisArg?: any): boolean; - - /** - * Sorts an array. - * @param compareFn The name of the function used to determine the order of the elements. If - * omitted, the elements are sorted in ascending, ASCII character order. - */ - sort(compareFn?: (a: number, b: number) => number): Float64Array; - - /** - * Gets a new Float64Array view of the ArrayBuffer store for this array, referencing the elements - * at begin, inclusive, up to end, exclusive. - * @param begin The index of the beginning of the array. - * @param end The index of the end of the array. - */ - subarray(begin: number, end?: number): Float64Array; - - /** - * Converts a number to a string by using the current locale. - */ - toLocaleString(): string; - - /** - * Returns a string representation of an array. - */ - toString(): string; - - [index: number]: number; -} - -interface Float64ArrayConstructor { - prototype: Float64Array; - new (length: number): Float64Array; - new (array: ArrayLike): Float64Array; - new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array; - - /** - * The size in bytes of each element in the array. - */ - BYTES_PER_ELEMENT: number; - - /** - * Returns a new array from a set of elements. - * @param items A set of elements to include in the new array object. - */ - of(...items: number[]): Float64Array; - - /** - * Creates an array from an array-like or iterable object. - * @param arrayLike An array-like or iterable object to convert to an array. - * @param mapfn A mapping function to call on every element of the array. - * @param thisArg Value of 'this' used to invoke the mapfn. - */ - from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array; -} -declare var Float64Array: Float64ArrayConstructor; -///////////////////////////// -/// ECMAScript Internationalization API -///////////////////////////// - -declare module Intl { - interface CollatorOptions { - usage?: string; - localeMatcher?: string; - numeric?: boolean; - caseFirst?: string; - sensitivity?: string; - ignorePunctuation?: boolean; - } - - interface ResolvedCollatorOptions { - locale: string; - usage: string; - sensitivity: string; - ignorePunctuation: boolean; - collation: string; - caseFirst: string; - numeric: boolean; - } - - interface Collator { - compare(x: string, y: string): number; - resolvedOptions(): ResolvedCollatorOptions; - } - var Collator: { - new (locales?: string[], options?: CollatorOptions): Collator; - new (locale?: string, options?: CollatorOptions): Collator; - (locales?: string[], options?: CollatorOptions): Collator; - (locale?: string, options?: CollatorOptions): Collator; - supportedLocalesOf(locales: string[], options?: CollatorOptions): string[]; - supportedLocalesOf(locale: string, options?: CollatorOptions): string[]; - } - - interface NumberFormatOptions { - localeMatcher?: string; - style?: string; - currency?: string; - currencyDisplay?: string; - useGrouping?: boolean; - minimumIntegerDigits?: number; - minimumFractionDigits?: number; - maximumFractionDigits?: number; - minimumSignificantDigits?: number; - maximumSignificantDigits?: number; - } - - interface ResolvedNumberFormatOptions { - locale: string; - numberingSystem: string; - style: string; - currency?: string; - currencyDisplay?: string; - minimumIntegerDigits: number; - minimumFractionDigits: number; - maximumFractionDigits: number; - minimumSignificantDigits?: number; - maximumSignificantDigits?: number; - useGrouping: boolean; - } - - interface NumberFormat { - format(value: number): string; - resolvedOptions(): ResolvedNumberFormatOptions; - } - var NumberFormat: { - new (locales?: string[], options?: NumberFormatOptions): NumberFormat; - new (locale?: string, options?: NumberFormatOptions): NumberFormat; - (locales?: string[], options?: NumberFormatOptions): NumberFormat; - (locale?: string, options?: NumberFormatOptions): NumberFormat; - supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[]; - supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[]; - } - - interface DateTimeFormatOptions { - localeMatcher?: string; - weekday?: string; - era?: string; - year?: string; - month?: string; - day?: string; - hour?: string; - minute?: string; - second?: string; - timeZoneName?: string; - formatMatcher?: string; - hour12?: boolean; - timeZone?: string; - } - - interface ResolvedDateTimeFormatOptions { - locale: string; - calendar: string; - numberingSystem: string; - timeZone: string; - hour12?: boolean; - weekday?: string; - era?: string; - year?: string; - month?: string; - day?: string; - hour?: string; - minute?: string; - second?: string; - timeZoneName?: string; - } - - interface DateTimeFormat { - format(date?: Date | number): string; - resolvedOptions(): ResolvedDateTimeFormatOptions; - } - var DateTimeFormat: { - new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat; - new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat; - (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat; - (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat; - supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[]; - supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[]; - } -} - -interface String { - /** - * Determines whether two strings are equivalent in the current locale. - * @param that String to compare to target string - * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details. - * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details. - */ - localeCompare(that: string, locales: string[], options?: Intl.CollatorOptions): number; - - /** - * Determines whether two strings are equivalent in the current locale. - * @param that String to compare to target string - * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details. - * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details. - */ - localeCompare(that: string, locale: string, options?: Intl.CollatorOptions): number; -} - -interface Number { - /** - * Converts a number to a string by using the current or specified locale. - * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleString(locales?: string[], options?: Intl.NumberFormatOptions): string; - - /** - * Converts a number to a string by using the current or specified locale. - * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleString(locale?: string, options?: Intl.NumberFormatOptions): string; -} - -interface Date { - /** - * Converts a date and time to a string by using the current or specified locale. - * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleString(locales?: string[], options?: Intl.DateTimeFormatOptions): string; - /** - * Converts a date to a string by using the current or specified locale. - * @param locales An array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleDateString(locales?: string[], options?: Intl.DateTimeFormatOptions): string; - - /** - * Converts a time to a string by using the current or specified locale. - * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleTimeString(locale?: string[], options?: Intl.DateTimeFormatOptions): string; - - /** - * Converts a date and time to a string by using the current or specified locale. - * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleString(locale?: string, options?: Intl.DateTimeFormatOptions): string; - - /** - * Converts a date to a string by using the current or specified locale. - * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleDateString(locale?: string, options?: Intl.DateTimeFormatOptions): string; - - /** - * Converts a time to a string by using the current or specified locale. - * @param locale Locale tag. If you omit this parameter, the default locale of the JavaScript runtime is used. - * @param options An object that contains one or more properties that specify comparison options. - */ - toLocaleTimeString(locale?: string, options?: Intl.DateTimeFormatOptions): string; -} - - -///////////////////////////// -/// IE DOM APIs -///////////////////////////// - -interface Algorithm { - name?: string; -} - -interface AriaRequestEventInit extends EventInit { - attributeName?: string; - attributeValue?: string; -} - -interface ClipboardEventInit extends EventInit { - data?: string; - dataType?: string; -} - -interface CommandEventInit extends EventInit { - commandName?: string; - detail?: string; -} - -interface CompositionEventInit extends UIEventInit { - data?: string; -} - -interface ConfirmSiteSpecificExceptionsInformation extends ExceptionInformation { - arrayOfDomainStrings?: string[]; -} - -interface CustomEventInit extends EventInit { - detail?: any; -} - -interface DeviceAccelerationDict { - x?: number; - y?: number; - z?: number; -} - -interface DeviceRotationRateDict { - alpha?: number; - beta?: number; - gamma?: number; -} - -interface EventInit { - bubbles?: boolean; - cancelable?: boolean; -} - -interface ExceptionInformation { - domain?: string; -} - -interface FocusEventInit extends UIEventInit { - relatedTarget?: EventTarget; -} - -interface HashChangeEventInit extends EventInit { - newURL?: string; - oldURL?: string; -} - -interface KeyAlgorithm { - name?: string; -} - -interface KeyboardEventInit extends SharedKeyboardAndMouseEventInit { - key?: string; - location?: number; - repeat?: boolean; -} - -interface MouseEventInit extends SharedKeyboardAndMouseEventInit { - screenX?: number; - screenY?: number; - clientX?: number; - clientY?: number; - button?: number; - buttons?: number; - relatedTarget?: EventTarget; -} - -interface MsZoomToOptions { - contentX?: number; - contentY?: number; - viewportX?: string; - viewportY?: string; - scaleFactor?: number; - animate?: string; -} - -interface MutationObserverInit { - childList?: boolean; - attributes?: boolean; - characterData?: boolean; - subtree?: boolean; - attributeOldValue?: boolean; - characterDataOldValue?: boolean; - attributeFilter?: string[]; -} - -interface ObjectURLOptions { - oneTimeOnly?: boolean; -} - -interface PointerEventInit extends MouseEventInit { - pointerId?: number; - width?: number; - height?: number; - pressure?: number; - tiltX?: number; - tiltY?: number; - pointerType?: string; - isPrimary?: boolean; -} - -interface PositionOptions { - enableHighAccuracy?: boolean; - timeout?: number; - maximumAge?: number; -} - -interface SharedKeyboardAndMouseEventInit extends UIEventInit { - ctrlKey?: boolean; - shiftKey?: boolean; - altKey?: boolean; - metaKey?: boolean; - keyModifierStateAltGraph?: boolean; - keyModifierStateCapsLock?: boolean; - keyModifierStateFn?: boolean; - keyModifierStateFnLock?: boolean; - keyModifierStateHyper?: boolean; - keyModifierStateNumLock?: boolean; - keyModifierStateOS?: boolean; - keyModifierStateScrollLock?: boolean; - keyModifierStateSuper?: boolean; - keyModifierStateSymbol?: boolean; - keyModifierStateSymbolLock?: boolean; -} - -interface StoreExceptionsInformation extends ExceptionInformation { - siteName?: string; - explanationString?: string; - detailURI?: string; -} - -interface StoreSiteSpecificExceptionsInformation extends StoreExceptionsInformation { - arrayOfDomainStrings?: string[]; -} - -interface UIEventInit extends EventInit { - view?: Window; - detail?: number; -} - -interface WebGLContextAttributes { - alpha?: boolean; - depth?: boolean; - stencil?: boolean; - antialias?: boolean; - premultipliedAlpha?: boolean; - preserveDrawingBuffer?: boolean; -} - -interface WebGLContextEventInit extends EventInit { - statusMessage?: string; -} - -interface WheelEventInit extends MouseEventInit { - deltaX?: number; - deltaY?: number; - deltaZ?: number; - deltaMode?: number; -} - -interface EventListener { - (evt: Event): void; -} - -interface ANGLE_instanced_arrays { - drawArraysInstancedANGLE(mode: number, first: number, count: number, primcount: number): void; - drawElementsInstancedANGLE(mode: number, count: number, type: number, offset: number, primcount: number): void; - vertexAttribDivisorANGLE(index: number, divisor: number): void; - VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number; -} - -declare var ANGLE_instanced_arrays: { - prototype: ANGLE_instanced_arrays; - new(): ANGLE_instanced_arrays; - VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE: number; -} - -interface AnalyserNode extends AudioNode { - fftSize: number; - frequencyBinCount: number; - maxDecibels: number; - minDecibels: number; - smoothingTimeConstant: number; - getByteFrequencyData(array: Uint8Array): void; - getByteTimeDomainData(array: Uint8Array): void; - getFloatFrequencyData(array: Float32Array): void; - getFloatTimeDomainData(array: Float32Array): void; -} - -declare var AnalyserNode: { - prototype: AnalyserNode; - new(): AnalyserNode; -} - -interface AnimationEvent extends Event { - animationName: string; - elapsedTime: number; - initAnimationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, animationNameArg: string, elapsedTimeArg: number): void; -} - -declare var AnimationEvent: { - prototype: AnimationEvent; - new(): AnimationEvent; -} - -interface ApplicationCache extends EventTarget { - oncached: (ev: Event) => any; - onchecking: (ev: Event) => any; - ondownloading: (ev: Event) => any; - onerror: (ev: Event) => any; - onnoupdate: (ev: Event) => any; - onobsolete: (ev: Event) => any; - onprogress: (ev: ProgressEvent) => any; - onupdateready: (ev: Event) => any; - status: number; - abort(): void; - swapCache(): void; - update(): void; - CHECKING: number; - DOWNLOADING: number; - IDLE: number; - OBSOLETE: number; - UNCACHED: number; - UPDATEREADY: number; - addEventListener(type: "cached", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "checking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "downloading", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "noupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "obsolete", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "updateready", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var ApplicationCache: { - prototype: ApplicationCache; - new(): ApplicationCache; - CHECKING: number; - DOWNLOADING: number; - IDLE: number; - OBSOLETE: number; - UNCACHED: number; - UPDATEREADY: number; -} - -interface AriaRequestEvent extends Event { - attributeName: string; - attributeValue: string; -} - -declare var AriaRequestEvent: { - prototype: AriaRequestEvent; - new(type: string, eventInitDict?: AriaRequestEventInit): AriaRequestEvent; -} - -interface Attr extends Node { - name: string; - ownerElement: Element; - specified: boolean; - value: string; -} - -declare var Attr: { - prototype: Attr; - new(): Attr; -} - -interface AudioBuffer { - duration: number; - length: number; - numberOfChannels: number; - sampleRate: number; - getChannelData(channel: number): Float32Array; -} - -declare var AudioBuffer: { - prototype: AudioBuffer; - new(): AudioBuffer; -} - -interface AudioBufferSourceNode extends AudioNode { - buffer: AudioBuffer; - loop: boolean; - loopEnd: number; - loopStart: number; - onended: (ev: Event) => any; - playbackRate: AudioParam; - start(when?: number, offset?: number, duration?: number): void; - stop(when?: number): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var AudioBufferSourceNode: { - prototype: AudioBufferSourceNode; - new(): AudioBufferSourceNode; -} - -interface AudioContext extends EventTarget { - currentTime: number; - destination: AudioDestinationNode; - listener: AudioListener; - sampleRate: number; - state: string; - createAnalyser(): AnalyserNode; - createBiquadFilter(): BiquadFilterNode; - createBuffer(numberOfChannels: number, length: number, sampleRate: number): AudioBuffer; - createBufferSource(): AudioBufferSourceNode; - createChannelMerger(numberOfInputs?: number): ChannelMergerNode; - createChannelSplitter(numberOfOutputs?: number): ChannelSplitterNode; - createConvolver(): ConvolverNode; - createDelay(maxDelayTime?: number): DelayNode; - createDynamicsCompressor(): DynamicsCompressorNode; - createGain(): GainNode; - createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode; - createOscillator(): OscillatorNode; - createPanner(): PannerNode; - createPeriodicWave(real: Float32Array, imag: Float32Array): PeriodicWave; - createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode; - createStereoPanner(): StereoPannerNode; - createWaveShaper(): WaveShaperNode; - decodeAudioData(audioData: ArrayBuffer, successCallback: DecodeSuccessCallback, errorCallback?: DecodeErrorCallback): void; -} - -declare var AudioContext: { - prototype: AudioContext; - new(): AudioContext; -} - -interface AudioDestinationNode extends AudioNode { - maxChannelCount: number; -} - -declare var AudioDestinationNode: { - prototype: AudioDestinationNode; - new(): AudioDestinationNode; -} - -interface AudioListener { - dopplerFactor: number; - speedOfSound: number; - setOrientation(x: number, y: number, z: number, xUp: number, yUp: number, zUp: number): void; - setPosition(x: number, y: number, z: number): void; - setVelocity(x: number, y: number, z: number): void; -} - -declare var AudioListener: { - prototype: AudioListener; - new(): AudioListener; -} - -interface AudioNode extends EventTarget { - channelCount: number; - channelCountMode: string; - channelInterpretation: string; - context: AudioContext; - numberOfInputs: number; - numberOfOutputs: number; - connect(destination: AudioNode, output?: number, input?: number): void; - disconnect(output?: number): void; -} - -declare var AudioNode: { - prototype: AudioNode; - new(): AudioNode; -} - -interface AudioParam { - defaultValue: number; - value: number; - cancelScheduledValues(startTime: number): void; - exponentialRampToValueAtTime(value: number, endTime: number): void; - linearRampToValueAtTime(value: number, endTime: number): void; - setTargetAtTime(target: number, startTime: number, timeConstant: number): void; - setValueAtTime(value: number, startTime: number): void; - setValueCurveAtTime(values: Float32Array, startTime: number, duration: number): void; -} - -declare var AudioParam: { - prototype: AudioParam; - new(): AudioParam; -} - -interface AudioProcessingEvent extends Event { - inputBuffer: AudioBuffer; - outputBuffer: AudioBuffer; - playbackTime: number; -} - -declare var AudioProcessingEvent: { - prototype: AudioProcessingEvent; - new(): AudioProcessingEvent; -} - -interface AudioTrack { - enabled: boolean; - id: string; - kind: string; - label: string; - language: string; - sourceBuffer: SourceBuffer; -} - -declare var AudioTrack: { - prototype: AudioTrack; - new(): AudioTrack; -} - -interface AudioTrackList extends EventTarget { - length: number; - onaddtrack: (ev: TrackEvent) => any; - onchange: (ev: Event) => any; - onremovetrack: (ev: TrackEvent) => any; - getTrackById(id: string): AudioTrack; - item(index: number): AudioTrack; - addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; - [index: number]: AudioTrack; -} - -declare var AudioTrackList: { - prototype: AudioTrackList; - new(): AudioTrackList; -} - -interface BarProp { - visible: boolean; -} - -declare var BarProp: { - prototype: BarProp; - new(): BarProp; -} - -interface BeforeUnloadEvent extends Event { - returnValue: any; -} - -declare var BeforeUnloadEvent: { - prototype: BeforeUnloadEvent; - new(): BeforeUnloadEvent; -} - -interface BiquadFilterNode extends AudioNode { - Q: AudioParam; - detune: AudioParam; - frequency: AudioParam; - gain: AudioParam; - type: string; - getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void; -} - -declare var BiquadFilterNode: { - prototype: BiquadFilterNode; - new(): BiquadFilterNode; -} - -interface Blob { - size: number; - type: string; - msClose(): void; - msDetachStream(): any; - slice(start?: number, end?: number, contentType?: string): Blob; -} - -declare var Blob: { - prototype: Blob; - new (blobParts?: any[], options?: BlobPropertyBag): Blob; -} - -interface CDATASection extends Text { -} - -declare var CDATASection: { - prototype: CDATASection; - new(): CDATASection; -} - -interface CSS { - supports(property: string, value?: string): boolean; -} -declare var CSS: CSS; - -interface CSSConditionRule extends CSSGroupingRule { - conditionText: string; -} - -declare var CSSConditionRule: { - prototype: CSSConditionRule; - new(): CSSConditionRule; -} - -interface CSSFontFaceRule extends CSSRule { - style: CSSStyleDeclaration; -} - -declare var CSSFontFaceRule: { - prototype: CSSFontFaceRule; - new(): CSSFontFaceRule; -} - -interface CSSGroupingRule extends CSSRule { - cssRules: CSSRuleList; - deleteRule(index?: number): void; - insertRule(rule: string, index?: number): number; -} - -declare var CSSGroupingRule: { - prototype: CSSGroupingRule; - new(): CSSGroupingRule; -} - -interface CSSImportRule extends CSSRule { - href: string; - media: MediaList; - styleSheet: CSSStyleSheet; -} - -declare var CSSImportRule: { - prototype: CSSImportRule; - new(): CSSImportRule; -} - -interface CSSKeyframeRule extends CSSRule { - keyText: string; - style: CSSStyleDeclaration; -} - -declare var CSSKeyframeRule: { - prototype: CSSKeyframeRule; - new(): CSSKeyframeRule; -} - -interface CSSKeyframesRule extends CSSRule { - cssRules: CSSRuleList; - name: string; - appendRule(rule: string): void; - deleteRule(rule: string): void; - findRule(rule: string): CSSKeyframeRule; -} - -declare var CSSKeyframesRule: { - prototype: CSSKeyframesRule; - new(): CSSKeyframesRule; -} - -interface CSSMediaRule extends CSSConditionRule { - media: MediaList; -} - -declare var CSSMediaRule: { - prototype: CSSMediaRule; - new(): CSSMediaRule; -} - -interface CSSNamespaceRule extends CSSRule { - namespaceURI: string; - prefix: string; -} - -declare var CSSNamespaceRule: { - prototype: CSSNamespaceRule; - new(): CSSNamespaceRule; -} - -interface CSSPageRule extends CSSRule { - pseudoClass: string; - selector: string; - selectorText: string; - style: CSSStyleDeclaration; -} - -declare var CSSPageRule: { - prototype: CSSPageRule; - new(): CSSPageRule; -} - -interface CSSRule { - cssText: string; - parentRule: CSSRule; - parentStyleSheet: CSSStyleSheet; - type: number; - CHARSET_RULE: number; - FONT_FACE_RULE: number; - IMPORT_RULE: number; - KEYFRAMES_RULE: number; - KEYFRAME_RULE: number; - MEDIA_RULE: number; - NAMESPACE_RULE: number; - PAGE_RULE: number; - STYLE_RULE: number; - SUPPORTS_RULE: number; - UNKNOWN_RULE: number; - VIEWPORT_RULE: number; -} - -declare var CSSRule: { - prototype: CSSRule; - new(): CSSRule; - CHARSET_RULE: number; - FONT_FACE_RULE: number; - IMPORT_RULE: number; - KEYFRAMES_RULE: number; - KEYFRAME_RULE: number; - MEDIA_RULE: number; - NAMESPACE_RULE: number; - PAGE_RULE: number; - STYLE_RULE: number; - SUPPORTS_RULE: number; - UNKNOWN_RULE: number; - VIEWPORT_RULE: number; -} - -interface CSSRuleList { - length: number; - item(index: number): CSSRule; - [index: number]: CSSRule; -} - -declare var CSSRuleList: { - prototype: CSSRuleList; - new(): CSSRuleList; -} - -interface CSSStyleDeclaration { - alignContent: string; - alignItems: string; - alignSelf: string; - alignmentBaseline: string; - animation: string; - animationDelay: string; - animationDirection: string; - animationDuration: string; - animationFillMode: string; - animationIterationCount: string; - animationName: string; - animationPlayState: string; - animationTimingFunction: string; - backfaceVisibility: string; - background: string; - backgroundAttachment: string; - backgroundClip: string; - backgroundColor: string; - backgroundImage: string; - backgroundOrigin: string; - backgroundPosition: string; - backgroundPositionX: string; - backgroundPositionY: string; - backgroundRepeat: string; - backgroundSize: string; - baselineShift: string; - border: string; - borderBottom: string; - borderBottomColor: string; - borderBottomLeftRadius: string; - borderBottomRightRadius: string; - borderBottomStyle: string; - borderBottomWidth: string; - borderCollapse: string; - borderColor: string; - borderImage: string; - borderImageOutset: string; - borderImageRepeat: string; - borderImageSlice: string; - borderImageSource: string; - borderImageWidth: string; - borderLeft: string; - borderLeftColor: string; - borderLeftStyle: string; - borderLeftWidth: string; - borderRadius: string; - borderRight: string; - borderRightColor: string; - borderRightStyle: string; - borderRightWidth: string; - borderSpacing: string; - borderStyle: string; - borderTop: string; - borderTopColor: string; - borderTopLeftRadius: string; - borderTopRightRadius: string; - borderTopStyle: string; - borderTopWidth: string; - borderWidth: string; - bottom: string; - boxShadow: string; - boxSizing: string; - breakAfter: string; - breakBefore: string; - breakInside: string; - captionSide: string; - clear: string; - clip: string; - clipPath: string; - clipRule: string; - color: string; - colorInterpolationFilters: string; - columnCount: any; - columnFill: string; - columnGap: any; - columnRule: string; - columnRuleColor: any; - columnRuleStyle: string; - columnRuleWidth: any; - columnSpan: string; - columnWidth: any; - columns: string; - content: string; - counterIncrement: string; - counterReset: string; - cssFloat: string; - cssText: string; - cursor: string; - direction: string; - display: string; - dominantBaseline: string; - emptyCells: string; - enableBackground: string; - fill: string; - fillOpacity: string; - fillRule: string; - filter: string; - flex: string; - flexBasis: string; - flexDirection: string; - flexFlow: string; - flexGrow: string; - flexShrink: string; - flexWrap: string; - floodColor: string; - floodOpacity: string; - font: string; - fontFamily: string; - fontFeatureSettings: string; - fontSize: string; - fontSizeAdjust: string; - fontStretch: string; - fontStyle: string; - fontVariant: string; - fontWeight: string; - glyphOrientationHorizontal: string; - glyphOrientationVertical: string; - height: string; - imeMode: string; - justifyContent: string; - kerning: string; - left: string; - length: number; - letterSpacing: string; - lightingColor: string; - lineHeight: string; - listStyle: string; - listStyleImage: string; - listStylePosition: string; - listStyleType: string; - margin: string; - marginBottom: string; - marginLeft: string; - marginRight: string; - marginTop: string; - marker: string; - markerEnd: string; - markerMid: string; - markerStart: string; - mask: string; - maxHeight: string; - maxWidth: string; - minHeight: string; - minWidth: string; - msContentZoomChaining: string; - msContentZoomLimit: string; - msContentZoomLimitMax: any; - msContentZoomLimitMin: any; - msContentZoomSnap: string; - msContentZoomSnapPoints: string; - msContentZoomSnapType: string; - msContentZooming: string; - msFlowFrom: string; - msFlowInto: string; - msFontFeatureSettings: string; - msGridColumn: any; - msGridColumnAlign: string; - msGridColumnSpan: any; - msGridColumns: string; - msGridRow: any; - msGridRowAlign: string; - msGridRowSpan: any; - msGridRows: string; - msHighContrastAdjust: string; - msHyphenateLimitChars: string; - msHyphenateLimitLines: any; - msHyphenateLimitZone: any; - msHyphens: string; - msImeAlign: string; - msOverflowStyle: string; - msScrollChaining: string; - msScrollLimit: string; - msScrollLimitXMax: any; - msScrollLimitXMin: any; - msScrollLimitYMax: any; - msScrollLimitYMin: any; - msScrollRails: string; - msScrollSnapPointsX: string; - msScrollSnapPointsY: string; - msScrollSnapType: string; - msScrollSnapX: string; - msScrollSnapY: string; - msScrollTranslation: string; - msTextCombineHorizontal: string; - msTextSizeAdjust: any; - msTouchAction: string; - msTouchSelect: string; - msUserSelect: string; - msWrapFlow: string; - msWrapMargin: any; - msWrapThrough: string; - opacity: string; - order: string; - orphans: string; - outline: string; - outlineColor: string; - outlineStyle: string; - outlineWidth: string; - overflow: string; - overflowX: string; - overflowY: string; - padding: string; - paddingBottom: string; - paddingLeft: string; - paddingRight: string; - paddingTop: string; - pageBreakAfter: string; - pageBreakBefore: string; - pageBreakInside: string; - parentRule: CSSRule; - perspective: string; - perspectiveOrigin: string; - pointerEvents: string; - position: string; - quotes: string; - right: string; - rubyAlign: string; - rubyOverhang: string; - rubyPosition: string; - stopColor: string; - stopOpacity: string; - stroke: string; - strokeDasharray: string; - strokeDashoffset: string; - strokeLinecap: string; - strokeLinejoin: string; - strokeMiterlimit: string; - strokeOpacity: string; - strokeWidth: string; - tableLayout: string; - textAlign: string; - textAlignLast: string; - textAnchor: string; - textDecoration: string; - textFillColor: string; - textIndent: string; - textJustify: string; - textKashida: string; - textKashidaSpace: string; - textOverflow: string; - textShadow: string; - textTransform: string; - textUnderlinePosition: string; - top: string; - touchAction: string; - transform: string; - transformOrigin: string; - transformStyle: string; - transition: string; - transitionDelay: string; - transitionDuration: string; - transitionProperty: string; - transitionTimingFunction: string; - unicodeBidi: string; - verticalAlign: string; - visibility: string; - webkitAlignContent: string; - webkitAlignItems: string; - webkitAlignSelf: string; - webkitAnimation: string; - webkitAnimationDelay: string; - webkitAnimationDirection: string; - webkitAnimationDuration: string; - webkitAnimationFillMode: string; - webkitAnimationIterationCount: string; - webkitAnimationName: string; - webkitAnimationPlayState: string; - webkitAnimationTimingFunction: string; - webkitAppearance: string; - webkitBackfaceVisibility: string; - webkitBackground: string; - webkitBackgroundAttachment: string; - webkitBackgroundClip: string; - webkitBackgroundColor: string; - webkitBackgroundImage: string; - webkitBackgroundOrigin: string; - webkitBackgroundPosition: string; - webkitBackgroundPositionX: string; - webkitBackgroundPositionY: string; - webkitBackgroundRepeat: string; - webkitBackgroundSize: string; - webkitBorderBottomLeftRadius: string; - webkitBorderBottomRightRadius: string; - webkitBorderImage: string; - webkitBorderImageOutset: string; - webkitBorderImageRepeat: string; - webkitBorderImageSlice: string; - webkitBorderImageSource: string; - webkitBorderImageWidth: string; - webkitBorderRadius: string; - webkitBorderTopLeftRadius: string; - webkitBorderTopRightRadius: string; - webkitBoxAlign: string; - webkitBoxDirection: string; - webkitBoxFlex: string; - webkitBoxOrdinalGroup: string; - webkitBoxOrient: string; - webkitBoxPack: string; - webkitBoxSizing: string; - webkitColumnBreakAfter: string; - webkitColumnBreakBefore: string; - webkitColumnBreakInside: string; - webkitColumnCount: any; - webkitColumnGap: any; - webkitColumnRule: string; - webkitColumnRuleColor: any; - webkitColumnRuleStyle: string; - webkitColumnRuleWidth: any; - webkitColumnSpan: string; - webkitColumnWidth: any; - webkitColumns: string; - webkitFilter: string; - webkitFlex: string; - webkitFlexBasis: string; - webkitFlexDirection: string; - webkitFlexFlow: string; - webkitFlexGrow: string; - webkitFlexShrink: string; - webkitFlexWrap: string; - webkitJustifyContent: string; - webkitOrder: string; - webkitPerspective: string; - webkitPerspectiveOrigin: string; - webkitTapHighlightColor: string; - webkitTextFillColor: string; - webkitTextSizeAdjust: any; - webkitTransform: string; - webkitTransformOrigin: string; - webkitTransformStyle: string; - webkitTransition: string; - webkitTransitionDelay: string; - webkitTransitionDuration: string; - webkitTransitionProperty: string; - webkitTransitionTimingFunction: string; - webkitUserSelect: string; - webkitWritingMode: string; - whiteSpace: string; - widows: string; - width: string; - wordBreak: string; - wordSpacing: string; - wordWrap: string; - writingMode: string; - zIndex: string; - zoom: string; - getPropertyPriority(propertyName: string): string; - getPropertyValue(propertyName: string): string; - item(index: number): string; - removeProperty(propertyName: string): string; - setProperty(propertyName: string, value: string, priority?: string): void; - [index: number]: string; -} - -declare var CSSStyleDeclaration: { - prototype: CSSStyleDeclaration; - new(): CSSStyleDeclaration; -} - -interface CSSStyleRule extends CSSRule { - readOnly: boolean; - selectorText: string; - style: CSSStyleDeclaration; -} - -declare var CSSStyleRule: { - prototype: CSSStyleRule; - new(): CSSStyleRule; -} - -interface CSSStyleSheet extends StyleSheet { - cssRules: CSSRuleList; - cssText: string; - href: string; - id: string; - imports: StyleSheetList; - isAlternate: boolean; - isPrefAlternate: boolean; - ownerRule: CSSRule; - owningElement: Element; - pages: StyleSheetPageList; - readOnly: boolean; - rules: CSSRuleList; - addImport(bstrURL: string, lIndex?: number): number; - addPageRule(bstrSelector: string, bstrStyle: string, lIndex?: number): number; - addRule(bstrSelector: string, bstrStyle?: string, lIndex?: number): number; - deleteRule(index?: number): void; - insertRule(rule: string, index?: number): number; - removeImport(lIndex: number): void; - removeRule(lIndex: number): void; -} - -declare var CSSStyleSheet: { - prototype: CSSStyleSheet; - new(): CSSStyleSheet; -} - -interface CSSSupportsRule extends CSSConditionRule { -} - -declare var CSSSupportsRule: { - prototype: CSSSupportsRule; - new(): CSSSupportsRule; -} - -interface CanvasGradient { - addColorStop(offset: number, color: string): void; -} - -declare var CanvasGradient: { - prototype: CanvasGradient; - new(): CanvasGradient; -} - -interface CanvasPattern { -} - -declare var CanvasPattern: { - prototype: CanvasPattern; - new(): CanvasPattern; -} - -interface CanvasRenderingContext2D { - canvas: HTMLCanvasElement; - fillStyle: string | CanvasGradient | CanvasPattern; - font: string; - globalAlpha: number; - globalCompositeOperation: string; - lineCap: string; - lineDashOffset: number; - lineJoin: string; - lineWidth: number; - miterLimit: number; - msFillRule: string; - msImageSmoothingEnabled: boolean; - shadowBlur: number; - shadowColor: string; - shadowOffsetX: number; - shadowOffsetY: number; - strokeStyle: string | CanvasGradient | CanvasPattern; - textAlign: string; - textBaseline: string; - arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void; - arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void; - beginPath(): void; - bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void; - clearRect(x: number, y: number, w: number, h: number): void; - clip(fillRule?: string): void; - closePath(): void; - createImageData(imageDataOrSw: number | ImageData, sh?: number): ImageData; - createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient; - createPattern(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, repetition: string): CanvasPattern; - createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient; - drawImage(image: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, offsetX: number, offsetY: number, width?: number, height?: number, canvasOffsetX?: number, canvasOffsetY?: number, canvasImageWidth?: number, canvasImageHeight?: number): void; - fill(fillRule?: string): void; - fillRect(x: number, y: number, w: number, h: number): void; - fillText(text: string, x: number, y: number, maxWidth?: number): void; - getImageData(sx: number, sy: number, sw: number, sh: number): ImageData; - getLineDash(): number[]; - isPointInPath(x: number, y: number, fillRule?: string): boolean; - lineTo(x: number, y: number): void; - measureText(text: string): TextMetrics; - moveTo(x: number, y: number): void; - putImageData(imagedata: ImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number): void; - quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void; - rect(x: number, y: number, w: number, h: number): void; - restore(): void; - rotate(angle: number): void; - save(): void; - scale(x: number, y: number): void; - setLineDash(segments: number[]): void; - setTransform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void; - stroke(): void; - strokeRect(x: number, y: number, w: number, h: number): void; - strokeText(text: string, x: number, y: number, maxWidth?: number): void; - transform(m11: number, m12: number, m21: number, m22: number, dx: number, dy: number): void; - translate(x: number, y: number): void; -} - -declare var CanvasRenderingContext2D: { - prototype: CanvasRenderingContext2D; - new(): CanvasRenderingContext2D; -} - -interface ChannelMergerNode extends AudioNode { -} - -declare var ChannelMergerNode: { - prototype: ChannelMergerNode; - new(): ChannelMergerNode; -} - -interface ChannelSplitterNode extends AudioNode { -} - -declare var ChannelSplitterNode: { - prototype: ChannelSplitterNode; - new(): ChannelSplitterNode; -} - -interface CharacterData extends Node, ChildNode { - data: string; - length: number; - appendData(arg: string): void; - deleteData(offset: number, count: number): void; - insertData(offset: number, arg: string): void; - replaceData(offset: number, count: number, arg: string): void; - substringData(offset: number, count: number): string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var CharacterData: { - prototype: CharacterData; - new(): CharacterData; -} - -interface ClientRect { - bottom: number; - height: number; - left: number; - right: number; - top: number; - width: number; -} - -declare var ClientRect: { - prototype: ClientRect; - new(): ClientRect; -} - -interface ClientRectList { - length: number; - item(index: number): ClientRect; - [index: number]: ClientRect; -} - -declare var ClientRectList: { - prototype: ClientRectList; - new(): ClientRectList; -} - -interface ClipboardEvent extends Event { - clipboardData: DataTransfer; -} - -declare var ClipboardEvent: { - prototype: ClipboardEvent; - new(type: string, eventInitDict?: ClipboardEventInit): ClipboardEvent; -} - -interface CloseEvent extends Event { - code: number; - reason: string; - wasClean: boolean; - initCloseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, wasCleanArg: boolean, codeArg: number, reasonArg: string): void; -} - -declare var CloseEvent: { - prototype: CloseEvent; - new(): CloseEvent; -} - -interface CommandEvent extends Event { - commandName: string; - detail: string; -} - -declare var CommandEvent: { - prototype: CommandEvent; - new(type: string, eventInitDict?: CommandEventInit): CommandEvent; -} - -interface Comment extends CharacterData { - text: string; -} - -declare var Comment: { - prototype: Comment; - new(): Comment; -} - -interface CompositionEvent extends UIEvent { - data: string; - locale: string; - initCompositionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, locale: string): void; -} - -declare var CompositionEvent: { - prototype: CompositionEvent; - new(typeArg: string, eventInitDict?: CompositionEventInit): CompositionEvent; -} - -interface Console { - assert(test?: boolean, message?: string, ...optionalParams: any[]): void; - clear(): void; - count(countTitle?: string): void; - debug(message?: string, ...optionalParams: any[]): void; - dir(value?: any, ...optionalParams: any[]): void; - dirxml(value: any): void; - error(message?: any, ...optionalParams: any[]): void; - group(groupTitle?: string): void; - groupCollapsed(groupTitle?: string): void; - groupEnd(): void; - info(message?: any, ...optionalParams: any[]): void; - log(message?: any, ...optionalParams: any[]): void; - msIsIndependentlyComposed(element: Element): boolean; - profile(reportName?: string): void; - profileEnd(): void; - select(element: Element): void; - time(timerName?: string): void; - timeEnd(timerName?: string): void; - trace(message?: any, ...optionalParams: any[]): void; - warn(message?: any, ...optionalParams: any[]): void; -} - -declare var Console: { - prototype: Console; - new(): Console; -} - -interface ConvolverNode extends AudioNode { - buffer: AudioBuffer; - normalize: boolean; -} - -declare var ConvolverNode: { - prototype: ConvolverNode; - new(): ConvolverNode; -} - -interface Coordinates { - accuracy: number; - altitude: number; - altitudeAccuracy: number; - heading: number; - latitude: number; - longitude: number; - speed: number; -} - -declare var Coordinates: { - prototype: Coordinates; - new(): Coordinates; -} - -interface Crypto extends Object, RandomSource { - subtle: SubtleCrypto; -} - -declare var Crypto: { - prototype: Crypto; - new(): Crypto; -} - -interface CryptoKey { - algorithm: KeyAlgorithm; - extractable: boolean; - type: string; - usages: string[]; -} - -declare var CryptoKey: { - prototype: CryptoKey; - new(): CryptoKey; -} - -interface CryptoKeyPair { - privateKey: CryptoKey; - publicKey: CryptoKey; -} - -declare var CryptoKeyPair: { - prototype: CryptoKeyPair; - new(): CryptoKeyPair; -} - -interface CustomEvent extends Event { - detail: any; - initCustomEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, detailArg: any): void; -} - -declare var CustomEvent: { - prototype: CustomEvent; - new(typeArg: string, eventInitDict?: CustomEventInit): CustomEvent; -} - -interface DOMError { - name: string; - toString(): string; -} - -declare var DOMError: { - prototype: DOMError; - new(): DOMError; -} - -interface DOMException { - code: number; - message: string; - name: string; - toString(): string; - ABORT_ERR: number; - DATA_CLONE_ERR: number; - DOMSTRING_SIZE_ERR: number; - HIERARCHY_REQUEST_ERR: number; - INDEX_SIZE_ERR: number; - INUSE_ATTRIBUTE_ERR: number; - INVALID_ACCESS_ERR: number; - INVALID_CHARACTER_ERR: number; - INVALID_MODIFICATION_ERR: number; - INVALID_NODE_TYPE_ERR: number; - INVALID_STATE_ERR: number; - NAMESPACE_ERR: number; - NETWORK_ERR: number; - NOT_FOUND_ERR: number; - NOT_SUPPORTED_ERR: number; - NO_DATA_ALLOWED_ERR: number; - NO_MODIFICATION_ALLOWED_ERR: number; - PARSE_ERR: number; - QUOTA_EXCEEDED_ERR: number; - SECURITY_ERR: number; - SERIALIZE_ERR: number; - SYNTAX_ERR: number; - TIMEOUT_ERR: number; - TYPE_MISMATCH_ERR: number; - URL_MISMATCH_ERR: number; - VALIDATION_ERR: number; - WRONG_DOCUMENT_ERR: number; -} - -declare var DOMException: { - prototype: DOMException; - new(): DOMException; - ABORT_ERR: number; - DATA_CLONE_ERR: number; - DOMSTRING_SIZE_ERR: number; - HIERARCHY_REQUEST_ERR: number; - INDEX_SIZE_ERR: number; - INUSE_ATTRIBUTE_ERR: number; - INVALID_ACCESS_ERR: number; - INVALID_CHARACTER_ERR: number; - INVALID_MODIFICATION_ERR: number; - INVALID_NODE_TYPE_ERR: number; - INVALID_STATE_ERR: number; - NAMESPACE_ERR: number; - NETWORK_ERR: number; - NOT_FOUND_ERR: number; - NOT_SUPPORTED_ERR: number; - NO_DATA_ALLOWED_ERR: number; - NO_MODIFICATION_ALLOWED_ERR: number; - PARSE_ERR: number; - QUOTA_EXCEEDED_ERR: number; - SECURITY_ERR: number; - SERIALIZE_ERR: number; - SYNTAX_ERR: number; - TIMEOUT_ERR: number; - TYPE_MISMATCH_ERR: number; - URL_MISMATCH_ERR: number; - VALIDATION_ERR: number; - WRONG_DOCUMENT_ERR: number; -} - -interface DOMImplementation { - createDocument(namespaceURI: string, qualifiedName: string, doctype: DocumentType): Document; - createDocumentType(qualifiedName: string, publicId: string, systemId: string): DocumentType; - createHTMLDocument(title: string): Document; - hasFeature(feature: string, version: string): boolean; -} - -declare var DOMImplementation: { - prototype: DOMImplementation; - new(): DOMImplementation; -} - -interface DOMParser { - parseFromString(source: string, mimeType: string): Document; -} - -declare var DOMParser: { - prototype: DOMParser; - new(): DOMParser; -} - -interface DOMSettableTokenList extends DOMTokenList { - value: string; -} - -declare var DOMSettableTokenList: { - prototype: DOMSettableTokenList; - new(): DOMSettableTokenList; -} - -interface DOMStringList { - length: number; - contains(str: string): boolean; - item(index: number): string; - [index: number]: string; -} - -declare var DOMStringList: { - prototype: DOMStringList; - new(): DOMStringList; -} - -interface DOMStringMap { - [name: string]: string; -} - -declare var DOMStringMap: { - prototype: DOMStringMap; - new(): DOMStringMap; -} - -interface DOMTokenList { - length: number; - add(...token: string[]): void; - contains(token: string): boolean; - item(index: number): string; - remove(...token: string[]): void; - toString(): string; - toggle(token: string, force?: boolean): boolean; - [index: number]: string; -} - -declare var DOMTokenList: { - prototype: DOMTokenList; - new(): DOMTokenList; -} - -interface DataCue extends TextTrackCue { - data: ArrayBuffer; -} - -declare var DataCue: { - prototype: DataCue; - new(): DataCue; -} - -interface DataTransfer { - dropEffect: string; - effectAllowed: string; - files: FileList; - items: DataTransferItemList; - types: DOMStringList; - clearData(format?: string): boolean; - getData(format: string): string; - setData(format: string, data: string): boolean; -} - -declare var DataTransfer: { - prototype: DataTransfer; - new(): DataTransfer; -} - -interface DataTransferItem { - kind: string; - type: string; - getAsFile(): File; - getAsString(_callback: FunctionStringCallback): void; -} - -declare var DataTransferItem: { - prototype: DataTransferItem; - new(): DataTransferItem; -} - -interface DataTransferItemList { - length: number; - add(data: File): DataTransferItem; - clear(): void; - item(index: number): DataTransferItem; - remove(index: number): void; - [index: number]: DataTransferItem; -} - -declare var DataTransferItemList: { - prototype: DataTransferItemList; - new(): DataTransferItemList; -} - -interface DeferredPermissionRequest { - id: number; - type: string; - uri: string; - allow(): void; - deny(): void; -} - -declare var DeferredPermissionRequest: { - prototype: DeferredPermissionRequest; - new(): DeferredPermissionRequest; -} - -interface DelayNode extends AudioNode { - delayTime: AudioParam; -} - -declare var DelayNode: { - prototype: DelayNode; - new(): DelayNode; -} - -interface DeviceAcceleration { - x: number; - y: number; - z: number; -} - -declare var DeviceAcceleration: { - prototype: DeviceAcceleration; - new(): DeviceAcceleration; -} - -interface DeviceMotionEvent extends Event { - acceleration: DeviceAcceleration; - accelerationIncludingGravity: DeviceAcceleration; - interval: number; - rotationRate: DeviceRotationRate; - initDeviceMotionEvent(type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceAccelerationDict, accelerationIncludingGravity: DeviceAccelerationDict, rotationRate: DeviceRotationRateDict, interval: number): void; -} - -declare var DeviceMotionEvent: { - prototype: DeviceMotionEvent; - new(): DeviceMotionEvent; -} - -interface DeviceOrientationEvent extends Event { - absolute: boolean; - alpha: number; - beta: number; - gamma: number; - initDeviceOrientationEvent(type: string, bubbles: boolean, cancelable: boolean, alpha: number, beta: number, gamma: number, absolute: boolean): void; -} - -declare var DeviceOrientationEvent: { - prototype: DeviceOrientationEvent; - new(): DeviceOrientationEvent; -} - -interface DeviceRotationRate { - alpha: number; - beta: number; - gamma: number; -} - -declare var DeviceRotationRate: { - prototype: DeviceRotationRate; - new(): DeviceRotationRate; -} - -interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEvent { - /** - * Sets or gets the URL for the current document. - */ - URL: string; - /** - * Gets the URL for the document, stripped of any character encoding. - */ - URLUnencoded: string; - /** - * Gets the object that has the focus when the parent document has focus. - */ - activeElement: Element; - /** - * Sets or gets the color of all active links in the document. - */ - alinkColor: string; - /** - * Returns a reference to the collection of elements contained by the object. - */ - all: HTMLCollection; - /** - * Retrieves a collection of all a objects that have a name and/or id property. Objects in this collection are in HTML source order. - */ - anchors: HTMLCollection; - /** - * Retrieves a collection of all applet objects in the document. - */ - applets: HTMLCollection; - /** - * Deprecated. Sets or retrieves a value that indicates the background color behind the object. - */ - bgColor: string; - /** - * Specifies the beginning and end of the document body. - */ - body: HTMLElement; - characterSet: string; - /** - * Gets or sets the character set used to encode the object. - */ - charset: string; - /** - * Gets a value that indicates whether standards-compliant mode is switched on for the object. - */ - compatMode: string; - cookie: string; - /** - * Gets the default character set from the current regional language settings. - */ - defaultCharset: string; - defaultView: Window; - /** - * Sets or gets a value that indicates whether the document can be edited. - */ - designMode: string; - /** - * Sets or retrieves a value that indicates the reading order of the object. - */ - dir: string; - /** - * Gets an object representing the document type declaration associated with the current document. - */ - doctype: DocumentType; - /** - * Gets a reference to the root node of the document. - */ - documentElement: HTMLElement; - /** - * Sets or gets the security domain of the document. - */ - domain: string; - /** - * Retrieves a collection of all embed objects in the document. - */ - embeds: HTMLCollection; - /** - * Sets or gets the foreground (text) color of the document. - */ - fgColor: string; - /** - * Retrieves a collection, in source order, of all form objects in the document. - */ - forms: HTMLCollection; - fullscreenElement: Element; - fullscreenEnabled: boolean; - head: HTMLHeadElement; - hidden: boolean; - /** - * Retrieves a collection, in source order, of img objects in the document. - */ - images: HTMLCollection; - /** - * Gets the implementation object of the current document. - */ - implementation: DOMImplementation; - /** - * Returns the character encoding used to create the webpage that is loaded into the document object. - */ - inputEncoding: string; - /** - * Gets the date that the page was last modified, if the page supplies one. - */ - lastModified: string; - /** - * Sets or gets the color of the document links. - */ - linkColor: string; - /** - * Retrieves a collection of all a objects that specify the href property and all area objects in the document. - */ - links: HTMLCollection; - /** - * Contains information about the current URL. - */ - location: Location; - media: string; - msCSSOMElementFloatMetrics: boolean; - msCapsLockWarningOff: boolean; - msHidden: boolean; - msVisibilityState: string; - /** - * Fires when the user aborts the download. - * @param ev The event. - */ - onabort: (ev: Event) => any; - /** - * Fires when the object is set as the active element. - * @param ev The event. - */ - onactivate: (ev: UIEvent) => any; - /** - * Fires immediately before the object is set as the active element. - * @param ev The event. - */ - onbeforeactivate: (ev: UIEvent) => any; - /** - * Fires immediately before the activeElement is changed from the current object to another object in the parent document. - * @param ev The event. - */ - onbeforedeactivate: (ev: UIEvent) => any; - /** - * Fires when the object loses the input focus. - * @param ev The focus event. - */ - onblur: (ev: FocusEvent) => any; - /** - * Occurs when playback is possible, but would require further buffering. - * @param ev The event. - */ - oncanplay: (ev: Event) => any; - oncanplaythrough: (ev: Event) => any; - /** - * Fires when the contents of the object or selection have changed. - * @param ev The event. - */ - onchange: (ev: Event) => any; - /** - * Fires when the user clicks the left mouse button on the object - * @param ev The mouse event. - */ - onclick: (ev: MouseEvent) => any; - /** - * Fires when the user clicks the right mouse button in the client area, opening the context menu. - * @param ev The mouse event. - */ - oncontextmenu: (ev: PointerEvent) => any; - /** - * Fires when the user double-clicks the object. - * @param ev The mouse event. - */ - ondblclick: (ev: MouseEvent) => any; - /** - * Fires when the activeElement is changed from the current object to another object in the parent document. - * @param ev The UI Event - */ - ondeactivate: (ev: UIEvent) => any; - /** - * Fires on the source object continuously during a drag operation. - * @param ev The event. - */ - ondrag: (ev: DragEvent) => any; - /** - * Fires on the source object when the user releases the mouse at the close of a drag operation. - * @param ev The event. - */ - ondragend: (ev: DragEvent) => any; - /** - * Fires on the target element when the user drags the object to a valid drop target. - * @param ev The drag event. - */ - ondragenter: (ev: DragEvent) => any; - /** - * Fires on the target object when the user moves the mouse out of a valid drop target during a drag operation. - * @param ev The drag event. - */ - ondragleave: (ev: DragEvent) => any; - /** - * Fires on the target element continuously while the user drags the object over a valid drop target. - * @param ev The event. - */ - ondragover: (ev: DragEvent) => any; - /** - * Fires on the source object when the user starts to drag a text selection or selected object. - * @param ev The event. - */ - ondragstart: (ev: DragEvent) => any; - ondrop: (ev: DragEvent) => any; - /** - * Occurs when the duration attribute is updated. - * @param ev The event. - */ - ondurationchange: (ev: Event) => any; - /** - * Occurs when the media element is reset to its initial state. - * @param ev The event. - */ - onemptied: (ev: Event) => any; - /** - * Occurs when the end of playback is reached. - * @param ev The event - */ - onended: (ev: Event) => any; - /** - * Fires when an error occurs during object loading. - * @param ev The event. - */ - onerror: (ev: Event) => any; - /** - * Fires when the object receives focus. - * @param ev The event. - */ - onfocus: (ev: FocusEvent) => any; - onfullscreenchange: (ev: Event) => any; - onfullscreenerror: (ev: Event) => any; - oninput: (ev: Event) => any; - /** - * Fires when the user presses a key. - * @param ev The keyboard event - */ - onkeydown: (ev: KeyboardEvent) => any; - /** - * Fires when the user presses an alphanumeric key. - * @param ev The event. - */ - onkeypress: (ev: KeyboardEvent) => any; - /** - * Fires when the user releases a key. - * @param ev The keyboard event - */ - onkeyup: (ev: KeyboardEvent) => any; - /** - * Fires immediately after the browser loads the object. - * @param ev The event. - */ - onload: (ev: Event) => any; - /** - * Occurs when media data is loaded at the current playback position. - * @param ev The event. - */ - onloadeddata: (ev: Event) => any; - /** - * Occurs when the duration and dimensions of the media have been determined. - * @param ev The event. - */ - onloadedmetadata: (ev: Event) => any; - /** - * Occurs when Internet Explorer begins looking for media data. - * @param ev The event. - */ - onloadstart: (ev: Event) => any; - /** - * Fires when the user clicks the object with either mouse button. - * @param ev The mouse event. - */ - onmousedown: (ev: MouseEvent) => any; - /** - * Fires when the user moves the mouse over the object. - * @param ev The mouse event. - */ - onmousemove: (ev: MouseEvent) => any; - /** - * Fires when the user moves the mouse pointer outside the boundaries of the object. - * @param ev The mouse event. - */ - onmouseout: (ev: MouseEvent) => any; - /** - * Fires when the user moves the mouse pointer into the object. - * @param ev The mouse event. - */ - onmouseover: (ev: MouseEvent) => any; - /** - * Fires when the user releases a mouse button while the mouse is over the object. - * @param ev The mouse event. - */ - onmouseup: (ev: MouseEvent) => any; - /** - * Fires when the wheel button is rotated. - * @param ev The mouse event - */ - onmousewheel: (ev: MouseWheelEvent) => any; - onmscontentzoom: (ev: UIEvent) => any; - onmsgesturechange: (ev: MSGestureEvent) => any; - onmsgesturedoubletap: (ev: MSGestureEvent) => any; - onmsgestureend: (ev: MSGestureEvent) => any; - onmsgesturehold: (ev: MSGestureEvent) => any; - onmsgesturestart: (ev: MSGestureEvent) => any; - onmsgesturetap: (ev: MSGestureEvent) => any; - onmsinertiastart: (ev: MSGestureEvent) => any; - onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any; - onmspointercancel: (ev: MSPointerEvent) => any; - onmspointerdown: (ev: MSPointerEvent) => any; - onmspointerenter: (ev: MSPointerEvent) => any; - onmspointerleave: (ev: MSPointerEvent) => any; - onmspointermove: (ev: MSPointerEvent) => any; - onmspointerout: (ev: MSPointerEvent) => any; - onmspointerover: (ev: MSPointerEvent) => any; - onmspointerup: (ev: MSPointerEvent) => any; - /** - * Occurs when an item is removed from a Jump List of a webpage running in Site Mode. - * @param ev The event. - */ - onmssitemodejumplistitemremoved: (ev: MSSiteModeEvent) => any; - /** - * Occurs when a user clicks a button in a Thumbnail Toolbar of a webpage running in Site Mode. - * @param ev The event. - */ - onmsthumbnailclick: (ev: MSSiteModeEvent) => any; - /** - * Occurs when playback is paused. - * @param ev The event. - */ - onpause: (ev: Event) => any; - /** - * Occurs when the play method is requested. - * @param ev The event. - */ - onplay: (ev: Event) => any; - /** - * Occurs when the audio or video has started playing. - * @param ev The event. - */ - onplaying: (ev: Event) => any; - onpointerlockchange: (ev: Event) => any; - onpointerlockerror: (ev: Event) => any; - /** - * Occurs to indicate progress while downloading media data. - * @param ev The event. - */ - onprogress: (ev: ProgressEvent) => any; - /** - * Occurs when the playback rate is increased or decreased. - * @param ev The event. - */ - onratechange: (ev: Event) => any; - /** - * Fires when the state of the object has changed. - * @param ev The event - */ - onreadystatechange: (ev: ProgressEvent) => any; - /** - * Fires when the user resets a form. - * @param ev The event. - */ - onreset: (ev: Event) => any; - /** - * Fires when the user repositions the scroll box in the scroll bar on the object. - * @param ev The event. - */ - onscroll: (ev: UIEvent) => any; - /** - * Occurs when the seek operation ends. - * @param ev The event. - */ - onseeked: (ev: Event) => any; - /** - * Occurs when the current playback position is moved. - * @param ev The event. - */ - onseeking: (ev: Event) => any; - /** - * Fires when the current selection changes. - * @param ev The event. - */ - onselect: (ev: UIEvent) => any; - onselectstart: (ev: Event) => any; - /** - * Occurs when the download has stopped. - * @param ev The event. - */ - onstalled: (ev: Event) => any; - /** - * Fires when the user clicks the Stop button or leaves the Web page. - * @param ev The event. - */ - onstop: (ev: Event) => any; - onsubmit: (ev: Event) => any; - /** - * Occurs if the load operation has been intentionally halted. - * @param ev The event. - */ - onsuspend: (ev: Event) => any; - /** - * Occurs to indicate the current playback position. - * @param ev The event. - */ - ontimeupdate: (ev: Event) => any; - ontouchcancel: (ev: TouchEvent) => any; - ontouchend: (ev: TouchEvent) => any; - ontouchmove: (ev: TouchEvent) => any; - ontouchstart: (ev: TouchEvent) => any; - /** - * Occurs when the volume is changed, or playback is muted or unmuted. - * @param ev The event. - */ - onvolumechange: (ev: Event) => any; - /** - * Occurs when playback stops because the next frame of a video resource is not available. - * @param ev The event. - */ - onwaiting: (ev: Event) => any; - onwebkitfullscreenchange: (ev: Event) => any; - onwebkitfullscreenerror: (ev: Event) => any; - plugins: HTMLCollection; - pointerLockElement: Element; - /** - * Retrieves a value that indicates the current state of the object. - */ - readyState: string; - /** - * Gets the URL of the location that referred the user to the current page. - */ - referrer: string; - /** - * Gets the root svg element in the document hierarchy. - */ - rootElement: SVGSVGElement; - /** - * Retrieves a collection of all script objects in the document. - */ - scripts: HTMLCollection; - security: string; - /** - * Retrieves a collection of styleSheet objects representing the style sheets that correspond to each instance of a link or style object in the document. - */ - styleSheets: StyleSheetList; - /** - * Contains the title of the document. - */ - title: string; - visibilityState: string; - /** - * Sets or gets the color of the links that the user has visited. - */ - vlinkColor: string; - webkitCurrentFullScreenElement: Element; - webkitFullscreenElement: Element; - webkitFullscreenEnabled: boolean; - webkitIsFullScreen: boolean; - xmlEncoding: string; - xmlStandalone: boolean; - /** - * Gets or sets the version attribute specified in the declaration of an XML document. - */ - xmlVersion: string; - currentScript: HTMLScriptElement; - adoptNode(source: Node): Node; - captureEvents(): void; - clear(): void; - /** - * Closes an output stream and forces the sent data to display. - */ - close(): void; - /** - * Creates an attribute object with a specified name. - * @param name String that sets the attribute object's name. - */ - createAttribute(name: string): Attr; - createAttributeNS(namespaceURI: string, qualifiedName: string): Attr; - createCDATASection(data: string): CDATASection; - /** - * Creates a comment object with the specified data. - * @param data Sets the comment object's data. - */ - createComment(data: string): Comment; - /** - * Creates a new document. - */ - createDocumentFragment(): DocumentFragment; - /** - * Creates an instance of the element for the specified tag. - * @param tagName The name of an element. - */ - createElement(tagName: "a"): HTMLAnchorElement; - createElement(tagName: "abbr"): HTMLPhraseElement; - createElement(tagName: "acronym"): HTMLPhraseElement; - createElement(tagName: "address"): HTMLBlockElement; - createElement(tagName: "applet"): HTMLAppletElement; - createElement(tagName: "area"): HTMLAreaElement; - createElement(tagName: "audio"): HTMLAudioElement; - createElement(tagName: "b"): HTMLPhraseElement; - createElement(tagName: "base"): HTMLBaseElement; - createElement(tagName: "basefont"): HTMLBaseFontElement; - createElement(tagName: "bdo"): HTMLPhraseElement; - createElement(tagName: "big"): HTMLPhraseElement; - createElement(tagName: "blockquote"): HTMLBlockElement; - createElement(tagName: "body"): HTMLBodyElement; - createElement(tagName: "br"): HTMLBRElement; - createElement(tagName: "button"): HTMLButtonElement; - createElement(tagName: "canvas"): HTMLCanvasElement; - createElement(tagName: "caption"): HTMLTableCaptionElement; - createElement(tagName: "center"): HTMLBlockElement; - createElement(tagName: "cite"): HTMLPhraseElement; - createElement(tagName: "code"): HTMLPhraseElement; - createElement(tagName: "col"): HTMLTableColElement; - createElement(tagName: "colgroup"): HTMLTableColElement; - createElement(tagName: "datalist"): HTMLDataListElement; - createElement(tagName: "dd"): HTMLDDElement; - createElement(tagName: "del"): HTMLModElement; - createElement(tagName: "dfn"): HTMLPhraseElement; - createElement(tagName: "dir"): HTMLDirectoryElement; - createElement(tagName: "div"): HTMLDivElement; - createElement(tagName: "dl"): HTMLDListElement; - createElement(tagName: "dt"): HTMLDTElement; - createElement(tagName: "em"): HTMLPhraseElement; - createElement(tagName: "embed"): HTMLEmbedElement; - createElement(tagName: "fieldset"): HTMLFieldSetElement; - createElement(tagName: "font"): HTMLFontElement; - createElement(tagName: "form"): HTMLFormElement; - createElement(tagName: "frame"): HTMLFrameElement; - createElement(tagName: "frameset"): HTMLFrameSetElement; - createElement(tagName: "h1"): HTMLHeadingElement; - createElement(tagName: "h2"): HTMLHeadingElement; - createElement(tagName: "h3"): HTMLHeadingElement; - createElement(tagName: "h4"): HTMLHeadingElement; - createElement(tagName: "h5"): HTMLHeadingElement; - createElement(tagName: "h6"): HTMLHeadingElement; - createElement(tagName: "head"): HTMLHeadElement; - createElement(tagName: "hr"): HTMLHRElement; - createElement(tagName: "html"): HTMLHtmlElement; - createElement(tagName: "i"): HTMLPhraseElement; - createElement(tagName: "iframe"): HTMLIFrameElement; - createElement(tagName: "img"): HTMLImageElement; - createElement(tagName: "input"): HTMLInputElement; - createElement(tagName: "ins"): HTMLModElement; - createElement(tagName: "isindex"): HTMLIsIndexElement; - createElement(tagName: "kbd"): HTMLPhraseElement; - createElement(tagName: "keygen"): HTMLBlockElement; - createElement(tagName: "label"): HTMLLabelElement; - createElement(tagName: "legend"): HTMLLegendElement; - createElement(tagName: "li"): HTMLLIElement; - createElement(tagName: "link"): HTMLLinkElement; - createElement(tagName: "listing"): HTMLBlockElement; - createElement(tagName: "map"): HTMLMapElement; - createElement(tagName: "marquee"): HTMLMarqueeElement; - createElement(tagName: "menu"): HTMLMenuElement; - createElement(tagName: "meta"): HTMLMetaElement; - createElement(tagName: "nextid"): HTMLNextIdElement; - createElement(tagName: "nobr"): HTMLPhraseElement; - createElement(tagName: "object"): HTMLObjectElement; - createElement(tagName: "ol"): HTMLOListElement; - createElement(tagName: "optgroup"): HTMLOptGroupElement; - createElement(tagName: "option"): HTMLOptionElement; - createElement(tagName: "p"): HTMLParagraphElement; - createElement(tagName: "param"): HTMLParamElement; - createElement(tagName: "plaintext"): HTMLBlockElement; - createElement(tagName: "pre"): HTMLPreElement; - createElement(tagName: "progress"): HTMLProgressElement; - createElement(tagName: "q"): HTMLQuoteElement; - createElement(tagName: "rt"): HTMLPhraseElement; - createElement(tagName: "ruby"): HTMLPhraseElement; - createElement(tagName: "s"): HTMLPhraseElement; - createElement(tagName: "samp"): HTMLPhraseElement; - createElement(tagName: "script"): HTMLScriptElement; - createElement(tagName: "select"): HTMLSelectElement; - createElement(tagName: "small"): HTMLPhraseElement; - createElement(tagName: "source"): HTMLSourceElement; - createElement(tagName: "span"): HTMLSpanElement; - createElement(tagName: "strike"): HTMLPhraseElement; - createElement(tagName: "strong"): HTMLPhraseElement; - createElement(tagName: "style"): HTMLStyleElement; - createElement(tagName: "sub"): HTMLPhraseElement; - createElement(tagName: "sup"): HTMLPhraseElement; - createElement(tagName: "table"): HTMLTableElement; - createElement(tagName: "tbody"): HTMLTableSectionElement; - createElement(tagName: "td"): HTMLTableDataCellElement; - createElement(tagName: "textarea"): HTMLTextAreaElement; - createElement(tagName: "tfoot"): HTMLTableSectionElement; - createElement(tagName: "th"): HTMLTableHeaderCellElement; - createElement(tagName: "thead"): HTMLTableSectionElement; - createElement(tagName: "title"): HTMLTitleElement; - createElement(tagName: "tr"): HTMLTableRowElement; - createElement(tagName: "track"): HTMLTrackElement; - createElement(tagName: "tt"): HTMLPhraseElement; - createElement(tagName: "u"): HTMLPhraseElement; - createElement(tagName: "ul"): HTMLUListElement; - createElement(tagName: "var"): HTMLPhraseElement; - createElement(tagName: "video"): HTMLVideoElement; - createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement; - createElement(tagName: "xmp"): HTMLBlockElement; - createElement(tagName: string): HTMLElement; - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "circle"): SVGCircleElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "clipPath"): SVGClipPathElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "componentTransferFunction"): SVGComponentTransferFunctionElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "defs"): SVGDefsElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "desc"): SVGDescElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "ellipse"): SVGEllipseElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feBlend"): SVGFEBlendElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feColorMatrix"): SVGFEColorMatrixElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComponentTransfer"): SVGFEComponentTransferElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feComposite"): SVGFECompositeElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feConvolveMatrix"): SVGFEConvolveMatrixElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDiffuseLighting"): SVGFEDiffuseLightingElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDisplacementMap"): SVGFEDisplacementMapElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feDistantLight"): SVGFEDistantLightElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFlood"): SVGFEFloodElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncA"): SVGFEFuncAElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncB"): SVGFEFuncBElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncG"): SVGFEFuncGElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feFuncR"): SVGFEFuncRElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feGaussianBlur"): SVGFEGaussianBlurElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feImage"): SVGFEImageElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMerge"): SVGFEMergeElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMergeNode"): SVGFEMergeNodeElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feMorphology"): SVGFEMorphologyElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feOffset"): SVGFEOffsetElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "fePointLight"): SVGFEPointLightElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpecularLighting"): SVGFESpecularLightingElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feSpotLight"): SVGFESpotLightElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTile"): SVGFETileElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "feTurbulence"): SVGFETurbulenceElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "filter"): SVGFilterElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "foreignObject"): SVGForeignObjectElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "g"): SVGGElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "image"): SVGImageElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "gradient"): SVGGradientElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "line"): SVGLineElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "linearGradient"): SVGLinearGradientElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "marker"): SVGMarkerElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "mask"): SVGMaskElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "path"): SVGPathElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "metadata"): SVGMetadataElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "pattern"): SVGPatternElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polygon"): SVGPolygonElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "polyline"): SVGPolylineElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "radialGradient"): SVGRadialGradientElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "rect"): SVGRectElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "svg"): SVGSVGElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "script"): SVGScriptElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "stop"): SVGStopElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "style"): SVGStyleElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "switch"): SVGSwitchElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "symbol"): SVGSymbolElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "tspan"): SVGTSpanElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textContent"): SVGTextContentElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "text"): SVGTextElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPath"): SVGTextPathElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "textPositioning"): SVGTextPositioningElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "title"): SVGTitleElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "use"): SVGUseElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "view"): SVGViewElement - createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: string): SVGElement - createElementNS(namespaceURI: string, qualifiedName: string): Element; - createExpression(expression: string, resolver: XPathNSResolver): XPathExpression; - createNSResolver(nodeResolver: Node): XPathNSResolver; - /** - * Creates a NodeIterator object that you can use to traverse filtered lists of nodes or elements in a document. - * @param root The root element or node to start traversing on. - * @param whatToShow The type of nodes or elements to appear in the node list - * @param filter A custom NodeFilter function to use. For more information, see filter. Use null for no filter. - * @param entityReferenceExpansion A flag that specifies whether entity reference nodes are expanded. - */ - createNodeIterator(root: Node, whatToShow?: number, filter?: NodeFilter, entityReferenceExpansion?: boolean): NodeIterator; - createProcessingInstruction(target: string, data: string): ProcessingInstruction; - /** - * Returns an empty range object that has both of its boundary points positioned at the beginning of the document. - */ - createRange(): Range; - /** - * Creates a text string from the specified value. - * @param data String that specifies the nodeValue property of the text node. - */ - createTextNode(data: string): Text; - createTouch(view: any, target: EventTarget, identifier: number, pageX: number, pageY: number, screenX: number, screenY: number): Touch; - createTouchList(...touches: Touch[]): TouchList; - /** - * Creates a TreeWalker object that you can use to traverse filtered lists of nodes or elements in a document. - * @param root The root element or node to start traversing on. - * @param whatToShow The type of nodes or elements to appear in the node list. For more information, see whatToShow. - * @param filter A custom NodeFilter function to use. - * @param entityReferenceExpansion A flag that specifies whether entity reference nodes are expanded. - */ - createTreeWalker(root: Node, whatToShow?: number, filter?: NodeFilter, entityReferenceExpansion?: boolean): TreeWalker; - /** - * Returns the element for the specified x coordinate and the specified y coordinate. - * @param x The x-offset - * @param y The y-offset - */ - elementFromPoint(x: number, y: number): Element; - evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult; - /** - * Executes a command on the current document, current selection, or the given range. - * @param commandId String that specifies the command to execute. This command can be any of the command identifiers that can be executed in script. - * @param showUI Display the user interface, defaults to false. - * @param value Value to assign. - */ - execCommand(commandId: string, showUI?: boolean, value?: any): boolean; - /** - * Displays help information for the given command identifier. - * @param commandId Displays help information for the given command identifier. - */ - execCommandShowHelp(commandId: string): boolean; - exitFullscreen(): void; - exitPointerLock(): void; - /** - * Causes the element to receive the focus and executes the code specified by the onfocus event. - */ - focus(): void; - /** - * Returns a reference to the first object with the specified value of the ID or NAME attribute. - * @param elementId String that specifies the ID value. Case-insensitive. - */ - getElementById(elementId: string): HTMLElement; - getElementsByClassName(classNames: string): NodeListOf; - /** - * Gets a collection of objects based on the value of the NAME or ID attribute. - * @param elementName Gets a collection of objects based on the value of the NAME or ID attribute. - */ - getElementsByName(elementName: string): NodeListOf; - /** - * Retrieves a collection of objects based on the specified element name. - * @param name Specifies the name of an element. - */ - getElementsByTagName(tagname: "a"): NodeListOf; - getElementsByTagName(tagname: "abbr"): NodeListOf; - getElementsByTagName(tagname: "acronym"): NodeListOf; - getElementsByTagName(tagname: "address"): NodeListOf; - getElementsByTagName(tagname: "applet"): NodeListOf; - getElementsByTagName(tagname: "area"): NodeListOf; - getElementsByTagName(tagname: "article"): NodeListOf; - getElementsByTagName(tagname: "aside"): NodeListOf; - getElementsByTagName(tagname: "audio"): NodeListOf; - getElementsByTagName(tagname: "b"): NodeListOf; - getElementsByTagName(tagname: "base"): NodeListOf; - getElementsByTagName(tagname: "basefont"): NodeListOf; - getElementsByTagName(tagname: "bdo"): NodeListOf; - getElementsByTagName(tagname: "big"): NodeListOf; - getElementsByTagName(tagname: "blockquote"): NodeListOf; - getElementsByTagName(tagname: "body"): NodeListOf; - getElementsByTagName(tagname: "br"): NodeListOf; - getElementsByTagName(tagname: "button"): NodeListOf; - getElementsByTagName(tagname: "canvas"): NodeListOf; - getElementsByTagName(tagname: "caption"): NodeListOf; - getElementsByTagName(tagname: "center"): NodeListOf; - getElementsByTagName(tagname: "circle"): NodeListOf; - getElementsByTagName(tagname: "cite"): NodeListOf; - getElementsByTagName(tagname: "clippath"): NodeListOf; - getElementsByTagName(tagname: "code"): NodeListOf; - getElementsByTagName(tagname: "col"): NodeListOf; - getElementsByTagName(tagname: "colgroup"): NodeListOf; - getElementsByTagName(tagname: "datalist"): NodeListOf; - getElementsByTagName(tagname: "dd"): NodeListOf; - getElementsByTagName(tagname: "defs"): NodeListOf; - getElementsByTagName(tagname: "del"): NodeListOf; - getElementsByTagName(tagname: "desc"): NodeListOf; - getElementsByTagName(tagname: "dfn"): NodeListOf; - getElementsByTagName(tagname: "dir"): NodeListOf; - getElementsByTagName(tagname: "div"): NodeListOf; - getElementsByTagName(tagname: "dl"): NodeListOf; - getElementsByTagName(tagname: "dt"): NodeListOf; - getElementsByTagName(tagname: "ellipse"): NodeListOf; - getElementsByTagName(tagname: "em"): NodeListOf; - getElementsByTagName(tagname: "embed"): NodeListOf; - getElementsByTagName(tagname: "feblend"): NodeListOf; - getElementsByTagName(tagname: "fecolormatrix"): NodeListOf; - getElementsByTagName(tagname: "fecomponenttransfer"): NodeListOf; - getElementsByTagName(tagname: "fecomposite"): NodeListOf; - getElementsByTagName(tagname: "feconvolvematrix"): NodeListOf; - getElementsByTagName(tagname: "fediffuselighting"): NodeListOf; - getElementsByTagName(tagname: "fedisplacementmap"): NodeListOf; - getElementsByTagName(tagname: "fedistantlight"): NodeListOf; - getElementsByTagName(tagname: "feflood"): NodeListOf; - getElementsByTagName(tagname: "fefunca"): NodeListOf; - getElementsByTagName(tagname: "fefuncb"): NodeListOf; - getElementsByTagName(tagname: "fefuncg"): NodeListOf; - getElementsByTagName(tagname: "fefuncr"): NodeListOf; - getElementsByTagName(tagname: "fegaussianblur"): NodeListOf; - getElementsByTagName(tagname: "feimage"): NodeListOf; - getElementsByTagName(tagname: "femerge"): NodeListOf; - getElementsByTagName(tagname: "femergenode"): NodeListOf; - getElementsByTagName(tagname: "femorphology"): NodeListOf; - getElementsByTagName(tagname: "feoffset"): NodeListOf; - getElementsByTagName(tagname: "fepointlight"): NodeListOf; - getElementsByTagName(tagname: "fespecularlighting"): NodeListOf; - getElementsByTagName(tagname: "fespotlight"): NodeListOf; - getElementsByTagName(tagname: "fetile"): NodeListOf; - getElementsByTagName(tagname: "feturbulence"): NodeListOf; - getElementsByTagName(tagname: "fieldset"): NodeListOf; - getElementsByTagName(tagname: "figcaption"): NodeListOf; - getElementsByTagName(tagname: "figure"): NodeListOf; - getElementsByTagName(tagname: "filter"): NodeListOf; - getElementsByTagName(tagname: "font"): NodeListOf; - getElementsByTagName(tagname: "footer"): NodeListOf; - getElementsByTagName(tagname: "foreignobject"): NodeListOf; - getElementsByTagName(tagname: "form"): NodeListOf; - getElementsByTagName(tagname: "frame"): NodeListOf; - getElementsByTagName(tagname: "frameset"): NodeListOf; - getElementsByTagName(tagname: "g"): NodeListOf; - getElementsByTagName(tagname: "h1"): NodeListOf; - getElementsByTagName(tagname: "h2"): NodeListOf; - getElementsByTagName(tagname: "h3"): NodeListOf; - getElementsByTagName(tagname: "h4"): NodeListOf; - getElementsByTagName(tagname: "h5"): NodeListOf; - getElementsByTagName(tagname: "h6"): NodeListOf; - getElementsByTagName(tagname: "head"): NodeListOf; - getElementsByTagName(tagname: "header"): NodeListOf; - getElementsByTagName(tagname: "hgroup"): NodeListOf; - getElementsByTagName(tagname: "hr"): NodeListOf; - getElementsByTagName(tagname: "html"): NodeListOf; - getElementsByTagName(tagname: "i"): NodeListOf; - getElementsByTagName(tagname: "iframe"): NodeListOf; - getElementsByTagName(tagname: "image"): NodeListOf; - getElementsByTagName(tagname: "img"): NodeListOf; - getElementsByTagName(tagname: "input"): NodeListOf; - getElementsByTagName(tagname: "ins"): NodeListOf; - getElementsByTagName(tagname: "isindex"): NodeListOf; - getElementsByTagName(tagname: "kbd"): NodeListOf; - getElementsByTagName(tagname: "keygen"): NodeListOf; - getElementsByTagName(tagname: "label"): NodeListOf; - getElementsByTagName(tagname: "legend"): NodeListOf; - getElementsByTagName(tagname: "li"): NodeListOf; - getElementsByTagName(tagname: "line"): NodeListOf; - getElementsByTagName(tagname: "lineargradient"): NodeListOf; - getElementsByTagName(tagname: "link"): NodeListOf; - getElementsByTagName(tagname: "listing"): NodeListOf; - getElementsByTagName(tagname: "map"): NodeListOf; - getElementsByTagName(tagname: "mark"): NodeListOf; - getElementsByTagName(tagname: "marker"): NodeListOf; - getElementsByTagName(tagname: "marquee"): NodeListOf; - getElementsByTagName(tagname: "mask"): NodeListOf; - getElementsByTagName(tagname: "menu"): NodeListOf; - getElementsByTagName(tagname: "meta"): NodeListOf; - getElementsByTagName(tagname: "metadata"): NodeListOf; - getElementsByTagName(tagname: "nav"): NodeListOf; - getElementsByTagName(tagname: "nextid"): NodeListOf; - getElementsByTagName(tagname: "nobr"): NodeListOf; - getElementsByTagName(tagname: "noframes"): NodeListOf; - getElementsByTagName(tagname: "noscript"): NodeListOf; - getElementsByTagName(tagname: "object"): NodeListOf; - getElementsByTagName(tagname: "ol"): NodeListOf; - getElementsByTagName(tagname: "optgroup"): NodeListOf; - getElementsByTagName(tagname: "option"): NodeListOf; - getElementsByTagName(tagname: "p"): NodeListOf; - getElementsByTagName(tagname: "param"): NodeListOf; - getElementsByTagName(tagname: "path"): NodeListOf; - getElementsByTagName(tagname: "pattern"): NodeListOf; - getElementsByTagName(tagname: "plaintext"): NodeListOf; - getElementsByTagName(tagname: "polygon"): NodeListOf; - getElementsByTagName(tagname: "polyline"): NodeListOf; - getElementsByTagName(tagname: "pre"): NodeListOf; - getElementsByTagName(tagname: "progress"): NodeListOf; - getElementsByTagName(tagname: "q"): NodeListOf; - getElementsByTagName(tagname: "radialgradient"): NodeListOf; - getElementsByTagName(tagname: "rect"): NodeListOf; - getElementsByTagName(tagname: "rt"): NodeListOf; - getElementsByTagName(tagname: "ruby"): NodeListOf; - getElementsByTagName(tagname: "s"): NodeListOf; - getElementsByTagName(tagname: "samp"): NodeListOf; - getElementsByTagName(tagname: "script"): NodeListOf; - getElementsByTagName(tagname: "section"): NodeListOf; - getElementsByTagName(tagname: "select"): NodeListOf; - getElementsByTagName(tagname: "small"): NodeListOf; - getElementsByTagName(tagname: "source"): NodeListOf; - getElementsByTagName(tagname: "span"): NodeListOf; - getElementsByTagName(tagname: "stop"): NodeListOf; - getElementsByTagName(tagname: "strike"): NodeListOf; - getElementsByTagName(tagname: "strong"): NodeListOf; - getElementsByTagName(tagname: "style"): NodeListOf; - getElementsByTagName(tagname: "sub"): NodeListOf; - getElementsByTagName(tagname: "sup"): NodeListOf; - getElementsByTagName(tagname: "svg"): NodeListOf; - getElementsByTagName(tagname: "switch"): NodeListOf; - getElementsByTagName(tagname: "symbol"): NodeListOf; - getElementsByTagName(tagname: "table"): NodeListOf; - getElementsByTagName(tagname: "tbody"): NodeListOf; - getElementsByTagName(tagname: "td"): NodeListOf; - getElementsByTagName(tagname: "text"): NodeListOf; - getElementsByTagName(tagname: "textpath"): NodeListOf; - getElementsByTagName(tagname: "textarea"): NodeListOf; - getElementsByTagName(tagname: "tfoot"): NodeListOf; - getElementsByTagName(tagname: "th"): NodeListOf; - getElementsByTagName(tagname: "thead"): NodeListOf; - getElementsByTagName(tagname: "title"): NodeListOf; - getElementsByTagName(tagname: "tr"): NodeListOf; - getElementsByTagName(tagname: "track"): NodeListOf; - getElementsByTagName(tagname: "tspan"): NodeListOf; - getElementsByTagName(tagname: "tt"): NodeListOf; - getElementsByTagName(tagname: "u"): NodeListOf; - getElementsByTagName(tagname: "ul"): NodeListOf; - getElementsByTagName(tagname: "use"): NodeListOf; - getElementsByTagName(tagname: "var"): NodeListOf; - getElementsByTagName(tagname: "video"): NodeListOf; - getElementsByTagName(tagname: "view"): NodeListOf; - getElementsByTagName(tagname: "wbr"): NodeListOf; - getElementsByTagName(tagname: "x-ms-webview"): NodeListOf; - getElementsByTagName(tagname: "xmp"): NodeListOf; - getElementsByTagName(tagname: string): NodeListOf; - getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf; - /** - * Returns an object representing the current selection of the document that is loaded into the object displaying a webpage. - */ - getSelection(): Selection; - /** - * Gets a value indicating whether the object currently has focus. - */ - hasFocus(): boolean; - importNode(importedNode: Node, deep: boolean): Node; - msElementsFromPoint(x: number, y: number): NodeList; - msElementsFromRect(left: number, top: number, width: number, height: number): NodeList; - /** - * Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method. - * @param url Specifies a MIME type for the document. - * @param name Specifies the name of the window. This name is used as the value for the TARGET attribute on a form or an anchor element. - * @param features Contains a list of items separated by commas. Each item consists of an option and a value, separated by an equals sign (for example, "fullscreen=yes, toolbar=yes"). The following values are supported. - * @param replace Specifies whether the existing entry for the document is replaced in the history list. - */ - open(url?: string, name?: string, features?: string, replace?: boolean): Document; - /** - * Returns a Boolean value that indicates whether a specified command can be successfully executed using execCommand, given the current state of the document. - * @param commandId Specifies a command identifier. - */ - queryCommandEnabled(commandId: string): boolean; - /** - * Returns a Boolean value that indicates whether the specified command is in the indeterminate state. - * @param commandId String that specifies a command identifier. - */ - queryCommandIndeterm(commandId: string): boolean; - /** - * Returns a Boolean value that indicates the current state of the command. - * @param commandId String that specifies a command identifier. - */ - queryCommandState(commandId: string): boolean; - /** - * Returns a Boolean value that indicates whether the current command is supported on the current range. - * @param commandId Specifies a command identifier. - */ - queryCommandSupported(commandId: string): boolean; - /** - * Retrieves the string associated with a command. - * @param commandId String that contains the identifier of a command. This can be any command identifier given in the list of Command Identifiers. - */ - queryCommandText(commandId: string): string; - /** - * Returns the current value of the document, range, or current selection for the given command. - * @param commandId String that specifies a command identifier. - */ - queryCommandValue(commandId: string): string; - releaseEvents(): void; - /** - * Allows updating the print settings for the page. - */ - updateSettings(): void; - webkitCancelFullScreen(): void; - webkitExitFullscreen(): void; - /** - * Writes one or more HTML expressions to a document in the specified window. - * @param content Specifies the text and HTML tags to write. - */ - write(...content: string[]): void; - /** - * Writes one or more HTML expressions, followed by a carriage return, to a document in the specified window. - * @param content The text and HTML tags to write. - */ - writeln(...content: string[]): void; - createElement(tagName: "picture"): HTMLPictureElement; - getElementsByTagName(tagname: "picture"): NodeListOf; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "fullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "fullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mssitemodejumplistitemremoved", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void; - addEventListener(type: "msthumbnailclick", listener: (ev: MSSiteModeEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerlockchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointerlockerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stop", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var Document: { - prototype: Document; - new(): Document; -} - -interface DocumentFragment extends Node, NodeSelector { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var DocumentFragment: { - prototype: DocumentFragment; - new(): DocumentFragment; -} - -interface DocumentType extends Node, ChildNode { - entities: NamedNodeMap; - internalSubset: string; - name: string; - notations: NamedNodeMap; - publicId: string; - systemId: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var DocumentType: { - prototype: DocumentType; - new(): DocumentType; -} - -interface DragEvent extends MouseEvent { - dataTransfer: DataTransfer; - initDragEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, dataTransferArg: DataTransfer): void; - msConvertURL(file: File, targetType: string, targetURL?: string): void; -} - -declare var DragEvent: { - prototype: DragEvent; - new(): DragEvent; -} - -interface DynamicsCompressorNode extends AudioNode { - attack: AudioParam; - knee: AudioParam; - ratio: AudioParam; - reduction: AudioParam; - release: AudioParam; - threshold: AudioParam; -} - -declare var DynamicsCompressorNode: { - prototype: DynamicsCompressorNode; - new(): DynamicsCompressorNode; -} - -interface EXT_texture_filter_anisotropic { - MAX_TEXTURE_MAX_ANISOTROPY_EXT: number; - TEXTURE_MAX_ANISOTROPY_EXT: number; -} - -declare var EXT_texture_filter_anisotropic: { - prototype: EXT_texture_filter_anisotropic; - new(): EXT_texture_filter_anisotropic; - MAX_TEXTURE_MAX_ANISOTROPY_EXT: number; - TEXTURE_MAX_ANISOTROPY_EXT: number; -} - -interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode { - classList: DOMTokenList; - clientHeight: number; - clientLeft: number; - clientTop: number; - clientWidth: number; - msContentZoomFactor: number; - msRegionOverflow: string; - onariarequest: (ev: AriaRequestEvent) => any; - oncommand: (ev: CommandEvent) => any; - ongotpointercapture: (ev: PointerEvent) => any; - onlostpointercapture: (ev: PointerEvent) => any; - onmsgesturechange: (ev: MSGestureEvent) => any; - onmsgesturedoubletap: (ev: MSGestureEvent) => any; - onmsgestureend: (ev: MSGestureEvent) => any; - onmsgesturehold: (ev: MSGestureEvent) => any; - onmsgesturestart: (ev: MSGestureEvent) => any; - onmsgesturetap: (ev: MSGestureEvent) => any; - onmsgotpointercapture: (ev: MSPointerEvent) => any; - onmsinertiastart: (ev: MSGestureEvent) => any; - onmslostpointercapture: (ev: MSPointerEvent) => any; - onmspointercancel: (ev: MSPointerEvent) => any; - onmspointerdown: (ev: MSPointerEvent) => any; - onmspointerenter: (ev: MSPointerEvent) => any; - onmspointerleave: (ev: MSPointerEvent) => any; - onmspointermove: (ev: MSPointerEvent) => any; - onmspointerout: (ev: MSPointerEvent) => any; - onmspointerover: (ev: MSPointerEvent) => any; - onmspointerup: (ev: MSPointerEvent) => any; - ontouchcancel: (ev: TouchEvent) => any; - ontouchend: (ev: TouchEvent) => any; - ontouchmove: (ev: TouchEvent) => any; - ontouchstart: (ev: TouchEvent) => any; - onwebkitfullscreenchange: (ev: Event) => any; - onwebkitfullscreenerror: (ev: Event) => any; - scrollHeight: number; - scrollLeft: number; - scrollTop: number; - scrollWidth: number; - tagName: string; - id: string; - className: string; - innerHTML: string; - getAttribute(name?: string): string; - getAttributeNS(namespaceURI: string, localName: string): string; - getAttributeNode(name: string): Attr; - getAttributeNodeNS(namespaceURI: string, localName: string): Attr; - getBoundingClientRect(): ClientRect; - getClientRects(): ClientRectList; - getElementsByTagName(name: "a"): NodeListOf; - getElementsByTagName(name: "abbr"): NodeListOf; - getElementsByTagName(name: "acronym"): NodeListOf; - getElementsByTagName(name: "address"): NodeListOf; - getElementsByTagName(name: "applet"): NodeListOf; - getElementsByTagName(name: "area"): NodeListOf; - getElementsByTagName(name: "article"): NodeListOf; - getElementsByTagName(name: "aside"): NodeListOf; - getElementsByTagName(name: "audio"): NodeListOf; - getElementsByTagName(name: "b"): NodeListOf; - getElementsByTagName(name: "base"): NodeListOf; - getElementsByTagName(name: "basefont"): NodeListOf; - getElementsByTagName(name: "bdo"): NodeListOf; - getElementsByTagName(name: "big"): NodeListOf; - getElementsByTagName(name: "blockquote"): NodeListOf; - getElementsByTagName(name: "body"): NodeListOf; - getElementsByTagName(name: "br"): NodeListOf; - getElementsByTagName(name: "button"): NodeListOf; - getElementsByTagName(name: "canvas"): NodeListOf; - getElementsByTagName(name: "caption"): NodeListOf; - getElementsByTagName(name: "center"): NodeListOf; - getElementsByTagName(name: "circle"): NodeListOf; - getElementsByTagName(name: "cite"): NodeListOf; - getElementsByTagName(name: "clippath"): NodeListOf; - getElementsByTagName(name: "code"): NodeListOf; - getElementsByTagName(name: "col"): NodeListOf; - getElementsByTagName(name: "colgroup"): NodeListOf; - getElementsByTagName(name: "datalist"): NodeListOf; - getElementsByTagName(name: "dd"): NodeListOf; - getElementsByTagName(name: "defs"): NodeListOf; - getElementsByTagName(name: "del"): NodeListOf; - getElementsByTagName(name: "desc"): NodeListOf; - getElementsByTagName(name: "dfn"): NodeListOf; - getElementsByTagName(name: "dir"): NodeListOf; - getElementsByTagName(name: "div"): NodeListOf; - getElementsByTagName(name: "dl"): NodeListOf; - getElementsByTagName(name: "dt"): NodeListOf; - getElementsByTagName(name: "ellipse"): NodeListOf; - getElementsByTagName(name: "em"): NodeListOf; - getElementsByTagName(name: "embed"): NodeListOf; - getElementsByTagName(name: "feblend"): NodeListOf; - getElementsByTagName(name: "fecolormatrix"): NodeListOf; - getElementsByTagName(name: "fecomponenttransfer"): NodeListOf; - getElementsByTagName(name: "fecomposite"): NodeListOf; - getElementsByTagName(name: "feconvolvematrix"): NodeListOf; - getElementsByTagName(name: "fediffuselighting"): NodeListOf; - getElementsByTagName(name: "fedisplacementmap"): NodeListOf; - getElementsByTagName(name: "fedistantlight"): NodeListOf; - getElementsByTagName(name: "feflood"): NodeListOf; - getElementsByTagName(name: "fefunca"): NodeListOf; - getElementsByTagName(name: "fefuncb"): NodeListOf; - getElementsByTagName(name: "fefuncg"): NodeListOf; - getElementsByTagName(name: "fefuncr"): NodeListOf; - getElementsByTagName(name: "fegaussianblur"): NodeListOf; - getElementsByTagName(name: "feimage"): NodeListOf; - getElementsByTagName(name: "femerge"): NodeListOf; - getElementsByTagName(name: "femergenode"): NodeListOf; - getElementsByTagName(name: "femorphology"): NodeListOf; - getElementsByTagName(name: "feoffset"): NodeListOf; - getElementsByTagName(name: "fepointlight"): NodeListOf; - getElementsByTagName(name: "fespecularlighting"): NodeListOf; - getElementsByTagName(name: "fespotlight"): NodeListOf; - getElementsByTagName(name: "fetile"): NodeListOf; - getElementsByTagName(name: "feturbulence"): NodeListOf; - getElementsByTagName(name: "fieldset"): NodeListOf; - getElementsByTagName(name: "figcaption"): NodeListOf; - getElementsByTagName(name: "figure"): NodeListOf; - getElementsByTagName(name: "filter"): NodeListOf; - getElementsByTagName(name: "font"): NodeListOf; - getElementsByTagName(name: "footer"): NodeListOf; - getElementsByTagName(name: "foreignobject"): NodeListOf; - getElementsByTagName(name: "form"): NodeListOf; - getElementsByTagName(name: "frame"): NodeListOf; - getElementsByTagName(name: "frameset"): NodeListOf; - getElementsByTagName(name: "g"): NodeListOf; - getElementsByTagName(name: "h1"): NodeListOf; - getElementsByTagName(name: "h2"): NodeListOf; - getElementsByTagName(name: "h3"): NodeListOf; - getElementsByTagName(name: "h4"): NodeListOf; - getElementsByTagName(name: "h5"): NodeListOf; - getElementsByTagName(name: "h6"): NodeListOf; - getElementsByTagName(name: "head"): NodeListOf; - getElementsByTagName(name: "header"): NodeListOf; - getElementsByTagName(name: "hgroup"): NodeListOf; - getElementsByTagName(name: "hr"): NodeListOf; - getElementsByTagName(name: "html"): NodeListOf; - getElementsByTagName(name: "i"): NodeListOf; - getElementsByTagName(name: "iframe"): NodeListOf; - getElementsByTagName(name: "image"): NodeListOf; - getElementsByTagName(name: "img"): NodeListOf; - getElementsByTagName(name: "input"): NodeListOf; - getElementsByTagName(name: "ins"): NodeListOf; - getElementsByTagName(name: "isindex"): NodeListOf; - getElementsByTagName(name: "kbd"): NodeListOf; - getElementsByTagName(name: "keygen"): NodeListOf; - getElementsByTagName(name: "label"): NodeListOf; - getElementsByTagName(name: "legend"): NodeListOf; - getElementsByTagName(name: "li"): NodeListOf; - getElementsByTagName(name: "line"): NodeListOf; - getElementsByTagName(name: "lineargradient"): NodeListOf; - getElementsByTagName(name: "link"): NodeListOf; - getElementsByTagName(name: "listing"): NodeListOf; - getElementsByTagName(name: "map"): NodeListOf; - getElementsByTagName(name: "mark"): NodeListOf; - getElementsByTagName(name: "marker"): NodeListOf; - getElementsByTagName(name: "marquee"): NodeListOf; - getElementsByTagName(name: "mask"): NodeListOf; - getElementsByTagName(name: "menu"): NodeListOf; - getElementsByTagName(name: "meta"): NodeListOf; - getElementsByTagName(name: "metadata"): NodeListOf; - getElementsByTagName(name: "nav"): NodeListOf; - getElementsByTagName(name: "nextid"): NodeListOf; - getElementsByTagName(name: "nobr"): NodeListOf; - getElementsByTagName(name: "noframes"): NodeListOf; - getElementsByTagName(name: "noscript"): NodeListOf; - getElementsByTagName(name: "object"): NodeListOf; - getElementsByTagName(name: "ol"): NodeListOf; - getElementsByTagName(name: "optgroup"): NodeListOf; - getElementsByTagName(name: "option"): NodeListOf; - getElementsByTagName(name: "p"): NodeListOf; - getElementsByTagName(name: "param"): NodeListOf; - getElementsByTagName(name: "path"): NodeListOf; - getElementsByTagName(name: "pattern"): NodeListOf; - getElementsByTagName(name: "plaintext"): NodeListOf; - getElementsByTagName(name: "polygon"): NodeListOf; - getElementsByTagName(name: "polyline"): NodeListOf; - getElementsByTagName(name: "pre"): NodeListOf; - getElementsByTagName(name: "progress"): NodeListOf; - getElementsByTagName(name: "q"): NodeListOf; - getElementsByTagName(name: "radialgradient"): NodeListOf; - getElementsByTagName(name: "rect"): NodeListOf; - getElementsByTagName(name: "rt"): NodeListOf; - getElementsByTagName(name: "ruby"): NodeListOf; - getElementsByTagName(name: "s"): NodeListOf; - getElementsByTagName(name: "samp"): NodeListOf; - getElementsByTagName(name: "script"): NodeListOf; - getElementsByTagName(name: "section"): NodeListOf; - getElementsByTagName(name: "select"): NodeListOf; - getElementsByTagName(name: "small"): NodeListOf; - getElementsByTagName(name: "source"): NodeListOf; - getElementsByTagName(name: "span"): NodeListOf; - getElementsByTagName(name: "stop"): NodeListOf; - getElementsByTagName(name: "strike"): NodeListOf; - getElementsByTagName(name: "strong"): NodeListOf; - getElementsByTagName(name: "style"): NodeListOf; - getElementsByTagName(name: "sub"): NodeListOf; - getElementsByTagName(name: "sup"): NodeListOf; - getElementsByTagName(name: "svg"): NodeListOf; - getElementsByTagName(name: "switch"): NodeListOf; - getElementsByTagName(name: "symbol"): NodeListOf; - getElementsByTagName(name: "table"): NodeListOf; - getElementsByTagName(name: "tbody"): NodeListOf; - getElementsByTagName(name: "td"): NodeListOf; - getElementsByTagName(name: "text"): NodeListOf; - getElementsByTagName(name: "textpath"): NodeListOf; - getElementsByTagName(name: "textarea"): NodeListOf; - getElementsByTagName(name: "tfoot"): NodeListOf; - getElementsByTagName(name: "th"): NodeListOf; - getElementsByTagName(name: "thead"): NodeListOf; - getElementsByTagName(name: "title"): NodeListOf; - getElementsByTagName(name: "tr"): NodeListOf; - getElementsByTagName(name: "track"): NodeListOf; - getElementsByTagName(name: "tspan"): NodeListOf; - getElementsByTagName(name: "tt"): NodeListOf; - getElementsByTagName(name: "u"): NodeListOf; - getElementsByTagName(name: "ul"): NodeListOf; - getElementsByTagName(name: "use"): NodeListOf; - getElementsByTagName(name: "var"): NodeListOf; - getElementsByTagName(name: "video"): NodeListOf; - getElementsByTagName(name: "view"): NodeListOf; - getElementsByTagName(name: "wbr"): NodeListOf; - getElementsByTagName(name: "x-ms-webview"): NodeListOf; - getElementsByTagName(name: "xmp"): NodeListOf; - getElementsByTagName(name: string): NodeListOf; - getElementsByTagNameNS(namespaceURI: string, localName: string): NodeListOf; - hasAttribute(name: string): boolean; - hasAttributeNS(namespaceURI: string, localName: string): boolean; - msGetRegionContent(): MSRangeCollection; - msGetUntransformedBounds(): ClientRect; - msMatchesSelector(selectors: string): boolean; - msReleasePointerCapture(pointerId: number): void; - msSetPointerCapture(pointerId: number): void; - msZoomTo(args: MsZoomToOptions): void; - releasePointerCapture(pointerId: number): void; - removeAttribute(name?: string): void; - removeAttributeNS(namespaceURI: string, localName: string): void; - removeAttributeNode(oldAttr: Attr): Attr; - requestFullscreen(): void; - requestPointerLock(): void; - setAttribute(name: string, value: string): void; - setAttributeNS(namespaceURI: string, qualifiedName: string, value: string): void; - setAttributeNode(newAttr: Attr): Attr; - setAttributeNodeNS(newAttr: Attr): Attr; - setPointerCapture(pointerId: number): void; - webkitMatchesSelector(selectors: string): boolean; - webkitRequestFullScreen(): void; - webkitRequestFullscreen(): void; - getElementsByClassName(classNames: string): NodeListOf; - matches(selector: string): boolean; - getElementsByTagName(tagname: "picture"): NodeListOf; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var Element: { - prototype: Element; - new(): Element; -} - -interface ErrorEvent extends Event { - colno: number; - error: any; - filename: string; - lineno: number; - message: string; - initErrorEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, messageArg: string, filenameArg: string, linenoArg: number): void; -} - -declare var ErrorEvent: { - prototype: ErrorEvent; - new(): ErrorEvent; -} - -interface Event { - bubbles: boolean; - cancelBubble: boolean; - cancelable: boolean; - currentTarget: EventTarget; - defaultPrevented: boolean; - eventPhase: number; - isTrusted: boolean; - returnValue: boolean; - srcElement: Element; - target: EventTarget; - timeStamp: number; - type: string; - initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void; - preventDefault(): void; - stopImmediatePropagation(): void; - stopPropagation(): void; - AT_TARGET: number; - BUBBLING_PHASE: number; - CAPTURING_PHASE: number; -} - -declare var Event: { - prototype: Event; - new(type: string, eventInitDict?: EventInit): Event; - AT_TARGET: number; - BUBBLING_PHASE: number; - CAPTURING_PHASE: number; -} - -interface EventTarget { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; - dispatchEvent(evt: Event): boolean; - removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var EventTarget: { - prototype: EventTarget; - new(): EventTarget; -} - -interface External { -} - -declare var External: { - prototype: External; - new(): External; -} - -interface File extends Blob { - lastModifiedDate: any; - name: string; -} - -declare var File: { - prototype: File; - new (parts: (ArrayBuffer | ArrayBufferView | Blob | string)[], filename: string, properties?: FilePropertyBag): File; -} - -interface FileList { - length: number; - item(index: number): File; - [index: number]: File; -} - -declare var FileList: { - prototype: FileList; - new(): FileList; -} - -interface FileReader extends EventTarget, MSBaseReader { - error: DOMError; - readAsArrayBuffer(blob: Blob): void; - readAsBinaryString(blob: Blob): void; - readAsDataURL(blob: Blob): void; - readAsText(blob: Blob, encoding?: string): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var FileReader: { - prototype: FileReader; - new(): FileReader; -} - -interface FocusEvent extends UIEvent { - relatedTarget: EventTarget; - initFocusEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, relatedTargetArg: EventTarget): void; -} - -declare var FocusEvent: { - prototype: FocusEvent; - new(typeArg: string, eventInitDict?: FocusEventInit): FocusEvent; -} - -interface FormData { - append(name: any, value: any, blobName?: string): void; -} - -declare var FormData: { - prototype: FormData; - new (form?: HTMLFormElement): FormData; -} - -interface GainNode extends AudioNode { - gain: AudioParam; -} - -declare var GainNode: { - prototype: GainNode; - new(): GainNode; -} - -interface Gamepad { - axes: number[]; - buttons: GamepadButton[]; - connected: boolean; - id: string; - index: number; - mapping: string; - timestamp: number; -} - -declare var Gamepad: { - prototype: Gamepad; - new(): Gamepad; -} - -interface GamepadButton { - pressed: boolean; - value: number; -} - -declare var GamepadButton: { - prototype: GamepadButton; - new(): GamepadButton; -} - -interface GamepadEvent extends Event { - gamepad: Gamepad; -} - -declare var GamepadEvent: { - prototype: GamepadEvent; - new(): GamepadEvent; -} - -interface Geolocation { - clearWatch(watchId: number): void; - getCurrentPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback, options?: PositionOptions): void; - watchPosition(successCallback: PositionCallback, errorCallback?: PositionErrorCallback, options?: PositionOptions): number; -} - -declare var Geolocation: { - prototype: Geolocation; - new(): Geolocation; -} - -interface HTMLAllCollection extends HTMLCollection { - namedItem(name: string): Element; -} - -declare var HTMLAllCollection: { - prototype: HTMLAllCollection; - new(): HTMLAllCollection; -} - -interface HTMLAnchorElement extends HTMLElement { - Methods: string; - /** - * Sets or retrieves the character set used to encode the object. - */ - charset: string; - /** - * Sets or retrieves the coordinates of the object. - */ - coords: string; - /** - * Contains the anchor portion of the URL including the hash sign (#). - */ - hash: string; - /** - * Contains the hostname and port values of the URL. - */ - host: string; - /** - * Contains the hostname of a URL. - */ - hostname: string; - /** - * Sets or retrieves a destination URL or an anchor point. - */ - href: string; - /** - * Sets or retrieves the language code of the object. - */ - hreflang: string; - mimeType: string; - /** - * Sets or retrieves the shape of the object. - */ - name: string; - nameProp: string; - /** - * Contains the pathname of the URL. - */ - pathname: string; - /** - * Sets or retrieves the port number associated with a URL. - */ - port: string; - /** - * Contains the protocol of the URL. - */ - protocol: string; - protocolLong: string; - /** - * Sets or retrieves the relationship between the object and the destination of the link. - */ - rel: string; - /** - * Sets or retrieves the relationship between the object and the destination of the link. - */ - rev: string; - /** - * Sets or retrieves the substring of the href property that follows the question mark. - */ - search: string; - /** - * Sets or retrieves the shape of the object. - */ - shape: string; - /** - * Sets or retrieves the window or frame at which to target content. - */ - target: string; - /** - * Retrieves or sets the text of the object as a string. - */ - text: string; - type: string; - urn: string; - /** - * Returns a string representation of an object. - */ - toString(): string; -} - -declare var HTMLAnchorElement: { - prototype: HTMLAnchorElement; - new(): HTMLAnchorElement; -} - -interface HTMLAppletElement extends HTMLElement { - /** - * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element. - */ - BaseHref: string; - align: string; - /** - * Sets or retrieves a text alternative to the graphic. - */ - alt: string; - /** - * Gets or sets the optional alternative HTML script to execute if the object fails to load. - */ - altHtml: string; - /** - * Sets or retrieves a character string that can be used to implement your own archive functionality for the object. - */ - archive: string; - border: string; - code: string; - /** - * Sets or retrieves the URL of the component. - */ - codeBase: string; - /** - * Sets or retrieves the Internet media type for the code associated with the object. - */ - codeType: string; - /** - * Address of a pointer to the document this page or frame contains. If there is no document, then null will be returned. - */ - contentDocument: Document; - /** - * Sets or retrieves the URL that references the data of the object. - */ - data: string; - /** - * Sets or retrieves a character string that can be used to implement your own declare functionality for the object. - */ - declare: boolean; - form: HTMLFormElement; - /** - * Sets or retrieves the height of the object. - */ - height: string; - hspace: number; - /** - * Sets or retrieves the shape of the object. - */ - name: string; - object: string; - /** - * Sets or retrieves a message to be displayed while an object is loading. - */ - standby: string; - /** - * Returns the content type of the object. - */ - type: string; - /** - * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map. - */ - useMap: string; - vspace: number; - width: number; -} - -declare var HTMLAppletElement: { - prototype: HTMLAppletElement; - new(): HTMLAppletElement; -} - -interface HTMLAreaElement extends HTMLElement { - /** - * Sets or retrieves a text alternative to the graphic. - */ - alt: string; - /** - * Sets or retrieves the coordinates of the object. - */ - coords: string; - /** - * Sets or retrieves the subsection of the href property that follows the number sign (#). - */ - hash: string; - /** - * Sets or retrieves the hostname and port number of the location or URL. - */ - host: string; - /** - * Sets or retrieves the host name part of the location or URL. - */ - hostname: string; - /** - * Sets or retrieves a destination URL or an anchor point. - */ - href: string; - /** - * Sets or gets whether clicks in this region cause action. - */ - noHref: boolean; - /** - * Sets or retrieves the file name or path specified by the object. - */ - pathname: string; - /** - * Sets or retrieves the port number associated with a URL. - */ - port: string; - /** - * Sets or retrieves the protocol portion of a URL. - */ - protocol: string; - rel: string; - /** - * Sets or retrieves the substring of the href property that follows the question mark. - */ - search: string; - /** - * Sets or retrieves the shape of the object. - */ - shape: string; - /** - * Sets or retrieves the window or frame at which to target content. - */ - target: string; - /** - * Returns a string representation of an object. - */ - toString(): string; -} - -declare var HTMLAreaElement: { - prototype: HTMLAreaElement; - new(): HTMLAreaElement; -} - -interface HTMLAreasCollection extends HTMLCollection { - /** - * Adds an element to the areas, controlRange, or options collection. - */ - add(element: HTMLElement, before?: HTMLElement | number): void; - /** - * Removes an element from the collection. - */ - remove(index?: number): void; -} - -declare var HTMLAreasCollection: { - prototype: HTMLAreasCollection; - new(): HTMLAreasCollection; -} - -interface HTMLAudioElement extends HTMLMediaElement { -} - -declare var HTMLAudioElement: { - prototype: HTMLAudioElement; - new(): HTMLAudioElement; -} - -interface HTMLBRElement extends HTMLElement { - /** - * Sets or retrieves the side on which floating objects are not to be positioned when any IHTMLBlockElement is inserted into the document. - */ - clear: string; -} - -declare var HTMLBRElement: { - prototype: HTMLBRElement; - new(): HTMLBRElement; -} - -interface HTMLBaseElement extends HTMLElement { - /** - * Gets or sets the baseline URL on which relative links are based. - */ - href: string; - /** - * Sets or retrieves the window or frame at which to target content. - */ - target: string; -} - -declare var HTMLBaseElement: { - prototype: HTMLBaseElement; - new(): HTMLBaseElement; -} - -interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty { - /** - * Sets or retrieves the current typeface family. - */ - face: string; - /** - * Sets or retrieves the font size of the object. - */ - size: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLBaseFontElement: { - prototype: HTMLBaseFontElement; - new(): HTMLBaseFontElement; -} - -interface HTMLBlockElement extends HTMLElement { - /** - * Sets or retrieves reference information about the object. - */ - cite: string; - clear: string; - /** - * Sets or retrieves the width of the object. - */ - width: number; -} - -declare var HTMLBlockElement: { - prototype: HTMLBlockElement; - new(): HTMLBlockElement; -} - -interface HTMLBodyElement extends HTMLElement { - aLink: any; - background: string; - bgColor: any; - bgProperties: string; - link: any; - noWrap: boolean; - onafterprint: (ev: Event) => any; - onbeforeprint: (ev: Event) => any; - onbeforeunload: (ev: BeforeUnloadEvent) => any; - onblur: (ev: FocusEvent) => any; - onerror: (ev: Event) => any; - onfocus: (ev: FocusEvent) => any; - onhashchange: (ev: HashChangeEvent) => any; - onload: (ev: Event) => any; - onmessage: (ev: MessageEvent) => any; - onoffline: (ev: Event) => any; - ononline: (ev: Event) => any; - onorientationchange: (ev: Event) => any; - onpagehide: (ev: PageTransitionEvent) => any; - onpageshow: (ev: PageTransitionEvent) => any; - onpopstate: (ev: PopStateEvent) => any; - onresize: (ev: UIEvent) => any; - onstorage: (ev: StorageEvent) => any; - onunload: (ev: Event) => any; - text: any; - vLink: any; - createTextRange(): TextRange; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "popstate", listener: (ev: PopStateEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLBodyElement: { - prototype: HTMLBodyElement; - new(): HTMLBodyElement; -} - -interface HTMLButtonElement extends HTMLElement { - /** - * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing. - */ - autofocus: boolean; - disabled: boolean; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Overrides the action attribute (where the data on a form is sent) on the parent form element. - */ - formAction: string; - /** - * Used to override the encoding (formEnctype attribute) specified on the form element. - */ - formEnctype: string; - /** - * Overrides the submit method attribute previously specified on a form element. - */ - formMethod: string; - /** - * Overrides any validation or required attributes on a form or form elements to allow it to be submitted without validation. This can be used to create a "save draft"-type submit option. - */ - formNoValidate: string; - /** - * Overrides the target attribute on a form element. - */ - formTarget: string; - /** - * Sets or retrieves the name of the object. - */ - name: string; - status: any; - /** - * Gets the classification and default behavior of the button. - */ - type: string; - /** - * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting. - */ - validationMessage: string; - /** - * Returns a ValidityState object that represents the validity states of an element. - */ - validity: ValidityState; - /** - * Sets or retrieves the default or selected value of the control. - */ - value: string; - /** - * Returns whether an element will successfully validate based on forms validation rules and constraints. - */ - willValidate: boolean; - /** - * Returns whether a form will validate when it is submitted, without having to submit it. - */ - checkValidity(): boolean; - /** - * Creates a TextRange object for the element. - */ - createTextRange(): TextRange; - /** - * Sets a custom error message that is displayed when a form is submitted. - * @param error Sets a custom error message that is displayed when a form is submitted. - */ - setCustomValidity(error: string): void; -} - -declare var HTMLButtonElement: { - prototype: HTMLButtonElement; - new(): HTMLButtonElement; -} - -interface HTMLCanvasElement extends HTMLElement { - /** - * Gets or sets the height of a canvas element on a document. - */ - height: number; - /** - * Gets or sets the width of a canvas element on a document. - */ - width: number; - /** - * Returns an object that provides methods and properties for drawing and manipulating images and graphics on a canvas element in a document. A context object includes information about colors, line widths, fonts, and other graphic parameters that can be drawn on a canvas. - * @param contextId The identifier (ID) of the type of canvas to create. Internet Explorer 9 and Internet Explorer 10 support only a 2-D context using canvas.getContext("2d"); IE11 Preview also supports 3-D or WebGL context using canvas.getContext("experimental-webgl"); - */ - getContext(contextId: "2d"): CanvasRenderingContext2D; - getContext(contextId: "experimental-webgl"): WebGLRenderingContext; - getContext(contextId: string, ...args: any[]): CanvasRenderingContext2D | WebGLRenderingContext; - /** - * Returns a blob object encoded as a Portable Network Graphics (PNG) format from a canvas image or drawing. - */ - msToBlob(): Blob; - /** - * Returns the content of the current canvas as an image that you can use as a source for another canvas or an HTML element. - * @param type The standard MIME type for the image format to return. If you do not specify this parameter, the default value is a PNG format image. - */ - toDataURL(type?: string, ...args: any[]): string; - toBlob(): Blob; -} - -declare var HTMLCanvasElement: { - prototype: HTMLCanvasElement; - new(): HTMLCanvasElement; -} - -interface HTMLCollection { - /** - * Sets or retrieves the number of objects in a collection. - */ - length: number; - /** - * Retrieves an object from various collections. - */ - item(nameOrIndex?: any, optionalIndex?: any): Element; - /** - * Retrieves a select object or an object from an options collection. - */ - namedItem(name: string): Element; - [index: number]: Element; -} - -declare var HTMLCollection: { - prototype: HTMLCollection; - new(): HTMLCollection; -} - -interface HTMLDDElement extends HTMLElement { - /** - * Sets or retrieves whether the browser automatically performs wordwrap. - */ - noWrap: boolean; -} - -declare var HTMLDDElement: { - prototype: HTMLDDElement; - new(): HTMLDDElement; -} - -interface HTMLDListElement extends HTMLElement { - compact: boolean; -} - -declare var HTMLDListElement: { - prototype: HTMLDListElement; - new(): HTMLDListElement; -} - -interface HTMLDTElement extends HTMLElement { - /** - * Sets or retrieves whether the browser automatically performs wordwrap. - */ - noWrap: boolean; -} - -declare var HTMLDTElement: { - prototype: HTMLDTElement; - new(): HTMLDTElement; -} - -interface HTMLDataListElement extends HTMLElement { - options: HTMLCollection; -} - -declare var HTMLDataListElement: { - prototype: HTMLDataListElement; - new(): HTMLDataListElement; -} - -interface HTMLDirectoryElement extends HTMLElement { - compact: boolean; -} - -declare var HTMLDirectoryElement: { - prototype: HTMLDirectoryElement; - new(): HTMLDirectoryElement; -} - -interface HTMLDivElement extends HTMLElement { - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - /** - * Sets or retrieves whether the browser automatically performs wordwrap. - */ - noWrap: boolean; -} - -declare var HTMLDivElement: { - prototype: HTMLDivElement; - new(): HTMLDivElement; -} - -interface HTMLDocument extends Document { -} - -declare var HTMLDocument: { - prototype: HTMLDocument; - new(): HTMLDocument; -} - -interface HTMLElement extends Element { - accessKey: string; - children: HTMLCollection; - contentEditable: string; - dataset: DOMStringMap; - dir: string; - draggable: boolean; - hidden: boolean; - hideFocus: boolean; - innerHTML: string; - innerText: string; - isContentEditable: boolean; - lang: string; - offsetHeight: number; - offsetLeft: number; - offsetParent: Element; - offsetTop: number; - offsetWidth: number; - onabort: (ev: Event) => any; - onactivate: (ev: UIEvent) => any; - onbeforeactivate: (ev: UIEvent) => any; - onbeforecopy: (ev: DragEvent) => any; - onbeforecut: (ev: DragEvent) => any; - onbeforedeactivate: (ev: UIEvent) => any; - onbeforepaste: (ev: DragEvent) => any; - onblur: (ev: FocusEvent) => any; - oncanplay: (ev: Event) => any; - oncanplaythrough: (ev: Event) => any; - onchange: (ev: Event) => any; - onclick: (ev: MouseEvent) => any; - oncontextmenu: (ev: PointerEvent) => any; - oncopy: (ev: DragEvent) => any; - oncuechange: (ev: Event) => any; - oncut: (ev: DragEvent) => any; - ondblclick: (ev: MouseEvent) => any; - ondeactivate: (ev: UIEvent) => any; - ondrag: (ev: DragEvent) => any; - ondragend: (ev: DragEvent) => any; - ondragenter: (ev: DragEvent) => any; - ondragleave: (ev: DragEvent) => any; - ondragover: (ev: DragEvent) => any; - ondragstart: (ev: DragEvent) => any; - ondrop: (ev: DragEvent) => any; - ondurationchange: (ev: Event) => any; - onemptied: (ev: Event) => any; - onended: (ev: Event) => any; - onerror: (ev: Event) => any; - onfocus: (ev: FocusEvent) => any; - oninput: (ev: Event) => any; - onkeydown: (ev: KeyboardEvent) => any; - onkeypress: (ev: KeyboardEvent) => any; - onkeyup: (ev: KeyboardEvent) => any; - onload: (ev: Event) => any; - onloadeddata: (ev: Event) => any; - onloadedmetadata: (ev: Event) => any; - onloadstart: (ev: Event) => any; - onmousedown: (ev: MouseEvent) => any; - onmouseenter: (ev: MouseEvent) => any; - onmouseleave: (ev: MouseEvent) => any; - onmousemove: (ev: MouseEvent) => any; - onmouseout: (ev: MouseEvent) => any; - onmouseover: (ev: MouseEvent) => any; - onmouseup: (ev: MouseEvent) => any; - onmousewheel: (ev: MouseWheelEvent) => any; - onmscontentzoom: (ev: UIEvent) => any; - onmsmanipulationstatechanged: (ev: MSManipulationEvent) => any; - onpaste: (ev: DragEvent) => any; - onpause: (ev: Event) => any; - onplay: (ev: Event) => any; - onplaying: (ev: Event) => any; - onprogress: (ev: ProgressEvent) => any; - onratechange: (ev: Event) => any; - onreset: (ev: Event) => any; - onscroll: (ev: UIEvent) => any; - onseeked: (ev: Event) => any; - onseeking: (ev: Event) => any; - onselect: (ev: UIEvent) => any; - onselectstart: (ev: Event) => any; - onstalled: (ev: Event) => any; - onsubmit: (ev: Event) => any; - onsuspend: (ev: Event) => any; - ontimeupdate: (ev: Event) => any; - onvolumechange: (ev: Event) => any; - onwaiting: (ev: Event) => any; - outerHTML: string; - outerText: string; - spellcheck: boolean; - style: CSSStyleDeclaration; - tabIndex: number; - title: string; - blur(): void; - click(): void; - dragDrop(): boolean; - focus(): void; - insertAdjacentElement(position: string, insertedElement: Element): Element; - insertAdjacentHTML(where: string, html: string): void; - insertAdjacentText(where: string, text: string): void; - msGetInputContext(): MSInputMethodContext; - scrollIntoView(top?: boolean): void; - setActive(): void; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLElement: { - prototype: HTMLElement; - new(): HTMLElement; -} - -interface HTMLEmbedElement extends HTMLElement, GetSVGDocument { - /** - * Sets or retrieves the height of the object. - */ - height: string; - hidden: any; - /** - * Gets or sets whether the DLNA PlayTo device is available. - */ - msPlayToDisabled: boolean; - /** - * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server. - */ - msPlayToPreferredSourceUri: string; - /** - * Gets or sets the primary DLNA PlayTo device. - */ - msPlayToPrimary: boolean; - /** - * Gets the source associated with the media element for use by the PlayToManager. - */ - msPlayToSource: any; - /** - * Sets or retrieves the name of the object. - */ - name: string; - /** - * Retrieves the palette used for the embedded document. - */ - palette: string; - /** - * Retrieves the URL of the plug-in used to view an embedded document. - */ - pluginspage: string; - readyState: string; - /** - * Sets or retrieves a URL to be loaded by the object. - */ - src: string; - /** - * Sets or retrieves the height and width units of the embed object. - */ - units: string; - /** - * Sets or retrieves the width of the object. - */ - width: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLEmbedElement: { - prototype: HTMLEmbedElement; - new(): HTMLEmbedElement; -} - -interface HTMLFieldSetElement extends HTMLElement { - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - disabled: boolean; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting. - */ - validationMessage: string; - /** - * Returns a ValidityState object that represents the validity states of an element. - */ - validity: ValidityState; - /** - * Returns whether an element will successfully validate based on forms validation rules and constraints. - */ - willValidate: boolean; - /** - * Returns whether a form will validate when it is submitted, without having to submit it. - */ - checkValidity(): boolean; - /** - * Sets a custom error message that is displayed when a form is submitted. - * @param error Sets a custom error message that is displayed when a form is submitted. - */ - setCustomValidity(error: string): void; -} - -declare var HTMLFieldSetElement: { - prototype: HTMLFieldSetElement; - new(): HTMLFieldSetElement; -} - -interface HTMLFontElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2DeprecatedSizeProperty { - /** - * Sets or retrieves the current typeface family. - */ - face: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLFontElement: { - prototype: HTMLFontElement; - new(): HTMLFontElement; -} - -interface HTMLFormElement extends HTMLElement { - /** - * Sets or retrieves a list of character encodings for input data that must be accepted by the server processing the form. - */ - acceptCharset: string; - /** - * Sets or retrieves the URL to which the form content is sent for processing. - */ - action: string; - /** - * Specifies whether autocomplete is applied to an editable text field. - */ - autocomplete: string; - /** - * Retrieves a collection, in source order, of all controls in a given form. - */ - elements: HTMLCollection; - /** - * Sets or retrieves the MIME encoding for the form. - */ - encoding: string; - /** - * Sets or retrieves the encoding type for the form. - */ - enctype: string; - /** - * Sets or retrieves the number of objects in a collection. - */ - length: number; - /** - * Sets or retrieves how to send the form data to the server. - */ - method: string; - /** - * Sets or retrieves the name of the object. - */ - name: string; - /** - * Designates a form that is not validated when submitted. - */ - noValidate: boolean; - /** - * Sets or retrieves the window or frame at which to target content. - */ - target: string; - /** - * Returns whether a form will validate when it is submitted, without having to submit it. - */ - checkValidity(): boolean; - /** - * Retrieves a form object or an object from an elements collection. - * @param name Variant of type Number or String that specifies the object or collection to retrieve. If this parameter is a Number, it is the zero-based index of the object. If this parameter is a string, all objects with matching name or id properties are retrieved, and a collection is returned if more than one match is made. - * @param index Variant of type Number that specifies the zero-based index of the object to retrieve when a collection is returned. - */ - item(name?: any, index?: any): any; - /** - * Retrieves a form object or an object from an elements collection. - */ - namedItem(name: string): any; - /** - * Fires when the user resets a form. - */ - reset(): void; - /** - * Fires when a FORM is about to be submitted. - */ - submit(): void; - [name: string]: any; -} - -declare var HTMLFormElement: { - prototype: HTMLFormElement; - new(): HTMLFormElement; -} - -interface HTMLFrameElement extends HTMLElement, GetSVGDocument { - /** - * Specifies the properties of a border drawn around an object. - */ - border: string; - /** - * Sets or retrieves the border color of the object. - */ - borderColor: any; - /** - * Retrieves the document object of the page or frame. - */ - contentDocument: Document; - /** - * Retrieves the object of the specified. - */ - contentWindow: Window; - /** - * Sets or retrieves whether to display a border for the frame. - */ - frameBorder: string; - /** - * Sets or retrieves the amount of additional space between the frames. - */ - frameSpacing: any; - /** - * Sets or retrieves the height of the object. - */ - height: string | number; - /** - * Sets or retrieves a URI to a long description of the object. - */ - longDesc: string; - /** - * Sets or retrieves the top and bottom margin heights before displaying the text in a frame. - */ - marginHeight: string; - /** - * Sets or retrieves the left and right margin widths before displaying the text in a frame. - */ - marginWidth: string; - /** - * Sets or retrieves the frame name. - */ - name: string; - /** - * Sets or retrieves whether the user can resize the frame. - */ - noResize: boolean; - /** - * Raised when the object has been completely received from the server. - */ - onload: (ev: Event) => any; - /** - * Sets or retrieves whether the frame can be scrolled. - */ - scrolling: string; - /** - * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied. - */ - security: any; - /** - * Sets or retrieves a URL to be loaded by the object. - */ - src: string; - /** - * Sets or retrieves the width of the object. - */ - width: string | number; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLFrameElement: { - prototype: HTMLFrameElement; - new(): HTMLFrameElement; -} - -interface HTMLFrameSetElement extends HTMLElement { - border: string; - /** - * Sets or retrieves the border color of the object. - */ - borderColor: any; - /** - * Sets or retrieves the frame widths of the object. - */ - cols: string; - /** - * Sets or retrieves whether to display a border for the frame. - */ - frameBorder: string; - /** - * Sets or retrieves the amount of additional space between the frames. - */ - frameSpacing: any; - name: string; - onafterprint: (ev: Event) => any; - onbeforeprint: (ev: Event) => any; - onbeforeunload: (ev: BeforeUnloadEvent) => any; - /** - * Fires when the object loses the input focus. - */ - onblur: (ev: FocusEvent) => any; - onerror: (ev: Event) => any; - /** - * Fires when the object receives focus. - */ - onfocus: (ev: FocusEvent) => any; - onhashchange: (ev: HashChangeEvent) => any; - onload: (ev: Event) => any; - onmessage: (ev: MessageEvent) => any; - onoffline: (ev: Event) => any; - ononline: (ev: Event) => any; - onorientationchange: (ev: Event) => any; - onpagehide: (ev: PageTransitionEvent) => any; - onpageshow: (ev: PageTransitionEvent) => any; - onresize: (ev: UIEvent) => any; - onstorage: (ev: StorageEvent) => any; - onunload: (ev: Event) => any; - /** - * Sets or retrieves the frame heights of the object. - */ - rows: string; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLFrameSetElement: { - prototype: HTMLFrameSetElement; - new(): HTMLFrameSetElement; -} - -interface HTMLHRElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2DeprecatedSizeProperty { - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - /** - * Sets or retrieves whether the horizontal rule is drawn with 3-D shading. - */ - noShade: boolean; - /** - * Sets or retrieves the width of the object. - */ - width: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLHRElement: { - prototype: HTMLHRElement; - new(): HTMLHRElement; -} - -interface HTMLHeadElement extends HTMLElement { - profile: string; -} - -declare var HTMLHeadElement: { - prototype: HTMLHeadElement; - new(): HTMLHeadElement; -} - -interface HTMLHeadingElement extends HTMLElement { - /** - * Sets or retrieves a value that indicates the table alignment. - */ - align: string; - clear: string; -} - -declare var HTMLHeadingElement: { - prototype: HTMLHeadingElement; - new(): HTMLHeadingElement; -} - -interface HTMLHtmlElement extends HTMLElement { - /** - * Sets or retrieves the DTD version that governs the current document. - */ - version: string; -} - -declare var HTMLHtmlElement: { - prototype: HTMLHtmlElement; - new(): HTMLHtmlElement; -} - -interface HTMLIFrameElement extends HTMLElement, GetSVGDocument { - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - allowFullscreen: boolean; - /** - * Specifies the properties of a border drawn around an object. - */ - border: string; - /** - * Retrieves the document object of the page or frame. - */ - contentDocument: Document; - /** - * Retrieves the object of the specified. - */ - contentWindow: Window; - /** - * Sets or retrieves whether to display a border for the frame. - */ - frameBorder: string; - /** - * Sets or retrieves the amount of additional space between the frames. - */ - frameSpacing: any; - /** - * Sets or retrieves the height of the object. - */ - height: string; - /** - * Sets or retrieves the horizontal margin for the object. - */ - hspace: number; - /** - * Sets or retrieves a URI to a long description of the object. - */ - longDesc: string; - /** - * Sets or retrieves the top and bottom margin heights before displaying the text in a frame. - */ - marginHeight: string; - /** - * Sets or retrieves the left and right margin widths before displaying the text in a frame. - */ - marginWidth: string; - /** - * Sets or retrieves the frame name. - */ - name: string; - /** - * Sets or retrieves whether the user can resize the frame. - */ - noResize: boolean; - /** - * Raised when the object has been completely received from the server. - */ - onload: (ev: Event) => any; - sandbox: DOMSettableTokenList; - /** - * Sets or retrieves whether the frame can be scrolled. - */ - scrolling: string; - /** - * Sets the value indicating whether the source file of a frame or iframe has specific security restrictions applied. - */ - security: any; - /** - * Sets or retrieves a URL to be loaded by the object. - */ - src: string; - /** - * Sets or retrieves the vertical margin for the object. - */ - vspace: number; - /** - * Sets or retrieves the width of the object. - */ - width: string; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLIFrameElement: { - prototype: HTMLIFrameElement; - new(): HTMLIFrameElement; -} - -interface HTMLImageElement extends HTMLElement { - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - /** - * Sets or retrieves a text alternative to the graphic. - */ - alt: string; - /** - * Specifies the properties of a border drawn around an object. - */ - border: string; - /** - * Retrieves whether the object is fully loaded. - */ - complete: boolean; - crossOrigin: string; - currentSrc: string; - /** - * Sets or retrieves the height of the object. - */ - height: number; - /** - * Sets or retrieves the width of the border to draw around the object. - */ - hspace: number; - /** - * Sets or retrieves whether the image is a server-side image map. - */ - isMap: boolean; - /** - * Sets or retrieves a Uniform Resource Identifier (URI) to a long description of the object. - */ - longDesc: string; - /** - * Gets or sets whether the DLNA PlayTo device is available. - */ - msPlayToDisabled: boolean; - msPlayToPreferredSourceUri: string; - /** - * Gets or sets the primary DLNA PlayTo device. - */ - msPlayToPrimary: boolean; - /** - * Gets the source associated with the media element for use by the PlayToManager. - */ - msPlayToSource: any; - /** - * Sets or retrieves the name of the object. - */ - name: string; - /** - * The original height of the image resource before sizing. - */ - naturalHeight: number; - /** - * The original width of the image resource before sizing. - */ - naturalWidth: number; - /** - * The address or URL of the a media resource that is to be considered. - */ - src: string; - srcset: string; - /** - * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map. - */ - useMap: string; - /** - * Sets or retrieves the vertical margin for the object. - */ - vspace: number; - /** - * Sets or retrieves the width of the object. - */ - width: number; - x: number; - y: number; - msGetAsCastingSource(): any; -} - -declare var HTMLImageElement: { - prototype: HTMLImageElement; - new(): HTMLImageElement; - create(): HTMLImageElement; -} - -interface HTMLInputElement extends HTMLElement { - /** - * Sets or retrieves a comma-separated list of content types. - */ - accept: string; - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - /** - * Sets or retrieves a text alternative to the graphic. - */ - alt: string; - /** - * Specifies whether autocomplete is applied to an editable text field. - */ - autocomplete: string; - /** - * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing. - */ - autofocus: boolean; - /** - * Sets or retrieves the width of the border to draw around the object. - */ - border: string; - /** - * Sets or retrieves the state of the check box or radio button. - */ - checked: boolean; - /** - * Retrieves whether the object is fully loaded. - */ - complete: boolean; - /** - * Sets or retrieves the state of the check box or radio button. - */ - defaultChecked: boolean; - /** - * Sets or retrieves the initial contents of the object. - */ - defaultValue: string; - disabled: boolean; - /** - * Returns a FileList object on a file type input object. - */ - files: FileList; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Overrides the action attribute (where the data on a form is sent) on the parent form element. - */ - formAction: string; - /** - * Used to override the encoding (formEnctype attribute) specified on the form element. - */ - formEnctype: string; - /** - * Overrides the submit method attribute previously specified on a form element. - */ - formMethod: string; - /** - * Overrides any validation or required attributes on a form or form elements to allow it to be submitted without validation. This can be used to create a "save draft"-type submit option. - */ - formNoValidate: string; - /** - * Overrides the target attribute on a form element. - */ - formTarget: string; - /** - * Sets or retrieves the height of the object. - */ - height: string; - /** - * Sets or retrieves the width of the border to draw around the object. - */ - hspace: number; - indeterminate: boolean; - /** - * Specifies the ID of a pre-defined datalist of options for an input element. - */ - list: HTMLElement; - /** - * Defines the maximum acceptable value for an input element with type="number".When used with the min and step attributes, lets you control the range and increment (such as only even numbers) that the user can enter into an input field. - */ - max: string; - /** - * Sets or retrieves the maximum number of characters that the user can enter in a text control. - */ - maxLength: number; - /** - * Defines the minimum acceptable value for an input element with type="number". When used with the max and step attributes, lets you control the range and increment (such as even numbers only) that the user can enter into an input field. - */ - min: string; - /** - * Sets or retrieves the Boolean value indicating whether multiple items can be selected from a list. - */ - multiple: boolean; - /** - * Sets or retrieves the name of the object. - */ - name: string; - /** - * Gets or sets a string containing a regular expression that the user's input must match. - */ - pattern: string; - /** - * Gets or sets a text string that is displayed in an input field as a hint or prompt to users as the format or type of information they need to enter.The text appears in an input field until the user puts focus on the field. - */ - placeholder: string; - readOnly: boolean; - /** - * When present, marks an element that can't be submitted without a value. - */ - required: boolean; - /** - * Gets or sets the end position or offset of a text selection. - */ - selectionEnd: number; - /** - * Gets or sets the starting position or offset of a text selection. - */ - selectionStart: number; - size: number; - /** - * The address or URL of the a media resource that is to be considered. - */ - src: string; - status: boolean; - /** - * Defines an increment or jump between values that you want to allow the user to enter. When used with the max and min attributes, lets you control the range and increment (for example, allow only even numbers) that the user can enter into an input field. - */ - step: string; - /** - * Returns the content type of the object. - */ - type: string; - /** - * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map. - */ - useMap: string; - /** - * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting. - */ - validationMessage: string; - /** - * Returns a ValidityState object that represents the validity states of an element. - */ - validity: ValidityState; - /** - * Returns the value of the data at the cursor's current position. - */ - value: string; - valueAsDate: Date; - /** - * Returns the input field value as a number. - */ - valueAsNumber: number; - /** - * Sets or retrieves the vertical margin for the object. - */ - vspace: number; - /** - * Sets or retrieves the width of the object. - */ - width: string; - /** - * Returns whether an element will successfully validate based on forms validation rules and constraints. - */ - willValidate: boolean; - /** - * Returns whether a form will validate when it is submitted, without having to submit it. - */ - checkValidity(): boolean; - /** - * Creates a TextRange object for the element. - */ - createTextRange(): TextRange; - /** - * Makes the selection equal to the current object. - */ - select(): void; - /** - * Sets a custom error message that is displayed when a form is submitted. - * @param error Sets a custom error message that is displayed when a form is submitted. - */ - setCustomValidity(error: string): void; - /** - * Sets the start and end positions of a selection in a text field. - * @param start The offset into the text field for the start of the selection. - * @param end The offset into the text field for the end of the selection. - */ - setSelectionRange(start: number, end: number): void; - /** - * Decrements a range input control's value by the value given by the Step attribute. If the optional parameter is used, it will decrement the input control's step value multiplied by the parameter's value. - * @param n Value to decrement the value by. - */ - stepDown(n?: number): void; - /** - * Increments a range input control's value by the value given by the Step attribute. If the optional parameter is used, will increment the input control's value by that value. - * @param n Value to increment the value by. - */ - stepUp(n?: number): void; -} - -declare var HTMLInputElement: { - prototype: HTMLInputElement; - new(): HTMLInputElement; -} - -interface HTMLIsIndexElement extends HTMLElement { - /** - * Sets or retrieves the URL to which the form content is sent for processing. - */ - action: string; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - prompt: string; -} - -declare var HTMLIsIndexElement: { - prototype: HTMLIsIndexElement; - new(): HTMLIsIndexElement; -} - -interface HTMLLIElement extends HTMLElement { - type: string; - /** - * Sets or retrieves the value of a list item. - */ - value: number; -} - -declare var HTMLLIElement: { - prototype: HTMLLIElement; - new(): HTMLLIElement; -} - -interface HTMLLabelElement extends HTMLElement { - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Sets or retrieves the object to which the given label object is assigned. - */ - htmlFor: string; -} - -declare var HTMLLabelElement: { - prototype: HTMLLabelElement; - new(): HTMLLabelElement; -} - -interface HTMLLegendElement extends HTMLElement { - /** - * Retrieves a reference to the form that the object is embedded in. - */ - align: string; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; -} - -declare var HTMLLegendElement: { - prototype: HTMLLegendElement; - new(): HTMLLegendElement; -} - -interface HTMLLinkElement extends HTMLElement, LinkStyle { - /** - * Sets or retrieves the character set used to encode the object. - */ - charset: string; - disabled: boolean; - /** - * Sets or retrieves a destination URL or an anchor point. - */ - href: string; - /** - * Sets or retrieves the language code of the object. - */ - hreflang: string; - /** - * Sets or retrieves the media type. - */ - media: string; - /** - * Sets or retrieves the relationship between the object and the destination of the link. - */ - rel: string; - /** - * Sets or retrieves the relationship between the object and the destination of the link. - */ - rev: string; - /** - * Sets or retrieves the window or frame at which to target content. - */ - target: string; - /** - * Sets or retrieves the MIME type of the object. - */ - type: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLLinkElement: { - prototype: HTMLLinkElement; - new(): HTMLLinkElement; -} - -interface HTMLMapElement extends HTMLElement { - /** - * Retrieves a collection of the area objects defined for the given map object. - */ - areas: HTMLAreasCollection; - /** - * Sets or retrieves the name of the object. - */ - name: string; -} - -declare var HTMLMapElement: { - prototype: HTMLMapElement; - new(): HTMLMapElement; -} - -interface HTMLMarqueeElement extends HTMLElement { - behavior: string; - bgColor: any; - direction: string; - height: string; - hspace: number; - loop: number; - onbounce: (ev: Event) => any; - onfinish: (ev: Event) => any; - onstart: (ev: Event) => any; - scrollAmount: number; - scrollDelay: number; - trueSpeed: boolean; - vspace: number; - width: string; - start(): void; - stop(): void; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "bounce", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "finish", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "start", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLMarqueeElement: { - prototype: HTMLMarqueeElement; - new(): HTMLMarqueeElement; -} - -interface HTMLMediaElement extends HTMLElement { - /** - * Returns an AudioTrackList object with the audio tracks for a given video element. - */ - audioTracks: AudioTrackList; - /** - * Gets or sets a value that indicates whether to start playing the media automatically. - */ - autoplay: boolean; - /** - * Gets a collection of buffered time ranges. - */ - buffered: TimeRanges; - /** - * Gets or sets a flag that indicates whether the client provides a set of controls for the media (in case the developer does not include controls for the player). - */ - controls: boolean; - /** - * Gets the address or URL of the current media resource that is selected by IHTMLMediaElement. - */ - currentSrc: string; - /** - * Gets or sets the current playback position, in seconds. - */ - currentTime: number; - defaultMuted: boolean; - /** - * Gets or sets the default playback rate when the user is not using fast forward or reverse for a video or audio resource. - */ - defaultPlaybackRate: number; - /** - * Returns the duration in seconds of the current media resource. A NaN value is returned if duration is not available, or Infinity if the media resource is streaming. - */ - duration: number; - /** - * Gets information about whether the playback has ended or not. - */ - ended: boolean; - /** - * Returns an object representing the current error state of the audio or video element. - */ - error: MediaError; - /** - * Gets or sets a flag to specify whether playback should restart after it completes. - */ - loop: boolean; - /** - * Specifies the purpose of the audio or video media, such as background audio or alerts. - */ - msAudioCategory: string; - /** - * Specifies the output device id that the audio will be sent to. - */ - msAudioDeviceType: string; - msGraphicsTrustStatus: MSGraphicsTrust; - /** - * Gets the MSMediaKeys object, which is used for decrypting media data, that is associated with this media element. - */ - msKeys: MSMediaKeys; - /** - * Gets or sets whether the DLNA PlayTo device is available. - */ - msPlayToDisabled: boolean; - /** - * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server. - */ - msPlayToPreferredSourceUri: string; - /** - * Gets or sets the primary DLNA PlayTo device. - */ - msPlayToPrimary: boolean; - /** - * Gets the source associated with the media element for use by the PlayToManager. - */ - msPlayToSource: any; - /** - * Specifies whether or not to enable low-latency playback on the media element. - */ - msRealTime: boolean; - /** - * Gets or sets a flag that indicates whether the audio (either audio or the audio track on video media) is muted. - */ - muted: boolean; - /** - * Gets the current network activity for the element. - */ - networkState: number; - onmsneedkey: (ev: MSMediaKeyNeededEvent) => any; - /** - * Gets a flag that specifies whether playback is paused. - */ - paused: boolean; - /** - * Gets or sets the current rate of speed for the media resource to play. This speed is expressed as a multiple of the normal speed of the media resource. - */ - playbackRate: number; - /** - * Gets TimeRanges for the current media resource that has been played. - */ - played: TimeRanges; - /** - * Gets or sets the current playback position, in seconds. - */ - preload: string; - readyState: number; - /** - * Returns a TimeRanges object that represents the ranges of the current media resource that can be seeked. - */ - seekable: TimeRanges; - /** - * Gets a flag that indicates whether the the client is currently moving to a new playback position in the media resource. - */ - seeking: boolean; - /** - * The address or URL of the a media resource that is to be considered. - */ - src: string; - textTracks: TextTrackList; - videoTracks: VideoTrackList; - /** - * Gets or sets the volume level for audio portions of the media element. - */ - volume: number; - addTextTrack(kind: string, label?: string, language?: string): TextTrack; - /** - * Returns a string that specifies whether the client can play a given media resource type. - */ - canPlayType(type: string): string; - /** - * Fires immediately after the client loads the object. - */ - load(): void; - /** - * Clears all effects from the media pipeline. - */ - msClearEffects(): void; - msGetAsCastingSource(): any; - /** - * Inserts the specified audio effect into media pipeline. - */ - msInsertAudioEffect(activatableClassId: string, effectRequired: boolean, config?: any): void; - msSetMediaKeys(mediaKeys: MSMediaKeys): void; - /** - * Specifies the media protection manager for a given media pipeline. - */ - msSetMediaProtectionManager(mediaProtectionManager?: any): void; - /** - * Pauses the current playback and sets paused to TRUE. This can be used to test whether the media is playing or paused. You can also use the pause or play events to tell whether the media is playing or not. - */ - pause(): void; - /** - * Loads and starts playback of a media resource. - */ - play(): void; - HAVE_CURRENT_DATA: number; - HAVE_ENOUGH_DATA: number; - HAVE_FUTURE_DATA: number; - HAVE_METADATA: number; - HAVE_NOTHING: number; - NETWORK_EMPTY: number; - NETWORK_IDLE: number; - NETWORK_LOADING: number; - NETWORK_NO_SOURCE: number; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLMediaElement: { - prototype: HTMLMediaElement; - new(): HTMLMediaElement; - HAVE_CURRENT_DATA: number; - HAVE_ENOUGH_DATA: number; - HAVE_FUTURE_DATA: number; - HAVE_METADATA: number; - HAVE_NOTHING: number; - NETWORK_EMPTY: number; - NETWORK_IDLE: number; - NETWORK_LOADING: number; - NETWORK_NO_SOURCE: number; -} - -interface HTMLMenuElement extends HTMLElement { - compact: boolean; - type: string; -} - -declare var HTMLMenuElement: { - prototype: HTMLMenuElement; - new(): HTMLMenuElement; -} - -interface HTMLMetaElement extends HTMLElement { - /** - * Sets or retrieves the character set used to encode the object. - */ - charset: string; - /** - * Gets or sets meta-information to associate with httpEquiv or name. - */ - content: string; - /** - * Gets or sets information used to bind the value of a content attribute of a meta element to an HTTP response header. - */ - httpEquiv: string; - /** - * Sets or retrieves the value specified in the content attribute of the meta object. - */ - name: string; - /** - * Sets or retrieves a scheme to be used in interpreting the value of a property specified for the object. - */ - scheme: string; - /** - * Sets or retrieves the URL property that will be loaded after the specified time has elapsed. - */ - url: string; -} - -declare var HTMLMetaElement: { - prototype: HTMLMetaElement; - new(): HTMLMetaElement; -} - -interface HTMLModElement extends HTMLElement { - /** - * Sets or retrieves reference information about the object. - */ - cite: string; - /** - * Sets or retrieves the date and time of a modification to the object. - */ - dateTime: string; -} - -declare var HTMLModElement: { - prototype: HTMLModElement; - new(): HTMLModElement; -} - -interface HTMLNextIdElement extends HTMLElement { - n: string; -} - -declare var HTMLNextIdElement: { - prototype: HTMLNextIdElement; - new(): HTMLNextIdElement; -} - -interface HTMLOListElement extends HTMLElement { - compact: boolean; - /** - * The starting number. - */ - start: number; - type: string; -} - -declare var HTMLOListElement: { - prototype: HTMLOListElement; - new(): HTMLOListElement; -} - -interface HTMLObjectElement extends HTMLElement, GetSVGDocument { - /** - * Retrieves a string of the URL where the object tag can be found. This is often the href of the document that the object is in, or the value set by a base element. - */ - BaseHref: string; - align: string; - /** - * Sets or retrieves a text alternative to the graphic. - */ - alt: string; - /** - * Gets or sets the optional alternative HTML script to execute if the object fails to load. - */ - altHtml: string; - /** - * Sets or retrieves a character string that can be used to implement your own archive functionality for the object. - */ - archive: string; - border: string; - /** - * Sets or retrieves the URL of the file containing the compiled Java class. - */ - code: string; - /** - * Sets or retrieves the URL of the component. - */ - codeBase: string; - /** - * Sets or retrieves the Internet media type for the code associated with the object. - */ - codeType: string; - /** - * Retrieves the document object of the page or frame. - */ - contentDocument: Document; - /** - * Sets or retrieves the URL that references the data of the object. - */ - data: string; - declare: boolean; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Sets or retrieves the height of the object. - */ - height: string; - hspace: number; - /** - * Gets or sets whether the DLNA PlayTo device is available. - */ - msPlayToDisabled: boolean; - /** - * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server. - */ - msPlayToPreferredSourceUri: string; - /** - * Gets or sets the primary DLNA PlayTo device. - */ - msPlayToPrimary: boolean; - /** - * Gets the source associated with the media element for use by the PlayToManager. - */ - msPlayToSource: any; - /** - * Sets or retrieves the name of the object. - */ - name: string; - /** - * Retrieves the contained object. - */ - object: any; - readyState: number; - /** - * Sets or retrieves a message to be displayed while an object is loading. - */ - standby: string; - /** - * Sets or retrieves the MIME type of the object. - */ - type: string; - /** - * Sets or retrieves the URL, often with a bookmark extension (#name), to use as a client-side image map. - */ - useMap: string; - /** - * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting. - */ - validationMessage: string; - /** - * Returns a ValidityState object that represents the validity states of an element. - */ - validity: ValidityState; - vspace: number; - /** - * Sets or retrieves the width of the object. - */ - width: string; - /** - * Returns whether an element will successfully validate based on forms validation rules and constraints. - */ - willValidate: boolean; - /** - * Returns whether a form will validate when it is submitted, without having to submit it. - */ - checkValidity(): boolean; - /** - * Sets a custom error message that is displayed when a form is submitted. - * @param error Sets a custom error message that is displayed when a form is submitted. - */ - setCustomValidity(error: string): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLObjectElement: { - prototype: HTMLObjectElement; - new(): HTMLObjectElement; -} - -interface HTMLOptGroupElement extends HTMLElement { - /** - * Sets or retrieves the status of an option. - */ - defaultSelected: boolean; - disabled: boolean; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Sets or retrieves the ordinal position of an option in a list box. - */ - index: number; - /** - * Sets or retrieves a value that you can use to implement your own label functionality for the object. - */ - label: string; - /** - * Sets or retrieves whether the option in the list box is the default item. - */ - selected: boolean; - /** - * Sets or retrieves the text string specified by the option tag. - */ - text: string; - /** - * Sets or retrieves the value which is returned to the server when the form control is submitted. - */ - value: string; -} - -declare var HTMLOptGroupElement: { - prototype: HTMLOptGroupElement; - new(): HTMLOptGroupElement; -} - -interface HTMLOptionElement extends HTMLElement { - /** - * Sets or retrieves the status of an option. - */ - defaultSelected: boolean; - disabled: boolean; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Sets or retrieves the ordinal position of an option in a list box. - */ - index: number; - /** - * Sets or retrieves a value that you can use to implement your own label functionality for the object. - */ - label: string; - /** - * Sets or retrieves whether the option in the list box is the default item. - */ - selected: boolean; - /** - * Sets or retrieves the text string specified by the option tag. - */ - text: string; - /** - * Sets or retrieves the value which is returned to the server when the form control is submitted. - */ - value: string; -} - -declare var HTMLOptionElement: { - prototype: HTMLOptionElement; - new(): HTMLOptionElement; - create(): HTMLOptionElement; -} - -interface HTMLParagraphElement extends HTMLElement { - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - clear: string; -} - -declare var HTMLParagraphElement: { - prototype: HTMLParagraphElement; - new(): HTMLParagraphElement; -} - -interface HTMLParamElement extends HTMLElement { - /** - * Sets or retrieves the name of an input parameter for an element. - */ - name: string; - /** - * Sets or retrieves the content type of the resource designated by the value attribute. - */ - type: string; - /** - * Sets or retrieves the value of an input parameter for an element. - */ - value: string; - /** - * Sets or retrieves the data type of the value attribute. - */ - valueType: string; -} - -declare var HTMLParamElement: { - prototype: HTMLParamElement; - new(): HTMLParamElement; -} - -interface HTMLPhraseElement extends HTMLElement { - /** - * Sets or retrieves reference information about the object. - */ - cite: string; - /** - * Sets or retrieves the date and time of a modification to the object. - */ - dateTime: string; -} - -declare var HTMLPhraseElement: { - prototype: HTMLPhraseElement; - new(): HTMLPhraseElement; -} - -interface HTMLPreElement extends HTMLElement { - /** - * Indicates a citation by rendering text in italic type. - */ - cite: string; - clear: string; - /** - * Sets or gets a value that you can use to implement your own width functionality for the object. - */ - width: number; -} - -declare var HTMLPreElement: { - prototype: HTMLPreElement; - new(): HTMLPreElement; -} - -interface HTMLProgressElement extends HTMLElement { - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Defines the maximum, or "done" value for a progress element. - */ - max: number; - /** - * Returns the quotient of value/max when the value attribute is set (determinate progress bar), or -1 when the value attribute is missing (indeterminate progress bar). - */ - position: number; - /** - * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value. - */ - value: number; -} - -declare var HTMLProgressElement: { - prototype: HTMLProgressElement; - new(): HTMLProgressElement; -} - -interface HTMLQuoteElement extends HTMLElement { - /** - * Sets or retrieves reference information about the object. - */ - cite: string; - /** - * Sets or retrieves the date and time of a modification to the object. - */ - dateTime: string; -} - -declare var HTMLQuoteElement: { - prototype: HTMLQuoteElement; - new(): HTMLQuoteElement; -} - -interface HTMLScriptElement extends HTMLElement { - async: boolean; - /** - * Sets or retrieves the character set used to encode the object. - */ - charset: string; - /** - * Sets or retrieves the status of the script. - */ - defer: boolean; - /** - * Sets or retrieves the event for which the script is written. - */ - event: string; - /** - * Sets or retrieves the object that is bound to the event script. - */ - htmlFor: string; - /** - * Retrieves the URL to an external file that contains the source code or data. - */ - src: string; - /** - * Retrieves or sets the text of the object as a string. - */ - text: string; - /** - * Sets or retrieves the MIME type for the associated scripting engine. - */ - type: string; -} - -declare var HTMLScriptElement: { - prototype: HTMLScriptElement; - new(): HTMLScriptElement; -} - -interface HTMLSelectElement extends HTMLElement { - /** - * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing. - */ - autofocus: boolean; - disabled: boolean; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Sets or retrieves the number of objects in a collection. - */ - length: number; - /** - * Sets or retrieves the Boolean value indicating whether multiple items can be selected from a list. - */ - multiple: boolean; - /** - * Sets or retrieves the name of the object. - */ - name: string; - options: HTMLCollection; - /** - * When present, marks an element that can't be submitted without a value. - */ - required: boolean; - /** - * Sets or retrieves the index of the selected option in a select object. - */ - selectedIndex: number; - /** - * Sets or retrieves the number of rows in the list box. - */ - size: number; - /** - * Retrieves the type of select control based on the value of the MULTIPLE attribute. - */ - type: string; - /** - * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting. - */ - validationMessage: string; - /** - * Returns a ValidityState object that represents the validity states of an element. - */ - validity: ValidityState; - /** - * Sets or retrieves the value which is returned to the server when the form control is submitted. - */ - value: string; - /** - * Returns whether an element will successfully validate based on forms validation rules and constraints. - */ - willValidate: boolean; - selectedOptions: HTMLCollection; - /** - * Adds an element to the areas, controlRange, or options collection. - * @param element Variant of type Number that specifies the index position in the collection where the element is placed. If no value is given, the method places the element at the end of the collection. - * @param before Variant of type Object that specifies an element to insert before, or null to append the object to the collection. - */ - add(element: HTMLElement, before?: HTMLElement | number): void; - /** - * Returns whether a form will validate when it is submitted, without having to submit it. - */ - checkValidity(): boolean; - /** - * Retrieves a select object or an object from an options collection. - * @param name Variant of type Number or String that specifies the object or collection to retrieve. If this parameter is an integer, it is the zero-based index of the object. If this parameter is a string, all objects with matching name or id properties are retrieved, and a collection is returned if more than one match is made. - * @param index Variant of type Number that specifies the zero-based index of the object to retrieve when a collection is returned. - */ - item(name?: any, index?: any): any; - /** - * Retrieves a select object or an object from an options collection. - * @param namedItem A String that specifies the name or id property of the object to retrieve. A collection is returned if more than one match is made. - */ - namedItem(name: string): any; - /** - * Removes an element from the collection. - * @param index Number that specifies the zero-based index of the element to remove from the collection. - */ - remove(index?: number): void; - /** - * Sets a custom error message that is displayed when a form is submitted. - * @param error Sets a custom error message that is displayed when a form is submitted. - */ - setCustomValidity(error: string): void; - [name: string]: any; -} - -declare var HTMLSelectElement: { - prototype: HTMLSelectElement; - new(): HTMLSelectElement; -} - -interface HTMLSourceElement extends HTMLElement { - /** - * Gets or sets the intended media type of the media source. - */ - media: string; - msKeySystem: string; - /** - * The address or URL of the a media resource that is to be considered. - */ - src: string; - /** - * Gets or sets the MIME type of a media resource. - */ - type: string; -} - -declare var HTMLSourceElement: { - prototype: HTMLSourceElement; - new(): HTMLSourceElement; -} - -interface HTMLSpanElement extends HTMLElement { -} - -declare var HTMLSpanElement: { - prototype: HTMLSpanElement; - new(): HTMLSpanElement; -} - -interface HTMLStyleElement extends HTMLElement, LinkStyle { - /** - * Sets or retrieves the media type. - */ - media: string; - /** - * Retrieves the CSS language in which the style sheet is written. - */ - type: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLStyleElement: { - prototype: HTMLStyleElement; - new(): HTMLStyleElement; -} - -interface HTMLTableCaptionElement extends HTMLElement { - /** - * Sets or retrieves the alignment of the caption or legend. - */ - align: string; - /** - * Sets or retrieves whether the caption appears at the top or bottom of the table. - */ - vAlign: string; -} - -declare var HTMLTableCaptionElement: { - prototype: HTMLTableCaptionElement; - new(): HTMLTableCaptionElement; -} - -interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment { - /** - * Sets or retrieves abbreviated text for the object. - */ - abbr: string; - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - /** - * Sets or retrieves a comma-delimited list of conceptual categories associated with the object. - */ - axis: string; - bgColor: any; - /** - * Retrieves the position of the object in the cells collection of a row. - */ - cellIndex: number; - /** - * Sets or retrieves the number columns in the table that the object should span. - */ - colSpan: number; - /** - * Sets or retrieves a list of header cells that provide information for the object. - */ - headers: string; - /** - * Sets or retrieves the height of the object. - */ - height: any; - /** - * Sets or retrieves whether the browser automatically performs wordwrap. - */ - noWrap: boolean; - /** - * Sets or retrieves how many rows in a table the cell should span. - */ - rowSpan: number; - /** - * Sets or retrieves the group of cells in a table to which the object's information applies. - */ - scope: string; - /** - * Sets or retrieves the width of the object. - */ - width: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLTableCellElement: { - prototype: HTMLTableCellElement; - new(): HTMLTableCellElement; -} - -interface HTMLTableColElement extends HTMLElement, HTMLTableAlignment { - /** - * Sets or retrieves the alignment of the object relative to the display or table. - */ - align: string; - /** - * Sets or retrieves the number of columns in the group. - */ - span: number; - /** - * Sets or retrieves the width of the object. - */ - width: any; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLTableColElement: { - prototype: HTMLTableColElement; - new(): HTMLTableColElement; -} - -interface HTMLTableDataCellElement extends HTMLTableCellElement { -} - -declare var HTMLTableDataCellElement: { - prototype: HTMLTableDataCellElement; - new(): HTMLTableDataCellElement; -} - -interface HTMLTableElement extends HTMLElement { - /** - * Sets or retrieves a value that indicates the table alignment. - */ - align: string; - bgColor: any; - /** - * Sets or retrieves the width of the border to draw around the object. - */ - border: string; - /** - * Sets or retrieves the border color of the object. - */ - borderColor: any; - /** - * Retrieves the caption object of a table. - */ - caption: HTMLTableCaptionElement; - /** - * Sets or retrieves the amount of space between the border of the cell and the content of the cell. - */ - cellPadding: string; - /** - * Sets or retrieves the amount of space between cells in a table. - */ - cellSpacing: string; - /** - * Sets or retrieves the number of columns in the table. - */ - cols: number; - /** - * Sets or retrieves the way the border frame around the table is displayed. - */ - frame: string; - /** - * Sets or retrieves the height of the object. - */ - height: any; - /** - * Sets or retrieves the number of horizontal rows contained in the object. - */ - rows: HTMLCollection; - /** - * Sets or retrieves which dividing lines (inner borders) are displayed. - */ - rules: string; - /** - * Sets or retrieves a description and/or structure of the object. - */ - summary: string; - /** - * Retrieves a collection of all tBody objects in the table. Objects in this collection are in source order. - */ - tBodies: HTMLCollection; - /** - * Retrieves the tFoot object of the table. - */ - tFoot: HTMLTableSectionElement; - /** - * Retrieves the tHead object of the table. - */ - tHead: HTMLTableSectionElement; - /** - * Sets or retrieves the width of the object. - */ - width: string; - /** - * Creates an empty caption element in the table. - */ - createCaption(): HTMLTableCaptionElement; - /** - * Creates an empty tBody element in the table. - */ - createTBody(): HTMLTableSectionElement; - /** - * Creates an empty tFoot element in the table. - */ - createTFoot(): HTMLTableSectionElement; - /** - * Returns the tHead element object if successful, or null otherwise. - */ - createTHead(): HTMLTableSectionElement; - /** - * Deletes the caption element and its contents from the table. - */ - deleteCaption(): void; - /** - * Removes the specified row (tr) from the element and from the rows collection. - * @param index Number that specifies the zero-based position in the rows collection of the row to remove. - */ - deleteRow(index?: number): void; - /** - * Deletes the tFoot element and its contents from the table. - */ - deleteTFoot(): void; - /** - * Deletes the tHead element and its contents from the table. - */ - deleteTHead(): void; - /** - * Creates a new row (tr) in the table, and adds the row to the rows collection. - * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection. - */ - insertRow(index?: number): HTMLTableRowElement; -} - -declare var HTMLTableElement: { - prototype: HTMLTableElement; - new(): HTMLTableElement; -} - -interface HTMLTableHeaderCellElement extends HTMLTableCellElement { - /** - * Sets or retrieves the group of cells in a table to which the object's information applies. - */ - scope: string; -} - -declare var HTMLTableHeaderCellElement: { - prototype: HTMLTableHeaderCellElement; - new(): HTMLTableHeaderCellElement; -} - -interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment { - /** - * Sets or retrieves how the object is aligned with adjacent text. - */ - align: string; - bgColor: any; - /** - * Retrieves a collection of all cells in the table row. - */ - cells: HTMLCollection; - /** - * Sets or retrieves the height of the object. - */ - height: any; - /** - * Retrieves the position of the object in the rows collection for the table. - */ - rowIndex: number; - /** - * Retrieves the position of the object in the collection. - */ - sectionRowIndex: number; - /** - * Removes the specified cell from the table row, as well as from the cells collection. - * @param index Number that specifies the zero-based position of the cell to remove from the table row. If no value is provided, the last cell in the cells collection is deleted. - */ - deleteCell(index?: number): void; - /** - * Creates a new cell in the table row, and adds the cell to the cells collection. - * @param index Number that specifies where to insert the cell in the tr. The default value is -1, which appends the new cell to the end of the cells collection. - */ - insertCell(index?: number): HTMLTableCellElement; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLTableRowElement: { - prototype: HTMLTableRowElement; - new(): HTMLTableRowElement; -} - -interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment { - /** - * Sets or retrieves a value that indicates the table alignment. - */ - align: string; - /** - * Sets or retrieves the number of horizontal rows contained in the object. - */ - rows: HTMLCollection; - /** - * Removes the specified row (tr) from the element and from the rows collection. - * @param index Number that specifies the zero-based position in the rows collection of the row to remove. - */ - deleteRow(index?: number): void; - /** - * Creates a new row (tr) in the table, and adds the row to the rows collection. - * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection. - */ - insertRow(index?: number): HTMLTableRowElement; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLTableSectionElement: { - prototype: HTMLTableSectionElement; - new(): HTMLTableSectionElement; -} - -interface HTMLTextAreaElement extends HTMLElement { - /** - * Provides a way to direct a user to a specific field when a document loads. This can provide both direction and convenience for a user, reducing the need to click or tab to a field when a page opens. This attribute is true when present on an element, and false when missing. - */ - autofocus: boolean; - /** - * Sets or retrieves the width of the object. - */ - cols: number; - /** - * Sets or retrieves the initial contents of the object. - */ - defaultValue: string; - disabled: boolean; - /** - * Retrieves a reference to the form that the object is embedded in. - */ - form: HTMLFormElement; - /** - * Sets or retrieves the maximum number of characters that the user can enter in a text control. - */ - maxLength: number; - /** - * Sets or retrieves the name of the object. - */ - name: string; - /** - * Gets or sets a text string that is displayed in an input field as a hint or prompt to users as the format or type of information they need to enter.The text appears in an input field until the user puts focus on the field. - */ - placeholder: string; - /** - * Sets or retrieves the value indicated whether the content of the object is read-only. - */ - readOnly: boolean; - /** - * When present, marks an element that can't be submitted without a value. - */ - required: boolean; - /** - * Sets or retrieves the number of horizontal rows contained in the object. - */ - rows: number; - /** - * Gets or sets the end position or offset of a text selection. - */ - selectionEnd: number; - /** - * Gets or sets the starting position or offset of a text selection. - */ - selectionStart: number; - /** - * Sets or retrieves the value indicating whether the control is selected. - */ - status: any; - /** - * Retrieves the type of control. - */ - type: string; - /** - * Returns the error message that would be displayed if the user submits the form, or an empty string if no error message. It also triggers the standard error message, such as "this is a required field". The result is that the user sees validation messages without actually submitting. - */ - validationMessage: string; - /** - * Returns a ValidityState object that represents the validity states of an element. - */ - validity: ValidityState; - /** - * Retrieves or sets the text in the entry field of the textArea element. - */ - value: string; - /** - * Returns whether an element will successfully validate based on forms validation rules and constraints. - */ - willValidate: boolean; - /** - * Sets or retrieves how to handle wordwrapping in the object. - */ - wrap: string; - /** - * Returns whether a form will validate when it is submitted, without having to submit it. - */ - checkValidity(): boolean; - /** - * Creates a TextRange object for the element. - */ - createTextRange(): TextRange; - /** - * Highlights the input area of a form element. - */ - select(): void; - /** - * Sets a custom error message that is displayed when a form is submitted. - * @param error Sets a custom error message that is displayed when a form is submitted. - */ - setCustomValidity(error: string): void; - /** - * Sets the start and end positions of a selection in a text field. - * @param start The offset into the text field for the start of the selection. - * @param end The offset into the text field for the end of the selection. - */ - setSelectionRange(start: number, end: number): void; -} - -declare var HTMLTextAreaElement: { - prototype: HTMLTextAreaElement; - new(): HTMLTextAreaElement; -} - -interface HTMLTitleElement extends HTMLElement { - /** - * Retrieves or sets the text of the object as a string. - */ - text: string; -} - -declare var HTMLTitleElement: { - prototype: HTMLTitleElement; - new(): HTMLTitleElement; -} - -interface HTMLTrackElement extends HTMLElement { - default: boolean; - kind: string; - label: string; - readyState: number; - src: string; - srclang: string; - track: TextTrack; - ERROR: number; - LOADED: number; - LOADING: number; - NONE: number; -} - -declare var HTMLTrackElement: { - prototype: HTMLTrackElement; - new(): HTMLTrackElement; - ERROR: number; - LOADED: number; - LOADING: number; - NONE: number; -} - -interface HTMLUListElement extends HTMLElement { - compact: boolean; - type: string; -} - -declare var HTMLUListElement: { - prototype: HTMLUListElement; - new(): HTMLUListElement; -} - -interface HTMLUnknownElement extends HTMLElement { -} - -declare var HTMLUnknownElement: { - prototype: HTMLUnknownElement; - new(): HTMLUnknownElement; -} - -interface HTMLVideoElement extends HTMLMediaElement { - /** - * Gets or sets the height of the video element. - */ - height: number; - msHorizontalMirror: boolean; - msIsLayoutOptimalForPlayback: boolean; - msIsStereo3D: boolean; - msStereo3DPackingMode: string; - msStereo3DRenderMode: string; - msZoom: boolean; - onMSVideoFormatChanged: (ev: Event) => any; - onMSVideoFrameStepCompleted: (ev: Event) => any; - onMSVideoOptimalLayoutChanged: (ev: Event) => any; - /** - * Gets or sets a URL of an image to display, for example, like a movie poster. This can be a still frame from the video, or another image if no video data is available. - */ - poster: string; - /** - * Gets the intrinsic height of a video in CSS pixels, or zero if the dimensions are not known. - */ - videoHeight: number; - /** - * Gets the intrinsic width of a video in CSS pixels, or zero if the dimensions are not known. - */ - videoWidth: number; - webkitDisplayingFullscreen: boolean; - webkitSupportsFullscreen: boolean; - /** - * Gets or sets the width of the video element. - */ - width: number; - getVideoPlaybackQuality(): VideoPlaybackQuality; - msFrameStep(forward: boolean): void; - msInsertVideoEffect(activatableClassId: string, effectRequired: boolean, config?: any): void; - msSetVideoRectangle(left: number, top: number, right: number, bottom: number): void; - webkitEnterFullScreen(): void; - webkitEnterFullscreen(): void; - webkitExitFullScreen(): void; - webkitExitFullscreen(): void; - addEventListener(type: "MSContentZoom", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSManipulationStateChanged", listener: (ev: MSManipulationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSVideoFormatChanged", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "MSVideoFrameStepCompleted", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "MSVideoOptimalLayoutChanged", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "activate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecopy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforecut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforedeactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "beforepaste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "copy", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "cut", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deactivate", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "msneedkey", listener: (ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void; - addEventListener(type: "paste", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "selectstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var HTMLVideoElement: { - prototype: HTMLVideoElement; - new(): HTMLVideoElement; -} - -interface HashChangeEvent extends Event { - newURL: string; - oldURL: string; -} - -declare var HashChangeEvent: { - prototype: HashChangeEvent; - new(type: string, eventInitDict?: HashChangeEventInit): HashChangeEvent; -} - -interface History { - length: number; - state: any; - back(distance?: any): void; - forward(distance?: any): void; - go(delta?: any): void; - pushState(statedata: any, title?: string, url?: string): void; - replaceState(statedata: any, title?: string, url?: string): void; -} - -declare var History: { - prototype: History; - new(): History; -} - -interface IDBCursor { - direction: string; - key: any; - primaryKey: any; - source: any; - advance(count: number): void; - continue(key?: any): void; - delete(): IDBRequest; - update(value: any): IDBRequest; - NEXT: string; - NEXT_NO_DUPLICATE: string; - PREV: string; - PREV_NO_DUPLICATE: string; -} - -declare var IDBCursor: { - prototype: IDBCursor; - new(): IDBCursor; - NEXT: string; - NEXT_NO_DUPLICATE: string; - PREV: string; - PREV_NO_DUPLICATE: string; -} - -interface IDBCursorWithValue extends IDBCursor { - value: any; -} - -declare var IDBCursorWithValue: { - prototype: IDBCursorWithValue; - new(): IDBCursorWithValue; -} - -interface IDBDatabase extends EventTarget { - name: string; - objectStoreNames: DOMStringList; - onabort: (ev: Event) => any; - onerror: (ev: Event) => any; - version: number; - close(): void; - createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore; - deleteObjectStore(name: string): void; - transaction(storeNames: any, mode?: string): IDBTransaction; - addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var IDBDatabase: { - prototype: IDBDatabase; - new(): IDBDatabase; -} - -interface IDBFactory { - cmp(first: any, second: any): number; - deleteDatabase(name: string): IDBOpenDBRequest; - open(name: string, version?: number): IDBOpenDBRequest; -} - -declare var IDBFactory: { - prototype: IDBFactory; - new(): IDBFactory; -} - -interface IDBIndex { - keyPath: string | string[]; - name: string; - objectStore: IDBObjectStore; - unique: boolean; - multiEntry: boolean; - count(key?: any): IDBRequest; - get(key: any): IDBRequest; - getKey(key: any): IDBRequest; - openCursor(range?: IDBKeyRange, direction?: string): IDBRequest; - openKeyCursor(range?: IDBKeyRange, direction?: string): IDBRequest; -} - -declare var IDBIndex: { - prototype: IDBIndex; - new(): IDBIndex; -} - -interface IDBKeyRange { - lower: any; - lowerOpen: boolean; - upper: any; - upperOpen: boolean; -} - -declare var IDBKeyRange: { - prototype: IDBKeyRange; - new(): IDBKeyRange; - bound(lower: any, upper: any, lowerOpen?: boolean, upperOpen?: boolean): IDBKeyRange; - lowerBound(bound: any, open?: boolean): IDBKeyRange; - only(value: any): IDBKeyRange; - upperBound(bound: any, open?: boolean): IDBKeyRange; -} - -interface IDBObjectStore { - indexNames: DOMStringList; - keyPath: string; - name: string; - transaction: IDBTransaction; - add(value: any, key?: any): IDBRequest; - clear(): IDBRequest; - count(key?: any): IDBRequest; - createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): IDBIndex; - delete(key: any): IDBRequest; - deleteIndex(indexName: string): void; - get(key: any): IDBRequest; - index(name: string): IDBIndex; - openCursor(range?: any, direction?: string): IDBRequest; - put(value: any, key?: any): IDBRequest; -} - -declare var IDBObjectStore: { - prototype: IDBObjectStore; - new(): IDBObjectStore; -} - -interface IDBOpenDBRequest extends IDBRequest { - onblocked: (ev: Event) => any; - onupgradeneeded: (ev: IDBVersionChangeEvent) => any; - addEventListener(type: "blocked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "upgradeneeded", listener: (ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var IDBOpenDBRequest: { - prototype: IDBOpenDBRequest; - new(): IDBOpenDBRequest; -} - -interface IDBRequest extends EventTarget { - error: DOMError; - onerror: (ev: Event) => any; - onsuccess: (ev: Event) => any; - readyState: string; - result: any; - source: any; - transaction: IDBTransaction; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var IDBRequest: { - prototype: IDBRequest; - new(): IDBRequest; -} - -interface IDBTransaction extends EventTarget { - db: IDBDatabase; - error: DOMError; - mode: string; - onabort: (ev: Event) => any; - oncomplete: (ev: Event) => any; - onerror: (ev: Event) => any; - abort(): void; - objectStore(name: string): IDBObjectStore; - READ_ONLY: string; - READ_WRITE: string; - VERSION_CHANGE: string; - addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var IDBTransaction: { - prototype: IDBTransaction; - new(): IDBTransaction; - READ_ONLY: string; - READ_WRITE: string; - VERSION_CHANGE: string; -} - -interface IDBVersionChangeEvent extends Event { - newVersion: number; - oldVersion: number; -} - -declare var IDBVersionChangeEvent: { - prototype: IDBVersionChangeEvent; - new(): IDBVersionChangeEvent; -} - -interface ImageData { - data: Uint8ClampedArray; - height: number; - width: number; -} - -declare var ImageData: { - prototype: ImageData; - new(width: number, height: number): ImageData; - new(array: Uint8ClampedArray, width: number, height: number): ImageData; -} - -interface KeyboardEvent extends UIEvent { - altKey: boolean; - char: string; - charCode: number; - ctrlKey: boolean; - key: string; - keyCode: number; - locale: string; - location: number; - metaKey: boolean; - repeat: boolean; - shiftKey: boolean; - which: number; - getModifierState(keyArg: string): boolean; - initKeyboardEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, keyArg: string, locationArg: number, modifiersListArg: string, repeat: boolean, locale: string): void; - DOM_KEY_LOCATION_JOYSTICK: number; - DOM_KEY_LOCATION_LEFT: number; - DOM_KEY_LOCATION_MOBILE: number; - DOM_KEY_LOCATION_NUMPAD: number; - DOM_KEY_LOCATION_RIGHT: number; - DOM_KEY_LOCATION_STANDARD: number; -} - -declare var KeyboardEvent: { - prototype: KeyboardEvent; - new(typeArg: string, eventInitDict?: KeyboardEventInit): KeyboardEvent; - DOM_KEY_LOCATION_JOYSTICK: number; - DOM_KEY_LOCATION_LEFT: number; - DOM_KEY_LOCATION_MOBILE: number; - DOM_KEY_LOCATION_NUMPAD: number; - DOM_KEY_LOCATION_RIGHT: number; - DOM_KEY_LOCATION_STANDARD: number; -} - -interface Location { - hash: string; - host: string; - hostname: string; - href: string; - origin: string; - pathname: string; - port: string; - protocol: string; - search: string; - assign(url: string): void; - reload(forcedReload?: boolean): void; - replace(url: string): void; - toString(): string; -} - -declare var Location: { - prototype: Location; - new(): Location; -} - -interface LongRunningScriptDetectedEvent extends Event { - executionTime: number; - stopPageScriptExecution: boolean; -} - -declare var LongRunningScriptDetectedEvent: { - prototype: LongRunningScriptDetectedEvent; - new(): LongRunningScriptDetectedEvent; -} - -interface MSApp { - clearTemporaryWebDataAsync(): MSAppAsyncOperation; - createBlobFromRandomAccessStream(type: string, seeker: any): Blob; - createDataPackage(object: any): any; - createDataPackageFromSelection(): any; - createFileFromStorageFile(storageFile: any): File; - createStreamFromInputStream(type: string, inputStream: any): MSStream; - execAsyncAtPriority(asynchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): void; - execAtPriority(synchronousCallback: MSExecAtPriorityFunctionCallback, priority: string, ...args: any[]): any; - getCurrentPriority(): string; - getHtmlPrintDocumentSourceAsync(htmlDoc: any): any; - getViewId(view: any): any; - isTaskScheduledAtPriorityOrHigher(priority: string): boolean; - pageHandlesAllApplicationActivations(enabled: boolean): void; - suppressSubdownloadCredentialPrompts(suppress: boolean): void; - terminateApp(exceptionObject: any): void; - CURRENT: string; - HIGH: string; - IDLE: string; - NORMAL: string; -} -declare var MSApp: MSApp; - -interface MSAppAsyncOperation extends EventTarget { - error: DOMError; - oncomplete: (ev: Event) => any; - onerror: (ev: Event) => any; - readyState: number; - result: any; - start(): void; - COMPLETED: number; - ERROR: number; - STARTED: number; - addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var MSAppAsyncOperation: { - prototype: MSAppAsyncOperation; - new(): MSAppAsyncOperation; - COMPLETED: number; - ERROR: number; - STARTED: number; -} - -interface MSBlobBuilder { - append(data: any, endings?: string): void; - getBlob(contentType?: string): Blob; -} - -declare var MSBlobBuilder: { - prototype: MSBlobBuilder; - new(): MSBlobBuilder; -} - -interface MSCSSMatrix { - a: number; - b: number; - c: number; - d: number; - e: number; - f: number; - m11: number; - m12: number; - m13: number; - m14: number; - m21: number; - m22: number; - m23: number; - m24: number; - m31: number; - m32: number; - m33: number; - m34: number; - m41: number; - m42: number; - m43: number; - m44: number; - inverse(): MSCSSMatrix; - multiply(secondMatrix: MSCSSMatrix): MSCSSMatrix; - rotate(angleX: number, angleY?: number, angleZ?: number): MSCSSMatrix; - rotateAxisAngle(x: number, y: number, z: number, angle: number): MSCSSMatrix; - scale(scaleX: number, scaleY?: number, scaleZ?: number): MSCSSMatrix; - setMatrixValue(value: string): void; - skewX(angle: number): MSCSSMatrix; - skewY(angle: number): MSCSSMatrix; - toString(): string; - translate(x: number, y: number, z?: number): MSCSSMatrix; -} - -declare var MSCSSMatrix: { - prototype: MSCSSMatrix; - new(text?: string): MSCSSMatrix; -} - -interface MSGesture { - target: Element; - addPointer(pointerId: number): void; - stop(): void; -} - -declare var MSGesture: { - prototype: MSGesture; - new(): MSGesture; -} - -interface MSGestureEvent extends UIEvent { - clientX: number; - clientY: number; - expansion: number; - gestureObject: any; - hwTimestamp: number; - offsetX: number; - offsetY: number; - rotation: number; - scale: number; - screenX: number; - screenY: number; - translationX: number; - translationY: number; - velocityAngular: number; - velocityExpansion: number; - velocityX: number; - velocityY: number; - initGestureEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, offsetXArg: number, offsetYArg: number, translationXArg: number, translationYArg: number, scaleArg: number, expansionArg: number, rotationArg: number, velocityXArg: number, velocityYArg: number, velocityExpansionArg: number, velocityAngularArg: number, hwTimestampArg: number): void; - MSGESTURE_FLAG_BEGIN: number; - MSGESTURE_FLAG_CANCEL: number; - MSGESTURE_FLAG_END: number; - MSGESTURE_FLAG_INERTIA: number; - MSGESTURE_FLAG_NONE: number; -} - -declare var MSGestureEvent: { - prototype: MSGestureEvent; - new(): MSGestureEvent; - MSGESTURE_FLAG_BEGIN: number; - MSGESTURE_FLAG_CANCEL: number; - MSGESTURE_FLAG_END: number; - MSGESTURE_FLAG_INERTIA: number; - MSGESTURE_FLAG_NONE: number; -} - -interface MSGraphicsTrust { - constrictionActive: boolean; - status: string; -} - -declare var MSGraphicsTrust: { - prototype: MSGraphicsTrust; - new(): MSGraphicsTrust; -} - -interface MSHTMLWebViewElement extends HTMLElement { - canGoBack: boolean; - canGoForward: boolean; - containsFullScreenElement: boolean; - documentTitle: string; - height: number; - settings: MSWebViewSettings; - src: string; - width: number; - addWebAllowedObject(name: string, applicationObject: any): void; - buildLocalStreamUri(contentIdentifier: string, relativePath: string): string; - capturePreviewToBlobAsync(): MSWebViewAsyncOperation; - captureSelectedContentToDataPackageAsync(): MSWebViewAsyncOperation; - getDeferredPermissionRequestById(id: number): DeferredPermissionRequest; - getDeferredPermissionRequests(): DeferredPermissionRequest[]; - goBack(): void; - goForward(): void; - invokeScriptAsync(scriptName: string, ...args: any[]): MSWebViewAsyncOperation; - navigate(uri: string): void; - navigateToLocalStreamUri(source: string, streamResolver: any): void; - navigateToString(contents: string): void; - navigateWithHttpRequestMessage(requestMessage: any): void; - refresh(): void; - stop(): void; -} - -declare var MSHTMLWebViewElement: { - prototype: MSHTMLWebViewElement; - new(): MSHTMLWebViewElement; -} - -interface MSInputMethodContext extends EventTarget { - compositionEndOffset: number; - compositionStartOffset: number; - oncandidatewindowhide: (ev: Event) => any; - oncandidatewindowshow: (ev: Event) => any; - oncandidatewindowupdate: (ev: Event) => any; - target: HTMLElement; - getCandidateWindowClientRect(): ClientRect; - getCompositionAlternatives(): string[]; - hasComposition(): boolean; - isCandidateWindowVisible(): boolean; - addEventListener(type: "MSCandidateWindowHide", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "MSCandidateWindowShow", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "MSCandidateWindowUpdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var MSInputMethodContext: { - prototype: MSInputMethodContext; - new(): MSInputMethodContext; -} - -interface MSManipulationEvent extends UIEvent { - currentState: number; - inertiaDestinationX: number; - inertiaDestinationY: number; - lastState: number; - initMSManipulationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, lastState: number, currentState: number): void; - MS_MANIPULATION_STATE_ACTIVE: number; - MS_MANIPULATION_STATE_CANCELLED: number; - MS_MANIPULATION_STATE_COMMITTED: number; - MS_MANIPULATION_STATE_DRAGGING: number; - MS_MANIPULATION_STATE_INERTIA: number; - MS_MANIPULATION_STATE_PRESELECT: number; - MS_MANIPULATION_STATE_SELECTING: number; - MS_MANIPULATION_STATE_STOPPED: number; -} - -declare var MSManipulationEvent: { - prototype: MSManipulationEvent; - new(): MSManipulationEvent; - MS_MANIPULATION_STATE_ACTIVE: number; - MS_MANIPULATION_STATE_CANCELLED: number; - MS_MANIPULATION_STATE_COMMITTED: number; - MS_MANIPULATION_STATE_DRAGGING: number; - MS_MANIPULATION_STATE_INERTIA: number; - MS_MANIPULATION_STATE_PRESELECT: number; - MS_MANIPULATION_STATE_SELECTING: number; - MS_MANIPULATION_STATE_STOPPED: number; -} - -interface MSMediaKeyError { - code: number; - systemCode: number; - MS_MEDIA_KEYERR_CLIENT: number; - MS_MEDIA_KEYERR_DOMAIN: number; - MS_MEDIA_KEYERR_HARDWARECHANGE: number; - MS_MEDIA_KEYERR_OUTPUT: number; - MS_MEDIA_KEYERR_SERVICE: number; - MS_MEDIA_KEYERR_UNKNOWN: number; -} - -declare var MSMediaKeyError: { - prototype: MSMediaKeyError; - new(): MSMediaKeyError; - MS_MEDIA_KEYERR_CLIENT: number; - MS_MEDIA_KEYERR_DOMAIN: number; - MS_MEDIA_KEYERR_HARDWARECHANGE: number; - MS_MEDIA_KEYERR_OUTPUT: number; - MS_MEDIA_KEYERR_SERVICE: number; - MS_MEDIA_KEYERR_UNKNOWN: number; -} - -interface MSMediaKeyMessageEvent extends Event { - destinationURL: string; - message: Uint8Array; -} - -declare var MSMediaKeyMessageEvent: { - prototype: MSMediaKeyMessageEvent; - new(): MSMediaKeyMessageEvent; -} - -interface MSMediaKeyNeededEvent extends Event { - initData: Uint8Array; -} - -declare var MSMediaKeyNeededEvent: { - prototype: MSMediaKeyNeededEvent; - new(): MSMediaKeyNeededEvent; -} - -interface MSMediaKeySession extends EventTarget { - error: MSMediaKeyError; - keySystem: string; - sessionId: string; - close(): void; - update(key: Uint8Array): void; -} - -declare var MSMediaKeySession: { - prototype: MSMediaKeySession; - new(): MSMediaKeySession; -} - -interface MSMediaKeys { - keySystem: string; - createSession(type: string, initData: Uint8Array, cdmData?: Uint8Array): MSMediaKeySession; -} - -declare var MSMediaKeys: { - prototype: MSMediaKeys; - new(keySystem: string): MSMediaKeys; - isTypeSupported(keySystem: string, type?: string): boolean; -} - -interface MSMimeTypesCollection { - length: number; -} - -declare var MSMimeTypesCollection: { - prototype: MSMimeTypesCollection; - new(): MSMimeTypesCollection; -} - -interface MSPluginsCollection { - length: number; - refresh(reload?: boolean): void; -} - -declare var MSPluginsCollection: { - prototype: MSPluginsCollection; - new(): MSPluginsCollection; -} - -interface MSPointerEvent extends MouseEvent { - currentPoint: any; - height: number; - hwTimestamp: number; - intermediatePoints: any; - isPrimary: boolean; - pointerId: number; - pointerType: any; - pressure: number; - rotation: number; - tiltX: number; - tiltY: number; - width: number; - getCurrentPoint(element: Element): void; - getIntermediatePoints(element: Element): void; - initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void; -} - -declare var MSPointerEvent: { - prototype: MSPointerEvent; - new(typeArg: string, eventInitDict?: PointerEventInit): MSPointerEvent; -} - -interface MSRangeCollection { - length: number; - item(index: number): Range; - [index: number]: Range; -} - -declare var MSRangeCollection: { - prototype: MSRangeCollection; - new(): MSRangeCollection; -} - -interface MSSiteModeEvent extends Event { - actionURL: string; - buttonID: number; -} - -declare var MSSiteModeEvent: { - prototype: MSSiteModeEvent; - new(): MSSiteModeEvent; -} - -interface MSStream { - type: string; - msClose(): void; - msDetachStream(): any; -} - -declare var MSStream: { - prototype: MSStream; - new(): MSStream; -} - -interface MSStreamReader extends EventTarget, MSBaseReader { - error: DOMError; - readAsArrayBuffer(stream: MSStream, size?: number): void; - readAsBinaryString(stream: MSStream, size?: number): void; - readAsBlob(stream: MSStream, size?: number): void; - readAsDataURL(stream: MSStream, size?: number): void; - readAsText(stream: MSStream, encoding?: string, size?: number): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var MSStreamReader: { - prototype: MSStreamReader; - new(): MSStreamReader; -} - -interface MSWebViewAsyncOperation extends EventTarget { - error: DOMError; - oncomplete: (ev: Event) => any; - onerror: (ev: Event) => any; - readyState: number; - result: any; - target: MSHTMLWebViewElement; - type: number; - start(): void; - COMPLETED: number; - ERROR: number; - STARTED: number; - TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number; - TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number; - TYPE_INVOKE_SCRIPT: number; - addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var MSWebViewAsyncOperation: { - prototype: MSWebViewAsyncOperation; - new(): MSWebViewAsyncOperation; - COMPLETED: number; - ERROR: number; - STARTED: number; - TYPE_CAPTURE_PREVIEW_TO_RANDOM_ACCESS_STREAM: number; - TYPE_CREATE_DATA_PACKAGE_FROM_SELECTION: number; - TYPE_INVOKE_SCRIPT: number; -} - -interface MSWebViewSettings { - isIndexedDBEnabled: boolean; - isJavaScriptEnabled: boolean; -} - -declare var MSWebViewSettings: { - prototype: MSWebViewSettings; - new(): MSWebViewSettings; -} - -interface MediaElementAudioSourceNode extends AudioNode { -} - -declare var MediaElementAudioSourceNode: { - prototype: MediaElementAudioSourceNode; - new(): MediaElementAudioSourceNode; -} - -interface MediaError { - code: number; - msExtendedCode: number; - MEDIA_ERR_ABORTED: number; - MEDIA_ERR_DECODE: number; - MEDIA_ERR_NETWORK: number; - MEDIA_ERR_SRC_NOT_SUPPORTED: number; - MS_MEDIA_ERR_ENCRYPTED: number; -} - -declare var MediaError: { - prototype: MediaError; - new(): MediaError; - MEDIA_ERR_ABORTED: number; - MEDIA_ERR_DECODE: number; - MEDIA_ERR_NETWORK: number; - MEDIA_ERR_SRC_NOT_SUPPORTED: number; - MS_MEDIA_ERR_ENCRYPTED: number; -} - -interface MediaList { - length: number; - mediaText: string; - appendMedium(newMedium: string): void; - deleteMedium(oldMedium: string): void; - item(index: number): string; - toString(): string; - [index: number]: string; -} - -declare var MediaList: { - prototype: MediaList; - new(): MediaList; -} - -interface MediaQueryList { - matches: boolean; - media: string; - addListener(listener: MediaQueryListListener): void; - removeListener(listener: MediaQueryListListener): void; -} - -declare var MediaQueryList: { - prototype: MediaQueryList; - new(): MediaQueryList; -} - -interface MediaSource extends EventTarget { - activeSourceBuffers: SourceBufferList; - duration: number; - readyState: string; - sourceBuffers: SourceBufferList; - addSourceBuffer(type: string): SourceBuffer; - endOfStream(error?: number): void; - removeSourceBuffer(sourceBuffer: SourceBuffer): void; -} - -declare var MediaSource: { - prototype: MediaSource; - new(): MediaSource; - isTypeSupported(type: string): boolean; -} - -interface MessageChannel { - port1: MessagePort; - port2: MessagePort; -} - -declare var MessageChannel: { - prototype: MessageChannel; - new(): MessageChannel; -} - -interface MessageEvent extends Event { - data: any; - origin: string; - ports: any; - source: Window; - initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, dataArg: any, originArg: string, lastEventIdArg: string, sourceArg: Window): void; -} - -declare var MessageEvent: { - prototype: MessageEvent; - new(type: string, eventInitDict?: MessageEventInit): MessageEvent; -} - -interface MessagePort extends EventTarget { - onmessage: (ev: MessageEvent) => any; - close(): void; - postMessage(message?: any, ports?: any): void; - start(): void; - addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var MessagePort: { - prototype: MessagePort; - new(): MessagePort; -} - -interface MimeType { - description: string; - enabledPlugin: Plugin; - suffixes: string; - type: string; -} - -declare var MimeType: { - prototype: MimeType; - new(): MimeType; -} - -interface MimeTypeArray { - length: number; - item(index: number): Plugin; - namedItem(type: string): Plugin; - [index: number]: Plugin; -} - -declare var MimeTypeArray: { - prototype: MimeTypeArray; - new(): MimeTypeArray; -} - -interface MouseEvent extends UIEvent { - altKey: boolean; - button: number; - buttons: number; - clientX: number; - clientY: number; - ctrlKey: boolean; - fromElement: Element; - layerX: number; - layerY: number; - metaKey: boolean; - movementX: number; - movementY: number; - offsetX: number; - offsetY: number; - pageX: number; - pageY: number; - relatedTarget: EventTarget; - screenX: number; - screenY: number; - shiftKey: boolean; - toElement: Element; - which: number; - x: number; - y: number; - getModifierState(keyArg: string): boolean; - initMouseEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget): void; -} - -declare var MouseEvent: { - prototype: MouseEvent; - new(typeArg: string, eventInitDict?: MouseEventInit): MouseEvent; -} - -interface MouseWheelEvent extends MouseEvent { - wheelDelta: number; - wheelDeltaX: number; - wheelDeltaY: number; - initMouseWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, wheelDeltaArg: number): void; -} - -declare var MouseWheelEvent: { - prototype: MouseWheelEvent; - new(): MouseWheelEvent; -} - -interface MutationEvent extends Event { - attrChange: number; - attrName: string; - newValue: string; - prevValue: string; - relatedNode: Node; - initMutationEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, relatedNodeArg: Node, prevValueArg: string, newValueArg: string, attrNameArg: string, attrChangeArg: number): void; - ADDITION: number; - MODIFICATION: number; - REMOVAL: number; -} - -declare var MutationEvent: { - prototype: MutationEvent; - new(): MutationEvent; - ADDITION: number; - MODIFICATION: number; - REMOVAL: number; -} - -interface MutationObserver { - disconnect(): void; - observe(target: Node, options: MutationObserverInit): void; - takeRecords(): MutationRecord[]; -} - -declare var MutationObserver: { - prototype: MutationObserver; - new(callback: MutationCallback): MutationObserver; -} - -interface MutationRecord { - addedNodes: NodeList; - attributeName: string; - attributeNamespace: string; - nextSibling: Node; - oldValue: string; - previousSibling: Node; - removedNodes: NodeList; - target: Node; - type: string; -} - -declare var MutationRecord: { - prototype: MutationRecord; - new(): MutationRecord; -} - -interface NamedNodeMap { - length: number; - getNamedItem(name: string): Attr; - getNamedItemNS(namespaceURI: string, localName: string): Attr; - item(index: number): Attr; - removeNamedItem(name: string): Attr; - removeNamedItemNS(namespaceURI: string, localName: string): Attr; - setNamedItem(arg: Attr): Attr; - setNamedItemNS(arg: Attr): Attr; - [index: number]: Attr; -} - -declare var NamedNodeMap: { - prototype: NamedNodeMap; - new(): NamedNodeMap; -} - -interface NavigationCompletedEvent extends NavigationEvent { - isSuccess: boolean; - webErrorStatus: number; -} - -declare var NavigationCompletedEvent: { - prototype: NavigationCompletedEvent; - new(): NavigationCompletedEvent; -} - -interface NavigationEvent extends Event { - uri: string; -} - -declare var NavigationEvent: { - prototype: NavigationEvent; - new(): NavigationEvent; -} - -interface NavigationEventWithReferrer extends NavigationEvent { - referer: string; -} - -declare var NavigationEventWithReferrer: { - prototype: NavigationEventWithReferrer; - new(): NavigationEventWithReferrer; -} - -interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorContentUtils, NavigatorStorageUtils, NavigatorGeolocation, MSNavigatorDoNotTrack, MSFileSaver { - appCodeName: string; - appMinorVersion: string; - browserLanguage: string; - connectionSpeed: number; - cookieEnabled: boolean; - cpuClass: string; - language: string; - maxTouchPoints: number; - mimeTypes: MSMimeTypesCollection; - msManipulationViewsEnabled: boolean; - msMaxTouchPoints: number; - msPointerEnabled: boolean; - plugins: MSPluginsCollection; - pointerEnabled: boolean; - systemLanguage: string; - userLanguage: string; - webdriver: boolean; - getGamepads(): Gamepad[]; - javaEnabled(): boolean; - msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void; - vibrate(pattern: number | number[]): boolean; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var Navigator: { - prototype: Navigator; - new(): Navigator; -} - -interface Node extends EventTarget { - attributes: NamedNodeMap; - baseURI: string; - childNodes: NodeList; - firstChild: Node; - lastChild: Node; - localName: string; - namespaceURI: string; - nextSibling: Node; - nodeName: string; - nodeType: number; - nodeValue: string; - ownerDocument: Document; - parentElement: HTMLElement; - parentNode: Node; - prefix: string; - previousSibling: Node; - textContent: string; - appendChild(newChild: Node): Node; - cloneNode(deep?: boolean): Node; - compareDocumentPosition(other: Node): number; - hasAttributes(): boolean; - hasChildNodes(): boolean; - insertBefore(newChild: Node, refChild?: Node): Node; - isDefaultNamespace(namespaceURI: string): boolean; - isEqualNode(arg: Node): boolean; - isSameNode(other: Node): boolean; - lookupNamespaceURI(prefix: string): string; - lookupPrefix(namespaceURI: string): string; - normalize(): void; - removeChild(oldChild: Node): Node; - replaceChild(newChild: Node, oldChild: Node): Node; - contains(node: Node): boolean; - ATTRIBUTE_NODE: number; - CDATA_SECTION_NODE: number; - COMMENT_NODE: number; - DOCUMENT_FRAGMENT_NODE: number; - DOCUMENT_NODE: number; - DOCUMENT_POSITION_CONTAINED_BY: number; - DOCUMENT_POSITION_CONTAINS: number; - DOCUMENT_POSITION_DISCONNECTED: number; - DOCUMENT_POSITION_FOLLOWING: number; - DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number; - DOCUMENT_POSITION_PRECEDING: number; - DOCUMENT_TYPE_NODE: number; - ELEMENT_NODE: number; - ENTITY_NODE: number; - ENTITY_REFERENCE_NODE: number; - NOTATION_NODE: number; - PROCESSING_INSTRUCTION_NODE: number; - TEXT_NODE: number; -} - -declare var Node: { - prototype: Node; - new(): Node; - ATTRIBUTE_NODE: number; - CDATA_SECTION_NODE: number; - COMMENT_NODE: number; - DOCUMENT_FRAGMENT_NODE: number; - DOCUMENT_NODE: number; - DOCUMENT_POSITION_CONTAINED_BY: number; - DOCUMENT_POSITION_CONTAINS: number; - DOCUMENT_POSITION_DISCONNECTED: number; - DOCUMENT_POSITION_FOLLOWING: number; - DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number; - DOCUMENT_POSITION_PRECEDING: number; - DOCUMENT_TYPE_NODE: number; - ELEMENT_NODE: number; - ENTITY_NODE: number; - ENTITY_REFERENCE_NODE: number; - NOTATION_NODE: number; - PROCESSING_INSTRUCTION_NODE: number; - TEXT_NODE: number; -} - -interface NodeFilter { - acceptNode(n: Node): number; -} - -declare var NodeFilter: { - FILTER_ACCEPT: number; - FILTER_REJECT: number; - FILTER_SKIP: number; - SHOW_ALL: number; - SHOW_ATTRIBUTE: number; - SHOW_CDATA_SECTION: number; - SHOW_COMMENT: number; - SHOW_DOCUMENT: number; - SHOW_DOCUMENT_FRAGMENT: number; - SHOW_DOCUMENT_TYPE: number; - SHOW_ELEMENT: number; - SHOW_ENTITY: number; - SHOW_ENTITY_REFERENCE: number; - SHOW_NOTATION: number; - SHOW_PROCESSING_INSTRUCTION: number; - SHOW_TEXT: number; -} - -interface NodeIterator { - expandEntityReferences: boolean; - filter: NodeFilter; - root: Node; - whatToShow: number; - detach(): void; - nextNode(): Node; - previousNode(): Node; -} - -declare var NodeIterator: { - prototype: NodeIterator; - new(): NodeIterator; -} - -interface NodeList { - length: number; - item(index: number): Node; - [index: number]: Node; -} - -declare var NodeList: { - prototype: NodeList; - new(): NodeList; -} - -interface OES_element_index_uint { -} - -declare var OES_element_index_uint: { - prototype: OES_element_index_uint; - new(): OES_element_index_uint; -} - -interface OES_standard_derivatives { - FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number; -} - -declare var OES_standard_derivatives: { - prototype: OES_standard_derivatives; - new(): OES_standard_derivatives; - FRAGMENT_SHADER_DERIVATIVE_HINT_OES: number; -} - -interface OES_texture_float { -} - -declare var OES_texture_float: { - prototype: OES_texture_float; - new(): OES_texture_float; -} - -interface OES_texture_float_linear { -} - -declare var OES_texture_float_linear: { - prototype: OES_texture_float_linear; - new(): OES_texture_float_linear; -} - -interface OfflineAudioCompletionEvent extends Event { - renderedBuffer: AudioBuffer; -} - -declare var OfflineAudioCompletionEvent: { - prototype: OfflineAudioCompletionEvent; - new(): OfflineAudioCompletionEvent; -} - -interface OfflineAudioContext extends AudioContext { - oncomplete: (ev: Event) => any; - startRendering(): void; - addEventListener(type: "complete", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var OfflineAudioContext: { - prototype: OfflineAudioContext; - new(numberOfChannels: number, length: number, sampleRate: number): OfflineAudioContext; -} - -interface OscillatorNode extends AudioNode { - detune: AudioParam; - frequency: AudioParam; - onended: (ev: Event) => any; - type: string; - setPeriodicWave(periodicWave: PeriodicWave): void; - start(when?: number): void; - stop(when?: number): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var OscillatorNode: { - prototype: OscillatorNode; - new(): OscillatorNode; -} - -interface PageTransitionEvent extends Event { - persisted: boolean; -} - -declare var PageTransitionEvent: { - prototype: PageTransitionEvent; - new(): PageTransitionEvent; -} - -interface PannerNode extends AudioNode { - coneInnerAngle: number; - coneOuterAngle: number; - coneOuterGain: number; - distanceModel: string; - maxDistance: number; - panningModel: string; - refDistance: number; - rolloffFactor: number; - setOrientation(x: number, y: number, z: number): void; - setPosition(x: number, y: number, z: number): void; - setVelocity(x: number, y: number, z: number): void; -} - -declare var PannerNode: { - prototype: PannerNode; - new(): PannerNode; -} - -interface PerfWidgetExternal { - activeNetworkRequestCount: number; - averageFrameTime: number; - averagePaintTime: number; - extraInformationEnabled: boolean; - independentRenderingEnabled: boolean; - irDisablingContentString: string; - irStatusAvailable: boolean; - maxCpuSpeed: number; - paintRequestsPerSecond: number; - performanceCounter: number; - performanceCounterFrequency: number; - addEventListener(eventType: string, callback: Function): void; - getMemoryUsage(): number; - getProcessCpuUsage(): number; - getRecentCpuUsage(last: number): any; - getRecentFrames(last: number): any; - getRecentMemoryUsage(last: number): any; - getRecentPaintRequests(last: number): any; - removeEventListener(eventType: string, callback: Function): void; - repositionWindow(x: number, y: number): void; - resizeWindow(width: number, height: number): void; -} - -declare var PerfWidgetExternal: { - prototype: PerfWidgetExternal; - new(): PerfWidgetExternal; -} - -interface Performance { - navigation: PerformanceNavigation; - timing: PerformanceTiming; - clearMarks(markName?: string): void; - clearMeasures(measureName?: string): void; - clearResourceTimings(): void; - getEntries(): any; - getEntriesByName(name: string, entryType?: string): any; - getEntriesByType(entryType: string): any; - getMarks(markName?: string): any; - getMeasures(measureName?: string): any; - mark(markName: string): void; - measure(measureName: string, startMarkName?: string, endMarkName?: string): void; - now(): number; - setResourceTimingBufferSize(maxSize: number): void; - toJSON(): any; -} - -declare var Performance: { - prototype: Performance; - new(): Performance; -} - -interface PerformanceEntry { - duration: number; - entryType: string; - name: string; - startTime: number; -} - -declare var PerformanceEntry: { - prototype: PerformanceEntry; - new(): PerformanceEntry; -} - -interface PerformanceMark extends PerformanceEntry { -} - -declare var PerformanceMark: { - prototype: PerformanceMark; - new(): PerformanceMark; -} - -interface PerformanceMeasure extends PerformanceEntry { -} - -declare var PerformanceMeasure: { - prototype: PerformanceMeasure; - new(): PerformanceMeasure; -} - -interface PerformanceNavigation { - redirectCount: number; - type: number; - toJSON(): any; - TYPE_BACK_FORWARD: number; - TYPE_NAVIGATE: number; - TYPE_RELOAD: number; - TYPE_RESERVED: number; -} - -declare var PerformanceNavigation: { - prototype: PerformanceNavigation; - new(): PerformanceNavigation; - TYPE_BACK_FORWARD: number; - TYPE_NAVIGATE: number; - TYPE_RELOAD: number; - TYPE_RESERVED: number; -} - -interface PerformanceNavigationTiming extends PerformanceEntry { - connectEnd: number; - connectStart: number; - domComplete: number; - domContentLoadedEventEnd: number; - domContentLoadedEventStart: number; - domInteractive: number; - domLoading: number; - domainLookupEnd: number; - domainLookupStart: number; - fetchStart: number; - loadEventEnd: number; - loadEventStart: number; - navigationStart: number; - redirectCount: number; - redirectEnd: number; - redirectStart: number; - requestStart: number; - responseEnd: number; - responseStart: number; - type: string; - unloadEventEnd: number; - unloadEventStart: number; -} - -declare var PerformanceNavigationTiming: { - prototype: PerformanceNavigationTiming; - new(): PerformanceNavigationTiming; -} - -interface PerformanceResourceTiming extends PerformanceEntry { - connectEnd: number; - connectStart: number; - domainLookupEnd: number; - domainLookupStart: number; - fetchStart: number; - initiatorType: string; - redirectEnd: number; - redirectStart: number; - requestStart: number; - responseEnd: number; - responseStart: number; -} - -declare var PerformanceResourceTiming: { - prototype: PerformanceResourceTiming; - new(): PerformanceResourceTiming; -} - -interface PerformanceTiming { - connectEnd: number; - connectStart: number; - domComplete: number; - domContentLoadedEventEnd: number; - domContentLoadedEventStart: number; - domInteractive: number; - domLoading: number; - domainLookupEnd: number; - domainLookupStart: number; - fetchStart: number; - loadEventEnd: number; - loadEventStart: number; - msFirstPaint: number; - navigationStart: number; - redirectEnd: number; - redirectStart: number; - requestStart: number; - responseEnd: number; - responseStart: number; - unloadEventEnd: number; - unloadEventStart: number; - toJSON(): any; -} - -declare var PerformanceTiming: { - prototype: PerformanceTiming; - new(): PerformanceTiming; -} - -interface PeriodicWave { -} - -declare var PeriodicWave: { - prototype: PeriodicWave; - new(): PeriodicWave; -} - -interface PermissionRequest extends DeferredPermissionRequest { - state: string; - defer(): void; -} - -declare var PermissionRequest: { - prototype: PermissionRequest; - new(): PermissionRequest; -} - -interface PermissionRequestedEvent extends Event { - permissionRequest: PermissionRequest; -} - -declare var PermissionRequestedEvent: { - prototype: PermissionRequestedEvent; - new(): PermissionRequestedEvent; -} - -interface Plugin { - description: string; - filename: string; - length: number; - name: string; - version: string; - item(index: number): MimeType; - namedItem(type: string): MimeType; - [index: number]: MimeType; -} - -declare var Plugin: { - prototype: Plugin; - new(): Plugin; -} - -interface PluginArray { - length: number; - item(index: number): Plugin; - namedItem(name: string): Plugin; - refresh(reload?: boolean): void; - [index: number]: Plugin; -} - -declare var PluginArray: { - prototype: PluginArray; - new(): PluginArray; -} - -interface PointerEvent extends MouseEvent { - currentPoint: any; - height: number; - hwTimestamp: number; - intermediatePoints: any; - isPrimary: boolean; - pointerId: number; - pointerType: any; - pressure: number; - rotation: number; - tiltX: number; - tiltY: number; - width: number; - getCurrentPoint(element: Element): void; - getIntermediatePoints(element: Element): void; - initPointerEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, ctrlKeyArg: boolean, altKeyArg: boolean, shiftKeyArg: boolean, metaKeyArg: boolean, buttonArg: number, relatedTargetArg: EventTarget, offsetXArg: number, offsetYArg: number, widthArg: number, heightArg: number, pressure: number, rotation: number, tiltX: number, tiltY: number, pointerIdArg: number, pointerType: any, hwTimestampArg: number, isPrimary: boolean): void; -} - -declare var PointerEvent: { - prototype: PointerEvent; - new(typeArg: string, eventInitDict?: PointerEventInit): PointerEvent; -} - -interface PopStateEvent extends Event { - state: any; - initPopStateEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, stateArg: any): void; -} - -declare var PopStateEvent: { - prototype: PopStateEvent; - new(): PopStateEvent; -} - -interface Position { - coords: Coordinates; - timestamp: number; -} - -declare var Position: { - prototype: Position; - new(): Position; -} - -interface PositionError { - code: number; - message: string; - toString(): string; - PERMISSION_DENIED: number; - POSITION_UNAVAILABLE: number; - TIMEOUT: number; -} - -declare var PositionError: { - prototype: PositionError; - new(): PositionError; - PERMISSION_DENIED: number; - POSITION_UNAVAILABLE: number; - TIMEOUT: number; -} - -interface ProcessingInstruction extends CharacterData { - target: string; -} - -declare var ProcessingInstruction: { - prototype: ProcessingInstruction; - new(): ProcessingInstruction; -} - -interface ProgressEvent extends Event { - lengthComputable: boolean; - loaded: number; - total: number; - initProgressEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, lengthComputableArg: boolean, loadedArg: number, totalArg: number): void; -} - -declare var ProgressEvent: { - prototype: ProgressEvent; - new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent; -} - -interface Range { - collapsed: boolean; - commonAncestorContainer: Node; - endContainer: Node; - endOffset: number; - startContainer: Node; - startOffset: number; - cloneContents(): DocumentFragment; - cloneRange(): Range; - collapse(toStart: boolean): void; - compareBoundaryPoints(how: number, sourceRange: Range): number; - createContextualFragment(fragment: string): DocumentFragment; - deleteContents(): void; - detach(): void; - expand(Unit: string): boolean; - extractContents(): DocumentFragment; - getBoundingClientRect(): ClientRect; - getClientRects(): ClientRectList; - insertNode(newNode: Node): void; - selectNode(refNode: Node): void; - selectNodeContents(refNode: Node): void; - setEnd(refNode: Node, offset: number): void; - setEndAfter(refNode: Node): void; - setEndBefore(refNode: Node): void; - setStart(refNode: Node, offset: number): void; - setStartAfter(refNode: Node): void; - setStartBefore(refNode: Node): void; - surroundContents(newParent: Node): void; - toString(): string; - END_TO_END: number; - END_TO_START: number; - START_TO_END: number; - START_TO_START: number; -} - -declare var Range: { - prototype: Range; - new(): Range; - END_TO_END: number; - END_TO_START: number; - START_TO_END: number; - START_TO_START: number; -} - -interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference { - target: SVGAnimatedString; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGAElement: { - prototype: SVGAElement; - new(): SVGAElement; -} - -interface SVGAngle { - unitType: number; - value: number; - valueAsString: string; - valueInSpecifiedUnits: number; - convertToSpecifiedUnits(unitType: number): void; - newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void; - SVG_ANGLETYPE_DEG: number; - SVG_ANGLETYPE_GRAD: number; - SVG_ANGLETYPE_RAD: number; - SVG_ANGLETYPE_UNKNOWN: number; - SVG_ANGLETYPE_UNSPECIFIED: number; -} - -declare var SVGAngle: { - prototype: SVGAngle; - new(): SVGAngle; - SVG_ANGLETYPE_DEG: number; - SVG_ANGLETYPE_GRAD: number; - SVG_ANGLETYPE_RAD: number; - SVG_ANGLETYPE_UNKNOWN: number; - SVG_ANGLETYPE_UNSPECIFIED: number; -} - -interface SVGAnimatedAngle { - animVal: SVGAngle; - baseVal: SVGAngle; -} - -declare var SVGAnimatedAngle: { - prototype: SVGAnimatedAngle; - new(): SVGAnimatedAngle; -} - -interface SVGAnimatedBoolean { - animVal: boolean; - baseVal: boolean; -} - -declare var SVGAnimatedBoolean: { - prototype: SVGAnimatedBoolean; - new(): SVGAnimatedBoolean; -} - -interface SVGAnimatedEnumeration { - animVal: number; - baseVal: number; -} - -declare var SVGAnimatedEnumeration: { - prototype: SVGAnimatedEnumeration; - new(): SVGAnimatedEnumeration; -} - -interface SVGAnimatedInteger { - animVal: number; - baseVal: number; -} - -declare var SVGAnimatedInteger: { - prototype: SVGAnimatedInteger; - new(): SVGAnimatedInteger; -} - -interface SVGAnimatedLength { - animVal: SVGLength; - baseVal: SVGLength; -} - -declare var SVGAnimatedLength: { - prototype: SVGAnimatedLength; - new(): SVGAnimatedLength; -} - -interface SVGAnimatedLengthList { - animVal: SVGLengthList; - baseVal: SVGLengthList; -} - -declare var SVGAnimatedLengthList: { - prototype: SVGAnimatedLengthList; - new(): SVGAnimatedLengthList; -} - -interface SVGAnimatedNumber { - animVal: number; - baseVal: number; -} - -declare var SVGAnimatedNumber: { - prototype: SVGAnimatedNumber; - new(): SVGAnimatedNumber; -} - -interface SVGAnimatedNumberList { - animVal: SVGNumberList; - baseVal: SVGNumberList; -} - -declare var SVGAnimatedNumberList: { - prototype: SVGAnimatedNumberList; - new(): SVGAnimatedNumberList; -} - -interface SVGAnimatedPreserveAspectRatio { - animVal: SVGPreserveAspectRatio; - baseVal: SVGPreserveAspectRatio; -} - -declare var SVGAnimatedPreserveAspectRatio: { - prototype: SVGAnimatedPreserveAspectRatio; - new(): SVGAnimatedPreserveAspectRatio; -} - -interface SVGAnimatedRect { - animVal: SVGRect; - baseVal: SVGRect; -} - -declare var SVGAnimatedRect: { - prototype: SVGAnimatedRect; - new(): SVGAnimatedRect; -} - -interface SVGAnimatedString { - animVal: string; - baseVal: string; -} - -declare var SVGAnimatedString: { - prototype: SVGAnimatedString; - new(): SVGAnimatedString; -} - -interface SVGAnimatedTransformList { - animVal: SVGTransformList; - baseVal: SVGTransformList; -} - -declare var SVGAnimatedTransformList: { - prototype: SVGAnimatedTransformList; - new(): SVGAnimatedTransformList; -} - -interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - cx: SVGAnimatedLength; - cy: SVGAnimatedLength; - r: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGCircleElement: { - prototype: SVGCircleElement; - new(): SVGCircleElement; -} - -interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes { - clipPathUnits: SVGAnimatedEnumeration; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGClipPathElement: { - prototype: SVGClipPathElement; - new(): SVGClipPathElement; -} - -interface SVGComponentTransferFunctionElement extends SVGElement { - amplitude: SVGAnimatedNumber; - exponent: SVGAnimatedNumber; - intercept: SVGAnimatedNumber; - offset: SVGAnimatedNumber; - slope: SVGAnimatedNumber; - tableValues: SVGAnimatedNumberList; - type: SVGAnimatedEnumeration; - SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number; - SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number; - SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number; - SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number; - SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number; - SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number; -} - -declare var SVGComponentTransferFunctionElement: { - prototype: SVGComponentTransferFunctionElement; - new(): SVGComponentTransferFunctionElement; - SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number; - SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number; - SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number; - SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number; - SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number; - SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number; -} - -interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGDefsElement: { - prototype: SVGDefsElement; - new(): SVGDefsElement; -} - -interface SVGDescElement extends SVGElement, SVGStylable, SVGLangSpace { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGDescElement: { - prototype: SVGDescElement; - new(): SVGDescElement; -} - -interface SVGElement extends Element { - id: string; - onclick: (ev: MouseEvent) => any; - ondblclick: (ev: MouseEvent) => any; - onfocusin: (ev: FocusEvent) => any; - onfocusout: (ev: FocusEvent) => any; - onload: (ev: Event) => any; - onmousedown: (ev: MouseEvent) => any; - onmousemove: (ev: MouseEvent) => any; - onmouseout: (ev: MouseEvent) => any; - onmouseover: (ev: MouseEvent) => any; - onmouseup: (ev: MouseEvent) => any; - ownerSVGElement: SVGSVGElement; - viewportElement: SVGElement; - xmlbase: string; - className: any; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focusin", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focusout", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGElement: { - prototype: SVGElement; - new(): SVGElement; -} - -interface SVGElementInstance extends EventTarget { - childNodes: SVGElementInstanceList; - correspondingElement: SVGElement; - correspondingUseElement: SVGUseElement; - firstChild: SVGElementInstance; - lastChild: SVGElementInstance; - nextSibling: SVGElementInstance; - parentNode: SVGElementInstance; - previousSibling: SVGElementInstance; -} - -declare var SVGElementInstance: { - prototype: SVGElementInstance; - new(): SVGElementInstance; -} - -interface SVGElementInstanceList { - length: number; - item(index: number): SVGElementInstance; -} - -declare var SVGElementInstanceList: { - prototype: SVGElementInstanceList; - new(): SVGElementInstanceList; -} - -interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - cx: SVGAnimatedLength; - cy: SVGAnimatedLength; - rx: SVGAnimatedLength; - ry: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGEllipseElement: { - prototype: SVGEllipseElement; - new(): SVGEllipseElement; -} - -interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - in2: SVGAnimatedString; - mode: SVGAnimatedEnumeration; - SVG_FEBLEND_MODE_COLOR: number; - SVG_FEBLEND_MODE_COLOR_BURN: number; - SVG_FEBLEND_MODE_COLOR_DODGE: number; - SVG_FEBLEND_MODE_DARKEN: number; - SVG_FEBLEND_MODE_DIFFERENCE: number; - SVG_FEBLEND_MODE_EXCLUSION: number; - SVG_FEBLEND_MODE_HARD_LIGHT: number; - SVG_FEBLEND_MODE_HUE: number; - SVG_FEBLEND_MODE_LIGHTEN: number; - SVG_FEBLEND_MODE_LUMINOSITY: number; - SVG_FEBLEND_MODE_MULTIPLY: number; - SVG_FEBLEND_MODE_NORMAL: number; - SVG_FEBLEND_MODE_OVERLAY: number; - SVG_FEBLEND_MODE_SATURATION: number; - SVG_FEBLEND_MODE_SCREEN: number; - SVG_FEBLEND_MODE_SOFT_LIGHT: number; - SVG_FEBLEND_MODE_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEBlendElement: { - prototype: SVGFEBlendElement; - new(): SVGFEBlendElement; - SVG_FEBLEND_MODE_COLOR: number; - SVG_FEBLEND_MODE_COLOR_BURN: number; - SVG_FEBLEND_MODE_COLOR_DODGE: number; - SVG_FEBLEND_MODE_DARKEN: number; - SVG_FEBLEND_MODE_DIFFERENCE: number; - SVG_FEBLEND_MODE_EXCLUSION: number; - SVG_FEBLEND_MODE_HARD_LIGHT: number; - SVG_FEBLEND_MODE_HUE: number; - SVG_FEBLEND_MODE_LIGHTEN: number; - SVG_FEBLEND_MODE_LUMINOSITY: number; - SVG_FEBLEND_MODE_MULTIPLY: number; - SVG_FEBLEND_MODE_NORMAL: number; - SVG_FEBLEND_MODE_OVERLAY: number; - SVG_FEBLEND_MODE_SATURATION: number; - SVG_FEBLEND_MODE_SCREEN: number; - SVG_FEBLEND_MODE_SOFT_LIGHT: number; - SVG_FEBLEND_MODE_UNKNOWN: number; -} - -interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - type: SVGAnimatedEnumeration; - values: SVGAnimatedNumberList; - SVG_FECOLORMATRIX_TYPE_HUEROTATE: number; - SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number; - SVG_FECOLORMATRIX_TYPE_MATRIX: number; - SVG_FECOLORMATRIX_TYPE_SATURATE: number; - SVG_FECOLORMATRIX_TYPE_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEColorMatrixElement: { - prototype: SVGFEColorMatrixElement; - new(): SVGFEColorMatrixElement; - SVG_FECOLORMATRIX_TYPE_HUEROTATE: number; - SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number; - SVG_FECOLORMATRIX_TYPE_MATRIX: number; - SVG_FECOLORMATRIX_TYPE_SATURATE: number; - SVG_FECOLORMATRIX_TYPE_UNKNOWN: number; -} - -interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEComponentTransferElement: { - prototype: SVGFEComponentTransferElement; - new(): SVGFEComponentTransferElement; -} - -interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - in2: SVGAnimatedString; - k1: SVGAnimatedNumber; - k2: SVGAnimatedNumber; - k3: SVGAnimatedNumber; - k4: SVGAnimatedNumber; - operator: SVGAnimatedEnumeration; - SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number; - SVG_FECOMPOSITE_OPERATOR_ATOP: number; - SVG_FECOMPOSITE_OPERATOR_IN: number; - SVG_FECOMPOSITE_OPERATOR_OUT: number; - SVG_FECOMPOSITE_OPERATOR_OVER: number; - SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number; - SVG_FECOMPOSITE_OPERATOR_XOR: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFECompositeElement: { - prototype: SVGFECompositeElement; - new(): SVGFECompositeElement; - SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number; - SVG_FECOMPOSITE_OPERATOR_ATOP: number; - SVG_FECOMPOSITE_OPERATOR_IN: number; - SVG_FECOMPOSITE_OPERATOR_OUT: number; - SVG_FECOMPOSITE_OPERATOR_OVER: number; - SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number; - SVG_FECOMPOSITE_OPERATOR_XOR: number; -} - -interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - bias: SVGAnimatedNumber; - divisor: SVGAnimatedNumber; - edgeMode: SVGAnimatedEnumeration; - in1: SVGAnimatedString; - kernelMatrix: SVGAnimatedNumberList; - kernelUnitLengthX: SVGAnimatedNumber; - kernelUnitLengthY: SVGAnimatedNumber; - orderX: SVGAnimatedInteger; - orderY: SVGAnimatedInteger; - preserveAlpha: SVGAnimatedBoolean; - targetX: SVGAnimatedInteger; - targetY: SVGAnimatedInteger; - SVG_EDGEMODE_DUPLICATE: number; - SVG_EDGEMODE_NONE: number; - SVG_EDGEMODE_UNKNOWN: number; - SVG_EDGEMODE_WRAP: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEConvolveMatrixElement: { - prototype: SVGFEConvolveMatrixElement; - new(): SVGFEConvolveMatrixElement; - SVG_EDGEMODE_DUPLICATE: number; - SVG_EDGEMODE_NONE: number; - SVG_EDGEMODE_UNKNOWN: number; - SVG_EDGEMODE_WRAP: number; -} - -interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - diffuseConstant: SVGAnimatedNumber; - in1: SVGAnimatedString; - kernelUnitLengthX: SVGAnimatedNumber; - kernelUnitLengthY: SVGAnimatedNumber; - surfaceScale: SVGAnimatedNumber; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEDiffuseLightingElement: { - prototype: SVGFEDiffuseLightingElement; - new(): SVGFEDiffuseLightingElement; -} - -interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - in2: SVGAnimatedString; - scale: SVGAnimatedNumber; - xChannelSelector: SVGAnimatedEnumeration; - yChannelSelector: SVGAnimatedEnumeration; - SVG_CHANNEL_A: number; - SVG_CHANNEL_B: number; - SVG_CHANNEL_G: number; - SVG_CHANNEL_R: number; - SVG_CHANNEL_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEDisplacementMapElement: { - prototype: SVGFEDisplacementMapElement; - new(): SVGFEDisplacementMapElement; - SVG_CHANNEL_A: number; - SVG_CHANNEL_B: number; - SVG_CHANNEL_G: number; - SVG_CHANNEL_R: number; - SVG_CHANNEL_UNKNOWN: number; -} - -interface SVGFEDistantLightElement extends SVGElement { - azimuth: SVGAnimatedNumber; - elevation: SVGAnimatedNumber; -} - -declare var SVGFEDistantLightElement: { - prototype: SVGFEDistantLightElement; - new(): SVGFEDistantLightElement; -} - -interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEFloodElement: { - prototype: SVGFEFloodElement; - new(): SVGFEFloodElement; -} - -interface SVGFEFuncAElement extends SVGComponentTransferFunctionElement { -} - -declare var SVGFEFuncAElement: { - prototype: SVGFEFuncAElement; - new(): SVGFEFuncAElement; -} - -interface SVGFEFuncBElement extends SVGComponentTransferFunctionElement { -} - -declare var SVGFEFuncBElement: { - prototype: SVGFEFuncBElement; - new(): SVGFEFuncBElement; -} - -interface SVGFEFuncGElement extends SVGComponentTransferFunctionElement { -} - -declare var SVGFEFuncGElement: { - prototype: SVGFEFuncGElement; - new(): SVGFEFuncGElement; -} - -interface SVGFEFuncRElement extends SVGComponentTransferFunctionElement { -} - -declare var SVGFEFuncRElement: { - prototype: SVGFEFuncRElement; - new(): SVGFEFuncRElement; -} - -interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - stdDeviationX: SVGAnimatedNumber; - stdDeviationY: SVGAnimatedNumber; - setStdDeviation(stdDeviationX: number, stdDeviationY: number): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEGaussianBlurElement: { - prototype: SVGFEGaussianBlurElement; - new(): SVGFEGaussianBlurElement; -} - -interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired { - preserveAspectRatio: SVGAnimatedPreserveAspectRatio; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEImageElement: { - prototype: SVGFEImageElement; - new(): SVGFEImageElement; -} - -interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEMergeElement: { - prototype: SVGFEMergeElement; - new(): SVGFEMergeElement; -} - -interface SVGFEMergeNodeElement extends SVGElement { - in1: SVGAnimatedString; -} - -declare var SVGFEMergeNodeElement: { - prototype: SVGFEMergeNodeElement; - new(): SVGFEMergeNodeElement; -} - -interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - operator: SVGAnimatedEnumeration; - radiusX: SVGAnimatedNumber; - radiusY: SVGAnimatedNumber; - SVG_MORPHOLOGY_OPERATOR_DILATE: number; - SVG_MORPHOLOGY_OPERATOR_ERODE: number; - SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEMorphologyElement: { - prototype: SVGFEMorphologyElement; - new(): SVGFEMorphologyElement; - SVG_MORPHOLOGY_OPERATOR_DILATE: number; - SVG_MORPHOLOGY_OPERATOR_ERODE: number; - SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number; -} - -interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - dx: SVGAnimatedNumber; - dy: SVGAnimatedNumber; - in1: SVGAnimatedString; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFEOffsetElement: { - prototype: SVGFEOffsetElement; - new(): SVGFEOffsetElement; -} - -interface SVGFEPointLightElement extends SVGElement { - x: SVGAnimatedNumber; - y: SVGAnimatedNumber; - z: SVGAnimatedNumber; -} - -declare var SVGFEPointLightElement: { - prototype: SVGFEPointLightElement; - new(): SVGFEPointLightElement; -} - -interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - kernelUnitLengthX: SVGAnimatedNumber; - kernelUnitLengthY: SVGAnimatedNumber; - specularConstant: SVGAnimatedNumber; - specularExponent: SVGAnimatedNumber; - surfaceScale: SVGAnimatedNumber; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFESpecularLightingElement: { - prototype: SVGFESpecularLightingElement; - new(): SVGFESpecularLightingElement; -} - -interface SVGFESpotLightElement extends SVGElement { - limitingConeAngle: SVGAnimatedNumber; - pointsAtX: SVGAnimatedNumber; - pointsAtY: SVGAnimatedNumber; - pointsAtZ: SVGAnimatedNumber; - specularExponent: SVGAnimatedNumber; - x: SVGAnimatedNumber; - y: SVGAnimatedNumber; - z: SVGAnimatedNumber; -} - -declare var SVGFESpotLightElement: { - prototype: SVGFESpotLightElement; - new(): SVGFESpotLightElement; -} - -interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - in1: SVGAnimatedString; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFETileElement: { - prototype: SVGFETileElement; - new(): SVGFETileElement; -} - -interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardAttributes { - baseFrequencyX: SVGAnimatedNumber; - baseFrequencyY: SVGAnimatedNumber; - numOctaves: SVGAnimatedInteger; - seed: SVGAnimatedNumber; - stitchTiles: SVGAnimatedEnumeration; - type: SVGAnimatedEnumeration; - SVG_STITCHTYPE_NOSTITCH: number; - SVG_STITCHTYPE_STITCH: number; - SVG_STITCHTYPE_UNKNOWN: number; - SVG_TURBULENCE_TYPE_FRACTALNOISE: number; - SVG_TURBULENCE_TYPE_TURBULENCE: number; - SVG_TURBULENCE_TYPE_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFETurbulenceElement: { - prototype: SVGFETurbulenceElement; - new(): SVGFETurbulenceElement; - SVG_STITCHTYPE_NOSTITCH: number; - SVG_STITCHTYPE_STITCH: number; - SVG_STITCHTYPE_UNKNOWN: number; - SVG_TURBULENCE_TYPE_FRACTALNOISE: number; - SVG_TURBULENCE_TYPE_TURBULENCE: number; - SVG_TURBULENCE_TYPE_UNKNOWN: number; -} - -interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired { - filterResX: SVGAnimatedInteger; - filterResY: SVGAnimatedInteger; - filterUnits: SVGAnimatedEnumeration; - height: SVGAnimatedLength; - primitiveUnits: SVGAnimatedEnumeration; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - setFilterRes(filterResX: number, filterResY: number): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGFilterElement: { - prototype: SVGFilterElement; - new(): SVGFilterElement; -} - -interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - height: SVGAnimatedLength; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGForeignObjectElement: { - prototype: SVGForeignObjectElement; - new(): SVGForeignObjectElement; -} - -interface SVGGElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGGElement: { - prototype: SVGGElement; - new(): SVGGElement; -} - -interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourcesRequired, SVGURIReference, SVGUnitTypes { - gradientTransform: SVGAnimatedTransformList; - gradientUnits: SVGAnimatedEnumeration; - spreadMethod: SVGAnimatedEnumeration; - SVG_SPREADMETHOD_PAD: number; - SVG_SPREADMETHOD_REFLECT: number; - SVG_SPREADMETHOD_REPEAT: number; - SVG_SPREADMETHOD_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGGradientElement: { - prototype: SVGGradientElement; - new(): SVGGradientElement; - SVG_SPREADMETHOD_PAD: number; - SVG_SPREADMETHOD_REFLECT: number; - SVG_SPREADMETHOD_REPEAT: number; - SVG_SPREADMETHOD_UNKNOWN: number; -} - -interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference { - height: SVGAnimatedLength; - preserveAspectRatio: SVGAnimatedPreserveAspectRatio; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGImageElement: { - prototype: SVGImageElement; - new(): SVGImageElement; -} - -interface SVGLength { - unitType: number; - value: number; - valueAsString: string; - valueInSpecifiedUnits: number; - convertToSpecifiedUnits(unitType: number): void; - newValueSpecifiedUnits(unitType: number, valueInSpecifiedUnits: number): void; - SVG_LENGTHTYPE_CM: number; - SVG_LENGTHTYPE_EMS: number; - SVG_LENGTHTYPE_EXS: number; - SVG_LENGTHTYPE_IN: number; - SVG_LENGTHTYPE_MM: number; - SVG_LENGTHTYPE_NUMBER: number; - SVG_LENGTHTYPE_PC: number; - SVG_LENGTHTYPE_PERCENTAGE: number; - SVG_LENGTHTYPE_PT: number; - SVG_LENGTHTYPE_PX: number; - SVG_LENGTHTYPE_UNKNOWN: number; -} - -declare var SVGLength: { - prototype: SVGLength; - new(): SVGLength; - SVG_LENGTHTYPE_CM: number; - SVG_LENGTHTYPE_EMS: number; - SVG_LENGTHTYPE_EXS: number; - SVG_LENGTHTYPE_IN: number; - SVG_LENGTHTYPE_MM: number; - SVG_LENGTHTYPE_NUMBER: number; - SVG_LENGTHTYPE_PC: number; - SVG_LENGTHTYPE_PERCENTAGE: number; - SVG_LENGTHTYPE_PT: number; - SVG_LENGTHTYPE_PX: number; - SVG_LENGTHTYPE_UNKNOWN: number; -} - -interface SVGLengthList { - numberOfItems: number; - appendItem(newItem: SVGLength): SVGLength; - clear(): void; - getItem(index: number): SVGLength; - initialize(newItem: SVGLength): SVGLength; - insertItemBefore(newItem: SVGLength, index: number): SVGLength; - removeItem(index: number): SVGLength; - replaceItem(newItem: SVGLength, index: number): SVGLength; -} - -declare var SVGLengthList: { - prototype: SVGLengthList; - new(): SVGLengthList; -} - -interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - x1: SVGAnimatedLength; - x2: SVGAnimatedLength; - y1: SVGAnimatedLength; - y2: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGLineElement: { - prototype: SVGLineElement; - new(): SVGLineElement; -} - -interface SVGLinearGradientElement extends SVGGradientElement { - x1: SVGAnimatedLength; - x2: SVGAnimatedLength; - y1: SVGAnimatedLength; - y2: SVGAnimatedLength; -} - -declare var SVGLinearGradientElement: { - prototype: SVGLinearGradientElement; - new(): SVGLinearGradientElement; -} - -interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox { - markerHeight: SVGAnimatedLength; - markerUnits: SVGAnimatedEnumeration; - markerWidth: SVGAnimatedLength; - orientAngle: SVGAnimatedAngle; - orientType: SVGAnimatedEnumeration; - refX: SVGAnimatedLength; - refY: SVGAnimatedLength; - setOrientToAngle(angle: SVGAngle): void; - setOrientToAuto(): void; - SVG_MARKERUNITS_STROKEWIDTH: number; - SVG_MARKERUNITS_UNKNOWN: number; - SVG_MARKERUNITS_USERSPACEONUSE: number; - SVG_MARKER_ORIENT_ANGLE: number; - SVG_MARKER_ORIENT_AUTO: number; - SVG_MARKER_ORIENT_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGMarkerElement: { - prototype: SVGMarkerElement; - new(): SVGMarkerElement; - SVG_MARKERUNITS_STROKEWIDTH: number; - SVG_MARKERUNITS_UNKNOWN: number; - SVG_MARKERUNITS_USERSPACEONUSE: number; - SVG_MARKER_ORIENT_ANGLE: number; - SVG_MARKER_ORIENT_AUTO: number; - SVG_MARKER_ORIENT_UNKNOWN: number; -} - -interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes { - height: SVGAnimatedLength; - maskContentUnits: SVGAnimatedEnumeration; - maskUnits: SVGAnimatedEnumeration; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGMaskElement: { - prototype: SVGMaskElement; - new(): SVGMaskElement; -} - -interface SVGMatrix { - a: number; - b: number; - c: number; - d: number; - e: number; - f: number; - flipX(): SVGMatrix; - flipY(): SVGMatrix; - inverse(): SVGMatrix; - multiply(secondMatrix: SVGMatrix): SVGMatrix; - rotate(angle: number): SVGMatrix; - rotateFromVector(x: number, y: number): SVGMatrix; - scale(scaleFactor: number): SVGMatrix; - scaleNonUniform(scaleFactorX: number, scaleFactorY: number): SVGMatrix; - skewX(angle: number): SVGMatrix; - skewY(angle: number): SVGMatrix; - translate(x: number, y: number): SVGMatrix; -} - -declare var SVGMatrix: { - prototype: SVGMatrix; - new(): SVGMatrix; -} - -interface SVGMetadataElement extends SVGElement { -} - -declare var SVGMetadataElement: { - prototype: SVGMetadataElement; - new(): SVGMetadataElement; -} - -interface SVGNumber { - value: number; -} - -declare var SVGNumber: { - prototype: SVGNumber; - new(): SVGNumber; -} - -interface SVGNumberList { - numberOfItems: number; - appendItem(newItem: SVGNumber): SVGNumber; - clear(): void; - getItem(index: number): SVGNumber; - initialize(newItem: SVGNumber): SVGNumber; - insertItemBefore(newItem: SVGNumber, index: number): SVGNumber; - removeItem(index: number): SVGNumber; - replaceItem(newItem: SVGNumber, index: number): SVGNumber; -} - -declare var SVGNumberList: { - prototype: SVGNumberList; - new(): SVGNumberList; -} - -interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPathData { - createSVGPathSegArcAbs(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcAbs; - createSVGPathSegArcRel(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcRel; - createSVGPathSegClosePath(): SVGPathSegClosePath; - createSVGPathSegCurvetoCubicAbs(x: number, y: number, x1: number, y1: number, x2: number, y2: number): SVGPathSegCurvetoCubicAbs; - createSVGPathSegCurvetoCubicRel(x: number, y: number, x1: number, y1: number, x2: number, y2: number): SVGPathSegCurvetoCubicRel; - createSVGPathSegCurvetoCubicSmoothAbs(x: number, y: number, x2: number, y2: number): SVGPathSegCurvetoCubicSmoothAbs; - createSVGPathSegCurvetoCubicSmoothRel(x: number, y: number, x2: number, y2: number): SVGPathSegCurvetoCubicSmoothRel; - createSVGPathSegCurvetoQuadraticAbs(x: number, y: number, x1: number, y1: number): SVGPathSegCurvetoQuadraticAbs; - createSVGPathSegCurvetoQuadraticRel(x: number, y: number, x1: number, y1: number): SVGPathSegCurvetoQuadraticRel; - createSVGPathSegCurvetoQuadraticSmoothAbs(x: number, y: number): SVGPathSegCurvetoQuadraticSmoothAbs; - createSVGPathSegCurvetoQuadraticSmoothRel(x: number, y: number): SVGPathSegCurvetoQuadraticSmoothRel; - createSVGPathSegLinetoAbs(x: number, y: number): SVGPathSegLinetoAbs; - createSVGPathSegLinetoHorizontalAbs(x: number): SVGPathSegLinetoHorizontalAbs; - createSVGPathSegLinetoHorizontalRel(x: number): SVGPathSegLinetoHorizontalRel; - createSVGPathSegLinetoRel(x: number, y: number): SVGPathSegLinetoRel; - createSVGPathSegLinetoVerticalAbs(y: number): SVGPathSegLinetoVerticalAbs; - createSVGPathSegLinetoVerticalRel(y: number): SVGPathSegLinetoVerticalRel; - createSVGPathSegMovetoAbs(x: number, y: number): SVGPathSegMovetoAbs; - createSVGPathSegMovetoRel(x: number, y: number): SVGPathSegMovetoRel; - getPathSegAtLength(distance: number): number; - getPointAtLength(distance: number): SVGPoint; - getTotalLength(): number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGPathElement: { - prototype: SVGPathElement; - new(): SVGPathElement; -} - -interface SVGPathSeg { - pathSegType: number; - pathSegTypeAsLetter: string; - PATHSEG_ARC_ABS: number; - PATHSEG_ARC_REL: number; - PATHSEG_CLOSEPATH: number; - PATHSEG_CURVETO_CUBIC_ABS: number; - PATHSEG_CURVETO_CUBIC_REL: number; - PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number; - PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number; - PATHSEG_CURVETO_QUADRATIC_ABS: number; - PATHSEG_CURVETO_QUADRATIC_REL: number; - PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number; - PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number; - PATHSEG_LINETO_ABS: number; - PATHSEG_LINETO_HORIZONTAL_ABS: number; - PATHSEG_LINETO_HORIZONTAL_REL: number; - PATHSEG_LINETO_REL: number; - PATHSEG_LINETO_VERTICAL_ABS: number; - PATHSEG_LINETO_VERTICAL_REL: number; - PATHSEG_MOVETO_ABS: number; - PATHSEG_MOVETO_REL: number; - PATHSEG_UNKNOWN: number; -} - -declare var SVGPathSeg: { - prototype: SVGPathSeg; - new(): SVGPathSeg; - PATHSEG_ARC_ABS: number; - PATHSEG_ARC_REL: number; - PATHSEG_CLOSEPATH: number; - PATHSEG_CURVETO_CUBIC_ABS: number; - PATHSEG_CURVETO_CUBIC_REL: number; - PATHSEG_CURVETO_CUBIC_SMOOTH_ABS: number; - PATHSEG_CURVETO_CUBIC_SMOOTH_REL: number; - PATHSEG_CURVETO_QUADRATIC_ABS: number; - PATHSEG_CURVETO_QUADRATIC_REL: number; - PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS: number; - PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL: number; - PATHSEG_LINETO_ABS: number; - PATHSEG_LINETO_HORIZONTAL_ABS: number; - PATHSEG_LINETO_HORIZONTAL_REL: number; - PATHSEG_LINETO_REL: number; - PATHSEG_LINETO_VERTICAL_ABS: number; - PATHSEG_LINETO_VERTICAL_REL: number; - PATHSEG_MOVETO_ABS: number; - PATHSEG_MOVETO_REL: number; - PATHSEG_UNKNOWN: number; -} - -interface SVGPathSegArcAbs extends SVGPathSeg { - angle: number; - largeArcFlag: boolean; - r1: number; - r2: number; - sweepFlag: boolean; - x: number; - y: number; -} - -declare var SVGPathSegArcAbs: { - prototype: SVGPathSegArcAbs; - new(): SVGPathSegArcAbs; -} - -interface SVGPathSegArcRel extends SVGPathSeg { - angle: number; - largeArcFlag: boolean; - r1: number; - r2: number; - sweepFlag: boolean; - x: number; - y: number; -} - -declare var SVGPathSegArcRel: { - prototype: SVGPathSegArcRel; - new(): SVGPathSegArcRel; -} - -interface SVGPathSegClosePath extends SVGPathSeg { -} - -declare var SVGPathSegClosePath: { - prototype: SVGPathSegClosePath; - new(): SVGPathSegClosePath; -} - -interface SVGPathSegCurvetoCubicAbs extends SVGPathSeg { - x: number; - x1: number; - x2: number; - y: number; - y1: number; - y2: number; -} - -declare var SVGPathSegCurvetoCubicAbs: { - prototype: SVGPathSegCurvetoCubicAbs; - new(): SVGPathSegCurvetoCubicAbs; -} - -interface SVGPathSegCurvetoCubicRel extends SVGPathSeg { - x: number; - x1: number; - x2: number; - y: number; - y1: number; - y2: number; -} - -declare var SVGPathSegCurvetoCubicRel: { - prototype: SVGPathSegCurvetoCubicRel; - new(): SVGPathSegCurvetoCubicRel; -} - -interface SVGPathSegCurvetoCubicSmoothAbs extends SVGPathSeg { - x: number; - x2: number; - y: number; - y2: number; -} - -declare var SVGPathSegCurvetoCubicSmoothAbs: { - prototype: SVGPathSegCurvetoCubicSmoothAbs; - new(): SVGPathSegCurvetoCubicSmoothAbs; -} - -interface SVGPathSegCurvetoCubicSmoothRel extends SVGPathSeg { - x: number; - x2: number; - y: number; - y2: number; -} - -declare var SVGPathSegCurvetoCubicSmoothRel: { - prototype: SVGPathSegCurvetoCubicSmoothRel; - new(): SVGPathSegCurvetoCubicSmoothRel; -} - -interface SVGPathSegCurvetoQuadraticAbs extends SVGPathSeg { - x: number; - x1: number; - y: number; - y1: number; -} - -declare var SVGPathSegCurvetoQuadraticAbs: { - prototype: SVGPathSegCurvetoQuadraticAbs; - new(): SVGPathSegCurvetoQuadraticAbs; -} - -interface SVGPathSegCurvetoQuadraticRel extends SVGPathSeg { - x: number; - x1: number; - y: number; - y1: number; -} - -declare var SVGPathSegCurvetoQuadraticRel: { - prototype: SVGPathSegCurvetoQuadraticRel; - new(): SVGPathSegCurvetoQuadraticRel; -} - -interface SVGPathSegCurvetoQuadraticSmoothAbs extends SVGPathSeg { - x: number; - y: number; -} - -declare var SVGPathSegCurvetoQuadraticSmoothAbs: { - prototype: SVGPathSegCurvetoQuadraticSmoothAbs; - new(): SVGPathSegCurvetoQuadraticSmoothAbs; -} - -interface SVGPathSegCurvetoQuadraticSmoothRel extends SVGPathSeg { - x: number; - y: number; -} - -declare var SVGPathSegCurvetoQuadraticSmoothRel: { - prototype: SVGPathSegCurvetoQuadraticSmoothRel; - new(): SVGPathSegCurvetoQuadraticSmoothRel; -} - -interface SVGPathSegLinetoAbs extends SVGPathSeg { - x: number; - y: number; -} - -declare var SVGPathSegLinetoAbs: { - prototype: SVGPathSegLinetoAbs; - new(): SVGPathSegLinetoAbs; -} - -interface SVGPathSegLinetoHorizontalAbs extends SVGPathSeg { - x: number; -} - -declare var SVGPathSegLinetoHorizontalAbs: { - prototype: SVGPathSegLinetoHorizontalAbs; - new(): SVGPathSegLinetoHorizontalAbs; -} - -interface SVGPathSegLinetoHorizontalRel extends SVGPathSeg { - x: number; -} - -declare var SVGPathSegLinetoHorizontalRel: { - prototype: SVGPathSegLinetoHorizontalRel; - new(): SVGPathSegLinetoHorizontalRel; -} - -interface SVGPathSegLinetoRel extends SVGPathSeg { - x: number; - y: number; -} - -declare var SVGPathSegLinetoRel: { - prototype: SVGPathSegLinetoRel; - new(): SVGPathSegLinetoRel; -} - -interface SVGPathSegLinetoVerticalAbs extends SVGPathSeg { - y: number; -} - -declare var SVGPathSegLinetoVerticalAbs: { - prototype: SVGPathSegLinetoVerticalAbs; - new(): SVGPathSegLinetoVerticalAbs; -} - -interface SVGPathSegLinetoVerticalRel extends SVGPathSeg { - y: number; -} - -declare var SVGPathSegLinetoVerticalRel: { - prototype: SVGPathSegLinetoVerticalRel; - new(): SVGPathSegLinetoVerticalRel; -} - -interface SVGPathSegList { - numberOfItems: number; - appendItem(newItem: SVGPathSeg): SVGPathSeg; - clear(): void; - getItem(index: number): SVGPathSeg; - initialize(newItem: SVGPathSeg): SVGPathSeg; - insertItemBefore(newItem: SVGPathSeg, index: number): SVGPathSeg; - removeItem(index: number): SVGPathSeg; - replaceItem(newItem: SVGPathSeg, index: number): SVGPathSeg; -} - -declare var SVGPathSegList: { - prototype: SVGPathSegList; - new(): SVGPathSegList; -} - -interface SVGPathSegMovetoAbs extends SVGPathSeg { - x: number; - y: number; -} - -declare var SVGPathSegMovetoAbs: { - prototype: SVGPathSegMovetoAbs; - new(): SVGPathSegMovetoAbs; -} - -interface SVGPathSegMovetoRel extends SVGPathSeg { - x: number; - y: number; -} - -declare var SVGPathSegMovetoRel: { - prototype: SVGPathSegMovetoRel; - new(): SVGPathSegMovetoRel; -} - -interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGURIReference, SVGUnitTypes { - height: SVGAnimatedLength; - patternContentUnits: SVGAnimatedEnumeration; - patternTransform: SVGAnimatedTransformList; - patternUnits: SVGAnimatedEnumeration; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGPatternElement: { - prototype: SVGPatternElement; - new(): SVGPatternElement; -} - -interface SVGPoint { - x: number; - y: number; - matrixTransform(matrix: SVGMatrix): SVGPoint; -} - -declare var SVGPoint: { - prototype: SVGPoint; - new(): SVGPoint; -} - -interface SVGPointList { - numberOfItems: number; - appendItem(newItem: SVGPoint): SVGPoint; - clear(): void; - getItem(index: number): SVGPoint; - initialize(newItem: SVGPoint): SVGPoint; - insertItemBefore(newItem: SVGPoint, index: number): SVGPoint; - removeItem(index: number): SVGPoint; - replaceItem(newItem: SVGPoint, index: number): SVGPoint; -} - -declare var SVGPointList: { - prototype: SVGPointList; - new(): SVGPointList; -} - -interface SVGPolygonElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGPolygonElement: { - prototype: SVGPolygonElement; - new(): SVGPolygonElement; -} - -interface SVGPolylineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGPolylineElement: { - prototype: SVGPolylineElement; - new(): SVGPolylineElement; -} - -interface SVGPreserveAspectRatio { - align: number; - meetOrSlice: number; - SVG_MEETORSLICE_MEET: number; - SVG_MEETORSLICE_SLICE: number; - SVG_MEETORSLICE_UNKNOWN: number; - SVG_PRESERVEASPECTRATIO_NONE: number; - SVG_PRESERVEASPECTRATIO_UNKNOWN: number; - SVG_PRESERVEASPECTRATIO_XMAXYMAX: number; - SVG_PRESERVEASPECTRATIO_XMAXYMID: number; - SVG_PRESERVEASPECTRATIO_XMAXYMIN: number; - SVG_PRESERVEASPECTRATIO_XMIDYMAX: number; - SVG_PRESERVEASPECTRATIO_XMIDYMID: number; - SVG_PRESERVEASPECTRATIO_XMIDYMIN: number; - SVG_PRESERVEASPECTRATIO_XMINYMAX: number; - SVG_PRESERVEASPECTRATIO_XMINYMID: number; - SVG_PRESERVEASPECTRATIO_XMINYMIN: number; -} - -declare var SVGPreserveAspectRatio: { - prototype: SVGPreserveAspectRatio; - new(): SVGPreserveAspectRatio; - SVG_MEETORSLICE_MEET: number; - SVG_MEETORSLICE_SLICE: number; - SVG_MEETORSLICE_UNKNOWN: number; - SVG_PRESERVEASPECTRATIO_NONE: number; - SVG_PRESERVEASPECTRATIO_UNKNOWN: number; - SVG_PRESERVEASPECTRATIO_XMAXYMAX: number; - SVG_PRESERVEASPECTRATIO_XMAXYMID: number; - SVG_PRESERVEASPECTRATIO_XMAXYMIN: number; - SVG_PRESERVEASPECTRATIO_XMIDYMAX: number; - SVG_PRESERVEASPECTRATIO_XMIDYMID: number; - SVG_PRESERVEASPECTRATIO_XMIDYMIN: number; - SVG_PRESERVEASPECTRATIO_XMINYMAX: number; - SVG_PRESERVEASPECTRATIO_XMINYMID: number; - SVG_PRESERVEASPECTRATIO_XMINYMIN: number; -} - -interface SVGRadialGradientElement extends SVGGradientElement { - cx: SVGAnimatedLength; - cy: SVGAnimatedLength; - fx: SVGAnimatedLength; - fy: SVGAnimatedLength; - r: SVGAnimatedLength; -} - -declare var SVGRadialGradientElement: { - prototype: SVGRadialGradientElement; - new(): SVGRadialGradientElement; -} - -interface SVGRect { - height: number; - width: number; - x: number; - y: number; -} - -declare var SVGRect: { - prototype: SVGRect; - new(): SVGRect; -} - -interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - height: SVGAnimatedLength; - rx: SVGAnimatedLength; - ry: SVGAnimatedLength; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGRectElement: { - prototype: SVGRectElement; - new(): SVGRectElement; -} - -interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTests, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan { - contentScriptType: string; - contentStyleType: string; - currentScale: number; - currentTranslate: SVGPoint; - height: SVGAnimatedLength; - onabort: (ev: Event) => any; - onerror: (ev: Event) => any; - onresize: (ev: UIEvent) => any; - onscroll: (ev: UIEvent) => any; - onunload: (ev: Event) => any; - onzoom: (ev: SVGZoomEvent) => any; - pixelUnitToMillimeterX: number; - pixelUnitToMillimeterY: number; - screenPixelToMillimeterX: number; - screenPixelToMillimeterY: number; - viewport: SVGRect; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - checkEnclosure(element: SVGElement, rect: SVGRect): boolean; - checkIntersection(element: SVGElement, rect: SVGRect): boolean; - createSVGAngle(): SVGAngle; - createSVGLength(): SVGLength; - createSVGMatrix(): SVGMatrix; - createSVGNumber(): SVGNumber; - createSVGPoint(): SVGPoint; - createSVGRect(): SVGRect; - createSVGTransform(): SVGTransform; - createSVGTransformFromMatrix(matrix: SVGMatrix): SVGTransform; - deselectAll(): void; - forceRedraw(): void; - getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration; - getCurrentTime(): number; - getElementById(elementId: string): Element; - getEnclosureList(rect: SVGRect, referenceElement: SVGElement): NodeList; - getIntersectionList(rect: SVGRect, referenceElement: SVGElement): NodeList; - pauseAnimations(): void; - setCurrentTime(seconds: number): void; - suspendRedraw(maxWaitMilliseconds: number): number; - unpauseAnimations(): void; - unsuspendRedraw(suspendHandleID: number): void; - unsuspendRedrawAll(): void; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGotPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSLostPointerCapture", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "SVGAbort", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "SVGError", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "SVGUnload", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "SVGZoom", listener: (ev: SVGZoomEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ariarequest", listener: (ev: AriaRequestEvent) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "command", listener: (ev: CommandEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focusin", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "focusout", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "gotpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "lostpointercapture", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchcancel", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchend", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchmove", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "touchstart", listener: (ev: TouchEvent) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "webkitfullscreenerror", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGSVGElement: { - prototype: SVGSVGElement; - new(): SVGSVGElement; -} - -interface SVGScriptElement extends SVGElement, SVGExternalResourcesRequired, SVGURIReference { - type: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGScriptElement: { - prototype: SVGScriptElement; - new(): SVGScriptElement; -} - -interface SVGStopElement extends SVGElement, SVGStylable { - offset: SVGAnimatedNumber; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGStopElement: { - prototype: SVGStopElement; - new(): SVGStopElement; -} - -interface SVGStringList { - numberOfItems: number; - appendItem(newItem: string): string; - clear(): void; - getItem(index: number): string; - initialize(newItem: string): string; - insertItemBefore(newItem: string, index: number): string; - removeItem(index: number): string; - replaceItem(newItem: string, index: number): string; -} - -declare var SVGStringList: { - prototype: SVGStringList; - new(): SVGStringList; -} - -interface SVGStyleElement extends SVGElement, SVGLangSpace { - media: string; - title: string; - type: string; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGStyleElement: { - prototype: SVGStyleElement; - new(): SVGStyleElement; -} - -interface SVGSwitchElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGSwitchElement: { - prototype: SVGSwitchElement; - new(): SVGSwitchElement; -} - -interface SVGSymbolElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGSymbolElement: { - prototype: SVGSymbolElement; - new(): SVGSymbolElement; -} - -interface SVGTSpanElement extends SVGTextPositioningElement { -} - -declare var SVGTSpanElement: { - prototype: SVGTSpanElement; - new(): SVGTSpanElement; -} - -interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired { - lengthAdjust: SVGAnimatedEnumeration; - textLength: SVGAnimatedLength; - getCharNumAtPosition(point: SVGPoint): number; - getComputedTextLength(): number; - getEndPositionOfChar(charnum: number): SVGPoint; - getExtentOfChar(charnum: number): SVGRect; - getNumberOfChars(): number; - getRotationOfChar(charnum: number): number; - getStartPositionOfChar(charnum: number): SVGPoint; - getSubStringLength(charnum: number, nchars: number): number; - selectSubString(charnum: number, nchars: number): void; - LENGTHADJUST_SPACING: number; - LENGTHADJUST_SPACINGANDGLYPHS: number; - LENGTHADJUST_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGTextContentElement: { - prototype: SVGTextContentElement; - new(): SVGTextContentElement; - LENGTHADJUST_SPACING: number; - LENGTHADJUST_SPACINGANDGLYPHS: number; - LENGTHADJUST_UNKNOWN: number; -} - -interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGTextElement: { - prototype: SVGTextElement; - new(): SVGTextElement; -} - -interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference { - method: SVGAnimatedEnumeration; - spacing: SVGAnimatedEnumeration; - startOffset: SVGAnimatedLength; - TEXTPATH_METHODTYPE_ALIGN: number; - TEXTPATH_METHODTYPE_STRETCH: number; - TEXTPATH_METHODTYPE_UNKNOWN: number; - TEXTPATH_SPACINGTYPE_AUTO: number; - TEXTPATH_SPACINGTYPE_EXACT: number; - TEXTPATH_SPACINGTYPE_UNKNOWN: number; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGTextPathElement: { - prototype: SVGTextPathElement; - new(): SVGTextPathElement; - TEXTPATH_METHODTYPE_ALIGN: number; - TEXTPATH_METHODTYPE_STRETCH: number; - TEXTPATH_METHODTYPE_UNKNOWN: number; - TEXTPATH_SPACINGTYPE_AUTO: number; - TEXTPATH_SPACINGTYPE_EXACT: number; - TEXTPATH_SPACINGTYPE_UNKNOWN: number; -} - -interface SVGTextPositioningElement extends SVGTextContentElement { - dx: SVGAnimatedLengthList; - dy: SVGAnimatedLengthList; - rotate: SVGAnimatedNumberList; - x: SVGAnimatedLengthList; - y: SVGAnimatedLengthList; -} - -declare var SVGTextPositioningElement: { - prototype: SVGTextPositioningElement; - new(): SVGTextPositioningElement; -} - -interface SVGTitleElement extends SVGElement, SVGStylable, SVGLangSpace { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGTitleElement: { - prototype: SVGTitleElement; - new(): SVGTitleElement; -} - -interface SVGTransform { - angle: number; - matrix: SVGMatrix; - type: number; - setMatrix(matrix: SVGMatrix): void; - setRotate(angle: number, cx: number, cy: number): void; - setScale(sx: number, sy: number): void; - setSkewX(angle: number): void; - setSkewY(angle: number): void; - setTranslate(tx: number, ty: number): void; - SVG_TRANSFORM_MATRIX: number; - SVG_TRANSFORM_ROTATE: number; - SVG_TRANSFORM_SCALE: number; - SVG_TRANSFORM_SKEWX: number; - SVG_TRANSFORM_SKEWY: number; - SVG_TRANSFORM_TRANSLATE: number; - SVG_TRANSFORM_UNKNOWN: number; -} - -declare var SVGTransform: { - prototype: SVGTransform; - new(): SVGTransform; - SVG_TRANSFORM_MATRIX: number; - SVG_TRANSFORM_ROTATE: number; - SVG_TRANSFORM_SCALE: number; - SVG_TRANSFORM_SKEWX: number; - SVG_TRANSFORM_SKEWY: number; - SVG_TRANSFORM_TRANSLATE: number; - SVG_TRANSFORM_UNKNOWN: number; -} - -interface SVGTransformList { - numberOfItems: number; - appendItem(newItem: SVGTransform): SVGTransform; - clear(): void; - consolidate(): SVGTransform; - createSVGTransformFromMatrix(matrix: SVGMatrix): SVGTransform; - getItem(index: number): SVGTransform; - initialize(newItem: SVGTransform): SVGTransform; - insertItemBefore(newItem: SVGTransform, index: number): SVGTransform; - removeItem(index: number): SVGTransform; - replaceItem(newItem: SVGTransform, index: number): SVGTransform; -} - -declare var SVGTransformList: { - prototype: SVGTransformList; - new(): SVGTransformList; -} - -interface SVGUnitTypes { - SVG_UNIT_TYPE_OBJECTBOUNDINGBOX: number; - SVG_UNIT_TYPE_UNKNOWN: number; - SVG_UNIT_TYPE_USERSPACEONUSE: number; -} -declare var SVGUnitTypes: SVGUnitTypes; - -interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference { - animatedInstanceRoot: SVGElementInstance; - height: SVGAnimatedLength; - instanceRoot: SVGElementInstance; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGUseElement: { - prototype: SVGUseElement; - new(): SVGUseElement; -} - -interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan { - viewTarget: SVGStringList; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var SVGViewElement: { - prototype: SVGViewElement; - new(): SVGViewElement; -} - -interface SVGZoomAndPan { - SVG_ZOOMANDPAN_DISABLE: number; - SVG_ZOOMANDPAN_MAGNIFY: number; - SVG_ZOOMANDPAN_UNKNOWN: number; -} -declare var SVGZoomAndPan: SVGZoomAndPan; - -interface SVGZoomEvent extends UIEvent { - newScale: number; - newTranslate: SVGPoint; - previousScale: number; - previousTranslate: SVGPoint; - zoomRectScreen: SVGRect; -} - -declare var SVGZoomEvent: { - prototype: SVGZoomEvent; - new(): SVGZoomEvent; -} - -interface Screen extends EventTarget { - availHeight: number; - availWidth: number; - bufferDepth: number; - colorDepth: number; - deviceXDPI: number; - deviceYDPI: number; - fontSmoothingEnabled: boolean; - height: number; - logicalXDPI: number; - logicalYDPI: number; - msOrientation: string; - onmsorientationchange: (ev: Event) => any; - pixelDepth: number; - systemXDPI: number; - systemYDPI: number; - width: number; - msLockOrientation(orientations: string | string[]): boolean; - msUnlockOrientation(): void; - addEventListener(type: "MSOrientationChange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var Screen: { - prototype: Screen; - new(): Screen; -} - -interface ScriptNotifyEvent extends Event { - callingUri: string; - value: string; -} - -declare var ScriptNotifyEvent: { - prototype: ScriptNotifyEvent; - new(): ScriptNotifyEvent; -} - -interface ScriptProcessorNode extends AudioNode { - bufferSize: number; - onaudioprocess: (ev: AudioProcessingEvent) => any; - addEventListener(type: "audioprocess", listener: (ev: AudioProcessingEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var ScriptProcessorNode: { - prototype: ScriptProcessorNode; - new(): ScriptProcessorNode; -} - -interface Selection { - anchorNode: Node; - anchorOffset: number; - focusNode: Node; - focusOffset: number; - isCollapsed: boolean; - rangeCount: number; - type: string; - addRange(range: Range): void; - collapse(parentNode: Node, offset: number): void; - collapseToEnd(): void; - collapseToStart(): void; - containsNode(node: Node, partlyContained: boolean): boolean; - deleteFromDocument(): void; - empty(): void; - extend(newNode: Node, offset: number): void; - getRangeAt(index: number): Range; - removeAllRanges(): void; - removeRange(range: Range): void; - selectAllChildren(parentNode: Node): void; - setBaseAndExtent(baseNode: Node, baseOffset: number, extentNode: Node, extentOffset: number): void; - toString(): string; -} - -declare var Selection: { - prototype: Selection; - new(): Selection; -} - -interface SourceBuffer extends EventTarget { - appendWindowEnd: number; - appendWindowStart: number; - audioTracks: AudioTrackList; - buffered: TimeRanges; - mode: string; - timestampOffset: number; - updating: boolean; - videoTracks: VideoTrackList; - abort(): void; - appendBuffer(data: ArrayBuffer | ArrayBufferView): void; - appendStream(stream: MSStream, maxSize?: number): void; - remove(start: number, end: number): void; -} - -declare var SourceBuffer: { - prototype: SourceBuffer; - new(): SourceBuffer; -} - -interface SourceBufferList extends EventTarget { - length: number; - item(index: number): SourceBuffer; - [index: number]: SourceBuffer; -} - -declare var SourceBufferList: { - prototype: SourceBufferList; - new(): SourceBufferList; -} - -interface StereoPannerNode extends AudioNode { - pan: AudioParam; -} - -declare var StereoPannerNode: { - prototype: StereoPannerNode; - new(): StereoPannerNode; -} - -interface Storage { - length: number; - clear(): void; - getItem(key: string): any; - key(index: number): string; - removeItem(key: string): void; - setItem(key: string, data: string): void; - [key: string]: any; - [index: number]: string; -} - -declare var Storage: { - prototype: Storage; - new(): Storage; -} - -interface StorageEvent extends Event { - url: string; - key?: string; - oldValue?: string; - newValue?: string; - storageArea?: Storage; -} - -declare var StorageEvent: { - prototype: StorageEvent; - new (type: string, eventInitDict?: StorageEventInit): StorageEvent; -} - -interface StyleMedia { - type: string; - matchMedium(mediaquery: string): boolean; -} - -declare var StyleMedia: { - prototype: StyleMedia; - new(): StyleMedia; -} - -interface StyleSheet { - disabled: boolean; - href: string; - media: MediaList; - ownerNode: Node; - parentStyleSheet: StyleSheet; - title: string; - type: string; -} - -declare var StyleSheet: { - prototype: StyleSheet; - new(): StyleSheet; -} - -interface StyleSheetList { - length: number; - item(index?: number): StyleSheet; - [index: number]: StyleSheet; -} - -declare var StyleSheetList: { - prototype: StyleSheetList; - new(): StyleSheetList; -} - -interface StyleSheetPageList { - length: number; - item(index: number): CSSPageRule; - [index: number]: CSSPageRule; -} - -declare var StyleSheetPageList: { - prototype: StyleSheetPageList; - new(): StyleSheetPageList; -} - -interface SubtleCrypto { - decrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any; - deriveBits(algorithm: string | Algorithm, baseKey: CryptoKey, length: number): any; - deriveKey(algorithm: string | Algorithm, baseKey: CryptoKey, derivedKeyType: string | Algorithm, extractable: boolean, keyUsages: string[]): any; - digest(algorithm: string | Algorithm, data: ArrayBufferView): any; - encrypt(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any; - exportKey(format: string, key: CryptoKey): any; - generateKey(algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any; - importKey(format: string, keyData: ArrayBufferView, algorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any; - sign(algorithm: string | Algorithm, key: CryptoKey, data: ArrayBufferView): any; - unwrapKey(format: string, wrappedKey: ArrayBufferView, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): any; - verify(algorithm: string | Algorithm, key: CryptoKey, signature: ArrayBufferView, data: ArrayBufferView): any; - wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): any; -} - -declare var SubtleCrypto: { - prototype: SubtleCrypto; - new(): SubtleCrypto; -} - -interface Text extends CharacterData { - wholeText: string; - replaceWholeText(content: string): Text; - splitText(offset: number): Text; -} - -declare var Text: { - prototype: Text; - new(): Text; -} - -interface TextEvent extends UIEvent { - data: string; - inputMethod: number; - locale: string; - initTextEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, dataArg: string, inputMethod: number, locale: string): void; - DOM_INPUT_METHOD_DROP: number; - DOM_INPUT_METHOD_HANDWRITING: number; - DOM_INPUT_METHOD_IME: number; - DOM_INPUT_METHOD_KEYBOARD: number; - DOM_INPUT_METHOD_MULTIMODAL: number; - DOM_INPUT_METHOD_OPTION: number; - DOM_INPUT_METHOD_PASTE: number; - DOM_INPUT_METHOD_SCRIPT: number; - DOM_INPUT_METHOD_UNKNOWN: number; - DOM_INPUT_METHOD_VOICE: number; -} - -declare var TextEvent: { - prototype: TextEvent; - new(): TextEvent; - DOM_INPUT_METHOD_DROP: number; - DOM_INPUT_METHOD_HANDWRITING: number; - DOM_INPUT_METHOD_IME: number; - DOM_INPUT_METHOD_KEYBOARD: number; - DOM_INPUT_METHOD_MULTIMODAL: number; - DOM_INPUT_METHOD_OPTION: number; - DOM_INPUT_METHOD_PASTE: number; - DOM_INPUT_METHOD_SCRIPT: number; - DOM_INPUT_METHOD_UNKNOWN: number; - DOM_INPUT_METHOD_VOICE: number; -} - -interface TextMetrics { - width: number; -} - -declare var TextMetrics: { - prototype: TextMetrics; - new(): TextMetrics; -} - -interface TextRange { - boundingHeight: number; - boundingLeft: number; - boundingTop: number; - boundingWidth: number; - htmlText: string; - offsetLeft: number; - offsetTop: number; - text: string; - collapse(start?: boolean): void; - compareEndPoints(how: string, sourceRange: TextRange): number; - duplicate(): TextRange; - execCommand(cmdID: string, showUI?: boolean, value?: any): boolean; - execCommandShowHelp(cmdID: string): boolean; - expand(Unit: string): boolean; - findText(string: string, count?: number, flags?: number): boolean; - getBookmark(): string; - getBoundingClientRect(): ClientRect; - getClientRects(): ClientRectList; - inRange(range: TextRange): boolean; - isEqual(range: TextRange): boolean; - move(unit: string, count?: number): number; - moveEnd(unit: string, count?: number): number; - moveStart(unit: string, count?: number): number; - moveToBookmark(bookmark: string): boolean; - moveToElementText(element: Element): void; - moveToPoint(x: number, y: number): void; - parentElement(): Element; - pasteHTML(html: string): void; - queryCommandEnabled(cmdID: string): boolean; - queryCommandIndeterm(cmdID: string): boolean; - queryCommandState(cmdID: string): boolean; - queryCommandSupported(cmdID: string): boolean; - queryCommandText(cmdID: string): string; - queryCommandValue(cmdID: string): any; - scrollIntoView(fStart?: boolean): void; - select(): void; - setEndPoint(how: string, SourceRange: TextRange): void; -} - -declare var TextRange: { - prototype: TextRange; - new(): TextRange; -} - -interface TextRangeCollection { - length: number; - item(index: number): TextRange; - [index: number]: TextRange; -} - -declare var TextRangeCollection: { - prototype: TextRangeCollection; - new(): TextRangeCollection; -} - -interface TextTrack extends EventTarget { - activeCues: TextTrackCueList; - cues: TextTrackCueList; - inBandMetadataTrackDispatchType: string; - kind: string; - label: string; - language: string; - mode: any; - oncuechange: (ev: Event) => any; - onerror: (ev: Event) => any; - onload: (ev: Event) => any; - readyState: number; - addCue(cue: TextTrackCue): void; - removeCue(cue: TextTrackCue): void; - DISABLED: number; - ERROR: number; - HIDDEN: number; - LOADED: number; - LOADING: number; - NONE: number; - SHOWING: number; - addEventListener(type: "cuechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var TextTrack: { - prototype: TextTrack; - new(): TextTrack; - DISABLED: number; - ERROR: number; - HIDDEN: number; - LOADED: number; - LOADING: number; - NONE: number; - SHOWING: number; -} - -interface TextTrackCue extends EventTarget { - endTime: number; - id: string; - onenter: (ev: Event) => any; - onexit: (ev: Event) => any; - pauseOnExit: boolean; - startTime: number; - text: string; - track: TextTrack; - getCueAsHTML(): DocumentFragment; - addEventListener(type: "enter", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "exit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var TextTrackCue: { - prototype: TextTrackCue; - new(startTime: number, endTime: number, text: string): TextTrackCue; -} - -interface TextTrackCueList { - length: number; - getCueById(id: string): TextTrackCue; - item(index: number): TextTrackCue; - [index: number]: TextTrackCue; -} - -declare var TextTrackCueList: { - prototype: TextTrackCueList; - new(): TextTrackCueList; -} - -interface TextTrackList extends EventTarget { - length: number; - onaddtrack: (ev: TrackEvent) => any; - item(index: number): TextTrack; - addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; - [index: number]: TextTrack; -} - -declare var TextTrackList: { - prototype: TextTrackList; - new(): TextTrackList; -} - -interface TimeRanges { - length: number; - end(index: number): number; - start(index: number): number; -} - -declare var TimeRanges: { - prototype: TimeRanges; - new(): TimeRanges; -} - -interface Touch { - clientX: number; - clientY: number; - identifier: number; - pageX: number; - pageY: number; - screenX: number; - screenY: number; - target: EventTarget; -} - -declare var Touch: { - prototype: Touch; - new(): Touch; -} - -interface TouchEvent extends UIEvent { - altKey: boolean; - changedTouches: TouchList; - ctrlKey: boolean; - metaKey: boolean; - shiftKey: boolean; - targetTouches: TouchList; - touches: TouchList; -} - -declare var TouchEvent: { - prototype: TouchEvent; - new(): TouchEvent; -} - -interface TouchList { - length: number; - item(index: number): Touch; - [index: number]: Touch; -} - -declare var TouchList: { - prototype: TouchList; - new(): TouchList; -} - -interface TrackEvent extends Event { - track: any; -} - -declare var TrackEvent: { - prototype: TrackEvent; - new(): TrackEvent; -} - -interface TransitionEvent extends Event { - elapsedTime: number; - propertyName: string; - initTransitionEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, propertyNameArg: string, elapsedTimeArg: number): void; -} - -declare var TransitionEvent: { - prototype: TransitionEvent; - new(): TransitionEvent; -} - -interface TreeWalker { - currentNode: Node; - expandEntityReferences: boolean; - filter: NodeFilter; - root: Node; - whatToShow: number; - firstChild(): Node; - lastChild(): Node; - nextNode(): Node; - nextSibling(): Node; - parentNode(): Node; - previousNode(): Node; - previousSibling(): Node; -} - -declare var TreeWalker: { - prototype: TreeWalker; - new(): TreeWalker; -} - -interface UIEvent extends Event { - detail: number; - view: Window; - initUIEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number): void; -} - -declare var UIEvent: { - prototype: UIEvent; - new(type: string, eventInitDict?: UIEventInit): UIEvent; -} - -interface URL { - createObjectURL(object: any, options?: ObjectURLOptions): string; - revokeObjectURL(url: string): void; -} -declare var URL: URL; - -interface UnviewableContentIdentifiedEvent extends NavigationEventWithReferrer { - mediaType: string; -} - -declare var UnviewableContentIdentifiedEvent: { - prototype: UnviewableContentIdentifiedEvent; - new(): UnviewableContentIdentifiedEvent; -} - -interface ValidityState { - badInput: boolean; - customError: boolean; - patternMismatch: boolean; - rangeOverflow: boolean; - rangeUnderflow: boolean; - stepMismatch: boolean; - tooLong: boolean; - typeMismatch: boolean; - valid: boolean; - valueMissing: boolean; -} - -declare var ValidityState: { - prototype: ValidityState; - new(): ValidityState; -} - -interface VideoPlaybackQuality { - corruptedVideoFrames: number; - creationTime: number; - droppedVideoFrames: number; - totalFrameDelay: number; - totalVideoFrames: number; -} - -declare var VideoPlaybackQuality: { - prototype: VideoPlaybackQuality; - new(): VideoPlaybackQuality; -} - -interface VideoTrack { - id: string; - kind: string; - label: string; - language: string; - selected: boolean; - sourceBuffer: SourceBuffer; -} - -declare var VideoTrack: { - prototype: VideoTrack; - new(): VideoTrack; -} - -interface VideoTrackList extends EventTarget { - length: number; - onaddtrack: (ev: TrackEvent) => any; - onchange: (ev: Event) => any; - onremovetrack: (ev: TrackEvent) => any; - selectedIndex: number; - getTrackById(id: string): VideoTrack; - item(index: number): VideoTrack; - addEventListener(type: "addtrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "removetrack", listener: (ev: TrackEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; - [index: number]: VideoTrack; -} - -declare var VideoTrackList: { - prototype: VideoTrackList; - new(): VideoTrackList; -} - -interface WEBGL_compressed_texture_s3tc { - COMPRESSED_RGBA_S3TC_DXT1_EXT: number; - COMPRESSED_RGBA_S3TC_DXT3_EXT: number; - COMPRESSED_RGBA_S3TC_DXT5_EXT: number; - COMPRESSED_RGB_S3TC_DXT1_EXT: number; -} - -declare var WEBGL_compressed_texture_s3tc: { - prototype: WEBGL_compressed_texture_s3tc; - new(): WEBGL_compressed_texture_s3tc; - COMPRESSED_RGBA_S3TC_DXT1_EXT: number; - COMPRESSED_RGBA_S3TC_DXT3_EXT: number; - COMPRESSED_RGBA_S3TC_DXT5_EXT: number; - COMPRESSED_RGB_S3TC_DXT1_EXT: number; -} - -interface WEBGL_debug_renderer_info { - UNMASKED_RENDERER_WEBGL: number; - UNMASKED_VENDOR_WEBGL: number; -} - -declare var WEBGL_debug_renderer_info: { - prototype: WEBGL_debug_renderer_info; - new(): WEBGL_debug_renderer_info; - UNMASKED_RENDERER_WEBGL: number; - UNMASKED_VENDOR_WEBGL: number; -} - -interface WEBGL_depth_texture { - UNSIGNED_INT_24_8_WEBGL: number; -} - -declare var WEBGL_depth_texture: { - prototype: WEBGL_depth_texture; - new(): WEBGL_depth_texture; - UNSIGNED_INT_24_8_WEBGL: number; -} - -interface WaveShaperNode extends AudioNode { - curve: Float32Array; - oversample: string; -} - -declare var WaveShaperNode: { - prototype: WaveShaperNode; - new(): WaveShaperNode; -} - -interface WebGLActiveInfo { - name: string; - size: number; - type: number; -} - -declare var WebGLActiveInfo: { - prototype: WebGLActiveInfo; - new(): WebGLActiveInfo; -} - -interface WebGLBuffer extends WebGLObject { -} - -declare var WebGLBuffer: { - prototype: WebGLBuffer; - new(): WebGLBuffer; -} - -interface WebGLContextEvent extends Event { - statusMessage: string; -} - -declare var WebGLContextEvent: { - prototype: WebGLContextEvent; - new(): WebGLContextEvent; -} - -interface WebGLFramebuffer extends WebGLObject { -} - -declare var WebGLFramebuffer: { - prototype: WebGLFramebuffer; - new(): WebGLFramebuffer; -} - -interface WebGLObject { -} - -declare var WebGLObject: { - prototype: WebGLObject; - new(): WebGLObject; -} - -interface WebGLProgram extends WebGLObject { -} - -declare var WebGLProgram: { - prototype: WebGLProgram; - new(): WebGLProgram; -} - -interface WebGLRenderbuffer extends WebGLObject { -} - -declare var WebGLRenderbuffer: { - prototype: WebGLRenderbuffer; - new(): WebGLRenderbuffer; -} - -interface WebGLRenderingContext { - canvas: HTMLCanvasElement; - drawingBufferHeight: number; - drawingBufferWidth: number; - activeTexture(texture: number): void; - attachShader(program: WebGLProgram, shader: WebGLShader): void; - bindAttribLocation(program: WebGLProgram, index: number, name: string): void; - bindBuffer(target: number, buffer: WebGLBuffer): void; - bindFramebuffer(target: number, framebuffer: WebGLFramebuffer): void; - bindRenderbuffer(target: number, renderbuffer: WebGLRenderbuffer): void; - bindTexture(target: number, texture: WebGLTexture): void; - blendColor(red: number, green: number, blue: number, alpha: number): void; - blendEquation(mode: number): void; - blendEquationSeparate(modeRGB: number, modeAlpha: number): void; - blendFunc(sfactor: number, dfactor: number): void; - blendFuncSeparate(srcRGB: number, dstRGB: number, srcAlpha: number, dstAlpha: number): void; - bufferData(target: number, size: number | ArrayBufferView | ArrayBuffer, usage: number): void; - bufferSubData(target: number, offset: number, data: ArrayBufferView | ArrayBuffer): void; - checkFramebufferStatus(target: number): number; - clear(mask: number): void; - clearColor(red: number, green: number, blue: number, alpha: number): void; - clearDepth(depth: number): void; - clearStencil(s: number): void; - colorMask(red: boolean, green: boolean, blue: boolean, alpha: boolean): void; - compileShader(shader: WebGLShader): void; - compressedTexImage2D(target: number, level: number, internalformat: number, width: number, height: number, border: number, data: ArrayBufferView): void; - compressedTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, data: ArrayBufferView): void; - copyTexImage2D(target: number, level: number, internalformat: number, x: number, y: number, width: number, height: number, border: number): void; - copyTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number, x: number, y: number, width: number, height: number): void; - createBuffer(): WebGLBuffer; - createFramebuffer(): WebGLFramebuffer; - createProgram(): WebGLProgram; - createRenderbuffer(): WebGLRenderbuffer; - createShader(type: number): WebGLShader; - createTexture(): WebGLTexture; - cullFace(mode: number): void; - deleteBuffer(buffer: WebGLBuffer): void; - deleteFramebuffer(framebuffer: WebGLFramebuffer): void; - deleteProgram(program: WebGLProgram): void; - deleteRenderbuffer(renderbuffer: WebGLRenderbuffer): void; - deleteShader(shader: WebGLShader): void; - deleteTexture(texture: WebGLTexture): void; - depthFunc(func: number): void; - depthMask(flag: boolean): void; - depthRange(zNear: number, zFar: number): void; - detachShader(program: WebGLProgram, shader: WebGLShader): void; - disable(cap: number): void; - disableVertexAttribArray(index: number): void; - drawArrays(mode: number, first: number, count: number): void; - drawElements(mode: number, count: number, type: number, offset: number): void; - enable(cap: number): void; - enableVertexAttribArray(index: number): void; - finish(): void; - flush(): void; - framebufferRenderbuffer(target: number, attachment: number, renderbuffertarget: number, renderbuffer: WebGLRenderbuffer): void; - framebufferTexture2D(target: number, attachment: number, textarget: number, texture: WebGLTexture, level: number): void; - frontFace(mode: number): void; - generateMipmap(target: number): void; - getActiveAttrib(program: WebGLProgram, index: number): WebGLActiveInfo; - getActiveUniform(program: WebGLProgram, index: number): WebGLActiveInfo; - getAttachedShaders(program: WebGLProgram): WebGLShader[]; - getAttribLocation(program: WebGLProgram, name: string): number; - getBufferParameter(target: number, pname: number): any; - getContextAttributes(): WebGLContextAttributes; - getError(): number; - getExtension(name: string): any; - getFramebufferAttachmentParameter(target: number, attachment: number, pname: number): any; - getParameter(pname: number): any; - getProgramInfoLog(program: WebGLProgram): string; - getProgramParameter(program: WebGLProgram, pname: number): any; - getRenderbufferParameter(target: number, pname: number): any; - getShaderInfoLog(shader: WebGLShader): string; - getShaderParameter(shader: WebGLShader, pname: number): any; - getShaderPrecisionFormat(shadertype: number, precisiontype: number): WebGLShaderPrecisionFormat; - getShaderSource(shader: WebGLShader): string; - getSupportedExtensions(): string[]; - getTexParameter(target: number, pname: number): any; - getUniform(program: WebGLProgram, location: WebGLUniformLocation): any; - getUniformLocation(program: WebGLProgram, name: string): WebGLUniformLocation; - getVertexAttrib(index: number, pname: number): any; - getVertexAttribOffset(index: number, pname: number): number; - hint(target: number, mode: number): void; - isBuffer(buffer: WebGLBuffer): boolean; - isContextLost(): boolean; - isEnabled(cap: number): boolean; - isFramebuffer(framebuffer: WebGLFramebuffer): boolean; - isProgram(program: WebGLProgram): boolean; - isRenderbuffer(renderbuffer: WebGLRenderbuffer): boolean; - isShader(shader: WebGLShader): boolean; - isTexture(texture: WebGLTexture): boolean; - lineWidth(width: number): void; - linkProgram(program: WebGLProgram): void; - pixelStorei(pname: number, param: number): void; - polygonOffset(factor: number, units: number): void; - readPixels(x: number, y: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView): void; - renderbufferStorage(target: number, internalformat: number, width: number, height: number): void; - sampleCoverage(value: number, invert: boolean): void; - scissor(x: number, y: number, width: number, height: number): void; - shaderSource(shader: WebGLShader, source: string): void; - stencilFunc(func: number, ref: number, mask: number): void; - stencilFuncSeparate(face: number, func: number, ref: number, mask: number): void; - stencilMask(mask: number): void; - stencilMaskSeparate(face: number, mask: number): void; - stencilOp(fail: number, zfail: number, zpass: number): void; - stencilOpSeparate(face: number, fail: number, zfail: number, zpass: number): void; - texImage2D(target: number, level: number, internalformat: number, width: number, height: number, border: number, format: number, type: number, pixels: ArrayBufferView): void; - texImage2D(target: number, level: number, internalformat: number, format: number, type: number, image: HTMLImageElement): void; - texImage2D(target: number, level: number, internalformat: number, format: number, type: number, canvas: HTMLCanvasElement): void; - texImage2D(target: number, level: number, internalformat: number, format: number, type: number, video: HTMLVideoElement): void; - texImage2D(target: number, level: number, internalformat: number, format: number, type: number, pixels: ImageData): void; - texParameterf(target: number, pname: number, param: number): void; - texParameteri(target: number, pname: number, param: number): void; - texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView): void; - texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, image: HTMLImageElement): void; - texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, canvas: HTMLCanvasElement): void; - texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void; - texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void; - uniform1f(location: WebGLUniformLocation, x: number): void; - uniform1fv(location: WebGLUniformLocation, v: Float32Array): void; - uniform1i(location: WebGLUniformLocation, x: number): void; - uniform1iv(location: WebGLUniformLocation, v: Int32Array): void; - uniform2f(location: WebGLUniformLocation, x: number, y: number): void; - uniform2fv(location: WebGLUniformLocation, v: Float32Array): void; - uniform2i(location: WebGLUniformLocation, x: number, y: number): void; - uniform2iv(location: WebGLUniformLocation, v: Int32Array): void; - uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void; - uniform3fv(location: WebGLUniformLocation, v: Float32Array): void; - uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void; - uniform3iv(location: WebGLUniformLocation, v: Int32Array): void; - uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void; - uniform4fv(location: WebGLUniformLocation, v: Float32Array): void; - uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void; - uniform4iv(location: WebGLUniformLocation, v: Int32Array): void; - uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void; - uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void; - uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void; - useProgram(program: WebGLProgram): void; - validateProgram(program: WebGLProgram): void; - vertexAttrib1f(indx: number, x: number): void; - vertexAttrib1fv(indx: number, values: Float32Array): void; - vertexAttrib2f(indx: number, x: number, y: number): void; - vertexAttrib2fv(indx: number, values: Float32Array): void; - vertexAttrib3f(indx: number, x: number, y: number, z: number): void; - vertexAttrib3fv(indx: number, values: Float32Array): void; - vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void; - vertexAttrib4fv(indx: number, values: Float32Array): void; - vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void; - viewport(x: number, y: number, width: number, height: number): void; - ACTIVE_ATTRIBUTES: number; - ACTIVE_TEXTURE: number; - ACTIVE_UNIFORMS: number; - ALIASED_LINE_WIDTH_RANGE: number; - ALIASED_POINT_SIZE_RANGE: number; - ALPHA: number; - ALPHA_BITS: number; - ALWAYS: number; - ARRAY_BUFFER: number; - ARRAY_BUFFER_BINDING: number; - ATTACHED_SHADERS: number; - BACK: number; - BLEND: number; - BLEND_COLOR: number; - BLEND_DST_ALPHA: number; - BLEND_DST_RGB: number; - BLEND_EQUATION: number; - BLEND_EQUATION_ALPHA: number; - BLEND_EQUATION_RGB: number; - BLEND_SRC_ALPHA: number; - BLEND_SRC_RGB: number; - BLUE_BITS: number; - BOOL: number; - BOOL_VEC2: number; - BOOL_VEC3: number; - BOOL_VEC4: number; - BROWSER_DEFAULT_WEBGL: number; - BUFFER_SIZE: number; - BUFFER_USAGE: number; - BYTE: number; - CCW: number; - CLAMP_TO_EDGE: number; - COLOR_ATTACHMENT0: number; - COLOR_BUFFER_BIT: number; - COLOR_CLEAR_VALUE: number; - COLOR_WRITEMASK: number; - COMPILE_STATUS: number; - COMPRESSED_TEXTURE_FORMATS: number; - CONSTANT_ALPHA: number; - CONSTANT_COLOR: number; - CONTEXT_LOST_WEBGL: number; - CULL_FACE: number; - CULL_FACE_MODE: number; - CURRENT_PROGRAM: number; - CURRENT_VERTEX_ATTRIB: number; - CW: number; - DECR: number; - DECR_WRAP: number; - DELETE_STATUS: number; - DEPTH_ATTACHMENT: number; - DEPTH_BITS: number; - DEPTH_BUFFER_BIT: number; - DEPTH_CLEAR_VALUE: number; - DEPTH_COMPONENT: number; - DEPTH_COMPONENT16: number; - DEPTH_FUNC: number; - DEPTH_RANGE: number; - DEPTH_STENCIL: number; - DEPTH_STENCIL_ATTACHMENT: number; - DEPTH_TEST: number; - DEPTH_WRITEMASK: number; - DITHER: number; - DONT_CARE: number; - DST_ALPHA: number; - DST_COLOR: number; - DYNAMIC_DRAW: number; - ELEMENT_ARRAY_BUFFER: number; - ELEMENT_ARRAY_BUFFER_BINDING: number; - EQUAL: number; - FASTEST: number; - FLOAT: number; - FLOAT_MAT2: number; - FLOAT_MAT3: number; - FLOAT_MAT4: number; - FLOAT_VEC2: number; - FLOAT_VEC3: number; - FLOAT_VEC4: number; - FRAGMENT_SHADER: number; - FRAMEBUFFER: number; - FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number; - FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number; - FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number; - FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number; - FRAMEBUFFER_BINDING: number; - FRAMEBUFFER_COMPLETE: number; - FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number; - FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number; - FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number; - FRAMEBUFFER_UNSUPPORTED: number; - FRONT: number; - FRONT_AND_BACK: number; - FRONT_FACE: number; - FUNC_ADD: number; - FUNC_REVERSE_SUBTRACT: number; - FUNC_SUBTRACT: number; - GENERATE_MIPMAP_HINT: number; - GEQUAL: number; - GREATER: number; - GREEN_BITS: number; - HIGH_FLOAT: number; - HIGH_INT: number; - IMPLEMENTATION_COLOR_READ_FORMAT: number; - IMPLEMENTATION_COLOR_READ_TYPE: number; - INCR: number; - INCR_WRAP: number; - INT: number; - INT_VEC2: number; - INT_VEC3: number; - INT_VEC4: number; - INVALID_ENUM: number; - INVALID_FRAMEBUFFER_OPERATION: number; - INVALID_OPERATION: number; - INVALID_VALUE: number; - INVERT: number; - KEEP: number; - LEQUAL: number; - LESS: number; - LINEAR: number; - LINEAR_MIPMAP_LINEAR: number; - LINEAR_MIPMAP_NEAREST: number; - LINES: number; - LINE_LOOP: number; - LINE_STRIP: number; - LINE_WIDTH: number; - LINK_STATUS: number; - LOW_FLOAT: number; - LOW_INT: number; - LUMINANCE: number; - LUMINANCE_ALPHA: number; - MAX_COMBINED_TEXTURE_IMAGE_UNITS: number; - MAX_CUBE_MAP_TEXTURE_SIZE: number; - MAX_FRAGMENT_UNIFORM_VECTORS: number; - MAX_RENDERBUFFER_SIZE: number; - MAX_TEXTURE_IMAGE_UNITS: number; - MAX_TEXTURE_SIZE: number; - MAX_VARYING_VECTORS: number; - MAX_VERTEX_ATTRIBS: number; - MAX_VERTEX_TEXTURE_IMAGE_UNITS: number; - MAX_VERTEX_UNIFORM_VECTORS: number; - MAX_VIEWPORT_DIMS: number; - MEDIUM_FLOAT: number; - MEDIUM_INT: number; - MIRRORED_REPEAT: number; - NEAREST: number; - NEAREST_MIPMAP_LINEAR: number; - NEAREST_MIPMAP_NEAREST: number; - NEVER: number; - NICEST: number; - NONE: number; - NOTEQUAL: number; - NO_ERROR: number; - ONE: number; - ONE_MINUS_CONSTANT_ALPHA: number; - ONE_MINUS_CONSTANT_COLOR: number; - ONE_MINUS_DST_ALPHA: number; - ONE_MINUS_DST_COLOR: number; - ONE_MINUS_SRC_ALPHA: number; - ONE_MINUS_SRC_COLOR: number; - OUT_OF_MEMORY: number; - PACK_ALIGNMENT: number; - POINTS: number; - POLYGON_OFFSET_FACTOR: number; - POLYGON_OFFSET_FILL: number; - POLYGON_OFFSET_UNITS: number; - RED_BITS: number; - RENDERBUFFER: number; - RENDERBUFFER_ALPHA_SIZE: number; - RENDERBUFFER_BINDING: number; - RENDERBUFFER_BLUE_SIZE: number; - RENDERBUFFER_DEPTH_SIZE: number; - RENDERBUFFER_GREEN_SIZE: number; - RENDERBUFFER_HEIGHT: number; - RENDERBUFFER_INTERNAL_FORMAT: number; - RENDERBUFFER_RED_SIZE: number; - RENDERBUFFER_STENCIL_SIZE: number; - RENDERBUFFER_WIDTH: number; - RENDERER: number; - REPEAT: number; - REPLACE: number; - RGB: number; - RGB565: number; - RGB5_A1: number; - RGBA: number; - RGBA4: number; - SAMPLER_2D: number; - SAMPLER_CUBE: number; - SAMPLES: number; - SAMPLE_ALPHA_TO_COVERAGE: number; - SAMPLE_BUFFERS: number; - SAMPLE_COVERAGE: number; - SAMPLE_COVERAGE_INVERT: number; - SAMPLE_COVERAGE_VALUE: number; - SCISSOR_BOX: number; - SCISSOR_TEST: number; - SHADER_TYPE: number; - SHADING_LANGUAGE_VERSION: number; - SHORT: number; - SRC_ALPHA: number; - SRC_ALPHA_SATURATE: number; - SRC_COLOR: number; - STATIC_DRAW: number; - STENCIL_ATTACHMENT: number; - STENCIL_BACK_FAIL: number; - STENCIL_BACK_FUNC: number; - STENCIL_BACK_PASS_DEPTH_FAIL: number; - STENCIL_BACK_PASS_DEPTH_PASS: number; - STENCIL_BACK_REF: number; - STENCIL_BACK_VALUE_MASK: number; - STENCIL_BACK_WRITEMASK: number; - STENCIL_BITS: number; - STENCIL_BUFFER_BIT: number; - STENCIL_CLEAR_VALUE: number; - STENCIL_FAIL: number; - STENCIL_FUNC: number; - STENCIL_INDEX: number; - STENCIL_INDEX8: number; - STENCIL_PASS_DEPTH_FAIL: number; - STENCIL_PASS_DEPTH_PASS: number; - STENCIL_REF: number; - STENCIL_TEST: number; - STENCIL_VALUE_MASK: number; - STENCIL_WRITEMASK: number; - STREAM_DRAW: number; - SUBPIXEL_BITS: number; - TEXTURE: number; - TEXTURE0: number; - TEXTURE1: number; - TEXTURE10: number; - TEXTURE11: number; - TEXTURE12: number; - TEXTURE13: number; - TEXTURE14: number; - TEXTURE15: number; - TEXTURE16: number; - TEXTURE17: number; - TEXTURE18: number; - TEXTURE19: number; - TEXTURE2: number; - TEXTURE20: number; - TEXTURE21: number; - TEXTURE22: number; - TEXTURE23: number; - TEXTURE24: number; - TEXTURE25: number; - TEXTURE26: number; - TEXTURE27: number; - TEXTURE28: number; - TEXTURE29: number; - TEXTURE3: number; - TEXTURE30: number; - TEXTURE31: number; - TEXTURE4: number; - TEXTURE5: number; - TEXTURE6: number; - TEXTURE7: number; - TEXTURE8: number; - TEXTURE9: number; - TEXTURE_2D: number; - TEXTURE_BINDING_2D: number; - TEXTURE_BINDING_CUBE_MAP: number; - TEXTURE_CUBE_MAP: number; - TEXTURE_CUBE_MAP_NEGATIVE_X: number; - TEXTURE_CUBE_MAP_NEGATIVE_Y: number; - TEXTURE_CUBE_MAP_NEGATIVE_Z: number; - TEXTURE_CUBE_MAP_POSITIVE_X: number; - TEXTURE_CUBE_MAP_POSITIVE_Y: number; - TEXTURE_CUBE_MAP_POSITIVE_Z: number; - TEXTURE_MAG_FILTER: number; - TEXTURE_MIN_FILTER: number; - TEXTURE_WRAP_S: number; - TEXTURE_WRAP_T: number; - TRIANGLES: number; - TRIANGLE_FAN: number; - TRIANGLE_STRIP: number; - UNPACK_ALIGNMENT: number; - UNPACK_COLORSPACE_CONVERSION_WEBGL: number; - UNPACK_FLIP_Y_WEBGL: number; - UNPACK_PREMULTIPLY_ALPHA_WEBGL: number; - UNSIGNED_BYTE: number; - UNSIGNED_INT: number; - UNSIGNED_SHORT: number; - UNSIGNED_SHORT_4_4_4_4: number; - UNSIGNED_SHORT_5_5_5_1: number; - UNSIGNED_SHORT_5_6_5: number; - VALIDATE_STATUS: number; - VENDOR: number; - VERSION: number; - VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number; - VERTEX_ATTRIB_ARRAY_ENABLED: number; - VERTEX_ATTRIB_ARRAY_NORMALIZED: number; - VERTEX_ATTRIB_ARRAY_POINTER: number; - VERTEX_ATTRIB_ARRAY_SIZE: number; - VERTEX_ATTRIB_ARRAY_STRIDE: number; - VERTEX_ATTRIB_ARRAY_TYPE: number; - VERTEX_SHADER: number; - VIEWPORT: number; - ZERO: number; -} - -declare var WebGLRenderingContext: { - prototype: WebGLRenderingContext; - new(): WebGLRenderingContext; - ACTIVE_ATTRIBUTES: number; - ACTIVE_TEXTURE: number; - ACTIVE_UNIFORMS: number; - ALIASED_LINE_WIDTH_RANGE: number; - ALIASED_POINT_SIZE_RANGE: number; - ALPHA: number; - ALPHA_BITS: number; - ALWAYS: number; - ARRAY_BUFFER: number; - ARRAY_BUFFER_BINDING: number; - ATTACHED_SHADERS: number; - BACK: number; - BLEND: number; - BLEND_COLOR: number; - BLEND_DST_ALPHA: number; - BLEND_DST_RGB: number; - BLEND_EQUATION: number; - BLEND_EQUATION_ALPHA: number; - BLEND_EQUATION_RGB: number; - BLEND_SRC_ALPHA: number; - BLEND_SRC_RGB: number; - BLUE_BITS: number; - BOOL: number; - BOOL_VEC2: number; - BOOL_VEC3: number; - BOOL_VEC4: number; - BROWSER_DEFAULT_WEBGL: number; - BUFFER_SIZE: number; - BUFFER_USAGE: number; - BYTE: number; - CCW: number; - CLAMP_TO_EDGE: number; - COLOR_ATTACHMENT0: number; - COLOR_BUFFER_BIT: number; - COLOR_CLEAR_VALUE: number; - COLOR_WRITEMASK: number; - COMPILE_STATUS: number; - COMPRESSED_TEXTURE_FORMATS: number; - CONSTANT_ALPHA: number; - CONSTANT_COLOR: number; - CONTEXT_LOST_WEBGL: number; - CULL_FACE: number; - CULL_FACE_MODE: number; - CURRENT_PROGRAM: number; - CURRENT_VERTEX_ATTRIB: number; - CW: number; - DECR: number; - DECR_WRAP: number; - DELETE_STATUS: number; - DEPTH_ATTACHMENT: number; - DEPTH_BITS: number; - DEPTH_BUFFER_BIT: number; - DEPTH_CLEAR_VALUE: number; - DEPTH_COMPONENT: number; - DEPTH_COMPONENT16: number; - DEPTH_FUNC: number; - DEPTH_RANGE: number; - DEPTH_STENCIL: number; - DEPTH_STENCIL_ATTACHMENT: number; - DEPTH_TEST: number; - DEPTH_WRITEMASK: number; - DITHER: number; - DONT_CARE: number; - DST_ALPHA: number; - DST_COLOR: number; - DYNAMIC_DRAW: number; - ELEMENT_ARRAY_BUFFER: number; - ELEMENT_ARRAY_BUFFER_BINDING: number; - EQUAL: number; - FASTEST: number; - FLOAT: number; - FLOAT_MAT2: number; - FLOAT_MAT3: number; - FLOAT_MAT4: number; - FLOAT_VEC2: number; - FLOAT_VEC3: number; - FLOAT_VEC4: number; - FRAGMENT_SHADER: number; - FRAMEBUFFER: number; - FRAMEBUFFER_ATTACHMENT_OBJECT_NAME: number; - FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE: number; - FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE: number; - FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL: number; - FRAMEBUFFER_BINDING: number; - FRAMEBUFFER_COMPLETE: number; - FRAMEBUFFER_INCOMPLETE_ATTACHMENT: number; - FRAMEBUFFER_INCOMPLETE_DIMENSIONS: number; - FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT: number; - FRAMEBUFFER_UNSUPPORTED: number; - FRONT: number; - FRONT_AND_BACK: number; - FRONT_FACE: number; - FUNC_ADD: number; - FUNC_REVERSE_SUBTRACT: number; - FUNC_SUBTRACT: number; - GENERATE_MIPMAP_HINT: number; - GEQUAL: number; - GREATER: number; - GREEN_BITS: number; - HIGH_FLOAT: number; - HIGH_INT: number; - IMPLEMENTATION_COLOR_READ_FORMAT: number; - IMPLEMENTATION_COLOR_READ_TYPE: number; - INCR: number; - INCR_WRAP: number; - INT: number; - INT_VEC2: number; - INT_VEC3: number; - INT_VEC4: number; - INVALID_ENUM: number; - INVALID_FRAMEBUFFER_OPERATION: number; - INVALID_OPERATION: number; - INVALID_VALUE: number; - INVERT: number; - KEEP: number; - LEQUAL: number; - LESS: number; - LINEAR: number; - LINEAR_MIPMAP_LINEAR: number; - LINEAR_MIPMAP_NEAREST: number; - LINES: number; - LINE_LOOP: number; - LINE_STRIP: number; - LINE_WIDTH: number; - LINK_STATUS: number; - LOW_FLOAT: number; - LOW_INT: number; - LUMINANCE: number; - LUMINANCE_ALPHA: number; - MAX_COMBINED_TEXTURE_IMAGE_UNITS: number; - MAX_CUBE_MAP_TEXTURE_SIZE: number; - MAX_FRAGMENT_UNIFORM_VECTORS: number; - MAX_RENDERBUFFER_SIZE: number; - MAX_TEXTURE_IMAGE_UNITS: number; - MAX_TEXTURE_SIZE: number; - MAX_VARYING_VECTORS: number; - MAX_VERTEX_ATTRIBS: number; - MAX_VERTEX_TEXTURE_IMAGE_UNITS: number; - MAX_VERTEX_UNIFORM_VECTORS: number; - MAX_VIEWPORT_DIMS: number; - MEDIUM_FLOAT: number; - MEDIUM_INT: number; - MIRRORED_REPEAT: number; - NEAREST: number; - NEAREST_MIPMAP_LINEAR: number; - NEAREST_MIPMAP_NEAREST: number; - NEVER: number; - NICEST: number; - NONE: number; - NOTEQUAL: number; - NO_ERROR: number; - ONE: number; - ONE_MINUS_CONSTANT_ALPHA: number; - ONE_MINUS_CONSTANT_COLOR: number; - ONE_MINUS_DST_ALPHA: number; - ONE_MINUS_DST_COLOR: number; - ONE_MINUS_SRC_ALPHA: number; - ONE_MINUS_SRC_COLOR: number; - OUT_OF_MEMORY: number; - PACK_ALIGNMENT: number; - POINTS: number; - POLYGON_OFFSET_FACTOR: number; - POLYGON_OFFSET_FILL: number; - POLYGON_OFFSET_UNITS: number; - RED_BITS: number; - RENDERBUFFER: number; - RENDERBUFFER_ALPHA_SIZE: number; - RENDERBUFFER_BINDING: number; - RENDERBUFFER_BLUE_SIZE: number; - RENDERBUFFER_DEPTH_SIZE: number; - RENDERBUFFER_GREEN_SIZE: number; - RENDERBUFFER_HEIGHT: number; - RENDERBUFFER_INTERNAL_FORMAT: number; - RENDERBUFFER_RED_SIZE: number; - RENDERBUFFER_STENCIL_SIZE: number; - RENDERBUFFER_WIDTH: number; - RENDERER: number; - REPEAT: number; - REPLACE: number; - RGB: number; - RGB565: number; - RGB5_A1: number; - RGBA: number; - RGBA4: number; - SAMPLER_2D: number; - SAMPLER_CUBE: number; - SAMPLES: number; - SAMPLE_ALPHA_TO_COVERAGE: number; - SAMPLE_BUFFERS: number; - SAMPLE_COVERAGE: number; - SAMPLE_COVERAGE_INVERT: number; - SAMPLE_COVERAGE_VALUE: number; - SCISSOR_BOX: number; - SCISSOR_TEST: number; - SHADER_TYPE: number; - SHADING_LANGUAGE_VERSION: number; - SHORT: number; - SRC_ALPHA: number; - SRC_ALPHA_SATURATE: number; - SRC_COLOR: number; - STATIC_DRAW: number; - STENCIL_ATTACHMENT: number; - STENCIL_BACK_FAIL: number; - STENCIL_BACK_FUNC: number; - STENCIL_BACK_PASS_DEPTH_FAIL: number; - STENCIL_BACK_PASS_DEPTH_PASS: number; - STENCIL_BACK_REF: number; - STENCIL_BACK_VALUE_MASK: number; - STENCIL_BACK_WRITEMASK: number; - STENCIL_BITS: number; - STENCIL_BUFFER_BIT: number; - STENCIL_CLEAR_VALUE: number; - STENCIL_FAIL: number; - STENCIL_FUNC: number; - STENCIL_INDEX: number; - STENCIL_INDEX8: number; - STENCIL_PASS_DEPTH_FAIL: number; - STENCIL_PASS_DEPTH_PASS: number; - STENCIL_REF: number; - STENCIL_TEST: number; - STENCIL_VALUE_MASK: number; - STENCIL_WRITEMASK: number; - STREAM_DRAW: number; - SUBPIXEL_BITS: number; - TEXTURE: number; - TEXTURE0: number; - TEXTURE1: number; - TEXTURE10: number; - TEXTURE11: number; - TEXTURE12: number; - TEXTURE13: number; - TEXTURE14: number; - TEXTURE15: number; - TEXTURE16: number; - TEXTURE17: number; - TEXTURE18: number; - TEXTURE19: number; - TEXTURE2: number; - TEXTURE20: number; - TEXTURE21: number; - TEXTURE22: number; - TEXTURE23: number; - TEXTURE24: number; - TEXTURE25: number; - TEXTURE26: number; - TEXTURE27: number; - TEXTURE28: number; - TEXTURE29: number; - TEXTURE3: number; - TEXTURE30: number; - TEXTURE31: number; - TEXTURE4: number; - TEXTURE5: number; - TEXTURE6: number; - TEXTURE7: number; - TEXTURE8: number; - TEXTURE9: number; - TEXTURE_2D: number; - TEXTURE_BINDING_2D: number; - TEXTURE_BINDING_CUBE_MAP: number; - TEXTURE_CUBE_MAP: number; - TEXTURE_CUBE_MAP_NEGATIVE_X: number; - TEXTURE_CUBE_MAP_NEGATIVE_Y: number; - TEXTURE_CUBE_MAP_NEGATIVE_Z: number; - TEXTURE_CUBE_MAP_POSITIVE_X: number; - TEXTURE_CUBE_MAP_POSITIVE_Y: number; - TEXTURE_CUBE_MAP_POSITIVE_Z: number; - TEXTURE_MAG_FILTER: number; - TEXTURE_MIN_FILTER: number; - TEXTURE_WRAP_S: number; - TEXTURE_WRAP_T: number; - TRIANGLES: number; - TRIANGLE_FAN: number; - TRIANGLE_STRIP: number; - UNPACK_ALIGNMENT: number; - UNPACK_COLORSPACE_CONVERSION_WEBGL: number; - UNPACK_FLIP_Y_WEBGL: number; - UNPACK_PREMULTIPLY_ALPHA_WEBGL: number; - UNSIGNED_BYTE: number; - UNSIGNED_INT: number; - UNSIGNED_SHORT: number; - UNSIGNED_SHORT_4_4_4_4: number; - UNSIGNED_SHORT_5_5_5_1: number; - UNSIGNED_SHORT_5_6_5: number; - VALIDATE_STATUS: number; - VENDOR: number; - VERSION: number; - VERTEX_ATTRIB_ARRAY_BUFFER_BINDING: number; - VERTEX_ATTRIB_ARRAY_ENABLED: number; - VERTEX_ATTRIB_ARRAY_NORMALIZED: number; - VERTEX_ATTRIB_ARRAY_POINTER: number; - VERTEX_ATTRIB_ARRAY_SIZE: number; - VERTEX_ATTRIB_ARRAY_STRIDE: number; - VERTEX_ATTRIB_ARRAY_TYPE: number; - VERTEX_SHADER: number; - VIEWPORT: number; - ZERO: number; -} - -interface WebGLShader extends WebGLObject { -} - -declare var WebGLShader: { - prototype: WebGLShader; - new(): WebGLShader; -} - -interface WebGLShaderPrecisionFormat { - precision: number; - rangeMax: number; - rangeMin: number; -} - -declare var WebGLShaderPrecisionFormat: { - prototype: WebGLShaderPrecisionFormat; - new(): WebGLShaderPrecisionFormat; -} - -interface WebGLTexture extends WebGLObject { -} - -declare var WebGLTexture: { - prototype: WebGLTexture; - new(): WebGLTexture; -} - -interface WebGLUniformLocation { -} - -declare var WebGLUniformLocation: { - prototype: WebGLUniformLocation; - new(): WebGLUniformLocation; -} - -interface WebKitCSSMatrix { - a: number; - b: number; - c: number; - d: number; - e: number; - f: number; - m11: number; - m12: number; - m13: number; - m14: number; - m21: number; - m22: number; - m23: number; - m24: number; - m31: number; - m32: number; - m33: number; - m34: number; - m41: number; - m42: number; - m43: number; - m44: number; - inverse(): WebKitCSSMatrix; - multiply(secondMatrix: WebKitCSSMatrix): WebKitCSSMatrix; - rotate(angleX: number, angleY?: number, angleZ?: number): WebKitCSSMatrix; - rotateAxisAngle(x: number, y: number, z: number, angle: number): WebKitCSSMatrix; - scale(scaleX: number, scaleY?: number, scaleZ?: number): WebKitCSSMatrix; - setMatrixValue(value: string): void; - skewX(angle: number): WebKitCSSMatrix; - skewY(angle: number): WebKitCSSMatrix; - toString(): string; - translate(x: number, y: number, z?: number): WebKitCSSMatrix; -} - -declare var WebKitCSSMatrix: { - prototype: WebKitCSSMatrix; - new(text?: string): WebKitCSSMatrix; -} - -interface WebKitPoint { - x: number; - y: number; -} - -declare var WebKitPoint: { - prototype: WebKitPoint; - new(x?: number, y?: number): WebKitPoint; -} - -interface WebSocket extends EventTarget { - binaryType: string; - bufferedAmount: number; - extensions: string; - onclose: (ev: CloseEvent) => any; - onerror: (ev: Event) => any; - onmessage: (ev: MessageEvent) => any; - onopen: (ev: Event) => any; - protocol: string; - readyState: number; - url: string; - close(code?: number, reason?: string): void; - send(data: any): void; - CLOSED: number; - CLOSING: number; - CONNECTING: number; - OPEN: number; - addEventListener(type: "close", listener: (ev: CloseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void; - addEventListener(type: "open", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var WebSocket: { - prototype: WebSocket; - new(url: string, protocols?: string | string[]): WebSocket; - CLOSED: number; - CLOSING: number; - CONNECTING: number; - OPEN: number; -} - -interface WheelEvent extends MouseEvent { - deltaMode: number; - deltaX: number; - deltaY: number; - deltaZ: number; - getCurrentPoint(element: Element): void; - initWheelEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, viewArg: Window, detailArg: number, screenXArg: number, screenYArg: number, clientXArg: number, clientYArg: number, buttonArg: number, relatedTargetArg: EventTarget, modifiersListArg: string, deltaXArg: number, deltaYArg: number, deltaZArg: number, deltaMode: number): void; - DOM_DELTA_LINE: number; - DOM_DELTA_PAGE: number; - DOM_DELTA_PIXEL: number; -} - -declare var WheelEvent: { - prototype: WheelEvent; - new(typeArg: string, eventInitDict?: WheelEventInit): WheelEvent; - DOM_DELTA_LINE: number; - DOM_DELTA_PAGE: number; - DOM_DELTA_PIXEL: number; -} - -interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 { - animationStartTime: number; - applicationCache: ApplicationCache; - clientInformation: Navigator; - closed: boolean; - crypto: Crypto; - defaultStatus: string; - devicePixelRatio: number; - doNotTrack: string; - document: Document; - event: Event; - external: External; - frameElement: Element; - frames: Window; - history: History; - innerHeight: number; - innerWidth: number; - length: number; - location: Location; - locationbar: BarProp; - menubar: BarProp; - msAnimationStartTime: number; - name: string; - navigator: Navigator; - offscreenBuffering: string | boolean; - onabort: (ev: Event) => any; - onafterprint: (ev: Event) => any; - onbeforeprint: (ev: Event) => any; - onbeforeunload: (ev: BeforeUnloadEvent) => any; - onblur: (ev: FocusEvent) => any; - oncanplay: (ev: Event) => any; - oncanplaythrough: (ev: Event) => any; - onchange: (ev: Event) => any; - onclick: (ev: MouseEvent) => any; - oncompassneedscalibration: (ev: Event) => any; - oncontextmenu: (ev: PointerEvent) => any; - ondblclick: (ev: MouseEvent) => any; - ondevicemotion: (ev: DeviceMotionEvent) => any; - ondeviceorientation: (ev: DeviceOrientationEvent) => any; - ondrag: (ev: DragEvent) => any; - ondragend: (ev: DragEvent) => any; - ondragenter: (ev: DragEvent) => any; - ondragleave: (ev: DragEvent) => any; - ondragover: (ev: DragEvent) => any; - ondragstart: (ev: DragEvent) => any; - ondrop: (ev: DragEvent) => any; - ondurationchange: (ev: Event) => any; - onemptied: (ev: Event) => any; - onended: (ev: Event) => any; - onerror: ErrorEventHandler; - onfocus: (ev: FocusEvent) => any; - onhashchange: (ev: HashChangeEvent) => any; - oninput: (ev: Event) => any; - onkeydown: (ev: KeyboardEvent) => any; - onkeypress: (ev: KeyboardEvent) => any; - onkeyup: (ev: KeyboardEvent) => any; - onload: (ev: Event) => any; - onloadeddata: (ev: Event) => any; - onloadedmetadata: (ev: Event) => any; - onloadstart: (ev: Event) => any; - onmessage: (ev: MessageEvent) => any; - onmousedown: (ev: MouseEvent) => any; - onmouseenter: (ev: MouseEvent) => any; - onmouseleave: (ev: MouseEvent) => any; - onmousemove: (ev: MouseEvent) => any; - onmouseout: (ev: MouseEvent) => any; - onmouseover: (ev: MouseEvent) => any; - onmouseup: (ev: MouseEvent) => any; - onmousewheel: (ev: MouseWheelEvent) => any; - onmsgesturechange: (ev: MSGestureEvent) => any; - onmsgesturedoubletap: (ev: MSGestureEvent) => any; - onmsgestureend: (ev: MSGestureEvent) => any; - onmsgesturehold: (ev: MSGestureEvent) => any; - onmsgesturestart: (ev: MSGestureEvent) => any; - onmsgesturetap: (ev: MSGestureEvent) => any; - onmsinertiastart: (ev: MSGestureEvent) => any; - onmspointercancel: (ev: MSPointerEvent) => any; - onmspointerdown: (ev: MSPointerEvent) => any; - onmspointerenter: (ev: MSPointerEvent) => any; - onmspointerleave: (ev: MSPointerEvent) => any; - onmspointermove: (ev: MSPointerEvent) => any; - onmspointerout: (ev: MSPointerEvent) => any; - onmspointerover: (ev: MSPointerEvent) => any; - onmspointerup: (ev: MSPointerEvent) => any; - onoffline: (ev: Event) => any; - ononline: (ev: Event) => any; - onorientationchange: (ev: Event) => any; - onpagehide: (ev: PageTransitionEvent) => any; - onpageshow: (ev: PageTransitionEvent) => any; - onpause: (ev: Event) => any; - onplay: (ev: Event) => any; - onplaying: (ev: Event) => any; - onpopstate: (ev: PopStateEvent) => any; - onprogress: (ev: ProgressEvent) => any; - onratechange: (ev: Event) => any; - onreadystatechange: (ev: ProgressEvent) => any; - onreset: (ev: Event) => any; - onresize: (ev: UIEvent) => any; - onscroll: (ev: UIEvent) => any; - onseeked: (ev: Event) => any; - onseeking: (ev: Event) => any; - onselect: (ev: UIEvent) => any; - onstalled: (ev: Event) => any; - onstorage: (ev: StorageEvent) => any; - onsubmit: (ev: Event) => any; - onsuspend: (ev: Event) => any; - ontimeupdate: (ev: Event) => any; - ontouchcancel: any; - ontouchend: any; - ontouchmove: any; - ontouchstart: any; - onunload: (ev: Event) => any; - onvolumechange: (ev: Event) => any; - onwaiting: (ev: Event) => any; - opener: Window; - orientation: string | number; - outerHeight: number; - outerWidth: number; - pageXOffset: number; - pageYOffset: number; - parent: Window; - performance: Performance; - personalbar: BarProp; - screen: Screen; - screenLeft: number; - screenTop: number; - screenX: number; - screenY: number; - scrollX: number; - scrollY: number; - scrollbars: BarProp; - self: Window; - status: string; - statusbar: BarProp; - styleMedia: StyleMedia; - toolbar: BarProp; - top: Window; - window: Window; - URL: URL; - alert(message?: any): void; - blur(): void; - cancelAnimationFrame(handle: number): void; - captureEvents(): void; - close(): void; - confirm(message?: string): boolean; - focus(): void; - getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration; - getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList; - getSelection(): Selection; - matchMedia(mediaQuery: string): MediaQueryList; - moveBy(x?: number, y?: number): void; - moveTo(x?: number, y?: number): void; - msCancelRequestAnimationFrame(handle: number): void; - msMatchMedia(mediaQuery: string): MediaQueryList; - msRequestAnimationFrame(callback: FrameRequestCallback): number; - msWriteProfilerMark(profilerMarkName: string): void; - open(url?: string, target?: string, features?: string, replace?: boolean): Window; - postMessage(message: any, targetOrigin: string, ports?: any): void; - print(): void; - prompt(message?: string, _default?: string): string; - releaseEvents(): void; - requestAnimationFrame(callback: FrameRequestCallback): number; - resizeBy(x?: number, y?: number): void; - resizeTo(x?: number, y?: number): void; - scroll(x?: number, y?: number): void; - scrollBy(x?: number, y?: number): void; - scrollTo(x?: number, y?: number): void; - webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint; - webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint; - addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void; - addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void; - addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; - addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; - addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void; - addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; - addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "popstate", listener: (ev: PopStateEvent) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; - addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void; - addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; - [index: number]: Window; -} - -declare var Window: { - prototype: Window; - new(): Window; -} - -interface Worker extends EventTarget, AbstractWorker { - onmessage: (ev: MessageEvent) => any; - postMessage(message: any, ports?: any): void; - terminate(): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var Worker: { - prototype: Worker; - new(stringUrl: string): Worker; -} - -interface XMLDocument extends Document { -} - -declare var XMLDocument: { - prototype: XMLDocument; - new(): XMLDocument; -} - -interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget { - msCaching: string; - onreadystatechange: (ev: ProgressEvent) => any; - readyState: number; - response: any; - responseBody: any; - responseText: string; - responseType: string; - responseXML: any; - status: number; - statusText: string; - timeout: number; - upload: XMLHttpRequestUpload; - withCredentials: boolean; - abort(): void; - getAllResponseHeaders(): string; - getResponseHeader(header: string): string; - msCachingEnabled(): boolean; - open(method: string, url: string, async?: boolean, user?: string, password?: string): void; - overrideMimeType(mime: string): void; - send(data?: Document): void; - send(data?: string): void; - send(data?: any): void; - setRequestHeader(header: string, value: string): void; - DONE: number; - HEADERS_RECEIVED: number; - LOADING: number; - OPENED: number; - UNSENT: number; - addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadend", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "timeout", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var XMLHttpRequest: { - prototype: XMLHttpRequest; - new(): XMLHttpRequest; - DONE: number; - HEADERS_RECEIVED: number; - LOADING: number; - OPENED: number; - UNSENT: number; - create(): XMLHttpRequest; -} - -interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget { - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -declare var XMLHttpRequestUpload: { - prototype: XMLHttpRequestUpload; - new(): XMLHttpRequestUpload; -} - -interface XMLSerializer { - serializeToString(target: Node): string; -} - -declare var XMLSerializer: { - prototype: XMLSerializer; - new(): XMLSerializer; -} - -interface XPathEvaluator { - createExpression(expression: string, resolver: XPathNSResolver): XPathExpression; - createNSResolver(nodeResolver?: Node): XPathNSResolver; - evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult; -} - -declare var XPathEvaluator: { - prototype: XPathEvaluator; - new(): XPathEvaluator; -} - -interface XPathExpression { - evaluate(contextNode: Node, type: number, result: XPathResult): XPathExpression; -} - -declare var XPathExpression: { - prototype: XPathExpression; - new(): XPathExpression; -} - -interface XPathNSResolver { - lookupNamespaceURI(prefix: string): string; -} - -declare var XPathNSResolver: { - prototype: XPathNSResolver; - new(): XPathNSResolver; -} - -interface XPathResult { - booleanValue: boolean; - invalidIteratorState: boolean; - numberValue: number; - resultType: number; - singleNodeValue: Node; - snapshotLength: number; - stringValue: string; - iterateNext(): Node; - snapshotItem(index: number): Node; - ANY_TYPE: number; - ANY_UNORDERED_NODE_TYPE: number; - BOOLEAN_TYPE: number; - FIRST_ORDERED_NODE_TYPE: number; - NUMBER_TYPE: number; - ORDERED_NODE_ITERATOR_TYPE: number; - ORDERED_NODE_SNAPSHOT_TYPE: number; - STRING_TYPE: number; - UNORDERED_NODE_ITERATOR_TYPE: number; - UNORDERED_NODE_SNAPSHOT_TYPE: number; -} - -declare var XPathResult: { - prototype: XPathResult; - new(): XPathResult; - ANY_TYPE: number; - ANY_UNORDERED_NODE_TYPE: number; - BOOLEAN_TYPE: number; - FIRST_ORDERED_NODE_TYPE: number; - NUMBER_TYPE: number; - ORDERED_NODE_ITERATOR_TYPE: number; - ORDERED_NODE_SNAPSHOT_TYPE: number; - STRING_TYPE: number; - UNORDERED_NODE_ITERATOR_TYPE: number; - UNORDERED_NODE_SNAPSHOT_TYPE: number; -} - -interface XSLTProcessor { - clearParameters(): void; - getParameter(namespaceURI: string, localName: string): any; - importStylesheet(style: Node): void; - removeParameter(namespaceURI: string, localName: string): void; - reset(): void; - setParameter(namespaceURI: string, localName: string, value: any): void; - transformToDocument(source: Node): Document; - transformToFragment(source: Node, document: Document): DocumentFragment; -} - -declare var XSLTProcessor: { - prototype: XSLTProcessor; - new(): XSLTProcessor; -} - -interface AbstractWorker { - onerror: (ev: Event) => any; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -interface ChildNode { - remove(): void; -} - -interface DOML2DeprecatedColorProperty { - color: string; -} - -interface DOML2DeprecatedSizeProperty { - size: number; -} - -interface DocumentEvent { - createEvent(eventInterface:"AnimationEvent"): AnimationEvent; - createEvent(eventInterface:"AriaRequestEvent"): AriaRequestEvent; - createEvent(eventInterface:"AudioProcessingEvent"): AudioProcessingEvent; - createEvent(eventInterface:"BeforeUnloadEvent"): BeforeUnloadEvent; - createEvent(eventInterface:"ClipboardEvent"): ClipboardEvent; - createEvent(eventInterface:"CloseEvent"): CloseEvent; - createEvent(eventInterface:"CommandEvent"): CommandEvent; - createEvent(eventInterface:"CompositionEvent"): CompositionEvent; - createEvent(eventInterface:"CustomEvent"): CustomEvent; - createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent; - createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent; - createEvent(eventInterface:"DragEvent"): DragEvent; - createEvent(eventInterface:"ErrorEvent"): ErrorEvent; - createEvent(eventInterface:"Event"): Event; - createEvent(eventInterface:"Events"): Event; - createEvent(eventInterface:"FocusEvent"): FocusEvent; - createEvent(eventInterface:"GamepadEvent"): GamepadEvent; - createEvent(eventInterface:"HashChangeEvent"): HashChangeEvent; - createEvent(eventInterface:"IDBVersionChangeEvent"): IDBVersionChangeEvent; - createEvent(eventInterface:"KeyboardEvent"): KeyboardEvent; - createEvent(eventInterface:"LongRunningScriptDetectedEvent"): LongRunningScriptDetectedEvent; - createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent; - createEvent(eventInterface:"MSManipulationEvent"): MSManipulationEvent; - createEvent(eventInterface:"MSMediaKeyMessageEvent"): MSMediaKeyMessageEvent; - createEvent(eventInterface:"MSMediaKeyNeededEvent"): MSMediaKeyNeededEvent; - createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent; - createEvent(eventInterface:"MSSiteModeEvent"): MSSiteModeEvent; - createEvent(eventInterface:"MessageEvent"): MessageEvent; - createEvent(eventInterface:"MouseEvent"): MouseEvent; - createEvent(eventInterface:"MouseEvents"): MouseEvent; - createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent; - createEvent(eventInterface:"MutationEvent"): MutationEvent; - createEvent(eventInterface:"MutationEvents"): MutationEvent; - createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent; - createEvent(eventInterface:"NavigationEvent"): NavigationEvent; - createEvent(eventInterface:"NavigationEventWithReferrer"): NavigationEventWithReferrer; - createEvent(eventInterface:"OfflineAudioCompletionEvent"): OfflineAudioCompletionEvent; - createEvent(eventInterface:"PageTransitionEvent"): PageTransitionEvent; - createEvent(eventInterface:"PermissionRequestedEvent"): PermissionRequestedEvent; - createEvent(eventInterface:"PointerEvent"): PointerEvent; - createEvent(eventInterface:"PopStateEvent"): PopStateEvent; - createEvent(eventInterface:"ProgressEvent"): ProgressEvent; - createEvent(eventInterface:"SVGZoomEvent"): SVGZoomEvent; - createEvent(eventInterface:"SVGZoomEvents"): SVGZoomEvent; - createEvent(eventInterface:"ScriptNotifyEvent"): ScriptNotifyEvent; - createEvent(eventInterface:"StorageEvent"): StorageEvent; - createEvent(eventInterface:"TextEvent"): TextEvent; - createEvent(eventInterface:"TouchEvent"): TouchEvent; - createEvent(eventInterface:"TrackEvent"): TrackEvent; - createEvent(eventInterface:"TransitionEvent"): TransitionEvent; - createEvent(eventInterface:"UIEvent"): UIEvent; - createEvent(eventInterface:"UIEvents"): UIEvent; - createEvent(eventInterface:"UnviewableContentIdentifiedEvent"): UnviewableContentIdentifiedEvent; - createEvent(eventInterface:"WebGLContextEvent"): WebGLContextEvent; - createEvent(eventInterface:"WheelEvent"): WheelEvent; - createEvent(eventInterface: string): Event; -} - -interface ElementTraversal { - childElementCount: number; - firstElementChild: Element; - lastElementChild: Element; - nextElementSibling: Element; - previousElementSibling: Element; -} - -interface GetSVGDocument { - getSVGDocument(): Document; -} - -interface GlobalEventHandlers { - onpointercancel: (ev: PointerEvent) => any; - onpointerdown: (ev: PointerEvent) => any; - onpointerenter: (ev: PointerEvent) => any; - onpointerleave: (ev: PointerEvent) => any; - onpointermove: (ev: PointerEvent) => any; - onpointerout: (ev: PointerEvent) => any; - onpointerover: (ev: PointerEvent) => any; - onpointerup: (ev: PointerEvent) => any; - onwheel: (ev: WheelEvent) => any; - addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; - addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -interface HTMLTableAlignment { - /** - * Sets or retrieves a value that you can use to implement your own ch functionality for the object. - */ - ch: string; - /** - * Sets or retrieves a value that you can use to implement your own chOff functionality for the object. - */ - chOff: string; - /** - * Sets or retrieves how text and other content are vertically aligned within the object that contains them. - */ - vAlign: string; -} - -interface IDBEnvironment { - indexedDB: IDBFactory; - msIndexedDB: IDBFactory; -} - -interface LinkStyle { - sheet: StyleSheet; -} - -interface MSBaseReader { - onabort: (ev: Event) => any; - onerror: (ev: Event) => any; - onload: (ev: Event) => any; - onloadend: (ev: ProgressEvent) => any; - onloadstart: (ev: Event) => any; - onprogress: (ev: ProgressEvent) => any; - readyState: number; - result: any; - abort(): void; - DONE: number; - EMPTY: number; - LOADING: number; - addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadend", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -interface MSFileSaver { - msSaveBlob(blob: any, defaultName?: string): boolean; - msSaveOrOpenBlob(blob: any, defaultName?: string): boolean; -} - -interface MSNavigatorDoNotTrack { - confirmSiteSpecificTrackingException(args: ConfirmSiteSpecificExceptionsInformation): boolean; - confirmWebWideTrackingException(args: ExceptionInformation): boolean; - removeSiteSpecificTrackingException(args: ExceptionInformation): void; - removeWebWideTrackingException(args: ExceptionInformation): void; - storeSiteSpecificTrackingException(args: StoreSiteSpecificExceptionsInformation): void; - storeWebWideTrackingException(args: StoreExceptionsInformation): void; -} - -interface NavigatorContentUtils { -} - -interface NavigatorGeolocation { - geolocation: Geolocation; -} - -interface NavigatorID { - appName: string; - appVersion: string; - platform: string; - product: string; - productSub: string; - userAgent: string; - vendor: string; - vendorSub: string; -} - -interface NavigatorOnLine { - onLine: boolean; -} - -interface NavigatorStorageUtils { -} - -interface NodeSelector { - querySelector(selectors: string): Element; - querySelectorAll(selectors: string): NodeListOf; -} - -interface RandomSource { - getRandomValues(array: ArrayBufferView): ArrayBufferView; -} - -interface SVGAnimatedPathData { - pathSegList: SVGPathSegList; -} - -interface SVGAnimatedPoints { - animatedPoints: SVGPointList; - points: SVGPointList; -} - -interface SVGExternalResourcesRequired { - externalResourcesRequired: SVGAnimatedBoolean; -} - -interface SVGFilterPrimitiveStandardAttributes extends SVGStylable { - height: SVGAnimatedLength; - result: SVGAnimatedString; - width: SVGAnimatedLength; - x: SVGAnimatedLength; - y: SVGAnimatedLength; -} - -interface SVGFitToViewBox { - preserveAspectRatio: SVGAnimatedPreserveAspectRatio; - viewBox: SVGAnimatedRect; -} - -interface SVGLangSpace { - xmllang: string; - xmlspace: string; -} - -interface SVGLocatable { - farthestViewportElement: SVGElement; - nearestViewportElement: SVGElement; - getBBox(): SVGRect; - getCTM(): SVGMatrix; - getScreenCTM(): SVGMatrix; - getTransformToElement(element: SVGElement): SVGMatrix; -} - -interface SVGStylable { - className: any; - style: CSSStyleDeclaration; -} - -interface SVGTests { - requiredExtensions: SVGStringList; - requiredFeatures: SVGStringList; - systemLanguage: SVGStringList; - hasExtension(extension: string): boolean; -} - -interface SVGTransformable extends SVGLocatable { - transform: SVGAnimatedTransformList; -} - -interface SVGURIReference { - href: SVGAnimatedString; -} - -interface WindowBase64 { - atob(encodedString: string): string; - btoa(rawString: string): string; -} - -interface WindowConsole { - console: Console; -} - -interface WindowLocalStorage { - localStorage: Storage; -} - -interface WindowSessionStorage { - sessionStorage: Storage; -} - -interface WindowTimers extends Object, WindowTimersExtension { - clearInterval(handle: number): void; - clearTimeout(handle: number): void; - setInterval(handler: any, timeout?: any, ...args: any[]): number; - setTimeout(handler: any, timeout?: any, ...args: any[]): number; -} - -interface WindowTimersExtension { - clearImmediate(handle: number): void; - msClearImmediate(handle: number): void; - msSetImmediate(expression: any, ...args: any[]): number; - setImmediate(expression: any, ...args: any[]): number; -} - -interface XMLHttpRequestEventTarget { - onabort: (ev: Event) => any; - onerror: (ev: Event) => any; - onload: (ev: Event) => any; - onloadend: (ev: ProgressEvent) => any; - onloadstart: (ev: Event) => any; - onprogress: (ev: ProgressEvent) => any; - ontimeout: (ev: ProgressEvent) => any; - addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; - addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "loadend", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; - addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: "timeout", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; - addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -} - -interface StorageEventInit extends EventInit { - key?: string; - oldValue?: string; - newValue?: string; - url: string; - storageArea?: Storage; -} - -interface IDBObjectStoreParameters { - keyPath?: string | string[]; - autoIncrement?: boolean; -} - -interface IDBIndexParameters { - unique?: boolean; - multiEntry?: boolean; -} - -interface NodeListOf extends NodeList { - length: number; - item(index: number): TNode; - [index: number]: TNode; -} - -interface BlobPropertyBag { - type?: string; - endings?: string; -} - -interface FilePropertyBag { - type?: string; - lastModified?: number; -} - -interface EventListenerObject { - handleEvent(evt: Event): void; -} - -interface MessageEventInit extends EventInit { - data?: any; - origin?: string; - lastEventId?: string; - channel?: string; - source?: any; - ports?: MessagePort[]; -} - -interface ProgressEventInit extends EventInit { - lengthComputable?: boolean; - loaded?: number; - total?: number; -} - -interface HTMLTemplateElement extends HTMLElement { - content: DocumentFragment; -} - -declare var HTMLTemplateElement: { - prototype: HTMLTemplateElement; - new(): HTMLTemplateElement; -} - -interface HTMLPictureElement extends HTMLElement { -} - -declare var HTMLPictureElement: { - prototype: HTMLPictureElement; - new(): HTMLPictureElement; -} - -declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject; - -interface ErrorEventHandler { - (message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void; -} -interface PositionCallback { - (position: Position): void; -} -interface PositionErrorCallback { - (error: PositionError): void; -} -interface MediaQueryListListener { - (mql: MediaQueryList): void; -} -interface MSLaunchUriCallback { - (): void; -} -interface FrameRequestCallback { - (time: number): void; -} -interface MSUnsafeFunctionCallback { - (): any; -} -interface MSExecAtPriorityFunctionCallback { - (...args: any[]): any; -} -interface MutationCallback { - (mutations: MutationRecord[], observer: MutationObserver): void; -} -interface DecodeSuccessCallback { - (decodedData: AudioBuffer): void; -} -interface DecodeErrorCallback { - (): void; -} -interface FunctionStringCallback { - (data: string): void; -} -declare var Audio: {new(src?: string): HTMLAudioElement; }; -declare var Image: {new(width?: number, height?: number): HTMLImageElement; }; -declare var Option: {new(text?: string, value?: string, defaultSelected?: boolean, selected?: boolean): HTMLOptionElement; }; -declare var animationStartTime: number; -declare var applicationCache: ApplicationCache; -declare var clientInformation: Navigator; -declare var closed: boolean; -declare var crypto: Crypto; -declare var defaultStatus: string; -declare var devicePixelRatio: number; -declare var doNotTrack: string; -declare var document: Document; -declare var event: Event; -declare var external: External; -declare var frameElement: Element; -declare var frames: Window; -declare var history: History; -declare var innerHeight: number; -declare var innerWidth: number; -declare var length: number; -declare var location: Location; -declare var locationbar: BarProp; -declare var menubar: BarProp; -declare var msAnimationStartTime: number; -declare var name: string; -declare var navigator: Navigator; -declare var offscreenBuffering: string | boolean; -declare var onabort: (ev: Event) => any; -declare var onafterprint: (ev: Event) => any; -declare var onbeforeprint: (ev: Event) => any; -declare var onbeforeunload: (ev: BeforeUnloadEvent) => any; -declare var onblur: (ev: FocusEvent) => any; -declare var oncanplay: (ev: Event) => any; -declare var oncanplaythrough: (ev: Event) => any; -declare var onchange: (ev: Event) => any; -declare var onclick: (ev: MouseEvent) => any; -declare var oncompassneedscalibration: (ev: Event) => any; -declare var oncontextmenu: (ev: PointerEvent) => any; -declare var ondblclick: (ev: MouseEvent) => any; -declare var ondevicemotion: (ev: DeviceMotionEvent) => any; -declare var ondeviceorientation: (ev: DeviceOrientationEvent) => any; -declare var ondrag: (ev: DragEvent) => any; -declare var ondragend: (ev: DragEvent) => any; -declare var ondragenter: (ev: DragEvent) => any; -declare var ondragleave: (ev: DragEvent) => any; -declare var ondragover: (ev: DragEvent) => any; -declare var ondragstart: (ev: DragEvent) => any; -declare var ondrop: (ev: DragEvent) => any; -declare var ondurationchange: (ev: Event) => any; -declare var onemptied: (ev: Event) => any; -declare var onended: (ev: Event) => any; -declare var onerror: ErrorEventHandler; -declare var onfocus: (ev: FocusEvent) => any; -declare var onhashchange: (ev: HashChangeEvent) => any; -declare var oninput: (ev: Event) => any; -declare var onkeydown: (ev: KeyboardEvent) => any; -declare var onkeypress: (ev: KeyboardEvent) => any; -declare var onkeyup: (ev: KeyboardEvent) => any; -declare var onload: (ev: Event) => any; -declare var onloadeddata: (ev: Event) => any; -declare var onloadedmetadata: (ev: Event) => any; -declare var onloadstart: (ev: Event) => any; -declare var onmessage: (ev: MessageEvent) => any; -declare var onmousedown: (ev: MouseEvent) => any; -declare var onmouseenter: (ev: MouseEvent) => any; -declare var onmouseleave: (ev: MouseEvent) => any; -declare var onmousemove: (ev: MouseEvent) => any; -declare var onmouseout: (ev: MouseEvent) => any; -declare var onmouseover: (ev: MouseEvent) => any; -declare var onmouseup: (ev: MouseEvent) => any; -declare var onmousewheel: (ev: MouseWheelEvent) => any; -declare var onmsgesturechange: (ev: MSGestureEvent) => any; -declare var onmsgesturedoubletap: (ev: MSGestureEvent) => any; -declare var onmsgestureend: (ev: MSGestureEvent) => any; -declare var onmsgesturehold: (ev: MSGestureEvent) => any; -declare var onmsgesturestart: (ev: MSGestureEvent) => any; -declare var onmsgesturetap: (ev: MSGestureEvent) => any; -declare var onmsinertiastart: (ev: MSGestureEvent) => any; -declare var onmspointercancel: (ev: MSPointerEvent) => any; -declare var onmspointerdown: (ev: MSPointerEvent) => any; -declare var onmspointerenter: (ev: MSPointerEvent) => any; -declare var onmspointerleave: (ev: MSPointerEvent) => any; -declare var onmspointermove: (ev: MSPointerEvent) => any; -declare var onmspointerout: (ev: MSPointerEvent) => any; -declare var onmspointerover: (ev: MSPointerEvent) => any; -declare var onmspointerup: (ev: MSPointerEvent) => any; -declare var onoffline: (ev: Event) => any; -declare var ononline: (ev: Event) => any; -declare var onorientationchange: (ev: Event) => any; -declare var onpagehide: (ev: PageTransitionEvent) => any; -declare var onpageshow: (ev: PageTransitionEvent) => any; -declare var onpause: (ev: Event) => any; -declare var onplay: (ev: Event) => any; -declare var onplaying: (ev: Event) => any; -declare var onpopstate: (ev: PopStateEvent) => any; -declare var onprogress: (ev: ProgressEvent) => any; -declare var onratechange: (ev: Event) => any; -declare var onreadystatechange: (ev: ProgressEvent) => any; -declare var onreset: (ev: Event) => any; -declare var onresize: (ev: UIEvent) => any; -declare var onscroll: (ev: UIEvent) => any; -declare var onseeked: (ev: Event) => any; -declare var onseeking: (ev: Event) => any; -declare var onselect: (ev: UIEvent) => any; -declare var onstalled: (ev: Event) => any; -declare var onstorage: (ev: StorageEvent) => any; -declare var onsubmit: (ev: Event) => any; -declare var onsuspend: (ev: Event) => any; -declare var ontimeupdate: (ev: Event) => any; -declare var ontouchcancel: any; -declare var ontouchend: any; -declare var ontouchmove: any; -declare var ontouchstart: any; -declare var onunload: (ev: Event) => any; -declare var onvolumechange: (ev: Event) => any; -declare var onwaiting: (ev: Event) => any; -declare var opener: Window; -declare var orientation: string | number; -declare var outerHeight: number; -declare var outerWidth: number; -declare var pageXOffset: number; -declare var pageYOffset: number; -declare var parent: Window; -declare var performance: Performance; -declare var personalbar: BarProp; -declare var screen: Screen; -declare var screenLeft: number; -declare var screenTop: number; -declare var screenX: number; -declare var screenY: number; -declare var scrollX: number; -declare var scrollY: number; -declare var scrollbars: BarProp; -declare var self: Window; -declare var status: string; -declare var statusbar: BarProp; -declare var styleMedia: StyleMedia; -declare var toolbar: BarProp; -declare var top: Window; -declare var window: Window; -declare var URL: URL; -declare function alert(message?: any): void; -declare function blur(): void; -declare function cancelAnimationFrame(handle: number): void; -declare function captureEvents(): void; -declare function close(): void; -declare function confirm(message?: string): boolean; -declare function focus(): void; -declare function getComputedStyle(elt: Element, pseudoElt?: string): CSSStyleDeclaration; -declare function getMatchedCSSRules(elt: Element, pseudoElt?: string): CSSRuleList; -declare function getSelection(): Selection; -declare function matchMedia(mediaQuery: string): MediaQueryList; -declare function moveBy(x?: number, y?: number): void; -declare function moveTo(x?: number, y?: number): void; -declare function msCancelRequestAnimationFrame(handle: number): void; -declare function msMatchMedia(mediaQuery: string): MediaQueryList; -declare function msRequestAnimationFrame(callback: FrameRequestCallback): number; -declare function msWriteProfilerMark(profilerMarkName: string): void; -declare function open(url?: string, target?: string, features?: string, replace?: boolean): Window; -declare function postMessage(message: any, targetOrigin: string, ports?: any): void; -declare function print(): void; -declare function prompt(message?: string, _default?: string): string; -declare function releaseEvents(): void; -declare function requestAnimationFrame(callback: FrameRequestCallback): number; -declare function resizeBy(x?: number, y?: number): void; -declare function resizeTo(x?: number, y?: number): void; -declare function scroll(x?: number, y?: number): void; -declare function scrollBy(x?: number, y?: number): void; -declare function scrollTo(x?: number, y?: number): void; -declare function webkitConvertPointFromNodeToPage(node: Node, pt: WebKitPoint): WebKitPoint; -declare function webkitConvertPointFromPageToNode(node: Node, pt: WebKitPoint): WebKitPoint; -declare function toString(): string; -declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -declare function dispatchEvent(evt: Event): boolean; -declare function removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; -declare function clearInterval(handle: number): void; -declare function clearTimeout(handle: number): void; -declare function setInterval(handler: any, timeout?: any, ...args: any[]): number; -declare function setTimeout(handler: any, timeout?: any, ...args: any[]): number; -declare function clearImmediate(handle: number): void; -declare function msClearImmediate(handle: number): void; -declare function msSetImmediate(expression: any, ...args: any[]): number; -declare function setImmediate(expression: any, ...args: any[]): number; -declare var sessionStorage: Storage; -declare var localStorage: Storage; -declare var console: Console; -declare var onpointercancel: (ev: PointerEvent) => any; -declare var onpointerdown: (ev: PointerEvent) => any; -declare var onpointerenter: (ev: PointerEvent) => any; -declare var onpointerleave: (ev: PointerEvent) => any; -declare var onpointermove: (ev: PointerEvent) => any; -declare var onpointerout: (ev: PointerEvent) => any; -declare var onpointerover: (ev: PointerEvent) => any; -declare var onpointerup: (ev: PointerEvent) => any; -declare var onwheel: (ev: WheelEvent) => any; -declare var indexedDB: IDBFactory; -declare var msIndexedDB: IDBFactory; -declare function atob(encodedString: string): string; -declare function btoa(rawString: string): string; -declare function addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSGestureHold", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSGestureStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSGestureTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSInertiaStart", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerCancel", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerDown", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerEnter", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerLeave", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerMove", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerOut", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerOver", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "MSPointerUp", listener: (ev: MSPointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "abort", listener: (ev: UIEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "afterprint", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "beforeprint", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "beforeunload", listener: (ev: BeforeUnloadEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "blur", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "canplay", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "canplaythrough", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "change", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "click", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "compassneedscalibration", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "contextmenu", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "dblclick", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "devicemotion", listener: (ev: DeviceMotionEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "deviceorientation", listener: (ev: DeviceOrientationEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "drag", listener: (ev: DragEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "dragend", listener: (ev: DragEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "dragenter", listener: (ev: DragEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "dragleave", listener: (ev: DragEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "dragover", listener: (ev: DragEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "dragstart", listener: (ev: DragEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "drop", listener: (ev: DragEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "durationchange", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "emptied", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "ended", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "focus", listener: (ev: FocusEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "hashchange", listener: (ev: HashChangeEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "input", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "keydown", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "keypress", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "keyup", listener: (ev: KeyboardEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "load", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "loadeddata", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "loadedmetadata", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "loadstart", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mousedown", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mouseenter", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mouseleave", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mousemove", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mouseout", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mouseover", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mouseup", listener: (ev: MouseEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "mousewheel", listener: (ev: MouseWheelEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "offline", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "online", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "orientationchange", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pagehide", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pageshow", listener: (ev: PageTransitionEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pause", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "play", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "playing", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointercancel", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointerleave", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointermove", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointerover", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "pointerup", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "popstate", listener: (ev: PopStateEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "progress", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "ratechange", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "readystatechange", listener: (ev: ProgressEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "reset", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "resize", listener: (ev: UIEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "scroll", listener: (ev: UIEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "seeked", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "seeking", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "select", listener: (ev: UIEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "stalled", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "storage", listener: (ev: StorageEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: "submit", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "suspend", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "timeupdate", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "unload", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void; -declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void; -declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;interface DOMTokenList { - [Symbol.iterator](): IterableIterator; -} - -interface NodeList { - [Symbol.iterator](): IterableIterator -} - -interface NodeListOf { - [Symbol.iterator](): IterableIterator -} - -///////////////////////////// -/// WorkerGlobalScope APIs -///////////////////////////// -// These are only available in a Web Worker -declare function importScripts(...urls: string[]): void; - - -///////////////////////////// -/// Windows Script Host APIS -///////////////////////////// - - -interface ActiveXObject { - new (s: string): any; -} -declare var ActiveXObject: ActiveXObject; - -interface ITextWriter { - Write(s: string): void; - WriteLine(s: string): void; - Close(): void; -} - -interface TextStreamBase { - /** - * The column number of the current character position in an input stream. - */ - Column: number; - - /** - * The current line number in an input stream. - */ - Line: number; - - /** - * Closes a text stream. - * It is not necessary to close standard streams; they close automatically when the process ends. If - * you close a standard stream, be aware that any other pointers to that standard stream become invalid. - */ - Close(): void; -} - -interface TextStreamWriter extends TextStreamBase { - /** - * Sends a string to an output stream. - */ - Write(s: string): void; - - /** - * Sends a specified number of blank lines (newline characters) to an output stream. - */ - WriteBlankLines(intLines: number): void; - - /** - * Sends a string followed by a newline character to an output stream. - */ - WriteLine(s: string): void; -} - -interface TextStreamReader extends TextStreamBase { - /** - * Returns a specified number of characters from an input stream, starting at the current pointer position. - * Does not return until the ENTER key is pressed. - * Can only be used on a stream in reading mode; causes an error in writing or appending mode. - */ - Read(characters: number): string; - - /** - * Returns all characters from an input stream. - * Can only be used on a stream in reading mode; causes an error in writing or appending mode. - */ - ReadAll(): string; - - /** - * Returns an entire line from an input stream. - * Although this method extracts the newline character, it does not add it to the returned string. - * Can only be used on a stream in reading mode; causes an error in writing or appending mode. - */ - ReadLine(): string; - - /** - * Skips a specified number of characters when reading from an input text stream. - * Can only be used on a stream in reading mode; causes an error in writing or appending mode. - * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.) - */ - Skip(characters: number): void; - - /** - * Skips the next line when reading from an input text stream. - * Can only be used on a stream in reading mode, not writing or appending mode. - */ - SkipLine(): void; - - /** - * Indicates whether the stream pointer position is at the end of a line. - */ - AtEndOfLine: boolean; - - /** - * Indicates whether the stream pointer position is at the end of a stream. - */ - AtEndOfStream: boolean; -} - -declare var WScript: { - /** - * Outputs text to either a message box (under WScript.exe) or the command console window followed by - * a newline (under CScript.exe). - */ - Echo(s: any): void; - - /** - * Exposes the write-only error output stream for the current script. - * Can be accessed only while using CScript.exe. - */ - StdErr: TextStreamWriter; - - /** - * Exposes the write-only output stream for the current script. - * Can be accessed only while using CScript.exe. - */ - StdOut: TextStreamWriter; - Arguments: { length: number; Item(n: number): string; }; - - /** - * The full path of the currently running script. - */ - ScriptFullName: string; - - /** - * Forces the script to stop immediately, with an optional exit code. - */ - Quit(exitCode?: number): number; - - /** - * The Windows Script Host build version number. - */ - BuildVersion: number; - - /** - * Fully qualified path of the host executable. - */ - FullName: string; - - /** - * Gets/sets the script mode - interactive(true) or batch(false). - */ - Interactive: boolean; - - /** - * The name of the host executable (WScript.exe or CScript.exe). - */ - Name: string; - - /** - * Path of the directory containing the host executable. - */ - Path: string; - - /** - * The filename of the currently running script. - */ - ScriptName: string; - - /** - * Exposes the read-only input stream for the current script. - * Can be accessed only while using CScript.exe. - */ - StdIn: TextStreamReader; - - /** - * Windows Script Host version - */ - Version: string; - - /** - * Connects a COM object's event sources to functions named with a given prefix, in the form prefix_event. - */ - ConnectObject(objEventSource: any, strPrefix: string): void; - - /** - * Creates a COM object. - * @param strProgiID - * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events. - */ - CreateObject(strProgID: string, strPrefix?: string): any; - - /** - * Disconnects a COM object from its event sources. - */ - DisconnectObject(obj: any): void; - - /** - * Retrieves an existing object with the specified ProgID from memory, or creates a new one from a file. - * @param strPathname Fully qualified path to the file containing the object persisted to disk. - * For objects in memory, pass a zero-length string. - * @param strProgID - * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events. - */ - GetObject(strPathname: string, strProgID?: string, strPrefix?: string): any; - - /** - * Suspends script execution for a specified length of time, then continues execution. - * @param intTime Interval (in milliseconds) to suspend script execution. - */ - Sleep(intTime: number): void; -}; - -/** - * Allows enumerating over a COM collection, which may not have indexed item access. - */ -interface Enumerator { - /** - * Returns true if the current item is the last one in the collection, or the collection is empty, - * or the current item is undefined. - */ - atEnd(): boolean; - - /** - * Returns the current item in the collection - */ - item(): T; - - /** - * Resets the current item in the collection to the first item. If there are no items in the collection, - * the current item is set to undefined. - */ - moveFirst(): void; - - /** - * Moves the current item to the next item in the collection. If the enumerator is at the end of - * the collection or the collection is empty, the current item is set to undefined. - */ - moveNext(): void; -} - -interface EnumeratorConstructor { - new (collection: any): Enumerator; - new (collection: any): Enumerator; -} - -declare var Enumerator: EnumeratorConstructor; - -/** - * Enables reading from a COM safe array, which might have an alternate lower bound, or multiple dimensions. - */ -interface VBArray { - /** - * Returns the number of dimensions (1-based). - */ - dimensions(): number; - - /** - * Takes an index for each dimension in the array, and returns the item at the corresponding location. - */ - getItem(dimension1Index: number, ...dimensionNIndexes: number[]): T; - - /** - * Returns the smallest available index for a given dimension. - * @param dimension 1-based dimension (defaults to 1) - */ - lbound(dimension?: number): number; - - /** - * Returns the largest available index for a given dimension. - * @param dimension 1-based dimension (defaults to 1) - */ - ubound(dimension?: number): number; - - /** - * Returns a Javascript array with all the elements in the VBArray. If there are multiple dimensions, - * each successive dimension is appended to the end of the array. - * Example: [[1,2,3],[4,5,6]] becomes [1,2,3,4,5,6] - */ - toArray(): T[]; -} - -interface VBArrayConstructor { - new (safeArray: any): VBArray; - new (safeArray: any): VBArray; -} - -declare var VBArray: VBArrayConstructor; diff --git a/package.json b/package.json index e8014d799..98a226820 100644 --- a/package.json +++ b/package.json @@ -1,63 +1,62 @@ { - "name": "hazelcast-client", - "version": "3.12.3", - "description": "Hazelcast - open source In-Memory Data Grid - client for NodeJS", - "main": "lib/index.js", - "dependencies": { - "bluebird": "3.5.4", - "long": "3.2.0" - }, - "devDependencies": { - "@types/bluebird": "3.5.21", - "@types/long": "3.0.32", - "@types/node": "6.0.87", - "chai": "4.1.2", - "chai-as-promised": "7.1.1", - "istanbul": "0.4.5", - "jsonschema": "1.2.4", - "mocha": "3.5.3", - "mocha-junit-reporter": "1.18.0", - "mousse": "0.3.1", - "remap-istanbul": "0.9.6", - "rimraf": "2.6.2", - "sinon": "4.0.0", - "thrift": "^0.9.3", - "tslint": "5.7.0", - "typescript": "2.5.2", - "winston": "2.3.1" - }, - "engines": { - "node": ">=8" - }, - "scripts": { - "clean": "rimraf lib typings *.jar *.log", - "compile": "tsc", - "pretest": "node download-remote-controller.js", - "test": "mocha --recursive --reporter-options mochaFile=report.xml --reporter mocha-junit-reporter", - "precoverage": "node download-remote-controller.js", - "coverage": "rimraf coverage && istanbul cover --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter-options mochaFile=report.xml --reporter mocha-junit-reporter", - "coverage-without-codecs": "rimraf coverage && istanbul cover -x **/codec/**/* --root lib/ --include-all-sources node_modules/mocha/bin/_mocha -- --recursive --reporter spec", - "postcoverage": "remap-istanbul -i coverage/coverage.json -o coverage/cobertura-coverage.xml -t cobertura && remap-istanbul -i coverage/coverage.json -o coverage -t html", - "pregenerate-docs": "rimraf docs", - "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", - "lint": "tslint --project tsconfig.json -t stylish" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/hazelcast/hazelcast-nodejs-client.git" - }, - "keywords": [ - "hazelcast", - "nodejs", - "node", - "client", - "data", - "grid" - ], - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues" - }, - "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme", - "typings": "./lib/index" + "name": "hazelcast-client", + "version": "4.0.0", + "description": "Hazelcast - open source In-Memory Data Grid - client for Node.js", + "main": "lib/index.js", + "dependencies": { + "bluebird": "3.7.2", + "long": "4.0.0" + }, + "devDependencies": { + "@types/bluebird": "^3.5.32", + "@types/long": "^4.0.1", + "@types/node": "^8.10.60", + "@typescript-eslint/eslint-plugin": "^2.34.0", + "@typescript-eslint/parser": "^2.34.0", + "chai": "^4.2.0", + "chai-as-promised": "^7.1.1", + "eslint": "^6.8.0", + "jsonschema": "^1.2.6", + "mocha": "^7.2.0", + "mocha-junit-reporter": "^1.23.3", + "mousse": "^0.3.1", + "nyc": "^15.1.0", + "rimraf": "^3.0.2", + "sinon": "^9.0.2", + "thrift": "^0.12.0", + "typescript": "^3.9.5", + "winston": "^3.2.1" + }, + "engines": { + "node": ">=8" + }, + "scripts": { + "clean": "rimraf lib *.jar *.log", + "compile": "tsc", + "pretest": "node download-remote-controller.js", + "test": "mocha --recursive", + "precoverage": "node download-remote-controller.js", + "coverage": "rimraf coverage && nyc node_modules/mocha/bin/_mocha -- --recursive --reporter-options mochaFile=report.xml --reporter mocha-junit-reporter", + "pregenerate-docs": "rimraf docs", + "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", + "lint": "eslint --ext .ts ." + }, + "repository": { + "type": "git", + "url": "git+https://github.com/hazelcast/hazelcast-nodejs-client.git" + }, + "keywords": [ + "hazelcast", + "nodejs", + "node", + "client", + "data", + "grid" + ], + "license": "Apache-2.0", + "bugs": { + "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues" + }, + "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme", + "typings": "./lib/index" } diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index 0158a1567..1e5db18f0 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -14,29 +14,28 @@ * limitations under the License. */ -/* tslint:disable:no-bitwise */ export class BitsUtil { - static BYTE_SIZE_IN_BYTES: number = 1; - static BOOLEAN_SIZE_IN_BYTES: number = 1; - static SHORT_SIZE_IN_BYTES: number = 2; - static CHAR_SIZE_IN_BYTES: number = 2; - static INT_SIZE_IN_BYTES: number = 4; - static FLOAT_SIZE_IN_BYTES: number = 4; - static LONG_SIZE_IN_BYTES: number = 8; - static DOUBLE_SIZE_IN_BYTES: number = 8; + static BYTE_SIZE_IN_BYTES = 1; + static BOOLEAN_SIZE_IN_BYTES = 1; + static SHORT_SIZE_IN_BYTES = 2; + static CHAR_SIZE_IN_BYTES = 2; + static INT_SIZE_IN_BYTES = 4; + static FLOAT_SIZE_IN_BYTES = 4; + static LONG_SIZE_IN_BYTES = 8; + static DOUBLE_SIZE_IN_BYTES = 8; static UUID_SIZE_IN_BYTES: number = BitsUtil.BOOLEAN_SIZE_IN_BYTES + 2 * BitsUtil.LONG_SIZE_IN_BYTES; - static BIG_ENDIAN: number = 2; - static LITTLE_ENDIAN: number = 1; + static BIG_ENDIAN = 2; + static LITTLE_ENDIAN = 1; - static BEGIN_FLAG: number = 0x80; - static END_FLAG: number = 0x40; + static BEGIN_FLAG = 0x80; + static END_FLAG = 0x40; static BEGIN_END_FLAG: number = BitsUtil.BEGIN_FLAG | BitsUtil.END_FLAG; - static LISTENER_FLAG: number = 0x01; + static LISTENER_FLAG = 0x01; - static NULL_ARRAY_LENGTH: number = -1; + static NULL_ARRAY_LENGTH = -1; - static FRAME_LENGTH_FIELD_OFFSET: number = 0; + static FRAME_LENGTH_FIELD_OFFSET = 0; static VERSION_FIELD_OFFSET: number = BitsUtil.FRAME_LENGTH_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; static FLAGS_FIELD_OFFSET: number = BitsUtil.VERSION_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; static TYPE_FIELD_OFFSET: number = BitsUtil.FLAGS_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; diff --git a/src/ClientInfo.ts b/src/ClientInfo.ts index bc283ec08..36aa72c11 100644 --- a/src/ClientInfo.ts +++ b/src/ClientInfo.ts @@ -32,7 +32,7 @@ export class ClientInfo { /** * Type of this client. It is always NodeJS. */ - type: string = 'NodeJS'; + type = 'NodeJS'; /** * Name of the client. diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 1ec75ff03..7c6d32a4b 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -/* tslint:disable:no-bitwise */ import {BitsUtil} from './BitsUtil'; import {ClientConnection} from './network/ClientConnection'; import {FixSizedTypesCodec} from './codec/builtin/FixSizedTypesCodec'; @@ -252,7 +251,6 @@ export class ClientMessage { frameLengthAndFlags.writeInt32LE(currentFrame.content.length + SIZE_OF_FRAME_LENGTH_AND_FLAGS, 0); if (isLastFrame) { - // tslint:disable-next-line:no-bitwise frameLengthAndFlags.writeUInt16LE(currentFrame.flags | IS_FINAL_FLAG, BitsUtil.INT_SIZE_IN_BYTES); } else { frameLengthAndFlags.writeUInt16LE(currentFrame.flags, BitsUtil.INT_SIZE_IN_BYTES); diff --git a/src/HeartbeatManager.ts b/src/HeartbeatManager.ts index 641d52021..3159b80f5 100644 --- a/src/HeartbeatManager.ts +++ b/src/HeartbeatManager.ts @@ -23,8 +23,8 @@ import {cancelRepetitionTask, scheduleWithRepetition, Task} from './Util'; import {TargetDisconnectedError} from './HazelcastError'; import {Invocation} from './invocation/InvocationService'; -const PROPERTY_HEARTBEAT_INTERVAL: string = 'hazelcast.client.heartbeat.interval'; -const PROPERTY_HEARTBEAT_TIMEOUT: string = 'hazelcast.client.heartbeat.timeout'; +const PROPERTY_HEARTBEAT_INTERVAL = 'hazelcast.client.heartbeat.interval'; +const PROPERTY_HEARTBEAT_TIMEOUT = 'hazelcast.client.heartbeat.timeout'; /** * HeartbeatManager manager used by connection manager. diff --git a/src/LoadBalancer.ts b/src/LoadBalancer.ts index fb8cf48a2..347cbf768 100644 --- a/src/LoadBalancer.ts +++ b/src/LoadBalancer.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientConfig, ClientNetworkConfig} from './config/Config'; +import {ClientConfig} from './config/Config'; import {Cluster} from './core/Cluster'; import {Member} from './core/Member'; @@ -22,7 +22,7 @@ import {Member} from './core/Member'; * {@link LoadBalancer} allows you to send operations to one of a number of endpoints (Members). * It is up to the implementation to use different load balancing policies. *

- * If Client is configured with {@link ClientNetworkConfig#smartRouting}, + * If Client is configured with {@link ClientNetworkConfig.smartRouting}, * only the operations that are not key based will be routed to the endpoint * returned by the LoadBalancer. If it is not, the LoadBalancer will not be used. *

diff --git a/src/PartitionService.ts b/src/PartitionService.ts index ee2bf3b62..e951d275a 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -22,7 +22,7 @@ import {ClientOfflineError} from './HazelcastError'; class PartitionTable { connection: ClientConnection; - partitionStateVersion: number = -1; + partitionStateVersion = -1; partitions = new Map(); } @@ -35,7 +35,7 @@ export class PartitionService { private client: HazelcastClient; private partitionTable = new PartitionTable(); - private partitionCount: number = 0; + private partitionCount = 0; private logger: ILogger; constructor(client: HazelcastClient) { diff --git a/src/Util.ts b/src/Util.ts index ed97b8f94..2f7d4c21d 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -19,9 +19,6 @@ import * as Long from 'long'; import * as Promise from 'bluebird'; import * as Path from 'path'; import {JsonConfigLocator} from './config/JsonConfigLocator'; -import {Comparator} from './core/Comparator'; -import {IterationType} from './core/Predicate'; -import {PagingPredicate} from './serialization/DefaultPredicates'; import {Address} from './Address'; export function assertNotNull(v: any): void { @@ -47,7 +44,7 @@ export function shuffleArray(array: T[]): void { } } -export function assertNotNegative(v: number, message: string = 'The value cannot be negative.'): void { +export function assertNotNegative(v: number, message = 'The value cannot be negative.'): void { assert(v >= 0, message); } @@ -69,43 +66,6 @@ export function enumFromString(enumType: any, value: string): T { return enumType[value]; } -export function getSortedQueryResultSet(list: any[], predicate: PagingPredicate): any[] { - if (list.length === 0) { - return list; - } - let comparatorObject = predicate.getComparator(); - if (comparatorObject == null) { - comparatorObject = createComparator(predicate.getIterationType()); - } - list.sort(comparatorObject.sort.bind(comparatorObject)); - const nearestAnchorEntry = (predicate == null) ? null : predicate.getNearestAnchorEntry(); - const nearestPage = nearestAnchorEntry[0]; - const page = predicate.getPage(); - const pageSize = predicate.getPageSize(); - const begin = pageSize * (page - nearestPage - 1); - const size = list.length; - if (begin > size) { - return []; - } - let end = begin + pageSize; - if (end > size) { - end = size; - } - - setAnchor(list, predicate, nearestPage); - const iterationType = predicate.getIterationType(); - return list.slice(begin, end).map(function (item): any { - switch (iterationType) { - case IterationType.ENTRY: - return item; - case IterationType.KEY: - return item[0]; - case IterationType.VALUE: - return item[1]; - } - }); -} - export function copyObjectShallow(obj: T): T { if (obj === undefined || obj === null) { return obj; @@ -189,11 +149,11 @@ export function resolvePath(path: string): string { } export function loadNameFromPath(path: string, exportedName: string): any { - const requirePath = require(resolvePath(path)); + const requirePath = require(resolvePath(path)); /*eslint-disable-line @typescript-eslint/no-var-requires*/ if (exportedName === undefined) { return requirePath; } else { - return require(resolvePath(path))[exportedName]; + return requirePath[exportedName]; } } @@ -269,38 +229,6 @@ export function randomInt(upperBound: number): number { return Math.floor(Math.random() * upperBound); } -function createComparator(iterationType: IterationType): Comparator { - const object: Comparator = { - sort(a: [any, any], b: [any, any]): number { - return 0; - }, - }; - switch (iterationType) { - case IterationType.KEY: - object.sort = (e1: [any, any], e2: [any, any]) => e1[0] < e2[0] ? -1 : +(e1[0] > e2[0]); - break; - case IterationType.ENTRY: - object.sort = (e1: [any, any], e2: [any, any]) => e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); - break; - case IterationType.VALUE: - object.sort = (e1: [any, any], e2: [any, any]) => e1[1] < e2[1] ? -1 : +(e1[1] > e2[1]); - break; - } - return object; -} - -function setAnchor(list: any[], predicate: PagingPredicate, nearestPage: number): void { - assert(list.length > 0); - const size = list.length; - const pageSize = predicate.getPageSize(); - const page = predicate.getPage(); - for (let i = pageSize; i <= size && nearestPage < page; i += pageSize) { - const anchor = list[i - 1]; - nearestPage++; - predicate.setAnchor(nearestPage, anchor); - } -} - export class Task { intervalId: NodeJS.Timer; timeoutId: NodeJS.Timer; @@ -344,11 +272,3 @@ export function getNodejsMajorVersion(): number { const versions = versionString.split('.'); return Number.parseInt(versions[0].substr(1)); } - -export function pad(str: string, targetLength: number, padString: string): string { - if (str.length >= targetLength) { - return str; - } else { - return new Array(targetLength - str.length + 1).join(padString) + str; - } -} diff --git a/src/aggregation/AggregatorFactory.ts b/src/aggregation/AggregatorFactory.ts index 58a02d3d3..98f8f925a 100644 --- a/src/aggregation/AggregatorFactory.ts +++ b/src/aggregation/AggregatorFactory.ts @@ -30,7 +30,6 @@ import { MinAggregator, NumberAverageAggregator, } from './Aggregator'; -import {ILogger} from '../logging/ILogger'; import {HazelcastError} from '../HazelcastError'; export class AggregatorFactory implements IdentifiedDataSerializableFactory { diff --git a/src/codec/ClientAddClusterViewListenerCodec.ts b/src/codec/ClientAddClusterViewListenerCodec.ts index 939cc16bf..148ca679b 100644 --- a/src/codec/ClientAddClusterViewListenerCodec.ts +++ b/src/codec/ClientAddClusterViewListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index ffe34f8f9..64a909211 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 345f123bf..8af6290f8 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index 2f0c4a218..ebe4998da 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 456f6d95e..aa2bc5acb 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientCreateProxiesCodec.ts b/src/codec/ClientCreateProxiesCodec.ts index fcab2237b..ff2fcea2c 100644 --- a/src/codec/ClientCreateProxiesCodec.ts +++ b/src/codec/ClientCreateProxiesCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {EntryListCodec} from './builtin/EntryListCodec'; diff --git a/src/codec/ClientCreateProxyCodec.ts b/src/codec/ClientCreateProxyCodec.ts index a0c2e5a0e..48c5920f1 100644 --- a/src/codec/ClientCreateProxyCodec.ts +++ b/src/codec/ClientCreateProxyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index 4c8d6362e..75d59e33f 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {EntryListCodec} from './builtin/EntryListCodec'; diff --git a/src/codec/ClientDestroyProxyCodec.ts b/src/codec/ClientDestroyProxyCodec.ts index d091a4b23..d2d938a5a 100644 --- a/src/codec/ClientDestroyProxyCodec.ts +++ b/src/codec/ClientDestroyProxyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index 254cdbbc6..91f56e507 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {DistributedObjectInfo} from '../DistributedObjectInfo'; diff --git a/src/codec/ClientLocalBackupListenerCodec.ts b/src/codec/ClientLocalBackupListenerCodec.ts index 79d8de3c8..2e2c8b7d5 100644 --- a/src/codec/ClientLocalBackupListenerCodec.ts +++ b/src/codec/ClientLocalBackupListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientPingCodec.ts b/src/codec/ClientPingCodec.ts index 9f371b703..ee853b33f 100644 --- a/src/codec/ClientPingCodec.ts +++ b/src/codec/ClientPingCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index 2fdf5c94d..ec4bc7327 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index 6663aae49..e38200d6d 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts index c385fc7b3..ce8e17114 100644 --- a/src/codec/ClientStatisticsCodec.ts +++ b/src/codec/ClientStatisticsCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ClientTriggerPartitionAssignmentCodec.ts b/src/codec/ClientTriggerPartitionAssignmentCodec.ts index b5ab94fdb..ce4e161cf 100644 --- a/src/codec/ClientTriggerPartitionAssignmentCodec.ts +++ b/src/codec/ClientTriggerPartitionAssignmentCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts index 08f50dd02..6567361bd 100644 --- a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 01e6dcbb8..3202155f4 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index c7f8fb8f9..726a7bcf1 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index a660906ca..d194ba8e8 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index 484ce33f2..c525d270f 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListAddWithIndexCodec.ts b/src/codec/ListAddWithIndexCodec.ts index 7a3771e75..a45ffbf4f 100644 --- a/src/codec/ListAddWithIndexCodec.ts +++ b/src/codec/ListAddWithIndexCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListClearCodec.ts b/src/codec/ListClearCodec.ts index 201996abf..3aebae119 100644 --- a/src/codec/ListClearCodec.ts +++ b/src/codec/ListClearCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index 7a302cdfc..05ae0f87b 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 91876d140..7758fb4d1 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index 632659c45..51ccfce33 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index 316c406fa..b9f8a2c3f 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index dc262ebf4..4fb7d4408 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index cae4a3cd0..e840f2184 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index 1d376fcd4..ff8db1d2f 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index 28f88ed0c..60e4d6dde 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 8060a824f..90e261092 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index a36d20047..188d8cbe2 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index 24199440a..aa2dd2166 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index ecaa96c02..51a084ef4 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index 23ebba5c2..9747111ef 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index 712f849c0..8806eaaa6 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 0bc325a9f..60640470d 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index 270ffbb7b..7ad0d0d00 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index 4c1f7362d..abb490dcd 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index 866bc535c..9d16b081f 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index a431215f3..19de73eaa 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index d231b7024..394592b57 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index 4d734d4bf..4a23b32a5 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index bbca6ab09..4f5a2fea0 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index df5c5c290..2025e400c 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index 9f2989a78..5acaecbae 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index adf94e646..a3bc2dc3e 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index 2b502ddc8..f054b2f8f 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index 1cf5c399b..b22c44824 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapClearCodec.ts b/src/codec/MapClearCodec.ts index e04698bf1..1c6e08d63 100644 --- a/src/codec/MapClearCodec.ts +++ b/src/codec/MapClearCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 19170ed04..76711256d 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 1bd108625..3b6064c1d 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapDeleteCodec.ts b/src/codec/MapDeleteCodec.ts index 3df5bd4c2..21d70cf01 100644 --- a/src/codec/MapDeleteCodec.ts +++ b/src/codec/MapDeleteCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index 2f389d630..0f40c2331 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index 1a7b0673e..38ecf04b1 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index d32670183..8eb0eb3e4 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index 7ae8a882b..4951e6251 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index 7a44ef946..a9ecbbbd6 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapEvictAllCodec.ts b/src/codec/MapEvictAllCodec.ts index b72204c9b..44407ca9b 100644 --- a/src/codec/MapEvictAllCodec.ts +++ b/src/codec/MapEvictAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index e72858fd8..7bfd54ac7 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index 6dd29802f..d7f3f8e16 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index 9ac243762..db9067f38 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index 9a8ffcd52..014268a1f 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 87f8ca0ec..70b4c9b80 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index 368d1900a..a84553070 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index 3f4b2ccef..79a4bbc8d 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index 735b80715..de44d4c2e 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index a2ddb3ac7..865fbe6c4 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapFlushCodec.ts b/src/codec/MapFlushCodec.ts index 13def5e09..fc3c45819 100644 --- a/src/codec/MapFlushCodec.ts +++ b/src/codec/MapFlushCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapForceUnlockCodec.ts b/src/codec/MapForceUnlockCodec.ts index 068f3deda..270270a84 100644 --- a/src/codec/MapForceUnlockCodec.ts +++ b/src/codec/MapForceUnlockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index 499dcedae..06b91afe8 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index cc70900b7..bb91d7077 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index 99b9fc228..bde577331 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index d29636414..add778632 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index 416fde9ac..3a9b051b8 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index 9cfc58bcd..421b8b5c3 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index 6c8b9c17c..5be634cf6 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index 7ec08d72f..35d38d3cd 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapLoadAllCodec.ts b/src/codec/MapLoadAllCodec.ts index a446bd486..9e49b3e70 100644 --- a/src/codec/MapLoadAllCodec.ts +++ b/src/codec/MapLoadAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapLoadGivenKeysCodec.ts b/src/codec/MapLoadGivenKeysCodec.ts index 2519b203a..7d39c4733 100644 --- a/src/codec/MapLoadGivenKeysCodec.ts +++ b/src/codec/MapLoadGivenKeysCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapLockCodec.ts b/src/codec/MapLockCodec.ts index de1d93168..565119eba 100644 --- a/src/codec/MapLockCodec.ts +++ b/src/codec/MapLockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 94c7a84cc..a796af72b 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index cf3a93dd0..2c86964ee 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapPutAllCodec.ts b/src/codec/MapPutAllCodec.ts index cd5707cb9..22afbd543 100644 --- a/src/codec/MapPutAllCodec.ts +++ b/src/codec/MapPutAllCodec.ts @@ -14,8 +14,9 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; @@ -27,14 +28,16 @@ const REQUEST_MESSAGE_TYPE = 76800; // hex: 0x012C01 // RESPONSE_MESSAGE_TYPE = 76801 -const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_TRIGGER_MAP_LOADER_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TRIGGER_MAP_LOADER_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; export class MapPutAllCodec { - static encodeRequest(name: string, entries: Array<[Data, Data]>): ClientMessage { + static encodeRequest(name: string, entries: Array<[Data, Data]>, triggerMapLoader: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); clientMessage.setRetryable(false); const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeBoolean(initialFrame.content, REQUEST_TRIGGER_MAP_LOADER_OFFSET, triggerMapLoader); clientMessage.addFrame(initialFrame); clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); clientMessage.setPartitionId(-1); diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index 49007eaa7..07740b04b 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index 4cff49e9a..ef9e66f08 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts index 69883040a..5d2c1369c 100644 --- a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts +++ b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapPutTransientCodec.ts b/src/codec/MapPutTransientCodec.ts index d18e2403c..521838caf 100644 --- a/src/codec/MapPutTransientCodec.ts +++ b/src/codec/MapPutTransientCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapPutTransientWithMaxIdleCodec.ts b/src/codec/MapPutTransientWithMaxIdleCodec.ts index 93ca1111f..ed78c89b9 100644 --- a/src/codec/MapPutTransientWithMaxIdleCodec.ts +++ b/src/codec/MapPutTransientWithMaxIdleCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapPutWithMaxIdleCodec.ts b/src/codec/MapPutWithMaxIdleCodec.ts index b85ac45f0..7f6d7d14b 100644 --- a/src/codec/MapPutWithMaxIdleCodec.ts +++ b/src/codec/MapPutWithMaxIdleCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapRemoveAllCodec.ts b/src/codec/MapRemoveAllCodec.ts index a645c5636..db4d07dab 100644 --- a/src/codec/MapRemoveAllCodec.ts +++ b/src/codec/MapRemoveAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index 460c52fde..479191cd1 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index 8d94852a6..6d516da45 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index f28e61a0b..084a0ff13 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index 2dc081a3f..156ba762d 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index eaf4a015b..a2c2ab665 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index 3611ba10c..c1d92b7d8 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index 96b7e422f..f56368d99 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapSetCodec.ts b/src/codec/MapSetCodec.ts index 17331fffe..947cdeced 100644 --- a/src/codec/MapSetCodec.ts +++ b/src/codec/MapSetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapSetTtlCodec.ts b/src/codec/MapSetTtlCodec.ts index ad17099e1..9dc892a12 100644 --- a/src/codec/MapSetTtlCodec.ts +++ b/src/codec/MapSetTtlCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapSetWithMaxIdleCodec.ts b/src/codec/MapSetWithMaxIdleCodec.ts index d3b1c918e..fa51a6aac 100644 --- a/src/codec/MapSetWithMaxIdleCodec.ts +++ b/src/codec/MapSetWithMaxIdleCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index cea6adeb9..ac07dd813 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 088694e35..76f1d4f52 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index 4490bb578..2ed77529e 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index d3c880f63..a23ba70a3 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index b709f920c..2736608c7 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapUnlockCodec.ts b/src/codec/MapUnlockCodec.ts index 99f3705d7..814df8818 100644 --- a/src/codec/MapUnlockCodec.ts +++ b/src/codec/MapUnlockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 97991df81..1093f3255 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index 58fe2e115..c00a2f2b7 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 8e04b099d..eb389ad81 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index 45278cdf9..ea1608dd3 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index ac55faf5c..17e418891 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapClearCodec.ts b/src/codec/MultiMapClearCodec.ts index fb5d38515..211d2afa8 100644 --- a/src/codec/MultiMapClearCodec.ts +++ b/src/codec/MultiMapClearCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 22f4fc84c..6f34358b5 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index 6bb6bf993..bd2a42282 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index f55739488..bb72a9724 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapDeleteCodec.ts b/src/codec/MultiMapDeleteCodec.ts index b6d869c7b..72ccfebac 100644 --- a/src/codec/MultiMapDeleteCodec.ts +++ b/src/codec/MultiMapDeleteCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index 18d1e4221..99172c8be 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MultiMapForceUnlockCodec.ts b/src/codec/MultiMapForceUnlockCodec.ts index 37298d1ac..bba4e3d81 100644 --- a/src/codec/MultiMapForceUnlockCodec.ts +++ b/src/codec/MultiMapForceUnlockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index 12ade2b29..62052e302 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index 783f9012e..7ca6add17 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 2651b4297..036d6b2fc 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MultiMapLockCodec.ts b/src/codec/MultiMapLockCodec.ts index cade52331..ad56f4ae6 100644 --- a/src/codec/MultiMapLockCodec.ts +++ b/src/codec/MultiMapLockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapPutAllCodec.ts b/src/codec/MultiMapPutAllCodec.ts new file mode 100644 index 000000000..e8c53ef43 --- /dev/null +++ b/src/codec/MultiMapPutAllCodec.ts @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x021700 +const REQUEST_MESSAGE_TYPE = 136960; +// hex: 0x021701 +// RESPONSE_MESSAGE_TYPE = 136961 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +export class MultiMapPutAllCodec { + static encodeRequest(name: string, entries: Array<[Data, Data[]]>): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, name); + EntryListCodec.encode(clientMessage, entries, DataCodec.encode, ListDataCodec.encode); + return clientMessage; + } +} diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index fe746449c..1a468582d 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index 6f3fa14ce..5d570f4d5 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index 5650b885f..bdf9071be 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 10d34dd86..7cf2c0740 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index ea54025f2..b3cbef068 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index e6d621a54..e8ac10d66 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapUnlockCodec.ts b/src/codec/MultiMapUnlockCodec.ts index ea65af027..b3baf7897 100644 --- a/src/codec/MultiMapUnlockCodec.ts +++ b/src/codec/MultiMapUnlockCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index 20c86820d..8edc1ba44 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index 871def486..8144e95b4 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts index 203738609..1306118f9 100644 --- a/src/codec/PNCounterAddCodec.ts +++ b/src/codec/PNCounterAddCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts index 29242ae97..2eb3787c2 100644 --- a/src/codec/PNCounterGetCodec.ts +++ b/src/codec/PNCounterGetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts index b314dfd67..1d0e13748 100644 --- a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index 233d53e32..83d92a4e6 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index 9ebe1b83b..6bf8272b6 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueClearCodec.ts b/src/codec/QueueClearCodec.ts index f95282cdd..965d66d66 100644 --- a/src/codec/QueueClearCodec.ts +++ b/src/codec/QueueClearCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index 2f8824c33..880b43326 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index 52b8237a5..4dab65540 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index 798828e1d..0bb44a4ee 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index 6db81a329..4531d4296 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index d6039f41d..1aa6082d0 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index 7d3994612..38f96e017 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index 3b8b9f8d1..8cdb3b438 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index 0a4f50e9d..5547fab1f 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index 8de415968..db18b4484 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index 9a1e5aeed..92ae659bf 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index f0e8110ff..c012ade90 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueuePutCodec.ts b/src/codec/QueuePutCodec.ts index 7f71e204b..af0c9dca9 100644 --- a/src/codec/QueuePutCodec.ts +++ b/src/codec/QueuePutCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index 9e08df876..c02e977f2 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index cf3ffc87f..e357d32ef 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index c589002fe..984233fe3 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index 2cd12b31f..da855af4c 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index 0c218b228..5c4d2361e 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index 3ab31b654..dc45201d8 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index e52dc03b4..69fd13a0e 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index a324be15f..7af1785d5 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 310993007..829568fe9 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index e7bf9afa1..db19a3912 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapClearCodec.ts b/src/codec/ReplicatedMapClearCodec.ts index 66b23f19a..be330e4eb 100644 --- a/src/codec/ReplicatedMapClearCodec.ts +++ b/src/codec/ReplicatedMapClearCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index aef48e0e7..c20166cb3 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 1252832bb..0640a4902 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index 6e5f20327..7d810df65 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index 53a1d5e21..2054d8791 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index 2dfc736e0..3a8e3e6ee 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index 0befd04eb..60deffb1d 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapPutAllCodec.ts b/src/codec/ReplicatedMapPutAllCodec.ts index 2d2dc1dac..22cea5071 100644 --- a/src/codec/ReplicatedMapPutAllCodec.ts +++ b/src/codec/ReplicatedMapPutAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index 93874df5e..2d59e7a74 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index 6abb5df5c..1d4914da4 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index 70e7a7d1e..879023f38 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index 818bf701a..042aad889 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index cb3ec7bed..5547f3cad 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index ef48ea022..07bf8a354 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index bbb57039e..99a88add0 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index 338b88567..f3245cd08 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index 1e79e1bcc..5e694f60f 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index 6e0f611e0..dc729b07f 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index 7b1a477a9..b3df7de8b 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index c40f122d1..f1fc5279a 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index 5ce141d52..7f4f2fa70 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index 2f09aca80..e9e3cd70a 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index 5d304a3a4..1cda5d840 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index 0f595dc17..f985ebf34 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index a59a43fc9..a8dff13f8 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetClearCodec.ts b/src/codec/SetClearCodec.ts index e1ca68641..b7c3769ea 100644 --- a/src/codec/SetClearCodec.ts +++ b/src/codec/SetClearCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index 31ba3a43b..d3cda255e 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index b35f85e11..7ab93858e 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index baefaec4d..74c1b6bc1 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index 5db201552..49fd47c11 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index a3d0c4fc8..41fe384da 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index 8f78b69f0..d3d08536e 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index ed9a01572..975657397 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index 72b009b89..d7e3f13f7 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index 3d9d64773..d3bf5ccbf 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index 5642434df..363f417f5 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TopicPublishCodec.ts b/src/codec/TopicPublishCodec.ts index 64ee43f17..08ad46e5c 100644 --- a/src/codec/TopicPublishCodec.ts +++ b/src/codec/TopicPublishCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index 2dfce56b9..7371ceffb 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionCommitCodec.ts b/src/codec/TransactionCommitCodec.ts index 5da659d5f..d89afc5e0 100644 --- a/src/codec/TransactionCommitCodec.ts +++ b/src/codec/TransactionCommitCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionCreateCodec.ts b/src/codec/TransactionCreateCodec.ts index cb30da45d..f47402ada 100644 --- a/src/codec/TransactionCreateCodec.ts +++ b/src/codec/TransactionCreateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionRollbackCodec.ts b/src/codec/TransactionRollbackCodec.ts index 93d736bcf..c2297f2a2 100644 --- a/src/codec/TransactionRollbackCodec.ts +++ b/src/codec/TransactionRollbackCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalListAddCodec.ts b/src/codec/TransactionalListAddCodec.ts index 921e5b874..5ebbc5325 100644 --- a/src/codec/TransactionalListAddCodec.ts +++ b/src/codec/TransactionalListAddCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalListRemoveCodec.ts b/src/codec/TransactionalListRemoveCodec.ts index a8c07a6bc..03bffb7c1 100644 --- a/src/codec/TransactionalListRemoveCodec.ts +++ b/src/codec/TransactionalListRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalListSizeCodec.ts b/src/codec/TransactionalListSizeCodec.ts index 314b4a964..078730951 100644 --- a/src/codec/TransactionalListSizeCodec.ts +++ b/src/codec/TransactionalListSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapContainsKeyCodec.ts b/src/codec/TransactionalMapContainsKeyCodec.ts index ea49fc58d..fefe9467e 100644 --- a/src/codec/TransactionalMapContainsKeyCodec.ts +++ b/src/codec/TransactionalMapContainsKeyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapContainsValueCodec.ts b/src/codec/TransactionalMapContainsValueCodec.ts index ecc5ede13..3899a09f7 100644 --- a/src/codec/TransactionalMapContainsValueCodec.ts +++ b/src/codec/TransactionalMapContainsValueCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapDeleteCodec.ts b/src/codec/TransactionalMapDeleteCodec.ts index cc76acc13..9822e04f6 100644 --- a/src/codec/TransactionalMapDeleteCodec.ts +++ b/src/codec/TransactionalMapDeleteCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapGetCodec.ts b/src/codec/TransactionalMapGetCodec.ts index 743cab16a..88555c38b 100644 --- a/src/codec/TransactionalMapGetCodec.ts +++ b/src/codec/TransactionalMapGetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapGetForUpdateCodec.ts b/src/codec/TransactionalMapGetForUpdateCodec.ts index e51721f2f..d6d4721ce 100644 --- a/src/codec/TransactionalMapGetForUpdateCodec.ts +++ b/src/codec/TransactionalMapGetForUpdateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapIsEmptyCodec.ts b/src/codec/TransactionalMapIsEmptyCodec.ts index d378f51b5..175e06402 100644 --- a/src/codec/TransactionalMapIsEmptyCodec.ts +++ b/src/codec/TransactionalMapIsEmptyCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapKeySetCodec.ts b/src/codec/TransactionalMapKeySetCodec.ts index f8dcba815..11f8f93d7 100644 --- a/src/codec/TransactionalMapKeySetCodec.ts +++ b/src/codec/TransactionalMapKeySetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts index 4c1c4a13e..1a90bd20f 100644 --- a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts +++ b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapPutCodec.ts b/src/codec/TransactionalMapPutCodec.ts index 7fd10c1cf..be04099c8 100644 --- a/src/codec/TransactionalMapPutCodec.ts +++ b/src/codec/TransactionalMapPutCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapPutIfAbsentCodec.ts b/src/codec/TransactionalMapPutIfAbsentCodec.ts index 1b8236f5d..24e9add2d 100644 --- a/src/codec/TransactionalMapPutIfAbsentCodec.ts +++ b/src/codec/TransactionalMapPutIfAbsentCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapRemoveCodec.ts b/src/codec/TransactionalMapRemoveCodec.ts index 7f254582f..2badb8459 100644 --- a/src/codec/TransactionalMapRemoveCodec.ts +++ b/src/codec/TransactionalMapRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapRemoveIfSameCodec.ts b/src/codec/TransactionalMapRemoveIfSameCodec.ts index d4c2a59fc..a4b7670d3 100644 --- a/src/codec/TransactionalMapRemoveIfSameCodec.ts +++ b/src/codec/TransactionalMapRemoveIfSameCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapReplaceCodec.ts b/src/codec/TransactionalMapReplaceCodec.ts index c4b6ccbe7..f6ea82ff0 100644 --- a/src/codec/TransactionalMapReplaceCodec.ts +++ b/src/codec/TransactionalMapReplaceCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapReplaceIfSameCodec.ts b/src/codec/TransactionalMapReplaceIfSameCodec.ts index 7706e69ee..8986bc9c4 100644 --- a/src/codec/TransactionalMapReplaceIfSameCodec.ts +++ b/src/codec/TransactionalMapReplaceIfSameCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapSetCodec.ts b/src/codec/TransactionalMapSetCodec.ts index 02b017175..95c0b1849 100644 --- a/src/codec/TransactionalMapSetCodec.ts +++ b/src/codec/TransactionalMapSetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapSizeCodec.ts b/src/codec/TransactionalMapSizeCodec.ts index db4777b64..9d48fa1d2 100644 --- a/src/codec/TransactionalMapSizeCodec.ts +++ b/src/codec/TransactionalMapSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapValuesCodec.ts b/src/codec/TransactionalMapValuesCodec.ts index c15a69610..cfaf66c94 100644 --- a/src/codec/TransactionalMapValuesCodec.ts +++ b/src/codec/TransactionalMapValuesCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMapValuesWithPredicateCodec.ts b/src/codec/TransactionalMapValuesWithPredicateCodec.ts index 3e9bcedc5..ccfa6a7eb 100644 --- a/src/codec/TransactionalMapValuesWithPredicateCodec.ts +++ b/src/codec/TransactionalMapValuesWithPredicateCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMultiMapGetCodec.ts b/src/codec/TransactionalMultiMapGetCodec.ts index baed2bc3b..5239dec11 100644 --- a/src/codec/TransactionalMultiMapGetCodec.ts +++ b/src/codec/TransactionalMultiMapGetCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMultiMapPutCodec.ts b/src/codec/TransactionalMultiMapPutCodec.ts index 68e3fcc53..9805a989e 100644 --- a/src/codec/TransactionalMultiMapPutCodec.ts +++ b/src/codec/TransactionalMultiMapPutCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMultiMapRemoveCodec.ts b/src/codec/TransactionalMultiMapRemoveCodec.ts index f6e798185..2a095dd4d 100644 --- a/src/codec/TransactionalMultiMapRemoveCodec.ts +++ b/src/codec/TransactionalMultiMapRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts index 7ff2203f2..69a288b9e 100644 --- a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts +++ b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMultiMapSizeCodec.ts b/src/codec/TransactionalMultiMapSizeCodec.ts index 86f1c149d..f9ab25097 100644 --- a/src/codec/TransactionalMultiMapSizeCodec.ts +++ b/src/codec/TransactionalMultiMapSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalMultiMapValueCountCodec.ts b/src/codec/TransactionalMultiMapValueCountCodec.ts index 47dac13f6..1f358ca92 100644 --- a/src/codec/TransactionalMultiMapValueCountCodec.ts +++ b/src/codec/TransactionalMultiMapValueCountCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalQueueOfferCodec.ts b/src/codec/TransactionalQueueOfferCodec.ts index 27acbbd38..355fad7c3 100644 --- a/src/codec/TransactionalQueueOfferCodec.ts +++ b/src/codec/TransactionalQueueOfferCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalQueuePeekCodec.ts b/src/codec/TransactionalQueuePeekCodec.ts index 67db34c51..9d7d5fde0 100644 --- a/src/codec/TransactionalQueuePeekCodec.ts +++ b/src/codec/TransactionalQueuePeekCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalQueuePollCodec.ts b/src/codec/TransactionalQueuePollCodec.ts index 70d9be2af..5a7a46360 100644 --- a/src/codec/TransactionalQueuePollCodec.ts +++ b/src/codec/TransactionalQueuePollCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalQueueSizeCodec.ts b/src/codec/TransactionalQueueSizeCodec.ts index 58c8b1cc0..64d296528 100644 --- a/src/codec/TransactionalQueueSizeCodec.ts +++ b/src/codec/TransactionalQueueSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalQueueTakeCodec.ts b/src/codec/TransactionalQueueTakeCodec.ts index 1b2517608..10678010d 100644 --- a/src/codec/TransactionalQueueTakeCodec.ts +++ b/src/codec/TransactionalQueueTakeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalSetAddCodec.ts b/src/codec/TransactionalSetAddCodec.ts index ad78913ee..248b49606 100644 --- a/src/codec/TransactionalSetAddCodec.ts +++ b/src/codec/TransactionalSetAddCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalSetRemoveCodec.ts b/src/codec/TransactionalSetRemoveCodec.ts index b87f0b6ef..d447d50fd 100644 --- a/src/codec/TransactionalSetRemoveCodec.ts +++ b/src/codec/TransactionalSetRemoveCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/TransactionalSetSizeCodec.ts b/src/codec/TransactionalSetSizeCodec.ts index f3194b2a0..6c3dad84b 100644 --- a/src/codec/TransactionalSetSizeCodec.ts +++ b/src/codec/TransactionalSetSizeCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {BitsUtil} from '../BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; diff --git a/src/codec/builtin/CodecUtil.ts b/src/codec/builtin/CodecUtil.ts index dd858809c..2fca339a2 100644 --- a/src/codec/builtin/CodecUtil.ts +++ b/src/codec/builtin/CodecUtil.ts @@ -51,7 +51,7 @@ export class CodecUtil { /** * Returns whether the next frame is {@link NULL_FRAME} or not. * If it is a {@link NULL_FRAME}, this method consumes the iterator - * by calling {@link ClientMessage#nextFrame} once to skip the {@link NULL_FRAME}. + * by calling {@link ClientMessage.nextFrame} once to skip the {@link NULL_FRAME}. */ static nextFrameIsNullFrame(clientMessage: ClientMessage): boolean { const isNull = clientMessage.peekNextFrame().isNullFrame(); diff --git a/src/codec/custom/AddressCodec.ts b/src/codec/custom/AddressCodec.ts index 0d1f16bac..475c1332f 100644 --- a/src/codec/custom/AddressCodec.ts +++ b/src/codec/custom/AddressCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; diff --git a/src/codec/custom/BitmapIndexOptionsCodec.ts b/src/codec/custom/BitmapIndexOptionsCodec.ts index 6f1f212a9..1800036cf 100644 --- a/src/codec/custom/BitmapIndexOptionsCodec.ts +++ b/src/codec/custom/BitmapIndexOptionsCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; diff --git a/src/codec/custom/DistributedObjectInfoCodec.ts b/src/codec/custom/DistributedObjectInfoCodec.ts index 22a2e5755..6c3f826fc 100644 --- a/src/codec/custom/DistributedObjectInfoCodec.ts +++ b/src/codec/custom/DistributedObjectInfoCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {StringCodec} from '../builtin/StringCodec'; diff --git a/src/codec/custom/ErrorHolderCodec.ts b/src/codec/custom/ErrorHolderCodec.ts index a088ed4e8..765f2b6c5 100644 --- a/src/codec/custom/ErrorHolderCodec.ts +++ b/src/codec/custom/ErrorHolderCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; diff --git a/src/codec/custom/IndexConfigCodec.ts b/src/codec/custom/IndexConfigCodec.ts index 3331547de..a53538785 100644 --- a/src/codec/custom/IndexConfigCodec.ts +++ b/src/codec/custom/IndexConfigCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; diff --git a/src/codec/custom/PagingPredicateHolderCodec.ts b/src/codec/custom/PagingPredicateHolderCodec.ts index 8b73b773d..ecefca6ed 100644 --- a/src/codec/custom/PagingPredicateHolderCodec.ts +++ b/src/codec/custom/PagingPredicateHolderCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; diff --git a/src/codec/custom/SimpleEntryViewCodec.ts b/src/codec/custom/SimpleEntryViewCodec.ts index 27b21acf3..99b6ec94f 100644 --- a/src/codec/custom/SimpleEntryViewCodec.ts +++ b/src/codec/custom/SimpleEntryViewCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; diff --git a/src/codec/custom/StackTraceElementCodec.ts b/src/codec/custom/StackTraceElementCodec.ts index c9379ab64..c0dcc49d9 100644 --- a/src/codec/custom/StackTraceElementCodec.ts +++ b/src/codec/custom/StackTraceElementCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; diff --git a/src/config/BitmapIndexOptions.ts b/src/config/BitmapIndexOptions.ts index de5cb4048..f0a81e380 100644 --- a/src/config/BitmapIndexOptions.ts +++ b/src/config/BitmapIndexOptions.ts @@ -18,7 +18,7 @@ import {QueryConstants} from '../core/Predicate'; /** * Defines an assortment of transformations which can be applied to - * {@link BitmapIndexOptions#uniqueKey unique key} values. + * {@link BitmapIndexOptions.uniqueKey unique key} values. */ export enum UniqueKeyTransformation { /** @@ -59,7 +59,7 @@ export class BitmapIndexOptions { /** * Unique key transformation configured in this index. Defaults - * to {@link UniqueKeyTransformation#OBJECT OBJECT}. The transformation is + * to {@link UniqueKeyTransformation.OBJECT OBJECT}. The transformation is * applied to every value extracted from unique key attribute. */ uniqueKeyTransformation: UniqueKeyTransformation; diff --git a/src/config/ClientCloudConfig.ts b/src/config/ClientCloudConfig.ts index ed5135fb7..686751773 100644 --- a/src/config/ClientCloudConfig.ts +++ b/src/config/ClientCloudConfig.ts @@ -25,5 +25,5 @@ export class ClientCloudConfig { /** * enabled true to use hazelcast.cloud */ - enabled: boolean = false; + enabled = false; } diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index 29f471e90..628b195f9 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -34,19 +34,19 @@ export class ClientNetworkConfig { /** * Timeout value in millis for nodes to accept client connection requests. */ - connectionTimeout: number = 5000; + connectionTimeout = 5000; /** * true if redo operations are enabled (not implemented yet) */ - redoOperation: boolean = false; + redoOperation = false; /** * If true, client will behave as smart client instead of dummy client. Smart client sends key based operations * to owner of the keys. Dummy client sends all operations to a single node. See http://docs.hazelcast.org to * learn about smart/dummy client. */ - smartRouting: boolean = true; + smartRouting = true; /** * SSL configuration. diff --git a/src/config/ConnectionRetryConfig.ts b/src/config/ConnectionRetryConfig.ts index 11480972c..5ad4282e1 100644 --- a/src/config/ConnectionRetryConfig.ts +++ b/src/config/ConnectionRetryConfig.ts @@ -22,22 +22,22 @@ export class ConnectionRetryConfig { /** * How long to wait after the first failure before retrying. Must be non-negative. */ - initialBackoffMillis: number = 1000; + initialBackoffMillis = 1000; /** * When backoff reaches this upper bound, it does not increase any more. Must be non-negative. */ - maxBackoffMillis: number = 30000; + maxBackoffMillis = 30000; /** * Timeout value in milliseconds for the client to give up to connect to the current cluster. */ - clusterConnectTimeoutMillis: number = 20000; + clusterConnectTimeoutMillis = 20000; /** * Factor with which to multiply backoff after a failed retry. Must be greater than or equal to 1. */ - multiplier: number = 1; + multiplier = 1; /** * By how much to randomize backoffs. @@ -45,5 +45,5 @@ export class ConnectionRetryConfig { * Random(-jitter * current_backoff, jitter * current_backoff) * It must be in range [0.0, 1.0]. */ - jitter: number = 0; + jitter = 0; } diff --git a/src/config/ConnectionStrategyConfig.ts b/src/config/ConnectionStrategyConfig.ts index 97e908edb..26b127c91 100644 --- a/src/config/ConnectionStrategyConfig.ts +++ b/src/config/ConnectionStrategyConfig.ts @@ -14,9 +14,7 @@ * limitations under the License. */ -import {ClientOfflineError} from '../HazelcastError'; import {ConnectionRetryConfig} from './ConnectionRetryConfig'; -import * as HazelcastClient from '../HazelcastClient'; /** * Reconnect options. @@ -44,12 +42,12 @@ export enum ReconnectMode { */ export class ConnectionStrategyConfig { /** - * Set true for non blocking {@link HazelcastClient#newHazelcastClient}. The client creation won't wait to + * Set true for non blocking {@link HazelcastClient.newHazelcastClient}. The client creation won't wait to * connect to cluster. The client instance will throw exception until it connects to cluster and become ready. - * If set to false, {@link HazelcastClient#newHazelcastClient} will block until a cluster connection established and it's + * If set to false, {@link HazelcastClient.newHazelcastClient} will block until a cluster connection established and it's * ready to use client instance */ - asyncStart: boolean = false; + asyncStart = false; /** * How a client reconnect to cluster after a disconnect can be configured. This parameter is used by default strategy and diff --git a/src/config/FlakeIdGeneratorConfig.ts b/src/config/FlakeIdGeneratorConfig.ts index ef0a3d771..b9fefe085 100644 --- a/src/config/FlakeIdGeneratorConfig.ts +++ b/src/config/FlakeIdGeneratorConfig.ts @@ -18,7 +18,7 @@ export class FlakeIdGeneratorConfig { /** * Sets the name for this config. */ - name: string = 'default'; + name = 'default'; /** * Sets how many IDs are pre-fetched on the background when a new flake id is requested @@ -26,7 +26,7 @@ export class FlakeIdGeneratorConfig { * * prefetch count should be in the range 1..100,000. */ - prefetchCount: number = 100; + prefetchCount = 100; /** * Sets for how long the pre-fetched IDs can be used. If this time elapses, a new batch of IDs will be @@ -38,7 +38,7 @@ export class FlakeIdGeneratorConfig { * * Set to the desired ID validity or 0 for unlimited. */ - prefetchValidityMillis: number = 600000; + prefetchValidityMillis = 600000; toString(): string { return 'FlakeIdGeneratorConfig[' + diff --git a/src/config/JsonConfigLocator.ts b/src/config/JsonConfigLocator.ts index 187790718..72f14e1d7 100644 --- a/src/config/JsonConfigLocator.ts +++ b/src/config/JsonConfigLocator.ts @@ -17,8 +17,7 @@ import * as Promise from 'bluebird'; import * as fs from 'fs'; import * as Path from 'path'; -import {LoggingService, LogLevel} from '../logging/LoggingService'; -import {ConfigBuilder} from './ConfigBuilder'; +import {LogLevel} from '../logging/LoggingService'; import {DeferredPromise} from '../Util'; import {DefaultLogger} from '../logging/DefaultLogger'; @@ -35,7 +34,6 @@ export class JsonConfigLocator { if (loaded) { return; } - // tslint:disable-next-line return this.loadFromWorkingDirectory().then((loaded: boolean) => { if (loaded) { return; @@ -48,9 +46,9 @@ export class JsonConfigLocator { const envVariableLocation = process.env[JsonConfigLocator.ENV_VARIABLE_NAME]; if (envVariableLocation) { const loadLocation = Path.resolve(envVariableLocation); - this.logger.trace('ConfigBuilder', 'Loading config from ' + envVariableLocation); - return this.loadPath(envVariableLocation).then((buffer: Buffer) => { - this.configLocation = envVariableLocation; + this.logger.trace('ConfigBuilder', 'Loading config from ' + loadLocation); + return this.loadPath(loadLocation).then((buffer: Buffer) => { + this.configLocation = loadLocation; this.buffer = buffer; return true; }); diff --git a/src/config/NearCacheConfig.ts b/src/config/NearCacheConfig.ts index f0365363b..6d6a41bae 100644 --- a/src/config/NearCacheConfig.ts +++ b/src/config/NearCacheConfig.ts @@ -18,25 +18,25 @@ import {EvictionPolicy} from './EvictionPolicy'; import {InMemoryFormat} from './InMemoryFormat'; export class NearCacheConfig { - name: string = 'default'; + name = 'default'; /** * 'true' to invalidate entries when they are changed in cluster, * 'false' to invalidate entries only when they are accessed. */ - invalidateOnChange: boolean = true; + invalidateOnChange = true; /** * Max number of seconds that an entry can stay in the cache until it is acceessed */ - maxIdleSeconds: number = 0; + maxIdleSeconds = 0; inMemoryFormat: InMemoryFormat = InMemoryFormat.BINARY; /** * Maximum number of seconds that an entry can stay in cache. */ - timeToLiveSeconds: number = 0; + timeToLiveSeconds = 0; evictionPolicy: EvictionPolicy = EvictionPolicy.NONE; evictionMaxSize: number = Number.MAX_SAFE_INTEGER; - evictionSamplingCount: number = 8; - evictionSamplingPoolSize: number = 16; + evictionSamplingCount = 8; + evictionSamplingPoolSize = 16; toString(): string { return 'NearCacheConfig[' + diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts index a4e8e9a65..4c0efcee5 100644 --- a/src/config/ReliableTopicConfig.ts +++ b/src/config/ReliableTopicConfig.ts @@ -17,8 +17,8 @@ import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; export class ReliableTopicConfig { - name: string = 'default'; - readBatchSize: number = 10; + name = 'default'; + readBatchSize = 10; overloadPolicy: TopicOverloadPolicy = TopicOverloadPolicy.BLOCK; toString(): string { diff --git a/src/config/SSLConfig.ts b/src/config/SSLConfig.ts index a6ad59e0e..4af6a23d1 100644 --- a/src/config/SSLConfig.ts +++ b/src/config/SSLConfig.ts @@ -26,7 +26,7 @@ export class SSLConfig { /** * If it is true, SSL is enabled. */ - enabled: boolean = false; + enabled = false; /** * sslOptions is by default null which means the following default configuration diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index 3f94345b8..ae8f231b3 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -19,13 +19,13 @@ import {ImportConfig} from './ImportConfig'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; export class SerializationConfig { - defaultNumberType: string = 'double'; - isBigEndian: boolean = true; + defaultNumberType = 'double'; + isBigEndian = true; dataSerializableFactories: { [id: number]: IdentifiedDataSerializableFactory } = {}; dataSerializableFactoryConfigs: { [id: number]: ImportConfig } = {}; portableFactories: { [id: number]: PortableFactory } = {}; portableFactoryConfigs: { [id: number]: ImportConfig } = {}; - portableVersion: number = 0; + portableVersion = 0; customSerializers: any[] = []; customSerializerConfigs: { [id: number]: ImportConfig } = {}; globalSerializer: any = null; diff --git a/src/core/Cluster.ts b/src/core/Cluster.ts index 1aa787eda..181f35a83 100644 --- a/src/core/Cluster.ts +++ b/src/core/Cluster.ts @@ -24,7 +24,7 @@ export interface Cluster { * Adds MembershipListener to listen for membership updates. *

* The addMembershipListener method returns a register ID. This ID is needed to remove the MembershipListener using the - * {@link #removeMembershipListener} method. + * {@link removeMembershipListener} method. *

* If the MembershipListener implements the {@link InitialMembershipListener} interface, it will also receive * the {@link InitialMembershipEvent}. @@ -34,7 +34,7 @@ export interface Cluster { * @param listener membership listener * @return the registration ID * @throws AssertionError if listener is null - * @see #removeMembershipListener + * @see {@link removeMembershipListener} */ addMembershipListener(listener: MembershipListener): UUID; @@ -48,7 +48,7 @@ export interface Cluster { * @param registrationId the registrationId of MembershipListener to remove * @return true if the registration is removed, false otherwise * @throws AssertionError if the registration ID is null - * @see #addMembershipListener + * @see {@link addMembershipListener} */ removeMembershipListener(registrationId: UUID): boolean; diff --git a/src/core/EventType.ts b/src/core/EventType.ts index 7c3e64f20..52ad70258 100644 --- a/src/core/EventType.ts +++ b/src/core/EventType.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -/* tslint:disable:no-bitwise */ export enum EventType { ADDED = 1 << 0, REMOVED = 1 << 1, diff --git a/src/core/InitialMembershipEvent.ts b/src/core/InitialMembershipEvent.ts index 565fc80d7..49ac45454 100644 --- a/src/core/InitialMembershipEvent.ts +++ b/src/core/InitialMembershipEvent.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -import {MembershipEvent} from './MembershipEvent'; -import {InitialMembershipListener} from './InitialMembershipListener'; import {Member} from './Member'; /** diff --git a/src/core/UUID.ts b/src/core/UUID.ts index bd8e10137..17d4b8884 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -15,7 +15,6 @@ */ import * as Long from 'long'; -import {pad} from '../Util'; export class UUID { readonly leastSignificant: Long; @@ -34,7 +33,6 @@ export class UUID { return other.mostSignificant.equals(this.mostSignificant) && other.leastSignificant.equals(this.leastSignificant); } - /* tslint:disable:no-bitwise */ toString(): string { if (this.cachedString) { return this.cachedString; @@ -48,12 +46,12 @@ export class UUID { const div2 = (mostLow >>> 16).toString(16); const div3 = (mostLow & ((1 << 16) - 1)).toString(16); const div4 = (leastHigh >>> 16).toString(16); - const div5 = (leastHigh & ((1 << 16) - 1)).toString(16) + pad(leastLow.toString(16), 8, '0'); - this.cachedString = pad(div1, 8, '0') + '-' - + pad(div2, 4, '0') + '-' - + pad(div3, 4, '0') + '-' - + pad(div4, 4, '0') + '-' - + pad(div5, 12, '0'); + const div5 = (leastHigh & ((1 << 16) - 1)).toString(16) + leastLow.toString(16).padStart(8, '0'); + this.cachedString = div1.padStart(8, '0') + '-' + + div2.padStart(4, '0') + '-' + + div3.padStart(4, '0') + '-' + + div4.padStart(4, '0') + '-' + + div5.padStart(12, '0'); return this.cachedString; } } diff --git a/src/core/VectorClock.ts b/src/core/VectorClock.ts index 1215d9055..326d53755 100644 --- a/src/core/VectorClock.ts +++ b/src/core/VectorClock.ts @@ -14,10 +14,6 @@ * limitations under the License. */ -import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; -import {DataInput, DataOutput} from '../serialization/Data'; -import {IdentifiedDataSerializable} from '../serialization/Serializable'; - export class VectorClock { private replicaTimestamps = new Map(); diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index 46586a89a..a9ca783f3 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -64,7 +64,7 @@ export class HazelcastCloudDiscovery { path: url.path, }; - let dataAsAString: string = ''; + let dataAsAString = ''; get(endpointUrlOptions, (res: IncomingMessage) => { res.setEncoding('utf8'); res.on('data', (chunk) => { diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index eaccc5251..67740e727 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -78,7 +78,7 @@ export class Invocation { */ deferred: Promise.Resolver; - invokeCount: number = 0; + invokeCount = 0; /** * If this is an event listener registration, handler should be set to the function to be called on events. @@ -89,7 +89,7 @@ export class Invocation { /** * True if this invocation is urgent (can be invoked even in the client is in the disconnected state), false otherwise. */ - urgent: boolean = false; + urgent = false; constructor(client: HazelcastClient, request: ClientMessage) { this.client = client; diff --git a/src/invocation/Murmur.ts b/src/invocation/Murmur.ts index 52752aea2..9e7e7097b 100644 --- a/src/invocation/Murmur.ts +++ b/src/invocation/Murmur.ts @@ -14,17 +14,16 @@ * limitations under the License. */ -/* tslint:disable */ -var seed = 0x01000193; +const seed = 0x01000193; -function murmurhash3_32_gc(key: any) { - var remainder: any, bytes: any, h1: any, h1b: any, c1: any, c2: any, k1: any, i: any; +export function murmur(key: any): number { + let h1: number, h1b: number, k1: number, i: number; - remainder = key.length & 3; // key.length % 4 - bytes = key.length - remainder; + const remainder = key.length & 3; // key.length % 4 + const bytes = key.length - remainder; h1 = seed; - c1 = 0xcc9e2d51; - c2 = 0x1b873593; + const c1 = 0xcc9e2d51; + const c2 = 0x1b873593; i = 0; while (i < bytes) { @@ -50,9 +49,9 @@ function murmurhash3_32_gc(key: any) { switch (remainder) { case 3: k1 ^= (key.readUInt8(i + 2) & 0xff) << 16; - case 2: + case 2: // eslint-disable-line no-fallthrough k1 ^= (key.readUInt8(i + 1) & 0xff) << 8; - case 1: + case 1: // eslint-disable-line no-fallthrough k1 ^= (key.readUInt8(i) & 0xff); k1 = (((k1 & 0xffff) * c1) + ((((k1 >>> 16) * c1) & 0xffff) << 16)) & 0xffffffff; @@ -69,10 +68,8 @@ function murmurhash3_32_gc(key: any) { h1 = ((((h1 & 0xffff) * 0xc2b2ae35) + ((((h1 >>> 16) * 0xc2b2ae35) & 0xffff) << 16))) & 0xffffffff; h1 ^= h1 >>> 16; - var result = h1 >>> 0; + const result = h1 >>> 0; // This simulates the 32 bit integer overflow to match Java implementation return result | 0; } - -export = murmurhash3_32_gc; diff --git a/src/listener/ClusterViewListenerService.ts b/src/listener/ClusterViewListenerService.ts index da9d49d5e..620f32658 100644 --- a/src/listener/ClusterViewListenerService.ts +++ b/src/listener/ClusterViewListenerService.ts @@ -96,7 +96,7 @@ export class ClusterViewListenerService { } private createClusterViewEventHandler(connection: ClientConnection): (msg: ClientMessage) => void { - return (clientMessage: ClientMessage) => { + return (clientMessage: ClientMessage): void => { ClientAddClusterViewListenerCodec.handle(clientMessage, this.clusterService.handleMembersViewEvent.bind(this.clusterService), (version: number, partitions: Array<[UUID, number[]]>) => { diff --git a/src/nearcache/DataRecord.ts b/src/nearcache/DataRecord.ts index 2d253115d..682330c02 100644 --- a/src/nearcache/DataRecord.ts +++ b/src/nearcache/DataRecord.ts @@ -55,7 +55,6 @@ export class DataRecord { this.status = DataRecord.READ_PERMITTED; } - /*tslint:disable:member-ordering*/ public static lruComp(x: DataRecord, y: DataRecord): number { return x.lastAccessTime - y.lastAccessTime; } diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 0dfd3a50b..394f65cc7 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -77,10 +77,10 @@ export class NearCacheImpl implements NearCache { private staleReadDetector: StaleReadDetector = AlwaysFreshStaleReadDetectorImpl.INSTANCE; private reservationCounter: Long = Long.ZERO; - private evictedCount: number = 0; - private expiredCount: number = 0; - private missCount: number = 0; - private hitCount: number = 0; + private evictedCount = 0; + private expiredCount = 0; + private missCount = 0; + private hitCount = 0; private creationTime = Date.now(); private compareFunc: (x: DataRecord, y: DataRecord) => number; private ready: Promise.Resolver; @@ -250,7 +250,6 @@ export class NearCacheImpl implements NearCache { if (!this.isEvictionRequired()) { return; } - const internalSize = this.internalStore.size; if (this.recomputeEvictionPool() > 0) { return; } else { diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index a8da9eac5..35f0e7fc0 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -81,7 +81,7 @@ export class RepairingHandler { } } - checkOrRepairSequence(partitionId: number, nextSequence: Long, viaAntiEntropy: boolean = false): void { + checkOrRepairSequence(partitionId: number, nextSequence: Long, viaAntiEntropy = false): void { const metadata = this.getMetadataContainer(partitionId); const current = metadata.getSequence(); if (current.greaterThanOrEqual(nextSequence)) { diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index 1a4c6c192..72f90b9bc 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -42,7 +42,7 @@ export class PipelinedWriter extends EventEmitter { private readonly socket: net.Socket; private queue: OutputQueueItem[] = []; private error: Error; - private scheduled: boolean = false; + private scheduled = false; // coalescing threshold in bytes private readonly threshold: number; @@ -151,9 +151,9 @@ export class DirectWriter extends EventEmitter { export class ClientMessageReader { private chunks: Buffer[] = []; - private chunksTotalSize: number = 0; - private frameSize: number = 0; - private flags: number = 0; + private chunksTotalSize = 0; + private frameSize = 0; + private flags = 0; private clientMessage: ClientMessage = null; append(buffer: Buffer): void { @@ -162,7 +162,7 @@ export class ClientMessageReader { } read(): ClientMessage { - while (true) { + for (;;) { if (this.readFrame()) { if (this.clientMessage.endFrame.isFinalFrame()) { const message = this.clientMessage; diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index 958a8aea3..23ba77849 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -70,8 +70,8 @@ const BINARY_PROTOCOL_VERSION = Buffer.from('CP2'); enum ClientState { /** * Clients start with this state. Once a client connects to a cluster, - * it directly switches to {@link #INITIALIZED_ON_CLUSTER} instead of - * {@link #CONNECTED_TO_CLUSTER} because on startup a client has no + * it directly switches to {@link INITIALIZED_ON_CLUSTER} instead of + * {@link CONNECTED_TO_CLUSTER} because on startup a client has no * local state to send to the cluster. */ INITIAL = 0, @@ -87,7 +87,7 @@ enum ClientState { * When a client sends its local state to the cluster it has connected, * it switches to this state. When a client loses all connections to * the current cluster and connects to a new cluster, its state goes - * back to {@link #CONNECTED_TO_CLUSTER}. + * back to {@link CONNECTED_TO_CLUSTER}. *

* Invocations are allowed in this state. */ @@ -242,7 +242,7 @@ export class ClientConnectionManager extends EventEmitter { const connectionResolver: Promise.Resolver = DeferredPromise(); this.pendingConnections.set(addressKey, connectionResolver); - const processResponseCallback = (msg: ClientMessage) => { + const processResponseCallback = (msg: ClientMessage): void => { this.client.getInvocationService().processResponse(msg); }; diff --git a/src/protocol/PagingPredicateHolder.ts b/src/protocol/PagingPredicateHolder.ts index 1f89f1eae..bbf909be5 100644 --- a/src/protocol/PagingPredicateHolder.ts +++ b/src/protocol/PagingPredicateHolder.ts @@ -16,7 +16,6 @@ import {AnchorDataListHolder} from './AnchorDataListHolder'; import {Data} from '../serialization/Data'; -import {Predicate} from '../core/Predicate'; import {SerializationService} from '../serialization/SerializationService'; import {PagingPredicate} from '../serialization/DefaultPredicates'; diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index b2b805b4a..3ef75a41d 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -18,7 +18,6 @@ import * as Promise from 'bluebird'; import {BuildInfo} from '../BuildInfo'; import HazelcastClient from '../HazelcastClient'; import {Data} from '../serialization/Data'; -import {Address} from '../Address'; import {ClientMessage} from '../ClientMessage'; import {UUID} from '../core/UUID'; diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index 6b35b7612..ce9a22cce 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -22,7 +22,6 @@ import {Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../DistributedObject'; import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; -import {IndexType} from '../config/IndexType'; import {IndexConfig} from '../config/IndexConfig'; export interface IMap extends DistributedObject { diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index 72d2147bb..17dcf851e 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -194,7 +194,7 @@ export class ListProxy extends PartitionSpecificProxy implements IList { } addItemListener(listener: ItemListener, includeValue: boolean): Promise { - const listenerHandler = (message: ClientMessage) => { + const listenerHandler = (message: ClientMessage): void => { ListAddListenerCodec.handle(message, (element: Data, uuid: UUID, eventType: number) => { const responseObject = element ? this.toObject(element) : null; diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 4e7fbfeb6..97fd7226d 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -249,7 +249,7 @@ export class MapProxy extends BaseProxy implements IMap { }); } - put(key: K, value: V, ttl: number = -1): Promise { + put(key: K, value: V, ttl = -1): Promise { assertNotNull(key); assertNotNull(value); const keyData: Data = this.toData(key); @@ -358,7 +358,7 @@ export class MapProxy extends BaseProxy implements IMap { .then(() => undefined); } - lock(key: K, ttl: number = -1): Promise { + lock(key: K, ttl = -1): Promise { assertNotNull(key); const keyData = this.toData(key); return this.encodeInvokeOnKey(MapLockCodec, keyData, keyData, 0, ttl, 0) @@ -397,7 +397,7 @@ export class MapProxy extends BaseProxy implements IMap { }); } - loadAll(keys: K[] = null, replaceExistingValues: boolean = true): Promise { + loadAll(keys: K[] = null, replaceExistingValues = true): Promise { if (keys == null) { return this.encodeInvokeOnRandomTarget(MapLoadAllCodec, replaceExistingValues) .then(() => undefined); @@ -409,7 +409,7 @@ export class MapProxy extends BaseProxy implements IMap { } } - putIfAbsent(key: K, value: V, ttl: number = -1): Promise { + putIfAbsent(key: K, value: V, ttl = -1): Promise { assertNotNull(key); assertNotNull(value); const keyData = this.toData(key); @@ -417,7 +417,7 @@ export class MapProxy extends BaseProxy implements IMap { return this.putIfAbsentInternal(keyData, valueData, ttl); } - putTransient(key: K, value: V, ttl: number = -1): Promise { + putTransient(key: K, value: V, ttl = -1): Promise { assertNotNull(key); assertNotNull(value); const keyData = this.toData(key); @@ -443,7 +443,7 @@ export class MapProxy extends BaseProxy implements IMap { return this.replaceIfSameInternal(keyData, oldValueData, newValueData); } - set(key: K, value: V, ttl: number = -1): Promise { + set(key: K, value: V, ttl = -1): Promise { assertNotNull(key); assertNotNull(value); const keyData = this.toData(key); @@ -484,7 +484,7 @@ export class MapProxy extends BaseProxy implements IMap { .then(() => undefined); } - tryLock(key: K, timeout: number = 0, lease: number = -1): Promise { + tryLock(key: K, timeout = 0, lease = -1): Promise { assertNotNull(key); const keyData = this.toData(key); return this.encodeInvokeOnKey(MapTryLockCodec, keyData, keyData, 0, lease, timeout, 0) @@ -508,7 +508,7 @@ export class MapProxy extends BaseProxy implements IMap { return this.tryRemoveInternal(keyData, timeout); } - addEntryListener(listener: MapListener, key: K, includeValue: boolean = false): Promise { + addEntryListener(listener: MapListener, key: K, includeValue = false): Promise { return this.addEntryListenerInternal(listener, undefined, key, includeValue); } @@ -679,14 +679,12 @@ export class MapProxy extends BaseProxy implements IMap { }; for (const funcName in conversionTable) { if (listener[funcName]) { - /* tslint:disable:no-bitwise */ flags = flags | conversionTable[funcName]; } } const toObject = this.toObject.bind(this); - const entryEventHandler = ( - /* tslint:disable-next-line:no-shadowed-variable */ - key: K, value: V, oldValue: V, mergingValue: V, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => { + const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, eventType: number, + uuid: UUID, numberOfAffectedEntries: number): void => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index d7b589416..6cd0d70f2 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -56,10 +56,8 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { private lockReferenceIdGenerator: LockReferenceIdGenerator = this.client.getLockReferenceIdGenerator(); private deserializeList = (items: Data[]): X[] => { return items.map(this.toObject.bind(this)); - // tslint:disable-next-line:semicolon }; - /*tslint:disable:member-ordering*/ put(key: K, value: V): Promise { const keyData = this.toData(key); const valueData = this.toData(value); @@ -172,12 +170,11 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { }); } - addEntryListener(listener: EntryListener, key?: K, includeValue: boolean = true): Promise { + addEntryListener(listener: EntryListener, key?: K, includeValue = true): Promise { const toObject = this.toObject.bind(this); - /* tslint:disable: no-shadowed-variable */ const entryEventHandler = (keyData: Data, valueData: Data, oldValueData: Data, mergingValueData: Data, eventType: number, - uuid: UUID, numberOfAffectedEntries: number) => { + uuid: UUID, numberOfAffectedEntries: number): void => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; @@ -212,14 +209,14 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { if (key) { const keyData = this.toData(key); - const handler = (m: ClientMessage) => { + const handler = (m: ClientMessage): void => { MultiMapAddEntryListenerToKeyCodec.handle(m, entryEventHandler); }; const codec = this.createEntryListenerToKey(this.name, keyData, includeValue); return this.client.getListenerService().registerListener(codec, handler); } else { - const listenerHandler = (m: ClientMessage) => { + const listenerHandler = (m: ClientMessage): void => { MultiMapAddEntryListenerCodec.handle(m, entryEventHandler); }; const codec = this.createEntryListener(this.name, includeValue); @@ -232,7 +229,7 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { return this.client.getListenerService().deregisterListener(listenerId); } - lock(key: K, leaseMillis: number = -1): Promise { + lock(key: K, leaseMillis = -1): Promise { const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapLockCodec, keyData, keyData, 1, leaseMillis, this.nextSequence()) .then(() => undefined); @@ -247,7 +244,7 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { }); } - tryLock(key: K, timeoutMillis: number = 0, leaseMillis: number = -1): Promise { + tryLock(key: K, timeoutMillis = 0, leaseMillis = -1): Promise { const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapTryLockCodec, keyData, keyData, 1, leaseMillis, timeoutMillis, this.nextSequence()) .then((clientMessage) => { diff --git a/src/proxy/PNCounterProxy.ts b/src/proxy/PNCounterProxy.ts index 0c0402894..f9219757e 100644 --- a/src/proxy/PNCounterProxy.ts +++ b/src/proxy/PNCounterProxy.ts @@ -25,13 +25,12 @@ import {NoDataMemberInClusterError} from '../HazelcastError'; import {randomInt} from '../Util'; import {BaseProxy} from './BaseProxy'; import {PNCounter} from './PNCounter'; -import {Address} from '../Address'; import {Member} from '../core/Member'; export class PNCounterProxy extends BaseProxy implements PNCounter { private static readonly EMPTY_ARRAY: Member[] = []; private lastObservedVectorClock: VectorClock = new VectorClock(); - private maximumReplicaCount: number = 0; + private maximumReplicaCount = 0; private currentTargetReplicaAddress: Member; get(): Promise { diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 7d64ad376..fbd87b693 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -167,7 +167,7 @@ export class ProxyManager { public addDistributedObjectListener(distributedObjectListener: DistributedObjectListener): Promise { const handler = function (clientMessage: ClientMessage): void { - const converterFunc = (objectName: string, serviceName: string, eventType: string) => { + const converterFunc = (objectName: string, serviceName: string, eventType: string): void => { eventType = eventType.toLowerCase(); const distributedObjectEvent = new DistributedObjectEvent(eventType, serviceName, objectName); distributedObjectListener(distributedObjectEvent); diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index ee89e2070..b739fd7af 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -70,7 +70,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } addItemListener(listener: ItemListener, includeValue: boolean): Promise { - const handler = (message: ClientMessage) => { + const handler = (message: ClientMessage): void => { QueueAddListenerCodec.handle(message, (item: Data, uuid: UUID, eventType: number) => { let responseObject: E; if (item == null) { @@ -150,7 +150,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { }); } - offer(item: E, time: number = 0): Promise { + offer(item: E, time = 0): Promise { const itemData = this.toData(item); return this.encodeInvoke(QueueOfferCodec, itemData, time) .then((clientMessage) => { @@ -167,7 +167,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { }); } - poll(time: number = 0): Promise { + poll(time = 0): Promise { return this.encodeInvoke(QueuePollCodec, time) .then((clientMessage) => { const response = QueuePollCodec.decodeResponse(clientMessage); diff --git a/src/proxy/ReplicatedMap.ts b/src/proxy/ReplicatedMap.ts index f2f4b9add..b670a72a8 100644 --- a/src/proxy/ReplicatedMap.ts +++ b/src/proxy/ReplicatedMap.ts @@ -49,7 +49,7 @@ export interface ReplicatedMap extends DistributedObject { * * If this map permits null values, then a return value of null does not * necessarily indicate that the map contains no mapping for the key; it's also - * possible that the map explicitly maps the key to null. The #containsKey + * possible that the map explicitly maps the key to null. The {@link containsKey} * operation may be used to distinguish these two cases. This message is * idempotent. * diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index bbf1539a4..63073951a 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -17,7 +17,7 @@ import * as Promise from 'bluebird'; import {ReplicatedMapAddEntryListenerCodec} from '../codec/ReplicatedMapAddEntryListenerCodec'; import {ReplicatedMapAddEntryListenerToKeyCodec} from '../codec/ReplicatedMapAddEntryListenerToKeyCodec'; -/* tslint:disable:max-line-length */ +// eslint-disable-next-line max-len import {ReplicatedMapAddEntryListenerToKeyWithPredicateCodec} from '../codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec'; import {ReplicatedMapAddEntryListenerWithPredicateCodec} from '../codec/ReplicatedMapAddEntryListenerWithPredicateCodec'; import {ReplicatedMapClearCodec} from '../codec/ReplicatedMapClearCodec'; @@ -44,7 +44,6 @@ import {ArrayComparator} from '../util/ArrayComparator'; import {ReplicatedMap} from './ReplicatedMap'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {MapEvent} from '../core/MapListener'; -/* tslint:enable:max-line-length */ import Long = require('long'); import {UUID} from '../core/UUID'; import {ClientMessage} from '../ClientMessage'; @@ -199,9 +198,8 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements private addEntryListenerInternal(listener: EntryListener, predicate: Predicate, key: K): Promise { const toObject = this.toObject.bind(this); - /* tslint:disable-next-line:no-shadowed-variable */ const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, - event: number, uuid: UUID, numberOfAffectedEntries: number) => { + event: number, uuid: UUID, numberOfAffectedEntries: number): void => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; diff --git a/src/proxy/Ringbuffer.ts b/src/proxy/Ringbuffer.ts index b86d4be4a..68f4ee94a 100644 --- a/src/proxy/Ringbuffer.ts +++ b/src/proxy/Ringbuffer.ts @@ -112,8 +112,8 @@ export interface Ringbuffer extends DistributedObject { * @return the item that was read. * @throws `RangeError` if the sequence is: * smaller then zero; - * smaller than {@link #headSequence()}; - * more than {@link #tailSequence()} + 1 + * smaller than {@link headSequence}; + * more than {@link tailSequence} + 1 */ readOne(sequence: number | Long): Promise; @@ -130,7 +130,7 @@ export interface Ringbuffer extends DistributedObject { * @param minCount minimum number of items to be read. * @param maxCount maximum number of items to be read. * @throws `RangeError` if startSequence is smaller than 0 - * or if startSequence larger than {@link #tailSequence()} + * or if startSequence larger than {@link tailSequence} * or if minCount smaller than 0 * or if minCount larger than maxCount, * or if maxCount larger than the capacity of the ringbuffer diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index 270735e35..e12d18669 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -123,8 +123,8 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { }); } - addItemListener(listener: ItemListener, includeValue: boolean = true): Promise { - const handler = (message: ClientMessage) => { + addItemListener(listener: ItemListener, includeValue = true): Promise { + const handler = (message: ClientMessage): void => { SetAddListenerCodec.handle(message, (item: Data, uuid: UUID, eventType: number) => { const responseObject = this.toObject(item); const member = this.client.getClusterService().getMember(uuid); diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index 363952d46..fba0d843f 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -60,7 +60,7 @@ export class AutoBatcher { private queue: Array> = []; private batch: Batch; - private requestInFlight: boolean = false; + private requestInFlight = false; private supplier: () => Promise; private emitter = new EventEmitter(); diff --git a/src/proxy/ringbuffer/ReadResultSet.ts b/src/proxy/ringbuffer/ReadResultSet.ts index 8e8bd3383..b0ec4f518 100644 --- a/src/proxy/ringbuffer/ReadResultSet.ts +++ b/src/proxy/ringbuffer/ReadResultSet.ts @@ -15,7 +15,7 @@ */ /** - * ReadResultSet defines the result of a {@lin RingBuffer#readMany} operation. + * ReadResultSet defines the result of a {@link Ringbuffer.readMany} operation. */ import * as Long from 'long'; @@ -24,7 +24,7 @@ export interface ReadResultSet { /** * Returns the number of items that have been read before filtering. *

- * If no filter is set, then the readCount will be equal to {@link #size}. But if a filter is applied, it could be that items + * If no filter is set, then the readCount will be equal to {@link size}. But if a filter is applied, it could be that items * are read, but are filtered out. So if you are trying to make another read based on the ReadResultSet then you should * increment the sequence by readCount and not by size. Otherwise you will be re-reading the same filtered messages. * diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 96dbcb561..823c83749 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -26,12 +26,12 @@ import {ILogger} from '../../logging/ILogger'; export class ReliableTopicListenerRunner { - public sequenceNumber: number = 0; + public sequenceNumber = 0; private listener: MessageListener; private ringbuffer: Ringbuffer; private batchSize: number; private serializationService: SerializationService; - private cancelled: boolean = false; + private cancelled = false; private logger: ILogger; private proxy: ReliableTopicProxy; private listenerId: string; diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index adca57e23..292e906a1 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -376,7 +376,7 @@ export class PagingPredicate extends AbstractPredicate { private internalPredicate: Predicate; private pageSize: number; private comparatorObject: Comparator; - private page: number = 0; + private page = 0; private iterationType: IterationType = IterationType.ENTRY; private anchorList: Array<[number, [any, any]]> = []; diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index 52b0ed195..bcf41798e 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -382,8 +382,7 @@ export class IdentifiedDataSerializableSerializer implements Serializer { } const factoryId = input.readInt(); const classId = input.readInt(); - let factory: IdentifiedDataSerializableFactory; - factory = this.factories[factoryId]; + const factory = this.factories[factoryId]; if (!factory) { throw new RangeError('There is no Identified Data Serializer factory with id ' + factoryId + '.'); } diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index 2380dea6b..ec948360d 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -14,12 +14,12 @@ * limitations under the License. */ -import murmur = require('../invocation/Murmur'); +import {murmur} from '../invocation/Murmur'; import {Data} from './Data'; -export const PARTITION_HASH_OFFSET: number = 0; -export const TYPE_OFFSET: number = 4; -export const DATA_OFFSET: number = 8; +export const PARTITION_HASH_OFFSET = 0; +export const TYPE_OFFSET = 4; +export const DATA_OFFSET = 8; export const HEAP_DATA_OVERHEAD: number = DATA_OFFSET; export class HeapData implements Data { diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 037ea6e9b..420be8986 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -/* tslint:disable:no-bitwise */ import * as assert from 'assert'; import * as Long from 'long'; import {BitsUtil} from '../BitsUtil'; @@ -24,8 +23,6 @@ import {SerializationService} from './SerializationService'; const OUTPUT_BUFFER_INITIAL_SIZE = HEAP_DATA_OVERHEAD + BitsUtil.LONG_SIZE_IN_BYTES; const MASK_1BYTE = (1 << 8) - 1; -const MASK_2BYTE = (1 << 16) - 1; -const MASK_4BYTE = (1 << 32) - 1; export class ObjectDataOutput implements DataOutput { protected buffer: Buffer; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index f63ed6ba8..69b0618ff 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -293,10 +293,9 @@ export class SerializationServiceV1 implements SerializationService { protected registerCustomSerializers(): void { const customSerializersArray: any[] = this.serializationConfig.customSerializers; - const self = this; - customSerializersArray.forEach(function (candidate): void { - self.assertValidCustomSerializer(candidate); - self.registerSerializer('!custom' + candidate.getId(), candidate); + customSerializersArray.forEach((candidate) => { + this.assertValidCustomSerializer(candidate); + this.registerSerializer('!custom' + candidate.getId(), candidate); }); const customSerializerConfigs = this.serializationConfig.customSerializerConfigs; for (const typeId in customSerializerConfigs) { @@ -371,9 +370,7 @@ export class SerializationServiceV1 implements SerializationService { } private defaultPartitionStrategy(obj: any): number { - /* tslint:disable:no-string-literal */ if (obj == null || !obj['getPartitionHash']) { - /* tslint:enable:no-string-literal */ return 0; } else { return obj.getPartitionHash(); diff --git a/src/serialization/portable/ClassDefinitionBuilder.ts b/src/serialization/portable/ClassDefinitionBuilder.ts index 4065de469..d96d1bd3e 100644 --- a/src/serialization/portable/ClassDefinitionBuilder.ts +++ b/src/serialization/portable/ClassDefinitionBuilder.ts @@ -24,10 +24,10 @@ export class ClassDefinitionBuilder { private fieldDefinitions: FieldDefinition[] = []; - private index: number = 0; + private index = 0; private done: boolean; - constructor(factoryId: number, classId: number, version: number = 0) { + constructor(factoryId: number, classId: number, version = 0) { this.factoryId = factoryId; this.classId = classId; this.version = version; diff --git a/src/serialization/portable/DefaultPortableReader.ts b/src/serialization/portable/DefaultPortableReader.ts index 6375b072e..5ee3371a8 100644 --- a/src/serialization/portable/DefaultPortableReader.ts +++ b/src/serialization/portable/DefaultPortableReader.ts @@ -30,16 +30,13 @@ export class DefaultPortableReader implements PortableReader { private offset: number; private finalPos: number; - private raw: boolean = false; + private raw = false; constructor(serializer: PortableSerializer, input: DataInput, classDefinition: ClassDefinition) { this.serializer = serializer; this.input = input; this.classDefinition = classDefinition; - - this.finalPos = this.input.readInt(); - const fieldCount = this.input.readInt(); - this.offset = this.input.position(); + this.initFinalPositionAndOffset(); } getVersion(): number { @@ -220,4 +217,15 @@ export class DefaultPortableReader implements PortableReader { const definition = this.classDefinition.getField(fieldName); return this.positionByFieldDefinition(definition); } + + private initFinalPositionAndOffset(): void { + this.finalPos = this.input.readInt(); + const fieldCount = this.input.readInt(); + const expectedFieldCount = this.classDefinition.getFieldCount(); + if (fieldCount !== expectedFieldCount) { + // eslint-disable-next-line max-len + throw new IllegalStateError(`Field count[${fieldCount}] in stream does not match with class definition[${expectedFieldCount}]`); + } + this.offset = this.input.position(); + } } diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 88305549e..dd4d1b1b0 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -24,7 +24,6 @@ import {ClassDefinition, FieldType} from './ClassDefinition'; import {DefaultPortableWriter} from './DefaultPortableWriter'; import * as Long from 'long'; import {SerializationConfig} from '../../config/SerializationConfig'; -import * as Path from 'path'; import {HazelcastSerializationError} from '../../HazelcastError'; import * as Util from '../../Util'; diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts index e9051ad32..03bfe8b5e 100644 --- a/src/statistics/Statistics.ts +++ b/src/statistics/Statistics.ts @@ -150,7 +150,7 @@ export class Statistics { this.allGauges[gaugeName] = gaugeFunc; } catch (e) { this.logger.warn('Statistics', 'Could not collect data for gauge ' + gaugeName + ' , it won\'t be registered', e); - this.allGauges[gaugeName] = () => Statistics.EMPTY_STAT_VALUE; + this.allGauges[gaugeName] = (): string => Statistics.EMPTY_STAT_VALUE; } } diff --git a/src/util/RoundRobinLB.ts b/src/util/RoundRobinLB.ts index 57c9646ec..fa97cf31c 100644 --- a/src/util/RoundRobinLB.ts +++ b/src/util/RoundRobinLB.ts @@ -18,7 +18,6 @@ import {AbstractLoadBalancer} from './AbstractLoadBalancer'; import {randomInt} from '../Util'; import {Member} from '../core/Member'; -// tslint:disable-next-line:no-bitwise const INITIAL_SEED_CAP = 1 << 16; /** diff --git a/src/util/UuidUtil.ts b/src/util/UuidUtil.ts index e50ac49f2..62c82c5ed 100644 --- a/src/util/UuidUtil.ts +++ b/src/util/UuidUtil.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -/* tslint:disable:no-bitwise */ import * as Long from 'long'; import {UUID} from '../core/UUID'; @@ -25,7 +24,7 @@ function randomUInt(): number { } export class UuidUtil { - static generate(isUnsigned: boolean = true): UUID { + static generate(isUnsigned = true): UUID { const mostS = new Long(randomUInt(), randomUInt(), isUnsigned); const leastS = new Long(randomUInt(), randomUInt(), isUnsigned); return new UUID(mostS, leastS); diff --git a/test/LoggingTest.js b/test/LoggingTest.js index 66e7fa0df..a686c2846 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -26,7 +26,7 @@ describe('Logging Test', function () { var client; var winstonAdapter = { - logger: new (winston.Logger)({ + logger: winston.createLogger({ transports: [ new (winston.transports.Console)() ] @@ -90,9 +90,10 @@ describe('Logging Test', function () { it('winston should emit logging event', function () { var loggingHappened = false; - winstonAdapter.logger.on('logging', function (transport, level, msg, meta) { + winstonAdapter.logger.transports[0].on('logged', function (transport, level, msg, meta) { loggingHappened = true; }); + var cfg = new Config.ClientConfig(); cfg.clusterName = cluster.id; cfg.customLogger = winstonAdapter; @@ -163,9 +164,8 @@ describe('Logging Test', function () { cfg.properties['hazelcast.logging.level'] = LogLevel.TRACE; return HazelcastClient.newHazelcastClient(cfg).then(function (cl) { client = cl; - return sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); - return sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'DEBUG'); - return sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'TRACE'); + sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); + sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'TRACE'); }); }); }); diff --git a/test/mocha.opts b/test/mocha.opts deleted file mode 100644 index 001046da1..000000000 --- a/test/mocha.opts +++ /dev/null @@ -1 +0,0 @@ ---timeout 8000 diff --git a/test/unit/protocol/ClientMessageFramingTest.js b/test/unit/protocol/ClientMessageFramingTest.js index 2f10763f5..7567fe985 100644 --- a/test/unit/protocol/ClientMessageFramingTest.js +++ b/test/unit/protocol/ClientMessageFramingTest.js @@ -47,7 +47,7 @@ describe('ClientMessageFramingTest', function () { beforeEach(function () { buffer = Buffer.allocUnsafe(20); - message = new cm.ClientMessage.createForEncode(); + message = cm.ClientMessage.createForEncode(); message.addFrame(new cm.Frame(buffer)); }); diff --git a/tsconfig.json b/tsconfig.json index f5df56b3e..c389af944 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,12 +4,12 @@ "module": "commonjs", "moduleResolution": "node", "noImplicitAny": true, - "target": "es5", + "target": "es2016", "outDir": "lib", "preserveConstEnums": true, "lib": [ - "es5", - "es6" + "es2016", + "es2017.string" ], "removeComments": false, "sourceMap": true diff --git a/tslint.json b/tslint.json deleted file mode 100644 index 981efc8ca..000000000 --- a/tslint.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "extends": "tslint:recommended", - "rules": { - "max-line-length": [ - true, - 130 - ], - "quotemark": [ - true, - "single" - ], - "member-access": false, - "only-arrow-functions": false, - "space-before-function-paren": [ - true, - { - "anonymous": "always", - "named": "never", - "method": "never", - "asyncArrow": "always" - } - ], - "member-ordering": [ - true, - { - "order": [ - "public-static-field", - "protected-static-field", - "private-static-field", - "public-instance-field", - "protected-instance-field", - "private-instance-field", - "public-constructor", - "protected-constructor", - "private-constructor", - "public-static-method", - "protected-static-method", - "private-static-method", - "public-instance-method", - "protected-instance-method", - "private-instance-method" - ] - } - ], - "forin": false, - "max-classes-per-file": false, - "interface-name": false, - "ban-types": false, - "object-literal-sort-keys": false, - "no-var-requires": false, - "no-console": false, - "no-empty-interface": false, - "ordered-imports": false, - "no-conditional-assignment": false, - "typedef": [ - true, - "call-signature", - "property-declaration" - ], - "variable-name": [ - true, - "allow-leading-underscore" - ] - } -} From 5cdb37402813138d9f1f951689279fc3215176cf Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Mon, 27 Jul 2020 10:34:19 +0300 Subject: [PATCH 271/685] Change IMDG version in RC to 4.0.2 (#561) --- scripts/dev-test-rc.sh | 4 ++-- scripts/download-rc.bat | 4 ++-- scripts/download-rc.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 23827930f..2047b0a09 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="4.0.2-SNAPSHOT" -HAZELCAST_TEST_VERSION="4.0.2-SNAPSHOT" +HZ_VERSION="4.0.2" +HAZELCAST_TEST_VERSION="4.0.2" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.7-SNAPSHOT" diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 17e8bf30d..4e25c9027 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,5 +1,5 @@ -set HZ_VERSION="4.0.2-SNAPSHOT" -set HZ_TEST_VERSION="4.0.2-SNAPSHOT" +set HZ_VERSION="4.0.2" +set HZ_TEST_VERSION="4.0.2" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 19504cb42..b57893df2 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="4.0.2-SNAPSHOT" -HZ_TEST_VERSION="4.0.2-SNAPSHOT" +HZ_VERSION="4.0.2" +HZ_TEST_VERSION="4.0.2" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} From c6e23cf96dfa7a1b3c2f3d0f58f3758d25edfc22 Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Tue, 4 Aug 2020 16:00:33 +0300 Subject: [PATCH 272/685] Support protocol extension (#549) Includes the following: * Update codecs * Add implementations for map#setAll and multimap#putAll --- scripts/dev-test-rc.sh | 4 +- scripts/download-rc.bat | 4 +- scripts/download-rc.sh | 4 +- src/HazelcastError.ts | 7 ++ ...ClientAddDistributedObjectListenerCodec.ts | 7 +- .../ClientAddPartitionLostListenerCodec.ts | 7 +- src/codec/ClientAuthenticationCodec.ts | 21 +++--- src/codec/ClientAuthenticationCustomCodec.ts | 21 +++--- src/codec/ClientGetDistributedObjectsCodec.ts | 7 +- src/codec/ClientLocalBackupListenerCodec.ts | 7 +- ...entRemoveDistributedObjectListenerCodec.ts | 7 +- .../ClientRemovePartitionLostListenerCodec.ts | 7 +- src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 11 +-- src/codec/ListAddAllCodec.ts | 7 +- src/codec/ListAddAllWithIndexCodec.ts | 7 +- src/codec/ListAddCodec.ts | 7 +- src/codec/ListAddListenerCodec.ts | 7 +- src/codec/ListCompareAndRemoveAllCodec.ts | 7 +- src/codec/ListCompareAndRetainAllCodec.ts | 7 +- src/codec/ListContainsAllCodec.ts | 7 +- src/codec/ListContainsCodec.ts | 7 +- src/codec/ListGetAllCodec.ts | 7 +- src/codec/ListGetCodec.ts | 7 +- src/codec/ListIndexOfCodec.ts | 7 +- src/codec/ListIsEmptyCodec.ts | 7 +- src/codec/ListIteratorCodec.ts | 7 +- src/codec/ListLastIndexOfCodec.ts | 7 +- src/codec/ListListIteratorCodec.ts | 7 +- src/codec/ListRemoveCodec.ts | 7 +- src/codec/ListRemoveListenerCodec.ts | 7 +- src/codec/ListRemoveWithIndexCodec.ts | 7 +- src/codec/ListSetCodec.ts | 7 +- src/codec/ListSizeCodec.ts | 7 +- src/codec/ListSubCodec.ts | 7 +- src/codec/MapAddEntryListenerCodec.ts | 7 +- src/codec/MapAddEntryListenerToKeyCodec.ts | 7 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 7 +- .../MapAddEntryListenerWithPredicateCodec.ts | 7 +- src/codec/MapAddInterceptorCodec.ts | 7 +- ...apAddNearCacheInvalidationListenerCodec.ts | 7 +- src/codec/MapAddPartitionLostListenerCodec.ts | 7 +- src/codec/MapAggregateCodec.ts | 7 +- src/codec/MapAggregateWithPredicateCodec.ts | 7 +- src/codec/MapContainsKeyCodec.ts | 7 +- src/codec/MapContainsValueCodec.ts | 7 +- .../MapEntriesWithPagingPredicateCodec.ts | 9 +-- src/codec/MapEntriesWithPredicateCodec.ts | 7 +- src/codec/MapEntrySetCodec.ts | 7 +- src/codec/MapEventJournalReadCodec.ts | 13 ++-- src/codec/MapEventJournalSubscribeCodec.ts | 9 +-- src/codec/MapEvictCodec.ts | 7 +- src/codec/MapExecuteOnAllKeysCodec.ts | 7 +- src/codec/MapExecuteOnKeyCodec.ts | 7 +- src/codec/MapExecuteOnKeysCodec.ts | 7 +- src/codec/MapExecuteWithPredicateCodec.ts | 7 +- src/codec/MapFetchEntriesCodec.ts | 9 +-- src/codec/MapFetchKeysCodec.ts | 9 +-- ...FetchNearCacheInvalidationMetadataCodec.ts | 9 +-- src/codec/MapFetchWithQueryCodec.ts | 9 +-- src/codec/MapGetAllCodec.ts | 7 +- src/codec/MapGetCodec.ts | 7 +- src/codec/MapGetEntryViewCodec.ts | 9 +-- src/codec/MapIsEmptyCodec.ts | 7 +- src/codec/MapIsLockedCodec.ts | 7 +- src/codec/MapKeySetCodec.ts | 7 +- .../MapKeySetWithPagingPredicateCodec.ts | 9 +-- src/codec/MapKeySetWithPredicateCodec.ts | 7 +- src/codec/MapProjectCodec.ts | 7 +- src/codec/MapProjectWithPredicateCodec.ts | 7 +- src/codec/MapPutCodec.ts | 7 +- src/codec/MapPutIfAbsentCodec.ts | 7 +- src/codec/MapPutIfAbsentWithMaxIdleCodec.ts | 7 +- src/codec/MapPutTransientWithMaxIdleCodec.ts | 7 +- src/codec/MapPutWithMaxIdleCodec.ts | 7 +- src/codec/MapRemoveCodec.ts | 7 +- src/codec/MapRemoveEntryListenerCodec.ts | 7 +- src/codec/MapRemoveIfSameCodec.ts | 7 +- src/codec/MapRemoveInterceptorCodec.ts | 7 +- .../MapRemovePartitionLostListenerCodec.ts | 7 +- src/codec/MapReplaceCodec.ts | 7 +- src/codec/MapReplaceIfSameCodec.ts | 7 +- src/codec/MapSetTtlCodec.ts | 7 +- src/codec/MapSetWithMaxIdleCodec.ts | 7 +- src/codec/MapSizeCodec.ts | 7 +- src/codec/MapSubmitToKeyCodec.ts | 7 +- src/codec/MapTryLockCodec.ts | 7 +- src/codec/MapTryPutCodec.ts | 7 +- src/codec/MapTryRemoveCodec.ts | 7 +- src/codec/MapValuesCodec.ts | 7 +- .../MapValuesWithPagingPredicateCodec.ts | 9 +-- src/codec/MapValuesWithPredicateCodec.ts | 7 +- src/codec/MultiMapAddEntryListenerCodec.ts | 7 +- .../MultiMapAddEntryListenerToKeyCodec.ts | 7 +- src/codec/MultiMapContainsEntryCodec.ts | 7 +- src/codec/MultiMapContainsKeyCodec.ts | 7 +- src/codec/MultiMapContainsValueCodec.ts | 7 +- src/codec/MultiMapEntrySetCodec.ts | 7 +- src/codec/MultiMapGetCodec.ts | 7 +- src/codec/MultiMapIsLockedCodec.ts | 7 +- src/codec/MultiMapKeySetCodec.ts | 7 +- src/codec/MultiMapPutAllCodec.ts | 4 ++ src/codec/MultiMapPutCodec.ts | 7 +- src/codec/MultiMapRemoveCodec.ts | 7 +- src/codec/MultiMapRemoveEntryCodec.ts | 7 +- src/codec/MultiMapRemoveEntryListenerCodec.ts | 7 +- src/codec/MultiMapSizeCodec.ts | 7 +- src/codec/MultiMapTryLockCodec.ts | 7 +- src/codec/MultiMapValueCountCodec.ts | 7 +- src/codec/MultiMapValuesCodec.ts | 7 +- src/codec/PNCounterAddCodec.ts | 11 +-- src/codec/PNCounterGetCodec.ts | 11 +-- ...PNCounterGetConfiguredReplicaCountCodec.ts | 7 +- src/codec/QueueAddAllCodec.ts | 7 +- src/codec/QueueAddListenerCodec.ts | 7 +- src/codec/QueueCompareAndRemoveAllCodec.ts | 7 +- src/codec/QueueCompareAndRetainAllCodec.ts | 7 +- src/codec/QueueContainsAllCodec.ts | 7 +- src/codec/QueueContainsCodec.ts | 7 +- src/codec/QueueDrainToCodec.ts | 7 +- src/codec/QueueDrainToMaxSizeCodec.ts | 7 +- src/codec/QueueIsEmptyCodec.ts | 7 +- src/codec/QueueIteratorCodec.ts | 7 +- src/codec/QueueOfferCodec.ts | 7 +- src/codec/QueuePeekCodec.ts | 7 +- src/codec/QueuePollCodec.ts | 7 +- src/codec/QueueRemainingCapacityCodec.ts | 7 +- src/codec/QueueRemoveCodec.ts | 7 +- src/codec/QueueRemoveListenerCodec.ts | 7 +- src/codec/QueueSizeCodec.ts | 7 +- src/codec/QueueTakeCodec.ts | 7 +- .../ReplicatedMapAddEntryListenerCodec.ts | 7 +- ...ReplicatedMapAddEntryListenerToKeyCodec.ts | 7 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 7 +- ...edMapAddEntryListenerWithPredicateCodec.ts | 7 +- ...icatedMapAddNearCacheEntryListenerCodec.ts | 7 +- src/codec/ReplicatedMapContainsKeyCodec.ts | 7 +- src/codec/ReplicatedMapContainsValueCodec.ts | 7 +- src/codec/ReplicatedMapEntrySetCodec.ts | 7 +- src/codec/ReplicatedMapGetCodec.ts | 7 +- src/codec/ReplicatedMapIsEmptyCodec.ts | 7 +- src/codec/ReplicatedMapKeySetCodec.ts | 7 +- src/codec/ReplicatedMapPutCodec.ts | 7 +- src/codec/ReplicatedMapRemoveCodec.ts | 7 +- .../ReplicatedMapRemoveEntryListenerCodec.ts | 7 +- src/codec/ReplicatedMapSizeCodec.ts | 7 +- src/codec/ReplicatedMapValuesCodec.ts | 7 +- src/codec/RingbufferAddAllCodec.ts | 7 +- src/codec/RingbufferAddCodec.ts | 7 +- src/codec/RingbufferCapacityCodec.ts | 7 +- src/codec/RingbufferHeadSequenceCodec.ts | 7 +- src/codec/RingbufferReadManyCodec.ts | 13 ++-- src/codec/RingbufferReadOneCodec.ts | 7 +- src/codec/RingbufferRemainingCapacityCodec.ts | 7 +- src/codec/RingbufferSizeCodec.ts | 7 +- src/codec/RingbufferTailSequenceCodec.ts | 7 +- src/codec/SetAddAllCodec.ts | 7 +- src/codec/SetAddCodec.ts | 7 +- src/codec/SetAddListenerCodec.ts | 7 +- src/codec/SetCompareAndRemoveAllCodec.ts | 7 +- src/codec/SetCompareAndRetainAllCodec.ts | 7 +- src/codec/SetContainsAllCodec.ts | 7 +- src/codec/SetContainsCodec.ts | 7 +- src/codec/SetGetAllCodec.ts | 7 +- src/codec/SetIsEmptyCodec.ts | 7 +- src/codec/SetRemoveCodec.ts | 7 +- src/codec/SetRemoveListenerCodec.ts | 7 +- src/codec/SetSizeCodec.ts | 7 +- src/codec/TopicAddMessageListenerCodec.ts | 7 +- src/codec/TopicRemoveMessageListenerCodec.ts | 7 +- src/codec/TransactionCommitCodec.ts | 47 ------------- src/codec/TransactionCreateCodec.ts | 64 ----------------- src/codec/TransactionRollbackCodec.ts | 47 ------------- src/codec/TransactionalListAddCodec.ts | 65 ----------------- src/codec/TransactionalListRemoveCodec.ts | 65 ----------------- src/codec/TransactionalListSizeCodec.ts | 62 ----------------- src/codec/TransactionalMapContainsKeyCodec.ts | 65 ----------------- .../TransactionalMapContainsValueCodec.ts | 65 ----------------- src/codec/TransactionalMapDeleteCodec.ts | 52 -------------- src/codec/TransactionalMapGetCodec.ts | 66 ------------------ .../TransactionalMapGetForUpdateCodec.ts | 66 ------------------ src/codec/TransactionalMapIsEmptyCodec.ts | 62 ----------------- src/codec/TransactionalMapKeySetCodec.ts | 65 ----------------- ...ransactionalMapKeySetWithPredicateCodec.ts | 66 ------------------ src/codec/TransactionalMapPutCodec.ts | 69 ------------------- src/codec/TransactionalMapPutIfAbsentCodec.ts | 67 ------------------ src/codec/TransactionalMapRemoveCodec.ts | 66 ------------------ .../TransactionalMapRemoveIfSameCodec.ts | 66 ------------------ src/codec/TransactionalMapReplaceCodec.ts | 67 ------------------ .../TransactionalMapReplaceIfSameCodec.ts | 67 ------------------ src/codec/TransactionalMapSetCodec.ts | 53 -------------- src/codec/TransactionalMapSizeCodec.ts | 62 ----------------- src/codec/TransactionalMapValuesCodec.ts | 65 ----------------- ...ransactionalMapValuesWithPredicateCodec.ts | 66 ------------------ src/codec/TransactionalMultiMapGetCodec.ts | 66 ------------------ src/codec/TransactionalMultiMapPutCodec.ts | 66 ------------------ src/codec/TransactionalMultiMapRemoveCodec.ts | 66 ------------------ .../TransactionalMultiMapRemoveEntryCodec.ts | 66 ------------------ src/codec/TransactionalMultiMapSizeCodec.ts | 62 ----------------- .../TransactionalMultiMapValueCountCodec.ts | 65 ----------------- src/codec/TransactionalQueueOfferCodec.ts | 67 ------------------ src/codec/TransactionalQueuePeekCodec.ts | 67 ------------------ src/codec/TransactionalQueuePollCodec.ts | 67 ------------------ src/codec/TransactionalQueueSizeCodec.ts | 62 ----------------- src/codec/TransactionalQueueTakeCodec.ts | 65 ----------------- src/codec/TransactionalSetAddCodec.ts | 65 ----------------- src/codec/TransactionalSetRemoveCodec.ts | 65 ----------------- src/codec/TransactionalSetSizeCodec.ts | 62 ----------------- src/codec/builtin/ListDataCodec.ts | 30 ++++++++ src/codec/custom/AddressCodec.ts | 7 +- src/codec/custom/AnchorDataListHolderCodec.ts | 10 +-- src/codec/custom/BitmapIndexOptionsCodec.ts | 7 +- .../custom/DistributedObjectInfoCodec.ts | 5 +- src/codec/custom/ErrorHolderCodec.ts | 12 ++-- src/codec/custom/IndexConfigCodec.ts | 12 ++-- src/codec/custom/MemberInfoCodec.ts | 18 +++-- src/codec/custom/MemberVersionCodec.ts | 8 +-- .../custom/PagingPredicateHolderCodec.ts | 19 +++-- src/codec/custom/SimpleEntryViewCodec.ts | 28 ++++---- src/codec/custom/StackTraceElementCodec.ts | 11 +-- src/protocol/ErrorFactory.ts | 2 + src/proxy/IMap.ts | 59 ++++++++++++++++ src/proxy/MapProxy.ts | 55 ++++++++------- src/proxy/MultiMap.ts | 13 ++++ src/proxy/MultiMapProxy.ts | 35 ++++++++++ src/proxy/NearCachedMapProxy.ts | 14 ++-- test/map/MapProxyTest.js | 63 +++++++++-------- test/map/MapStoreTest.js | 56 ++++++++++++++- test/map/NearCachedMapTest.js | 23 ++++--- test/multimap/MultiMapProxyListenersTest.js | 23 ++++++- test/multimap/MultiMapProxyTest.js | 29 ++++++++ 230 files changed, 1106 insertions(+), 3090 deletions(-) delete mode 100644 src/codec/TransactionCommitCodec.ts delete mode 100644 src/codec/TransactionCreateCodec.ts delete mode 100644 src/codec/TransactionRollbackCodec.ts delete mode 100644 src/codec/TransactionalListAddCodec.ts delete mode 100644 src/codec/TransactionalListRemoveCodec.ts delete mode 100644 src/codec/TransactionalListSizeCodec.ts delete mode 100644 src/codec/TransactionalMapContainsKeyCodec.ts delete mode 100644 src/codec/TransactionalMapContainsValueCodec.ts delete mode 100644 src/codec/TransactionalMapDeleteCodec.ts delete mode 100644 src/codec/TransactionalMapGetCodec.ts delete mode 100644 src/codec/TransactionalMapGetForUpdateCodec.ts delete mode 100644 src/codec/TransactionalMapIsEmptyCodec.ts delete mode 100644 src/codec/TransactionalMapKeySetCodec.ts delete mode 100644 src/codec/TransactionalMapKeySetWithPredicateCodec.ts delete mode 100644 src/codec/TransactionalMapPutCodec.ts delete mode 100644 src/codec/TransactionalMapPutIfAbsentCodec.ts delete mode 100644 src/codec/TransactionalMapRemoveCodec.ts delete mode 100644 src/codec/TransactionalMapRemoveIfSameCodec.ts delete mode 100644 src/codec/TransactionalMapReplaceCodec.ts delete mode 100644 src/codec/TransactionalMapReplaceIfSameCodec.ts delete mode 100644 src/codec/TransactionalMapSetCodec.ts delete mode 100644 src/codec/TransactionalMapSizeCodec.ts delete mode 100644 src/codec/TransactionalMapValuesCodec.ts delete mode 100644 src/codec/TransactionalMapValuesWithPredicateCodec.ts delete mode 100644 src/codec/TransactionalMultiMapGetCodec.ts delete mode 100644 src/codec/TransactionalMultiMapPutCodec.ts delete mode 100644 src/codec/TransactionalMultiMapRemoveCodec.ts delete mode 100644 src/codec/TransactionalMultiMapRemoveEntryCodec.ts delete mode 100644 src/codec/TransactionalMultiMapSizeCodec.ts delete mode 100644 src/codec/TransactionalMultiMapValueCountCodec.ts delete mode 100644 src/codec/TransactionalQueueOfferCodec.ts delete mode 100644 src/codec/TransactionalQueuePeekCodec.ts delete mode 100644 src/codec/TransactionalQueuePollCodec.ts delete mode 100644 src/codec/TransactionalQueueSizeCodec.ts delete mode 100644 src/codec/TransactionalQueueTakeCodec.ts delete mode 100644 src/codec/TransactionalSetAddCodec.ts delete mode 100644 src/codec/TransactionalSetRemoveCodec.ts delete mode 100644 src/codec/TransactionalSetSizeCodec.ts create mode 100644 src/codec/builtin/ListDataCodec.ts diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 2047b0a09..ec7a84c89 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="4.0.2" -HAZELCAST_TEST_VERSION="4.0.2" +HZ_VERSION="4.1-SNAPSHOT" +HAZELCAST_TEST_VERSION="4.1-SNAPSHOT" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.7-SNAPSHOT" diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 4e25c9027..6a0e4aec1 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,5 +1,5 @@ -set HZ_VERSION="4.0.2" -set HZ_TEST_VERSION="4.0.2" +set HZ_VERSION="4.1-SNAPSHOT" +set HZ_TEST_VERSION="4.1-SNAPSHOT" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index b57893df2..24f852fd6 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="4.0.2" -HZ_TEST_VERSION="4.0.2" +HZ_VERSION="4.1-SNAPSHOT" +HZ_TEST_VERSION="4.1-SNAPSHOT" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index 1157602f2..2fcf4da09 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -284,3 +284,10 @@ export class NodeIdOutOfRangeError extends HazelcastError { Object.setPrototypeOf(this, NodeIdOutOfRangeError.prototype); } } + +export class ReachedMaxSizeError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, ReachedMaxSizeError.prototype); + } +} diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index 64a909211..c07f15a71 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -54,9 +54,10 @@ export class ClientAddDistributedObjectListenerCodec { static decodeResponse(clientMessage: ClientMessage): ClientAddDistributedObjectListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ClientAddDistributedObjectListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleDistributedObjectEvent: (name: string, serviceName: string, eventType: string, source: UUID) => void = null): void { diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 8af6290f8..18906e074 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -55,9 +55,10 @@ export class ClientAddPartitionLostListenerCodec { static decodeResponse(clientMessage: ClientMessage): ClientAddPartitionLostListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ClientAddPartitionLostListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handlePartitionLostEvent: (partitionId: number, lostBackupCount: number, source: UUID) => void = null): void { diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index ebe4998da..2761af75b 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -76,15 +76,16 @@ export class ClientAuthenticationCodec { static decodeResponse(clientMessage: ClientMessage): ClientAuthenticationResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - status: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_STATUS_OFFSET), - memberUuid: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_MEMBER_UUID_OFFSET), - serializationVersion: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_SERIALIZATION_VERSION_OFFSET), - partitionCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_PARTITION_COUNT_OFFSET), - clusterId: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_CLUSTER_ID_OFFSET), - failoverSupported: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_FAILOVER_SUPPORTED_OFFSET), - address: CodecUtil.decodeNullable(clientMessage, AddressCodec.decode), - serverHazelcastVersion: StringCodec.decode(clientMessage), - }; + const response = {} as ClientAuthenticationResponseParams; + response.status = FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_STATUS_OFFSET); + response.memberUuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_MEMBER_UUID_OFFSET); + response.serializationVersion = FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_SERIALIZATION_VERSION_OFFSET); + response.partitionCount = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_PARTITION_COUNT_OFFSET); + response.clusterId = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_CLUSTER_ID_OFFSET); + response.failoverSupported = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_FAILOVER_SUPPORTED_OFFSET); + response.address = CodecUtil.decodeNullable(clientMessage, AddressCodec.decode); + response.serverHazelcastVersion = StringCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index aa2bc5acb..148adbcbb 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -76,15 +76,16 @@ export class ClientAuthenticationCustomCodec { static decodeResponse(clientMessage: ClientMessage): ClientAuthenticationCustomResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - status: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_STATUS_OFFSET), - memberUuid: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_MEMBER_UUID_OFFSET), - serializationVersion: FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_SERIALIZATION_VERSION_OFFSET), - partitionCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_PARTITION_COUNT_OFFSET), - clusterId: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_CLUSTER_ID_OFFSET), - failoverSupported: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_FAILOVER_SUPPORTED_OFFSET), - address: CodecUtil.decodeNullable(clientMessage, AddressCodec.decode), - serverHazelcastVersion: StringCodec.decode(clientMessage), - }; + const response = {} as ClientAuthenticationCustomResponseParams; + response.status = FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_STATUS_OFFSET); + response.memberUuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_MEMBER_UUID_OFFSET); + response.serializationVersion = FixSizedTypesCodec.decodeByte(initialFrame.content, RESPONSE_SERIALIZATION_VERSION_OFFSET); + response.partitionCount = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_PARTITION_COUNT_OFFSET); + response.clusterId = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_CLUSTER_ID_OFFSET); + response.failoverSupported = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_FAILOVER_SUPPORTED_OFFSET); + response.address = CodecUtil.decodeNullable(clientMessage, AddressCodec.decode); + response.serverHazelcastVersion = StringCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index 91f56e507..b71d5b41b 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -49,8 +49,9 @@ export class ClientGetDistributedObjectsCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DistributedObjectInfoCodec.decode), - }; + const response = {} as ClientGetDistributedObjectsResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DistributedObjectInfoCodec.decode); + + return response; } } diff --git a/src/codec/ClientLocalBackupListenerCodec.ts b/src/codec/ClientLocalBackupListenerCodec.ts index 2e2c8b7d5..66d57a459 100644 --- a/src/codec/ClientLocalBackupListenerCodec.ts +++ b/src/codec/ClientLocalBackupListenerCodec.ts @@ -52,9 +52,10 @@ export class ClientLocalBackupListenerCodec { static decodeResponse(clientMessage: ClientMessage): ClientLocalBackupListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ClientLocalBackupListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleBackupEvent: (sourceInvocationCorrelationId: Long) => void = null): void { diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index ec4bc7327..2ad922afc 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -50,8 +50,9 @@ export class ClientRemoveDistributedObjectListenerCodec { static decodeResponse(clientMessage: ClientMessage): ClientRemoveDistributedObjectListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ClientRemoveDistributedObjectListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index e38200d6d..05a9385f1 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -50,8 +50,9 @@ export class ClientRemovePartitionLostListenerCodec { static decodeResponse(clientMessage: ClientMessage): ClientRemovePartitionLostListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ClientRemovePartitionLostListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts index 6567361bd..e8464b1a6 100644 --- a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -56,10 +56,11 @@ export class FlakeIdGeneratorNewIdBatchCodec { static decodeResponse(clientMessage: ClientMessage): FlakeIdGeneratorNewIdBatchResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - base: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_BASE_OFFSET), - increment: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_INCREMENT_OFFSET), - batchSize: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_BATCH_SIZE_OFFSET), - }; + const response = {} as FlakeIdGeneratorNewIdBatchResponseParams; + response.base = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_BASE_OFFSET); + response.increment = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_INCREMENT_OFFSET); + response.batchSize = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_BATCH_SIZE_OFFSET); + + return response; } } diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 3202155f4..5c9b3dd83 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -53,8 +53,9 @@ export class ListAddAllCodec { static decodeResponse(clientMessage: ClientMessage): ListAddAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListAddAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index 726a7bcf1..7ceac7d5c 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -55,8 +55,9 @@ export class ListAddAllWithIndexCodec { static decodeResponse(clientMessage: ClientMessage): ListAddAllWithIndexResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListAddAllWithIndexResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index d194ba8e8..e29301a3d 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -52,8 +52,9 @@ export class ListAddCodec { static decodeResponse(clientMessage: ClientMessage): ListAddResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListAddResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index c525d270f..aaa9f111d 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -61,9 +61,10 @@ export class ListAddListenerCodec { static decodeResponse(clientMessage: ClientMessage): ListAddListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListAddListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleItemEvent: (item: Data, uuid: UUID, eventType: number) => void = null): void { diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index 05ae0f87b..65f82d8d6 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -53,8 +53,9 @@ export class ListCompareAndRemoveAllCodec { static decodeResponse(clientMessage: ClientMessage): ListCompareAndRemoveAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListCompareAndRemoveAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 7758fb4d1..52ba7ea9b 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -53,8 +53,9 @@ export class ListCompareAndRetainAllCodec { static decodeResponse(clientMessage: ClientMessage): ListCompareAndRetainAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListCompareAndRetainAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index 51ccfce33..6ab5c6344 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -53,8 +53,9 @@ export class ListContainsAllCodec { static decodeResponse(clientMessage: ClientMessage): ListContainsAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListContainsAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index b9f8a2c3f..50b16b9a8 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -52,8 +52,9 @@ export class ListContainsCodec { static decodeResponse(clientMessage: ClientMessage): ListContainsResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListContainsResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index 4fb7d4408..0df8fb71b 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -51,8 +51,9 @@ export class ListGetAllCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as ListGetAllResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index e840f2184..e1227138d 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -54,8 +54,9 @@ export class ListGetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as ListGetResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index ff8db1d2f..5326676d0 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -52,8 +52,9 @@ export class ListIndexOfCodec { static decodeResponse(clientMessage: ClientMessage): ListIndexOfResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListIndexOfResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index 60e4d6dde..e4a26bb82 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -49,8 +49,9 @@ export class ListIsEmptyCodec { static decodeResponse(clientMessage: ClientMessage): ListIsEmptyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListIsEmptyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 90e261092..95e54926e 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -51,8 +51,9 @@ export class ListIteratorCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as ListIteratorResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index 188d8cbe2..3f15374d6 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -52,8 +52,9 @@ export class ListLastIndexOfCodec { static decodeResponse(clientMessage: ClientMessage): ListLastIndexOfResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListLastIndexOfResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index aa2dd2166..60c3f8ccb 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -54,8 +54,9 @@ export class ListListIteratorCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as ListListIteratorResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index 51a084ef4..2dbda5152 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -52,8 +52,9 @@ export class ListRemoveCodec { static decodeResponse(clientMessage: ClientMessage): ListRemoveResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListRemoveResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index 9747111ef..ac5084826 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -52,8 +52,9 @@ export class ListRemoveListenerCodec { static decodeResponse(clientMessage: ClientMessage): ListRemoveListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListRemoveListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index 8806eaaa6..cf6e594d5 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -54,8 +54,9 @@ export class ListRemoveWithIndexCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as ListRemoveWithIndexResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 60640470d..7f5875cb5 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -55,8 +55,9 @@ export class ListSetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as ListSetResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index 7ad0d0d00..38d5cfb70 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -49,8 +49,9 @@ export class ListSizeCodec { static decodeResponse(clientMessage: ClientMessage): ListSizeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ListSizeResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index abb490dcd..a7ab9d29c 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -56,8 +56,9 @@ export class ListSubCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as ListSubResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index 9d16b081f..80bdb7a48 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -64,9 +64,10 @@ export class MapAddEntryListenerCodec { static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapAddEntryListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index 19de73eaa..dd244b16a 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -65,9 +65,10 @@ export class MapAddEntryListenerToKeyCodec { static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerToKeyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapAddEntryListenerToKeyResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index 394592b57..fbebabc04 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -66,9 +66,10 @@ export class MapAddEntryListenerToKeyWithPredicateCodec { static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerToKeyWithPredicateResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapAddEntryListenerToKeyWithPredicateResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index 4a23b32a5..b47d3c439 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -65,9 +65,10 @@ export class MapAddEntryListenerWithPredicateCodec { static decodeResponse(clientMessage: ClientMessage): MapAddEntryListenerWithPredicateResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapAddEntryListenerWithPredicateResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index 2025e400c..ed00ac11a 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -51,8 +51,9 @@ export class MapAddInterceptorCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: StringCodec.decode(clientMessage), - }; + const response = {} as MapAddInterceptorResponseParams; + response.response = StringCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index 5acaecbae..98e0bada2 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -68,9 +68,10 @@ export class MapAddNearCacheInvalidationListenerCodec { static decodeResponse(clientMessage: ClientMessage): MapAddNearCacheInvalidationListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapAddNearCacheInvalidationListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleIMapInvalidationEvent: (key: Data, sourceUuid: UUID, partitionUuid: UUID, sequence: Long) => void = null, handleIMapBatchInvalidationEvent: (keys: Data[], sourceUuids: UUID[], partitionUuids: UUID[], sequences: Long[]) => void = null): void { diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index a3bc2dc3e..6b0083634 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -56,9 +56,10 @@ export class MapAddPartitionLostListenerCodec { static decodeResponse(clientMessage: ClientMessage): MapAddPartitionLostListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapAddPartitionLostListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleMapPartitionLostEvent: (partitionId: number, uuid: UUID) => void = null): void { diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index f054b2f8f..559a22ce1 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -52,8 +52,9 @@ export class MapAggregateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapAggregateResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index b22c44824..f1bef4786 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -53,8 +53,9 @@ export class MapAggregateWithPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapAggregateWithPredicateResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 76711256d..8b0a3f624 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -55,8 +55,9 @@ export class MapContainsKeyCodec { static decodeResponse(clientMessage: ClientMessage): MapContainsKeyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapContainsKeyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 3b6064c1d..e48f8e43c 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -52,8 +52,9 @@ export class MapContainsValueCodec { static decodeResponse(clientMessage: ClientMessage): MapContainsValueResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapContainsValueResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index 0f40c2331..5e7b854c6 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -57,9 +57,10 @@ export class MapEntriesWithPagingPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - anchorDataList: AnchorDataListHolderCodec.decode(clientMessage), - }; + const response = {} as MapEntriesWithPagingPredicateResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + response.anchorDataList = AnchorDataListHolderCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index 38ecf04b1..1fa04e7f6 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -52,8 +52,9 @@ export class MapEntriesWithPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MapEntriesWithPredicateResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index 8eb0eb3e4..583faa2cf 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -51,8 +51,9 @@ export class MapEntrySetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MapEntrySetResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index 4951e6251..e41c0dca5 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -67,11 +67,12 @@ export class MapEventJournalReadCodec { static decodeResponse(clientMessage: ClientMessage): MapEventJournalReadResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - readCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_READ_COUNT_OFFSET), - nextSeq: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEXT_SEQ_OFFSET), - items: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - itemSeqs: CodecUtil.decodeNullable(clientMessage, LongArrayCodec.decode), - }; + const response = {} as MapEventJournalReadResponseParams; + response.readCount = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_READ_COUNT_OFFSET); + response.nextSeq = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEXT_SEQ_OFFSET); + response.items = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + response.itemSeqs = CodecUtil.decodeNullable(clientMessage, LongArrayCodec.decode); + + return response; } } diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index a9ecbbbd6..4c2b89d32 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -52,9 +52,10 @@ export class MapEventJournalSubscribeCodec { static decodeResponse(clientMessage: ClientMessage): MapEventJournalSubscribeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - oldestSequence: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_OLDEST_SEQUENCE_OFFSET), - newestSequence: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEWEST_SEQUENCE_OFFSET), - }; + const response = {} as MapEventJournalSubscribeResponseParams; + response.oldestSequence = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_OLDEST_SEQUENCE_OFFSET); + response.newestSequence = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEWEST_SEQUENCE_OFFSET); + + return response; } } diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index 7bfd54ac7..49db0af7e 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -55,8 +55,9 @@ export class MapEvictCodec { static decodeResponse(clientMessage: ClientMessage): MapEvictResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapEvictResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index d7f3f8e16..2abc4158f 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -52,8 +52,9 @@ export class MapExecuteOnAllKeysCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MapExecuteOnAllKeysResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index db9067f38..21d6a2b47 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -57,8 +57,9 @@ export class MapExecuteOnKeyCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapExecuteOnKeyResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index 014268a1f..3cfae6731 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -54,8 +54,9 @@ export class MapExecuteOnKeysCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MapExecuteOnKeysResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 70b4c9b80..1984d2f72 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -53,8 +53,9 @@ export class MapExecuteWithPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MapExecuteWithPredicateResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index a84553070..ee9853d68 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -57,9 +57,10 @@ export class MapFetchEntriesCodec { // empty initial frame clientMessage.nextFrame(); - return { - iterationPointers: EntryListIntegerIntegerCodec.decode(clientMessage), - entries: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MapFetchEntriesResponseParams; + response.iterationPointers = EntryListIntegerIntegerCodec.decode(clientMessage); + response.entries = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index 79a4bbc8d..bea5bbf3d 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -57,9 +57,10 @@ export class MapFetchKeysCodec { // empty initial frame clientMessage.nextFrame(); - return { - iterationPointers: EntryListIntegerIntegerCodec.decode(clientMessage), - keys: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MapFetchKeysResponseParams; + response.iterationPointers = EntryListIntegerIntegerCodec.decode(clientMessage); + response.keys = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index de44d4c2e..1eafe38c1 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -58,9 +58,10 @@ export class MapFetchNearCacheInvalidationMetadataCodec { // empty initial frame clientMessage.nextFrame(); - return { - namePartitionSequenceList: EntryListCodec.decode(clientMessage, StringCodec.decode, EntryListIntegerLongCodec.decode), - partitionUuidList: EntryListIntegerUUIDCodec.decode(clientMessage), - }; + const response = {} as MapFetchNearCacheInvalidationMetadataResponseParams; + response.namePartitionSequenceList = EntryListCodec.decode(clientMessage, StringCodec.decode, EntryListIntegerLongCodec.decode); + response.partitionUuidList = EntryListIntegerUUIDCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index 865fbe6c4..195ea6e53 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -59,9 +59,10 @@ export class MapFetchWithQueryCodec { // empty initial frame clientMessage.nextFrame(); - return { - results: ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode), - iterationPointers: EntryListIntegerIntegerCodec.decode(clientMessage), - }; + const response = {} as MapFetchWithQueryResponseParams; + response.results = ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode); + response.iterationPointers = EntryListIntegerIntegerCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index 06b91afe8..b746af27c 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -53,8 +53,9 @@ export class MapGetAllCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MapGetAllResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index bb91d7077..3033b488d 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -56,8 +56,9 @@ export class MapGetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapGetResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index bde577331..87fe5895a 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -59,9 +59,10 @@ export class MapGetEntryViewCodec { static decodeResponse(clientMessage: ClientMessage): MapGetEntryViewResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - maxIdle: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_MAX_IDLE_OFFSET), - response: CodecUtil.decodeNullable(clientMessage, SimpleEntryViewCodec.decode), - }; + const response = {} as MapGetEntryViewResponseParams; + response.maxIdle = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_MAX_IDLE_OFFSET); + response.response = CodecUtil.decodeNullable(clientMessage, SimpleEntryViewCodec.decode); + + return response; } } diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index add778632..f527e0a28 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -49,8 +49,9 @@ export class MapIsEmptyCodec { static decodeResponse(clientMessage: ClientMessage): MapIsEmptyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapIsEmptyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index 3a9b051b8..ad007647d 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -52,8 +52,9 @@ export class MapIsLockedCodec { static decodeResponse(clientMessage: ClientMessage): MapIsLockedResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapIsLockedResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index 421b8b5c3..05de9f85f 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -51,8 +51,9 @@ export class MapKeySetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MapKeySetResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index 5be634cf6..58bb01bcb 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -57,9 +57,10 @@ export class MapKeySetWithPagingPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - anchorDataList: AnchorDataListHolderCodec.decode(clientMessage), - }; + const response = {} as MapKeySetWithPagingPredicateResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + response.anchorDataList = AnchorDataListHolderCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index 35d38d3cd..aac89ff71 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -52,8 +52,9 @@ export class MapKeySetWithPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MapKeySetWithPredicateResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index a796af72b..0f670a977 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -52,8 +52,9 @@ export class MapProjectCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapProjectResponseParams; + response.response = ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index 2c86964ee..a1d176eb7 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -53,8 +53,9 @@ export class MapProjectWithPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapProjectWithPredicateResponseParams; + response.response = ListMultiFrameCodec.decodeContainsNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index 07740b04b..dbb14c770 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -59,8 +59,9 @@ export class MapPutCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapPutResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index ef9e66f08..3e100950d 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -59,8 +59,9 @@ export class MapPutIfAbsentCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapPutIfAbsentResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts index 5d2c1369c..18216858d 100644 --- a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts +++ b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts @@ -61,8 +61,9 @@ export class MapPutIfAbsentWithMaxIdleCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapPutIfAbsentWithMaxIdleResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapPutTransientWithMaxIdleCodec.ts b/src/codec/MapPutTransientWithMaxIdleCodec.ts index ed78c89b9..47fc6bf41 100644 --- a/src/codec/MapPutTransientWithMaxIdleCodec.ts +++ b/src/codec/MapPutTransientWithMaxIdleCodec.ts @@ -61,8 +61,9 @@ export class MapPutTransientWithMaxIdleCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapPutTransientWithMaxIdleResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapPutWithMaxIdleCodec.ts b/src/codec/MapPutWithMaxIdleCodec.ts index 7f6d7d14b..40b475ef7 100644 --- a/src/codec/MapPutWithMaxIdleCodec.ts +++ b/src/codec/MapPutWithMaxIdleCodec.ts @@ -61,8 +61,9 @@ export class MapPutWithMaxIdleCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapPutWithMaxIdleResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index 479191cd1..1ec8d0e09 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -56,8 +56,9 @@ export class MapRemoveCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapRemoveResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index 6d516da45..e3ef22462 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -52,8 +52,9 @@ export class MapRemoveEntryListenerCodec { static decodeResponse(clientMessage: ClientMessage): MapRemoveEntryListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapRemoveEntryListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index 084a0ff13..f3a691b54 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -56,8 +56,9 @@ export class MapRemoveIfSameCodec { static decodeResponse(clientMessage: ClientMessage): MapRemoveIfSameResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapRemoveIfSameResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index 156ba762d..48638510e 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -50,8 +50,9 @@ export class MapRemoveInterceptorCodec { static decodeResponse(clientMessage: ClientMessage): MapRemoveInterceptorResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapRemoveInterceptorResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index a2c2ab665..1fa437811 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -52,8 +52,9 @@ export class MapRemovePartitionLostListenerCodec { static decodeResponse(clientMessage: ClientMessage): MapRemovePartitionLostListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapRemovePartitionLostListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index c1d92b7d8..99ff51e73 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -57,8 +57,9 @@ export class MapReplaceCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapReplaceResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index f56368d99..ebf08a99d 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -57,8 +57,9 @@ export class MapReplaceIfSameCodec { static decodeResponse(clientMessage: ClientMessage): MapReplaceIfSameResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapReplaceIfSameResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapSetTtlCodec.ts b/src/codec/MapSetTtlCodec.ts index 9dc892a12..3c5fa6b81 100644 --- a/src/codec/MapSetTtlCodec.ts +++ b/src/codec/MapSetTtlCodec.ts @@ -55,8 +55,9 @@ export class MapSetTtlCodec { static decodeResponse(clientMessage: ClientMessage): MapSetTtlResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapSetTtlResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapSetWithMaxIdleCodec.ts b/src/codec/MapSetWithMaxIdleCodec.ts index fa51a6aac..77d66cd68 100644 --- a/src/codec/MapSetWithMaxIdleCodec.ts +++ b/src/codec/MapSetWithMaxIdleCodec.ts @@ -61,8 +61,9 @@ export class MapSetWithMaxIdleCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapSetWithMaxIdleResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index ac07dd813..06fe7fb96 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -49,8 +49,9 @@ export class MapSizeCodec { static decodeResponse(clientMessage: ClientMessage): MapSizeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapSizeResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 76f1d4f52..1fc6f6404 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -57,8 +57,9 @@ export class MapSubmitToKeyCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as MapSubmitToKeyResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index 2ed77529e..424d0a605 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -61,8 +61,9 @@ export class MapTryLockCodec { static decodeResponse(clientMessage: ClientMessage): MapTryLockResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapTryLockResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index a23ba70a3..365d8daf7 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -58,8 +58,9 @@ export class MapTryPutCodec { static decodeResponse(clientMessage: ClientMessage): MapTryPutResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapTryPutResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index 2736608c7..d30a2ebc6 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -57,8 +57,9 @@ export class MapTryRemoveCodec { static decodeResponse(clientMessage: ClientMessage): MapTryRemoveResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MapTryRemoveResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 1093f3255..4754dadff 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -51,8 +51,9 @@ export class MapValuesCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MapValuesResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index c00a2f2b7..409dc36dd 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -57,9 +57,10 @@ export class MapValuesWithPagingPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - anchorDataList: AnchorDataListHolderCodec.decode(clientMessage), - }; + const response = {} as MapValuesWithPagingPredicateResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + response.anchorDataList = AnchorDataListHolderCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index eb389ad81..073a0fd3b 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -52,8 +52,9 @@ export class MapValuesWithPredicateCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MapValuesWithPredicateResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index ea1608dd3..ecc7f3f1e 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -62,9 +62,10 @@ export class MultiMapAddEntryListenerCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapAddEntryListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapAddEntryListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index 17e418891..ef7d995cc 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -63,9 +63,10 @@ export class MultiMapAddEntryListenerToKeyCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapAddEntryListenerToKeyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapAddEntryListenerToKeyResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 6f34358b5..d076b6d9a 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -56,8 +56,9 @@ export class MultiMapContainsEntryCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapContainsEntryResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapContainsEntryResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index bd2a42282..4f12501e7 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -55,8 +55,9 @@ export class MultiMapContainsKeyCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapContainsKeyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapContainsKeyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index bb72a9724..b8358bc36 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -52,8 +52,9 @@ export class MultiMapContainsValueCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapContainsValueResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapContainsValueResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index 99172c8be..9bf28c82f 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -51,8 +51,9 @@ export class MultiMapEntrySetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as MultiMapEntrySetResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index 62052e302..d3b101169 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -56,8 +56,9 @@ export class MultiMapGetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MultiMapGetResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index 7ca6add17..30cd87306 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -52,8 +52,9 @@ export class MultiMapIsLockedCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapIsLockedResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapIsLockedResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 036d6b2fc..40e425e94 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -51,8 +51,9 @@ export class MultiMapKeySetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MultiMapKeySetResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MultiMapPutAllCodec.ts b/src/codec/MultiMapPutAllCodec.ts index e8c53ef43..0cbb1b1db 100644 --- a/src/codec/MultiMapPutAllCodec.ts +++ b/src/codec/MultiMapPutAllCodec.ts @@ -18,6 +18,10 @@ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; +import {EntryListCodec} from './builtin/EntryListCodec'; +import {DataCodec} from './builtin/DataCodec'; +import {ListDataCodec} from './builtin/ListDataCodec'; +import {Data} from '../serialization/Data'; // hex: 0x021700 const REQUEST_MESSAGE_TYPE = 136960; diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index 1a468582d..f04e7a617 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -56,8 +56,9 @@ export class MultiMapPutCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapPutResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapPutResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index 5d570f4d5..00d356e5c 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -56,8 +56,9 @@ export class MultiMapRemoveCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MultiMapRemoveResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index bdf9071be..bd820280e 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -56,8 +56,9 @@ export class MultiMapRemoveEntryCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapRemoveEntryResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapRemoveEntryResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 7cf2c0740..4b96d424c 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -52,8 +52,9 @@ export class MultiMapRemoveEntryListenerCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapRemoveEntryListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapRemoveEntryListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index b3cbef068..2dc7018c2 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -49,8 +49,9 @@ export class MultiMapSizeCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapSizeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapSizeResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index e8ac10d66..1ba856d58 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -61,8 +61,9 @@ export class MultiMapTryLockCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapTryLockResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapTryLockResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index 8edc1ba44..6fc09823a 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -55,8 +55,9 @@ export class MultiMapValueCountCodec { static decodeResponse(clientMessage: ClientMessage): MultiMapValueCountResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as MultiMapValueCountResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index 8144e95b4..61de5df0b 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -51,8 +51,9 @@ export class MultiMapValuesCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as MultiMapValuesResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts index 1306118f9..199caab92 100644 --- a/src/codec/PNCounterAddCodec.ts +++ b/src/codec/PNCounterAddCodec.ts @@ -62,10 +62,11 @@ export class PNCounterAddCodec { static decodeResponse(clientMessage: ClientMessage): PNCounterAddResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - value: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_VALUE_OFFSET), - replicaCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_REPLICA_COUNT_OFFSET), - replicaTimestamps: EntryListUUIDLongCodec.decode(clientMessage), - }; + const response = {} as PNCounterAddResponseParams; + response.value = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_VALUE_OFFSET); + response.replicaCount = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_REPLICA_COUNT_OFFSET); + response.replicaTimestamps = EntryListUUIDLongCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts index 2eb3787c2..ea72e23bc 100644 --- a/src/codec/PNCounterGetCodec.ts +++ b/src/codec/PNCounterGetCodec.ts @@ -58,10 +58,11 @@ export class PNCounterGetCodec { static decodeResponse(clientMessage: ClientMessage): PNCounterGetResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - value: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_VALUE_OFFSET), - replicaCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_REPLICA_COUNT_OFFSET), - replicaTimestamps: EntryListUUIDLongCodec.decode(clientMessage), - }; + const response = {} as PNCounterGetResponseParams; + response.value = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_VALUE_OFFSET); + response.replicaCount = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_REPLICA_COUNT_OFFSET); + response.replicaTimestamps = EntryListUUIDLongCodec.decode(clientMessage); + + return response; } } diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts index 1d0e13748..16c2b1647 100644 --- a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -49,8 +49,9 @@ export class PNCounterGetConfiguredReplicaCountCodec { static decodeResponse(clientMessage: ClientMessage): PNCounterGetConfiguredReplicaCountResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as PNCounterGetConfiguredReplicaCountResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index 83d92a4e6..4250e1d2f 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -53,8 +53,9 @@ export class QueueAddAllCodec { static decodeResponse(clientMessage: ClientMessage): QueueAddAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueAddAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index 6bf8272b6..2e86718f9 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -61,9 +61,10 @@ export class QueueAddListenerCodec { static decodeResponse(clientMessage: ClientMessage): QueueAddListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueAddListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleItemEvent: (item: Data, uuid: UUID, eventType: number) => void = null): void { diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index 880b43326..820d56b5f 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -53,8 +53,9 @@ export class QueueCompareAndRemoveAllCodec { static decodeResponse(clientMessage: ClientMessage): QueueCompareAndRemoveAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueCompareAndRemoveAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index 4dab65540..a5ecf34b9 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -53,8 +53,9 @@ export class QueueCompareAndRetainAllCodec { static decodeResponse(clientMessage: ClientMessage): QueueCompareAndRetainAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueCompareAndRetainAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index 0bb44a4ee..c15a533d2 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -53,8 +53,9 @@ export class QueueContainsAllCodec { static decodeResponse(clientMessage: ClientMessage): QueueContainsAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueContainsAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index 4531d4296..a16a24b5e 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -52,8 +52,9 @@ export class QueueContainsCodec { static decodeResponse(clientMessage: ClientMessage): QueueContainsResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueContainsResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index 1aa6082d0..73dc37f13 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -51,8 +51,9 @@ export class QueueDrainToCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as QueueDrainToResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index 38f96e017..0339803a3 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -54,8 +54,9 @@ export class QueueDrainToMaxSizeCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as QueueDrainToMaxSizeResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index 8cdb3b438..e612cb1c3 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -49,8 +49,9 @@ export class QueueIsEmptyCodec { static decodeResponse(clientMessage: ClientMessage): QueueIsEmptyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueIsEmptyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index 5547fab1f..cab188384 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -51,8 +51,9 @@ export class QueueIteratorCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as QueueIteratorResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index db18b4484..0e436be1f 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -55,8 +55,9 @@ export class QueueOfferCodec { static decodeResponse(clientMessage: ClientMessage): QueueOfferResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueOfferResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index 92ae659bf..aa4bb017d 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -51,8 +51,9 @@ export class QueuePeekCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as QueuePeekResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index c012ade90..7143fec4d 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -55,8 +55,9 @@ export class QueuePollCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as QueuePollResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index c02e977f2..31730428c 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -49,8 +49,9 @@ export class QueueRemainingCapacityCodec { static decodeResponse(clientMessage: ClientMessage): QueueRemainingCapacityResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueRemainingCapacityResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index e357d32ef..3a77b3cd2 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -52,8 +52,9 @@ export class QueueRemoveCodec { static decodeResponse(clientMessage: ClientMessage): QueueRemoveResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueRemoveResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index 984233fe3..cb3fc5e6e 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -52,8 +52,9 @@ export class QueueRemoveListenerCodec { static decodeResponse(clientMessage: ClientMessage): QueueRemoveListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueRemoveListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index da855af4c..4df780b7e 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -49,8 +49,9 @@ export class QueueSizeCodec { static decodeResponse(clientMessage: ClientMessage): QueueSizeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as QueueSizeResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index 5c4d2361e..2cdd71b72 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -51,8 +51,9 @@ export class QueueTakeCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as QueueTakeResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index dc45201d8..13ce1dee6 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -60,9 +60,10 @@ export class ReplicatedMapAddEntryListenerCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapAddEntryListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index 69fd13a0e..ede0e88d6 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -61,9 +61,10 @@ export class ReplicatedMapAddEntryListenerToKeyCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerToKeyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapAddEntryListenerToKeyResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index 7af1785d5..5903bf334 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -62,9 +62,10 @@ export class ReplicatedMapAddEntryListenerToKeyWithPredicateCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerToKeyWithPredicateResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapAddEntryListenerToKeyWithPredicateResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 829568fe9..55f367623 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -61,9 +61,10 @@ export class ReplicatedMapAddEntryListenerWithPredicateCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddEntryListenerWithPredicateResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapAddEntryListenerWithPredicateResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index db19a3912..ea5d85de4 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -62,9 +62,10 @@ export class ReplicatedMapAddNearCacheEntryListenerCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapAddNearCacheEntryListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapAddNearCacheEntryListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleEntryEvent: (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void = null): void { diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index c20166cb3..d0859bd5e 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -52,8 +52,9 @@ export class ReplicatedMapContainsKeyCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapContainsKeyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapContainsKeyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 0640a4902..7e59815ca 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -52,8 +52,9 @@ export class ReplicatedMapContainsValueCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapContainsValueResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapContainsValueResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index 7d810df65..27eb9932b 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -51,8 +51,9 @@ export class ReplicatedMapEntrySetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode), - }; + const response = {} as ReplicatedMapEntrySetResponseParams; + response.response = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + return response; } } diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index 2054d8791..d86b083a4 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -52,8 +52,9 @@ export class ReplicatedMapGetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as ReplicatedMapGetResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index 3a8e3e6ee..c9a78108d 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -49,8 +49,9 @@ export class ReplicatedMapIsEmptyCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapIsEmptyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapIsEmptyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index 60deffb1d..577780e8b 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -51,8 +51,9 @@ export class ReplicatedMapKeySetCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as ReplicatedMapKeySetResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index 2d59e7a74..0d2cb8639 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -57,8 +57,9 @@ export class ReplicatedMapPutCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as ReplicatedMapPutResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index 1d4914da4..d4780ac5f 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -52,8 +52,9 @@ export class ReplicatedMapRemoveCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as ReplicatedMapRemoveResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index 879023f38..369168e7d 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -52,8 +52,9 @@ export class ReplicatedMapRemoveEntryListenerCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapRemoveEntryListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapRemoveEntryListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index 042aad889..96a0c9f37 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -49,8 +49,9 @@ export class ReplicatedMapSizeCodec { static decodeResponse(clientMessage: ClientMessage): ReplicatedMapSizeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as ReplicatedMapSizeResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index 5547f3cad..bd65e651a 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -51,8 +51,9 @@ export class ReplicatedMapValuesCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as ReplicatedMapValuesResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index 07bf8a354..c482c18c2 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -56,8 +56,9 @@ export class RingbufferAddAllCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferAddAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as RingbufferAddAllResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 99a88add0..35d650db8 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -55,8 +55,9 @@ export class RingbufferAddCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferAddResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as RingbufferAddResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index f3245cd08..0d65668f6 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -50,8 +50,9 @@ export class RingbufferCapacityCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferCapacityResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as RingbufferCapacityResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index 5e694f60f..1495f837e 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -50,8 +50,9 @@ export class RingbufferHeadSequenceCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferHeadSequenceResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as RingbufferHeadSequenceResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index dc729b07f..98af54e15 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -66,11 +66,12 @@ export class RingbufferReadManyCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferReadManyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - readCount: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_READ_COUNT_OFFSET), - nextSeq: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEXT_SEQ_OFFSET), - items: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - itemSeqs: CodecUtil.decodeNullable(clientMessage, LongArrayCodec.decode), - }; + const response = {} as RingbufferReadManyResponseParams; + response.readCount = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_READ_COUNT_OFFSET); + response.nextSeq = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_NEXT_SEQ_OFFSET); + response.items = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + response.itemSeqs = CodecUtil.decodeNullable(clientMessage, LongArrayCodec.decode); + + return response; } } diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index b3df7de8b..4d4d7006d 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -55,8 +55,9 @@ export class RingbufferReadOneCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; + const response = {} as RingbufferReadOneResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index f1fc5279a..28ba59e31 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -50,8 +50,9 @@ export class RingbufferRemainingCapacityCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferRemainingCapacityResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as RingbufferRemainingCapacityResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index 7f4f2fa70..a03b017fe 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -50,8 +50,9 @@ export class RingbufferSizeCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferSizeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as RingbufferSizeResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index e9e3cd70a..4a5c887a8 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -50,8 +50,9 @@ export class RingbufferTailSequenceCodec { static decodeResponse(clientMessage: ClientMessage): RingbufferTailSequenceResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as RingbufferTailSequenceResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index 1cda5d840..96be8a65e 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -53,8 +53,9 @@ export class SetAddAllCodec { static decodeResponse(clientMessage: ClientMessage): SetAddAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetAddAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index f985ebf34..e0ca1c1cc 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -52,8 +52,9 @@ export class SetAddCodec { static decodeResponse(clientMessage: ClientMessage): SetAddResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetAddResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index a8dff13f8..28067add3 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -61,9 +61,10 @@ export class SetAddListenerCodec { static decodeResponse(clientMessage: ClientMessage): SetAddListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetAddListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleItemEvent: (item: Data, uuid: UUID, eventType: number) => void = null): void { diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index d3cda255e..0e1415929 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -53,8 +53,9 @@ export class SetCompareAndRemoveAllCodec { static decodeResponse(clientMessage: ClientMessage): SetCompareAndRemoveAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetCompareAndRemoveAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index 7ab93858e..c97a7b825 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -53,8 +53,9 @@ export class SetCompareAndRetainAllCodec { static decodeResponse(clientMessage: ClientMessage): SetCompareAndRetainAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetCompareAndRetainAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index 74c1b6bc1..43a3c9719 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -53,8 +53,9 @@ export class SetContainsAllCodec { static decodeResponse(clientMessage: ClientMessage): SetContainsAllResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetContainsAllResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index 49fd47c11..f0bd5cf7c 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -52,8 +52,9 @@ export class SetContainsCodec { static decodeResponse(clientMessage: ClientMessage): SetContainsResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetContainsResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index 41fe384da..e4ee471b4 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -51,8 +51,9 @@ export class SetGetAllCodec { // empty initial frame clientMessage.nextFrame(); - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; + const response = {} as SetGetAllResponseParams; + response.response = ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + + return response; } } diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index d3d08536e..4755478f0 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -49,8 +49,9 @@ export class SetIsEmptyCodec { static decodeResponse(clientMessage: ClientMessage): SetIsEmptyResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetIsEmptyResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index 975657397..0ebae9bf4 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -52,8 +52,9 @@ export class SetRemoveCodec { static decodeResponse(clientMessage: ClientMessage): SetRemoveResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetRemoveResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index d7e3f13f7..4ae725226 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -52,8 +52,9 @@ export class SetRemoveListenerCodec { static decodeResponse(clientMessage: ClientMessage): SetRemoveListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetRemoveListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index d3bf5ccbf..38c776d77 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -49,8 +49,9 @@ export class SetSizeCodec { static decodeResponse(clientMessage: ClientMessage): SetSizeResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as SetSizeResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index 363f417f5..ebcbc898e 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -59,9 +59,10 @@ export class TopicAddMessageListenerCodec { static decodeResponse(clientMessage: ClientMessage): TopicAddMessageListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as TopicAddMessageListenerResponseParams; + response.response = FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } static handle(clientMessage: ClientMessage, handleTopicEvent: (item: Data, publishTime: Long, uuid: UUID) => void = null): void { diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index 7371ceffb..05c18aeab 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -52,8 +52,9 @@ export class TopicRemoveMessageListenerCodec { static decodeResponse(clientMessage: ClientMessage): TopicRemoveMessageListenerResponseParams { const initialFrame = clientMessage.nextFrame(); - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; + const response = {} as TopicRemoveMessageListenerResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; } } diff --git a/src/codec/TransactionCommitCodec.ts b/src/codec/TransactionCommitCodec.ts deleted file mode 100644 index d89afc5e0..000000000 --- a/src/codec/TransactionCommitCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; - -// hex: 0x150100 -const REQUEST_MESSAGE_TYPE = 1376512; -// hex: 0x150101 -// RESPONSE_MESSAGE_TYPE = 1376513 - -const REQUEST_TRANSACTION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export class TransactionCommitCodec { - static encodeRequest(transactionId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TRANSACTION_ID_OFFSET, transactionId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - return clientMessage; - } -} diff --git a/src/codec/TransactionCreateCodec.ts b/src/codec/TransactionCreateCodec.ts deleted file mode 100644 index f47402ada..000000000 --- a/src/codec/TransactionCreateCodec.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import * as Long from 'long'; -import {UUID} from '../core/UUID'; - -// hex: 0x150200 -const REQUEST_MESSAGE_TYPE = 1376768; -// hex: 0x150201 -// RESPONSE_MESSAGE_TYPE = 1376769 - -const REQUEST_TIMEOUT_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_DURABILITY_OFFSET = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const REQUEST_TRANSACTION_TYPE_OFFSET = REQUEST_DURABILITY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionCreateResponseParams { - response: UUID; -} - -export class TransactionCreateCodec { - static encodeRequest(timeout: Long, durability: number, transactionType: number, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); - FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_DURABILITY_OFFSET, durability); - FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_TRANSACTION_TYPE_OFFSET, transactionType); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionCreateResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeUUID(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionRollbackCodec.ts b/src/codec/TransactionRollbackCodec.ts deleted file mode 100644 index c2297f2a2..000000000 --- a/src/codec/TransactionRollbackCodec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; - -// hex: 0x150300 -const REQUEST_MESSAGE_TYPE = 1377024; -// hex: 0x150301 -// RESPONSE_MESSAGE_TYPE = 1377025 - -const REQUEST_TRANSACTION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TRANSACTION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export class TransactionRollbackCodec { - static encodeRequest(transactionId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TRANSACTION_ID_OFFSET, transactionId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - return clientMessage; - } -} diff --git a/src/codec/TransactionalListAddCodec.ts b/src/codec/TransactionalListAddCodec.ts deleted file mode 100644 index 5ebbc5325..000000000 --- a/src/codec/TransactionalListAddCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x110100 -const REQUEST_MESSAGE_TYPE = 1114368; -// hex: 0x110101 -// RESPONSE_MESSAGE_TYPE = 1114369 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalListAddResponseParams { - response: boolean; -} - -export class TransactionalListAddCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, item); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalListAddResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalListRemoveCodec.ts b/src/codec/TransactionalListRemoveCodec.ts deleted file mode 100644 index 03bffb7c1..000000000 --- a/src/codec/TransactionalListRemoveCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x110200 -const REQUEST_MESSAGE_TYPE = 1114624; -// hex: 0x110201 -// RESPONSE_MESSAGE_TYPE = 1114625 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalListRemoveResponseParams { - response: boolean; -} - -export class TransactionalListRemoveCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, item); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalListRemoveResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalListSizeCodec.ts b/src/codec/TransactionalListSizeCodec.ts deleted file mode 100644 index 078730951..000000000 --- a/src/codec/TransactionalListSizeCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; - -// hex: 0x110300 -const REQUEST_MESSAGE_TYPE = 1114880; -// hex: 0x110301 -// RESPONSE_MESSAGE_TYPE = 1114881 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalListSizeResponseParams { - response: number; -} - -export class TransactionalListSizeCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalListSizeResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMapContainsKeyCodec.ts b/src/codec/TransactionalMapContainsKeyCodec.ts deleted file mode 100644 index fefe9467e..000000000 --- a/src/codec/TransactionalMapContainsKeyCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E0100 -const REQUEST_MESSAGE_TYPE = 917760; -// hex: 0x0E0101 -// RESPONSE_MESSAGE_TYPE = 917761 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMapContainsKeyResponseParams { - response: boolean; -} - -export class TransactionalMapContainsKeyCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapContainsKeyResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMapContainsValueCodec.ts b/src/codec/TransactionalMapContainsValueCodec.ts deleted file mode 100644 index 3899a09f7..000000000 --- a/src/codec/TransactionalMapContainsValueCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E1200 -const REQUEST_MESSAGE_TYPE = 922112; -// hex: 0x0E1201 -// RESPONSE_MESSAGE_TYPE = 922113 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMapContainsValueResponseParams { - response: boolean; -} - -export class TransactionalMapContainsValueCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, value: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, value); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapContainsValueResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMapDeleteCodec.ts b/src/codec/TransactionalMapDeleteCodec.ts deleted file mode 100644 index 9822e04f6..000000000 --- a/src/codec/TransactionalMapDeleteCodec.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E0C00 -const REQUEST_MESSAGE_TYPE = 920576; -// hex: 0x0E0C01 -// RESPONSE_MESSAGE_TYPE = 920577 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export class TransactionalMapDeleteCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } -} diff --git a/src/codec/TransactionalMapGetCodec.ts b/src/codec/TransactionalMapGetCodec.ts deleted file mode 100644 index 88555c38b..000000000 --- a/src/codec/TransactionalMapGetCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x0E0200 -const REQUEST_MESSAGE_TYPE = 918016; -// hex: 0x0E0201 -// RESPONSE_MESSAGE_TYPE = 918017 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapGetResponseParams { - response: Data; -} - -export class TransactionalMapGetCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapGetResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapGetForUpdateCodec.ts b/src/codec/TransactionalMapGetForUpdateCodec.ts deleted file mode 100644 index d6d4721ce..000000000 --- a/src/codec/TransactionalMapGetForUpdateCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x0E0300 -const REQUEST_MESSAGE_TYPE = 918272; -// hex: 0x0E0301 -// RESPONSE_MESSAGE_TYPE = 918273 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapGetForUpdateResponseParams { - response: Data; -} - -export class TransactionalMapGetForUpdateCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapGetForUpdateResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapIsEmptyCodec.ts b/src/codec/TransactionalMapIsEmptyCodec.ts deleted file mode 100644 index 175e06402..000000000 --- a/src/codec/TransactionalMapIsEmptyCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; - -// hex: 0x0E0500 -const REQUEST_MESSAGE_TYPE = 918784; -// hex: 0x0E0501 -// RESPONSE_MESSAGE_TYPE = 918785 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMapIsEmptyResponseParams { - response: boolean; -} - -export class TransactionalMapIsEmptyCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapIsEmptyResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMapKeySetCodec.ts b/src/codec/TransactionalMapKeySetCodec.ts deleted file mode 100644 index 11f8f93d7..000000000 --- a/src/codec/TransactionalMapKeySetCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E0E00 -const REQUEST_MESSAGE_TYPE = 921088; -// hex: 0x0E0E01 -// RESPONSE_MESSAGE_TYPE = 921089 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapKeySetResponseParams { - response: Data[]; -} - -export class TransactionalMapKeySetCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapKeySetResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts b/src/codec/TransactionalMapKeySetWithPredicateCodec.ts deleted file mode 100644 index 1a90bd20f..000000000 --- a/src/codec/TransactionalMapKeySetWithPredicateCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; - -// hex: 0x0E0F00 -const REQUEST_MESSAGE_TYPE = 921344; -// hex: 0x0E0F01 -// RESPONSE_MESSAGE_TYPE = 921345 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapKeySetWithPredicateResponseParams { - response: Data[]; -} - -export class TransactionalMapKeySetWithPredicateCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, predicate: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, predicate); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapKeySetWithPredicateResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapPutCodec.ts b/src/codec/TransactionalMapPutCodec.ts deleted file mode 100644 index be04099c8..000000000 --- a/src/codec/TransactionalMapPutCodec.ts +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x0E0600 -const REQUEST_MESSAGE_TYPE = 919040; -// hex: 0x0E0601 -// RESPONSE_MESSAGE_TYPE = 919041 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapPutResponseParams { - response: Data; -} - -export class TransactionalMapPutCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data, ttl: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TTL_OFFSET, ttl); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, value); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapPutResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapPutIfAbsentCodec.ts b/src/codec/TransactionalMapPutIfAbsentCodec.ts deleted file mode 100644 index 24e9add2d..000000000 --- a/src/codec/TransactionalMapPutIfAbsentCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x0E0800 -const REQUEST_MESSAGE_TYPE = 919552; -// hex: 0x0E0801 -// RESPONSE_MESSAGE_TYPE = 919553 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapPutIfAbsentResponseParams { - response: Data; -} - -export class TransactionalMapPutIfAbsentCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, value); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapPutIfAbsentResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapRemoveCodec.ts b/src/codec/TransactionalMapRemoveCodec.ts deleted file mode 100644 index 2badb8459..000000000 --- a/src/codec/TransactionalMapRemoveCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x0E0B00 -const REQUEST_MESSAGE_TYPE = 920320; -// hex: 0x0E0B01 -// RESPONSE_MESSAGE_TYPE = 920321 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapRemoveResponseParams { - response: Data; -} - -export class TransactionalMapRemoveCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapRemoveResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapRemoveIfSameCodec.ts b/src/codec/TransactionalMapRemoveIfSameCodec.ts deleted file mode 100644 index a4b7670d3..000000000 --- a/src/codec/TransactionalMapRemoveIfSameCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E0D00 -const REQUEST_MESSAGE_TYPE = 920832; -// hex: 0x0E0D01 -// RESPONSE_MESSAGE_TYPE = 920833 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMapRemoveIfSameResponseParams { - response: boolean; -} - -export class TransactionalMapRemoveIfSameCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, value); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapRemoveIfSameResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMapReplaceCodec.ts b/src/codec/TransactionalMapReplaceCodec.ts deleted file mode 100644 index f6ea82ff0..000000000 --- a/src/codec/TransactionalMapReplaceCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x0E0900 -const REQUEST_MESSAGE_TYPE = 919808; -// hex: 0x0E0901 -// RESPONSE_MESSAGE_TYPE = 919809 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapReplaceResponseParams { - response: Data; -} - -export class TransactionalMapReplaceCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, value); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapReplaceResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapReplaceIfSameCodec.ts b/src/codec/TransactionalMapReplaceIfSameCodec.ts deleted file mode 100644 index 8986bc9c4..000000000 --- a/src/codec/TransactionalMapReplaceIfSameCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E0A00 -const REQUEST_MESSAGE_TYPE = 920064; -// hex: 0x0E0A01 -// RESPONSE_MESSAGE_TYPE = 920065 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMapReplaceIfSameResponseParams { - response: boolean; -} - -export class TransactionalMapReplaceIfSameCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, oldValue: Data, newValue: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, oldValue); - DataCodec.encode(clientMessage, newValue); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapReplaceIfSameResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMapSetCodec.ts b/src/codec/TransactionalMapSetCodec.ts deleted file mode 100644 index 95c0b1849..000000000 --- a/src/codec/TransactionalMapSetCodec.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E0700 -const REQUEST_MESSAGE_TYPE = 919296; -// hex: 0x0E0701 -// RESPONSE_MESSAGE_TYPE = 919297 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export class TransactionalMapSetCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, value); - return clientMessage; - } -} diff --git a/src/codec/TransactionalMapSizeCodec.ts b/src/codec/TransactionalMapSizeCodec.ts deleted file mode 100644 index 9d48fa1d2..000000000 --- a/src/codec/TransactionalMapSizeCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; - -// hex: 0x0E0400 -const REQUEST_MESSAGE_TYPE = 918528; -// hex: 0x0E0401 -// RESPONSE_MESSAGE_TYPE = 918529 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMapSizeResponseParams { - response: number; -} - -export class TransactionalMapSizeCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapSizeResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMapValuesCodec.ts b/src/codec/TransactionalMapValuesCodec.ts deleted file mode 100644 index cfaf66c94..000000000 --- a/src/codec/TransactionalMapValuesCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0E1000 -const REQUEST_MESSAGE_TYPE = 921600; -// hex: 0x0E1001 -// RESPONSE_MESSAGE_TYPE = 921601 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapValuesResponseParams { - response: Data[]; -} - -export class TransactionalMapValuesCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapValuesResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMapValuesWithPredicateCodec.ts b/src/codec/TransactionalMapValuesWithPredicateCodec.ts deleted file mode 100644 index ccfa6a7eb..000000000 --- a/src/codec/TransactionalMapValuesWithPredicateCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; - -// hex: 0x0E1100 -const REQUEST_MESSAGE_TYPE = 921856; -// hex: 0x0E1101 -// RESPONSE_MESSAGE_TYPE = 921857 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMapValuesWithPredicateResponseParams { - response: Data[]; -} - -export class TransactionalMapValuesWithPredicateCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, predicate: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, predicate); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMapValuesWithPredicateResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMultiMapGetCodec.ts b/src/codec/TransactionalMultiMapGetCodec.ts deleted file mode 100644 index 5239dec11..000000000 --- a/src/codec/TransactionalMultiMapGetCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; - -// hex: 0x0F0200 -const REQUEST_MESSAGE_TYPE = 983552; -// hex: 0x0F0201 -// RESPONSE_MESSAGE_TYPE = 983553 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMultiMapGetResponseParams { - response: Data[]; -} - -export class TransactionalMultiMapGetCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapGetResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMultiMapPutCodec.ts b/src/codec/TransactionalMultiMapPutCodec.ts deleted file mode 100644 index 9805a989e..000000000 --- a/src/codec/TransactionalMultiMapPutCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0F0100 -const REQUEST_MESSAGE_TYPE = 983296; -// hex: 0x0F0101 -// RESPONSE_MESSAGE_TYPE = 983297 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMultiMapPutResponseParams { - response: boolean; -} - -export class TransactionalMultiMapPutCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, value); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapPutResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMultiMapRemoveCodec.ts b/src/codec/TransactionalMultiMapRemoveCodec.ts deleted file mode 100644 index 2a095dd4d..000000000 --- a/src/codec/TransactionalMultiMapRemoveCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; - -// hex: 0x0F0300 -const REQUEST_MESSAGE_TYPE = 983808; -// hex: 0x0F0301 -// RESPONSE_MESSAGE_TYPE = 983809 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalMultiMapRemoveResponseParams { - response: Data[]; -} - -export class TransactionalMultiMapRemoveCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapRemoveResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: ListMultiFrameCodec.decode(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts b/src/codec/TransactionalMultiMapRemoveEntryCodec.ts deleted file mode 100644 index 69a288b9e..000000000 --- a/src/codec/TransactionalMultiMapRemoveEntryCodec.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0F0400 -const REQUEST_MESSAGE_TYPE = 984064; -// hex: 0x0F0401 -// RESPONSE_MESSAGE_TYPE = 984065 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMultiMapRemoveEntryResponseParams { - response: boolean; -} - -export class TransactionalMultiMapRemoveEntryCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data, value: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - DataCodec.encode(clientMessage, value); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapRemoveEntryResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMultiMapSizeCodec.ts b/src/codec/TransactionalMultiMapSizeCodec.ts deleted file mode 100644 index f9ab25097..000000000 --- a/src/codec/TransactionalMultiMapSizeCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; - -// hex: 0x0F0600 -const REQUEST_MESSAGE_TYPE = 984576; -// hex: 0x0F0601 -// RESPONSE_MESSAGE_TYPE = 984577 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMultiMapSizeResponseParams { - response: number; -} - -export class TransactionalMultiMapSizeCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapSizeResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalMultiMapValueCountCodec.ts b/src/codec/TransactionalMultiMapValueCountCodec.ts deleted file mode 100644 index 1f358ca92..000000000 --- a/src/codec/TransactionalMultiMapValueCountCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x0F0500 -const REQUEST_MESSAGE_TYPE = 984320; -// hex: 0x0F0501 -// RESPONSE_MESSAGE_TYPE = 984321 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalMultiMapValueCountResponseParams { - response: number; -} - -export class TransactionalMultiMapValueCountCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, key: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, key); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalMultiMapValueCountResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalQueueOfferCodec.ts b/src/codec/TransactionalQueueOfferCodec.ts deleted file mode 100644 index 355fad7c3..000000000 --- a/src/codec/TransactionalQueueOfferCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x120100 -const REQUEST_MESSAGE_TYPE = 1179904; -// hex: 0x120101 -// RESPONSE_MESSAGE_TYPE = 1179905 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalQueueOfferResponseParams { - response: boolean; -} - -export class TransactionalQueueOfferCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data, timeout: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, item); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalQueueOfferResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalQueuePeekCodec.ts b/src/codec/TransactionalQueuePeekCodec.ts deleted file mode 100644 index 9d7d5fde0..000000000 --- a/src/codec/TransactionalQueuePeekCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x120400 -const REQUEST_MESSAGE_TYPE = 1180672; -// hex: 0x120401 -// RESPONSE_MESSAGE_TYPE = 1180673 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalQueuePeekResponseParams { - response: Data; -} - -export class TransactionalQueuePeekCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, timeout: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalQueuePeekResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalQueuePollCodec.ts b/src/codec/TransactionalQueuePollCodec.ts deleted file mode 100644 index 5a7a46360..000000000 --- a/src/codec/TransactionalQueuePollCodec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x120300 -const REQUEST_MESSAGE_TYPE = 1180416; -// hex: 0x120301 -// RESPONSE_MESSAGE_TYPE = 1180417 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalQueuePollResponseParams { - response: Data; -} - -export class TransactionalQueuePollCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, timeout: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_OFFSET, timeout); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalQueuePollResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalQueueSizeCodec.ts b/src/codec/TransactionalQueueSizeCodec.ts deleted file mode 100644 index 64d296528..000000000 --- a/src/codec/TransactionalQueueSizeCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; - -// hex: 0x120500 -const REQUEST_MESSAGE_TYPE = 1180928; -// hex: 0x120501 -// RESPONSE_MESSAGE_TYPE = 1180929 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalQueueSizeResponseParams { - response: number; -} - -export class TransactionalQueueSizeCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalQueueSizeResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalQueueTakeCodec.ts b/src/codec/TransactionalQueueTakeCodec.ts deleted file mode 100644 index 10678010d..000000000 --- a/src/codec/TransactionalQueueTakeCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; -import {CodecUtil} from './builtin/CodecUtil'; - -// hex: 0x120200 -const REQUEST_MESSAGE_TYPE = 1180160; -// hex: 0x120201 -// RESPONSE_MESSAGE_TYPE = 1180161 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - -export interface TransactionalQueueTakeResponseParams { - response: Data; -} - -export class TransactionalQueueTakeCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalQueueTakeResponseParams { - // empty initial frame - clientMessage.nextFrame(); - - return { - response: CodecUtil.decodeNullable(clientMessage, DataCodec.decode), - }; - } -} diff --git a/src/codec/TransactionalSetAddCodec.ts b/src/codec/TransactionalSetAddCodec.ts deleted file mode 100644 index 248b49606..000000000 --- a/src/codec/TransactionalSetAddCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x100100 -const REQUEST_MESSAGE_TYPE = 1048832; -// hex: 0x100101 -// RESPONSE_MESSAGE_TYPE = 1048833 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalSetAddResponseParams { - response: boolean; -} - -export class TransactionalSetAddCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, item); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalSetAddResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalSetRemoveCodec.ts b/src/codec/TransactionalSetRemoveCodec.ts deleted file mode 100644 index d447d50fd..000000000 --- a/src/codec/TransactionalSetRemoveCodec.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; -import {Data} from '../serialization/Data'; -import {DataCodec} from './builtin/DataCodec'; - -// hex: 0x100200 -const REQUEST_MESSAGE_TYPE = 1049088; -// hex: 0x100201 -// RESPONSE_MESSAGE_TYPE = 1049089 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalSetRemoveResponseParams { - response: boolean; -} - -export class TransactionalSetRemoveCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long, item: Data): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - DataCodec.encode(clientMessage, item); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalSetRemoveResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/TransactionalSetSizeCodec.ts b/src/codec/TransactionalSetSizeCodec.ts deleted file mode 100644 index 6c3dad84b..000000000 --- a/src/codec/TransactionalSetSizeCodec.ts +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -/* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {UUID} from '../core/UUID'; -import * as Long from 'long'; -import {StringCodec} from './builtin/StringCodec'; - -// hex: 0x100300 -const REQUEST_MESSAGE_TYPE = 1049344; -// hex: 0x100301 -// RESPONSE_MESSAGE_TYPE = 1049345 - -const REQUEST_TXN_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; -const REQUEST_THREAD_ID_OFFSET = REQUEST_TXN_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; -const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; -const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - -export interface TransactionalSetSizeResponseParams { - response: number; -} - -export class TransactionalSetSizeCodec { - static encodeRequest(name: string, txnId: UUID, threadId: Long): ClientMessage { - const clientMessage = ClientMessage.createForEncode(); - clientMessage.setRetryable(false); - - const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); - FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_TXN_ID_OFFSET, txnId); - FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); - clientMessage.addFrame(initialFrame); - clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); - clientMessage.setPartitionId(-1); - - StringCodec.encode(clientMessage, name); - return clientMessage; - } - - static decodeResponse(clientMessage: ClientMessage): TransactionalSetSizeResponseParams { - const initialFrame = clientMessage.nextFrame(); - - return { - response: FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET), - }; - } -} diff --git a/src/codec/builtin/ListDataCodec.ts b/src/codec/builtin/ListDataCodec.ts new file mode 100644 index 000000000..5b193545a --- /dev/null +++ b/src/codec/builtin/ListDataCodec.ts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {ClientMessage} from '../../ClientMessage'; +import {Data} from '../../serialization/Data'; +import {ListMultiFrameCodec} from './ListMultiFrameCodec'; +import {DataCodec} from './DataCodec'; + +export class ListDataCodec { + static encode(clientMessage: ClientMessage, list: Data[]): void { + ListMultiFrameCodec.encode(clientMessage, list, DataCodec.encode); + } + + static decode(clientMessage: ClientMessage): Data[] { + return ListMultiFrameCodec.decode(clientMessage, DataCodec.decode); + } +} diff --git a/src/codec/custom/AddressCodec.ts b/src/codec/custom/AddressCodec.ts index 475c1332f..ea48d3a46 100644 --- a/src/codec/custom/AddressCodec.ts +++ b/src/codec/custom/AddressCodec.ts @@ -19,8 +19,8 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {StringCodec} from '../builtin/StringCodec'; import {Address} from '../../Address'; +import {StringCodec} from '../builtin/StringCodec'; const PORT_OFFSET = 0; const INITIAL_FRAME_SIZE = PORT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; @@ -43,8 +43,9 @@ export class AddressCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const port: number = FixSizedTypesCodec.decodeInt(initialFrame.content, PORT_OFFSET); - const host: string = StringCodec.decode(clientMessage); + const port = FixSizedTypesCodec.decodeInt(initialFrame.content, PORT_OFFSET); + + const host = StringCodec.decode(clientMessage); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/AnchorDataListHolderCodec.ts b/src/codec/custom/AnchorDataListHolderCodec.ts index 32722ff81..9cf4fb991 100644 --- a/src/codec/custom/AnchorDataListHolderCodec.ts +++ b/src/codec/custom/AnchorDataListHolderCodec.ts @@ -14,14 +14,13 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {ListIntegerCodec} from '../builtin/ListIntegerCodec'; +import {AnchorDataListHolder} from '../../protocol/AnchorDataListHolder'; import {EntryListCodec} from '../builtin/EntryListCodec'; import {DataCodec} from '../builtin/DataCodec'; -import {Data} from '../../serialization/Data'; -import {AnchorDataListHolder} from '../../protocol/AnchorDataListHolder'; export class AnchorDataListHolderCodec { static encode(clientMessage: ClientMessage, anchorDataListHolder: AnchorDataListHolder): void { @@ -36,8 +35,9 @@ export class AnchorDataListHolderCodec { static decode(clientMessage: ClientMessage): AnchorDataListHolder { // begin frame clientMessage.nextFrame(); - const anchorPageList: number[] = ListIntegerCodec.decode(clientMessage); - const anchorDataList: Array<[Data, Data]> = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); + + const anchorPageList = ListIntegerCodec.decode(clientMessage); + const anchorDataList = EntryListCodec.decode(clientMessage, DataCodec.decode, DataCodec.decode); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/BitmapIndexOptionsCodec.ts b/src/codec/custom/BitmapIndexOptionsCodec.ts index 1800036cf..74c0f3dae 100644 --- a/src/codec/custom/BitmapIndexOptionsCodec.ts +++ b/src/codec/custom/BitmapIndexOptionsCodec.ts @@ -19,8 +19,8 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {StringCodec} from '../builtin/StringCodec'; import {BitmapIndexOptions} from '../../config/BitmapIndexOptions'; +import {StringCodec} from '../builtin/StringCodec'; const UNIQUE_KEY_TRANSFORMATION_OFFSET = 0; const INITIAL_FRAME_SIZE = UNIQUE_KEY_TRANSFORMATION_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; @@ -43,8 +43,9 @@ export class BitmapIndexOptionsCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const uniqueKeyTransformation: number = FixSizedTypesCodec.decodeInt(initialFrame.content, UNIQUE_KEY_TRANSFORMATION_OFFSET); - const uniqueKey: string = StringCodec.decode(clientMessage); + const uniqueKeyTransformation = FixSizedTypesCodec.decodeInt(initialFrame.content, UNIQUE_KEY_TRANSFORMATION_OFFSET); + + const uniqueKey = StringCodec.decode(clientMessage); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/DistributedObjectInfoCodec.ts b/src/codec/custom/DistributedObjectInfoCodec.ts index 6c3f826fc..b99aec5dd 100644 --- a/src/codec/custom/DistributedObjectInfoCodec.ts +++ b/src/codec/custom/DistributedObjectInfoCodec.ts @@ -33,8 +33,9 @@ export class DistributedObjectInfoCodec { static decode(clientMessage: ClientMessage): DistributedObjectInfo { // begin frame clientMessage.nextFrame(); - const serviceName: string = StringCodec.decode(clientMessage); - const name: string = StringCodec.decode(clientMessage); + + const serviceName = StringCodec.decode(clientMessage); + const name = StringCodec.decode(clientMessage); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/ErrorHolderCodec.ts b/src/codec/custom/ErrorHolderCodec.ts index 765f2b6c5..6d1881386 100644 --- a/src/codec/custom/ErrorHolderCodec.ts +++ b/src/codec/custom/ErrorHolderCodec.ts @@ -19,11 +19,10 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; +import {ErrorHolder} from '../../protocol/ErrorHolder'; import {StringCodec} from '../builtin/StringCodec'; -import {StackTraceElement} from '../../protocol/StackTraceElement'; import {ListMultiFrameCodec} from '../builtin/ListMultiFrameCodec'; import {StackTraceElementCodec} from './StackTraceElementCodec'; -import {ErrorHolder} from '../../protocol/ErrorHolder'; const ERROR_CODE_OFFSET = 0; const INITIAL_FRAME_SIZE = ERROR_CODE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; @@ -48,10 +47,11 @@ export class ErrorHolderCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const errorCode: number = FixSizedTypesCodec.decodeInt(initialFrame.content, ERROR_CODE_OFFSET); - const className: string = StringCodec.decode(clientMessage); - const message: string = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); - const stackTraceElements: StackTraceElement[] = ListMultiFrameCodec.decode(clientMessage, StackTraceElementCodec.decode); + const errorCode = FixSizedTypesCodec.decodeInt(initialFrame.content, ERROR_CODE_OFFSET); + + const className = StringCodec.decode(clientMessage); + const message = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); + const stackTraceElements = ListMultiFrameCodec.decode(clientMessage, StackTraceElementCodec.decode); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/IndexConfigCodec.ts b/src/codec/custom/IndexConfigCodec.ts index a53538785..2e95d92e7 100644 --- a/src/codec/custom/IndexConfigCodec.ts +++ b/src/codec/custom/IndexConfigCodec.ts @@ -19,11 +19,10 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; +import {IndexConfig} from '../../config/IndexConfig'; import {StringCodec} from '../builtin/StringCodec'; import {ListMultiFrameCodec} from '../builtin/ListMultiFrameCodec'; -import {BitmapIndexOptions} from '../../config/BitmapIndexOptions'; import {BitmapIndexOptionsCodec} from './BitmapIndexOptionsCodec'; -import {IndexConfig} from '../../config/IndexConfig'; const TYPE_OFFSET = 0; const INITIAL_FRAME_SIZE = TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; @@ -48,10 +47,11 @@ export class IndexConfigCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const type: number = FixSizedTypesCodec.decodeInt(initialFrame.content, TYPE_OFFSET); - const name: string = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); - const attributes: string[] = ListMultiFrameCodec.decode(clientMessage, StringCodec.decode); - const bitmapIndexOptions: BitmapIndexOptions = CodecUtil.decodeNullable(clientMessage, BitmapIndexOptionsCodec.decode); + const type = FixSizedTypesCodec.decodeInt(initialFrame.content, TYPE_OFFSET); + + const name = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); + const attributes = ListMultiFrameCodec.decode(clientMessage, StringCodec.decode); + const bitmapIndexOptions = CodecUtil.decodeNullable(clientMessage, BitmapIndexOptionsCodec.decode); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/MemberInfoCodec.ts b/src/codec/custom/MemberInfoCodec.ts index d7bcb2ff9..84596b8a0 100644 --- a/src/codec/custom/MemberInfoCodec.ts +++ b/src/codec/custom/MemberInfoCodec.ts @@ -14,19 +14,16 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {UUID} from '../../core/UUID'; -import {Address} from '../../Address'; +import {MemberInfo} from '../../core/MemberInfo'; import {AddressCodec} from './AddressCodec'; import {MapCodec} from '../builtin/MapCodec'; import {StringCodec} from '../builtin/StringCodec'; -import {MemberVersion} from '../../core/MemberVersion'; import {MemberVersionCodec} from './MemberVersionCodec'; -import {MemberInfo} from '../../core/MemberInfo'; const UUID_OFFSET = 0; const LITE_MEMBER_OFFSET = UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; @@ -53,11 +50,12 @@ export class MemberInfoCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const uuid: UUID = FixSizedTypesCodec.decodeUUID(initialFrame.content, UUID_OFFSET); - const liteMember: boolean = FixSizedTypesCodec.decodeBoolean(initialFrame.content, LITE_MEMBER_OFFSET); - const address: Address = AddressCodec.decode(clientMessage); - const attributes: Map = MapCodec.decode(clientMessage, StringCodec.decode, StringCodec.decode); - const version: MemberVersion = MemberVersionCodec.decode(clientMessage); + const uuid = FixSizedTypesCodec.decodeUUID(initialFrame.content, UUID_OFFSET); + const liteMember = FixSizedTypesCodec.decodeBoolean(initialFrame.content, LITE_MEMBER_OFFSET); + + const address = AddressCodec.decode(clientMessage); + const attributes = MapCodec.decode(clientMessage, StringCodec.decode, StringCodec.decode); + const version = MemberVersionCodec.decode(clientMessage); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/MemberVersionCodec.ts b/src/codec/custom/MemberVersionCodec.ts index df4b34ffd..cf944d244 100644 --- a/src/codec/custom/MemberVersionCodec.ts +++ b/src/codec/custom/MemberVersionCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -/*tslint:disable:max-line-length*/ +/* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; @@ -44,9 +44,9 @@ export class MemberVersionCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const major: number = FixSizedTypesCodec.decodeByte(initialFrame.content, MAJOR_OFFSET); - const minor: number = FixSizedTypesCodec.decodeByte(initialFrame.content, MINOR_OFFSET); - const patch: number = FixSizedTypesCodec.decodeByte(initialFrame.content, PATCH_OFFSET); + const major = FixSizedTypesCodec.decodeByte(initialFrame.content, MAJOR_OFFSET); + const minor = FixSizedTypesCodec.decodeByte(initialFrame.content, MINOR_OFFSET); + const patch = FixSizedTypesCodec.decodeByte(initialFrame.content, PATCH_OFFSET); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/PagingPredicateHolderCodec.ts b/src/codec/custom/PagingPredicateHolderCodec.ts index ecefca6ed..c2f3bfa03 100644 --- a/src/codec/custom/PagingPredicateHolderCodec.ts +++ b/src/codec/custom/PagingPredicateHolderCodec.ts @@ -19,11 +19,9 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {AnchorDataListHolder} from '../../protocol/AnchorDataListHolder'; +import {PagingPredicateHolder} from '../../protocol/PagingPredicateHolder'; import {AnchorDataListHolderCodec} from './AnchorDataListHolderCodec'; -import {Data} from '../../serialization/Data'; import {DataCodec} from '../builtin/DataCodec'; -import {PagingPredicateHolder} from '../../protocol/PagingPredicateHolder'; const PAGE_SIZE_OFFSET = 0; const PAGE_OFFSET = PAGE_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; @@ -53,13 +51,14 @@ export class PagingPredicateHolderCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const pageSize: number = FixSizedTypesCodec.decodeInt(initialFrame.content, PAGE_SIZE_OFFSET); - const page: number = FixSizedTypesCodec.decodeInt(initialFrame.content, PAGE_OFFSET); - const iterationTypeId: number = FixSizedTypesCodec.decodeByte(initialFrame.content, ITERATION_TYPE_ID_OFFSET); - const anchorDataListHolder: AnchorDataListHolder = AnchorDataListHolderCodec.decode(clientMessage); - const predicateData: Data = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); - const comparatorData: Data = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); - const partitionKeyData: Data = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const pageSize = FixSizedTypesCodec.decodeInt(initialFrame.content, PAGE_SIZE_OFFSET); + const page = FixSizedTypesCodec.decodeInt(initialFrame.content, PAGE_OFFSET); + const iterationTypeId = FixSizedTypesCodec.decodeByte(initialFrame.content, ITERATION_TYPE_ID_OFFSET); + + const anchorDataListHolder = AnchorDataListHolderCodec.decode(clientMessage); + const predicateData = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const comparatorData = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + const partitionKeyData = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/SimpleEntryViewCodec.ts b/src/codec/custom/SimpleEntryViewCodec.ts index 99b6ec94f..46d62a23e 100644 --- a/src/codec/custom/SimpleEntryViewCodec.ts +++ b/src/codec/custom/SimpleEntryViewCodec.ts @@ -19,10 +19,9 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import * as Long from 'long'; +import {SimpleEntryView} from '../../core/SimpleEntryView'; import {Data} from '../../serialization/Data'; import {DataCodec} from '../builtin/DataCodec'; -import {SimpleEntryView} from '../../core/SimpleEntryView'; const COST_OFFSET = 0; const CREATION_TIME_OFFSET = COST_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; @@ -64,18 +63,19 @@ export class SimpleEntryViewCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const cost: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, COST_OFFSET); - const creationTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, CREATION_TIME_OFFSET); - const expirationTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, EXPIRATION_TIME_OFFSET); - const hits: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, HITS_OFFSET); - const lastAccessTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_ACCESS_TIME_OFFSET); - const lastStoredTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_STORED_TIME_OFFSET); - const lastUpdateTime: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_UPDATE_TIME_OFFSET); - const version: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, VERSION_OFFSET); - const ttl: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, TTL_OFFSET); - const maxIdle: Long = FixSizedTypesCodec.decodeLong(initialFrame.content, MAX_IDLE_OFFSET); - const key: Data = DataCodec.decode(clientMessage); - const value: Data = DataCodec.decode(clientMessage); + const cost = FixSizedTypesCodec.decodeLong(initialFrame.content, COST_OFFSET); + const creationTime = FixSizedTypesCodec.decodeLong(initialFrame.content, CREATION_TIME_OFFSET); + const expirationTime = FixSizedTypesCodec.decodeLong(initialFrame.content, EXPIRATION_TIME_OFFSET); + const hits = FixSizedTypesCodec.decodeLong(initialFrame.content, HITS_OFFSET); + const lastAccessTime = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_ACCESS_TIME_OFFSET); + const lastStoredTime = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_STORED_TIME_OFFSET); + const lastUpdateTime = FixSizedTypesCodec.decodeLong(initialFrame.content, LAST_UPDATE_TIME_OFFSET); + const version = FixSizedTypesCodec.decodeLong(initialFrame.content, VERSION_OFFSET); + const ttl = FixSizedTypesCodec.decodeLong(initialFrame.content, TTL_OFFSET); + const maxIdle = FixSizedTypesCodec.decodeLong(initialFrame.content, MAX_IDLE_OFFSET); + + const key = DataCodec.decode(clientMessage); + const value = DataCodec.decode(clientMessage); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/codec/custom/StackTraceElementCodec.ts b/src/codec/custom/StackTraceElementCodec.ts index c0dcc49d9..ed57881ce 100644 --- a/src/codec/custom/StackTraceElementCodec.ts +++ b/src/codec/custom/StackTraceElementCodec.ts @@ -19,8 +19,8 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {StringCodec} from '../builtin/StringCodec'; import {StackTraceElement} from '../../protocol/StackTraceElement'; +import {StringCodec} from '../builtin/StringCodec'; const LINE_NUMBER_OFFSET = 0; const INITIAL_FRAME_SIZE = LINE_NUMBER_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; @@ -45,10 +45,11 @@ export class StackTraceElementCodec { clientMessage.nextFrame(); const initialFrame = clientMessage.nextFrame(); - const lineNumber: number = FixSizedTypesCodec.decodeInt(initialFrame.content, LINE_NUMBER_OFFSET); - const className: string = StringCodec.decode(clientMessage); - const methodName: string = StringCodec.decode(clientMessage); - const fileName: string = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); + const lineNumber = FixSizedTypesCodec.decodeInt(initialFrame.content, LINE_NUMBER_OFFSET); + + const className = StringCodec.decode(clientMessage); + const methodName = StringCodec.decode(clientMessage); + const fileName = CodecUtil.decodeNullable(clientMessage, StringCodec.decode); CodecUtil.fastForwardToEndFrame(clientMessage); diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index 9346bfa91..690a025da 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -48,6 +48,7 @@ import { UndefinedErrorCodeError, UnsupportedOperationError, HazelcastSerializationError, + ReachedMaxSizeError, } from '../HazelcastError'; import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; import {ClientMessage} from '../ClientMessage'; @@ -94,6 +95,7 @@ export class ClientErrorFactory { this.register(ClientProtocolErrorCodes.QUERY, (m, c) => new QueryError(m, c)); this.register(ClientProtocolErrorCodes.QUERY_RESULT_SIZE_EXCEEDED, (m, c) => new QueryError(m, c)); this.register(ClientProtocolErrorCodes.SPLIT_BRAIN_PROTECTION, (m, c) => new SplitBrainProtectionError(m, c)); + this.register(ClientProtocolErrorCodes.REACHED_MAX_SIZE, (m, c) => new ReachedMaxSizeError(m, c)); this.register(ClientProtocolErrorCodes.RETRYABLE_HAZELCAST, (m, c) => new RetryableHazelcastError(m, c)); this.register(ClientProtocolErrorCodes.RETRYABLE_IO, (m, c) => new RetryableIOError(m, c)); this.register(ClientProtocolErrorCodes.SOCKET, (m, c) => new IOError(m, c)); diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index ce9a22cce..7bdc7a16c 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -136,10 +136,69 @@ export interface IMap extends DistributedObject { /** * Puts all key value pairs from this array to the map as key -> value mappings. + *

+ * The behaviour of this operation is undefined if the specified pairs are modified + * while this operation is in progress. + * + *

Interactions with the map store + *

+ * For each element not found in memory + * MapLoader#load(Object) is invoked to load the value from + * the map store backing the map, which may come at a significant + * performance cost. Exceptions thrown by load fail the operation + * and are propagated to the caller. The elements which were added + * before the exception was thrown will remain in the map, the rest + * will not be added. + *

+ * If write-through persistence mode is configured, + * MapStore#store(Object, Object) is invoked for each element + * before the element is added in memory, which may come at a + * significant performance cost. Exceptions thrown by store fail the + * operation and are propagated to the caller. The elements which + * were added before the exception was thrown will remain in the map, + * the rest will not be added. + *

+ * If write-behind persistence mode is configured with + * write-coalescing turned off, + * this call may be rejected with {@link ReachedMaxSizeError} + * if the write-behind queue has reached its per-node maximum + * capacity. + * * @param pairs */ putAll(pairs: Array<[K, V]>): Promise; + /** + * Puts all key value pairs from this array to the map as key -> value mappings without loading + * non-existing elements from map store (which is more efficient than {@link putAll}). + *

+ * This method breaks the contract of EntryListener. + * EntryEvent of all the updated entries will have null oldValue even if they exist previously. + *

+ * The behaviour of this operation is undefined if the specified pairs are modified + * while this operation is in progress. + * + *

Interactions with the map store + *

+ * If write-through persistence mode is configured, + * MapStore#store(Object, Object) is invoked for each element + * before the element is added in memory, which may come at a + * significant performance cost. Exceptions thrown by store fail the + * operation and are propagated to the caller. The elements which + * were added before the exception was thrown will remain in the map, + * the rest will not be added. + *

+ * If write-behind persistence mode is configured with + * write-coalescing turned off, + * this call may be rejected with {@link ReachedMaxSizeError} + * if the write-behind queue has reached its per-node maximum + * capacity. + * + * @param pairs + * @requires Hazelcast IMDG 4.1 + */ + setAll(pairs: Array<[K, V]>): Promise; + /** * Retrieves the value associated with given key. * @param key diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 97fd7226d..5469c7090 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -258,20 +258,11 @@ export class MapProxy extends BaseProxy implements IMap { } putAll(pairs: Array<[K, V]>): Promise { - const partitionService = this.client.getPartitionService(); - const partitionsToKeys: { [id: string]: any } = {}; - let pair: [K, V]; - let pairId: string; - for (pairId in pairs) { - pair = pairs[pairId]; - const keyData = this.toData(pair[0]); - const pId: number = partitionService.getPartitionId(keyData); - if (!partitionsToKeys[pId]) { - partitionsToKeys[pId] = []; - } - partitionsToKeys[pId].push([keyData, this.toData(pair[1])]); - } - return this.putAllInternal(partitionsToKeys); + return this.putAllInternal(pairs, true); + } + + setAll(pairs: Array<[K, V]>): Promise { + return this.putAllInternal(pairs, false); } get(key: K): Promise { @@ -540,17 +531,8 @@ export class MapProxy extends BaseProxy implements IMap { }); } - protected putAllInternal(partitionsToKeysData: { [id: string]: Array<[Data, Data]> }): Promise { - const partitionPromises: Array> = []; - for (const partition in partitionsToKeysData) { - partitionPromises.push( - this.encodeInvokeOnPartition(MapPutAllCodec, Number(partition), partitionsToKeysData[partition]) - .then(() => undefined), - ); - } - return Promise.all(partitionPromises).then(function (): any { - return; - }); + protected finalizePutAll(partitionsToKeys: { [id: string]: Array<[Data, Data]> }): void { + // No-op } protected getInternal(keyData: Data): Promise { @@ -662,6 +644,29 @@ export class MapProxy extends BaseProxy implements IMap { }); } + private putAllInternal(pairs: Array<[K, V]>, triggerMapLoader: boolean): Promise { + const partitionService = this.client.getPartitionService(); + const partitionsToKeys: { [id: number]: Array<[Data, Data]> } = {}; + for (const pair of pairs) { + const keyData = this.toData(pair[0]); + const pId: number = partitionService.getPartitionId(keyData); + if (!partitionsToKeys[pId]) { + partitionsToKeys[pId] = []; + } + partitionsToKeys[pId].push([keyData, this.toData(pair[1])]); + } + + const partitionPromises: Array> = []; + for (const partition in partitionsToKeys) { + partitionPromises.push( + this.encodeInvokeOnPartition(MapPutAllCodec, Number(partition), partitionsToKeys[partition], triggerMapLoader) + .then(() => this.finalizePutAll(partitionsToKeys)), + ); + } + return Promise.all(partitionPromises) + .then(() => undefined); + } + private addEntryListenerInternal( listener: MapListener, predicate: Predicate, key: K, includeValue: boolean, ): Promise { diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index e0537ca26..66abaa7e6 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -186,4 +186,17 @@ export interface MultiMap extends DistributedObject { * @param key key to be unlocked. */ forceUnlock(key: K): Promise; + + /** + * Stores the given key, value array pairs in the MultiMap. + *

+ * The behaviour of this operation is undefined if the specified pairs are modified + * while this operation is in progress. + *

+ * No atomicity guarantees are given. It could be that in case of failure + * some of the key/value-pairs get written, while others are not. + *

+ * @param pairs key, value array pairs + */ + putAll(pairs: Array<[K, V[]]>): Promise; } diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 6cd0d70f2..d64ad9f27 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -50,6 +50,7 @@ import {MapEvent} from '../core/MapListener'; import {ClientMessage} from '../ClientMessage'; import {UUID} from '../core/UUID'; import * as SerializationUtil from '../serialization/SerializationUtil'; +import {MultiMapPutAllCodec} from '../codec/MultiMapPutAllCodec'; export class MultiMapProxy extends BaseProxy implements MultiMap { @@ -265,6 +266,40 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { .then(() => undefined); } + putAll(pairs: Array<[K, V[]]>): Promise { + if (pairs.length === 0) { + return Promise.resolve(); + } + + const dataPairs: Array<[Data, Data[]]> = []; + for (const pair of pairs) { + const valuesData = SerializationUtil.serializeList(this.toData.bind(this), pair[1]); + dataPairs.push([this.toData(pair[0]), valuesData]); + } + + const partitionService = this.client.getPartitionService(); + const partitionToDataPairs = new Map>(); + + for (const dataPair of dataPairs) { + const partitionId = partitionService.getPartitionId(dataPair[0]); + let partitionedDataPairs = partitionToDataPairs.get(partitionId); + if (partitionedDataPairs == null) { + partitionedDataPairs = []; + partitionToDataPairs.set(partitionId, partitionedDataPairs); + } + + partitionedDataPairs.push(dataPair); + } + + const partitionPromises: Array> = []; + partitionToDataPairs.forEach((pair, partitionId) => { + partitionPromises.push(this.encodeInvokeOnPartition(MultiMapPutAllCodec, partitionId, pair)); + }); + + return Promise.all(partitionPromises) + .then(() => undefined); + } + private nextSequence(): Long { return this.lockReferenceIdGenerator.getNextReferenceId(); } diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 5b6c7d119..43003e91f 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -75,14 +75,12 @@ export class NearCachedMapProxy extends MapProxy { return super.evictInternal(key).then(this.invalidateCacheEntryAndReturn.bind(this, key)); } - protected putAllInternal(partitionsToKeysData: { [id: string]: Array<[Data, Data]> }): Promise { - return super.putAllInternal(partitionsToKeysData).then(() => { - for (const partition in partitionsToKeysData) { - partitionsToKeysData[partition].forEach((entry: [Data, Data]) => { - this.nearCache.invalidate(entry[0]); - }); - } - }); + protected finalizePutAll(partitionsToKeysData: { [id: string]: Array<[Data, Data]> }): void { + for (const partition in partitionsToKeysData) { + partitionsToKeysData[partition].forEach((entry: [Data, Data]) => { + this.nearCache.invalidate(entry[0]); + }); + } } protected postDestroy(): Promise { diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index 1a69869ea..f64c50a54 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -202,36 +202,43 @@ describe('MapProxy', function () { }); }); - it('putAll', function (done) { - var arr = [ - ['pa_k0', 'pa_v0'], - ['pa_k1', 'pa_v1'], - ['pa_k2', 'pa_v2'], - ['pa_k3', 'pa_v3'], - ['pa_k4', 'pa_v4'] - ]; - var returnedCorrectly = 0; - var verify = function (expected) { - return function (val) { - try { - expect(val).to.equal(expected); - returnedCorrectly++; - if (returnedCorrectly === 5) { - done(); - + [true, false].forEach(function (shouldUsePutAll) { + it(shouldUsePutAll ? 'putAll' : 'setAll', function (done) { + var arr = [ + ['pa_k0', 'pa_v0'], + ['pa_k1', 'pa_v1'], + ['pa_k2', 'pa_v2'], + ['pa_k3', 'pa_v3'], + ['pa_k4', 'pa_v4'] + ]; + var returnedCorrectly = 0; + var verify = function (expected) { + return function (val) { + try { + expect(val).to.equal(expected); + returnedCorrectly++; + if (returnedCorrectly === 5) { + done(); + } + } catch (e) { + done(e); } - } catch (e) { - done(e); - } + }; }; - }; - map.putAll(arr).then(function () { - map.get(arr[0][0]).then(verify(arr[0][1])); - map.get(arr[1][0]).then(verify(arr[1][1])); - map.get(arr[2][0]).then(verify(arr[2][1])); - map.get(arr[3][0]).then(verify(arr[3][1])); - map.get(arr[4][0]).then(verify(arr[4][1])); - }) + var promise; + if (shouldUsePutAll) { + promise = map.putAll(arr); + } else { + promise = map.setAll(arr); + } + promise.then(function () { + map.get(arr[0][0]).then(verify(arr[0][1])); + map.get(arr[1][0]).then(verify(arr[1][1])); + map.get(arr[2][0]).then(verify(arr[2][1])); + map.get(arr[3][0]).then(verify(arr[3][1])); + map.get(arr[4][0]).then(verify(arr[4][1])); + }) + }); }); it('getAll', function () { diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index fa5b6d1ac..4f7664ff2 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -21,6 +21,7 @@ var Controller = require('./../RC'); var fs = require('fs'); var _fillMap = require('../Util').fillMap; var promiseWaitMilliseconds = require('../Util').promiseWaitMilliseconds; +const Util = require('../Util'); describe('MapStore', function () { var cluster; @@ -194,9 +195,58 @@ describe('MapStore', function () { .then(function () { return map.put('some-key', 'some-value', 100) }).then(function () { - return promiseWaitMilliseconds(2000); - }).then(function () { - return map.get('some-key'); + return promiseWaitMilliseconds(2000); + }).then(function () { + return map.get('some-key'); + }); + }); + + it('listener contains old value after putAll', function (done) { + let listenerId; + const listener = { + updated: event => { + map.removeEntryListener(listenerId) + .then(() => { + if (event.oldValue === "1") { + done(); + } else { + done(new Error("Old value for the received event does not match with expected value! " + + "Expected: 1, received: " + event.oldValue)); + } + }); + }, + } + map.evictAll() + .then(() => map.put("1", "1")) + .then(() => map.addEntryListener(listener, null, true)) + .then(id => { + listenerId = id; + return map.putAll([["1", "2"]]); + }); + }); + + it('listener does not contain old value after setAll', function (done) { + Util.markServerVersionAtLeast(this, client, '4.1'); + let listenerId; + const listener = { + added: event => { + map.removeEntryListener(listenerId) + .then(() => { + if (event.oldValue == null) { + done(); + } else { + done(new Error("Old value for the received event does not match with expected value! " + + "Expected: null, received: " + event.oldValue)); + } + }); + }, + } + map.evictAll() + .then(() => map.put("1", "1")) + .then(() => map.addEntryListener(listener, null, true)) + .then(id => { + listenerId = id; + return map.setAll([["1", "2"]]); }); }); }); diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index eed5fecad..08a8c074c 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -233,14 +233,21 @@ describe("NearCachedMap", function () { it('loadAll invalidates the cache'); - it('putAll invalidates entries', function () { - return map1.getAll(['key1', 'key2']).then(function () { - return map1.putAll([ - ['key1', 'newVal1'], - ['key2', 'newVal2'] - ]); - }).then(function () { - return expectStats(map1, 0, 2, 0); + [true, false].forEach(function (shouldUsePutAll) { + it((shouldUsePutAll ? 'putAll' : 'setAll') + ' invalidates entries', function () { + return map1.getAll(['key1', 'key2']) + .then(() => { + const entries = [ + ['key1', 'newVal1'], + ['key2', 'newVal2'] + ]; + if (shouldUsePutAll) { + return map1.putAll(entries); + } else { + return map1.setAll(entries); + } + }) + .then(() => expectStats(map1, 0, 2, 0)); }); }); diff --git a/test/multimap/MultiMapProxyListenersTest.js b/test/multimap/MultiMapProxyListenersTest.js index 097de4afd..99a221c7a 100644 --- a/test/multimap/MultiMapProxyListenersTest.js +++ b/test/multimap/MultiMapProxyListenersTest.js @@ -18,7 +18,7 @@ var expect = require("chai").expect; var HazelcastClient = require("../../lib/index.js").Client; const Config = require("../../lib/index.js").Config; var Controller = require('./../RC'); -var Util = require('./../Util'); +const Util = require('./../Util'); describe("MultiMap Proxy Listener", function () { @@ -208,5 +208,26 @@ describe("MultiMap Proxy Listener", function () { }); }); + it('fires event for each pair of putAll', function (done) { + Util.markServerVersionAtLeast(this, client, '4.1'); + let expectedEventCount = 3; + const listener = (key, values) => { + return { + added: event => { + expect(event.key).to.equal(key); + expect(values).to.include(event.value); + expectedEventCount--; + if (expectedEventCount === 0) { + done(); + } else if (expectedEventCount < 0) { + done(new Error('Received too many events')); + } + } + } + } + map.addEntryListener(listener('a', [1]), 'a') + .then(() => map.addEntryListener(listener('b', [2, 22]), 'b')) + .then(() => map.putAll([['a', [1]], ['b', [2, 22]]])); + }); }); diff --git a/test/multimap/MultiMapProxyTest.js b/test/multimap/MultiMapProxyTest.js index de93b4e22..dd8262edf 100644 --- a/test/multimap/MultiMapProxyTest.js +++ b/test/multimap/MultiMapProxyTest.js @@ -241,4 +241,33 @@ describe("MultiMap Proxy", function () { expect(size).to.equal(0); }); }); + + it('putAll with empty pairs', function () { + return map.putAll([]) + .then(() => map.size()) + .then(size => expect(size).to.equal(0)); + }); + + it('putAll', function () { + Util.markServerVersionAtLeast(this, client, '4.1'); + const pairs = [["a", [1]], ["b", [2, 22]], ["c", [3, 33, 333]]]; + const checkValues = (expected, actual) => { + expect(actual.length).to.equal(expected.length); + expect(actual).to.have.members(expected); + } + + return map.putAll(pairs) + .then(() => map.get("a")) + .then(values => { + checkValues([1], values.toArray()); + return map.get("b"); + }) + .then(values => { + checkValues([2, 22], values.toArray()) + return map.get("c"); + }) + .then(values => { + checkValues([3, 33, 333], values.toArray()); + }) + }); }); From 4557ef08fde652c2645025d238cbe6ba35750565 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 6 Aug 2020 14:38:40 +0300 Subject: [PATCH 273/685] Simplify programmatic configuration API (#554) Also includes the following: * Remove declarative configuration feature * Rename config options in a way consistent with Java client * Change default evictionPolicy to LRU * Convert all enum values used in config options to strings * Use Serializer interface in serializer config * Remove unused fields from SerializationServiceV1 * Improve serialization config validation * Update full documentation * Migrate snippets in documentation and code samples to ES6 and async/await * Add code sample for IdentifiedDataSerializable * Remove network.hazelcastCloud.enabled option * Fix unused timeout field in HazelcastCloudDiscovery --- .gitignore | 1 + DOCUMENTATION.md | 2728 +++++++---------- README.md | 32 +- benchmark/README.md | 2 +- code_samples/README.md | 2 + code_samples/aggregation.js | 49 +- code_samples/client_statistics.js | 60 +- code_samples/custom_serializer.js | 89 +- code_samples/distributed_object_listener.js | 44 +- code_samples/flakeid_generator.js | 27 +- code_samples/global_serializer.js | 70 +- code_samples/hazelcast_cloud_discovery.js | 76 +- code_samples/hazelcast_json_value.js | 56 +- code_samples/identified_data_serializable.js | 75 + code_samples/jaas_sample/admin_client.js | 52 +- code_samples/jaas_sample/reader_client.js | 52 +- code_samples/jaas_sample/user_pass_cred.js | 45 +- .../jaas_sample/user_pass_cred_factory.js | 18 +- code_samples/lifecycle_listener.js | 25 +- code_samples/list.js | 45 +- code_samples/logging.js | 43 +- code_samples/map.js | 49 +- code_samples/map_entry_listener.js | 55 +- code_samples/membership_listener.js | 32 +- code_samples/near_cache.js | 85 +- .../org-website/CustomSerializerSample.js | 76 +- .../org-website/EntryProcessorSample.js | 90 +- .../org-website/GlobalSerializerSample.js | 55 +- .../IdentifiedDataSerializableSample.js | 81 +- code_samples/org-website/ListSample.js | 42 +- code_samples/org-website/MapSample.js | 37 +- code_samples/org-website/MultiMapSample.js | 42 +- .../org-website/PortableSerializableSample.js | 89 +- code_samples/org-website/QuerySample.js | 122 +- code_samples/org-website/QueueSample.js | 51 +- .../org-website/ReliableTopicSample.js | 29 +- .../org-website/ReplicatedMapSample.js | 38 +- code_samples/org-website/RingBufferSample.js | 50 +- code_samples/org-website/SetSample.js | 47 +- code_samples/paging_predicate.js | 118 +- code_samples/pn_counter.js | 32 +- code_samples/portable_multiversion_sample.js | 378 +-- code_samples/querying_with_SQL.js | 47 +- code_samples/queue.js | 41 +- code_samples/set.js | 41 +- code_samples/ssl_authentication.js | 26 +- config-schema.json | 275 +- hazelcast-client-default.json | 3 +- hazelcast-client-full.json | 3 +- scripts/dev-test-rc.sh | 4 +- scripts/download-rc.bat | 4 +- scripts/download-rc.sh | 4 +- src/HazelcastClient.ts | 70 +- src/LifecycleService.ts | 15 +- src/ListenerService.ts | 2 +- src/LoadBalancer.ts | 4 +- src/Util.ts | 29 +- src/codec/MapAddIndexCodec.ts | 4 +- src/codec/custom/BitmapIndexOptionsCodec.ts | 8 +- src/codec/custom/IndexConfigCodec.ts | 8 +- src/config/BitmapIndexOptions.ts | 27 +- src/config/ClientCloudConfig.ts | 18 +- src/config/ClientNetworkConfig.ts | 48 +- src/config/Config.ts | 203 +- src/config/ConfigBuilder.ts | 240 +- src/config/ConnectionRetryConfig.ts | 52 +- src/config/ConnectionStrategyConfig.ts | 41 +- src/config/EvictionPolicy.ts | 25 +- src/config/FlakeIdGeneratorConfig.ts | 44 +- src/config/InMemoryFormat.ts | 13 +- src/config/IndexConfig.ts | 56 +- src/config/IndexType.ts | 4 + src/config/JsonConfigLocator.ts | 100 - src/config/JsonStringDeserializationPolicy.ts | 6 +- src/config/ListenerConfig.ts | 42 - src/config/LoadBalancerConfig.ts | 60 + src/config/NearCacheConfig.ts | 75 +- src/config/ReliableTopicConfig.ts | 31 +- src/config/SSLConfig.ts | 29 +- src/config/SerializationConfig.ts | 68 +- src/connection/DefaultAddressProvider.ts | 8 +- src/core/MembershipListener.ts | 2 + .../HazelcastCloudAddressProvider.ts | 1 + src/discovery/HazelcastCloudDiscovery.ts | 5 +- src/index.ts | 8 +- src/invocation/ClusterService.ts | 2 +- src/invocation/InvocationService.ts | 4 +- src/nearcache/NearCache.ts | 4 +- src/network/ClientConnectionManager.ts | 38 +- src/proxy/FlakeIdGeneratorProxy.ts | 4 +- src/proxy/IMap.ts | 18 +- src/proxy/topic/TopicOverloadPolicy.ts | 9 +- src/serialization/Data.ts | 14 +- src/serialization/DefaultSerializer.ts | 32 +- src/serialization/HeapData.ts | 9 +- src/serialization/Serializable.ts | 16 + src/serialization/SerializationService.ts | 53 +- .../portable/PortableSerializer.ts | 15 +- src/util/AbstractLoadBalancer.ts | 4 +- src/util/IndexUtil.ts | 67 +- test/AutoPipeliningDisabledTest.js | 12 +- test/BuildInfoTest.js | 5 +- test/ClientProxyTest.js | 46 +- test/ClientReconnectTest.js | 62 +- test/ClusterServiceTest.js | 101 +- test/ConnectionManagerTest.js | 81 +- test/HazelcastClientTest.js | 49 +- test/LifecycleServiceTest.js | 74 +- test/ListenerServiceTest.js | 30 +- test/ListenersOnReconnectTest.js | 81 +- test/LoggingTest.js | 100 +- test/LostConnectionTest.js | 34 +- test/MembershipListenerTest.js | 67 +- test/RC.js | 23 +- test/RepetitionTaskTest.js | 23 +- test/Util.js | 33 +- .../config/ConfigBuilderHazelcastCloudTest.js | 49 + test/config/ConfigBuilderSSLTest.js | 47 + .../ConfigBuilderTest.js | 161 +- test/config/ConfigPatternMatcherTest.js | 88 + .../config/ResolvePathTest.js | 19 +- .../SchemaValidationTest.js | 18 +- test/config/configurations/cloud-enabled.json | 7 + .../configurations/full.json | 99 +- .../configurations/invalid-cloud.json | 3 +- .../configurations/invalid-ssl-disabled.json | 2 +- .../configurations/invalid-ssl-enabled.json | 2 +- .../configurations/invalid.json | 0 .../ssl-disabled-options-set.json | 3 +- .../ConfigBuilderHazelcastCloudTest.js | 65 - .../ConfigBuilderSSLTest.js | 74 - test/declarative_config/ConfigLocationTest.js | 83 - .../ConfigPatternMatcherTest.js | 77 - .../configurations/cloud-enabled.json | 8 - .../configurations/invalid-ssl-factory.json | 14 - .../configurations/near-cache.json | 15 - .../ssl-disabled-factory-set.json | 15 - test/discovery/HazelcastCloudConfigTest.js | 28 +- test/discovery/HazelcastCloudDiscoveryTest.js | 46 +- test/discovery/HazelcastCloudProviderTest.js | 34 +- .../flakeid/FlakeIdGeneratorOutOfRangeTest.js | 62 +- test/flakeid/FlakeIdGeneratorProxyTest.js | 79 +- .../HJVHazelcastJsonValueSerializerTest.js | 41 +- .../HJVJsonSerializerTest.js | 30 +- .../HazelcastJsonValueQueryTest.js | 38 +- .../HazelcastJsonValueTest.js | 7 +- test/heartbeat/HeartbeatFromClientTest.js | 50 +- test/heartbeat/HeartbeatFromServerTest.js | 113 +- test/integration/ClientLabelTest.js | 38 +- test/integration/ConnectionStrategyTest.js | 158 +- test/integration/DistributedObjectsTest.js | 22 +- .../InitialMembershipListenerTest.js | 44 +- test/javaclasses/CustomComparator.js | 8 +- test/javaclasses/IdentifiedFactory.js | 9 +- test/list/ListProxyTest.js | 124 +- test/map/MapAggregatorsDoubleTest.js | 81 +- test/map/MapAggregatorsIntTest.js | 59 +- test/map/MapAggregatorsLongTest.js | 56 +- test/map/MapEntryProcessorTest.js | 97 +- test/map/MapPartitionAwareTest.js | 58 +- test/map/MapPredicateTest.js | 117 +- test/map/MapProxyTest.js | 245 +- test/map/MapStoreTest.js | 51 +- test/map/NearCachedMapStressTest.js | 106 +- test/map/NearCachedMapTest.js | 75 +- test/multimap/MultiMapProxyListenersTest.js | 53 +- test/multimap/MultiMapProxyLockTest.js | 78 +- test/multimap/MultiMapProxyTest.js | 106 +- .../InvalidationMetadataDistortionTest.js | 91 +- test/nearcache/LostInvalidationsTest.js | 145 +- test/nearcache/MigratedDataTest.js | 125 +- .../NearCacheSimpleInvalidationTest.js | 78 +- test/nearcache/NearCacheTest.js | 153 +- test/nearcache/impl/RepairingTaskTest.js | 41 +- test/pncounter/PNCounterBasicTest.js | 46 +- test/pncounter/PNCounterConsistencyTest.js | 68 +- .../pncounter/PNCounterWithLiteMembersTest.js | 45 +- test/queue/QueueProxyTest.js | 75 +- test/remote_controller/Controller.js | 12 +- test/replicatedmap/ReplicatedMapProxyTest.js | 94 +- test/rest_value/RestValueTest.js | 15 +- test/ringbuffer/LazyReadResultSetTest.js | 22 +- test/ringbuffer/RingbufferTest.js | 45 +- test/serialization/APortable.js | 21 +- .../AnIdentifiedDataSerializable.js | 12 +- test/serialization/BinaryCompatibilityTest.js | 138 +- test/serialization/CustomSerializerTest.js | 62 +- .../DefaultSerializersLiveTest.js | 46 +- test/serialization/DefaultSerializersTest.js | 53 +- test/serialization/GlobalSerializerTest.js | 27 +- .../IdentifiedDataSerializableTest.js | 43 +- test/serialization/JsonSerializersTest.js | 49 +- test/serialization/ObjectDataTest.js | 24 +- .../PortableSerializationTest.js | 129 + .../PortableSerializersLiveTest.js | 59 +- test/serialization/PortableTest.js | 106 - test/serialization/ReferenceObjects.js | 50 +- .../serialization/SerializationServiceTest.js | 108 +- test/serialization/config/Address.js | 2 +- ...rTest.js => CustomSerializerConfigTest.js} | 53 +- test/serialization/config/FactoriesTest.js | 53 +- test/serialization/config/Foo.js | 3 +- test/serialization/config/Musician.js | 11 +- .../config/customserializer.json | 27 - .../portable/ClassDefinitionTest.js | 50 +- .../portable/NestedPortableVersionTest.js | 24 +- test/set/SetProxyTest.js | 78 +- test/ssl/BasicSSLOptionsFactoryTest.js | 27 +- test/ssl/ClientSSLAuthenticationTest.js | 163 +- test/ssl/ClientSSLTest.js | 76 +- test/statistics/StatisticsTest.js | 166 +- test/topic/TopicTest.js | 200 +- test/unit/AddressHelperTest.js | 1 - 213 files changed, 6724 insertions(+), 7247 deletions(-) create mode 100644 code_samples/identified_data_serializable.js delete mode 100644 src/config/JsonConfigLocator.ts delete mode 100644 src/config/ListenerConfig.ts create mode 100644 src/config/LoadBalancerConfig.ts create mode 100644 test/config/ConfigBuilderHazelcastCloudTest.js create mode 100644 test/config/ConfigBuilderSSLTest.js rename test/{declarative_config => config}/ConfigBuilderTest.js (59%) create mode 100644 test/config/ConfigPatternMatcherTest.js rename src/config/ImportConfig.ts => test/config/ResolvePathTest.js (57%) rename test/{declarative_config => config}/SchemaValidationTest.js (74%) create mode 100644 test/config/configurations/cloud-enabled.json rename test/{declarative_config => config}/configurations/full.json (59%) rename test/{declarative_config => config}/configurations/invalid-cloud.json (50%) rename test/{declarative_config => config}/configurations/invalid-ssl-disabled.json (76%) rename test/{declarative_config => config}/configurations/invalid-ssl-enabled.json (75%) rename test/{declarative_config => config}/configurations/invalid.json (100%) rename test/{declarative_config => config}/configurations/ssl-disabled-options-set.json (85%) delete mode 100644 test/declarative_config/ConfigBuilderHazelcastCloudTest.js delete mode 100644 test/declarative_config/ConfigBuilderSSLTest.js delete mode 100644 test/declarative_config/ConfigLocationTest.js delete mode 100644 test/declarative_config/ConfigPatternMatcherTest.js delete mode 100644 test/declarative_config/configurations/cloud-enabled.json delete mode 100644 test/declarative_config/configurations/invalid-ssl-factory.json delete mode 100644 test/declarative_config/configurations/near-cache.json delete mode 100644 test/declarative_config/configurations/ssl-disabled-factory-set.json create mode 100644 test/serialization/PortableSerializationTest.js delete mode 100644 test/serialization/PortableTest.js rename test/serialization/config/{CustomSerializerTest.js => CustomSerializerConfigTest.js} (51%) delete mode 100644 test/serialization/config/customserializer.json diff --git a/.gitignore b/.gitignore index 5a74a1f56..b002f5b2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ target/* .idea/* +.vscode/* node_modules/* *.iml diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 97b8deab8..406408537 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -223,8 +223,8 @@ npm install hazelcast-client --save ## 1.4. Basic Configuration -If you are using Hazelcast IMDG and Node.js Client on the same computer, generally the default configuration should be fine. This is great for -trying out the client. However, if you run the client on a different computer than any of the cluster members, you may +If you are using Hazelcast IMDG and Node.js Client on the same machine, generally the default configuration should be fine. This is great for +trying out the client. However, if you run the client on a different machine than any of the cluster members, you may need to do some simple configurations such as specifying the member addresses. The Hazelcast IMDG members and clients have their own configuration options. You may need to reflect some member side configurations on the client side to properly connect to the cluster. @@ -296,94 +296,55 @@ These configuration elements are enough for most connection scenarios. Now we wi ### 1.4.2. Configuring Hazelcast Node.js Client -There are two ways to configure a Hazelcast Node.js client: +To configure your Hazelcast Node.js client you need to create a config object and set the appropriate options. Then you can +supply this object to your client at the startup. The structure of the config object is similar to the `hazelcast.xml` configuration file used when configuring the member. It is done this way to make it easier to transfer Hazelcast skills to multiple platforms. -* Programmatically -* Declaratively (JSON) - -This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. See the [Configuration Overview section](#3-configuration-overview) -and the following sections for information about detailed network configurations and/or additional features of Hazelcast Node.js client configuration. - -An easy way to configure your Hazelcast Node.js client is to create a `ClientConfig` object and set the appropriate options. Then you can -supply this object to your client at the startup. This is the programmatic configuration approach. Another way to configure your client, which is the declarative approach, is to provide a `hazelcast-client.json` file. This is similar to the `hazelcast.xml` approach -in configuring the member. Note that `hazelcast-client.json` is a JSON file whereas the member configuration is XML based. Although these -two formats are different, you will realize that the names of configuration parameters are the same for both the client and member. -It is done this way to make it easier to transfer Hazelcast skills to multiple platforms. - -Once you embedded `hazelcast-client` to your Node.js project, you may follow any of programmatic or declarative configuration approaches. -We will provide both ways for each configuration option in this section. Pick one way and stick to it. - -**Programmatic Configuration:** +This section describes some network configuration settings to cover common use cases in connecting the client to a cluster. See the [Configuration Overview section](#3-configuration-overview) and the following sections for information about detailed network configurations and/or additional features of Hazelcast Node.js client configuration. You need to create a `ClientConfig` object and adjust its properties. Then you can pass this object to the client when starting it. ```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); -Client.newHazelcastClient(config).then(function(client) { - // Some operations -}); -``` - -**Declarative Configuration:** +const { Client } = require('hazelcast-client'); -Hazelcast Node.js client looks for a `hazelcast-client.json` in the current working directory unless you provide a configuration object -at the startup. If you intend to configure your client using a configuration file, then place a `hazelcast-client.json` in the directory -of your application's entry point. +// ... -If you prefer to keep your `hazelcast-client.json` file somewhere else, you can override the environment variable `HAZELCAST_CLIENT_CONFIG` -with the location of your config file. In this case, the client uses the configuration file specified in the environment variable. +const client = await Client.newHazelcastClient({ + clusterName: 'name of your cluster' +}); +// Some operations +``` -For the structure of `hazelcast-client.json`, see the [hazelcast-client-full.json file](hazelcast-client-full.json). You -can use only the relevant parts of the file in your `hazelcast-client.json` and remove the rest. The default configuration is used for any -part you do not explicitly set in the `hazelcast-client.json` file. +It's also possible to omit the config object in order to use the default settings. ---- +```javascript +const client = await Client.newHazelcastClient(); +// Some operations +``` -If you run the Hazelcast IMDG members in a different server than the client, you most probably have configured the members' ports and cluster -names as explained in the previous section. If you did, then you need to make certain changes to the network settings of your client. +If you run the Hazelcast IMDG members on a different server than the client, you most probably have configured the members' ports and cluster names as explained in the previous section. If you did, then you need to make certain changes to the network settings of your client. #### 1.4.2.1. Cluster Name Setting You need to provide the name of the cluster, if it is defined on the server side, to which you want the client to connect. -**Programmatic Configuration:** - ```javascript -let cfg = new Config.ClientConfig(); -cfg.clusterName = 'name of your cluster'; -``` - -**Declarative Configuration:** - -```json -{ - "clusterName": "name of your cluster" -} +const cfg = { + clusterName: 'name of your cluster' +}; ``` #### 1.4.2.2. Network Settings You need to provide the IP address and port of at least one member in your cluster, so the client can find it. -**Programmatic Configuration:** - ```javascript -let cfg = new Config.ClientConfig(); -cfg.networkConfig.addresses.push('some-ip-address:port'); -``` - -**Declarative Configuration:** - -```json -{ - "network": { - "clusterMembers": [ - "some-ip-address:port" +const cfg = { + networkConfig: { + clusterMembers: [ + 'some-ip-address:port' ] } -} +}; ``` ## 1.5. Basic Usage @@ -394,16 +355,24 @@ distributed map in the Node.js client. The following example first creates a programmatic configuration object. Then, it starts a client. ```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); // We create a config for illustrative purposes. - // We do not adjust this config. Therefore it has default settings. +const { Client } = require('hazelcast-client').Client; -Client.newHazelcastClient(config).then(function(client) { - console.log(client.getLocalEndpoint()); // Connects and prints some information about this client -}); +(async () => { + try { + // Connect to Hazelcast cluster + const client = await Client.newHazelcastClient(); + // Print some information about this client + console.log(client.getLocalEndpoint()); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); ``` +> **NOTE: For the sake of brevity we are going to omit boilerplate parts, like `require` or the root `async` function, in the later code snippets. Refer to the [Code Samples section](#16-code-samples) to see samples with the complete code.** + This should print logs about the cluster members and information about the client itself such as the client type, UUID and address. ``` @@ -411,27 +380,28 @@ This should print logs about the cluster members and information about the clien [DefaultLogger] INFO at LifecycleService: HazelcastClient is STARTED [DefaultLogger] INFO at ConnectionManager: Trying to connect to localhost:5701 [DefaultLogger] INFO at LifecycleService: HazelcastClient is CONNECTED -[DefaultLogger] INFO at ConnectionManager: Authenticated with server 192.168.1.10:5701:01bda57b-b987-448c-ac7f-6c0e4e8dd675, server version: 4.1-SNAPSHOT, local address: 127.0.0.1:54528 +[DefaultLogger] INFO at ConnectionManager: Authenticated with server 172.17.0.2:5701:255e4c83-cc19-445e-b7e1-9084ee423767, server version: 4.0.2, local address: 127.0.0.1:53988 [DefaultLogger] INFO at ClusterService: Members [1] { - Member [192.168.1.10]:5701 - 01bda57b-b987-448c-ac7f-6c0e4e8dd675 + Member [172.17.0.2]:5701 - 255e4c83-cc19-445e-b7e1-9084ee423767 } ClientInfo { type: 'NodeJS', - uuid: - UUID { - mostSignificant: Long { low: -798352083, high: 92336003, unsigned: false }, - leastSignificant: Long { low: -763619649, high: 328743032, unsigned: false } }, - localAddress: - Address { - host: '127.0.0.1', - port: 54528, - type: 4, - addrStr: '127.0.0.1:54528' }, + uuid: UUID { + mostSignificant: Long { low: 20157807, high: 1081410737, unsigned: false }, + leastSignificant: Long { low: 314555559, high: 1465580554, unsigned: false } + }, + localAddress: Address { + host: '127.0.0.1', + port: 53988, + type: 4, + addrStr: '127.0.0.1:53988' + }, labels: Set {}, - name: 'hz.client_0' } + name: 'hz.client_0' +} ``` Congratulations! You just started a Hazelcast Node.js client. @@ -440,32 +410,21 @@ Congratulations! You just started a Hazelcast Node.js client. Let's manipulate a distributed map on a cluster using the client. -Save the following file as `IT.js` and run it using `node IT.js`. - -**IT.js** -```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); - -Client.newHazelcastClient(config).then(function (client) { - var personnelMap; - return client.getMap('personnelMap').then(function (mp) { - personnelMap = mp; - return personnelMap.put('Alice', 'IT'); - }).then(function () { - return personnelMap.put('Bob', 'IT'); - }).then(function () { - return personnelMap.put('Clark', 'IT'); - }).then(function () { - console.log("Added IT personnel. Logging all known personnel"); - return personnelMap.entrySet(); - }).then(function (allPersonnel) { - allPersonnel.forEach(function (person) { - console.log(person[0] + ' is in ' + person[1] + ' department'); - }); - return client.shutdown(); - }); +Save the following file as `it.js` and run it using `node it.js`. + +**it.js** +```javascript +const client = await Client.newHazelcastClient(); + +const personnelMap = await client.getMap('personnelMap'); +await personnelMap.put('Alice', 'IT'); +await personnelMap.put('Bob', 'IT'); +await personnelMap.put('Clark', 'IT'); +console.log('Added IT personnel. Logging all known personnel'); + +const allPersonnel = await personnelMap.entrySet(); +allPersonnel.forEach(function (person) { + console.log(`${person[0]} is in ${person[1]} department`); }); ``` @@ -480,33 +439,22 @@ Bob is in IT department You see this example puts all the IT personnel into a cluster-wide `personnelMap` and then prints all the known personnel. -Now create a `Sales.js` file as shown below and run it using `node Sales.js`. +Now create a `sales.js` file as shown below and run it using `node sales.js`. **Sales.js** ```javascript -let Client = require('hazelcast-client').Client; -let Config = require('hazelcast-client').Config; -let config = new Config.ClientConfig(); - -Client.newHazelcastClient(config).then(function (client) { - var personnelMap; - return client.getMap('personnelMap').then(function (mp) { - personnelMap = mp; - return personnelMap.put('Denise', 'Sales'); - }).then(function () { - return personnelMap.put('Erwing', 'Sales'); - }).then(function () { - return personnelMap.put('Faith', 'Sales'); - }).then(function () { - console.log("Added Sales personnel. Logging all known personnel"); - return personnelMap.entrySet(); - }).then(function (allPersonnel) { - allPersonnel.forEach(function (person) { - console.log(person[0] + ' is in ' + person[1] + ' department'); - }); - return client.shutdown(); - }); +const client = await Client.newHazelcastClient(); + +const personnelMap = await client.getMap('personnelMap'); +await personnelMap.put('Denise', 'Sales'); +await personnelMap.put('Erwing', 'Sales'); +await personnelMap.put('Faith', 'Sales'); +console.log('Added Sales personnel. Logging all known personnel'); + +const allPersonnel = await personnelMap.entrySet(); +allPersonnel.forEach(function (person) { + console.log(`${person[0]} is in ${person[1]} department`); }); ``` @@ -531,6 +479,7 @@ See the Hazelcast Node.js [code samples](https://github.com/hazelcast/hazelcast- You can also see the Hazelcast Node.js [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/). + # 2. Features Hazelcast Node.js client supports the following data structures and features: @@ -576,150 +525,28 @@ Hazelcast Node.js client supports the following data structures and features: * Connection Strategy * Connection Retry + # 3. Configuration Overview -This chapter describes the options to configure your Node.js client and explains how you can import multiple configurations -and how you should set paths and exported names for the client to load objects. +This chapter describes the options to configure your Node.js client. ## 3.1. Configuration Options -You can configure the Hazelcast Node.js client declaratively (JSON) or programmatically (API). - -### 3.1.1. Programmatic Configuration - -For programmatic configuration of the Hazelcast Node.js client, just instantiate a `ClientConfig` object and configure the -desired aspects. An example is shown below. +For configuration of the Hazelcast Node.js client, just instantiate a config object and configure the desired aspects. An example is shown below. ```javascript -var Config = require('hazelcast-client').Config; -var cfg = new Config.ClientConfig(); -cfg.networkConfig.addresses.push('127.0.0.1:5701'); -HazelcastClient.newHazelcastClient(cfg).then(function (client) { - // Some operations -}); -``` - -See the `ClientConfig` class documentation at [Hazelcast Node.js Client API Docs](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs) for details. - -### 3.1.2. Declarative Configuration (JSON) - -If the client is not supplied with a programmatic configuration at the time of initialization, it will look for a configuration file named `hazelcast-client.json`. If this file exists, then the configuration is loaded from it. Otherwise, the client will start with the default configuration. The following are the places that the client looks for a `hazelcast-client.json` in the given order: - -1. Environment variable: The client first looks for the environment variable `HAZELCAST_CLIENT_CONFIG`. If it exists, -the client looks for the configuration file in the specified location. -2. Current working directory: If there is no environment variable set, the client tries to load `hazelcast-client.json` -from the current working directory. -3. Default configuration: If all of the above methods fail, the client starts with the default configuration. -The default configuration is programmatic. If you want to override the default configuration declaratively, you need to create -a `hazelcast-client.json` file in your working directory. To get an idea about the structure of this configuration file, see [hazelcast-client-default.json](hazelcast-client-default.json) and [hazelcast-client-full.json](hazelcast-client-full.json). - -Following is a sample JSON configuration file: - -```json -{ - "clusterName": "hzCluster", - "properties": { - "hazelcast.client.heartbeat.timeout": 10000, - "hazelcast.client.invocation.retry.pause.millis": 4000, - "hazelcast.client.invocation.timeout.millis": 180000, - "hazelcast.invalidation.reconciliation.interval.seconds": 50, - "hazelcast.invalidation.max.tolerated.miss.count": 15, - "hazelcast.invalidation.min.reconciliation.interval.seconds": 60 - }, - "network": { - "clusterMembers": [ - "127.0.0.1:5701" - ], - "smartRouting": true, - "connectionTimeout": 6000 - } -} -``` - -In the following chapters you will learn the description of all elements included in a JSON configuration file used to configure Hazelcast Node.js client. - -## 3.2. Importing Multiple Configurations - -You can compose the declarative configuration of your Node.js client from multiple declarative -configuration snippets. In order to compose a declarative configuration, you can use the `import` element to load -different declarative configuration files. - -Let's assume you have the following two configurations: - -`cluster-name-config.json`: - -```json -{ - "clusterName": "hzCluster" -} -``` - -`network-config.json`: - -```json -{ - "network": { - "clusterMembers": [ - "127.0.0.10:4001", - "127.0.0.11:4001" +const cfg = { + networkConfig: { + clusterMembers: [ + '127.0.0.1:5701' ] } -} -``` - -To get your example client configuration out of the above two, use the `import` element as -shown below. - -```json -{ - "import": [ - "cluster-name-config.json", - "network-config.json" - ] -} -``` - -> Note: Use `import` element on top level of JSON hierarchy. - -## 3.3. Loading Objects and Path Resolution - -For configuration elements that require you to specify a code piece, you will need to specify the path to the -code and name of the exported element that you want the client to use. This configuration is set as follows: - -```json -{ - "path": "path/to/file", - "exportedName": "MyObject" -} -``` - -In the above configuration, `path` shows the address to the file that you want the client to load. Unless this is an -absolute path, it is relative to the location of `hazelcast-config.json` file. - -In Javascript, you can define and export as many objects as you want in a single file. Above configuration element -is designed to load only one specified object from a file (`MyObject`). Therefore, `exportedName` specifies the name of desired object. - -Let's say your project's directory structure is as follows: - - my_app/ - my_app/index.js - my_app/factory_utils.js - my_app/hazelcast-client.json - my_app/node_modules/ - my_app/node_modules/hazelcast-client - -In the `factory_utils.js` file, you have multiple exported functions: - -```javascript -exports.utilityFunction = function() {...} -exports.MySSLFactory = function() {...} +}; +const client = await Client.newHazelcastClient(cfg); +// Some operations ``` -In order to load `MySSLFactory` in your SSL configuration, you should set `path` and `exportedName` as `factory_utils.js` -and `MySSLFactory`, respectively. - -If you have only one export as the default export from `factory_utils.js`, just skip the `exportedName` property and -the client will load the default export from the file. +In the following chapters you will learn the description of all options supported by Hazelcast Node.js client. # 4. Serialization @@ -735,7 +562,7 @@ Hazelcast serializes all your objects before sending them to the server. The `bo | string | String | | Long | Long | -> Note: A `number` type is serialized as `Double` by default. You can configure this behavior using the `SerializationConfig.defaultNumberType` method. +> **NOTE: A `number` type is serialized as `Double` by default. You can configure this behavior using the `serialization.defaultNumberType` config option.** Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for the Java server side, respectively. @@ -743,7 +570,7 @@ Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, When Hazelcast Node.js client serializes an object: -1. It first checks whether the object is null. +1. It first checks whether the object is `null`. 2. If the above check fails, then it checks if it is an instance of `IdentifiedDataSerializable`. @@ -757,89 +584,73 @@ When Hazelcast Node.js client serializes an object: 7. If the above check fails, then the Node.js client uses `JSON Serialization` by default. -However, `JSON Serialization` is not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization methods, such as [`IdentifiedDataSerializable` Serialization](#41-identifieddataserializable-serialization) and [`Portable` Serialization](#42-portable-serialization). +However, `JSON Serialization` may be not the best way of serialization in terms of performance and interoperability between the clients in different languages. If you want the serialization to work faster or you use the clients in different languages, Hazelcast offers its own native serialization methods, such as [`IdentifiedDataSerializable` Serialization](#41-identifieddataserializable-serialization) and [`Portable` Serialization](#42-portable-serialization). -Or, if you want to use your own serialization method, you can use a [Custom Serialization](#43-custom-serialization). +Or, if you want to use your own serialization method, you can use [Custom Serialization](#43-custom-serialization). -> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, - some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** +> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** ## 4.1. IdentifiedDataSerializable Serialization For a faster serialization of objects, Hazelcast recommends to implement the `IdentifiedDataSerializable` interface. The following is an example of an object implementing this interface: ```javascript -function Employee(id, name) { - this.id = id; - this.name = name; -} - -Employee.prototype.readData = function (input) { - this.id = input.readInt(); - this.name = input.readUTF(); -}; +class Employee { + constructor(id, name) { + this.id = id; + this.name = name; + } -Employee.prototype.writeData = function (output) { - output.writeInt(this.id); - output.writeUTF(this.name); -}; + readData(input) { + this.id = input.readInt(); + this.name = input.readUTF(); + } -Employee.prototype.getFactoryId = function () { - return 1000; -}; + writeData(output) { + output.writeInt(this.id); + output.writeUTF(this.name); + } -Employee.prototype.getClassId = function () { - return 100; -}; + getFactoryId() { + return 1000; + } -Employee.prototype.getClassId = function () { - return this.classId; -}; + getClassId() { + return 100; + } +} ``` -The `IdentifiedDataSerializable` interface uses `getClassId()` and `getFactoryId()` to reconstitute the object. To complete the implementation, `IdentifiedDataSerializableFactory` should also be implemented and registered into `SerializationConfig` which can be accessed from `Config.serializationConfig`. The factory's responsibility is to return an instance of the right `IdentifiedDataSerializable` object, given the `classId`. +> **NOTE: Refer to the following [API Documentation section](http://hazelcast.github.io/hazelcast-nodejs-client/api/4.0.0/docs/modules/_serialization_data_.html) to understand methods available on the `input`/`output` objects.** + +The `IdentifiedDataSerializable` interface uses `getClassId()` and `getFactoryId()` to reconstitute the object. To complete the implementation, `IdentifiedDataSerializableFactory` should also be implemented and put into the `serialization.dataSerializableFactories` config option. The factory's responsibility is to return an instance of the right `IdentifiedDataSerializable` object, given the `classId`. A sample `IdentifiedDataSerializableFactory` could be implemented as follows: ```javascript -function SampleDataSerializableFactory() { - // Constructor function -} - -SampleDataSerializableFactory.prototype.create = function (type) { - if (type === 100) { - return new Employee(); +class SampleDataSerializableFactory { + create(type) { + if (type === 100) { + return new Employee(); + } + return null; } - return null; -}; +} ``` -The last step is to register the `IdentifiedDataSerializableFactory` to the `SerializationConfig`. - -**Programmatic Configuration:** +The last step is to register the `IdentifiedDataSerializableFactory` in the config. ```javascript -var config = new Config.ClientConfig(); -config.serializationConfig.dataSerializableFactories[1000] = new SampleDataSerializableFactory(); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "dataSerializableFactories": [ - { - "path": "factory.js", - "exportedName": "SampleDataSerializableFactory", - "factoryId": 1000 - } - ] +const cfg = { + serialization: { + dataSerializableFactories: { + 1000: new SampleDataSerializableFactory() + } } -} +}; ``` -Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that the `Employee` object returns. +Note that the key used in the `serialization.dataSerializableFactories` option is the same as the `factoryId` that the `Employee` object returns. ## 4.2. Portable Serialization @@ -858,32 +669,34 @@ Also note that portable serialization is totally language independent and is use A sample portable implementation of a `Customer` class looks like the following: ```javascript -function Customer(name, id, lastOrder) { - this.name = name; - this.id = id; - this.lastOrder = lastOrder; - this.classId = 1; -} +class Customer { + constructor(name, id, lastOrder) { + this.name = name; + this.id = id; + this.lastOrder = lastOrder; + this.classId = 1; + } -Customer.prototype.readPortable = function (reader) { - this.name = reader.readUTF('name'); - this.id = reader.readInt('id'); - this.lastOrder = reader.readLong('lastOrder').toNumber(); -}; + readPortable(input) { + this.name = input.readUTF('name'); + this.id = input.readInt('id'); + this.lastOrder = input.readLong('lastOrder').toNumber(); + } -Customer.prototype.writePortable = function (writer) { - writer.writeUTF('name', this.name); - writer.writeInt('id', this.id); - writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); -}; + writePortable(output) { + output.writeUTF('name', this.name); + output.writeInt('id', this.id); + output.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); + } -Customer.prototype.getFactoryId = function () { - return PortableFactory.factoryId; -}; + getFactoryId() { + return PortableFactory.factoryId; + } -Customer.prototype.getClassId = function () { - return this.classId; -}; + getClassId() { + return this.classId; + } +} ``` Similar to `IdentifiedDataSerializable`, a `Portable` object must provide `classId` and `factoryId`. The factory object will be used to create the `Portable` object given the `classId`. @@ -891,45 +704,29 @@ Similar to `IdentifiedDataSerializable`, a `Portable` object must provide `class A sample `PortableFactory` could be implemented as follows: ```javascript -function PortableFactory() { - // Constructor function -} - -PortableFactory.prototype.create = function (classId) { - if (classId === 1) { - return new Customer(); +class PortableFactory { + create(classId) { + if (classId === 1) { + return new Customer(); + } + return null; } - return null; -}; +} ``` -The last step is to register the `PortableFactory` to the `SerializationConfig`. - -**Programmatic Configuration:** +The last step is to register the `PortableFactory` in the config. ```javascript -var config = new Config.ClientConfig(); -config.serializationConfig.portableFactories[1] = new PortableFactory(); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "portableFactories": [ - { - "path": "factory.js", - "exportedName": "PortableFactory", - "factoryId": 1 - } - ] +const cfg = { + serialization: { + portableFactories: { + 1: new PortableFactory() + } } -} +}; ``` -Note that the ID that is passed to the `SerializationConfig` is same as the `factoryId` that `Customer` object returns. - +Note that the ID that the key used in the `serialization.portableFactories` option is the same as the `factoryId` that the `Customer` object returns. ### 4.2.1. Versioning for Portable Serialization @@ -937,66 +734,67 @@ More than one version of the same class may need to be serialized and deserializ Portable serialization supports versioning. It is a global versioning, meaning that all portable classes that are serialized through a client get the globally configured portable version. -You can declare the version in the `hazelcast-client.json` configuration file using the `portableVersion` element, as shown below. +You can declare the version using the `serialization.portableVersion` option, as shown below. -```json -{ - "serialization": { - "portableVersion": 0 +```javascript +const cfg = { + serialization: { + portableVersion: 0 } } ``` -If you update the class by changing the type of one of the fields or by adding a new field, it is a good idea to upgrade the version of the class, rather than sticking to the global version specified in the `hazelcast-client.json` file. -In the Node.js client, you can achieve this by simply adding the `getVersion()` method to your class’s implementation of `Portable`, and setting the `ClassVersion` to be different than the default global version. +If you update the class by changing the type of one of the fields or by adding a new field, it is a good idea to upgrade the version of the class, rather than sticking to the global version specified in the configuration. In the Node.js client, you can achieve this by simply adding the `getVersion()` method to your class’s implementation of `Portable`, and setting the `ClassVersion` to be different than the default global version. > **NOTE: If you do not use the `getVersion()` method in your `Portable` implementation, it will have the global version, by default.** -Here is an example implementation of creating a version 2 for the Foo class: +Here is an example implementation of creating a version 2 for the `Foo` class: ```javascript -function Foo(foo, foo2) { - this.foo = foo; - this.foo2 = foo2; -} +class Foo { + constructor(foo, foo2) { + this.foo = foo; + this.foo2 = foo2; + } -Foo.prototype.getFactoryId = function () { - return 1; -}; + readPortable(input) { + this.foo = input.readUTF('foo'); + this.foo2 = input.readUTF('foo2'); + } -Foo.prototype.getClassId = function () { - return 1; -}; + writePortable(output) { + output.writeUTF('foo', this.foo); + output.writeUTF('foo2', this.foo2); + } -Foo.prototype.getVersion = function () { - return 2; -}; + getFactoryId() { + return 1; + } -Foo.prototype.readPortable = function (reader) { - this.foo = reader.readUTF('foo'); - this.foo2 = reader.readUTF('foo2'); -}; + getClassId() { + return 1; + } -Foo.prototype.writePortable = function (writer) { - writer.writeUTF('foo', this.foo); - writer.writeUTF('foo2', this.foo2); -}; + getVersion() { + return 2; + } +} ``` You should consider the following when you perform versioning: - It is important to change the version whenever an update is performed in the serialized fields of a class, for example by incrementing the version. -- If a client performs a Portable deserialization on a field and then that Portable is updated by removing that field on the cluster side, this may lead to problems such as a TypeError being thrown when an older version of the client tries to access the removed field. +- If a client performs a Portable deserialization on a field and then that `Portable` is updated by removing that field on the cluster side, this may lead to problems such as a `TypeError` being thrown when an older version of the client tries to access the removed field. - Portable serialization does not use reflection and hence, fields in the class and in the serialized content are not automatically mapped. Field renaming is a simpler process. Also, since the class ID is stored, renaming the Portable does not lead to problems. -- Types of fields need to be updated carefully. Hazelcast performs basic type upgradings, such as `int` to `float`. +- Types of fields need to be updated carefully. Hazelcast performs basic type upgrades, such as `int` to `float`. #### Example Portable Versioning Scenarios: Assume that a new client joins to the cluster with a class that has been modified and class's version has been upgraded due to this modification. -If you modified the class by adding a new field, the new client’s put operations include that new field. If this new client tries to get an object that was put from the older clients, it gets null for the newly added field. +If you modified the class by adding a new field, the new client’s put operations include that new field. If the new client tries to get an object that was put from the older clients, it gets `null` for the newly added field. -If you modified the class by removing a field, the old clients get null for the objects that are put by the new client. +If you modified the class by removing a field, the old clients get `null` for the objects that are put by the new client. If you modified the class by changing the type of a field to an incompatible type (such as from `int` to `String`), a `TypeError` is generated as the client tries accessing an object with the older version of the class. The same applies if a client with the old version tries to access a new version object. @@ -1009,68 +807,55 @@ Hazelcast lets you plug a custom serializer to be used for serialization of obje Let's say you have an object `CustomSerializable` and you would like to customize the serialization, since you may want to use an external serializer for only one object. ```javascript -function CustomSerializable(value) { - this.value = value; -} +class CustomSerializable { + constructor(value) { + this.value = value; + } -CustomSerializable.prototype.hzGetCustomId = function () { - return 10; -}; + hzGetCustomId() { + return 10; + } +} ``` -Let's say your custom `CustomSerializer` will serialize `CustomSerializable`. +Note that the `hzGetCustomId()` should return type id of the `CustomSerializable`. -```javascript -function CustomSerializer() { - // Constructor function -} +Now you need to implement acustom `CustomSerializer` which will will serialize `CustomSerializable`. -CustomSerializer.prototype.getId = function () { - return 10; -}; +```javascript +class CustomSerializer { + getId() { + return 10; + } -CustomSerializer.prototype.write = function (output, t) { - output.writeInt(t.value.length); - for (var i = 0; i < t.value.length; i++) { - output.writeInt(t.value.charCodeAt(i)); + read(input) { + const len = input.readInt(); + let str = ''; + for (let i = 0; i < len; i++) { + str = str + String.fromCharCode(input.readInt()); + } + return new CustomSerializable(str); } -}; -CustomSerializer.prototype.read = function (reader) { - var len = reader.readInt(); - var str = ''; - for (var i = 0; i < len; i++) { - str = str + String.fromCharCode(reader.readInt()); + write(output, obj) { + output.writeInt(obj.value.length); + for (let i = 0; i < obj.value.length; i++) { + output.writeInt(obj.value.charCodeAt(i)); + } } - return new CustomSerializable(str); -}; +} ``` Note that the serializer `id` must be unique as Hazelcast will use it to lookup the `CustomSerializer` while it deserializes the object. Now the last required step is to register the `CustomSerializer` to the configuration. -**Programmatic Configuration:** - ```javascript -var config = new Config.ClientConfig(); -config.serializationConfig.customSerializers.push(new CustomSerializer()); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "defaultNumberType": "integer", - "isBigEndian": false, - "serializers": [ - { - "path": "custom.js", - "exportedName": "CustomSerializer", - "typeId": 10 - } +const cfg ={ + serialization: { + customSerializers: [ + 10: new CustomSerializer() ] } -} +}; ``` From now on, Hazelcast will use `CustomSerializer` to serialize `CustomSerializable` objects. @@ -1089,21 +874,19 @@ By default, JSON serialization is used if the object is not `IdentifiedDataSeria A sample global serializer that integrates with a third party serializer is shown below. ```javascript -function GlobalSerializer() { - // Constructor function -} - -GlobalSerializer.prototype.getId = function () { - return 20; -}; +class GlobalSerializer { + getId() { + return 20; + } -GlobalSerializer.prototype.read = function (input) { - return MyFavoriteSerializer.deserialize(input.readByteArray()); -}; + read(input) { + return MyFavoriteSerializer.deserialize(input.readByteArray()); + } -GlobalSerializer.prototype.write = function (output, obj) { - output.writeByteArray(MyFavoriteSerializer.serialize(obj)) -}; + write(output, obj) { + output.writeByteArray(MyFavoriteSerializer.serialize(obj)); + } +} ``` You should register the global serializer in the configuration. @@ -1111,86 +894,51 @@ You should register the global serializer in the configuration. **Programmatic Configuration:** ```javascript -config.serializationConfig.globalSerializer = new GlobalSerializer(); -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "defaultNumberType": "integer", - "isBigEndian": false, - "globalSerializer": { - "path": "global_serializer.js", - "exportedName": "MyFavoriteSerializer" - } +const cfg = { + serialization: { + globalSerializer: new GlobalSerializer() } -} +}; ``` ## 4.5. JSON Serialization -If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization` by default. With `JSON Serialization`, objects -are converted to JSON strings and transmitted to the Hazelcast members as such. +If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization` by default. With `JSON Serialization`, objects are converted to JSON strings and transmitted to the Hazelcast members as such. -When the Hazelcast Node.js client retrieves a JSON serialized data from a member, it parses the JSON string and returns the object represented by that -string to the user. However, you may want to defer the string parsing and work with the raw JSON strings. +When the Hazelcast Node.js client retrieves a JSON serialized data from a member, it parses the JSON string and returns the object represented by that string to the user. However, you may want to defer the string parsing and work with the raw JSON strings. For this purpose, you can configure your client to return `HazelcastJsonValue` objects when it retrieves a JSON serialized data from a member. -`HazelcastJsonValue` is a lightweight wrapper around the JSON strings. You may get the JSON string representation of the object using the `toString` method. +`HazelcastJsonValue` is a lightweight wrapper around the raw JSON strings. You may get the JSON string representation of the object using the `toString()` method. Below is the configuration required to return `HazelcastJsonValue` objects instead of JavaScript objects. **Programmatic Configuration:** ```javascript -config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; -``` - -**Declarative Configuration:** - -```json -{ - "serialization": { - "jsonStringDeserializationPolicy": "no_deserialization" +const cfg = { + serialization: { + jsonStringDeserializationPolicy = 'NO_DESERIALIZATION' } -} +}; ``` -# 5. Setting Up Client Network -All network related configuration of Hazelcast Node.js client is performed via the `network` element in the declarative configuration file, or in the object `ClientNetworkConfig` when using programmatic configuration. Let's first give the examples for these two approaches. Then we will look at its sub-elements and attributes. - -**Declarative Configuration:** - -Here is an example of configuring the network for Node.js Client declaratively. - -```json -{ - "network": { - "clusterMembers": [ - "10.1.1.21", - "10.1.1.22:5703" - ], - "smartRouting": true, - "redoOperation": true, - "connectionTimeout": 6000 - } -} -``` +# 5. Setting Up Client Network -**Programmatic Configuration:** +Main parts of network related configuration for Hazelcast Node.js client may be tuned via the `network` configuration option. -Here is an example of configuring the network for Node.js Client programmatically. +Here is an example of configuring the network for Hazelcast Node.js client. ```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); -clientConfig.networkConfig.smartRouting = true; -clientConfig.networkConfig.redoOperation = true; -clientConfig.networkConfig.connectionTimeout = 6000; +const cfg = { + network: { + clusterMembers: ['10.1.1.21', '10.1.1.22:5703'], + smartRouting: true, + redoOperation: true, + connectionTimeout: 6000 + } +}; ``` ## 5.1. Providing Member Addresses @@ -1199,52 +947,31 @@ Address list is the initial list of cluster addresses which the client will conn list to find an alive member. Although it may be enough to give only one address of a member in the cluster (since all members communicate with each other), it is recommended that you give the addresses for all the members. -**Declarative Configuration:** - -```json -{ - "network": { - "clusterMembers": [ +```javascript +const cfg = { + network: { + clusterMembers: [ "10.1.1.21", "10.1.1.22:5703" ] } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.addresses.push('10.1.1.21', '10.1.1.22:5703'); +}; ``` -If the port part is omitted, then 5701, 5702 and 5703 will be tried in a random order. +If the port part is omitted, then `5701`, `5702` and `5703` ports will be tried in a random order. You can specify multiple addresses with or without the port information as seen above. The provided list is shuffled and tried in a random order. Its default value is `localhost`. ## 5.2. Setting Smart Routing -Smart routing defines whether the client mode is smart or unisocket. See the [Node.js Client Operation Modes section](#72-nodejs-client-operation-modes) -for the description of smart and unisocket modes. - -The following are example configurations. - -**Declarative Configuration:** - -```json -{ - "network": { - "smartRouting": true - } -} -``` - -**Programmatic Configuration:** +Smart routing defines whether the client mode is smart or unisocket. See the [Node.js Client Operation Modes section](#72-nodejs-client-operation-modes) for the description of smart and unisocket modes. ```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.smartRouting = true; +const cfg = { + network: { + smartRouting: true + } +}; ``` Its default value is `true` (smart client mode). @@ -1253,21 +980,12 @@ Its default value is `true` (smart client mode). It enables/disables redo-able operations. While sending the requests to the related members, the operations can fail due to various reasons. Read-only operations are retried by default. If you want to enable retry for the other operations, you can set the `redoOperation` to `true`. -**Declarative Configuration:** - -```json -{ - "network": { - "redoOperation": true - } -} -``` - -**Programmatic Configuration:** - ```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.redoOperation = true; +const cfg = { + network: { + redoOperation: true + } +}; ``` Its default value is `false` (disabled). @@ -1276,23 +994,12 @@ Its default value is `false` (disabled). Connection timeout is the timeout value in milliseconds for the members to accept the client connection requests. -The following are the example configurations. - -**Declarative Configuration:** - -```json -{ - "network": { - "connectionTimeout": 6000 - } -} -``` - -**Programmatic Configuration:** - ```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.networkConfig.connectionTimeout = 6000; +const cfg = { + network: { + connectionTimeout: 6000 + } +}; ``` Its default value is `5000` milliseconds. @@ -1306,47 +1013,28 @@ As explained in the [TLS/SSL section](#81-tlsssl), Hazelcast members have key st ## 5.6. Enabling Hazelcast Cloud Discovery -The purpose of [Hazelcast Cloud](https://cloud.hazelcast.com/) Discovery is to provide the clients to use IP addresses provided by Hazelcast orchestrator. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` field and set the `enabled` field to `true`. - -The following are example configurations. - -**Declarative Configuration:** +The purpose of [Hazelcast Cloud](https://cloud.hazelcast.com/) Discovery is to provide the clients to use IP addresses provided by Hazelcast orchestrator. To enable Hazelcast Cloud Discovery, specify a token for the `discoveryToken` option. -```json -{ - "clusterName": "hzCluster", - "network": { - "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN", - "enabled": true +```javascript +const cfg = { + clusterName: 'hzCluster', + network: { + hazelcastCloud: { + discoveryToken: 'EXAMPLE_TOKEN' } } -} -``` - -**Programmatic Configuration:** - -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.clusterName = 'hzCluster'; - -clientConfig.networkConfig.cloudConfig.enabled = true; -clientConfig.networkConfig.cloudConfig.discoveryToken = 'EXAMPLE_TOKEN'; +}; ``` To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. + # 6. Client Connection Strategy Node.js client can be configured to connect to a cluster in an async manner during the client start and reconnecting after a cluster disconnect. Both of these options are configured via `ClientConnectionStrategyConfig`. -You can configure the client’s starting mode as async or sync using the configuration element `asyncStart`. -When it is set to `true` (async), the behavior of `Client.newHazelcastClient()` call changes. -It resolves a client instance without waiting to establish a cluster connection. In this case, the client rejects -any network dependent operation with `ClientOfflineError` immediately until it connects to the cluster. If it is `false`, -the call is not resolved and the client is not created until a connection with the cluster is established. -Its default value is `false` (sync). +You can configure the client’s starting mode as async or sync using the configuration element `asyncStart`. When it is set to `true` (async), the behavior of `Client.newHazelcastClient()` call changes. It resolves a client instance without waiting to establish a cluster connection. In this case, the client rejects any network dependent operation with `ClientOfflineError` immediately until it connects to the cluster. If it is `false`, the call is not resolved and the client is not created until a connection with the cluster is established. Its default value is `false` (sync). You can also configure how the client reconnects to the cluster after a disconnection. This is configured using the configuration element `reconnectMode`; it has three options: @@ -1357,66 +1045,35 @@ configuration element `reconnectMode`; it has three options: Its default value is `ON`. -The example declarative and programmatic configurations below show how to configure a Node.js client’s starting and reconnecting modes. - -**Declarative Configuration:** - -```json -{ - "connectionStrategy": { - "asyncStart": false, - "reconnectMode": "ON" - } -} -``` - -**Programmatic Configuration:** +The example configuration below show how to configure a Node.js client’s starting and reconnecting modes. ```javascript -var clientConfig = new Config.ClientConfig(); - -clientConfig.connectionStrategyConfig.asyncStart = false; -clientConfig.connectionStrategyConfig.reconnectMode = Config.ReconnectMode.ON; +const cfg = { + connectionStrategy: { + asyncStart: false, + reconnectMode: 'ON' + } +}; ``` ## 6.1. Configuring Client Connection Retry -When client is disconnected from the cluster, it searches for new connections to reconnect. -You can configure the frequency of the reconnection attempts and client shutdown behavior using -`ConnectionRetryConfig` (programmatical approach) or `connectionRetry` element (declarative approach). - -Below are the example configurations for each. - -**Declarative Configuration:** - -```json -{ - "connectionStrategy": { - "asyncStart": false, - "reconnectMode": "ON", - "connectionRetry": { - "initialBackoffMillis": 1000, - "maxBackoffMillis": 60000, - "multiplier": 2, - "clusterConnectTimeoutMillis": 50000, - "jitter": 0.2 - } - } -} -``` - -**Programmatic Configuration:** +When the client is disconnected from the cluster, it searches for new connections to reconnect. You can configure the frequency of the reconnection attempts and client shutdown behavior using the `connectionStrategy.connectionRetry` configuration option. ```javascript -var clientConfig = new Config.ClientConfig(); -var connectionRetryConfig = new Config.ConnectionRetryConfig(); -connectionRetryConfig.initialBackoffMillis = 1000; -connectionRetryConfig.maxBackoffMillis = 60000; -connectionRetryConfig.multiplier = 2; -connectionRetryConfig.clusterConnectTimeoutMillis = 50000; -connectionRetryConfig.jitter = 0.2; - -clientConfig.connectionStrategyConfig.connectionRetryConfig = connectionRetryConfig; +const cfg = { + connectionStrategy: { + asyncStart: false, + reconnectMode: 'ON', + connectionRetry: { + initialBackoffMillis: 1000, + maxBackoffMillis: 60000, + multiplier: 2, + clusterConnectTimeoutMillis: 50000, + jitter: 0.2 + } + } +}; ``` The following are configuration element descriptions: @@ -1441,8 +1098,8 @@ while (tryConnect(connectionTimeout)) != SUCCESS) { } ``` -Note that, `tryConnect` above tries to connect to any member that the client knows, and for each connection we -have a connection timeout; see the [Setting Connection Timeout](#54-setting-connection-timeout) section. +Note that, `tryConnect` above tries to connect to any member that the client knows, and for each connection we have a connection timeout; see the [Setting Connection Timeout](#54-setting-connection-timeout) section. + # 7. Using Node.js Client with Hazelcast IMDG @@ -1450,28 +1107,24 @@ This chapter provides information on how you can use Hazelcast IMDG's data struc ## 7.1. Node.js Client API Overview -Most of the functions in the API return Promises. Therefore, you need to be familiar with the concept of -promises to use the Node.js client. If not, you can learn about them using various online resources. -Also, you can use `async/await`. +Most of the functions in the API return Promises. Therefore, you need to be familiar with the concept of promises to use the Node.js client. If not, you can learn about them using various online resources. Also, you can use async/await. If you are ready to go, let's start to use Hazelcast Node.js client. -The first step is the configuration. You can configure the Node.js client declaratively or programmatically. We will use the programmatic approach throughout this chapter. See the [Programmatic Configuration section](#311-programmatic-configuration) for details. +The first step is the configuration. See the [Programmatic Configuration section](#311-programmatic-configuration) for details. The following is an example on how to create a `ClientConfig` object and configure it programmatically: -```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.clusterName = 'dev'; -clientConfig.networkConfig.addresses.push('10.90.0.1', '10.90.0.2:5702'); -``` - -The second step is initializing the `HazelcastClient` to be connected to the cluster: +The fist step is to define configuration and initialize the `HazelcastClient` to be connected to the cluster: ```javascript -Client.newHazelcastClient(clientConfig).then(function (client) { - // Some operation +const client = await Client.newHazelcastClient({ + clusterName: 'dev', + network: { + clusterMembers: ['10.90.0.1', '10.90.0.2:5702'] + } }); +// Some operation ``` This client object is your gateway to access all the Hazelcast distributed objects. @@ -1479,63 +1132,41 @@ This client object is your gateway to access all the Hazelcast distributed objec Let's create a map and populate it with some data, as shown below. ```javascript -var map; -// Get the Distributed Map from Cluster -client.getMap('my-distributed-map').then(function (mp) { - map = mp; - // Standard Put and Get - return map.put('key', 'value'); -}).then(function () { - return map.get('key'); -}).then(function (val) { - // Concurrent Map methods, optimistic updating - return map.putIfAbsent('somekey', 'somevalue'); -}).then(function () { - return map.replace('key', 'value', 'newvalue'); -}); +// Get a Map called 'my-distributed-map' +const map = await client.getMap('my-distributed-map'); +// Write and read some data +await map.put('key', 'value'); +const val = await map.get('key'); ``` As the final step, if you are done with your client, you can shut it down as shown below. This will release all the used resources and close connections to the cluster. ```javascript ... -.then(function () { - client.shutdown(); -}); +client.shutdown(); ``` ## 7.2. Node.js Client Operation Modes -The client has two operation modes because of the distributed nature of the data and cluster: smart and unisocket. -Refer to the [Setting Smart Routing](#52-setting-smart-routing) section to see how to configure the client for -different operation modes. +The client has two operation modes because of the distributed nature of the data and cluster: smart and unisocket. Refer to the [Setting Smart Routing](#52-setting-smart-routing) section to see how to configure the client for different operation modes. ### 7.2.1. Smart Client -In the smart mode, the clients connect to each cluster member. Since each data partition uses the well-known and -consistent hashing algorithm, each client can send an operation to the relevant cluster member, -which increases the overall throughput and efficiency. Smart mode is the default mode. +In the smart mode, the clients connect to each cluster member. Since each data partition uses the well-known and consistent hashing algorithm, each client can send an operation to the relevant cluster member, which increases the overall throughput and efficiency. Smart mode is the default mode. ### 7.2.2. Unisocket Client -For some cases, the clients can be required to connect to a single member instead of each member in the cluster. -Firewalls, security or some custom networking issues can be the reason for these cases. +For some cases, the clients can be required to connect to a single member instead of each member in the cluster. Firewalls, security or some custom networking issues can be the reason for these cases. -In the unisocket client mode, the client will only connect to one of the configured addresses. -This single member will behave as a gateway to the other members. -For any operation requested from the client, it will redirect the request to the relevant member and return the -response back to the client connected to this member. +In the unisocket client mode, the client will only connect to one of the configured addresses. This single member will behave as a gateway to the other members. For any operation requested from the client, it will redirect the request to the relevant member and return the response back to the client connected to this member. ## 7.3. Handling Failures -There are two main failure cases you should be aware of. Below sections explain these, -and the configuration options you can use to achieve proper behavior. +There are two main failure cases you should be aware of. Below sections explain these, and the configuration options you can use to achieve proper behavior. ### 7.3.1. Handling Client Connection Failure -While the client is trying to connect initially to one of the members in the `ClientNetworkConfig.addressList`, all the members might not be available. -Instead of giving up, throwing an error and stopping the client, the client retries to connect as configured. -This behavior is described in the [Configuring Client Connection Retry](#61-configuring-client-connection-retry) section. +While the client is trying to connect initially to one of the members for the `network.addresses` array, all the members might not be available. Instead of giving up, throwing an error and stopping the client, the client retries to connect as configured. This behavior is described in the [Configuring Client Connection Retry](#61-configuring-client-connection-retry) section. The client executes each operation through the already established connection to the cluster. If this connection(s) disconnects or drops, the client will try to reconnect as configured. @@ -1543,7 +1174,7 @@ The client executes each operation through the already established connection to While sending requests to cluster members, the operations may fail due to various reasons. Read-only operations are retried by default. If you want to enable retrying for non-read-only operations, you can set the `redoOperation` to `true`. See the [Enabling Redo Operation section](#53-enabling-redo-operation). -You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in `ClientConfig.properties`. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: +You can set a timeout for retrying the operations sent to a member. This can be provided by using the property `hazelcast.client.invocation.timeout.seconds` in the `properties` option. The client will retry an operation within this given period, of course, if it is a read-only operation or you enabled the `redoOperation` as stated in the above paragraph. This timeout value is important when there is a failure resulted by either of the following causes: * Member throws an exception. * Connection between the client and member is closed. @@ -1562,20 +1193,14 @@ Hazelcast Map (`IMap`) is a distributed map. Through the Node.js client, you can A Map usage example is shown below. ```javascript -var map; -// Get the Distributed Map from Cluster -hz.getMap('my-distributed-map').then(function (mp) { - map = mp; - // Standard Put and Get - return map.put('key', 'value'); -}).then(function () { - return map.get('key'); -}).then(function (val) { - // Concurrent Map methods, optimistic updating - return map.putIfAbsent('somekey', 'somevalue'); -}).then(function () { - return map.replace('key', 'value', 'newvalue'); -}); +// Get a Map called 'my-distributed-map' +const map = await client.getMap('my-distributed-map'); +// Run Put and Get operations +await map.put('key', 'value'); +const val = await map.get('key'); +// Run concurrent Map operations (optimistic updates) +await map.putIfAbsent('somekey', 'somevalue'); +await map.replace('key', 'value', 'newvalue'); ``` Hazelcast Map supports a Near Cache for remotely stored entries to increase the performance of read operations. See the [Near Cache section](#782-near-cache) for a detailed explanation of the Near Cache feature and its configuration. @@ -1589,26 +1214,19 @@ Hazelcast `MultiMap` is a distributed and specialized map where you can store mu A MultiMap usage example is shown below. ```javascript -var multiMap; -// Get the Distributed MultiMap from Cluster -hz.getMultiMap('my-distributed-multimap').then(function (mmp) { - multiMap = mmp; - // Put values in the map against the same key - return multiMap.put('my-key', 'value1'); -}).then(function () { - return multiMap.put('my-key', 'value2'); -}).then(function () { - return multiMap.put('my-key', 'value3'); -}).then(function () { - // Print out all the values for associated with key called "my-key" - return multiMap.get('my-key') -}).then(function (values) { - for (value of values) { - console.log(value); - } - // Remove specific key/value pair - return multiMap.remove('my-key', 'value2'); -}); +// Get a MultiMap called 'my-distributed-multimap' +const multiMap = await client.getMultiMap('my-distributed-multimap'); +// Put values in the map against the same key +await multiMap.put('my-key', 'value1'); +await multiMap.put('my-key', 'value2'); +await multiMap.put('my-key', 'value3'); +// Read and print out all the values for associated with key called 'my-key' +const values = await multiMap.get('my-key') +for (value of values) { + console.log(value); +} +// Remove specific key/value pair +await multiMap.remove('my-key', 'value2'); ``` Hazelcast MultiMap uses `EntryListener` to listen to the events that occur when the entries are added to or removed from the MultiMap. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. @@ -1620,20 +1238,16 @@ Hazelcast `ReplicatedMap` is a distributed key-value data structure where the da A Replicated Map usage example is shown below. ```javascript -var map; -// Get a Replicated Map called "my-replicated-map" -hz.getReplicatedMap('my-replicated-map').then(function (rmp) { - map = rmp; - // Put and Get a value from the Replicated Map - // Key/value replicated to all members - return map.put('key', 'value'); -}).then(function (replacedValue) { - console.log('replaced value = ' + replacedValue); // Will be null as its first update - return map.get('key'); -}).then(function (value) { - // The value is retrieved from a random member in the cluster - console.log('value for key = ' + value); -}); +// Get a ReplicatedMap called 'my-replicated-map' +const map = await client.getReplicatedMap('my-replicated-map'); +// Put and get a value from the Replicated Map +// (key/value is replicated to all members) +const replacedValue = await map.put('key', 'value'); +// Will print 'replaced value = null' as it's the first update +console.log('replaced value = ' + replacedValue); +const value = map.get('key'); +// The value is retrieved from a random member in the cluster +console.log('value = ' + value); ``` Hazelcast Replicated Map uses `EntryListener` to listen to the events that occur when the entries are added to, updated in or evicted/removed from the Replicated Map. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. @@ -1645,28 +1259,19 @@ Hazelcast Queue (`IQueue`) is a distributed queue which enables all cluster memb A Queue usage example is shown below. ```javascript -var queue; -// Get a Blocking Queue called "my-distributed-queue" -hz.getQueue('my-distributed-queue').then(function (q) { - queue = q; - // Offer a String into the Distributed Queue - return queue.offer('item'); -}).then(function () { - // Poll the Distributed Queue and return the String - return queue.poll(); -}).then(function () { - // Timed blocking Operations - return queue.offer('anotheritem', 500); -}).then(function () { - return queue.poll(5000); -}).then(function () { - // Indefinitely blocking Operations - return queue.put('yetanotheritem'); -}).then(function () { - return queue.take(); -}).then(function (value) { - console.log(value); -}); +// Get a Queue called 'my-distributed-queue' +const queue = await client.getQueue('my-distributed-queue'); +// Offer a string into the Queue +await queue.offer('item'); +// Poll the Queue and return the string +let item = queue.poll(); +// Timed-restricted operations +await queue.offer('anotheritem', 500); +await queue.poll(5000); +// Indefinitely-waiting operations +await queue.put('yetanotheritem'); +const value = queue.take(); +console.log(value); ``` Hazelcast Queue uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Queue. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. @@ -1678,28 +1283,18 @@ Hazelcast Set (`ISet`) is a distributed set which does not allow duplicate eleme A Set usage example is shown below. ```javascript -var set; -// Get the Distributed Set from Cluster -hz.getSet('my-distributed-set').then(function (s) { - set = s; - // Add items to the set with duplicates - return set.add('item1'); -}).then(function () { - return set.add('item1'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item2'); -}).then(function () { - return set.add('item3'); -}).then(function () { - // Get the items. Note that there are no duplicates - return set.toArray(); -}).then(function (values) { - console.log(values); -}); +// Get a Set called 'my-distributed-set' +const set = await client.getSet('my-distributed-set'); +// Add items to the Set with duplicates +await set.add('item1'); +await set.add('item1'); +await set.add('item2'); +await set.add('item2'); +await set.add('item2'); +await set.add('item3'); +// Get the items. Note that there are no duplicates +const values = await set.toArray(); +console.log(values); ``` Hazelcast Set uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Set. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. @@ -1711,26 +1306,19 @@ Hazelcast List (`IList`) is a distributed list which allows duplicate elements a A List usage example is shown below. ```javascript -var list; -// Get the Distributed List from Cluster -hz.getList('my-distributed-list').then(function (l) { - list = l; - // Add elements to the list - return list.add('item1'); -}).then(function () { - return list.add('item2'); -}).then(function () { - //Remove the first element - return list.removeAt(0); -}).then(function (value) { - console.log(value); - // There is only one element left - return list.size(); -}).then(function (len) { - console.log(len); - // Clear the list - return list.clear(); -}); +// Get a List called 'my-distributed-list' +const list = await client.getList('my-distributed-list'); +// Add elements to the list +await list.add('item1'); +await list.add('item2'); +// Remove the first element +const value = await list.removeAt(0); +console.log(value); +// There is only one element left +const len = await list.size(); +console.log(len); +// Clear the list +await list.clear(); ``` Hazelcast List uses `ItemListener` to listen to the events that occur when the items are added to or removed from the List. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. @@ -1742,25 +1330,18 @@ Hazelcast `Ringbuffer` is a replicated but not partitioned data structure that s A Ringbuffer usage example is shown below. ```javascript -var rb; -// Get a Ringbuffer called "rb" -hz.getRingbuffer('rb').then(function (buffer) { - rb = buffer; - return rb.add(100); -}).then(function () { - return rb.add(200); -}).then(function (value) { - // We start from the oldest item. - // If you want to start from the next item, call rb.tailSequence()+1 - return rb.headSequence(); -}).then(function (sequence) { - return rb.readOne(sequence).then(function (value) { - console.log(value); - return rb.readOne(sequence.add(1)); - }).then(function (value) { - console.log(value); - }); -}); +// Get a Ringbuffer called 'my-distributed-ringbuffer' +const rb = await client.getRingbuffer('my-distributed-ringbuffer'); +// Add some elements to the Ringbuffer +await rb.add(100); +await rb.add(200); +// We start from the oldest item. +// If you want to start from the next item, call rb.tailSequence()+1 +const sequence = await rb.headSequence(); +let value = await rb.readOne(sequence); +console.log(value); +value = await rb.readOne(sequence.add(1)); +console.log(value); ``` ### 7.4.8. Using Reliable Topic @@ -1770,17 +1351,14 @@ Hazelcast `ReliableTopic` is a distributed topic implementation backed up by the A Reliable Topic usage example is shown below. ```javascript -var topic; -// Get a Topic called "my-distributed-topic" -hz.getReliableTopic('my-distributed-topic').then(function (t) { - topic = t; - // Add a Listener to the Topic - topic.addMessageListener(function (message) { - console.log(message); - }); - // Publish a message to the Topic - return topic.publish('Hello to distributed world'); +// Get a Topic called 'my-distributed-topic' +const topic = await client.getReliableTopic('my-distributed-topic'); +// Add a Listener to the Topic +topic.addMessageListener((message) => { + console.log(message); }); +// Publish a message to the Topic +await topic.publish('Hello to the distributed world!'); ``` Hazelcast Reliable Topic uses `MessageListener` to listen to the events that occur when a message is received. See the [Message Listener section](#7524-message-listener) for information on how to create a message listener object and register it. @@ -1789,36 +1367,20 @@ Hazelcast Reliable Topic uses `MessageListener` to listen to the events that occ You may configure `ReliableTopic`s as the following: -**Declarative Configuration:** - -```json -{ - "reliableTopics": [ - { - "name": "rt1", - "readBatchSize": 35, - "overloadPolicy": "discard_newest" - } - ] -} -``` - -**Programmatic Configuration:** - ```javascript -var config = new Config.ClientConfig(); - -var reliableTopicConfig = new Config.ReliableTopicConfig(); -reliableTopicConfig.name = 'rt1'; -reliableTopicConfig.readBatchSize = 35; -reliableTopicConfig.overloadPolicy = Config.TopicOverloadPolicy.DISCARD_NEWEST; - -config.reliableTopicConfigs['rt1'] = reliableTopicConfig; +const cfg = { + reliableTopics: { + 'rt1': { + readBatchSize: 35, + overloadPolicy: 'DISCARD_NEWEST' + } + } +}; ``` The following are the descriptions of configuration elements and attributes: -* `name`: Name of your Reliable Topic. +* key (`rt1` in the above example): Name of your Reliable Topic. * `readBatchSize`: Minimum number of messages that Reliable Topic tries to read in batches. Its default value is `10`. * `overloadPolicy`: Policy to handle an overloaded topic. Available values are `DISCARD_OLDEST`, `DISCARD_NEWEST`, `BLOCK` and `ERROR`. Its default value is `BLOCK`. See [Slow Consumers](https://docs.hazelcast.org/docs/latest/manual/html-single/#slow-consumers) for definitions of these policies. @@ -1829,25 +1391,23 @@ Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative co A PN Counter usage example is shown below. ```javascript -var pnCounter; -hz.getPNCounter('myPNCounter').then(function (counter) { - pnCounter = counter; - return pnCounter.get(); -}).then(function (value) { - console.log('Counter started with value ' + value); // 0 - return pnCounter.addAndGet(5); -}).then(function (value) { - console.log('Value after operation is ' + value); // 5 - return pnCounter.getAndAdd(2); -}).then(function (value) { - console.log('Value before operation was ' + value); // 5 - return pnCounter.get(); -}).then(function (value) { - console.log('New value is ' + value); // 7 - return pnCounter.decrementAndGet(); -}).then(function (value) { - console.log('Decremented counter by one. New value is ' + value); // 6 -}); +// Get a Topic called 'my-pn-counter' +const pnCounter = await client.getPNCounter('my-pn-counter'); +// Get the current value +let value = await pnCounter.get(); +console.log('Counter started with value ' + value); // 0 + +// Increment and get +value = await pnCounter.addAndGet(5); +console.log('Value after operation is ' + value); // 5 +// Get and increment +value = await pnCounter.getAndAdd(2); +console.log('Value before operation was ' + value); // 5 + +value = await pnCounter.get(); +console.log('New value is ' + value); // 7 +value = await pnCounter.decrementAndGet(); +console.log('Decremented counter by one. New value is ' + value); // 6 ``` ### 7.4.10. Using Flake ID Generator @@ -1857,61 +1417,40 @@ Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers A Flake ID Generator usage example is shown below. ```javascript -var flakeIdGenerator; -hz.getFlakeIdGenerator('myFlakeIdGenerator').then(function (gen) { - flakeIdGenerator = gen; - return flakeIdGenerator.newId(); -}).then(function (value) { - console.log('New id: ' + value.toString()); -}); +// Get a Topic called 'my-flake-id-generator' +const flakeIdGenerator = await client.getFlakeIdGenerator('my-flake-id-generator'); +// Generate an id +const id = flakeIdGenerator.newId(); +console.log('New id: ' + id.toString()); ``` #### 7.4.10.1 Configuring Flake ID Generator You may configure `FlakeIdGenerator`s as the following: -**Declarative Configuration:** - -```json -{ - "flakeIdGeneratorConfigs": [ - { - "name": "flakeidgenerator", - "prefetchCount": 123, - "prefetchValidityMillis": 150000 - } - ] -} -``` -> Note: Since Javascript cannot represent numbers greater than 2^53, you need to put long numbers in quotes as a string. - -**Programmatic Configuration:** - ```javascript -var config = new Config.ClientConfig(); -var flakeIdGeneratorConfig = new Config.FlakeIdGeneratorConfig(); -flakeIdGeneratorConfig.name = 'flakeidgenerator'; -flakeIdGeneratorConfig.prefetchCount = 123; -flakeIdGeneratorConfig.prefetchValidityMillis = 150000; - -config.flakeIdGeneratorConfigs['flakeidgenerator'] = flakeIdGeneratorConfig; +const cfg = { + flakeIdGenerators: { + 'flakeidgenerator': { + prefetchCount: 123, + prefetchValidityMillis: 150000 + } + } +}; ``` +> **NOTE: Since JavaScript's `number` type cannot represent numbers greater than `2^53` without precision loss, you need to put long numbers in quotes as a string.** The following are the descriptions of configuration elements and attributes: -* `name`: Name of your Flake ID Generator. +* key (`flakeidgenerator` in the above example): Name of your Flake ID Generator. * `prefetchCount`: Count of IDs which are pre-fetched on the background when one call to `FlakeIdGenerator.newId()` is made. Its value must be in the range `1` - `100,000`. Its default value is `100`. * `prefetchValidityMillis`: Specifies for how long the pre-fetched IDs can be used. After this time elapses, a new batch of IDs are fetched. Time unit is milliseconds. Its default value is `600,000` milliseconds (`10` minutes). The IDs contain a timestamp component, which ensures a rough global ordering of them. If an ID is assigned to an object that was created later, it will be out of order. If ordering is not important, set this value to `0`. ### 7.4.11. Using Lock, Semaphore and Atomic Long -Hazelcast IMDG 4.0 introduces CP concurrency primitives with respect to the [CAP principle](http://awoc.wolski.fi/dlib/big-data/Brewer_podc_keynote_2000.pdf), i.e., they always -maintain [linearizability](https://aphyr.com/posts/313-strong-consistency-models) and prefer consistency to availability during network partitions and client or server failures. +Hazelcast IMDG 4.0 introduces CP concurrency primitives with respect to the [CAP principle](http://awoc.wolski.fi/dlib/big-data/Brewer_podc_keynote_2000.pdf), i.e., they always maintain [linearizability](https://aphyr.com/posts/313-strong-consistency-models) and prefer consistency to availability during network partitions and client or server failures. -These new implementations are accessed using the [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) -which cannot be used with the Node.js client yet. We plan to implement support for the CP Subsystem in the upcoming 4.0 release. -In the meantime, since there is no way to access old non-CP primitives using IMDG 4.x, we removed their implementations, -code samples and documentations. They will be back once we implement them. +These new implementations are accessed using the [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) which cannot be used with the Node.js client yet. We plan to implement support for the CP Subsystem in the upcoming 4.0 release of Hazelcast Node.js client. In the meantime, since there is no way to access old non-CP primitives using IMDG 4.x, we removed their implementations, code samples and documentations. They will be back once we implement them. ## 7.5. Distributed Events @@ -1927,7 +1466,7 @@ You can add event listeners to a Hazelcast Node.js client. You can configure the #### 7.5.1.1. Membership Listener -The Membership Listener interface has functions that are invoked for the following events. +The Membership Listener interface has methods that are invoked for the following events. * `memberAdded`: A new member is added to the cluster. * `memberRemoved`: An existing member leaves the cluster. @@ -1939,22 +1478,22 @@ After you create the listener object, you can configure your cluster to include The following is a membership listener registration by using the `ClusterService.addMembershipListener()` function. ```javascript -var membershipListener = { - memberAdded: function (event) { +const membershipListener = { + memberAdded: (event) => { console.log('Member Added: The address is', event.member.address.toString()); }, }; -client.clusterService.addMembershipListener(membershipListener); +client.getClusterService().addMembershipListener(membershipListener); ``` Also, if you want to receive the list of available members when the client connects to cluster you may register an `InitialMembershipListener`. This listener receives an only-once `InitialMembershipEvent` when the member list becomes available. After the event has been received, the listener will receive the normal `MembershipEvent`s. -The following is an initial membership listener registration by using the `config.listeners.addMembershipListener()` function. +The following is an initial membership listener registration by using the `config.membershipListeners` config option. ```javascript -var membershipListener = { +const membershipListener = { init: function (event) { console.log("Initial member list received -> " + event.members); }, @@ -1962,14 +1501,14 @@ var membershipListener = { console.log('Member Added: The address is', event.member.address.toString()); }, }; - -var config = new Config.ClientConfig(); -config.listeners.addMembershipListener(membershipListener); +const cfg = { + membershipListeners: [membershipListener] +}; ``` #### 7.5.1.2. Distributed Object Listener -The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The type of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: +The events for distributed objects are invoked when they are created and destroyed in the cluster. After the events, a listener callback function is called. The interface of the callback function should be `DistributedObjectListener`. The parameter of the function is `DistributedObjectEvent` including following fields: * `serviceName`: Service name of the distributed object. * `objectName`: Name of the distributed object. @@ -1978,19 +1517,18 @@ The events for distributed objects are invoked when they are created and destroy The following is an example of adding a `DistributedObjectListener`. ```javascript -client.addDistributedObjectListener(function (distributedObjectEvent) { +await client.addDistributedObjectListener((event) => { console.log('Distributed object event >>> ', - distributedObjectEvent.serviceName, - distributedObjectEvent.objectName, - distributedObjectEvent.eventType + event.serviceName, + event.objectName, + event.eventType ); -}).then(function () { - var mapname = 'test'; - // This causes a created event - client.getMap(mapname); - // This causes no event because map was already created - client.getMap(mapname); }); +const mapname = 'test'; +// This causes a created event +await client.getMap(mapname); +// This causes no event because map was already created +await client.getMap(mapname); ``` #### 7.5.1.3. Lifecycle Listener @@ -2004,17 +1542,18 @@ The `LifecycleListener` interface notifies for the following events: * `DISCONNECTED`: The client disconnected from a member. * `SHUTDOWN`: The client has shutdown. -The following is an example of the `LifecycleListener` that is added to the `ClientConfig` object and its output. +The following is an example of the `LifecycleListener` that is added to the config object and its output. ```javascript -var clientConfig = new Config.ClientConfig(); -clientConfig.listeners.addLifecycleListener(function (state) { +const lifecycleListener = (state) => { console.log('Lifecycle Event >>> ' + state); -}); +}; +const cfg = { + lifecycleListeners: [lifecycleListener] +}; -Client.newHazelcastClient(clientConfig).then(function (hazelcastClient) { - hazelcastClient.shutdown(); -}); +const client = await Client.newHazelcastClient(cfg); +client.shutdown(); ``` **Output:** @@ -2047,12 +1586,11 @@ Lifecycle Event >>> SHUTDOWN You can add event listeners to the distributed data structures. -> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, - some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as `an instance of the interface`. You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for a required interface.** +> **NOTE: Hazelcast Node.js client is a TypeScript-based project but JavaScript does not have interfaces. Therefore, some interfaces are given to the user by using the TypeScript files that have `.ts` extension. In this guide, implementing an interface means creating an object to have the necessary functions that are listed in the interface inside the `.ts` file. Also, this object is mentioned as "an instance of the interface". You can search the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) or GitHub repository for the required interface.** #### 7.5.2.1. Map Listener -The Map Listener is used by the Hazelcast `Map`. +The Map Listener is used by the Hazelcast Map (`IMap`). You can listen to map-wide or entry-based events by using the functions in the `MapListener` interface. Every function type in this interface is one of the `EntryEventListener` and `MapEventListener` types. To listen to these events, you need to implement the relevant `EntryEventListener` and `MapEventListener` functions in the `MapListener` interface. @@ -2061,38 +1599,41 @@ An entry-based event is fired after the operations that affect a specific entry. See the following example. ```javascript -var entryEventListener = { - added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry +const entryEventListener = { + added: (entryEvent) => { + console.log('Entry added:', entryEvent.key, '-->', entryEvent.value); } }; -map.addEntryListener(entryEventListener, undefined, true).then(function () { - return map.put('1', 'My new entry'); -}); + +await map.addEntryListener(entryEventListener, undefined, true); +await map.put('1', 'My new entry'); +// Prints: +// Entry added: 1 --> My new entry ``` +The second argument in the `addEntryListener` method is `key`. It stands for the key to listen for. When it is set to `undefined` (or omitted, which is the same), the listener will be fired for all entries in the Map. + +The third argument in the `addEntryListener` method is `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. + A map-wide event is fired as a result of a map-wide operation. For example, `IMap.clear()` or `IMap.evictAll()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. See the following example. ```javascript -var mapEventListener = { - mapCleared: function (mapEvent) { - console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 3 +const mapEventListener = { + mapCleared: (mapEvent) => { + console.log('Map cleared:', mapEvent.numberOfAffectedEntries); } }; -map.addEntryListener(mapEventListener).then(function () { - return map.put('1', 'Muhammad Ali'); -}).then(function () { - return map.put('2', 'Mike Tyson'); -}).then(function () { - return map.put('3', 'Joe Louis'); -}).then(function () { - return map.clear(); -}); -``` +await map.addEntryListener(mapEventListener); -As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the map event contains the entry value. +await map.put('1', 'Muhammad Ali'); +await map.put('2', 'Mike Tyson'); +await map.put('3', 'Joe Louis'); +await map.clear(); +// Prints: +// Map cleared: 3 +``` #### 7.5.2.2. Entry Listener @@ -2103,38 +1644,43 @@ You can listen to map-wide or entry-based events by using the functions in the ` An entry-based event is fired after the operations that affect a specific entry. For example, `MultiMap.put()`, `MultiMap.remove()`. You should use the `EntryEventListener` type to listen to these events. An `EntryEvent` object is passed to the listener function. ```javascript -var entryEventListener = { - added: function (entryEvent) { - console.log('Entry Added:', entryEvent.key, '-->', entryEvent.value); // Entry Added: 1 --> My new entry +const entryEventListener = { + added: (entryEvent) => { + console.log('Entry added:', entryEvent.key, '-->', entryEvent.value); } }; -return mmp.addEntryListener(entryEventListener, undefined, true).then(function () { - return mmp.put('1', 'My new entry'); -}); +await mmp.addEntryListener(entryEventListener, undefined, true); + +await mmp.put('1', 'My new entry'); +// Prints: +// Entry Added: 1 --> My new entry ``` +The second argument in the `addEntryListener` method is `key`. It stands for the key to listen for. When it is set to `undefined` (or omitted, which is the same), the listener will be fired for all entries in the MultiMap or Replicated Map. + +The third argument in the `addEntryListener` method is `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. + A map-wide event is fired as a result of a map-wide operation. For example, `MultiMap.clear()`. You should use the `MapEventListener` type to listen to these events. A `MapEvent` object is passed to the listener function. See the following example. ```javascript -var mapEventListener = { - mapCleared: function (mapEvent) { - console.log('Map Cleared:', mapEvent.numberOfAffectedEntries); // Map Cleared: 1 +const mapEventListener = { + mapCleared: (mapEvent) => { + console.log('Map cleared:', mapEvent.numberOfAffectedEntries); } }; -mmp.addEntryListener(mapEventListener).then(function () { - return mmp.put('1', 'Muhammad Ali'); -}).then(function () { - return mmp.put('1', 'Mike Tyson'); -}).then(function () { - return mmp.put('1', 'Joe Louis'); -}).then(function () { - return mmp.clear(); -}); +await mmp.addEntryListener(mapEventListener); + +await mmp.put('1', 'Muhammad Ali'); +await mmp.put('1', 'Mike Tyson'); +await mmp.put('1', 'Joe Louis'); +await mmp.clear(); +// Prints: +// Map cleared: 1 ``` -Note that all functions in the `EntryListener` interface is not supported by MultiMap and Replicated Map. See the following headings to see supported listener functions for each data structure. +Note that some methods in the `EntryListener` interface are not supported by MultiMap and Replicated Map. See the following headings to see supported listener methods for each data structure. **Entry Listener Functions Supported by MultiMap** @@ -2150,8 +1696,6 @@ Note that all functions in the `EntryListener` interface is not supported by Mul - `evicted` - `mapCleared` -As you see, there is a parameter in the `addEntryListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the entry event contains the entry value. - #### 7.5.2.3. Item Listener The Item Listener is used by the Hazelcast `Queue`, `Set` and `List`. @@ -2161,44 +1705,42 @@ You can listen to item events by implementing the functions in the `ItemListener The following is an example of item listener object and its registration to the `Set`. It also applies to `Queue` and `List`. ```javascript -var itemListener = { - itemAdded: function (itemEvent) { - console.log('Item Added:', itemEvent.item); // Item Added: Item1 +const itemListener = { + itemAdded: (itemEvent) => { + console.log('Item added:', itemEvent.item); }, - itemRemoved: function (itemEvent) { - console.log('Item Removed:', itemEvent.item); // Item Removed: Item1 + itemRemoved: (itemEvent) => { + console.log('Item removed:', itemEvent.item); } }; -return set.addItemListener(itemListener, true).then(function () { - return set.add('Item1'); -}).then(function () { - return set.remove('Item1'); -}); +await set.addItemListener(itemListener, true); + +await set.add('Item1'); +// Prints: +// Item added: Item1 +await set.remove('Item1'); +// Prints: +// Item removed: Item1 ``` -As you see, there is a parameter in the `addItemListener` function: `includeValue`. It is a boolean parameter, and if it is `true`, the item event contains the item value. +The second argument in the `addItemListener` function is `includeValue`. It is a boolean parameter, and if it is `true`, the item event contains the item value. #### 7.5.2.4. Message Listener -The Message Listener is used by the Hazelcast `Reliable Topic`. +The Message Listener is used by the Hazelcast `ReliableTopic`. You can listen to message events. To listen to these events, you need to implement the `MessageListener` function to which a `Message` object is passed. See the following example. ```javascript -topic.addMessageListener(function (message) { - console.log(message.messageObject); +topic.addMessageListener((message) => { + console.log('Message received:', message.messageObject); }); -var movie = { - title: 'The Prestige', - year: '2006', - runtime: '130 min', - director: 'Christopher Nolan', - imdbRating: '8.5' -} -topic.publish(movie); +topic.publish('Message1'); +// Prints: +// Message received: Message1 ``` ## 7.6. Distributed Computing @@ -2209,7 +1751,7 @@ This chapter explains how you can use Hazelcast IMDG's entry processor implement Hazelcast supports entry processing. An entry processor is a function that executes your code on a map entry in an atomic way. -An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys -- executing `IMap.get(key)`, mutating the value and finally putting the entry back in the map using `IMap.put(key,value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. +An entry processor is a good option if you perform bulk processing on an `IMap`. Usually you perform a loop of keys -- executing `IMap.get(key)`, mutating the value and finally putting the entry back in the map using `IMap.put(key, value)`. If you perform this process from a client or from a member where the keys do not exist, you effectively perform two network hops for each update: the first to retrieve the data and the second to update the mutated value. If you are doing the process described above, you should consider using entry processors. An entry processor executes a read and updates upon the member where the data resides. This eliminates the costly network hops described above. @@ -2227,35 +1769,39 @@ The `IMap` interface provides the following functions for entry processing: In the Node.js client, an `EntryProcessor` should be `IdentifiedDataSerializable` or `Portable` because the server should be able to deserialize it to process. -The following is an example for `EntryProcessor` which is `IdentifiedDataSerializable`. +The following is an example for `EntryProcessor` which is an `IdentifiedDataSerializable`. ```javascript -function IdentifiedEntryProcessor(value) { - this.value = value; -} +class IdentifiedEntryProcessor { + constructor(value) { + this.value = value; + } -IdentifiedEntryProcessor.prototype.readData = function (inp) { - this.value = inp.readUTF(); -}; + readData(input) { + this.value = input.readUTF(); + } -IdentifiedEntryProcessor.prototype.writeData = function (outp) { - outp.writeUTF(this.value); -}; + writeData(output) { + output.writeUTF(this.value); + } -IdentifiedEntryProcessor.prototype.getFactoryId = function () { - return 5; -}; + getFactoryId() { + return 5; + } -IdentifiedEntryProcessor.prototype.getClassId = function () { - return 1; -}; + getClassId() { + return 1; + } +} ``` Now, you need to make sure that the Hazelcast member recognizes the entry processor. For this, you need to implement the Java equivalent of your entry processor and its factory, and create your own compiled class or JAR files. For adding your own compiled class or JAR files to the server's `CLASSPATH`, see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). -The following is the Java equivalent of the entry processor in Node.js client given above: +The following is the Java counterpart of the entry processor in Node.js client given above: ```java +package com.example; + import com.hazelcast.map.AbstractEntryProcessor; import com.hazelcast.nio.ObjectDataInput; import com.hazelcast.nio.ObjectDataOutput; @@ -2263,9 +1809,12 @@ import com.hazelcast.nio.serialization.IdentifiedDataSerializable; import java.io.IOException; import java.util.Map; -public class IdentifiedEntryProcessor extends AbstractEntryProcessor implements IdentifiedDataSerializable { - static final int CLASS_ID = 1; - private String value; +public class IdentifiedEntryProcessor + extends AbstractEntryProcessor + implements IdentifiedDataSerializable { + + static final int CLASS_ID = 1; + private String value; public IdentifiedEntryProcessor() { } @@ -2298,13 +1847,18 @@ public class IdentifiedEntryProcessor extends AbstractEntryProcessor - IdentifiedFactory + com.example.IdentifiedFactory ``` -The code that runs on the entries is implemented in Java on the server side. The client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, see the [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. +In this example the code that runs on the entries is implemented in Java on the server side. The client side entry processor is used to specify which entry processor should be called. For more details about the Java implementation of the entry processor, see the [Entry Processor section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#entry-processor) in the Hazelcast IMDG Reference Manual. After the above implementations and configuration are done and you start the server where your library is added to its `CLASSPATH`, you can use the entry processor in the `IMap` functions. See the following example. ```javascript -var map; -hazelcastClient.getMap('my-distributed-map').then(function (mp) { - map = mp; - return map.put('key', 'not-processed'); -}).then(function () { - return map.executeOnKey('key', new IdentifiedEntryProcessor('processed')); -}).then(function () { - return map.get('key'); -}).then(function (value) { - console.log(value); // Processed -}); +const map = await client.getMap('my-distributed-map'); +await map.put('key', 'not-processed'); + +// Run the entry processor +await map.executeOnKey('key', new IdentifiedEntryProcessor('processed')); + +const value = await map.get('key'); +// Prints: +// processed +console.log(value); ``` ## 7.7. Distributed Query @@ -2385,42 +1938,44 @@ Hazelcast offers the following ways for distributed query purposes: #### 7.7.1.1. Employee Map Query Example -Assume that you have an `employee` map containing the values of `Employee` objects, as coded below. +Assume that you have an `employee` map containing the values of `Employee` objects, as shown below. ```javascript -function Employee(name, age, active, salary) { - this.name = name; - this.age = age; - this.active = active; - this.salary = salary; -} +class Employee { + constructor(name, age, active, salary) { + this.name = name; + this.age = age; + this.active = active; + this.salary = salary; + } -Employee.prototype.getClassId = function () { - return 1; -} + readPortable(input) { + this.name = input.readUTF(); + this.age = input.readInt(); + this.active = input.readBoolean(); + this.salary = input.readDouble(); + } -Employee.prototype.getFactoryId = function () { - return 1; -} + writePortable(output) { + output.writeUTF(this.name); + output.writeInt(this.age); + output.writeBoolean(this.active); + output.writeDouble(this.salary); + } -Employee.prototype.readPortable = function (reader) { - this.name = reader.readUTF(); - this.age = reader.readInt(); - this.active = reader.readBoolean(); - this.salary = reader.readDouble(); -} + getClassId() { + return 1; + } -Employee.prototype.writePortable = function (writer) { - writer.writeUTF(this.name); - writer.writeInt(this.age); - writer.writeBoolean(this.active); - writer.writeDouble(this.salary); + getFactoryId() { + return 1; + } } ``` -Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you don't need to implement its Java equivalent on the server side. +Note that `Employee` is a `Portable` object. As portable types are not deserialized on the server side for querying, you do not need to implement its Java counterpart on the server side. -For the non-portable types, you need to implement its Java equivalent and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). +For the non-portable types, you need to implement its Java counterpart and its serializable factory on the server side for server to reconstitute the objects from binary formats. In this case before starting the server, you need to compile the Employee and related factory classes with server's CLASSPATH and add them to the user-lib directory in the extracted hazelcast-.zip (or tar). See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). > **NOTE: Querying with `Portable` object is faster as compared to `IdentifiedDataSerializable`.** @@ -2429,32 +1984,36 @@ For the non-portable types, you need to implement its Java equivalent and its se You can combine predicates by using the `and`, `or` and `not` operators, as shown in the below example. ```javascript -var map; -client.getMap('employee').then(function (mp) { - map = mp; - var predicate = Predicates.and(Predicates.equal('active', true), Predicates.lessThan('age', 30)); - return map.valuesWithPredicate(predicate); -}).then(function (employees) { - // Some operations -}); +const { Predicates } = require('hazelcast-client'); +// ... +const map = await client.getMap('employee'); +// Define the predicate +const predicate = Predicates.and( + Predicates.equal('active', true), + Predicates.lessThan('age', 30) +); +// Run the query +const employees = await map.valuesWithPredicate(predicate); +// Some operations ``` -In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than 30. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. +In the above example code, `predicate` verifies whether the entry is active and its `age` value is less than `30`. This `predicate` is applied to the `employee` map using the `map.valuesWithPredicate(predicate)` method. This method sends the predicate to all cluster members and merges the results coming from them. -> **NOTE: Predicates can also be applied to `keySet` and `entrySet` of the Hazelcast IMDG's distributed map.** +> **NOTE: Predicates can also be applied to `keySet` and `entrySet` methods of the Hazelcast IMDG's distributed map.** #### 7.7.1.3. Querying with SQL -`SqlPredicate` takes the regular SQL `where` clause. See the following example: +You can query with SQL by using the `SqlPredicate` class. Its constructor takes the regular SQL `where` clause, as shown in the below example. ```javascript -var map; -client.getMap('employee').then(function (mp) { - map = mp; - return map.valuesWithPredicate(new SqlPredicate('active AND age < 30')); -}).then(function (employees) { - // Some operations -}); +const { SqlPredicate } = require('hazelcast-client'); +// ... +const map = await client.getMap('employee'); +// Define the predicate +const predicate = new SqlPredicate('active AND age < 30'); +// Run the query +const employees = await map.valuesWithPredicate(predicate); +// Some operations ``` ##### Supported SQL Syntax @@ -2488,106 +2047,99 @@ client.getMap('employee').then(function (mp) { The `%` (percentage sign) is the placeholder for multiple characters, an `_` (underscore) is the placeholder for only one character. -- `name LIKE 'Jo%'` (true for 'Joe', 'Josh', 'Joseph' etc.) -- `name LIKE 'Jo_'` (true for 'Joe'; false for 'Josh') -- `name NOT LIKE 'Jo_'` (true for 'Josh'; false for 'Joe') -- `name LIKE 'J_s%'` (true for 'Josh', 'Joseph'; false 'John', 'Joe') +- `name LIKE 'Jo%'` (`true` for `Joe`, `Josh`, `Joseph`, etc.) +- `name LIKE 'Jo_'` (`true` for `Joe`; `false` for `Josh`) +- `name NOT LIKE 'Jo_'` (`true` for `Josh`; `false` for `Joe`) +- `name LIKE 'J_s%'` (`true` for `Josh`, `Joseph`; `false` for `John`, `Joe`) **ILIKE:** ` [NOT] ILIKE 'expression'` ILIKE is similar to the LIKE predicate but in a case-insensitive manner. -- `name ILIKE 'Jo%'` (true for 'Joe', 'joe', 'jOe','Josh','joSH', etc.) -- `name ILIKE 'Jo_'` (true for 'Joe' or 'jOE'; false for 'Josh') +- `name ILIKE 'Jo%'` (`true` for `Joe`, `joe`, `jOe`, `Josh`, `joSH`, etc.) +- `name ILIKE 'Jo_'` (`true` for `Joe` or `jOE`; `false` for `Josh`) **REGEX:** ` [NOT] REGEX 'expression'` -- `name REGEX 'abc-.*'` (true for 'abc-123'; false for 'abx-123') +- `name REGEX 'abc-.*'` (`true` for `abc-123`; `false` for `abx-123`) ##### Querying Examples with Predicates -You can use the `__key` attribute to perform a predicated search for the entry keys. See the following example: - -```javascript -var personMap; -client.getMap('persons').then(function (mp) { - personMap = mp; - return personMap.put('Alice', 35); -}).then(function () { - return personMap.put('Andy', 37); -}).then(function () { - return personMap.put('Bob', 22); -}).then(function () { - var predicate = new Predicates.sql('__key like A%'); - return personMap.valuesWithPredicate(predicate); -}).then(function (startingWithA) { - console.log(startingWithA.get(0)); // 35 -}); +You can use the `__key` attribute to perform a predicated search for the entry keys, as shown in the below example. + +```javascript +const personMap = await client.getMap('persons'); +// Generate some data +await personMap.put('Alice', 35); +await personMap.put('Andy', 37); +await personMap.put('Bob', 22); +// Run the query +// The following is an equialent of `new SqlPredicate('__key like A%')` +const predicate = new Predicates.sql('__key like A%'); +const startingWithA = await personMap.valuesWithPredicate(predicate); +// Prints: +// 35 +console.log(startingWithA.get(0)); ``` -In this example, the code creates a list with the values whose keys start with the letter "A”. +In this example, the code creates a list with the values whose keys start with the letter `A`. Note that the returned object is an instance of `ReadOnlyLazyList` class. You can use the `this` attribute to perform a predicated search for entry values. See the following example: ```javascript -var personMap; -return client.getMap('persons').then(function (mp) { - personMap = mp; - return personMap.put('Alice', 35); -}).then(function () { - return personMap.put('Andy', 37); -}).then(function () { - return personMap.put('Bob', 22); -}).then(function () { - var predicate = new Predicates.greaterEqual('this', 27); - return personMap.valuesWithPredicate(predicate); -}).then(function (olderThan27) { - console.log(olderThan27.get(0), olderThan27.get(1)); // 35 37 -}); +const personMap = await client.getMap('persons'); +// Generate some data +await personMap.put('Alice', 35); +await personMap.put('Andy', 37); +await personMap.put('Bob', 22); +// Run the query +const predicate = new Predicates.greaterEqual('this', 27); +const olderThan27 = await return personMap.valuesWithPredicate(predicate); +// Prints: +// 35 37 +console.log(olderThan27.get(0), olderThan27.get(1)); ``` -In this example, the code creates a list with the values greater than or equal to "27". +In this example, the code creates a list with the values greater than or equal to `27`. #### 7.7.1.4. Querying with JSON Strings -You can query the JSON strings stored inside your Hazelcast clusters. To query a JSON string, you can -use `HazelcastJsonValue` or JavaScript objects. - -`HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. -Then, it is possible to query these objects using the query methods explained in this section. - -```javascript -var personMap; -var person1 = '{ "name": "John", "age": 35 }'; -var person2 = '{ "name": "Jane", "age": 24 }'; -var person3 = '{ "name": "Trey", "age": 17 }'; - -return hz.getMap('personsMap').then(function (map) { - personMap = map; - return personMap.put(1, new HazelcastJsonValue(person1)); -}).then(function () { - return personMap.put(2, new HazelcastJsonValue(person2)); -}).then(function () { - return personMap.put(3, new HazelcastJsonValue(person3)); -}).then(function () { - return personMap.valuesWithPredicate(Predicates.lessThan('age', 21)); -}).then(function (personsUnder21) { - personsUnder21.toArray().forEach(function (person) { - console.log(person); - }); +You can query the JSON strings stored inside your Hazelcast clusters. To query a JSON string, you can use `HazelcastJsonValue` or plain JavaScript objects. + +`HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. Then, it is possible to query these objects using the query methods explained in this section. + +```javascript +const { + SqlPredicate, + HazelcastJsonValue +} = require('hazelcast-client'); +// ... + +const personMap = await client.getMap('personsMap'); +// Generate some data +const person1 = '{ "name": "John", "age": 35 }'; +const person2 = '{ "name": "Jane", "age": 24 }'; +const person3 = '{ "name": "Trey", "age": 17 }'; +await personMap.put(1, new HazelcastJsonValue(person1)); +await personMap.put(2, new HazelcastJsonValue(person2)); +await personMap.put(3, new HazelcastJsonValue(person3)); +// Run the query +const personsUnder21 = await personMap.valuesWithPredicate(Predicates.lessThan('age', 21)); +// Prints: +// HazelcastJsonValue { jsonString: '{ "name": "Trey", "age": 17 }' } +for (const person of personsUnder21) { + console.log(person); }); ``` -When running the queries, Hazelcast treats values extracted from the JSON documents as Java types so they can be compared with the query attribute. -JSON specification defines five primitive types to be used in the JSON documents: `number`, `string`, `true`, `false` and `null`. -The `string`, `true`/`false` and `null` types are treated as `String`, `boolean` and `null`, respectively. `Number` values treated as `long`s if they can be represented by a `long`. -Otherwise, `number`s are treated as `double`s. +When running the queries, Hazelcast treats values extracted from the JSON documents as Java types so they can be compared with the query attribute. JSON specification defines five primitive types to be used in the JSON documents: `number`, `string`, `true`, `false` and `null`. The `string`, `true`/`false` and `null` types are treated as `String`, `boolean` and `null`, respectively. `Number` values treated as `long`s if they can be represented by a `long`. Otherwise, `number`s are treated as `double`s. + +`HazelcastJsonValue` is a lightweight wrapper around your JSON strings. It is used merely as a way to indicate that the contained string should be treated as a valid JSON value. Hazelcast does not check the validity of JSON strings put into to maps. Putting an invalid JSON string in a map is permissible. However, in that case whether such an entry is going to be returned or not from a query is not defined. It is possible to query nested attributes and arrays in JSON documents. The query syntax is the same as querying other Hazelcast objects using the `Predicate`s. ```javascript -var departmentsMap; -var departments = [ +const departments = [ { departmentId: 1, room: 'alpha', @@ -2617,64 +2169,54 @@ var departments = [ ] } ]; -return hz.getMap('departmentsMap').then(function (map) { - departmentsMap = map; - return departmentsMap.putAll(departments.map(function (department, index) { - return [index, department]; - })); -}).then(function () { - // The following query finds all the departments that have a person named "Peter" working in them - return departmentsMap.valuesWithPredicate(Predicates.equal('people[any].name', 'Peter')) -}).then(function (departmentWithPeter) { - departmentWithPeter.toArray().forEach(function (department) { - console.log(department); - }); +const departmentsMap = await client.getMap('departmentsMap'); +await departmentsMap.putAll(departments.map((department, index) => { + return [index, department]; +})); +// Run the query which finds all the departments that have a person named "Peter" +const departmentsWithPeter = + await departmentsMap.valuesWithPredicate(Predicates.equal('people[any].name', 'Peter')) +// Prints the first department +for (const department of departmentsWithPeter) { + console.log(department); }); ``` -`HazelcastJsonValue` is a lightweight wrapper around your JSON strings. It is used merely as a way to indicate that the contained string should be treated as a valid JSON value. -Hazelcast does not check the validity of JSON strings put into to maps. Putting an invalid JSON string in a map is permissible. -However, in that case whether such an entry is going to be returned or not from a query is not defined. - ##### Querying with HazelcastJsonValue Objects -If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses `JSON Serialization`. - -This means that, you can run queries over your JavaScript objects if they are serialized as JSON strings. However, when the results -of your query are ready, they are parsed from JSON strings and returned to you as JavaScript objects. - -For the purposes of your application, you may want to get rid of the parsing and just work with the raw JSON strings using `HazelcastJsonValue` objects. Then, you can configure your client to do so -as described in the [JSON Serialization](#45-json-serialization) section. - -```javascript -var config = new Config(); -config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; - -Client.newHazelcastClient(config).then(function (hz) { - var moviesMap; - var movies = [ - [1, new HazelcastJsonValue('{ "name": "The Dark Knight", "rating": 9.1 }')], - [2, new HazelcastJsonValue('{ "name": "Inception", "rating": 8.8 }')], - [3, new HazelcastJsonValue('{ "name": "The Prestige", "rating": 8.5 }')] - ]; - return hz.getMap('moviesMap').then(function (map) { - moviesMap = map; - return moviesMap.putAll(movies); - }).then(function () { - return moviesMap.valuesWithPredicate(Predicates.greaterEqual('rating', 8.8)); - }).then(function (highRatedMovies) { - highRatedMovies.toArray().forEach(function (movie) { - console.log(movie.toString()); - }); - return hz.shutdown(); - }); +If the Hazelcast Node.js client cannot find a suitable serializer for an object, it uses JSON Serialization. + +This means that, you can run queries over your JavaScript objects if they are serialized as JSON strings. However, when the results of your query are ready, they are parsed from JSON strings and returned to you as JavaScript objects. + +For the purposes of your application, you may want to get rid of the parsing and just work with the raw JSON strings using `HazelcastJsonValue` objects. Then, you can configure your client to do so as described in the [JSON Serialization](#45-json-serialization) section. + +```javascript +const client = await Client.newHazelcastClient({ + serialization: { + jsonStringDeserializationPolicy: 'NO_DESERIALIZATION' + } +}); + +const moviesMap = await client.getMap('moviesMap'); +// Generate some data +const movies = [ + [1, new HazelcastJsonValue('{ "name": "The Dark Knight", "rating": 9.1 }')], + [2, new HazelcastJsonValue('{ "name": "Inception", "rating": 8.8 }')], + [3, new HazelcastJsonValue('{ "name": "The Prestige", "rating": 8.5 }')] +]; +await moviesMap.putAll(movies); +// Run the query +const highRatedMovies = + await moviesMap.valuesWithPredicate(Predicates.greaterEqual('rating', 8.8)); +// Prints the first two movies +for (const movie of highRatedMovies) { + console.log(movie.toString()); }); ``` ##### Metadata Creation for JSON Querying -Hazelcast stores a metadata object per JSON serialized object stored. This metadata object is created every time a JSON serialized object is put into an `IMap`. -Metadata is later used to speed up the query operations. Metadata creation is on by default. Depending on your application’s needs, you may want to turn off the metadata creation to decrease the put latency and increase the throughput. +Hazelcast stores a metadata object per JSON serialized object stored. This metadata object is created every time a JSON serialized object is put into an `IMap`. Metadata is later used to speed up the query operations. Metadata creation is on by default. Depending on your application’s needs, you may want to turn off the metadata creation to decrease the put latency and increase the throughput. You can configure this using `metadata-policy` element for the map configuration on the member side as follows: @@ -2698,39 +2240,30 @@ You can configure this using `metadata-policy` element for the map configuration The Node.js client provides paging for defined predicates. With its `PagingPredicate` object, you can get a list of keys, values or entries page by page by filtering them with predicates and giving the size of the pages. Also, you can sort the entries by specifying comparators. ```javascript -var map; -hazelcastClient.getMap('students').then(function (mp) { - map = mp; - - var greaterEqual = Predicates.greaterEqual('age', 18); - var pagingPredicate = Predicates.paging(greaterEqual, 5); - -// Set page to retrieve third page - pagingPredicate.setPage(3); - - // Retrieve third page - return map.valuesWithPredicate(pagingPredicate) -}).then(function (values) { - // Some operations -... - - // Set up next page - pagingPredicate.nextPage(); - - // Retrieve next page - return map.valuesWithPredicate(pagingPredicate); -}).then(function (values) { - // Some operations -}); +const map = await client.getMap('students'); +// Define the paging predicate +const greaterEqual = Predicates.greaterEqual('age', 18); +const pagingPredicate = Predicates.paging(greaterEqual, 5); +// Set page to retrieve the third page +pagingPredicate.setPage(3); +// Retrieve third page +let values = await map.valuesWithPredicate(pagingPredicate); +// Some operations +// ... +// Set up next page +pagingPredicate.nextPage(); +// Retrieve the next page +values = await map.valuesWithPredicate(pagingPredicate); +// Some operations ``` -If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java equivalent of it and its factory. The Java equivalent of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the equivalent of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). +If you want to sort the result before paging, you need to specify a comparator object that implements the `Comparator` interface. Also, this comparator object should be one of `IdentifiedDataSerializable` or `Portable`. After implementing this object in Node.js, you need to implement the Java counterpart of it and its factory. The Java counterpart of the comparator should implement `java.util.Comparator`. Note that the `compare` function of `Comparator` on the Java side is the counterpart of the `sort` function of `Comparator` on the Node.js side. When you implement the `Comparator` and its factory, you can add them to the `CLASSPATH` of the server side. See the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). Also, you can access a specific page more easily with the help of the `setPage` function. This way, if you make a query for the 100th page, for example, it will get all 100 pages at once instead of reaching the 100th page one by one using the `nextPage` function. ### 7.7.2. Fast-Aggregations -Fast-Aggregations feature provides some aggregate functions, such as `sum`, `average`, `max`, and `min`, on top of Hazelcast `IMap` entries. Their performance is perfect since they run in parallel for each partition and are highly optimized for speed and low memory consumption. +Fast-Aggregations feature provides some aggregate functions, such as `sum`, `average`, `max`, and `min`, on top of Hazelcast `IMap` entries. Their performance is high since they run in parallel for each partition and are highly optimized for speed and low memory consumption. The `Aggregators` object provides a wide variety of built-in aggregators. The full list is presented below: @@ -2752,25 +2285,32 @@ You can use these aggregators with the `IMap.aggregate()` and `IMap.aggregateWit See the following example. ```javascript -var map; -hz.getMap('employees').then(function (mp) { - map = mp; - return map.putAll([ - ['John Stiles', 23], - ['Judy Doe', 29], - ['Richard Miles', 38], - ]); -}).then(function () { - return map.aggregate(Aggregators.count()); -}).then(function (count) { - console.log('There are ' + count + ' employees.'); // There are 3 employees - return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); -}).then(function (count) { - console.log('There are ' + count + ' employees older than 25.'); // There are 2 employees older than 25. - return map.aggregate(Aggregators.numberAvg()); -}).then(function (avgAge) { - console.log('Average age is ' + avgAge); // Average age is 30 -}); +const { Aggregators } = require('hazelcast-client'); +// ... +const map = await client.getMap('employees'); +// Generate some data +await map.putAll([ + ['John Stiles', 23], + ['Judy Doe', 29], + ['Richard Miles', 38], +]); + +// Run count aggregate +let count = await map.aggregate(Aggregators.count()); +// Prints: +// There are 3 employees +console.log('There are ' + count + ' employees'); +// Run count aggregate with a predicate +count = await map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterThan('this', 25)); +// Prints: +// There are 2 employees older than 25 +console.log('There are ' + count + ' employees older than 25'); + +// Run avg aggregate +const avgAge = await map.aggregate(Aggregators.numberAvg()); +// Prints: +// Average age is 30 +console.log('Average age is ' + avgAge); ``` ## 7.8. Performance @@ -2782,82 +2322,58 @@ Partition Aware ensures that the related entries exist on the same member. If th Hazelcast has a standard way of finding out which member owns/manages each key object. The following operations are routed to the same member, since all of them are operating based on the same key `'key1'`. ```javascript -Client.newHazelcastClient().then(function (client) { - hazelcastClient = client; - return hazelcastClient.getMap('mapA') -}).then(function (mp) { - mapA = mp; - return hazelcastClient.getMap('mapB'); -}).then(function (mp) { - mapB = mp; - return hazelcastClient.getMap('mapC'); -}).then(function (mp) { - mapC = mp; - - // Since map names are different, operation is manipulating - // different entries, but the operation takes place on the - // same member since the keys ('key1') are the same - return mapA.put('key1', 'value1'); -}).then(function () { - return mapB.get('key1'); -}).then(function (res) { - return mapC.remove('key1'); -}).then(function () { - // Lock operation is still execute on the same member - // of the cluster since the key ("key1") is same - return hazelcastClient.getLock('key1'); -}).then(function (l) { - lock = l; - return lock.lock(); -}); +const mapA = await client.getMap('mapA'); +const mapB = await client.getMap('mapB'); +const mapC = await client.getMap('mapC'); + +// Since map names are different, operation is manipulating +// different entries, but the operation takes place on the +// same member since the keys ('key1') are the same +await mapA.put('key1', 'value1'); +const res = await mapB.get('key1'); +await mapC.remove('key1'); +// Lock operation is executed on the same member +// of the cluster since the key ("key1") is same +await mapA.lock('key1'); ``` -When the keys are the same, entries are stored on the same member. However, we sometimes want to have the related entries stored on the same member, such as a customer and their order entries. We would have a customers map with `customerId` as the key and an orders map with `orderId` as the key. Since `customerId` and `orderId` are different keys, a customer and their orders may fall into different members in your cluster. So how can we have them stored on the same member? We create an affinity between the customer and orders. If we make them part of the same partition then these entries will be co-located. We achieve this by making `OrderKey`s `PartitionAware`. +When the keys are the same, entries are stored on the same member. However, we sometimes want to have the related entries, such as a customer and their order entries, stored on the same member even if they are stored in different maps and have different keys. + +Let's consider a `customers` map with `customerId` as the key and an `orders` map with `orderId` as the key. Since `customerId` and `orderId` are different keys, a customer and their orders may fall into different members in your cluster. So how can we have them stored on the same member? We create an affinity between the customer and orders. If we make them part of the same partition then these entries will be co-located. We achieve this by making `OrderKey`s `PartitionAware`. ```javascript -function OrderKey(orderId, customerId) { - this.orderId = orderId; - this.customerId = customerId; -} +class OrderKey { + constructor(orderId, customerId) { + this.orderId = orderId; + this.customerId = customerId; + } -OrderKey.prototype.getPartitionKey = function () { - return this.customerId; -}; + getPartitionKey() { + return this.customerId; + } +} ``` -Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. +Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` method returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. ```javascript -var hazelcastClient; -var mapCustomers; -var mapOrders; - -Client.newHazelcastClient().then(function (client) { - hazelcastClient = client; - return hazelcastClient.getMap('customers') -}).then(function (mp) { - mapCustomers = mp; - return hazelcastClient.getMap('orders'); -}).then(function (mp) { - mapOrders = mp; - - // Create the customer entry with customer id = 1 - return mapCustomers.put(1, customer); -}).then(function () { - // Now create the orders for this customer - return mapOrders.putAll([ - [new OrderKey(21, 1), order], - [new OrderKey(22, 1), order], - [new OrderKey(23, 1), order] - ]); -}); +const customersMap = await client.getMap('customers'); +const ordersMap = await client.getMap('orders'); +// Create the customer entry with customer id = 1 +await customersMap.put(1, customer); +// Now create orders for this customer +await ordersMap.putAll([ + [new OrderKey(21, 1), order], + [new OrderKey(22, 1), order], + [new OrderKey(23, 1), order] +]); ``` For more details, see the [PartitionAware section](https://docs.hazelcast.org/docs/latest/manual/html-single/#partitionaware) in the Hazelcast IMDG Reference Manual. ### 7.8.2. Near Cache -Map entries in Hazelcast are partitioned across the cluster members. Hazelcast clients do not have local data at all. Suppose you read the key `k` a number of times from a Hazelcast client and `k` is owned by a member in your cluster. Then each `map.get(k)` will be a remote operation, which creates a lot of network trips. If you have a map that is mostly read, then you should consider creating a local Near Cache, so that reads are sped up and less network traffic is created. +Map entries in Hazelcast are partitioned across the cluster members. Hazelcast clients do not have local data at all. Suppose you read the key `k` a number of times from a Hazelcast client and `k` is owned by a member in your cluster. Then each `map.get('k')` will be a remote operation, which creates a lot of network trips. If you have a map that is mostly read, then you should consider creating a local Near Cache, so that reads are sped up and less network traffic is created. These benefits do not come for free, please consider the following trade-offs: @@ -2873,41 +2389,21 @@ Near Cache is highly recommended for maps that are mostly read. The following snippets show how a Near Cache is configured in the Node.js client, presenting all available values for each element: -**Declarative Configuration:** - -``` -{ - "nearCaches": [ - { - "name": "mostlyReadMap", - "invalidateOnChange": (false|true), - "timeToLiveSeconds": (0..Number.MAX_SAFE_INTEGER), - "maxIdleSeconds": (0..Number.MAX_SAFE_INTEGER), - "inMemoryFormat": "(object|binary)", - "evictionPolicy": "lru|lfu|random|none", - "evictionMaxSize": (0..Number.MAX_SAFE_INTEGER), - "evictionSamplingCount": (0..Number.MAX_SAFE_INTEGER), - "evictionSamplingPoolSize": (0..Number.MAX_SAFE_INTEGER), - } - ] -} -``` - -**Programmatic Configuration:** - ```javascript -var nearCacheConfig = new Config.NearCacheConfig(); -nearCacheConfig.name = 'mostlyReadMap'; -nearCacheConfig.invalidateOnChange = (false|true); -nearCacheConfig.timeToLiveSeconds = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.maxIdleSeconds = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.inMemoryFormat= (InMemoryFormat.OBJECT|InMemoryFormat.BINARY); -nearCacheConfig.evictionPolicy = (EvictionPolicy.LRU|EvictionPolicy.LFU|EvictionPolicy.RANDOM|EvictionPolicy.NONE); -nearCacheConfig.evictionMaxSize = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.evictionSamplingCount = (0..Number.MAX_SAFE_INTEGER); -nearCacheConfig.evictionSamplingPoolSize = (0..Number.MAX_SAFE_INTEGER); - -cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +const cfg = { + nearCaches: { + 'mostlyReadMap': { + invalidateOnChange: false, + maxIdleSeconds: 2, + inMemoryFormat: 'OBJECT', + timeToLiveSeconds: 3, + evictionPolicy: "lru", + evictionMaxSize: 3000, + evictionSamplingCount: 4, + evictionSamplingPoolSize: 8 + } + } +}; ``` Following are the descriptions of all configuration elements: @@ -2916,53 +2412,37 @@ Following are the descriptions of all configuration elements: - `BINARY`: Data will be stored in serialized binary format (default value). - `OBJECT`: Data will be stored in deserialized form. -- `invalidateOnChange`: Specifies whether the cached entries are evicted when the entries are updated or removed in members. Its default value is true. +- `invalidateOnChange`: Specifies whether the cached entries are evicted when the entries are updated or removed in members. Its default value is `true`. -- `timeToLiveSeconds`: Maximum number of seconds for each entry to stay in the Near Cache. Entries that are older than this period are automatically evicted from the Near Cache. Regardless of the eviction policy used, `timeToLiveSeconds` still applies. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. +- `timeToLiveSeconds`: Maximum number of seconds for each entry to stay in the Near Cache. Entries that are older than this period are automatically evicted from the Near Cache. Regardless of the eviction policy used, `timeToLiveSeconds` still applies. Any integer between `0` and `Number.MAX_SAFE_INTEGER`. Its default value is `0` (means infinite). -- `maxIdleSeconds`: Maximum number of seconds each entry can stay in the Near Cache as untouched (not read). Entries that are not read more than this period are removed from the Near Cache. Any integer between 0 and `Number.MAX_SAFE_INTEGER`. 0 means infinite. Its default value is 0. +- `maxIdleSeconds`: Maximum number of seconds each entry can stay in the Near Cache as untouched (not read). Entries that are not read more than this period are removed from the Near Cache. Any integer between `0` and `Number.MAX_SAFE_INTEGER`. Its default value is `0` (means infinite). - `evictionPolicy`: Eviction policy configuration. Available values are as follows: - `LRU`: Least Recently Used (default value). - `LFU`: Least Frequently Used. - - `NONE`: No items are evicted and the `evictionMaxSize` property is ignored. You still can combine it with `timeToLiveSeconds` and `maxIdleSeconds` to evict items from the Near Cache. - `RANDOM`: A random item is evicted. + - `NONE`: No items are evicted and the `evictionMaxSize` property is ignored. You still can combine it with `timeToLiveSeconds` and `maxIdleSeconds` to evict items from the Near Cache. -- `evictionMaxSize`: Maximum number of entries kept in the memory before eviction kicks in. -- `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. -- `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. +- `evictionMaxSize`: Maximum number of entries kept in the memory before eviction kicks in. Its default value is `Number.MAX_SAFE_INTEGER`. +- `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. Its default value is `8`. +- `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. Its default value is `16`. #### 7.8.2.2. Near Cache Example for Map The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. -**Declarative Configuration:** - -``` -{ - "nearCaches": [ - { - "name": "mostlyReadMap", - "inMemoryFormat": "object", - "invalidateOnChange": true, - "evictionPolicy": "lru", - "evictionMaxSize": 5000, - } - ] -} -``` - -**Programmatic Configuration:** - ```javascript -var nearCacheConfig = new Config.NearCacheConfig(); -nearCacheConfig.name = "mostlyReadMap"; -nearCacheConfig.inMemoryFormat= InMemoryFormat.OBJECT; -nearCacheConfig.invalidateOnChange = true; -nearCacheConfig.evictionPolicy = EvictionPolicy.LRU; -nearCacheConfig.evictionMaxSize = 5000; - -cfg.nearCacheConfigs['mostlyReadMap'] = nearCacheConfig; +const cfg = { + nearCaches: { + 'mostlyReadMap': { + inMemoryFormat: 'OBJECT', + invalidateOnChange: true, + evictionPolicy: 'LRU', + evictionMaxSize: 5000, + } + } +}; ``` #### 7.8.2.3. Near Cache Eviction @@ -2983,7 +2463,6 @@ Expiration means the eviction of expired records. A record is expired: The actual expiration is performed when a record is accessed: it is checked if the record is expired or not. If it is expired, it is evicted and `undefined` is returned as the value to the caller. - #### 7.8.2.5. Near Cache Invalidation Invalidation is the process of removing an entry from the Near Cache when its value is updated or it is removed from the original map (to prevent stale reads). See the [Near Cache Invalidation section](https://docs.hazelcast.org/docs/latest/manual/html-single/#near-cache-invalidation) in the Hazelcast IMDG Reference Manual. @@ -2994,7 +2473,7 @@ Near Caches are invalidated by invalidation events. Invalidation events can be l To solve this problem, Hazelcast provides eventually consistent behavior for Map Near Caches by detecting invalidation losses. After detection of an invalidation loss, stale data will be made unreachable and Near Cache’s `get` calls to that data will be directed to underlying Map to fetch the fresh data. -You can configure eventual consistency with the `ClientConfig.properties` below: +You can configure eventual consistency with entries of the `properties` config option as described below: - `hazelcast.invalidation.max.tolerated.miss.count`: Default value is `10`. If missed invalidation count is bigger than this value, relevant cached data will be made unreachable. @@ -3004,7 +2483,7 @@ You can configure eventual consistency with the `ClientConfig.properties` below: Hazelcast Node.js client performs automated pipelining of operations. It means that the library pushes all operations into an internal queue and tries to send them in batches. This reduces the count of executed `Socket.write()` calls and significantly improves throughtput for read operations. -You can configure automated operation pipelining with the `ClientConfig.properties` below: +You can configure automated operation pipelining with entries of the `properties` config option as described below: - `hazelcast.client.autopipelining.enabled`: Default value is `true`. Turns automated pipelining feature on/off. If your application does only writes operations, like `IMap.set()`, you can try disabling automated pipelining to get a slightly better throughtput. @@ -3016,19 +2495,7 @@ You can configure automated operation pipelining with the `ClientConfig.properti You can monitor your clients using Hazelcast Management Center. -As a prerequisite, you need to enable the client statistics before starting your clients. This can be done by setting the `hazelcast.client.statistics.enabled` system property to `true` on the **member** as the following: - -```xml - - ... - - true - - ... - -``` - -Also, you need to enable the client statistics in the Node.js client. There are two properties related to client statistics: +As a prerequisite, you need to enable the client statistics in the Node.js client. There are two entries supported by the `properties` config option which are related to client statistics: - `hazelcast.client.statistics.enabled`: If set to `true`, it enables collecting the client statistics and sending them to the cluster. When it is `true` you can monitor the clients that are connected to your Hazelcast cluster, using Hazelcast Management Center. Its default value is `false`. @@ -3036,49 +2503,45 @@ Also, you need to enable the client statistics in the Node.js client. There are You can enable client statistics and set a non-default period in seconds as follows: -**Declarative Configuration:** - -```json -{ - "properties": { - "hazelcast.client.statistics.enabled": true, - "hazelcast.client.statistics.period.seconds": 4 - } -} -``` - -**Programmatic Configuration:** - ```javascript -var config = new Config.ClientConfig(); -config.properties['hazelcast.client.statistics.enabled'] = true; -config.properties['hazelcast.client.statistics.period.seconds'] = 4; +const cfg = { + properties: { + 'hazelcast.client.statistics.enabled': true, + 'hazelcast.client.statistics.period.seconds': 4 + } +}; ``` After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. ### 7.9.2. Logging Configuration - By default, Hazelcast Node.js client uses a default logger which logs to the `stdout` with the `INFO` log level. You can change the log level using the `'hazelcast.logging.level'` property of the `ClientConfig.properties`. + By default, Hazelcast Node.js client uses a default logger which logs to the `stdout` with the `INFO` log level. You can change the log level using the `hazelcast.logging.level` entry of the `properties` config option. Below is an example of the logging configuration with the `OFF` log level which disables logging. ```javascript -cfg.properties['hazelcast.logging.level'] = LogLevel.OFF; +const cfg = { + properties: { + 'hazelcast.logging.level': 'OFF' + } +}; ``` - You can also implement a custom logger depending on your needs. Your custom logger must have `log`, `error`, `warn`, `info`, `debug`, `trace` methods. After implementing it, you can use your custom logger using the `customLogger` property of `ClientConfig` + You can also implement a custom logger depending on your needs. Your custom logger must have `log`, `error`, `warn`, `info`, `debug`, `trace` methods. After implementing it, you can use your custom logger using the `customLogger` config option. See the following for a custom logger example. ```javascript -var winstonAdapter = { - logger: new (winston.Logger)({ +const winstonAdapter = { + logger: winston.createLogger({ + level: 'info', transports: [ - new (winston.transports.Console)() + new winston.transports.Console({ + format: winston.format.simple() + }) ] }), - levels: [ 'error', 'warn', @@ -3086,116 +2549,80 @@ var winstonAdapter = { 'debug', 'silly' ], - log: function (level, objectName, message, furtherInfo) { this.logger.log(this.levels[level], objectName + ': ' + message, furtherInfo); }, - error: function (objectName, message, furtherInfo) { this.log(LogLevel.ERROR, objectName, message, furtherInfo); }, - warn: function (objectName, message, furtherInfo) { this.log(LogLevel.WARN, objectName, message, furtherInfo); }, - info: function (objectName, message, furtherInfo) { this.log(LogLevel.INFO, objectName, message, furtherInfo); }, - debug: function (objectName, message, furtherInfo) { this.log(LogLevel.DEBUG, objectName, message, furtherInfo); }, - trace: function (objectName, message, furtherInfo) { this.log(LogLevel.TRACE, objectName, message, furtherInfo); } - }; -cfg.customLogger = winstonAdapter; +const cfg = { + customLogger: winstonAdapter +}; ``` -Note that it is not possible to configure custom logging via declarative configuration. - ## 7.10. Defining Client Labels Through the client labels, you can assign special roles for your clients and use these roles to perform some actions specific to those client connections. -You can also group your clients using the client labels. These client groups can be blacklisted in the -Hazelcast Management Center so that they can be prevented from connecting to a cluster. -See the [related section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#changing-cluster-client-filtering) in the Hazelcast Management Center Reference Manual for more information on this topic. - -Declaratively, you can define the client labels using the `clientLabels` configuration element. See the below example. - -```json -{ - "clientLabels": [ - "role admin", - "region foo" - ] -} -``` +You can also group your clients using the client labels. These client groups can be blacklisted in Hazelcast Management Center so that they can be prevented from connecting to a cluster. See the [related section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#changing-cluster-client-filtering) in the Hazelcast Management Center Reference Manual for more information on this topic. -The equivalent programmatic approach is shown below. +You can define the client labels using the `clientLabels` config option. See the below example. ```javascript -var config = new Config.ClientConfig(); - -config.labels.add("role admin"); -config.labels.add("region foo"); +const cfg = { + clientLabels: [ + 'role admin', + 'region foo' + ] +}; ``` ## 7.11. Defining Instance Name -Each client has a name associated with it. By default, it is set to `hz.client_${CLIENT_ID}`. -`CLIENT_ID` starts from `0` and it is incremented by `1` for each new client. This id is incremented and set by the -client, so it may not be unique between different clients used by different applications. - -Declaratively, you can set the client name using the `instanceName` configuration element. +Each client has a name associated with it. By default, it is set to `hz.client_${CLIENT_ID}`. Here `CLIENT_ID` starts from `0` and it is incremented by `1` for each new client. This id is incremented and set by the client, so it may not be unique between different clients used by different applications. -```json -{ - "instanceName": "blue_client_0" -} -``` -The equivalent programmatic approach is shown below. +You can set the client name using the `instanceName` configuration element. ```javascript -var config = new Config.ClientConfig(); - -config.name = "blue_client_0"; +const cfg = { + instanceName: 'blue_client_0' +}; ``` ## 7.12. Configuring Load Balancer -`LoadBalancer` allows you to specify which cluster member to send next operation when queried. -It is up to your implementation to use different load balancing policies. -You should implement the `LoadBalancer` interface or extend the `AbstractLoadBalancer` class for that purpose. +Load Balancer configuration allows you to specify which cluster member to send next operation when queried. If it is a [smart client](#721-smart-client), only the operations that are not key-based are routed to the member that is returned by the `LoadBalancer`. If it is not a smart client, `LoadBalancer` is ignored. -By default, client uses `RoundRobinLB` which picks each cluster member in turn. Also, the client provides -`RandomLB` which picks the next member randomly as the name suggests. For the declarative configuration, -you can use `roundRobin` or `random` configuration elements as the load balancer type. +By default, client uses round robin Load Balancer which picks each cluster member in turn. Also, the client provides random Load Balancer which picks the next member randomly as the name suggests. You can use one of them by specifying `ROUND_ROBIN` or `RANDOM` value on the `loadBalancer.type` config option. The following are example configurations. -Declarative Configuration: -```json -{ - "loadBalancer": { - "type": "roundRobin" +```javascript +const cfg = { + loadBalancer: { + type: 'RANDOM' } -} +}; ``` -Programmatic Configuration: -```javascript -var config = new Config.ClientConfig(); -config.loadBalancer = new RoundRobinLB(); -``` +You can also provide a custom Load Balancer implementation to use different load balancing policies. To do so, you should implement the `LoadBalancer` interface or extend the `AbstractLoadBalancer` class for that purpose and provide the Load Balancer object into the `loadBalancer.customLoadBalancer` config option. # 8. Securing Client Connection @@ -3216,17 +2643,19 @@ Hazelcast allows you to encrypt socket level communication between Hazelcast mem ### 8.1.2. TLS/SSL for Hazelcast Node.js Clients -TLS/SSL for the Hazelcast Node.js client can be configured using the `SSLConfig` class. In order to turn it on, `enabled` property of `SSLConfig` should be set to `true`: +TLS/SSL for the Hazelcast Node.js client can be configured using the `SSLConfig` class. In order to turn it on, `enabled` property of the `network.ssl` config option should be set to `true`: ```javascript -var clientConfig = new Config.ClientConfig(); -var sslConfig = new Config.SSLConfig(); -sslConfig.enabled = true; -clientConfig.networkConfig.sslConfig = sslConfig; +const cfg = { + network: { + ssl: { + enabled: true + } + } +}; ``` -`SSLConfig` object takes various SSL options defined in the [Node.js TLS Documentation](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). You can set your custom options -object to `sslConfig.sslOptions`. +SSL config takes various SSL options defined in the [Node.js TLS Documentation](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback). You can set your custom options object to `network.ssl.sslOptions`. ### 8.1.3. Mutual Authentication @@ -3248,8 +2677,7 @@ To enable mutual authentication, firstly, you need to set the following property You can see the details of setting mutual authentication on the server side in the [Mutual Authentication section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#mutual-authentication) of the Hazelcast IMDG Reference Manual. -At the Node.js client side, you need to supply an SSL `options` object to pass to -[`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js. +At the Node.js client side, you need to supply an SSL `options` object to pass to [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js. There are two ways to provide this object to the client: @@ -3272,25 +2700,22 @@ properties. All you need to do is to specify your factory as `BasicSSLOptionsFac See [`tls.connect`](https://nodejs.org/api/tls.html#tls_tls_connect_options_callback) of Node.js for the descriptions of each option. -> `caPath`, `keyPath` and `certPath` define the file path to the respective file that stores such information. - -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "exportedName": "BasicSSLOptionsFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "rejectUnauthorized": false - } +> **NOTE: `caPath`, `keyPath` and `certPath` define the file path to the respective file that stores such information.** + +```javascript +const cfg = { + network: { + ssl: { + enabled: true, + sslOptionsFactoryProperties: { + caPath: 'ca.pem', + keyPath: 'key.pem', + certPath: 'cert.pem', + rejectUnauthorized: false } } } -} +}; ``` If these options are not enough for your application, you may write your own options factory and instruct the client @@ -3302,93 +2727,79 @@ In order to use the full range of options provided to [`tls.connect`](https://no An example configuration is shown below. -```json -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "path": "my_factory.js", - "exportedName": "SSLFactory", - "properties": { - "caPath": "ca.pem", - "keyPath": "key.pem", - "certPath": "cert.pem", - "keepOrder": true - } - } - } - } -} -``` +```javascript +const readFile = util.promisify(fs.readFile); -An example of a factory, `my_factory.js`, is shown below. +class SSLFactory { + async init(properties) { + const promises = []; + this.keepOrder = properties.userDefinedProperty1; + const self = this; -```javascript -function SSLFactory() { -} + promises.push(readFile(properties.caPath).then((data) => { + self.ca = data; + })); + promises.push(readFile(properties.keyPath).then((data) => { + self.key = data; + })); + promises.push(readFile(properties.certPath).then((data) => { + self.cert = data; + })); -SSLFactory.prototype.init = function (properties) { - var promises = []; - var readFile = Promise.promisify(fs.readFile); - this.keepOrder = properties.userDefinedProperty1; - var self = this; - - promises.push(readFile(properties.caPath).then(function (data) { - self.ca = data; - })); - promises.push(readFile(properties.keyPath).then(function (data) { - self.key = data; - })); - promises.push(readFile(properties.certPath).then(function (data) { - self.cert = data; - })); - - return Promise.all(promises).return(); -}; + return Promise.all(promises); + } -SSLFactory.prototype.getSSLOptions = function () { - var sslOpts = { - ca: this.ca, - key: this.key, - cert: this.cert, - servername: 'foo.bar.com', - rejectUnauthorized: true - }; - if (this.keepOrder) { - sslOpts.honorCipherOrder = true; - } - return sslOpts; + getSSLOptions() { + const sslOpts = { + ca: this.ca, + key: this.key, + cert: this.cert, + servername: 'foo.bar.com', + rejectUnauthorized: true + }; + if (this.keepOrder) { + sslOpts.honorCipherOrder = true; + } + return sslOpts; + } +} + +const cfg = { + network: { + ssl: { + enabled: true, + sslOptionsFactory: new SSLFactory(), + sslOptionsFactoryProperties: { + caPath: 'ca.pem', + keyPath: 'key.pem', + certPath: 'cert.pem', + keepOrder: true + } + } + } }; -exports.SSLFactory = SSLFactory; ``` -The client loads `MyFactory.js` at runtime and creates an instance of `SSLFactory`. It then calls the method `init` with -the properties section in the JSON configuration file. Lastly, the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. - -For information about the path resolution, see the [Loading Objects and Path Resolution section](#33-loading-objects-and-path-resolution). +The client calls the method `init` with the properties section defined in the configuration. Then the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. ## 8.2. Credentials -One of the key elements in Hazelcast security is the `Credentials` object, which can be used to carry all security attributes of the -Hazelcast Node.js client to Hazelcast members. Then, Hazelcast members can authenticate the clients and perform access control -checks on the client operations using this `Credentials` object. +One of the key elements in Hazelcast security is the `Credentials` object, which can be used to carry all security attributes of the Hazelcast Node.js client to Hazelcast members. Then, Hazelcast members can authenticate the clients and perform access control checks on the client operations using this `Credentials` object. To use this feature, you need to * have a class implementing the [`Credentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/Credentials.html) interface which contains the security attributes of your client * have a class implementing the [`LoginModule`](https://docs.oracle.com/javase/8/docs/api/javax/security/auth/spi/LoginModule.html?is-external=true) interface which uses the `Credentials` object during the authentication process * configure your Hazelcast member's security properties with respect to these classes before starting it. If you have started your member as described in the [Running Standalone JARs section](#1211-running-standalone-jars), see the [Adding User Library to CLASSPATH section](#1212-adding-user-library-to-classpath). -[`UsernamePasswordCredentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/UsernamePasswordCredentials.html), a basic implementation of the `Credentials` interface, is available in the Hazelcast `com.hazelcast.security` package. -`UsernamePasswordCredentials` is used for default configuration during the authentication process of both members and clients. You can also use this class to carry the security attributes of your client. +[`UsernamePasswordCredentials`](https://docs.hazelcast.org/docs/latest/javadoc/com/hazelcast/security/UsernamePasswordCredentials.html), a basic implementation of the `Credentials` interface, is available in the Hazelcast `com.hazelcast.security` package. `UsernamePasswordCredentials` is used for default configuration during the authentication process of both members and clients. You can also use this class to carry the security attributes of your client. -Hazelcast also has an abstract implementation of the `LoginModule` interface which is the `ClusterLoginModule` class in the `com.hazelcast.security` package. -You can extend this class and do the authentication on the `onLogin()` method. +Hazelcast also has an abstract implementation of the `LoginModule` interface which is the `ClusterLoginModule` class in the `com.hazelcast.security` package. You can extend this class and do the authentication on the `onLogin()` method. -Below is an example for the extension of abstract `ClusterLoginModule` class. -On the `ClientLoginModule#onLogin()` method, we are doing a simple authentication against a hardcoded username and password just for illustrative purposes. You should carry out the authentication against a security service of your choice. +Below is an example for the extension of abstract `ClusterLoginModule` class. On the `ClientLoginModule#onLogin()` method, we are doing a simple authentication against a hardcoded username and password just for illustrative purposes. You should carry out the authentication against a security service of your choice. ```java +package com.example; + import com.hazelcast.security.ClusterLoginModule; import com.hazelcast.security.UsernamePasswordCredentials; @@ -3429,14 +2840,13 @@ public class ClientLoginModule extends ClusterLoginModule { } ``` -Finally, you can configure `hazelcast.xml` as follows to enable Hazelcast security, do mandatory authentication with `ClientLoginModule` -and give the user with the name `admin` all the permissions over the map named `importantMap`. +Finally, you can configure `hazelcast.xml` as follows to enable Hazelcast security, do mandatory authentication with `ClientLoginModule` and give the user with the name `admin` all the permissions over the map named `importantMap`. ```xml - + @@ -3449,38 +2859,39 @@ and give the user with the name `admin` all the permissions over the map named ` ``` -After successfully starting a Hazelcast member as described above, you need to implement `Portable` equivalent of the `UsernamePasswordCredentials` -and register it to your client configuration. +After successfully starting a Hazelcast member as described above, you need to implement `Portable` equivalent of the `UsernamePasswordCredentials` and register it to your client configuration. Below is the code for that. **user_pass_cred.js** ```javascript -function UsernamePasswordCredentials(username, password, endpoint) { - this.username = username; - this.password = Buffer.from(password, 'utf8'); - this.endpoint = endpoint; -} +class UsernamePasswordCredentials { + constructor(username, password, endpoint) { + this.username = username; + this.password = Buffer.from(password, 'utf8'); + this.endpoint = endpoint; + } -UsernamePasswordCredentials.prototype.readPortable = function (reader) { - this.username = reader.readUTF('principal'); - this.endpoint = reader.readUTF('endpoint'); - this.password = reader.readByteArray('pwd'); -}; + readPortable = function (input) { + this.username = input.readUTF('principal'); + this.endpoint = input.readUTF('endpoint'); + this.password = input.readByteArray('pwd'); + } -UsernamePasswordCredentials.prototype.writePortable = function (writer) { - writer.writeUTF('principal', this.username); - writer.writeUTF('endpoint', this.endpoint); - writer.writeByteArray('pwd', this.password); -}; + writePortable(output) { + output.writeUTF('principal', this.username); + output.writeUTF('endpoint', this.endpoint); + output.writeByteArray('pwd', this.password); + } -UsernamePasswordCredentials.prototype.getFactoryId = function () { - return -1; -}; + getFactoryId() { + return -1; + } -UsernamePasswordCredentials.prototype.getClassId = function () { - return 1; -}; + getClassId() { + return 1; + } +} exports.UsernamePasswordCredentials = UsernamePasswordCredentials; ``` @@ -3489,17 +2900,16 @@ And below is the `Factory` implementation for the `Portable` implementation of ` **user_pass_cred_factory.js** ```javascript -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; +const { UsernamePasswordCredentials } = require('./user_pass_cred'); -function UsernamePasswordCredentialsFactory() { -} - -UsernamePasswordCredentialsFactory.prototype.create = function (classId) { - if(classId === 1){ - return new UsernamePasswordCredentials(); +class UsernamePasswordCredentialsFactory() { + create(classId) { + if (classId === 1) { + return new UsernamePasswordCredentials(); + } + return null; } - return null; -}; +} exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; ``` @@ -3507,32 +2917,24 @@ exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; Now, you can start your client by registering the `Portable` factory and giving the credentials as follows. ```javascript -var Client = require('hazelcast-client').Client; -var ClientConfig = require('hazelcast-client').Config.ClientConfig; - -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; -var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; - -var config = new ClientConfig(); -config.serializationConfig.portableVersion = 1; -config.serializationConfig.portableFactories[-1] = new UsernamePasswordCredentialsFactory(); -config.customCredentials = new UsernamePasswordCredentials('admin', 'password', '127.0.0.1'); - -Client.newHazelcastClient(config).then(function (client) { - var map; - return client.getMap('importantMap').then(function (mp) { - map = mp; - return map.put('key', 'value'); - }).then(function () { - return map.get('key'); - }).then(function (value) { - console.log(value); - return client.shutdown(); - }); -}); +const { UsernamePasswordCredentials } = require('./user_pass_cred'); +const { UsernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); + +const cfg = { + serialization: { + portableVersion: 1, + portableFactories: { + [-1]: new UsernamePasswordCredentialsFactory() + } + }, + customCredentials: new UsernamePasswordCredentials('admin', 'password', '127.0.0.1') +}; + +const client = await Client.newHazelcastClient(cfg); +// Some operations ``` -> NOTE: It is almost always a bad idea to write the credentials to wire in a clear-text format. Therefore, using TLS/SSL encryption is highly recommended while using the custom credentials as described in [TLS/SSL section]((#81-tlsssl)). +> **NOTE: It is almost always a bad idea to write the credentials to wire in a clear-text format. Therefore, using TLS/SSL encryption is highly recommended while using the custom credentials as described in [TLS/SSL section]((#81-tlsssl)).** With Hazelcast's extensible, `JAAS` based security features you can do much more than just authentication. See the [JAAS code sample](code_samples/jaas_sample) to learn how to perform access control checks on the client operations based on user groups. @@ -3542,8 +2944,7 @@ Also, see the [Security section](https://docs.hazelcast.org/docs/latest/manual/h # 9. Development and Testing -Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or -tweak the implementation to your application's needs, you can follow the steps in this section. +Hazelcast Node.js client is developed using TypeScript. If you want to help with bug fixes, develop new features or tweak the implementation to your application's needs, you can follow the steps in this section. ## 9.1. Building and Using Client From Sources @@ -3554,14 +2955,13 @@ Follow the below steps to build and install Hazelcast Node.js client from its so there may be vulnerabilities reported due to `devDependencies`. In that case, run `npm audit fix` to automatically install any compatible updates to vulnerable dependencies. 3. Run `npm run compile` to compile TypeScript files to JavaScript. -At this point you have all the runnable code (`.js`) and type declarations (`.d.ts`) in the `lib` directory. You may create a link to this module so that your local -applications can depend on your local copy of Hazelcast Node.js client. In order to create a link, run the below command: +At this point you have all the runnable code (`.js`) and type declarations (`.d.ts`) in the `lib` directory. You may create a link to this module so that your local applications can depend on your local copy of Hazelcast Node.js client. In order to create a link, run the below command: ``` npm link ``` -This will create a global link to this module in your computer. Whenever you need to depend on this module from another +This will create a global link to this module in your machine. Whenever you need to depend on this module from another local project, run the below command: ``` @@ -3578,7 +2978,7 @@ npm run lint In order to test Hazelcast Node.js client locally, you will need the following: -* Java 6 or newer +* Java 8 or newer * Maven Following command starts the tests: diff --git a/README.md b/README.md index 9195cb6f0..c420fb675 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ The quickest way to start a single member cluster for development purposes is to [Docker images](https://hub.docker.com/r/hazelcast/hazelcast/). ```bash -docker run -p 5701:5701 hazelcast/hazelcast:4.0.1 +docker run -p 5701:5701 hazelcast/hazelcast:4.0.2 ``` You can also use our ZIP or TAR [distributions](https://hazelcast.org/imdg/download/archives/#hazelcast-imdg) @@ -80,6 +80,8 @@ console.log(value); // Outputs 'value' client.shutdown(); ``` +> **NOTE: For the sake of brevity we are going to omit boilerplate parts in the above code snippet. Refer to the [Code Samples section](#16-code-samples) to see samples with the complete code.** + If you are using Hazelcast IMDG and the Node.js client on the same machine, the default configuration should work out-of-the-box. However, you may need to configure the client to connect to cluster nodes that are running on different machines or to customize client properties. @@ -87,25 +89,29 @@ different machines or to customize client properties. ### Configuration ```js -const { Client, Config } = require('hazelcast-client'); - -// Create a configuration object -const clientConfig = new Config.ClientConfig(); - -// Customize the client configuration -clientConfig.clusterName = 'cluster-name'; -clientConfig.networkConfig.addresses.push('10.90.0.2:5701'); -clientConfig.networkConfig.addresses.push('10.90.0.3:5701'); +const { Client } = require('hazelcast-client'); // Initialize the client with the given configuration -const client = await Client.newHazelcastClient(clientConfig); +const client = await Client.newHazelcastClient({ + clusterName: 'cluster-name', + network: { + clusterMembers: [ + '10.90.0.2:5701', + '10.90.0.3:5701' + ] + }, + lifecycleListeners: [ + (state) => { + console.log('Lifecycle Event >>> ' + state); + } + ] +}); console.log('Connected to cluster'); client.shutdown(); ``` -You can also configure the client -[declaratively](DOCUMENTATION.md#312-declarative-configuration-json) using a JSON file. +Refer to [the documentation](DOCUMENTATION.md) to learn more about supported configuration options. ## Features diff --git a/benchmark/README.md b/benchmark/README.md index 95e24a1ce..fd468b39c 100644 --- a/benchmark/README.md +++ b/benchmark/README.md @@ -19,7 +19,7 @@ npm run compile Next, run at least one instance of IMDG. The most simple way to do it would be to use the [official Docker image](https://hub.docker.com/r/hazelcast/hazelcast/): ```bash -docker run -p 5701:5701 hazelcast/hazelcast:3.12.1 +docker run -p 5701:5701 hazelcast/hazelcast:4.0.2 ``` Finally, run one of the benchmarks, e.g.: diff --git a/code_samples/README.md b/code_samples/README.md index b36dc738e..4ec1e493d 100644 --- a/code_samples/README.md +++ b/code_samples/README.md @@ -16,6 +16,8 @@ This folder contains an extensive collection of Hazelcast Node.js Client code sa **hazelcast-cloud-discovery.js** — Usage of cloud discovery. +**identified_data_serializable.js** — Creating and adding `IdentifiedDataSerializableFactory` to serialization configuration. + **lifecycle_listener.js** — Listening to lifecycle events of the Hazelcast instance. **list.js** — Usage of distributed list. diff --git a/code_samples/aggregation.js b/code_samples/aggregation.js index 7459230d3..b81174579 100644 --- a/code_samples/aggregation.js +++ b/code_samples/aggregation.js @@ -13,32 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Aggregators = require('hazelcast-client').Aggregators; -var Predicates = require('hazelcast-client').Predicates; +const { + Client, + Aggregators, + Predicates +} = require('hazelcast-client'); -Client.newHazelcastClient().then(function (hazelcastClient) { - var client = hazelcastClient; - var map; - hazelcastClient.getMap('person-age-map').then(function (mp) { - map = mp; - return map.putAll([ +(async () => { + try { + const client = await Client.newHazelcastClient(); + const map = await client.getMap('person-age-map'); + + await map.putAll([ ['Philip', 46], ['Elizabeth', 44], ['Henry', 13], ['Paige', 15] - ]) - }).then(function () { - return map.aggregate(Aggregators.count()); - }).then(function (count) { - console.log('There are ' + count + ' people.'); - return map.aggregateWithPredicate(Aggregators.count(), Predicates.lessEqual('this', 18)); - }).then(function (count) { - console.log('There are ' + count + ' children.'); - return map.aggregate(Aggregators.numberAvg()); - }).then(function (avgAge) { - console.log('Average age is ' + avgAge); - return client.shutdown(); - }); -}); + ]); + + let count = await map.aggregate(Aggregators.count()); + console.log(`There are ${count} people.`); + count = await map.aggregateWithPredicate(Aggregators.count(), Predicates.lessEqual('this', 18)); + console.log(`There are ${count} children.`); + const avgAge = await map.aggregate(Aggregators.numberAvg()); + console.log(`Average age is ${avgAge}`); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/client_statistics.js b/code_samples/client_statistics.js index fe72acfef..5c3b7ad02 100644 --- a/code_samples/client_statistics.js +++ b/code_samples/client_statistics.js @@ -13,37 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; +const { Client } = require('hazelcast-client'); -function createConfig() { - var cfg = new Config.ClientConfig(); +(async () => { + try { + const client = await Client.newHazelcastClient({ + nearCaches: { + // Enable near cache with all defaults + 'nearCachedMap': {} + }, + properties: { + 'hazelcast.client.statistics.enabled': true, + 'hazelcast.client.statistics.period.seconds': 2 + } + }); + const ncMap = await client.getMap('nearCachedMap'); - var nearCacheConfig = new Config.NearCacheConfig(); - cfg.nearCacheConfigs['nearCachedMap'] = nearCacheConfig; - cfg.properties['hazelcast.client.statistics.enabled'] = true; - cfg.properties['hazelcast.client.statistics.period.seconds'] = 2; - return cfg; -} + // Warm up the near cache + await ncMap.put('key1', 'value1'); + await ncMap.get('key1'); + await ncMap.get('key1'); + await ncMap.get('key1'); -Client.newHazelcastClient(createConfig()).then(function (client) { - var ncMap; - return client.getMap('nearCachedMap').then(function (map) { - ncMap = map; - return ncMap.put('key1', 'value1'); - }).then(function () { - return ncMap.get('key1'); - }).then(function () { - return ncMap.get('key1'); - }).then(function () { - return ncMap.get('key1'); - }).then(function () { - // At this point, we have 1 near cache miss, 2 near cache hits as client near cache statistics. - // Sleep more than statistics collection time and keep client running. Then, you can see the statistics - // at the Management center. - setTimeout(function () { - client.shutdown(); - }, 60000); - }); -}); + // At this point, we have 1 near cache miss, 2 near cache hits + // in client's near cache statistics. Sleep more than statistics + // collection time and keep client running. Then, you should see + // the statistics in Hazelcast Management Center + await new Promise((resolve) => setTimeout(resolve, 60000)); + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index 846f56c57..8bf267d90 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -13,32 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var cfg = new Config.ClientConfig(); +const { Client } = require('hazelcast-client'); -function TimeOfDay(hour, minute, second) { - this.hour = hour; - this.minute = minute; - this.second = second; -} +class TimeOfDay { + constructor(hour, minute, second) { + this.hour = hour; + this.minute = minute; + this.second = second; + } -TimeOfDay.prototype.hzGetCustomId = function () { - return 42; -}; + hzGetCustomId() { + return 42; + } +} -var CustomSerializer = { - getId: function () { +class CustomSerializer { + getId() { return 42; - }, - write: function (out, timeofday) { - var secondPoint = (timeofday.hour * 60 + timeofday.minute) * 60 + timeofday.second; - out.writeInt(secondPoint); - }, - read: function (inp) { - var obj = new TimeOfDay(); - var unit = inp.readInt(); + } + + write(output, timeofday) { + const secondPoint = (timeofday.hour * 60 + timeofday.minute) * 60 + timeofday.second; + output.writeInt(secondPoint); + } + + read(input) { + const obj = new TimeOfDay(); + let unit = input.readInt(); obj.second = unit % 60; unit = (unit - obj.second) / 60; obj.minute = unit % 60; @@ -47,29 +50,35 @@ var CustomSerializer = { obj.customDeserialized = true; return obj; } -}; +} -var giveInformation = function (timeofday) { +const giveInformation = (timeofday) => { console.log('-------------------'); - console.log('Custom deserialized: ' + !!(timeofday.customDeserialized)); - console.log('Hour: ' + timeofday.hour); - console.log('Minute: ' + timeofday.minute); - console.log('Second: ' + timeofday.second); + console.log('Custom deserialized:', !!(timeofday.customDeserialized)); + console.log('Hour:', timeofday.hour); + console.log('Minute:', timeofday.minute); + console.log('Second:', timeofday.second); console.log('-------------------'); }; -cfg.serializationConfig.customSerializers.push(CustomSerializer); -Client.newHazelcastClient(cfg).then(function (client) { - var map; - var t = new TimeOfDay(5, 32, 59); - giveInformation(t); - client.getMap('time').then(function (mp) { - map = mp; - return map.put(1, t) - }).then(function () { - return map.get(1); - }).then(function (deserialized) { +(async () => { + try { + const client = await Client.newHazelcastClient({ + serialization: { + customSerializers: [new CustomSerializer()] + } + }); + + const t = new TimeOfDay(5, 32, 59); + giveInformation(t); + + const map = await client.getMap('time'); + await map.put(1, t); + const deserialized = await map.get(1); giveInformation(deserialized); + client.shutdown(); - }); -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/distributed_object_listener.js b/code_samples/distributed_object_listener.js index 797ecbd10..99a368135 100644 --- a/code_samples/distributed_object_listener.js +++ b/code_samples/distributed_object_listener.js @@ -13,27 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -Client.newHazelcastClient().then(function (client) { - return client.addDistributedObjectListener(function (serviceName, name, event) { - console.log('Distributed object event >>> ' + JSON.stringify({ - serviceName: serviceName, - name: name, - event: event - })); - }).then(function () { - var map; - var mapname = 'test'; +const { Client } = require('hazelcast-client'); - // this causes a created event - return client.getMap(mapname).then(function (mp) { - map = mp; - // this causes no event because map was already created - return client.getMap(mapname); - }).then(function () { - // this causes a destroyed event - return map.destroy(); +(async () => { + try { + const client = await Client.newHazelcastClient(); + + client.addDistributedObjectListener((event) => { + console.log('Distributed object event >>>', event); }); - }); -}); + + const mapname = 'test'; + // This causes a 'created' event + let map = await client.getMap(mapname); + // This causes no event because map was already created + map = await client.getMap(mapname); + // This causes a 'destroyed' event + await map.destroy(); + + await new Promise((resolve) => setTimeout(resolve, 1000)); + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/flakeid_generator.js b/code_samples/flakeid_generator.js index dec0e71c0..d4b5309ce 100644 --- a/code_samples/flakeid_generator.js +++ b/code_samples/flakeid_generator.js @@ -13,17 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); -Client.newHazelcastClient().then(function (hazelcastClient) { - var client = hazelcastClient; - var flakeIdGenerator; - hazelcastClient.getFlakeIdGenerator('generator').then(function (gen) { - flakeIdGenerator = gen; - return flakeIdGenerator.newId(); - }).then(function (value) { - console.log('New id: ' + value.toString()); - return client.shutdown(); - }); -}); +(async () => { + try { + const client = await Client.newHazelcastClient(); + + const flakeIdGenerator = await client.getFlakeIdGenerator('generator'); + const id = await flakeIdGenerator.newId(); + console.log('Generated id:', id.toString()); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index c81c70aaa..316b0f99a 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -13,51 +13,53 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; /** * JSON serialization is not capable if handling circular references. * We will use Mousse serializer to serialize our self referring objects. */ -var mousse = require('mousse'); -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var cfg = new Config.ClientConfig(); -cfg.serializationConfig.globalSerializer = { - mousseSerialize: mousse.serialize, - mousseDeserialize: mousse.deserialize, - getId: function () { - return 10; - }, - write: function (out, obj) { - out.writeUTF(this.mousseSerialize(obj)) - }, - read: function (inp) { - var representation = inp.readUTF(); - return this.mousseDeserialize(representation).then(function (obj) { - return obj; - }); - } -}; +const mousse = require('mousse'); +const { Client } = require('hazelcast-client'); -var selfReferringObject = { +const selfReferringObject = { value: 10 }; selfReferringObject.self = selfReferringObject; -Client.newHazelcastClient(cfg).then(function (client) { - var map; - client.getMap('objects').then(function (mp) { - map = mp; - return map.put(1, selfReferringObject); - }).then(function () { - return map.get(1); - }).then(function (obj) { +(async () => { + try { + const client = await Client.newHazelcastClient({ + serialization: { + globalSerializer: { + mousseSerialize: mousse.serialize, + mousseDeserialize: mousse.deserialize, + getId: function () { + return 10; + }, + write: function (output, obj) { + output.writeUTF(this.mousseSerialize(obj)) + }, + read: function (input) { + const representation = input.readUTF(); + return this.mousseDeserialize(representation).then(function (obj) { + return obj; + }); + } + } + } + }); + + const map = await client.getMap('objects'); + await map.put(1, selfReferringObject); + + const obj = await map.get(1); console.log(obj); console.log(obj.self); console.log(obj.self.self); - client.shutdown(); - }) -}); - - + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/hazelcast_cloud_discovery.js b/code_samples/hazelcast_cloud_discovery.js index 843998b42..df92d9ca5 100644 --- a/code_samples/hazelcast_cloud_discovery.js +++ b/code_samples/hazelcast_cloud_discovery.js @@ -13,46 +13,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; + +const { Client } = require('hazelcast-client'); +const path = require('path'); + +(async () => { + try { + const cfg = { + clusterName: 'hazelcast', + network: { + hazelcastCloud: { + discoveryToken: 'EXAMPLE_TOKEN' + }, + ssl: { + enabled: true, + sslOptionsFactoryProperties: { + servername: 'Hazelcast-Inc', + rejectUnauthorized: true, + caPath: path.resolve(__dirname, './ca.pem'), + keyPath: path.resolve(__dirname, './key.pem'), + certPath: path.resolve(__dirname, './cert.pem') + } + } + } + }; + const client = await Client.newHazelcastClient(cfg); + + const map = await client.getMap('testMap'); + await map.put('key', 'value'); + const value = await map.get('key'); + console.log(value); -var Client = require('hazelcast-client').Client; -var ClientConfig = require('hazelcast-client').Config.ClientConfig; -var fs = require('fs'); -var Path = require('path'); - -// TODO test this sample with the Hazelcast Cloud -function createClientConfigWithSSLOpts(key, cert, ca) { - var sslOpts = { - servername: 'Hazelcast-Inc', - rejectUnauthorized: true, - ca: fs.readFileSync(Path.join(__dirname, ca)), - key: fs.readFileSync(Path.join(__dirname, key)), - cert: fs.readFileSync(Path.join(__dirname, cert)) - }; - var cfg = new ClientConfig(); - cfg.networkConfig.sslConfig.sslOptions = sslOpts; - - var token = 'EXAMPLE_TOKEN'; - - cfg.networkConfig.cloudConfig.enabled = true; - cfg.networkConfig.cloudConfig.discoveryToken = token; - cfg.clusterName = 'hazelcast'; - return cfg; -} - -var cfg = createClientConfigWithSSLOpts('./key.pem', './cert.pem', './ca.pem'); - -Client.newHazelcastClient(cfg).then(function (client) { - var map; - client.getMap("testMap").then(function (mp) { - map = mp; - return map.put('key', 'value'); - }).then(function () { - return map.get('key'); - }).then((res) => { - console.log(res); client.shutdown(); - }); -}); - - - + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/hazelcast_json_value.js b/code_samples/hazelcast_json_value.js index 13c4276bc..b6cd659f2 100644 --- a/code_samples/hazelcast_json_value.js +++ b/code_samples/hazelcast_json_value.js @@ -13,37 +13,45 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var Predicates = require('hazelcast-client').Predicates; -var HazelcastJsonValue = require('hazelcast-client').HazelcastJsonValue; -var JsonStringDeserializationPolicy = require('hazelcast-client').JsonStringDeserializationPolicy; +const { + Client, + Predicates, + HazelcastJsonValue +} = require('hazelcast-client'); -var config = new Config.ClientConfig(); -config.serializationConfig.jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; +(async () => { + try { + const client = await Client.newHazelcastClient({ + serialization: { + jsonStringDeserializationPolicy: 'NO_DESERIALIZATION' + } + }); -Client.newHazelcastClient(config).then(function(hz) { - var map; - return hz.getMap('employees').then(function(mp) { - map = mp; - var employees = [ + const map = await client.getMap('employees'); + const employeesData = [ { name: 'Alice', age: 35 }, { name: 'Andy', age: 22}, { name: 'Bob', age: 37 } ]; - - return map.putAll(employees.map(function (employee, index) { + await map.putAll(employeesData.map((employee, index) => { return [index, new HazelcastJsonValue(JSON.stringify(employee))]; })); - }).then(function() { - return map.valuesWithPredicate(Predicates - .and(Predicates.sql('name like A%'), Predicates.greaterThan("age", 30))); - }).then(function(values) { + + const employees = await map.valuesWithPredicate( + Predicates.and( + Predicates.sql('name like A%'), + Predicates.greaterThan("age", 30) + ) + ); // Prints all the employees whose name starts with 'A' and age is greater than 30 - values.toArray().forEach(function(value) { - console.log(value.toString()); - }); - return hz.shutdown(); - }); -}); + for (const employee of employees) { + console.log(employee.toString()); + } + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/identified_data_serializable.js b/code_samples/identified_data_serializable.js new file mode 100644 index 000000000..86604e592 --- /dev/null +++ b/code_samples/identified_data_serializable.js @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { Client } = require('hazelcast-client'); + +class Employee { + constructor(id, name) { + this.id = id; + this.name = name; + } + + readData(input) { + this.id = input.readInt(); + this.name = input.readUTF(); + } + + writeData(output) { + output.writeInt(this.id); + output.writeUTF(this.name); + } + + getFactoryId() { + return 1000; + } + + getClassId() { + return 100; + } +} + +class SampleDataSerializableFactory { + create(type) { + if (type === 100) { + return new Employee(); + } + return null; + } +} + +(async () => { + try { + const client = await Client.newHazelcastClient({ + serialization: { + dataSerializableFactories: { + 1000: new SampleDataSerializableFactory() + } + } + }); + const map = await client.getMap('my-distributed-map'); + + let employee = new Employee(42, 'John'); + await map.put('key', employee); + + employee = await map.get('key'); + console.log('Employee object:', employee); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/jaas_sample/admin_client.js b/code_samples/jaas_sample/admin_client.js index 0a40d9449..e87a5839c 100644 --- a/code_samples/jaas_sample/admin_client.js +++ b/code_samples/jaas_sample/admin_client.js @@ -13,33 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config.ClientConfig; +const { Client } = require('hazelcast-client'); +const { UsernamePasswordCredentials } = require('./user_pass_cred'); +const { UsernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; -var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; +(async () => { + try { + const adminClient = await Client.newHazelcastClient({ + serialization: { + portableFactories: { + 1: new UsernamePasswordCredentialsFactory() + } + }, + customCredentials: new UsernamePasswordCredentials('admin', 'password1', '127.0.0.1') + }); + console.log('Admin client connected'); -var adminClientConfig = new Config(); - -adminClientConfig.serializationConfig.portableFactories[1] = new UsernamePasswordCredentialsFactory(); -adminClientConfig.customCredentials = new UsernamePasswordCredentials('admin', 'password1', '127.0.0.1'); - -Client.newHazelcastClient(adminClientConfig).then(function (adminClient) { - console.log('Admin client connected'); - var adminMap; - return adminClient.getMap('importantAdminMap').then(function (map) { + const adminMap = await adminClient.getMap('importantAdminMap'); console.log('Admin can create a map'); - adminMap = map; - return adminMap.get('someKey'); - }).then(function (value) { - console.log('Admin can read from map: ' + value); - return adminMap.put('anotherKey', 'anotherValue'); // Should resolve - }).then(function () { + let value = await adminMap.get('someKey'); + console.log('Admin can read from map:', value); + await adminMap.put('anotherKey', 'anotherValue'); // Should resolve console.log('Admin can put to map'); - return adminMap.get('anotherKey'); - }).then(function (value) { - console.log('Value for the "anotherKey" is ' + value); - return adminClient.shutdown(); - }); -}); + value = await adminMap.get('anotherKey'); + console.log('Value for the "anotherKey" is', value); + + adminClient.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/jaas_sample/reader_client.js b/code_samples/jaas_sample/reader_client.js index f13188ca2..1f692e566 100644 --- a/code_samples/jaas_sample/reader_client.js +++ b/code_samples/jaas_sample/reader_client.js @@ -13,30 +13,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config.ClientConfig; +const { Client } = require('hazelcast-client'); +const { UsernamePasswordCredentials } = require('./user_pass_cred'); +const { UsernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); -var UsernamePasswordCredentials = require('./user_pass_cred').UsernamePasswordCredentials; -var UsernamePasswordCredentialsFactory = require('./user_pass_cred_factory').UsernamePasswordCredentialsFactory; +(async () => { + try { + const readerClient = await Client.newHazelcastClient({ + serialization: { + portableFactories: { + 1: new UsernamePasswordCredentialsFactory() + } + }, + customCredentials: new UsernamePasswordCredentials('reader', 'password2', '127.0.0.1') + }); + console.log('Admin client connected'); -var readerClientConfig = new Config(); - -readerClientConfig.serializationConfig.portableFactories[1] = new UsernamePasswordCredentialsFactory(); -readerClientConfig.customCredentials = new UsernamePasswordCredentials('reader', 'password2', '127.0.0.1'); - -Client.newHazelcastClient(readerClientConfig).then(function (readerClient) { - console.log('Reader client connected'); - var readerMap; - return readerClient.getMap('importantReaderMap').then(function (map) { + const readerMap = await readerClient.getMap('importantReaderMap'); console.log('Reader can create a map'); - readerMap = map; - return readerMap.get('someKey'); - }).then(function (value) { - console.log('Reader can read from map: ' + value); - return readerMap.put('anotherKey', 'anotherValue'); // Should reject - }).catch(function (err) { - console.log('Reader cannot put to map. Reason: ' + err); - return readerClient.shutdown(); - }); -}); + const value = await readerMap.get('someKey'); + console.log('Reader can read from map:', value); + try { + await readerMap.put('anotherKey', 'anotherValue'); // Should reject + } catch(err) { + console.log('Reader cannot put to map. Reason:', err); + } + + readerClient.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/jaas_sample/user_pass_cred.js b/code_samples/jaas_sample/user_pass_cred.js index 4d69cd3ab..9170c2fda 100644 --- a/code_samples/jaas_sample/user_pass_cred.js +++ b/code_samples/jaas_sample/user_pass_cred.js @@ -13,31 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -function UsernamePasswordCredentials(username, password, endpoint) { - this.username = username; - this.password = password; - this.endpoint = endpoint; -} +class UsernamePasswordCredentials { + constructor(username, password, endpoint) { + this.username = username; + this.password = password; + this.endpoint = endpoint; + } -UsernamePasswordCredentials.prototype.readPortable = function (reader) { - this.username = reader.readUTF('username'); - this.endpoint = reader.readUTF('password'); - this.password = reader.readUTF('endpoint'); -}; + readPortable(input) { + this.username = input.readUTF('username'); + this.endpoint = input.readUTF('password'); + this.password = input.readUTF('endpoint'); + } -UsernamePasswordCredentials.prototype.writePortable = function (writer) { - writer.writeUTF('username', this.username); - writer.writeUTF('password', this.password); - writer.writeUTF('endpoint', this.endpoint); -}; + writePortable(output) { + output.writeUTF('username', this.username); + output.writeUTF('password', this.password); + output.writeUTF('endpoint', this.endpoint); + } -UsernamePasswordCredentials.prototype.getFactoryId = function () { - return 1; -}; + getFactoryId() { + return 1; + } -UsernamePasswordCredentials.prototype.getClassId = function () { - return 1; -}; + getClassId() { + return 1; + } +} exports.UsernamePasswordCredentials = UsernamePasswordCredentials; diff --git a/code_samples/jaas_sample/user_pass_cred_factory.js b/code_samples/jaas_sample/user_pass_cred_factory.js index 11a9ea60e..f4ab4b9d8 100644 --- a/code_samples/jaas_sample/user_pass_cred_factory.js +++ b/code_samples/jaas_sample/user_pass_cred_factory.js @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var UsernamePasswordCredentials = require('./user_pass_cred'); +const UsernamePasswordCredentials = require('./user_pass_cred'); -function UsernamePasswordCredentialsFactory() { -} - -UsernamePasswordCredentialsFactory.prototype.create = function (classId) { - if(classId === 1){ - return new UsernamePasswordCredentials(); +class UsernamePasswordCredentialsFactory { + create(classId) { + if (classId === 1) { + return new UsernamePasswordCredentials(); + } + return null; } - return null; -}; +} exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; diff --git a/code_samples/lifecycle_listener.js b/code_samples/lifecycle_listener.js index 928227961..4c6b27814 100644 --- a/code_samples/lifecycle_listener.js +++ b/code_samples/lifecycle_listener.js @@ -13,15 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var HazelcastClient = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var cfg = new Config.ClientConfig(); +const { Client } = require('hazelcast-client'); -cfg.listeners.addLifecycleListener(function (state) { - console.log('Lifecycle Event >>> ' + state); -}); +(async () => { + try { + const client = await Client.newHazelcastClient({ + lifecycleListeners: [ + (state) => { + console.log('Lifecycle Event >>>', state); + } + ] + }); -HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - hazelcastClient.shutdown(); -}); + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/list.js b/code_samples/list.js index 465149b27..68cb06886 100644 --- a/code_samples/list.js +++ b/code_samples/list.js @@ -13,31 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); -Client.newHazelcastClient().then(function (hazelcastClient) { - var client = hazelcastClient; - var list; - hazelcastClient.getList('people').then(function (l) { - list = l; - return list.add('John'); - }).then(function (value) { - console.log('Added John.'); - return list.add('Jane', 1); - }).then(function () { - console.log('Added Jane to index 1.'); - return list.add('Thomas'); - }).then(function () { - console.log('Added Thomas.'); - return list.remove('Jane'); - }).then(function (value) { - console.log('Removed Jane.'); - return list.removeAt(1); - }).then(function (value) { - console.log('Removed ' + value); - return client.shutdown(); - }); -}); +(async () => { + try { + const client = await Client.newHazelcastClient(); + const list = await client.getList('people'); + await list.add('John'); + console.log('Added John'); + await list.add('Jane', 1); + console.log('Added Jane to index 1'); + await list.add('Thomas'); + console.log('Added Thomas'); + await list.remove('Jane'); + console.log('Removed Jane'); + const removedItem = await list.removeAt(1); + console.log('Removed', removedItem); + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/logging.js b/code_samples/logging.js index de3a1823d..73338fe2f 100644 --- a/code_samples/logging.js +++ b/code_samples/logging.js @@ -13,21 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var winston = require('winston'); -var Config = require('hazelcast-client').Config; -var HazelcastClient = require('hazelcast-client').Client; -var LogLevel = require('hazelcast-client').LogLevel; +const { + Client, + LogLevel +} = require('hazelcast-client'); +const winston = require('winston'); -var cfg = new Config.ClientConfig(); - -var winstonAdapter = { - logger: new (winston.Logger)({ +const winstonAdapter = { + logger: winston.createLogger({ + level: 'info', transports: [ - new (winston.transports.Console)() + new winston.transports.Console({ + format: winston.format.simple() + }) ] }), - levels: [ 'error', 'warn', @@ -35,33 +37,34 @@ var winstonAdapter = { 'debug', 'silly' ], - log: function (level, objectName, message, furtherInfo) { this.logger.log(this.levels[level], objectName + ': ' + message, furtherInfo); }, - error: function (objectName, message, furtherInfo) { this.log(LogLevel.ERROR, objectName, message, furtherInfo); }, - warn: function (objectName, message, furtherInfo) { this.log(LogLevel.WARN, objectName, message, furtherInfo); }, - info: function (objectName, message, furtherInfo) { this.log(LogLevel.INFO, objectName, message, furtherInfo); }, - debug: function (objectName, message, furtherInfo) { this.log(LogLevel.DEBUG, objectName, message, furtherInfo); }, - trace: function (objectName, message, furtherInfo) { this.log(LogLevel.TRACE, objectName, message, furtherInfo); } }; -cfg.customLogger = winstonAdapter; -HazelcastClient.newHazelcastClient(cfg).then(function (client) { - client.shutdown(); -}); +(async () => { + try { + const client = await Client.newHazelcastClient({ + customLogger: winstonAdapter + }); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/map.js b/code_samples/map.js index 2c35c0c7f..2e664c90d 100644 --- a/code_samples/map.js +++ b/code_samples/map.js @@ -13,33 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); -Client.newHazelcastClient().then(function (hazelcastClient) { - var client = hazelcastClient; - var map; - hazelcastClient.getMap('my-distributed-map').then(function (mp) { - map = mp; - return map.put('key', 'value'); - }).then(function () { - return map.get('key'); - }).then(function (val) { - console.log(val); +(async () => { + try { + const client = await Client.newHazelcastClient(); + const map = await client.getMap('my-distributed-map'); - return map.remove('key'); - }).then(function () { - return map.put('disappearing-key', 'this string will disappear after ttl', 1000); - }).then(function (value) { - return map.get('disappearing-key'); - }).then(function (value) { - console.log(value); + await map.put('key', 'value'); + const value = await map.get('key'); + console.log('Plain value:', value); + await map.remove('key'); - setTimeout(function () { - map.get('disappearing-key').then(function (value) { - console.log(value); - return client.shutdown(); - }); - }, 1000) - }); -}); + await map.put('disappearing-key', 'this string will disappear after TTL', 1000); + let disappearingValue = await map.get('disappearing-key'); + console.log('Disappearing value:', disappearingValue); + + await new Promise((resolve) => setTimeout(resolve, 1000)); + disappearingValue = await map.get('disappearing-key'); + console.log('Disappeared value:', disappearingValue); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/map_entry_listener.js b/code_samples/map_entry_listener.js index 6472683ee..5a25bfa8a 100644 --- a/code_samples/map_entry_listener.js +++ b/code_samples/map_entry_listener.js @@ -13,37 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var listener = { - added: function (entryEvent) { - console.log('added key: ' + entryEvent.key + ', new value: ' + entryEvent.value - + ', old value: ' + entryEvent.oldValue); - }, - removed: function (entryEvent) { - console.log('removed key: ' + entryEvent.key + ', new value: ' + entryEvent.value - + ', old value: ' + entryEvent.oldValue); - } -}; +const { Client } = require('hazelcast-client'); + +(async () => { + try { + const client = await Client.newHazelcastClient(); + const map = await client.getMap('notifications'); -var pushNotification = function (map, key, value) { - return map.put(key, value); -}; + const listener = { + added: (entryEvent) => { + console.log('Added key: ' + entryEvent.key + + ', new value: ' + entryEvent.value + + ', old value: ' + entryEvent.oldValue); + }, + removed: (entryEvent) => { + console.log('Removed key: ' + entryEvent.key + + ', new value: ' + entryEvent.value + + ', old value: ' + entryEvent.oldValue); + } + }; + await map.addEntryListener(listener, undefined, true); -var removeNotification = function (map, key) { - return map.remove(key); -}; + await map.put(1, 'new-value'); + await map.remove(1); -Client.newHazelcastClient().then(function (client) { - var map; - client.getMap('notifications').then(function (mp) { - map = mp; - return map.addEntryListener(listener, undefined, true); - }).then(function () { - return pushNotification(map, 1, 'new-value'); - }).then(function () { - return removeNotification(map, 1); - }).then(function () { client.shutdown(); - }); -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/membership_listener.js b/code_samples/membership_listener.js index cefa91cfa..7f1ffac00 100644 --- a/code_samples/membership_listener.js +++ b/code_samples/membership_listener.js @@ -13,23 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); -Client.newHazelcastClient().then(function (client) { +(async () => { + try { + const client = await Client.newHazelcastClient(); - // when a member is added and removed or its attribute is changed, member events are invoked. - var membershipListener = { - memberAdded: function (membershipEvent) { - console.log('Member Added:', membershipEvent.member.address); - }, - memberRemoved: function (membershipEvent) { - console.log('Member Removed:', membershipEvent.member.address); - }, - memberAttributeChanged: function (memberAttributeEvent) { - console.log('Member Attribute Changed:', memberAttributeEvent.member.address); + const membershipListener = { + memberAdded: (event) => { + console.log('Member Added:', event.member.address); + }, + memberRemoved: (event) => { + console.log('Member Removed:', event.member.address); + } } + // When a member is added and removed, the listener will be triggered + client.getClusterService().addMembershipListener(membershipListener); + } catch (err) { + console.error('Error occurred:', err); } - - client.clusterService.addMembershipListener(membershipListener); -}); +})(); diff --git a/code_samples/near_cache.js b/code_samples/near_cache.js index 2afd38d96..f40edcd3f 100644 --- a/code_samples/near_cache.js +++ b/code_samples/near_cache.js @@ -13,57 +13,48 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var EvictionPolicy = require('hazelcast-client').EvictionPolicy; +const { Client } = require('hazelcast-client'); -var nearCachedMapName = 'nearCachedMap'; -var regularMapName = 'reqularMap'; -var client; +async function do50000Gets(client, mapName) { + const label = '50,000 gets for ' + mapName; + console.time(label); -var cfg = new Config.ClientConfig(); -var nearCacheConfig = new Config.NearCacheConfig(); -nearCacheConfig.name = nearCachedMapName; -nearCacheConfig.evictionPolicy = EvictionPolicy.LFU; -nearCacheConfig.invalidateOnChange = true; -cfg.nearCacheConfigs[nearCachedMapName] = nearCacheConfig; + const map = await client.getMap(mapName); -function do50000Gets(client, mapName) { - var timerStart; - var timerEnd; - var map; + await map.put('item', 'anItem'); + // Warm up the cache + await map.get('item'); - return client.getMap(mapName).then(function (mp) { - map = mp; - return map.put('item', 'anItem'); - }).then(function () { - // warm up the cache - return client.getMap(mapName); - }).then(function (mp) { - map = mp; - return map.get('item'); - }).then(function () { - timerStart = Date.now(); - var requests = []; - for (var i = 0; i < 50000; i++) { - requests.push(client.getMap(mapName).then(function (mp) { - map = mp; - return map.get('item'); - })); - } - return Promise.all(requests); - }).then(function () { - timerEnd = Date.now(); - console.log('Took ' + (timerEnd - timerStart) + ' ms to do 50000 gets on ' + mapName + '.'); - }); + const requests = []; + for (let i = 0; i < 50000; i++) { + requests.push(map.get('item')); + } + await Promise.all(requests); + + console.timeEnd(label); } -Client.newHazelcastClient(cfg).then(function (cl) { - client = cl; - return do50000Gets(client, nearCachedMapName); -}).then(function () { - return do50000Gets(client, regularMapName); -}).then(function () { - client.shutdown(); -}); +(async () => { + try { + const nearCachedMapName = 'nearCachedMap'; + const regularMapName = 'reqularMap'; + + const client = await Client.newHazelcastClient({ + nearCaches: { + [nearCachedMapName]: { + evictionPolicy: 'LFU', + invalidateOnChange: true + } + } + }); + + await do50000Gets(client, nearCachedMapName); + await do50000Gets(client, regularMapName); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/CustomSerializerSample.js b/code_samples/org-website/CustomSerializerSample.js index fb52da6f9..c774816ac 100644 --- a/code_samples/org-website/CustomSerializerSample.js +++ b/code_samples/org-website/CustomSerializerSample.js @@ -13,48 +13,56 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; +const { Client } = require('hazelcast-client'); -function CustomSerializable(value) { - this.value = value; -} - -CustomSerializable.prototype.hzGetCustomId = function () { - return 10; -}; +class CustomSerializable { + constructor(value) { + this.value = value; + } -function CustomSerializer() { - //Constructor function + hzGetCustomId() { + return 10; + } } -CustomSerializer.prototype.getId = function () { - return 10; -}; - -CustomSerializer.prototype.write = function (output, t) { - output.writeInt(t.value.length); - for (var i = 0; i < t.value.length; i++) { - output.writeInt(t.value.charCodeAt(i)); +class CustomSerializer { + getId() { + return 10; } -}; -CustomSerializer.prototype.read = function (reader) { - var len = reader.readInt(); - var str = ''; - for (var i = 0; i < len; i++) { - str = str + String.fromCharCode(reader.readInt()); + read(input) { + const len = input.readInt(); + let str = ''; + for (let i = 0; i < len; i++) { + str = str + String.fromCharCode(input.readInt()); + } + return new CustomSerializable(str); } - return new CustomSerializable(str); -}; -var cfg = new Config.ClientConfig(); -cfg.serializationConfig.customSerializers.push(new CustomSerializer()); + write(output, obj) { + output.writeInt(obj.value.length); + for (let i = 0; i < obj.value.length; i++) { + output.writeInt(obj.value.charCodeAt(i)); + } + } +} -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient(cfg).then(function (hz) { - //CustomSerializer will serialize/deserialize CustomSerializable objects - hz.shutdown(); -}); +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient({ + serialization: { + customSerializers: [new CustomSerializer()] + } + }); + // CustomSerializer will serialize/deserialize CustomSerializable objects + // Shutdown this Hazelcast client + hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/EntryProcessorSample.js b/code_samples/org-website/EntryProcessorSample.js index f8cab484c..7c60be9e7 100644 --- a/code_samples/org-website/EntryProcessorSample.js +++ b/code_samples/org-website/EntryProcessorSample.js @@ -13,59 +13,63 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; +const { Client } = require('hazelcast-client'); -function IdentifiedEntryProcessor(value) { - // Constructor function -} - -IdentifiedEntryProcessor.prototype.readData = function (inp) { -}; - -IdentifiedEntryProcessor.prototype.writeData = function (outp) { -}; +class IdentifiedEntryProcessor { + constructor(value) { + // Constructor function + } -IdentifiedEntryProcessor.prototype.getFactoryId = function () { - return 1; -}; + readData(input) { + } -IdentifiedEntryProcessor.prototype.getClassId = function () { - return 9; -}; + writeData(output) { + } -function EntryProcessorDataSerializableFactory() { + getFactoryId() { + return 1; + } + getClassId() { + return 9; + } } -EntryProcessorDataSerializableFactory.prototype.create = function (type) { - if (type === 1) { - return new IdentifiedEntryProcessor(); +class EntryProcessorDataSerializableFactory() { + create(type) { + if (type === 1) { + return new IdentifiedEntryProcessor(); + } + return null; } - return null; -}; +} -var cfg = new Config.ClientConfig(); -cfg.serializationConfig.dataSerializableFactories[1] = new EntryProcessorDataSerializableFactory(); -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient(cfg).then(function (hz) { - var map; - // Get the Distributed Map from Cluster. - hz.getMap('my-distributed-map').then(function (mp) { - map = mp; +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient({ + serialization: { + dataSerializableFactories: { + 1: new EntryProcessorDataSerializableFactory() + } + } + }); + // Get the Distributed Map from Cluster + const map = hz.getMap('my-distributed-map'); // Put the double value of 0 into the Distributed Map - return map.put('key', 0); - }).then(function () { - // Run the IdentifiedEntryProcessor class on the Hazelcast Cluster Member holding the key called "key" - return map.executeOnKey('key', new IdentifiedEntryProcessor()); - }).then(function () { - // Show that the IdentifiedEntryProcessor updated the value. - return map.get('key'); - }).then(function (value) { + await map.put('key', 0); + // Run the IdentifiedEntryProcessor class on the Cluster Member + // holding the key called 'key' + await map.executeOnKey('key', new IdentifiedEntryProcessor()); + // Show that the IdentifiedEntryProcessor updated the value + const value = await map.get('key'); console.log(value); - // Shutdown the Hazelcast Cluster Member + // Shutdown this Hazelcast client hz.shutdown(); - }) -}); - + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/GlobalSerializerSample.js b/code_samples/org-website/GlobalSerializerSample.js index ee55ad0ce..d7f5cccfd 100644 --- a/code_samples/org-website/GlobalSerializerSample.js +++ b/code_samples/org-website/GlobalSerializerSample.js @@ -13,33 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var cfg = new Config.ClientConfig(); +const { Client } = require('hazelcast-client'); -function GlobalSerializer() { - // Constructor function -} - -GlobalSerializer.prototype.getId = function () { - return 20; -}; - -GlobalSerializer.prototype.read = function (input) { - // return MyFavoriteSerializer.deserialize(input.readByteArray()); -}; - -GlobalSerializer.prototype.write = function (output, obj) { - // output.writeByteArray(MyFavoriteSerializer.serialize(obj)) -}; - -cfg.serializationConfig.globalSerializer = new GlobalSerializer(); -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient(cfg).then(function (hz) { - // GlobalSerializer will serialize/deserialize all non-builtin types - hz.shutdown(); -}); +class GlobalSerializer { + getId() { + return 20; + } + read(input) { + // return MyFavoriteSerializer.deserialize(input.readByteArray()); + } + write(output, obj) { + // output.writeByteArray(MyFavoriteSerializer.serialize(obj)) + } +} +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient({ + serialization: { + globalSerializer: new GlobalSerializer() + } + }); + // GlobalSerializer will serialize/deserialize all non-builtin types + + // Shutdown this Hazelcast client + hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/IdentifiedDataSerializableSample.js b/code_samples/org-website/IdentifiedDataSerializableSample.js index 4c6e87436..af55d9b3f 100644 --- a/code_samples/org-website/IdentifiedDataSerializableSample.js +++ b/code_samples/org-website/IdentifiedDataSerializableSample.js @@ -13,49 +13,60 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; +const { Client } = require('hazelcast-client'); -function Employee(id, name) { - this.id = id; - this.name = name; -} - -Employee.prototype.readData = function (input) { - this.id = input.readInt(); - this.name = input.readUTF(); -}; +class Employee { + constructor(id, name) { + this.id = id; + this.name = name; + } -Employee.prototype.writeData = function (output) { - output.writeInt(this.id); - output.writeUTF(this.name); -}; + readData(input) { + this.id = input.readInt(); + this.name = input.readUTF(); + } -Employee.prototype.getFactoryId = function () { - return 1000; -}; + writeData(output) { + output.writeInt(this.id); + output.writeUTF(this.name); + } -Employee.prototype.getClassId = function () { - return 100; -}; + getFactoryId() { + return 1000; + } -function SampleDataSerializableFactory() { - // Constructor function + getClassId() { + return 100; + } } -SampleDataSerializableFactory.prototype.create = function (type) { - if (type === 100) { - return new Employee(); +class SampleDataSerializableFactory { + create(type) { + if (type === 100) { + return new Employee(); + } + return null; } - return null; -}; +} -var cfg = new Config.ClientConfig(); -cfg.serializationConfig.dataSerializableFactories[1000] = new SampleDataSerializableFactory(); -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient(cfg).then(function (hz) { - // Employee can be used here - hz.shutdown(); -}); +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient({ + serialization: { + dataSerializableFactories: { + 1000: new SampleDataSerializableFactory() + } + } + }); + // Employee can be used here + // Shutdown this Hazelcast client + hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/ListSample.js b/code_samples/org-website/ListSample.js index 222539aea..df1cac25b 100644 --- a/code_samples/org-website/ListSample.js +++ b/code_samples/org-website/ListSample.js @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var list; - // Get the Distributed List from Cluster. - hz.getList('my-distributed-list').then(function (l) { - list = l; +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get the Distributed List from Cluster + const list = await hz.getList('my-distributed-list'); // Add elements to the list - return list.add('item1'); - }).then(function () { - return list.add('item2'); - }).then(function () { + await list.add('item1'); + await list.add('item2'); //Remove the first element - return list.removeAt(0); - }).then(function (value) { - console.log(value); + const value = await list.removeAt(0); + console.log('Removed:', value); // There is only one element left - return list.size(); - }).then(function (len) { - console.log(len); + const len = await list.size(); + console.log('Current size is', len); // Clear the list - return list.clear(); - }).then(function () { + await list.clear(); // Shutdown this Hazelcast client hz.shutdown(); - }); -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/MapSample.js b/code_samples/org-website/MapSample.js index a625de6d4..709510c88 100644 --- a/code_samples/org-website/MapSample.js +++ b/code_samples/org-website/MapSample.js @@ -13,25 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var map; - // Get the Distributed Map from Cluster. - hz.getMap('my-distributed-map').then(function (mp) { - map = mp; - // Standard Put and Get. - return map.put('key', 'value'); - }).then(function () { - return map.get('key'); - }).then(function (val) { +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get the Distributed Map from Cluster + const map = await hz.getMap('my-distributed-map'); + // Standard Put and Get + await map.put('key', 'value'); + await map.get('key'); // Concurrent Map methods, optimistic updating - return map.putIfAbsent('somekey', 'somevalue'); - }).then(function () { - return map.replace('key', 'value', 'newvalue'); - }).then(function (value) { + await map.putIfAbsent('somekey', 'somevalue'); + await map.replace('key', 'value', 'newvalue'); // Shutdown this Hazelcast client hz.shutdown(); - }); -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/MultiMapSample.js b/code_samples/org-website/MultiMapSample.js index a9e788c0a..86cb74303 100644 --- a/code_samples/org-website/MultiMapSample.js +++ b/code_samples/org-website/MultiMapSample.js @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var multiMap; - // Get the Distributed MultiMap from Cluster. - hz.getMultiMap('my-distributed-multimap').then(function (mmp) { - multiMap = mmp; +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get the Distributed MultiMap from Cluster + const multiMap = await hz.getMap('my-distributed-multimap'); // Put values in the map against the same key - return multiMap.put('my-key', 'value1'); - }).then(function () { - return multiMap.put('my-key', 'value2'); - }).then(function () { - return multiMap.put('my-key', 'value3'); - }).then(function () { - // Print out all the values for associated with key called "my-key" - return multiMap.get('my-key') - }).then(function (values) { - for (value of values) { + await multiMap.put('my-key', 'value1'); + await multiMap.put('my-key', 'value2'); + await multiMap.put('my-key', 'value3'); + // Print out all the values for associated with key called 'my-key' + const values = await multiMap.get('my-key'); + for (const value of values) { console.log(value); } // remove specific key/value pair - return multiMap.remove('my-key', 'value2'); - }).then(function () { + await multiMap.remove('my-key', 'value2'); // Shutdown this Hazelcast client hz.shutdown(); - }); -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/PortableSerializableSample.js b/code_samples/org-website/PortableSerializableSample.js index d4dd038ad..9a71b842e 100644 --- a/code_samples/org-website/PortableSerializableSample.js +++ b/code_samples/org-website/PortableSerializableSample.js @@ -13,53 +13,64 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var Long = require('long'); +const { Client } = require('hazelcast-client'); +const Long = require('long'); -function Customer(name, id, lastOrder) { - this.name = name; - this.id = id; - this.lastOrder = lastOrder; -} - -Customer.prototype.readPortable = function (reader) { - this.name = reader.readUTF('name'); - this.id = reader.readInt('id'); - this.lastOrder = reader.readLong('lastOrder').toNumber(); -}; +class Customer { + constructor(name, id, lastOrder) { + this.name = name; + this.id = id; + this.lastOrder = lastOrder; + } -Customer.prototype.writePortable = function (writer) { - writer.writeUTF('name', this.name); - writer.writeInt('id', this.id); - writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); -}; + readPortable(input) { + this.name = input.readUTF('name'); + this.id = input.readInt('id'); + this.lastOrder = input.readLong('lastOrder').toNumber(); + } -Customer.prototype.getFactoryId = function () { - return 1; -}; + writePortable(output) { + output.writeUTF('name', this.name); + output.writeInt('id', this.id); + output.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); + } -Customer.prototype.getClassId = function () { - return 1; -}; + getFactoryId() { + return 1; + } -function PortableFactory() { - // Constructor function + getClassId() { + return 1; + } } -PortableFactory.prototype.create = function (classId) { - if (classId === 1) { - return new Customer(); +class PortableFactory { + create(classId) { + if (classId === 1) { + return new Customer(); + } + return null; } - return null; -}; +} -var cfg = new Config.ClientConfig(); -cfg.serializationConfig.portableFactories[1] = new PortableFactory(); -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient(cfg).then(function (hz) { - //Customer can be used here - hz.shutdown(); -}); +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient({ + serialization: { + portableFactories: { + 1: new PortableFactory() + } + } + }); + // Customer can be used here + // Shutdown this Hazelcast client + hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/QuerySample.js b/code_samples/org-website/QuerySample.js index 7cc14542c..c9dc8296a 100644 --- a/code_samples/org-website/QuerySample.js +++ b/code_samples/org-website/QuerySample.js @@ -13,78 +13,86 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Predicates = require('hazelcast-client').Predicates; -var Config = require('hazelcast-client').Config; +const { + Client, + Predicates +} = require('hazelcast-client'); -function User(username, age, active) { - this.username = username; - this.age = age; - this.active = active; -} - -User.prototype.readPortable = function (reader) { - this.username = reader.readUTF('username'); - this.age = reader.readInt('age'); - this.active = reader.readBoolean('active'); -}; +class User { + constructor(username, age, active) { + this.username = username; + this.age = age; + this.active = active; + } -User.prototype.writePortable = function (writer) { - writer.writeUTF('username', this.username); - writer.writeInt('age', this.age); - writer.writeBoolean('active', this.active); -}; + readPortable(input) { + this.username = input.readUTF('username'); + this.age = input.readInt('age'); + this.active = input.readBoolean('active'); + } -User.prototype.getFactoryId = function () { - return 1; -}; + writePortable(output) { + output.writeUTF('username', this.username); + output.writeInt('age', this.age); + output.writeBoolean('active', this.active); + } -User.prototype.getClassId = function () { - return 1; -}; + getFactoryId() { + return 1; + } -function PortableFactory() { - // Constructor sample + getClassId() { + return 1; + } } -PortableFactory.prototype.create = function (classId) { - if (classId === 1) { - return new User(); +class PortableFactory { + create(classId) { + if (classId === 1) { + return new User(); + } + return null; } - return null; -}; +} -function generateUsers(users) { - return users.put('Rod', new User('Rod', 19, true)).then(function () { - return users.put('Jane', new User('Jane', 20, true)); - }).then(function () { - return users.put('Freddy', new User('Freddy', 23, true)); - }); +async function generateUsers(usersMap) { + await usersMap.put('Rod', new User('Rod', 19, true)); + await usersMap.put('Jane', new User('Jane', 20, true)); + await usersMap.put('Freddy', new User('Freddy', 23, true)); } -var cfg = new Config.ClientConfig(); -cfg.serializationConfig.portableFactories[1] = new PortableFactory(); -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient(cfg).then(function (hz) { - var users; - // Get a Distributed Map called "users" - hz.getMap('users').then(function (mp) { - users = mp; +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient({ + serialization: { + portableFactories: { + 1: new PortableFactory() + } + } + }); + const usersMap = await hz.getMap('users'); // Add some users to the Distributed Map - return generateUsers(users) - }).then(function () { - // Create a Predicate - var criteriaQuery = Predicates.and( + await generateUsers(usersMap); + // Create a Predicate from a String (a SQL like Where clause) + const sqlQuery = Predicates.sql('active AND age BETWEEN (18 AND 21)'); + // Creating the same Predicate as above but with a builder + const criteriaQuery = Predicates.and( Predicates.equal('active', true), Predicates.between('age', 18, 21) ); - // Get result collections using the the Predicate - return users.valuesWithPredicate(criteriaQuery); - }).then(function (values) { + // Get result collections using the two different Predicates + const result1 = await usersMap.values(sqlQuery); + const result2 = await usersMap.values(criteriaQuery); // Print out the results - console.log(values.toArray()); - // Shutdown this Hazelcast Client + console.log(result1.toArray()); + console.log(result2.toArray()); + // Shutdown this Hazelcast client hz.shutdown(); - }) -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/QueueSample.js b/code_samples/org-website/QueueSample.js index 2882bf6ea..f8eb163cf 100644 --- a/code_samples/org-website/QueueSample.js +++ b/code_samples/org-website/QueueSample.js @@ -13,32 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var queue; - // Get a Blocking Queue called "my-distributed-queue" - hz.getQueue('my-distributed-queue').then(function (q) { - queue = q; - // Offer a String into the Distributed Queue - return queue.offer('item'); - }).then(function () { - // Poll the Distributed Queue and return the String - return queue.poll(); - }).then(function () { - // Timed blocking Operations - return queue.offer('anotheritem', 500); - }).then(function () { - return queue.poll(5000); - }).then(function () { - // Indefinitely blocking Operations - return queue.put('yetanotheritem'); - }).then(function () { - return queue.take(); - }).then(function (value) { - console.log(value); +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get a Queue called 'my-distributed-queue' + const queue = await hz.getQueue('my-distributed-queue'); + // Offer a string into the Distributed Queue + await queue.offer('item'); + // Poll the Distributed Queue and return the string + await queue.poll(); + // Timed-restricted operations + await queue.offer('anotheritem', 500); + await queue.poll(5000); + // Indefinitely-waiting operations + await queue.put('yetanotheritem'); + const item = await await queue.take(); + console.log(item); // Shutdown this Hazelcast Client hz.shutdown(); - }) -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/ReliableTopicSample.js b/code_samples/org-website/ReliableTopicSample.js index 75693c024..9745fa605 100644 --- a/code_samples/org-website/ReliableTopicSample.js +++ b/code_samples/org-website/ReliableTopicSample.js @@ -13,23 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var topic; - // Get a Topic called "my-distributed-topic" - hz.getReliableTopic('my-distributed-topic').then(function (t) { - topic = t; +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get a Topic called 'my-distributed-topic' + const topic = await hz.getReliableTopic('my-distributed-topic'); // Add a Listener to the Topic - topic.addMessageListener(function (message) { + topic.addMessageListener((message) => { console.log(message); }); // Publish a message to the Topic - return topic.publish('Hello to distributed world'); - }).then(function () { + await topic.publish('Hello to distributed world'); // Shutdown this Hazelcast Client hz.shutdown(); - }); - -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/ReplicatedMapSample.js b/code_samples/org-website/ReplicatedMapSample.js index 803bce4bc..97197b998 100644 --- a/code_samples/org-website/ReplicatedMapSample.js +++ b/code_samples/org-website/ReplicatedMapSample.js @@ -13,24 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var map; - // Get a Replicated Map called "my-replicated-map" - hz.getReplicatedMap('my-replicated-map').then(function (rmp) { - map = rmp; +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get a Replicated Map called 'my-replicated-map' + const map = await hz.getReplicatedMap('my-replicated-map'); // Put and Get a value from the Replicated Map - // key/value replicated to all members - return map.put('key', 'value'); - }).then(function (replacedValue) { - console.log('replaced value = ' + replacedValue); // Will be null as its first update - return map.get('key'); - }).then(function (value) { + // (key/value is replicated to all members) + const replacedValue = await map.put('key', 'value'); + // Will print 'Replaced value: null' as it's the first update + console.log('Replaced value:', replacedValue); + const value = await map.get('key'); // The value is retrieved from a random member in the cluster - console.log('value for key = ' + value); - // Shutdown this Hazelcast Client + console.log('Value for key:', value); + // Shutdown this Hazelcast client hz.shutdown(); - }); -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/RingBufferSample.js b/code_samples/org-website/RingBufferSample.js index 0e0b75ac6..4eab660e5 100644 --- a/code_samples/org-website/RingBufferSample.js +++ b/code_samples/org-website/RingBufferSample.js @@ -13,29 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var rb; - // Get a Ringbuffer called "rb" - hz.getRingbuffer('rb').then(function (buffer) { - rb = buffer; - return rb.add(100); - }).then(function () { - return rb.add(200); - }).then(function (value) { - // we start from the oldest item. - // if you want to start from the next item, call rb.tailSequence()+1 - return rb.headSequence(); - }).then(function (sequence) { - return rb.readOne(sequence).then(function (value) { - console.log(value); - return rb.readOne(sequence.add(1)); - }).then(function (value) { - console.log(value); - // Shutdown this Hazelcast Client - hz.shutdown(); - }); - }); -}); +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get a Ringbuffer called 'rb' + const rb = await hz.getRingbuffer('rb'); + await rb.add(100); + let value = await rb.add(200); + // We start from the oldest item. If you want to start from + // the next item, call rb.tailSequence()+1 + const sequence = await rb.headSequence(); + value = await rb.readOne(sequence); + console.log('Head value:', value); + value = await rb.readOne(sequence.add(1)); + console.log('Next value:', value); + // Shutdown this Hazelcast client + hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/SetSample.js b/code_samples/org-website/SetSample.js index 825a5ae49..292267bbe 100644 --- a/code_samples/org-website/SetSample.js +++ b/code_samples/org-website/SetSample.js @@ -13,33 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -// Start the Hazelcast Client and connect to an already running Hazelcast Cluster on 127.0.0.1 -Client.newHazelcastClient().then(function (hz) { - var set; - // Get the Distributed Set from Cluster. - hz.getSet('my-distributed-set').then(function (s) { - set = s; +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get the Distributed Set from Cluster + const set = await hz.getSet('my-distributed-set'); // Add items to the set with duplicates - return set.add('item1'); - }).then(function () { - return set.add('item1'); - }).then(function () { - return set.add('item2'); - }).then(function () { - return set.add('item2'); - }).then(function () { - return set.add('item2'); - }).then(function () { - return set.add('item3'); - }).then(function () { + await set.add('item1'); + await set.add('item1'); + await set.add('item2'); + await set.add('item2'); + await set.add('item2'); + await set.add('item3'); // Get the items. Note that there are no duplicates - return set.toArray(); - }).then(function (values) { - console.log(values); - }).then(function () { + const items = await set.toArray(); + console.log(items); // Shutdown this Hazelcast client hz.shutdown(); - }); -}); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/paging_predicate.js b/code_samples/paging_predicate.js index fbccb7a68..693c4fcc5 100644 --- a/code_samples/paging_predicate.js +++ b/code_samples/paging_predicate.js @@ -13,79 +13,73 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config; -var Predicates = require('hazelcast-client').Predicates; -var cfg = new Config.ClientConfig(); +const { + Client, + Predicates +} = require('hazelcast-client'); -//This comparator is both a comparator and an IdentifiedDataSerializable. -//Note that a comparator should be a serializable object( IdentifiedDataSerializable or Portable) -//because Hazelcast server should be able to deserialize the comparator in order to sort entries. -//So the same class should be registered to Hazelcast server instance. -var comparator = { - getFactoryId: function () { - return 1; - }, - - getClassId: function () { - return 10; - }, - - //This comparator sorts entries according to their keys in reverse alphabetical order. - sort: function (a, b) { +// This comparator is both a comparator and an IdentifiedDataSerializable. +// Note that a comparator should be a serializable object (IdentifiedDataSerializable +// or Portable) because Hazelcast members should be able to deserialize the +// comparator in order to sort entries. So the same class should be registered +// to Hazelcast server instance. +const comparator = { + getFactoryId: () => 1, + getClassId: () => 10, + // This comparator sorts entries according to their keys + // in reverse alphabetical order. + sort: (a, b) => { if (a[0] > b[0]) return -1; if (a[0] < b[0]) return 1; return 0; }, - - readData: function () { - - }, - - writeData: function () { - - } + readData: () => {}, + writeData: () => {} }; -//We register our comparator object as IdentifiedDataSerializable. -cfg.serializationConfig.dataSerializableFactories[1] = { - create: function () { - return comparator; - } -}; +(async () => { + try { + const client = await Client.newHazelcastClient({ + serialization: { + // We register our comparator object as IdentifiedDataSerializable + dataSerializableFactories: { + 1: { + create: () => comparator + } + } + } + }); -var predicate = Predicates.paging(Predicates.alwaysTrue(), 2, comparator); -Client.newHazelcastClient(cfg).then(function (client) { - var map; - client.getMap('test').then(function (mp) { - map = mp; - return map.putAll([['a', 1], ['b', 2], ['c', 3], ['d', 4], ['e', 5], ['f', 6], ['g', 7]]); - }).then(function () { - return map.size(); - }).then(function (mapSize) { - console.log('Added ' + mapSize + ' elements.'); + const map = await client.getMap('test'); + await map.putAll([ + ['a', 1], ['b', 2], ['c', 3], ['d', 4], + ['e', 5], ['f', 6],['g', 7] + ]); + const mapSize = await map.size(); + console.log(`Added ${mapSize} elements`); + + const predicate = Predicates.paging(Predicates.alwaysTrue(), 2, comparator); predicate.setPage(0); - return map.valuesWithPredicate(predicate); - }).then(function (values) { - console.log('Page: ' + 0); - console.log(values); + let values = await map.valuesWithPredicate(predicate); + console.log('Page 0:', values); + predicate.setPage(1); - return map.valuesWithPredicate(predicate); - }).then(function (values) { - console.log('Page: ' + 1); - console.log(values); + values = await map.valuesWithPredicate(predicate); + console.log('Page 1:', values); + predicate.setPage(2); - return map.valuesWithPredicate(predicate); - }).then(function (values) { - console.log('Page: ' + 2); - console.log(values); + values = await map.valuesWithPredicate(predicate); + console.log('Page 2:', values); + predicate.setPage(3); - return map.valuesWithPredicate(predicate); - }).then(function (values) { - console.log('Page: ' + 3); - console.log(values); - return client.shutdown(); - }); -}); + values = await map.valuesWithPredicate(predicate); + console.log('Page 3:', values); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/pn_counter.js b/code_samples/pn_counter.js index 7d75d44c3..f40bd4f97 100644 --- a/code_samples/pn_counter.js +++ b/code_samples/pn_counter.js @@ -13,20 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); -Client.newHazelcastClient().then(function (hazelcastClient) { - var client = hazelcastClient; - var pnCounter; - hazelcastClient.getPNCounter('counter').then(function (counter) { - pnCounter = counter; - return pnCounter.addAndGet(5); - }).then(function (val) { - console.log('Added 5 to `counter`. Current value is ' + val); - return pnCounter.decrementAndGet(); - }).then(function (val) { - console.log('Decremented `counter`. Current value is ' + val); - return client.shutdown(); - }); -}); +(async () => { + try { + const client = await Client.newHazelcastClient(); + + const pnCounter = await client.getPNCounter('counter'); + let value = await pnCounter.addAndGet(5); + console.log('Incremented counter by 5. Current value is', value.toNumber()); + value = await pnCounter.decrementAndGet(); + console.log('Decremented counter. Current value is', value.toNumber()); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/portable_multiversion_sample.js b/code_samples/portable_multiversion_sample.js index 819ed56f5..18f414798 100644 --- a/code_samples/portable_multiversion_sample.js +++ b/code_samples/portable_multiversion_sample.js @@ -13,54 +13,56 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; /* * This sample code demonstrates multiversion support of Portable serialization. * With multiversion support, you can have two clients that have different - * versions of the same object, and Hazelcast will store both meta information and use the - * correct one to serialize and deserialize portable objects depending on the client. + * versions of the same object, and Hazelcast will store both meta information + * and use the correct one to serialize and deserialize portable objects depending + * on the client. */ -var Client = require('hazelcast-client').Client; -var Config = require('hazelcast-client').Config.ClientConfig; +const { Client } = require('hazelcast-client'); // Default (version 1) Employee class. -function Employee(name, age) { - this.name = name; - this.age = age; -} - -Employee.prototype.readPortable = function (reader) { - this.name = reader.readUTF('name'); - this.age = reader.readInt('age'); -}; +class Employee { + constructor(name, age) { + this.name = name; + this.age = age; + } -Employee.prototype.writePortable = function (writer) { - writer.writeUTF('name', this.name); - writer.writeInt('age', this.age); -}; + readPortable(input) { + this.name = input.readUTF('name'); + this.age = input.readInt('age'); + } -Employee.prototype.getFactoryId = function () { - return 1; -}; + writePortable(output) { + output.writeUTF('name', this.name); + output.writeInt('age', this.age); + } -Employee.prototype.getClassId = function () { - return 1; -}; + getFactoryId() { + return 1; + } -Employee.prototype.getVersion = function () { - return 1; -}; + getClassId() { + return 1; + } -function PortableFactory() { + getVersion() { + return 1; + } } -PortableFactory.prototype.create = function (classId) { - if (classId === 1) { - return new Employee(); +class PortableFactory { + create(classId) { + if (classId === 1) { + return new Employee(); + } + return null; } - return null; -}; +} /* * If you update the class by changing the type of one of the fields or by adding a new field, @@ -69,173 +71,185 @@ PortableFactory.prototype.create = function (classId) { */ // Version 2: Added new field manager name (string). -function Employee2(name, age, manager) { - this.name = name; - this.age = age; - this.manager = manager; -} - -Employee2.prototype.readPortable = function (reader) { - this.name = reader.readUTF('name'); - this.age = reader.readInt('age'); - this.manager = reader.readUTF('manager'); -}; +class Employee2 { + constructor(name, age, manager) { + this.name = name; + this.age = age; + this.manager = manager; + } -Employee2.prototype.writePortable = function (writer) { - writer.writeUTF('name', this.name); - writer.writeInt('age', this.age); - writer.writeUTF('manager', this.manager); -}; + readPortable(input) { + this.name = input.readUTF('name'); + this.age = input.readInt('age'); + this.manager = input.readUTF('manager'); + } -Employee2.prototype.getFactoryId = function () { - return 1; -}; + writePortable(output) { + output.writeUTF('name', this.name); + output.writeInt('age', this.age); + output.writeUTF('manager', this.manager); + } -Employee2.prototype.getClassId = function () { - return 1; -}; + getFactoryId() { + return 1; + } -// It is necessary to implement this method for multiversion support to work. -Employee2.prototype.getVersion = function () { - return 2; // Specifies version different than the global version. -}; + getClassId() { + return 1; + } -function PortableFactory2() { + // It is necessary to implement this method for multiversion support to work. + getVersion() { + // Specifies version different than the global version. + return 2; + } } -PortableFactory2.prototype.create = function (classId) { - if (classId === 1) { - return new Employee2(); +class PortableFactory2 { + create(classId) { + if (classId === 1) { + return new Employee2(); + } + return null; } - return null; -}; +} /* - * However, having a version that changes across incompatible field types such as int and String will cause - * a type error as clients with older versions of the class tries to access it. We will demonstrate this below. + * However, having a version that changes across incompatible field types such as int and + * String will cause a type error as clients with older versions of the class tries to + * access it. We will demonstrate this below. */ -//Version 3 Employee class. Changed age field type from int to String. (Incompatible type change) -function Employee3(name, age, manager) { - this.name = name; - this.age = age; - this.manager = manager; -} +// Version 3 Employee class. Changed age field type from int to String. +// (Incompatible type change) +class Employee3 { + constructor(name, age, manager) { + this.name = name; + this.age = age; + this.manager = manager; + } -Employee3.prototype.readPortable = function (reader) { - this.name = reader.readUTF('name'); - this.age = reader.readUTF('age'); - this.manager = reader.readUTF('manager'); -}; + readPortable(input) { + this.name = input.readUTF('name'); + this.age = input.readUTF('age'); + this.manager = input.readUTF('manager'); + } -Employee3.prototype.writePortable = function (writer) { - writer.writeUTF('name', this.name); - writer.writeUTF('age', this.age); - writer.writeUTF('manager', this.manager); -}; + writePortable(output) { + output.writeUTF('name', this.name); + output.writeUTF('age', this.age); + output.writeUTF('manager', this.manager); + } -Employee3.prototype.getFactoryId = function () { - return 1; -}; + getFactoryId() { + return 1; + } -Employee3.prototype.getClassId = function () { - return 1; -}; + getClassId() { + return 1; + } -Employee3.prototype.getVersion = function () { - return 3; -}; + getVersion() { + return 3; + } +} -function PortableFactory3() { +class PortableFactory3 { + create(classId) { + if (classId === 1) { + return new Employee3(); + } + return null; + } } -PortableFactory3.prototype.create = function (classId) { - if (classId === 1) { - return new Employee3(); - } - return null; -}; - -// Let's now configure 3 clients with 3 different versions of Employee. -var cfg = new Config(); -cfg.serializationConfig.portableFactories[1] = new PortableFactory(); - -var cfg2 = new Config(); -cfg2.serializationConfig.portableFactories[1] = new PortableFactory2(); - -var cfg3 = new Config(); -cfg3.serializationConfig.portableFactories[1] = new PortableFactory3(); - -var map, map2, map3; -var client, client2, client3; - -Promise.all([ - Client.newHazelcastClient(cfg), - Client.newHazelcastClient(cfg2), - Client.newHazelcastClient(cfg3) - ] -).then(function (clients) { - /* - * Assume that a client joins a cluster with a newer version of a class. - * If you modified the class by adding a new field, the new client's put operations include that - * new field. - */ - client = clients[0]; - client2 = clients[1]; - client3 = clients[2]; - return Promise.all([ - client.getMap('employee-map'), - client2.getMap('employee-map'), - client3.getMap('employee-map') - ]); -}).then(function (maps) { - map = maps[0]; - map2 = maps[1]; - map3 = maps[2]; - return map.clear(); -}).then(function () { - return map.put(0, new Employee('Jack', 28)); -}).then(function () { - return map2.put(1, new Employee2('Jane', 29, 'Josh')); -}).then(function () { - return map.size(); -}).then(function (size) { - console.log('Map Size:', size); - return map.values(); -}).then(function (values) { - /* - * If this new client tries to get an object that was put from the older clients, it - * gets null for the newly added field. - */ - values.toArray().forEach(function (value) { - console.log(value); - }); - return map2.values(); -}).then(function (values) { - values.toArray().forEach(function (value) { - console.log(value); - }); - // Let's try now to put a version 3 Employee object to the map and see what happens. - return map3.put(2, new Employee3('Joe', '30', 'Mary')); -}).then(function () { - return map.size(); -}).then(function (size) { - console.log('Map Size:', size); - /* - * As clients with incompatible versions of the class try to access each other, a HazelcastSerializationError - * is raised (caused by a TypeError). - */ - return map.get(2).catch(function (err) { - // Client that has class with int type age field tries to read Employee3 object with String age field. - console.log('Failed due to:', err.message); - }); -}).then(function () { - return map3.get(0).catch(function (err) { - // Client that has class with String type age field tries to read Employee object with int age field. - console.log('Failed due to:', err.message); - }); -}).then(function () { - client.shutdown(); - client2.shutdown(); - client3.shutdown(); -}); +(async () => { + try { + // Let's now configure 3 clients with 3 different versions of Employee. + const cfg = { + serialization: { + portableFactories: { + 1: new PortableFactory() + } + } + }; + const cfg2 = { + serialization: { + portableFactories: { + 1: new PortableFactory2() + } + } + }; + const cfg3 = { + serialization: { + portableFactories: { + 1: new PortableFactory3() + } + } + }; + + const client = await Client.newHazelcastClient(cfg); + const client2 = await Client.newHazelcastClient(cfg2); + const client3 = await Client.newHazelcastClient(cfg3); + + /* + * Assume that a client joins a cluster with a newer version of a class. + * If you modified the class by adding a new field, the new client's put + * operations include that new field. + */ + const map = await client.getMap('employee-map'); + const map2 = await client2.getMap('employee-map'); + const map3 = await client3.getMap('employee-map'); + + await map.put(0, new Employee('Jack', 28)); + await map2.put(1, new Employee2('Jane', 29, 'Josh')); + + let size = await map.size(); + console.log('Map size:', size); + let values = await map.values(); + /* + * If this new client tries to get an object that was put from the older + * clients, it gets `null` for the newly added field. + */ + for (const value of values) { + console.log(value); + } + values = await map2.values(); + for (const value of values) { + console.log(value); + } + + /* + * Let's try now to put a version 3 Employee object to the map and see + * what happens. + */ + await map3.put(2, new Employee3('Joe', '30', 'Mary')); + size = await map.size(); + console.log('Map size:', size); + + /* + * As clients with incompatible versions of the class try to access each + * other, a HazelcastSerializationError is raised (caused by a TypeError). + */ + try { + await map.get(2); + } catch (err) { + // Client that has class with int type age field tries to read Employee3 + // object with string `age` field. + console.log('Failed due to:', err.message); + } + try { + await map3.get(0); + } catch (err) { + // Client that has class with String type age field tries to read + // Employee object with int `age` field. + console.log('Failed due to:', err.message); + } + + client.shutdown(); + client2.shutdown(); + client3.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/querying_with_SQL.js b/code_samples/querying_with_SQL.js index 4e194f55b..d3bde3e11 100644 --- a/code_samples/querying_with_SQL.js +++ b/code_samples/querying_with_SQL.js @@ -13,22 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; -var Predicates = require('hazelcast-client').Predicates; +const { + Client, + Predicates +} = require('hazelcast-client'); -function Customer(name, active, age) { - this.name = name; - this.active = active; - this.age = age; +class Customer { + constructor(name, active, age) { + this.name = name; + this.active = active; + this.age = age; + } } -Client.newHazelcastClient().then(function (client) { - var personMap; - client.getMap('personMap').then(function (mp) { - personMap = mp; +(async () => { + try { + const client = await Client.newHazelcastClient(); + const personMap = await client.getMap('personMap'); - return personMap.putAll([ + await personMap.putAll([ ['1', new Customer('Peter', true, 36)], ['2', new Customer('John', false, 40)], ['3', new Customer('Roger', true, 20)], @@ -37,13 +42,15 @@ Client.newHazelcastClient().then(function (client) { ['6', new Customer('Ragnar', true, 30)], ['7', new Customer('Hilary', true, 19)], ]); - }).then(function () { + const predicate = new Predicates.sql('active AND age < 30'); - return personMap.valuesWithPredicate(predicate); - }).then(function (values) { - values.toArray().forEach(function (value) { - console.log(value); - }); - return client.shutdown(); - }); -}); + const persons = await personMap.valuesWithPredicate(predicate); + for (const person of persons) { + console.log(person); + } + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/queue.js b/code_samples/queue.js index ac9ee3e4f..05185e463 100644 --- a/code_samples/queue.js +++ b/code_samples/queue.js @@ -13,30 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); -Client.newHazelcastClient().then(function (hazelcastClient) { - var client = hazelcastClient; - var queue; - hazelcastClient.getQueue('people').then(function (q) { - queue = q; - return queue.put('Item1'); - }).then(function () { - return queue.put('Item2'); - }).then(function () { - return queue.peek(); - }).then(function (item) { - console.log('Peeked item: ' + item + '. Item is not removed from queue.'); - return queue.poll(); - }).then(function (item) { - console.log('Retrieved item: ' + item + '. Item is removed from queue.'); - return queue.poll(); - }).then(function (item) { - console.log('Retrieved item: ' + item); - return client.shutdown(); - }); -}); +(async () => { + try { + const client = await Client.newHazelcastClient(); + const queue = await client.getQueue('my-distributed-queue'); + await queue.put('Item1'); + await queue.put('Item2'); + let item = await queue.peek(); + console.log(`Peeked item: ${item}. Item is not removed from queue`); + item = await queue.poll(); + console.log(`Retrieved item: ${item}. Item is removed from queue`); + item = await queue.poll(); + console.log(`Retrieved item: ${item}`); + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/set.js b/code_samples/set.js index 62b44632c..fedab9fd3 100644 --- a/code_samples/set.js +++ b/code_samples/set.js @@ -13,23 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); -Client.newHazelcastClient().then(function (hazelcastClient) { - var client = hazelcastClient; - var set; - hazelcastClient.getSet('my-distributed-set').then(function (s) { - set = s; - return set.add('key'); - }).then(function () { - console.log('"key" is added to the set.'); - return set.contains('key'); - }).then(function (contains) { - console.log(contains); - return set.size(); - }).then(function (val) { - console.log('Number of elements in the set: ' + val); - return client.shutdown(); - }); -}); +(async () => { + try { + const client = await Client.newHazelcastClient(); + const set = await client.getSet('my-distributed-set'); + + // Add the same item multiple times + await set.add('key'); + await set.add('key'); + await set.add('key'); + + console.log('Item \'key\' is added to the set.'); + const contains = await set.contains('key'); + console.log('Set contains item \'key\':', contains); + const size = await set.size(); + console.log('Set size:', size); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js index adc117310..65058f8cb 100644 --- a/code_samples/ssl_authentication.js +++ b/code_samples/ssl_authentication.js @@ -13,15 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Config = require('hazelcast-client').Config; -var HazelcastClient = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); +(async () => { + try { + const client = await Client.newHazelcastClient({ + network: { + ssl: { + enabled: true + } + } + }); + console.log('The client is authenticated using SSL'); -var cfg = new Config.ClientConfig(); -cfg.networkConfig.sslConfig.enabled = true; - -HazelcastClient.newHazelcastClient(cfg).then(function (client) { - console.log('This client is authenticated using SSL.'); - client.shutdown(); -}); + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/config-schema.json b/config-schema.json index 4626d9027..a6c72ada8 100644 --- a/config-schema.json +++ b/config-schema.json @@ -4,18 +4,6 @@ "title": "Hazelcast Node.js Client Configuration", "type": "object", "definitions": { - "importPath": { - "type": "object", - "properties": { - "path": { - "type": "string", - "format": "uri-reference" - }, - "exportedName": { - "type": "string" - } - } - }, "propertiesObject": { "type": "object", "propertyNames": { @@ -33,43 +21,6 @@ "type": "number", "minimum": 0, "multipleOf": 1 - }, - "listenerConfig": { - "allOf": [ - { - "$ref": "#/definitions/importPath" - }, - { - "properties": { - "type": { - "enum": [ - "lifecycle", - "membership" - ] - } - } - } - ] - }, - "factoryConfig": { - "allOf": [ - { - "$ref": "#/definitions/importPath" - }, - { - "properties": { - "factoryId": { - "$ref": "#/definitions/positiveInteger" - } - } - } - ] - }, - "factoryConfigArray": { - "type": "array", - "items": { - "$ref": "#/definitions/factoryConfig" - } } }, "properties": { @@ -123,10 +74,6 @@ "string", "null" ] - }, - "enabled": { - "type": "boolean", - "default": false } } }, @@ -152,23 +99,8 @@ } ] }, - "factory": { - "anyOf": [ - { - "$ref": "#/definitions/importPath" - }, - { - "type": "object", - "properties": { - "properties": { - "$ref": "#/definitions/propertiesObject" - } - } - }, - { - "type": "null" - } - ] + "sslOptionsFactoryProperties": { + "$ref": "#/definitions/propertiesObject" } } } @@ -215,12 +147,6 @@ } } }, - "listeners": { - "type": "array", - "items": { - "$ref": "#/definitions/listenerConfig" - } - }, "serialization": { "type": "object", "properties": { @@ -245,120 +171,98 @@ }, "portableVersion": { "$ref": "#/definitions/positiveInteger" - }, - "dataSerializableFactories": { - "$ref": "#/definitions/factoryConfigArray" - }, - "portableFactories": { - "$ref": "#/definitions/factoryConfigArray" - }, - "globalSerializer": { - "$ref": "#/definitions/importPath" - }, - "serializers": { - "type": "array", - "items": { - "allOf": [ - { - "$ref": "#/definitions/importPath" - }, - { - "required": [ - "typeId" - ], - "properties": { - "typeId": { - "$ref": "#/definitions/positiveInteger" - } - } - } - ] - } } } }, "nearCaches": { - "type": "array", - "items": { - "type": "object", - "required": [ - "name" - ], - "properties": { - "name": { - "type": "string", - "minLength": 1 - }, - "invalidateOnChange": { - "type": "boolean", - "default": true - }, - "maxIdleSeconds": { - "type": "number", - "default": 0, - "minimum": 0 - }, - "inMemoryFormat": { - "enum": [ - "object", - "binary" - ], - "default": "binary" - }, - "timeToLiveSeconds": { - "type": "number", - "minimum": 0, - "default": 0 - }, - "evictionPolicy": { - "enum": [ - "none", - "lru", - "lfu", - "random" - ], - "default": "none" - }, - "evictionMaxSize": { - "$ref": "#/definitions/positiveInteger", - "default": "maximum safe integer" - }, - "evictionSamplingCount": { - "$ref": "#/definitions/positiveInteger", - "default": 8 - }, - "evictionSamplingPoolSize": { - "$ref": "#/definitions/positiveInteger", - "default": 16 + "type": "object", + "patternProperties": { + ".+": { + "type": "object", + "properties": { + "invalidateOnChange": { + "type": "boolean", + "default": true + }, + "maxIdleSeconds": { + "type": "number", + "default": 0, + "minimum": 0 + }, + "inMemoryFormat": { + "enum": [ + "object", + "binary" + ], + "default": "binary" + }, + "timeToLiveSeconds": { + "type": "number", + "minimum": 0, + "default": 0 + }, + "evictionPolicy": { + "enum": [ + "none", + "lru", + "lfu", + "random" + ], + "default": "none" + }, + "evictionMaxSize": { + "$ref": "#/definitions/positiveInteger", + "default": "maximum safe integer" + }, + "evictionSamplingCount": { + "$ref": "#/definitions/positiveInteger", + "default": 8 + }, + "evictionSamplingPoolSize": { + "$ref": "#/definitions/positiveInteger", + "default": 16 + } } } } }, "reliableTopics": { - "type": "array", - "items": { - "type": "object", - "required": [ - "name" - ], - "additionalProperties": false, - "properties": { - "name": { - "type": "string", - "minLength": 1 - }, - "readBatchSize": { - "$ref": "#/definitions/positiveInteger", - "default": 25 - }, - "overloadPolicy": { - "enum": [ - "discard_oldest", - "discard_newest", - "block", - "error" - ], - "default": "block" + "type": "object", + "patternProperties": { + ".+": { + "type": "object", + "properties": { + "readBatchSize": { + "$ref": "#/definitions/positiveInteger", + "default": 25 + }, + "overloadPolicy": { + "enum": [ + "discard_oldest", + "discard_newest", + "block", + "error" + ], + "default": "block" + } + } + } + } + }, + "flakeIdGenerators": { + "type": "object", + "patternProperties": { + ".+": { + "type": "object", + "properties": { + "prefetchCount": { + "$ref": "#/definitions/positiveInteger", + "default": 100 + }, + "prefetchValidityMillis": { + "$ref": "#/definitions/positiveInteger", + "default": 600000 + } } } } @@ -368,18 +272,11 @@ "properties": { "type": { "enum": [ - "roundRobin", + "round_robin", "random" ] } } - }, - "import": { - "type": "array", - "minItems": 1, - "items": { - "type": "string" - } } } } diff --git a/hazelcast-client-default.json b/hazelcast-client-default.json index 7ab40aa18..ba66283ce 100644 --- a/hazelcast-client-default.json +++ b/hazelcast-client-default.json @@ -32,8 +32,7 @@ "factory": null }, "hazelcastCloud": { - "discoveryToken": null, - "enabled": false + "discoveryToken": null } }, "connectionStrategy": { diff --git a/hazelcast-client-full.json b/hazelcast-client-full.json index 7f7157c4f..3dd369b2f 100644 --- a/hazelcast-client-full.json +++ b/hazelcast-client-full.json @@ -42,8 +42,7 @@ } }, "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN", - "enabled": false + "discoveryToken": "EXAMPLE_TOKEN" } }, "connectionStrategy": { diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index ec7a84c89..2047b0a09 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="4.1-SNAPSHOT" -HAZELCAST_TEST_VERSION="4.1-SNAPSHOT" +HZ_VERSION="4.0.2" +HAZELCAST_TEST_VERSION="4.0.2" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_RC_VERSION="0.7-SNAPSHOT" diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 6a0e4aec1..4e25c9027 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -1,5 +1,5 @@ -set HZ_VERSION="4.1-SNAPSHOT" -set HZ_TEST_VERSION="4.1-SNAPSHOT" +set HZ_VERSION="4.0.2" +set HZ_TEST_VERSION="4.0.2" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index 24f852fd6..b57893df2 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -1,6 +1,6 @@ #!/bin/sh -HZ_VERSION="4.1-SNAPSHOT" -HZ_TEST_VERSION="4.1-SNAPSHOT" +HZ_VERSION="4.0.2" +HZ_TEST_VERSION="4.0.2" HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index af8ef62d5..df18bd3d3 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -17,7 +17,7 @@ import * as Promise from 'bluebird'; import {ClientInfo} from './ClientInfo'; import {ClientGetDistributedObjectsCodec} from './codec/ClientGetDistributedObjectsCodec'; -import {ClientConfig} from './config/Config'; +import {ClientConfig, ClientConfigImpl} from './config/Config'; import {ConfigBuilder} from './config/ConfigBuilder'; import {DistributedObject} from './DistributedObject'; import {ClientConnectionManager} from './network/ClientConnectionManager'; @@ -51,6 +51,8 @@ import {NearCacheManager} from './nearcache/NearCacheManager'; import {DistributedObjectListener} from './core/DistributedObjectListener'; import {IllegalStateError} from './HazelcastError'; import {LoadBalancer} from './LoadBalancer'; +import {LoadBalancerType} from './config/LoadBalancerConfig'; +import {RandomLB} from './util/RandomLB'; import {RoundRobinLB} from './util/RoundRobinLB'; import {ClusterViewListenerService} from './listener/ClusterViewListenerService'; import {ClientMessage} from './ClientMessage'; @@ -60,7 +62,7 @@ export default class HazelcastClient { private readonly instanceName: string; private readonly id: number = HazelcastClient.CLIENT_ID++; - private readonly config: ClientConfig = new ClientConfig(); + private readonly config: ClientConfigImpl; private readonly loggingService: LoggingService; private readonly serializationService: SerializationService; private readonly invocationService: InvocationService; @@ -80,19 +82,14 @@ export default class HazelcastClient { private mapRepairingTask: RepairingTask; - constructor(config: ClientConfig) { + constructor(config: ClientConfigImpl) { this.config = config; - if (config.getInstanceName() != null) { - this.instanceName = config.getInstanceName(); - } else { - this.instanceName = 'hz.client_' + this.id; - } - + this.instanceName = config.instanceName || 'hz.client_' + this.id; this.loggingService = new LoggingService(this.config.customLogger, this.config.properties['hazelcast.logging.level'] as number); this.loadBalancer = this.initLoadBalancer(); this.listenerService = new ListenerService(this); - this.serializationService = new SerializationServiceV1(this, this.config.serializationConfig); + this.serializationService = new SerializationServiceV1(this.config.serialization); this.nearCacheManager = new NearCacheManager(this); this.partitionService = new PartitionService(this); this.addressProvider = this.createAddressProvider(); @@ -113,16 +110,10 @@ export default class HazelcastClient { * @returns a new client instance */ public static newHazelcastClient(config?: ClientConfig): Promise { - if (config == null) { - const configBuilder = new ConfigBuilder(); - return configBuilder.loadConfig().then(() => { - const client = new HazelcastClient(configBuilder.build()); - return client.init(); - }); - } else { - const client = new HazelcastClient(config); - return client.init(); - } + const configBuilder = new ConfigBuilder(config); + const effectiveConfig = configBuilder.build(); + const client = new HazelcastClient(effectiveConfig); + return client.init(); } /** @@ -273,11 +264,11 @@ export default class HazelcastClient { } /** - * Return configuration that this instance started with. + * Returns configuration that this instance started with. * Returned configuration object should not be modified. - * @returns {ClientConfig} + * @returns {ClientConfigImpl} */ - getConfig(): ClientConfig { + getConfig(): ClientConfigImpl { return this.config; } @@ -402,7 +393,7 @@ export default class HazelcastClient { private init(): Promise { try { this.lifecycleService.start(); - const configuredMembershipListeners = this.config.listeners.getMembershipListeners(); + const configuredMembershipListeners = this.config.membershipListeners; this.clusterService.start(configuredMembershipListeners); this.clusterViewListenerService.start(); } catch (e) { @@ -412,7 +403,7 @@ export default class HazelcastClient { return this.connectionManager.start() .then(() => { - const connectionStrategyConfig = this.config.connectionStrategyConfig; + const connectionStrategyConfig = this.config.connectionStrategy; if (!connectionStrategyConfig.asyncStart) { return this.clusterService.waitInitialMemberListFetched() .then(() => this.connectionManager.connectToAllClusterMembers()); @@ -435,22 +426,29 @@ export default class HazelcastClient { } private initLoadBalancer(): LoadBalancer { - let lb = this.config.loadBalancer; + let lb = this.config.loadBalancer.customLoadBalancer; if (lb == null) { - lb = new RoundRobinLB(); + if (this.config.loadBalancer.type === LoadBalancerType.ROUND_ROBIN) { + lb = new RoundRobinLB(); + } else if (this.config.loadBalancer.type === LoadBalancerType.RANDOM) { + lb = new RandomLB(); + } else { + throw new IllegalStateError('Load balancer type ' + this.config.loadBalancer.type + + ' is not supported.'); + } } return lb; } private createAddressProvider(): AddressProvider { - const networkConfig = this.getConfig().networkConfig; + const networkConfig = this.getConfig().network; - const addressListProvided = networkConfig.addresses.length !== 0; - const hazelcastCloudEnabled = networkConfig.cloudConfig.enabled; - if (addressListProvided && hazelcastCloudEnabled) { + const addressListProvided = networkConfig.clusterMembers.length !== 0; + const hazelcastCloudToken = networkConfig.hazelcastCloud.discoveryToken; + if (addressListProvided && hazelcastCloudToken != null) { throw new IllegalStateError('Only one discovery method can be enabled at a time. ' + 'Cluster members given explicitly: ' + addressListProvided - + ', hazelcast.cloud enabled: ' + hazelcastCloudEnabled); + + ', hazelcastCloud enabled'); } const cloudAddressProvider = this.initCloudAddressProvider(); @@ -462,9 +460,9 @@ export default class HazelcastClient { } private initCloudAddressProvider(): HazelcastCloudAddressProvider { - const cloudConfig = this.getConfig().networkConfig.cloudConfig; - if (cloudConfig.enabled) { - const discoveryToken = cloudConfig.discoveryToken; + const cloudConfig = this.getConfig().network.hazelcastCloud; + const discoveryToken = cloudConfig.discoveryToken; + if (discoveryToken != null) { const urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(this.getConfig().properties, discoveryToken); return new HazelcastCloudAddressProvider(urlEndpoint, this.getConnectionTimeoutMillis(), this.loggingService.getLogger()); @@ -473,7 +471,7 @@ export default class HazelcastClient { } private getConnectionTimeoutMillis(): number { - const networkConfig = this.getConfig().networkConfig; + const networkConfig = this.getConfig().network; const connTimeout = networkConfig.connectionTimeout; return connTimeout === 0 ? Number.MAX_VALUE : connTimeout; } diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index f929f027e..fa047446c 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -15,15 +15,14 @@ */ import {EventEmitter} from 'events'; -import {ListenerImportConfig} from './config/ImportConfig'; import HazelcastClient from './HazelcastClient'; -import * as Util from './Util'; import {ILogger} from './logging/ILogger'; /** * Lifecycle states. */ export enum LifecycleState { + /** * Fired when the client is starting. */ @@ -58,6 +57,7 @@ export enum LifecycleState { * Fired when the client is connected to a new cluster. */ CHANGED_CLUSTER = 'CHANGED_CLUSTER', + } const LIFECYCLE_EVENT_NAME = 'lifecycleEvent'; @@ -75,19 +75,10 @@ export class LifecycleService extends EventEmitter { this.setMaxListeners(0); this.client = client; this.logger = this.client.getLoggingService().getLogger(); - const listeners = client.getConfig().listeners.lifecycleListeners; + const listeners = client.getConfig().lifecycleListeners; listeners.forEach((listener) => { this.on(LIFECYCLE_EVENT_NAME, listener); }); - const listenerConfigs = client.getConfig().listenerConfigs; - listenerConfigs.forEach((config: ListenerImportConfig) => { - if (config.type === 'lifecycle') { - const path = config.importConfig.path; - const exportedName = config.importConfig.exportedName; - const listener = Util.loadNameFromPath(path, exportedName); - this.on(LIFECYCLE_EVENT_NAME, listener); - } - }); } /** diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 34823db8b..1e56ffd47 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -37,7 +37,7 @@ export class ListenerService { constructor(client: HazelcastClient) { this.client = client; this.logger = this.client.getLoggingService().getLogger(); - this.isSmartService = this.client.getConfig().networkConfig.smartRouting; + this.isSmartService = this.client.getConfig().network.smartRouting; this.activeRegistrations = new Map(); this.userRegistrationKeyInformation = new Map(); } diff --git a/src/LoadBalancer.ts b/src/LoadBalancer.ts index 347cbf768..7d00ea427 100644 --- a/src/LoadBalancer.ts +++ b/src/LoadBalancer.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientConfig} from './config/Config'; +import {ClientConfigImpl} from './config/Config'; import {Cluster} from './core/Cluster'; import {Member} from './core/Member'; @@ -34,7 +34,7 @@ export interface LoadBalancer { * @param cluster the Cluster this LoadBalancer uses to select members from. * @param config the ClientConfig. */ - initLoadBalancer(cluster: Cluster, config: ClientConfig): void; + initLoadBalancer(cluster: Cluster, config: ClientConfigImpl): void; /** * Returns the next member to route to. diff --git a/src/Util.ts b/src/Util.ts index 2f7d4c21d..7a4169e40 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -18,7 +18,6 @@ import * as assert from 'assert'; import * as Long from 'long'; import * as Promise from 'bluebird'; import * as Path from 'path'; -import {JsonConfigLocator} from './config/JsonConfigLocator'; import {Address} from './Address'; export function assertNotNull(v: any): void { @@ -139,24 +138,10 @@ export function tryGetEnum(enumClass: any | { [index: string]: number }, str: } export function resolvePath(path: string): string { - let basePath: string; - if (process.env[JsonConfigLocator.ENV_VARIABLE_NAME]) { - basePath = Path.dirname(process.env[JsonConfigLocator.ENV_VARIABLE_NAME]); - } else { - basePath = process.cwd(); - } + const basePath = process.cwd(); return Path.resolve(basePath, path); } -export function loadNameFromPath(path: string, exportedName: string): any { - const requirePath = require(resolvePath(path)); /*eslint-disable-line @typescript-eslint/no-var-requires*/ - if (exportedName === undefined) { - return requirePath; - } else { - return requirePath[exportedName]; - } -} - export class AddressHelper { private static readonly MAX_PORT_TRIES: number = 3; private static readonly INITIAL_FIRST_PORT: number = 5701; @@ -207,18 +192,6 @@ export class AddressHelper { } -export function mergeJson(base: any, other: any): void { - for (const key in other) { - if (Array.isArray(base[key]) && Array.isArray(other[key])) { - base[key] = base[key].concat(other[key]); - } else if (typeof base[key] === 'object' && typeof other[key] === 'object') { - mergeJson(base[key], other[key]); - } else { - base[key] = other[key]; - } - } -} - /** * Returns a random integer between 0(inclusive) and `upperBound`(exclusive) * Upper bound should be an integer. diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index 4f5a2fea0..89e69c350 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -18,7 +18,7 @@ import {BitsUtil} from '../BitsUtil'; import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; import {StringCodec} from './builtin/StringCodec'; -import {IndexConfig} from '../config/IndexConfig'; +import {InternalIndexConfig} from '../config/IndexConfig'; import {IndexConfigCodec} from './custom/IndexConfigCodec'; // hex: 0x012900 @@ -29,7 +29,7 @@ const REQUEST_MESSAGE_TYPE = 76032; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class MapAddIndexCodec { - static encodeRequest(name: string, indexConfig: IndexConfig): ClientMessage { + static encodeRequest(name: string, indexConfig: InternalIndexConfig): ClientMessage { const clientMessage = ClientMessage.createForEncode(); clientMessage.setRetryable(false); diff --git a/src/codec/custom/BitmapIndexOptionsCodec.ts b/src/codec/custom/BitmapIndexOptionsCodec.ts index 74c0f3dae..b01319540 100644 --- a/src/codec/custom/BitmapIndexOptionsCodec.ts +++ b/src/codec/custom/BitmapIndexOptionsCodec.ts @@ -19,14 +19,14 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {BitmapIndexOptions} from '../../config/BitmapIndexOptions'; +import {InternalBitmapIndexOptions} from '../../config/BitmapIndexOptions'; import {StringCodec} from '../builtin/StringCodec'; const UNIQUE_KEY_TRANSFORMATION_OFFSET = 0; const INITIAL_FRAME_SIZE = UNIQUE_KEY_TRANSFORMATION_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class BitmapIndexOptionsCodec { - static encode(clientMessage: ClientMessage, bitmapIndexOptions: BitmapIndexOptions): void { + static encode(clientMessage: ClientMessage, bitmapIndexOptions: InternalBitmapIndexOptions): void { clientMessage.addFrame(BEGIN_FRAME.copy()); const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); @@ -38,7 +38,7 @@ export class BitmapIndexOptionsCodec { clientMessage.addFrame(END_FRAME.copy()); } - static decode(clientMessage: ClientMessage): BitmapIndexOptions { + static decode(clientMessage: ClientMessage): InternalBitmapIndexOptions { // begin frame clientMessage.nextFrame(); @@ -49,6 +49,6 @@ export class BitmapIndexOptionsCodec { CodecUtil.fastForwardToEndFrame(clientMessage); - return new BitmapIndexOptions(uniqueKey, uniqueKeyTransformation); + return new InternalBitmapIndexOptions(uniqueKey, uniqueKeyTransformation); } } diff --git a/src/codec/custom/IndexConfigCodec.ts b/src/codec/custom/IndexConfigCodec.ts index 2e95d92e7..36ff00951 100644 --- a/src/codec/custom/IndexConfigCodec.ts +++ b/src/codec/custom/IndexConfigCodec.ts @@ -19,7 +19,7 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {IndexConfig} from '../../config/IndexConfig'; +import {InternalIndexConfig} from '../../config/IndexConfig'; import {StringCodec} from '../builtin/StringCodec'; import {ListMultiFrameCodec} from '../builtin/ListMultiFrameCodec'; import {BitmapIndexOptionsCodec} from './BitmapIndexOptionsCodec'; @@ -28,7 +28,7 @@ const TYPE_OFFSET = 0; const INITIAL_FRAME_SIZE = TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; export class IndexConfigCodec { - static encode(clientMessage: ClientMessage, indexConfig: IndexConfig): void { + static encode(clientMessage: ClientMessage, indexConfig: InternalIndexConfig): void { clientMessage.addFrame(BEGIN_FRAME.copy()); const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); @@ -42,7 +42,7 @@ export class IndexConfigCodec { clientMessage.addFrame(END_FRAME.copy()); } - static decode(clientMessage: ClientMessage): IndexConfig { + static decode(clientMessage: ClientMessage): InternalIndexConfig { // begin frame clientMessage.nextFrame(); @@ -55,6 +55,6 @@ export class IndexConfigCodec { CodecUtil.fastForwardToEndFrame(clientMessage); - return new IndexConfig(name, type, attributes, bitmapIndexOptions); + return new InternalIndexConfig(name, type, attributes, bitmapIndexOptions); } } diff --git a/src/config/BitmapIndexOptions.ts b/src/config/BitmapIndexOptions.ts index f0a81e380..74845c0d7 100644 --- a/src/config/BitmapIndexOptions.ts +++ b/src/config/BitmapIndexOptions.ts @@ -21,6 +21,7 @@ import {QueryConstants} from '../core/Predicate'; * {@link BitmapIndexOptions.uniqueKey unique key} values. */ export enum UniqueKeyTransformation { + /** * Extracted unique key value is interpreted as an object value. * Non-negative unique ID is assigned to every distinct object value. @@ -41,27 +42,42 @@ export enum UniqueKeyTransformation { * long (if necessary) and the resulting value is used directly as an ID. */ RAW = 2, + } +export type UniqueKeyTransformationStrings = keyof typeof UniqueKeyTransformation; + const DEFAULT_UNIQUE_KEY = QueryConstants.KEY_ATTRIBUTE_NAME; const DEFAULT_UNIQUE_KEY_TRANSFORMATION = UniqueKeyTransformation.OBJECT; /** * Configures indexing options specific to bitmap indexes. */ -export class BitmapIndexOptions { +export interface BitmapIndexOptions { + /** * Unique key attribute configured in this index config. * Defaults to {@code __key}. The unique key attribute is used as a source * of values which uniquely identify each entry being inserted into an index. */ - uniqueKey: string; + uniqueKey?: string; /** - * Unique key transformation configured in this index. Defaults - * to {@link UniqueKeyTransformation.OBJECT OBJECT}. The transformation is - * applied to every value extracted from unique key attribute. + * Unique key transformation configured in this index. The transformation is + * applied to every value extracted from unique key attribute. Defaults + * to `OBJECT`. Available values are `OBJECT`, `LONG`, and `RAW`. */ + uniqueKeyTransformation?: UniqueKeyTransformationStrings; + +} + +/** + * Follows the shape of {@link BitmapIndexOptions}, but doesn't implement it due + * to the `uniqueKeyTransformation` enum field. + */ +export class InternalBitmapIndexOptions { + + uniqueKey: string; uniqueKeyTransformation: UniqueKeyTransformation; constructor(uniqueKey: string = DEFAULT_UNIQUE_KEY, @@ -76,4 +92,5 @@ export class BitmapIndexOptions { ', uniqueKeyTransformation: ' + this.uniqueKeyTransformation + ']'; } + } diff --git a/src/config/ClientCloudConfig.ts b/src/config/ClientCloudConfig.ts index 686751773..06046d2b6 100644 --- a/src/config/ClientCloudConfig.ts +++ b/src/config/ClientCloudConfig.ts @@ -15,15 +15,19 @@ */ /** - * hazelcast.cloud configuration to let the client connect the cluster via hazelcast.cloud + * Hazelcast Cloud configuration. */ -export class ClientCloudConfig { +export interface ClientCloudConfig { + /** - * hazelcast.cloud discoveryToken of your cluster + * Discovery token of your cluster. */ + discoveryToken?: string; + +} + +export class ClientCloudConfigImpl implements ClientCloudConfig { + discoveryToken: string = null; - /** - * enabled true to use hazelcast.cloud - */ - enabled = false; + } diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index 628b195f9..003a7a5bc 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -14,42 +14,58 @@ * limitations under the License. */ -import {ClientCloudConfig} from './ClientCloudConfig'; -import {SSLConfig} from './SSLConfig'; +import {ClientCloudConfig, ClientCloudConfigImpl} from './ClientCloudConfig'; +import {SSLConfig, SSLConfigImpl} from './SSLConfig'; /** * Network configuration. */ -export class ClientNetworkConfig { +export interface ClientNetworkConfig { + /** - * Array of candidate addresses that client will use to establish initial connection. + * Array of member candidate addresses that client will use to establish initial connection. + * By default, set to `['127.0.0.1']`. */ - addresses: string[] = []; + clusterMembers?: string[]; /** - * hazelcast.cloud configuration to let the client connect the cluster via hazelcast.cloud + * Hazelcast Cloud configuration to let the client connect the cluster in cloud. */ - cloudConfig: ClientCloudConfig = new ClientCloudConfig(); + hazelcastCloud?: ClientCloudConfig; /** - * Timeout value in millis for nodes to accept client connection requests. + * Timeout value in milliseconds for nodes to accept client connection requests. + * By default, set to `5000`. */ - connectionTimeout = 5000; + connectionTimeout: number; + // TODO not implemented yet /** - * true if redo operations are enabled (not implemented yet) + * Enables redo operations behavior. */ - redoOperation = false; + redoOperation?: boolean; /** - * If true, client will behave as smart client instead of dummy client. Smart client sends key based operations - * to owner of the keys. Dummy client sends all operations to a single node. See http://docs.hazelcast.org to - * learn about smart/dummy client. + * Enables smart mode for the client instead of unisocket client. Smart clients + * send key based operations to owner of the keys. Unisocket clients send all + * operations to a single node. By default, set to `true`. */ - smartRouting = true; + smartRouting?: boolean; /** * SSL configuration. */ - sslConfig: SSLConfig = new SSLConfig(); + ssl?: SSLConfig; + +} + +export class ClientNetworkConfigImpl implements ClientNetworkConfig { + + clusterMembers: string[] = []; + hazelcastCloud: ClientCloudConfigImpl = new ClientCloudConfigImpl(); + connectionTimeout = 5000; + redoOperation = false; + smartRouting = true; + ssl: SSLConfigImpl = new SSLConfigImpl(); + } diff --git a/src/config/Config.ts b/src/config/Config.ts index 3670b9a14..27ac096d8 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -15,34 +15,113 @@ */ import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; -import {ClientNetworkConfig} from './ClientNetworkConfig'; +import {ClientNetworkConfig, ClientNetworkConfigImpl} from './ClientNetworkConfig'; import {ConfigPatternMatcher} from './ConfigPatternMatcher'; import {EvictionPolicy} from './EvictionPolicy'; -import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; -import {ImportConfig, ListenerImportConfig} from './ImportConfig'; +import {FlakeIdGeneratorConfig, FlakeIdGeneratorConfigImpl} from './FlakeIdGeneratorConfig'; import {InMemoryFormat} from './InMemoryFormat'; -import {ListenerConfig} from './ListenerConfig'; -import {NearCacheConfig} from './NearCacheConfig'; +import {MembershipListener} from '../core/MembershipListener'; +import {LifecycleState} from '../LifecycleService'; +import {NearCacheConfig, NearCacheConfigImpl} from './NearCacheConfig'; import {SSLConfig} from './SSLConfig'; import {Properties} from './Properties'; -import {ReliableTopicConfig} from './ReliableTopicConfig'; -import {SerializationConfig} from './SerializationConfig'; +import {ReliableTopicConfig, ReliableTopicConfigImpl} from './ReliableTopicConfig'; +import {SerializationConfig, SerializationConfigImpl} from './SerializationConfig'; import {Statistics} from '../statistics/Statistics'; import {LogLevel} from '..'; import {ILogger} from '../logging/ILogger'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; -import {ConnectionStrategyConfig, ReconnectMode} from './ConnectionStrategyConfig'; -import {LoadBalancer} from '../LoadBalancer'; +import {ConnectionStrategyConfig, ConnectionStrategyConfigImpl, ReconnectMode} from './ConnectionStrategyConfig'; +import {LoadBalancerType, LoadBalancerConfig, LoadBalancerConfigImpl} from './LoadBalancerConfig'; import {IndexConfig} from './IndexConfig'; import {IndexType} from './IndexType'; import {ConnectionRetryConfig} from './ConnectionRetryConfig'; -const DEFAULT_CLUSTER_NAME = 'dev'; - /** - * Top level configuration object of Hazelcast client. Other configurations items are properties of this object. + * Top level configuration object of Hazelcast client. + * Other configurations items are properties of this object. */ -export class ClientConfig { +export interface ClientConfig { + + /** + * Name of the cluster to connect to. By default, set to `dev`. + */ + clusterName?: string; + + /** + * Name of the client instance. By default, set to `hz.client_${CLIENT_ID}`, where + * `CLIENT_ID` starts from `0` and it is incremented by `1` for each new client. + */ + instanceName?: string; + + /** + * Labels for the client to be sent to the cluster. + */ + clientLabels?: string[]; + + /** + * Network config of the client. + */ + network?: ClientNetworkConfig; + + /** + * Connection strategy config of the client. + */ + connectionStrategy?: ConnectionStrategyConfig; + + /** + * Load balancer config for the client. + */ + loadBalancer?: LoadBalancerConfig; + + /** + * Lifecycle listeners to be attached to the client. + */ + lifecycleListeners?: Array<(state: LifecycleState) => void>; + + /** + * Membership listeners to be attached to the client. + */ + membershipListeners?: MembershipListener[]; + + /** + * User-defined serialization config for the client. + */ + serialization?: SerializationConfig; + + /** + * Near Cache config for the client. + */ + nearCaches?: { [name: string]: NearCacheConfig }; + + /** + * Configs for ReliableTopics. + */ + reliableTopics?: { [name: string]: ReliableTopicConfig }; + + /** + * Configs for FlakeIdGenerators. + */ + flakeIdGenerators?: { [name: string]: FlakeIdGeneratorConfig }; + + /** + * Custom logger implementation for the client. + */ + customLogger?: ILogger; + + /** + * Custom credentials to be used as a part of authentication on the cluster. + */ + customCredentials?: any; + + /** + * User-defined properties. + */ + properties?: Properties; + +} + +export class ClientConfigImpl implements ClientConfig { properties: Properties = { 'hazelcast.client.heartbeat.interval': 5000, @@ -62,23 +141,20 @@ export class ClientConfig { 'hazelcast.client.shuffle.member.list': true, }; - /** - * Name of this client instance. - */ instanceName: string; - networkConfig: ClientNetworkConfig = new ClientNetworkConfig(); - customLogger: ILogger; + network = new ClientNetworkConfigImpl(); + customLogger: ILogger = null; customCredentials: any = null; - listeners: ListenerConfig = new ListenerConfig(); - listenerConfigs: ListenerImportConfig[] = []; - serializationConfig: SerializationConfig = new SerializationConfig(); - reliableTopicConfigs: { [name: string]: ReliableTopicConfig } = {}; - nearCacheConfigs: { [name: string]: NearCacheConfig } = {}; - flakeIdGeneratorConfigs: { [name: string]: FlakeIdGeneratorConfig } = {}; - connectionStrategyConfig: ConnectionStrategyConfig = new ConnectionStrategyConfig(); - clusterName: string = DEFAULT_CLUSTER_NAME; - labels = new Set(); - loadBalancer: LoadBalancer; + lifecycleListeners: Array<(state: LifecycleState) => void> = []; + membershipListeners: MembershipListener[] = []; + serialization = new SerializationConfigImpl(); + reliableTopics: { [name: string]: ReliableTopicConfigImpl } = {}; + nearCaches: { [name: string]: NearCacheConfigImpl } = {}; + flakeIdGenerators: { [name: string]: FlakeIdGeneratorConfigImpl } = {}; + connectionStrategy = new ConnectionStrategyConfigImpl(); + clusterName = 'dev'; + clientLabels: string[] = []; + loadBalancer = new LoadBalancerConfigImpl(); private configPatternMatcher = new ConfigPatternMatcher(); @@ -86,20 +162,20 @@ export class ClientConfig { return this.instanceName; } - getReliableTopicConfig(name: string): ReliableTopicConfig { - const matching = this.lookupByPattern(this.reliableTopicConfigs, name); - let config: ReliableTopicConfig; + getReliableTopicConfig(name: string): ReliableTopicConfigImpl { + const matching = this.lookupByPattern(this.reliableTopics, name); + let config: ReliableTopicConfigImpl; if (matching != null) { config = matching.clone(); } else { - config = new ReliableTopicConfig(); + config = new ReliableTopicConfigImpl(); } config.name = name; return config; } - getNearCacheConfig(name: string): NearCacheConfig { - const matching = this.lookupByPattern(this.nearCacheConfigs, name); + getNearCacheConfig(name: string): NearCacheConfigImpl { + const matching = this.lookupByPattern(this.nearCaches, name); if (matching == null) { return null; } @@ -108,13 +184,14 @@ export class ClientConfig { return config; } - getFlakeIdGeneratorConfig(name: string): FlakeIdGeneratorConfig { - const matching: FlakeIdGeneratorConfig = this.lookupByPattern(this.flakeIdGeneratorConfigs, name); - let config: FlakeIdGeneratorConfig; + getFlakeIdGeneratorConfig(name: string): FlakeIdGeneratorConfigImpl { + const matching: FlakeIdGeneratorConfigImpl = + this.lookupByPattern(this.flakeIdGenerators, name); + let config: FlakeIdGeneratorConfigImpl; if (matching != null) { config = matching.clone(); } else { - config = new FlakeIdGeneratorConfig(); + config = new FlakeIdGeneratorConfigImpl(); } config.name = name; return config; @@ -135,34 +212,22 @@ export class ClientConfig { } } -export {ClientNetworkConfig}; - -export {TopicOverloadPolicy}; - -export {SerializationConfig}; - -export {ReliableTopicConfig}; - -export {EvictionPolicy}; - -export {InMemoryFormat}; - -export {NearCacheConfig}; - -export {ImportConfig}; - -export {FlakeIdGeneratorConfig}; - -export {SSLConfig}; - -export {JsonStringDeserializationPolicy}; - -export {IndexConfig}; - -export {IndexType}; - -export {ConnectionStrategyConfig}; - -export {ReconnectMode}; - -export {ConnectionRetryConfig}; +export { + ClientNetworkConfig, + TopicOverloadPolicy, + SerializationConfig, + ReliableTopicConfig, + EvictionPolicy, + InMemoryFormat, + NearCacheConfig, + FlakeIdGeneratorConfig, + SSLConfig, + JsonStringDeserializationPolicy, + IndexConfig, + IndexType, + ConnectionStrategyConfig, + ReconnectMode, + ConnectionRetryConfig, + LoadBalancerConfig, + LoadBalancerType, +}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index f87f50d67..fa7e8e676 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -14,57 +14,38 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; -import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {HazelcastError} from '../HazelcastError'; import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; -import {mergeJson, tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; -import {ClientConfig} from './Config'; +import {tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; +import {ClientConfig, ClientConfigImpl} from './Config'; import {EvictionPolicy} from './EvictionPolicy'; -import {FlakeIdGeneratorConfig} from './FlakeIdGeneratorConfig'; -import {ImportConfig, ListenerImportConfig} from './ImportConfig'; +import {FlakeIdGeneratorConfigImpl} from './FlakeIdGeneratorConfig'; import {InMemoryFormat} from './InMemoryFormat'; -import {JsonConfigLocator} from './JsonConfigLocator'; -import {NearCacheConfig} from './NearCacheConfig'; +import {NearCacheConfigImpl} from './NearCacheConfig'; import {Properties} from './Properties'; -import {ReliableTopicConfig} from './ReliableTopicConfig'; +import {ReliableTopicConfigImpl} from './ReliableTopicConfig'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; import {ReconnectMode} from './ConnectionStrategyConfig'; -import {RandomLB} from '../util/RandomLB'; -import {RoundRobinLB} from '../util/RoundRobinLB'; +import {LoadBalancerType} from './LoadBalancerConfig'; +/** + * Responsible for user-defined config validation. Builds the effective config with necessary defaults. + */ export class ConfigBuilder { - private clientConfig: ClientConfig = new ClientConfig(); - private loadedJson: any; - private configLocator: JsonConfigLocator = new JsonConfigLocator(); - loadConfig(): Promise { - return this.configLocator.load().then(() => { - const loadedBuffer = this.configLocator.getBuffer(); - if (loadedBuffer) { - this.loadedJson = JSON.parse(loadedBuffer.toString()); - return this.replaceImportsWithContent(this.loadedJson); - } - }); + private originalConfig: ClientConfig; + private effectiveConfig: ClientConfigImpl = new ClientConfigImpl(); + + constructor(config?: ClientConfig) { + this.originalConfig = config || {}; } - build(): ClientConfig { + build(): ClientConfigImpl { try { - this.handleConfig(this.loadedJson); - return this.clientConfig; + this.handleConfig(this.originalConfig); + return this.effectiveConfig; } catch (e) { - throw new HazelcastError('Error parsing config: ' + e.message, e); - } - } - - private replaceImportsWithContent(jsonObject: any): Promise { - if (jsonObject.import) { - const includes = tryGetArray(jsonObject.import); - return Promise.map(includes, (path: string) => { - return this.configLocator.loadImported(path); - }).map((buffer: Buffer) => { - mergeJson(jsonObject, JSON.parse(buffer.toString())); - }).then(() => undefined); + throw new HazelcastError('Config validation error: ' + e.message, e); } } @@ -72,9 +53,9 @@ export class ConfigBuilder { for (const key in jsonObject) { const value = jsonObject[key]; if (key === 'clusterName') { - this.clientConfig.clusterName = tryGetString(value); + this.effectiveConfig.clusterName = tryGetString(value); } else if (key === 'instanceName') { - this.clientConfig.instanceName = tryGetString(value); + this.effectiveConfig.instanceName = tryGetString(value); } else if (key === 'properties') { this.handleProperties(value); } else if (key === 'clientLabels') { @@ -83,18 +64,24 @@ export class ConfigBuilder { this.handleNetwork(value); } else if (key === 'connectionStrategy') { this.handleConnectionStrategy(value); - } else if (key === 'listeners') { - this.handleListeners(value); + } else if (key === 'lifecycleListeners') { + this.handleLifecycleListeners(value); + } else if (key === 'membershipListeners') { + this.handleMembershipListeners(value); } else if (key === 'serialization') { this.handleSerialization(value); } else if (key === 'nearCaches') { this.handleNearCaches(value); } else if (key === 'reliableTopics') { this.handleReliableTopics(value); - } else if (key === 'flakeIdGeneratorConfigs') { - this.handleFlakeIds(value); + } else if (key === 'flakeIdGenerators') { + this.handleFlakeIdGenerators(value); } else if (key === 'loadBalancer') { this.handleLoadBalancer(value); + } else if (key === 'customLogger') { + this.handleLogger(value); + } else if (key === 'customCredentials') { + this.handleCredentials(value); } } } @@ -103,9 +90,9 @@ export class ConfigBuilder { for (const key in jsonObject) { const value = jsonObject[key]; if (key === 'asyncStart') { - this.clientConfig.connectionStrategyConfig.asyncStart = tryGetBoolean(value); + this.effectiveConfig.connectionStrategy.asyncStart = tryGetBoolean(value); } else if (key === 'reconnectMode') { - this.clientConfig.connectionStrategyConfig.reconnectMode = tryGetEnum(ReconnectMode, value); + this.effectiveConfig.connectionStrategy.reconnectMode = tryGetEnum(ReconnectMode, value); } else if (key === 'connectionRetry') { this.handleConnectionRetry(value); } @@ -116,16 +103,16 @@ export class ConfigBuilder { for (const key in jsonObject) { const value = jsonObject[key]; if (key === 'initialBackoffMillis') { - this.clientConfig.connectionStrategyConfig.connectionRetryConfig.initialBackoffMillis = tryGetNumber(value); + this.effectiveConfig.connectionStrategy.connectionRetry.initialBackoffMillis = tryGetNumber(value); } else if (key === 'maxBackoffMillis') { - this.clientConfig.connectionStrategyConfig.connectionRetryConfig.maxBackoffMillis = tryGetNumber(value); + this.effectiveConfig.connectionStrategy.connectionRetry.maxBackoffMillis = tryGetNumber(value); } else if (key === 'multiplier') { - this.clientConfig.connectionStrategyConfig.connectionRetryConfig.multiplier = tryGetNumber(value); + this.effectiveConfig.connectionStrategy.connectionRetry.multiplier = tryGetNumber(value); } else if (key === 'clusterConnectTimeoutMillis') { - this.clientConfig.connectionStrategyConfig.connectionRetryConfig + this.effectiveConfig.connectionStrategy.connectionRetry .clusterConnectTimeoutMillis = tryGetNumber(value); } else if (key === 'jitter') { - this.clientConfig.connectionStrategyConfig.connectionRetryConfig.jitter = tryGetNumber(value); + this.effectiveConfig.connectionStrategy.connectionRetry.jitter = tryGetNumber(value); } } } @@ -134,7 +121,7 @@ export class ConfigBuilder { const labelsArray = tryGetArray(jsonObject); for (const index in labelsArray) { const label = labelsArray[index]; - this.clientConfig.labels.add(label); + this.effectiveConfig.clientLabels.push(label); } } @@ -143,9 +130,9 @@ export class ConfigBuilder { if (key === 'clusterMembers') { this.handleClusterMembers(jsonObject[key]); } else if (key === 'smartRouting') { - this.clientConfig.networkConfig.smartRouting = tryGetBoolean(jsonObject[key]); + this.effectiveConfig.network.smartRouting = tryGetBoolean(jsonObject[key]); } else if (key === 'connectionTimeout') { - this.clientConfig.networkConfig.connectionTimeout = tryGetNumber(jsonObject[key]); + this.effectiveConfig.network.connectionTimeout = tryGetNumber(jsonObject[key]); } else if (key === 'ssl') { this.handleSSL(jsonObject[key]); } else if (key === 'hazelcastCloud') { @@ -155,13 +142,9 @@ export class ConfigBuilder { } private handleHazelcastCloud(jsonObject: any): void { - const cloudConfigEnabled = tryGetBoolean(jsonObject.enabled); - if (cloudConfigEnabled) { - this.clientConfig.networkConfig.cloudConfig.enabled = cloudConfigEnabled; - } for (const key in jsonObject) { if (key === 'discoveryToken') { - this.clientConfig.networkConfig.cloudConfig.discoveryToken = tryGetString(jsonObject[key]); + this.effectiveConfig.network.hazelcastCloud.discoveryToken = tryGetString(jsonObject[key]); } } } @@ -174,33 +157,20 @@ export class ConfigBuilder { return props; } - private parseImportConfig(jsonObject: any): ImportConfig { - const importConfig: ImportConfig = {} as ImportConfig; - importConfig.path = jsonObject.path; - importConfig.exportedName = jsonObject.exportedName; - return importConfig; - } - private handleSSL(jsonObject: any): void { const sslEnabled = tryGetBoolean(jsonObject.enabled); - this.clientConfig.networkConfig.sslConfig.enabled = sslEnabled; + this.effectiveConfig.network.ssl.enabled = sslEnabled; if (jsonObject.sslOptions) { - if (jsonObject.factory) { - throw new RangeError('Invalid configuration. Either SSL options should be set manually or SSL factory' + - ' should be used.'); - } - this.clientConfig.networkConfig.sslConfig.sslOptions = jsonObject.sslOptions; - } else if (jsonObject.factory) { - const factory = jsonObject.factory; - const importConfig = this.parseImportConfig(factory); - if (importConfig.path == null && importConfig.exportedName !== BasicSSLOptionsFactory.name) { - throw new RangeError('Invalid configuration. Either SSL factory path should be set or exportedName' + - ' should be ' + BasicSSLOptionsFactory.name + '.'); - } else { - this.clientConfig.networkConfig.sslConfig.sslOptionsFactoryConfig = this.parseImportConfig(factory); - this.clientConfig.networkConfig.sslConfig.sslOptionsFactoryProperties = this.parseProperties(factory.properties); + if (jsonObject.sslOptionsFactory || jsonObject.sslOptionsFactoryProperties) { + throw new RangeError('Invalid configuration. Either SSL options should be set manually or SSL factory' + + ' should be used.'); } + this.effectiveConfig.network.ssl.sslOptions = jsonObject.sslOptions; + } else if (jsonObject.sslOptionsFactory || jsonObject.sslOptionsFactoryProperties) { + this.effectiveConfig.network.ssl.sslOptionsFactory = jsonObject.sslOptionsFactory; + this.effectiveConfig.network.ssl.sslOptionsFactoryProperties = jsonObject.sslOptionsFactoryProperties + ? this.parseProperties(jsonObject.sslOptionsFactoryProperties) : null; } } @@ -208,76 +178,79 @@ export class ConfigBuilder { const addressArray = tryGetArray(jsonObject); for (const index in addressArray) { const address = addressArray[index]; - this.clientConfig.networkConfig.addresses.push(tryGetString(address)); + this.effectiveConfig.network.clusterMembers.push(tryGetString(address)); } } private handleProperties(jsonObject: any): void { for (const key in jsonObject) { - this.clientConfig.properties[key] = jsonObject[key]; + this.effectiveConfig.properties[key] = jsonObject[key]; + } + } + + private handleLifecycleListeners(jsonObject: any): void { + const listenersArray = tryGetArray(jsonObject); + for (const index in listenersArray) { + const listener = listenersArray[index]; + this.effectiveConfig.lifecycleListeners.push(listener); } } - private handleListeners(jsonObject: any): void { + private handleMembershipListeners(jsonObject: any): void { const listenersArray = tryGetArray(jsonObject); for (const index in listenersArray) { const listener = listenersArray[index]; - const listenerConfig = {} as ListenerImportConfig; - listenerConfig.importConfig = this.parseImportConfig(listener); - listenerConfig.type = listener.type; - this.clientConfig.listenerConfigs.push(listenerConfig); + this.effectiveConfig.membershipListeners.push(listener); } } private handleSerialization(jsonObject: any): void { for (const key in jsonObject) { if (key === 'defaultNumberType') { - this.clientConfig.serializationConfig.defaultNumberType = tryGetString(jsonObject[key]); + this.effectiveConfig.serialization.defaultNumberType = tryGetString(jsonObject[key]); } else if (key === 'isBigEndian') { - this.clientConfig.serializationConfig.isBigEndian = tryGetBoolean(jsonObject[key]); + this.effectiveConfig.serialization.isBigEndian = tryGetBoolean(jsonObject[key]); } else if (key === 'portableVersion') { - this.clientConfig.serializationConfig.portableVersion = tryGetNumber(jsonObject[key]); + this.effectiveConfig.serialization.portableVersion = tryGetNumber(jsonObject[key]); } else if (key === 'dataSerializableFactories') { for (const index in jsonObject[key]) { - const factory = jsonObject[key][index]; - this.clientConfig.serializationConfig - .dataSerializableFactoryConfigs[factory.factoryId] = this.parseImportConfig(factory); + const idx = Number.parseInt(index); + this.effectiveConfig.serialization + .dataSerializableFactories[idx] = jsonObject[key][index]; } } else if (key === 'portableFactories') { for (const index in jsonObject[key]) { - const factory = jsonObject[key][index]; - this.clientConfig.serializationConfig - .portableFactoryConfigs[factory.factoryId] = this.parseImportConfig(factory); + const idx = Number.parseInt(index); + this.effectiveConfig.serialization + .portableFactories[idx] = jsonObject[key][index]; } } else if (key === 'globalSerializer') { const globalSerializer = jsonObject[key]; - this.clientConfig.serializationConfig.globalSerializerConfig = this.parseImportConfig(globalSerializer); - } else if (key === 'serializers') { - this.handleSerializers(jsonObject[key]); + this.effectiveConfig.serialization.globalSerializer = globalSerializer; + } else if (key === 'customSerializers') { + this.handleCustomSerializers(jsonObject[key]); } else if (key === 'jsonStringDeserializationPolicy') { - this.clientConfig.serializationConfig + this.effectiveConfig.serialization .jsonStringDeserializationPolicy = tryGetEnum(JsonStringDeserializationPolicy, jsonObject[key]); } } } - private handleSerializers(jsonObject: any): void { + private handleCustomSerializers(jsonObject: any): void { const serializersArray = tryGetArray(jsonObject); for (const index in serializersArray) { const serializer = serializersArray[index]; - this.clientConfig.serializationConfig.customSerializerConfigs[serializer.typeId] = this.parseImportConfig(serializer); + this.effectiveConfig.serialization.customSerializers.push(serializer); } } private handleNearCaches(jsonObject: any): void { - const nearCachesArray = tryGetArray(jsonObject); - for (const index in nearCachesArray) { - const ncConfig = nearCachesArray[index]; - const nearCacheConfig = new NearCacheConfig(); + for (const key in jsonObject) { + const ncConfig = jsonObject[key]; + const nearCacheConfig = new NearCacheConfigImpl(); + nearCacheConfig.name = key; for (const name in ncConfig) { - if (name === 'name') { - nearCacheConfig.name = tryGetString(ncConfig[name]); - } else if (name === 'invalidateOnChange') { + if (name === 'invalidateOnChange') { nearCacheConfig.invalidateOnChange = tryGetBoolean(ncConfig[name]); } else if (name === 'maxIdleSeconds') { nearCacheConfig.maxIdleSeconds = tryGetNumber(ncConfig[name]); @@ -295,56 +268,57 @@ export class ConfigBuilder { nearCacheConfig.evictionSamplingPoolSize = tryGetNumber(ncConfig[name]); } } - this.clientConfig.nearCacheConfigs[nearCacheConfig.name] = nearCacheConfig; + this.effectiveConfig.nearCaches[nearCacheConfig.name] = nearCacheConfig; } } private handleReliableTopics(jsonObject: any): void { - const rtConfigsArray = tryGetArray(jsonObject); - for (const index in rtConfigsArray) { - const jsonRtCfg = rtConfigsArray[index]; - const reliableTopicConfig = new ReliableTopicConfig(); + for (const key in jsonObject) { + const jsonRtCfg = jsonObject[key]; + const reliableTopicConfig = new ReliableTopicConfigImpl(); + reliableTopicConfig.name = key; for (const name in jsonRtCfg) { - if (name === 'name') { - reliableTopicConfig.name = jsonRtCfg[name]; - } else if (name === 'readBatchSize') { + if (name === 'readBatchSize') { reliableTopicConfig.readBatchSize = jsonRtCfg[name]; } else if (name === 'overloadPolicy') { reliableTopicConfig.overloadPolicy = tryGetEnum(TopicOverloadPolicy, jsonRtCfg[name]); } } - this.clientConfig.reliableTopicConfigs[reliableTopicConfig.name] = reliableTopicConfig; + this.effectiveConfig.reliableTopics[reliableTopicConfig.name] = reliableTopicConfig; } } - private handleFlakeIds(jsonObject: any): void { - const flakeIdsArray = tryGetArray(jsonObject); - for (const index in flakeIdsArray) { - const fidConfig = flakeIdsArray[index]; - const flakeIdConfig = new FlakeIdGeneratorConfig(); + private handleFlakeIdGenerators(jsonObject: any): void { + for (const key in jsonObject) { + const fidConfig = jsonObject[key]; + const flakeIdConfig = new FlakeIdGeneratorConfigImpl(); + flakeIdConfig.name = key; for (const name in fidConfig) { - if (name === 'name') { - flakeIdConfig.name = tryGetString(fidConfig[name]); - } else if (name === 'prefetchCount') { + if (name === 'prefetchCount') { flakeIdConfig.prefetchCount = tryGetNumber(fidConfig[name]); } else if (name === 'prefetchValidityMillis') { flakeIdConfig.prefetchValidityMillis = tryGetNumber(fidConfig[name]); } } - this.clientConfig.flakeIdGeneratorConfigs[flakeIdConfig.name] = flakeIdConfig; + this.effectiveConfig.flakeIdGenerators[flakeIdConfig.name] = flakeIdConfig; } } private handleLoadBalancer(jsonObject: any): void { for (const key in jsonObject) { if (key === 'type') { - const loadBalancer = tryGetString(jsonObject[key]); - if (loadBalancer === 'random') { - this.clientConfig.loadBalancer = new RandomLB(); - } else if (loadBalancer === 'roundRobin') { - this.clientConfig.loadBalancer = new RoundRobinLB(); - } + this.effectiveConfig.loadBalancer.type = tryGetEnum(LoadBalancerType, jsonObject[key]); + } else if (key === 'customLoadBalancer') { + this.effectiveConfig.loadBalancer.customLoadBalancer = jsonObject[key]; } } } + + private handleLogger(jsonObject: any): void { + this.effectiveConfig.customLogger = jsonObject; + } + + private handleCredentials(jsonObject: any): void { + this.effectiveConfig.customCredentials = jsonObject; + } } diff --git a/src/config/ConnectionRetryConfig.ts b/src/config/ConnectionRetryConfig.ts index 5ad4282e1..926317aee 100644 --- a/src/config/ConnectionRetryConfig.ts +++ b/src/config/ConnectionRetryConfig.ts @@ -15,35 +15,57 @@ */ /** - * Connection Retry Config is controls the period among the retries and when should a client gave up - * retrying. Exponential behaviour can be chosen or jitter can be added to wait periods. + * Connection retry config controls the period among connection establish retries + * and defines when the client should give up retrying. Supports exponential behaviour + * with jitter for wait periods. */ -export class ConnectionRetryConfig { +export interface ConnectionRetryConfig { + /** - * How long to wait after the first failure before retrying. Must be non-negative. + * Defines wait period in millisecond after the first failure before retrying. + * Must be non-negative. By default, set to `1000`. */ - initialBackoffMillis = 1000; + initialBackoffMillis?: number; /** - * When backoff reaches this upper bound, it does not increase any more. Must be non-negative. + * Defines an upper bound for the backoff interval in milliseconds. Must be + * non-negative. By default, set to `30000` (30 seconds). */ - maxBackoffMillis = 30000; + maxBackoffMillis?: number; /** - * Timeout value in milliseconds for the client to give up to connect to the current cluster. + * Defines timeout value in milliseconds for the client to give up a connection + * attempt to the cluster. Must be non-negative. By default, set to `20000` + * (20 seconds). */ - clusterConnectTimeoutMillis = 20000; + clusterConnectTimeoutMillis?: number; /** - * Factor with which to multiply backoff after a failed retry. Must be greater than or equal to 1. + * Defines the factor with which to multiply backoff after a failed retry. + * Must be greater than or equal to `1`. By default, set to `1`. */ - multiplier = 1; + multiplier?: number; /** - * By how much to randomize backoffs. - * At each iteration calculated back-off is randomized via following method - * Random(-jitter * current_backoff, jitter * current_backoff) - * It must be in range [0.0, 1.0]. + * Defines how much to randomize backoffs. At each iteration the calculated + * back-off is randomized via following method in pseudo-code + * `Random(-jitter * current_backoff, jitter * current_backoff)`. + * Must be in range `[0.0, 1.0]`. By default, set to `0` (no randomization). */ + jitter?: number; + +} + +/** + * Connection Retry Config is controls the period among the retries and when should a client gave up + * retrying. Exponential behaviour can be chosen or jitter can be added to wait periods. + */ +export class ConnectionRetryConfigImpl implements ConnectionRetryConfig { + + initialBackoffMillis = 1000; + maxBackoffMillis = 30000; + clusterConnectTimeoutMillis = 20000; + multiplier = 1; jitter = 0; + } diff --git a/src/config/ConnectionStrategyConfig.ts b/src/config/ConnectionStrategyConfig.ts index 26b127c91..0be93e8f6 100644 --- a/src/config/ConnectionStrategyConfig.ts +++ b/src/config/ConnectionStrategyConfig.ts @@ -14,12 +14,13 @@ * limitations under the License. */ -import {ConnectionRetryConfig} from './ConnectionRetryConfig'; +import {ConnectionRetryConfig, ConnectionRetryConfigImpl} from './ConnectionRetryConfig'; /** - * Reconnect options. + * Reconnect mode. */ export enum ReconnectMode { + /** * Prevent reconnect to cluster after a disconnect */ @@ -35,29 +36,41 @@ export enum ReconnectMode { * {@link ClientOfflineError} */ ASYNC = 'ASYNC', + } /** * Connection strategy configuration is used for setting custom strategies and configuring strategy parameters. */ -export class ConnectionStrategyConfig { +export interface ConnectionStrategyConfig { + /** - * Set true for non blocking {@link HazelcastClient.newHazelcastClient}. The client creation won't wait to - * connect to cluster. The client instance will throw exception until it connects to cluster and become ready. - * If set to false, {@link HazelcastClient.newHazelcastClient} will block until a cluster connection established and it's - * ready to use client instance + * Enables non-blocking start mode of {@link HazelcastClient.newHazelcastClient}. + * When set to `true`, the client creation will not wait to connect to cluster. + * The client instance will throw exceptions until it connects to cluster and becomes + * ready. If set to `false`, {@link HazelcastClient.newHazelcastClient} will block + * until a cluster connection established and it is ready to use the client instance. + * By default, set to `false`. */ - asyncStart = false; + asyncStart?: boolean; /** - * How a client reconnect to cluster after a disconnect can be configured. This parameter is used by default strategy and - * custom implementations may ignore it if configured. + * Defines how a client reconnects to cluster after a disconnect. Available values + * are `ON`, `OFF` and `ASYNC`. By default, set to `ON`. */ - reconnectMode: ReconnectMode = ReconnectMode.ON; + reconnectMode?: ReconnectMode; /** - * Connection Retry Config is controls the period among the retries and when should a client gave up - * retrying. Exponential behaviour can be chosen or jitter can be added to wait periods. + * Connection retry config to be used by the client. */ - connectionRetryConfig: ConnectionRetryConfig = new ConnectionRetryConfig(); + connectionRetry?: ConnectionRetryConfig; + +} + +export class ConnectionStrategyConfigImpl implements ConnectionStrategyConfig { + + asyncStart = false; + reconnectMode: ReconnectMode = ReconnectMode.ON; + connectionRetry: ConnectionRetryConfigImpl = new ConnectionRetryConfigImpl(); + } diff --git a/src/config/EvictionPolicy.ts b/src/config/EvictionPolicy.ts index 8734d93a3..a5a3878ae 100644 --- a/src/config/EvictionPolicy.ts +++ b/src/config/EvictionPolicy.ts @@ -18,8 +18,25 @@ * Represents the format that objects are kept in this client's memory. */ export enum EvictionPolicy { - NONE, - LRU, - LFU, - RANDOM, + + /** + * No items are evicted. + */ + NONE = 'NONE', + + /** + * Least Recently Used. + */ + LRU = 'LRU', + + /** + * Least Frequently Used. + */ + LFU = 'LFU', + + /** + * A random item is evicted each time. + */ + RANDOM = 'RANDOM', + } diff --git a/src/config/FlakeIdGeneratorConfig.ts b/src/config/FlakeIdGeneratorConfig.ts index b9fefe085..1fadfb273 100644 --- a/src/config/FlakeIdGeneratorConfig.ts +++ b/src/config/FlakeIdGeneratorConfig.ts @@ -14,30 +14,39 @@ * limitations under the License. */ -export class FlakeIdGeneratorConfig { - /** - * Sets the name for this config. - */ - name = 'default'; + +/** + * Configuration to be used by the client for the specified FlakeIdGenerator. + */ +export interface FlakeIdGeneratorConfig { /** - * Sets how many IDs are pre-fetched on the background when a new flake id is requested - * from servers. Default is 100. - * - * prefetch count should be in the range 1..100,000. + * Defines how many IDs are pre-fetched on the background when a new flake id + * is requested from the cluster. Should be in the range `1..100000`. + * By default, set to `100`. */ - prefetchCount = 100; + prefetchCount?: number; /** - * Sets for how long the pre-fetched IDs can be used. If this time elapses, a new batch of IDs will be - * fetched. Time unit is milliseconds, default is 600,000 (10 minutes). + * Defines for how long the pre-fetched IDs can be used. If this time elapsed, + * a new batch of IDs will be fetched. Time unit is milliseconds. By default, + * set to `600000` (10 minutes). *

* The IDs contain timestamp component, which ensures rough global ordering of IDs. If an ID * is assigned to an object that was created much later, it will be much out of order. If you don't care - * about ordering, set this value to 0. - * - * Set to the desired ID validity or 0 for unlimited. + * about ordering, set this value to `0` for unlimited ID validity. */ + prefetchValidityMillis?: number; + +} + +export class FlakeIdGeneratorConfigImpl implements FlakeIdGeneratorConfig { + + /** + * Name of the FlakeIdGenerator. + */ + name: string; + prefetchCount = 100; prefetchValidityMillis = 600000; toString(): string { @@ -47,9 +56,10 @@ export class FlakeIdGeneratorConfig { 'prefetchValidityMillis: ' + this.prefetchValidityMillis + ']'; } - clone(): FlakeIdGeneratorConfig { - const other = new FlakeIdGeneratorConfig(); + clone(): FlakeIdGeneratorConfigImpl { + const other = new FlakeIdGeneratorConfigImpl(); Object.assign(other, this); return other; } + } diff --git a/src/config/InMemoryFormat.ts b/src/config/InMemoryFormat.ts index e13ea6be2..7f0143ddb 100644 --- a/src/config/InMemoryFormat.ts +++ b/src/config/InMemoryFormat.ts @@ -14,14 +14,19 @@ * limitations under the License. */ +/** + * In-memory format for Near Cache. + */ export enum InMemoryFormat { + /** - * Objects are in native JS objects + * Objects are in native JS objects. */ - OBJECT, + OBJECT = 'OBJECT', /** - * Objects are in serialized form + * Objects are in serialized form. */ - BINARY, + BINARY = 'BINARY', + } diff --git a/src/config/IndexConfig.ts b/src/config/IndexConfig.ts index 34f81ab4e..7d2c0523d 100644 --- a/src/config/IndexConfig.ts +++ b/src/config/IndexConfig.ts @@ -14,9 +14,8 @@ * limitations under the License. */ -import {IndexType} from './IndexType'; -import {BitmapIndexOptions} from './BitmapIndexOptions'; -import {IndexUtil} from '../util/IndexUtil'; +import {IndexType, IndexTypeStrings} from './IndexType'; +import {BitmapIndexOptions, InternalBitmapIndexOptions} from './BitmapIndexOptions'; /** * Configuration of an index. Hazelcast support two types of indexes: sorted index and hash index. @@ -28,30 +27,51 @@ import {IndexUtil} from '../util/IndexUtil'; * * @see {@link IndexType} */ -export class IndexConfig { - /** - * Default index type. - */ - public static readonly DEFAULT_TYPE = IndexType.SORTED; +export interface IndexConfig { /** * Name of the index. */ - name: string; + name?: string; /** - * Type of the index. + * Type of the index. By default, set to `SORTED`. Available values + * are `SORTED`, `HASH`, and `BITMAP`. */ - type: IndexType = IndexConfig.DEFAULT_TYPE; + type?: IndexTypeStrings; /** * Indexed attributes. */ - attributes: string[] = []; + attributes?: string[]; - bitmapIndexOptions: BitmapIndexOptions; + /** + * Bitmap index options. + */ + bitmapIndexOptions?: BitmapIndexOptions; + +} + +/** + * Follows the shape of {@link IndexConfig}, but doesn't implement it due + * to the `type` enum field. + */ +export class InternalIndexConfig { - constructor(name?: string, type?: IndexType, attributes?: string[], bitmapIndexOptions?: BitmapIndexOptions) { + /** + * Default index type. + */ + public static readonly DEFAULT_TYPE = IndexType.SORTED; + + name: string; + type: IndexType = InternalIndexConfig.DEFAULT_TYPE; + attributes: string[] = []; + bitmapIndexOptions: InternalBitmapIndexOptions; + + constructor(name?: string, + type?: IndexType, + attributes?: string[], + bitmapIndexOptions?: InternalBitmapIndexOptions) { if (name) { this.name = name; } @@ -63,17 +83,12 @@ export class IndexConfig { if (attributes) { this.attributes = attributes; } + if (bitmapIndexOptions) { this.bitmapIndexOptions = bitmapIndexOptions; } } - addAttribute(attribute: string): IndexConfig { - IndexUtil.validateAttribute(this, attribute); - this.attributes.push(attribute); - return this; - } - toString(): string { let bitmapIndexOptions: string; if (this.bitmapIndexOptions == null) { @@ -89,4 +104,5 @@ export class IndexConfig { ', bitmapIndexOptions: ' + bitmapIndexOptions + ']'; } + } diff --git a/src/config/IndexType.ts b/src/config/IndexType.ts index b4cc586dd..298b2d81b 100644 --- a/src/config/IndexType.ts +++ b/src/config/IndexType.ts @@ -18,6 +18,7 @@ * Type of the index. */ export enum IndexType { + /** * Sorted index. Can be used with equality and range predicates. */ @@ -32,4 +33,7 @@ export enum IndexType { * Bitmap index. Can be used with equality predicates. */ BITMAP = 2, + } + +export type IndexTypeStrings = keyof typeof IndexType; diff --git a/src/config/JsonConfigLocator.ts b/src/config/JsonConfigLocator.ts deleted file mode 100644 index 72f14e1d7..000000000 --- a/src/config/JsonConfigLocator.ts +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import * as Promise from 'bluebird'; -import * as fs from 'fs'; -import * as Path from 'path'; -import {LogLevel} from '../logging/LoggingService'; -import {DeferredPromise} from '../Util'; -import {DefaultLogger} from '../logging/DefaultLogger'; - -export class JsonConfigLocator { - static readonly ENV_VARIABLE_NAME = 'HAZELCAST_CLIENT_CONFIG'; - static readonly DEFAULT_FILE_NAME = 'hazelcast-client.json'; - - private buffer: Buffer; - private configLocation: string; - private logger = new DefaultLogger(LogLevel.INFO); - - load(): Promise { - return this.loadFromEnvironment().then((loaded: boolean) => { - if (loaded) { - return; - } - return this.loadFromWorkingDirectory().then((loaded: boolean) => { - if (loaded) { - return; - } - }); - }); - } - - loadFromEnvironment(): Promise { - const envVariableLocation = process.env[JsonConfigLocator.ENV_VARIABLE_NAME]; - if (envVariableLocation) { - const loadLocation = Path.resolve(envVariableLocation); - this.logger.trace('ConfigBuilder', 'Loading config from ' + loadLocation); - return this.loadPath(loadLocation).then((buffer: Buffer) => { - this.configLocation = loadLocation; - this.buffer = buffer; - return true; - }); - } else { - return Promise.resolve(false); - } - } - - loadFromWorkingDirectory(): Promise { - const cwd = process.cwd(); - const jsonPath = Path.resolve(cwd, JsonConfigLocator.DEFAULT_FILE_NAME); - const deferred = DeferredPromise(); - fs.access(jsonPath, (err) => { - if (err) { - deferred.resolve(false); - } else { - this.loadPath(jsonPath).then((buffer: Buffer) => { - this.buffer = buffer; - this.configLocation = jsonPath; - deferred.resolve(true); - }).catch((e) => { - deferred.reject(e); - }); - } - }); - return deferred.promise; - } - - loadImported(path: string): Promise { - return this.loadPath(Path.resolve(Path.dirname(this.configLocation), path)); - } - - loadPath(path: string): Promise { - const deferred = DeferredPromise(); - fs.readFile(path, (err, data: Buffer) => { - if (err) { - this.logger.trace('JsonConfigLocator', 'Cannot read from ' + path.toString()); - deferred.reject(err); - } else { - deferred.resolve(data); - } - }); - return deferred.promise; - } - - getBuffer(): Buffer { - return this.buffer; - } -} diff --git a/src/config/JsonStringDeserializationPolicy.ts b/src/config/JsonStringDeserializationPolicy.ts index d21799c75..6fb3c2beb 100644 --- a/src/config/JsonStringDeserializationPolicy.ts +++ b/src/config/JsonStringDeserializationPolicy.ts @@ -19,16 +19,18 @@ * deserialization type of the JSON strings. */ export enum JsonStringDeserializationPolicy { + /** * JSON strings are parsed and returned * as JavaScript objects. */ - EAGER, + EAGER = 'EAGER', /** * Raw JSON strings are returned around a * lightweight {@link HazelcastJsonValue} * wrapper. */ - NO_DESERIALIZATION, + NO_DESERIALIZATION = 'NO_DESERIALIZATION', + } diff --git a/src/config/ListenerConfig.ts b/src/config/ListenerConfig.ts deleted file mode 100644 index 097e738ce..000000000 --- a/src/config/ListenerConfig.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {MembershipListener} from '../core/MembershipListener'; -import {LifecycleState} from '../LifecycleService'; - -/** - * Configurations for LifecycleListeners. These are registered as soon as client started. - */ -export class ListenerConfig { - lifecycleListeners: Array<(state: LifecycleState) => void> = []; - membershipListeners: MembershipListener[] = []; - - addLifecycleListener(listener: (state: LifecycleState) => void): void { - this.lifecycleListeners.push(listener); - } - - addMembershipListener(listener: MembershipListener): void { - this.membershipListeners.push(listener); - } - - getLifecycleListeners(): Array<(state: LifecycleState) => void> { - return this.lifecycleListeners; - } - - getMembershipListeners(): MembershipListener[] { - return this.membershipListeners; - } -} diff --git a/src/config/LoadBalancerConfig.ts b/src/config/LoadBalancerConfig.ts new file mode 100644 index 000000000..b18a8b89f --- /dev/null +++ b/src/config/LoadBalancerConfig.ts @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {LoadBalancer} from '../LoadBalancer'; + +/** + * Defines {@link LoadBalancer} implementation used by the client. + */ +export enum LoadBalancerType { + + /** + * This implementation picks the next member randomly. + */ + RANDOM = 'RANDOM', + + /** + * This implementation picks each cluster member in turn. + */ + ROUND_ROBIN = 'ROUND_ROBIN', + +} + +/** + * Connection strategy configuration is used for setting custom strategies and configuring strategy parameters. + */ +export interface LoadBalancerConfig { + + /** + * Defines {@link LoadBalancer} used by the client. Available values + * are `RANDOM` and `ROUND_ROBIN`. By default, set to `ROUND_ROBIN`. + */ + type?: LoadBalancerType; + + /** + * Custom load balancer implementation for the client. When this option is in use, + * `loadBalancerType` setting is ignored. + */ + customLoadBalancer?: LoadBalancer; + +} + +export class LoadBalancerConfigImpl implements LoadBalancerConfig { + + type = LoadBalancerType.ROUND_ROBIN; + customLoadBalancer: LoadBalancer = null; + +} diff --git a/src/config/NearCacheConfig.ts b/src/config/NearCacheConfig.ts index 6d6a41bae..4607148df 100644 --- a/src/config/NearCacheConfig.ts +++ b/src/config/NearCacheConfig.ts @@ -17,24 +17,72 @@ import {EvictionPolicy} from './EvictionPolicy'; import {InMemoryFormat} from './InMemoryFormat'; -export class NearCacheConfig { - name = 'default'; +/** + * Near Cache configuration to be used by the client for the specified IMap. + */ +export interface NearCacheConfig { + /** - * 'true' to invalidate entries when they are changed in cluster, - * 'false' to invalidate entries only when they are accessed. + * Enables cluster-assisted invalidate on change behavior. When set to `true`, + * entries are invalidated when they are changed in cluster. By default, set to `true`. */ - invalidateOnChange = true; + invalidateOnChange?: boolean; + /** - * Max number of seconds that an entry can stay in the cache until it is acceessed + * Maximum number of seconds that an entry can stay in the Near Cache until + * it is accessed. By default, set to `0`. */ - maxIdleSeconds = 0; - inMemoryFormat: InMemoryFormat = InMemoryFormat.BINARY; + maxIdleSeconds?: number; + + /** + * Specifies in which format data will be stored in the Near Cache. Available values + * are `OBJECT` and `BINARY`. By default, set to `BINARY`. + */ + inMemoryFormat?: InMemoryFormat; + + /** + * Maximum number of seconds that an entry can stay in cache. By default, set to `0`. + */ + timeToLiveSeconds?: number; + + /** + * Defines eviction policy configuration. Available values are `LRU`, `LFU`, `NONE` + * and `RANDOM`. By default, set to `LRU`. + */ + evictionPolicy?: EvictionPolicy; + /** - * Maximum number of seconds that an entry can stay in cache. + * Defines maximum number of entries kept in the memory before eviction kicks in. + * By default, set to `Number.MAX_SAFE_INTEGER`. */ + evictionMaxSize?: number; + + /** + * Number of random entries that are evaluated to see if some of them are already + * expired. By default, set to `8`. + */ + evictionSamplingCount?: number; + + /** + * Size of the pool for eviction candidates. The pool is kept sorted according to + * the eviction policy. By default, set to `16`. + */ + evictionSamplingPoolSize?: number; + +} + +export class NearCacheConfigImpl implements NearCacheConfig { + + /** + * Name of the IMap backed by the Near Cache. + */ + name: string; + invalidateOnChange = true; + maxIdleSeconds = 0; + inMemoryFormat = InMemoryFormat.BINARY; timeToLiveSeconds = 0; - evictionPolicy: EvictionPolicy = EvictionPolicy.NONE; - evictionMaxSize: number = Number.MAX_SAFE_INTEGER; + evictionPolicy = EvictionPolicy.LRU; + evictionMaxSize = Number.MAX_SAFE_INTEGER; evictionSamplingCount = 8; evictionSamplingPoolSize = 16; @@ -49,9 +97,10 @@ export class NearCacheConfig { 'maxIdleSeconds: ' + this.maxIdleSeconds + ']'; } - clone(): NearCacheConfig { - const other = new NearCacheConfig(); + clone(): NearCacheConfigImpl { + const other = new NearCacheConfigImpl(); Object.assign(other, this); return other; } + } diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts index 4c0efcee5..4abc33435 100644 --- a/src/config/ReliableTopicConfig.ts +++ b/src/config/ReliableTopicConfig.ts @@ -16,8 +16,30 @@ import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; -export class ReliableTopicConfig { - name = 'default'; +/** + * Configuration to be used by the client for the specified ReliableTopic. + */ +export interface ReliableTopicConfig { + + /** + * Minimum number of messages that Reliable Topic tries to read in batches. By default, set to `10`. + */ + readBatchSize?: number; + + /** + * Policy to handle an overloaded topic. Available values are `DISCARD_OLDEST`, + * `DISCARD_NEWEST`, `BLOCK` and `ERROR`. By default, set to `BLOCK`. + */ + overloadPolicy?: TopicOverloadPolicy; + +} + +export class ReliableTopicConfigImpl implements ReliableTopicConfig { + + /** + * Name of the ReliableTopic. + */ + name: string; readBatchSize = 10; overloadPolicy: TopicOverloadPolicy = TopicOverloadPolicy.BLOCK; @@ -28,9 +50,10 @@ export class ReliableTopicConfig { 'overloadPolicy: ' + this.overloadPolicy + ']'; } - clone(): ReliableTopicConfig { - const other = new ReliableTopicConfig(); + clone(): ReliableTopicConfigImpl { + const other = new ReliableTopicConfigImpl(); Object.assign(other, this); return other; } + } diff --git a/src/config/SSLConfig.ts b/src/config/SSLConfig.ts index 4af6a23d1..812ae4fc4 100644 --- a/src/config/SSLConfig.ts +++ b/src/config/SSLConfig.ts @@ -16,20 +16,20 @@ import {ConnectionOptions} from 'tls'; import {Properties} from './Properties'; -import {ImportConfig} from './ImportConfig'; +import {SSLOptionsFactory} from '../connection/SSLOptionsFactory'; /** * SSL configuration. */ -export class SSLConfig { +export interface SSLConfig { /** * If it is true, SSL is enabled. */ - enabled = false; + enabled?: boolean; /** - * sslOptions is by default null which means the following default configuration + * Default SSL options are empty which means the following default configuration * is used while connecting to the server. * * { @@ -37,18 +37,27 @@ export class SSLConfig { * rejectUnauthorized: true, * }; * - * If you want to override the default behavior, you can write your own connection sslOptions. + * If you want to override the default behavior, you can define your own options. */ - sslOptions: ConnectionOptions = null; + sslOptions?: ConnectionOptions; /** - * sslOptionsFactoryConfig is config for ssl options factory. If you don't specify the path, BasicSSLOptionsFactory is used - * by default. + * SSL options factory. If you don't specify it, BasicSSLOptionsFactory is used by default. */ - sslOptionsFactoryConfig: ImportConfig = null; + sslOptionsFactory?: SSLOptionsFactory; /** - * sslOptionsFactoryProperties is the properties to be set for ssl options. + * The properties to be set for SSL options. */ + sslOptionsFactoryProperties?: Properties; + +} + +export class SSLConfigImpl implements SSLConfig { + + enabled = false; + sslOptions: ConnectionOptions = null; + sslOptionsFactory: SSLOptionsFactory = null; sslOptionsFactoryProperties: Properties = null; + } diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index ae8f231b3..d524f12fd 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -14,21 +14,71 @@ * limitations under the License. */ -import {IdentifiedDataSerializableFactory, PortableFactory} from '../serialization/Serializable'; -import {ImportConfig} from './ImportConfig'; +import { + IdentifiedDataSerializableFactory, + PortableFactory, + CustomSerializable, +} from '../serialization/Serializable'; +import {Serializer} from '../serialization/DefaultSerializer'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; -export class SerializationConfig { +/** + * User-defined serialization config for the client. + */ +export interface SerializationConfig { + + /** + * Defines how the `number` type is represented on the cluster side. By default, it is serialized as `Double`. + */ + defaultNumberType?: string; + + /** + * Defines if big-endian is used as the byte order for the serialization. By default, set to `true`. + */ + isBigEndian?: boolean; + + /** + * Defines IdentifiedDataSerializableFactory serialization factories. + */ + dataSerializableFactories?: { [id: number]: IdentifiedDataSerializableFactory }; + + /** + * Defines Portable serialization factories. + */ + portableFactories?: { [id: number]: PortableFactory }; + + /** + * Defines portable version number. By default, set to `0`. + */ + portableVersion?: number; + + /** + * Defines Custom serializers. + */ + customSerializers?: Array>; + + /** + * Defines the global serializer. This serializer is registered as a fallback serializer + * to handle all other objects if a serializer cannot be located for them. + */ + globalSerializer?: Serializer; + + /** + * Defines JSON deserialization policy. By default, set to `eager`. + */ + jsonStringDeserializationPolicy?: JsonStringDeserializationPolicy; + +} + +export class SerializationConfigImpl implements SerializationConfig { + defaultNumberType = 'double'; isBigEndian = true; dataSerializableFactories: { [id: number]: IdentifiedDataSerializableFactory } = {}; - dataSerializableFactoryConfigs: { [id: number]: ImportConfig } = {}; portableFactories: { [id: number]: PortableFactory } = {}; - portableFactoryConfigs: { [id: number]: ImportConfig } = {}; portableVersion = 0; - customSerializers: any[] = []; - customSerializerConfigs: { [id: number]: ImportConfig } = {}; - globalSerializer: any = null; - globalSerializerConfig: ImportConfig = null; + customSerializers: Array> = []; + globalSerializer: Serializer = null; jsonStringDeserializationPolicy: JsonStringDeserializationPolicy = JsonStringDeserializationPolicy.EAGER; + } diff --git a/src/connection/DefaultAddressProvider.ts b/src/connection/DefaultAddressProvider.ts index 01e751e5f..8b57a6648 100644 --- a/src/connection/DefaultAddressProvider.ts +++ b/src/connection/DefaultAddressProvider.ts @@ -15,7 +15,7 @@ */ import {AddressProvider} from './AddressProvider'; -import {ClientNetworkConfig} from '../config/ClientNetworkConfig'; +import {ClientNetworkConfigImpl} from '../config/ClientNetworkConfig'; import * as Promise from 'bluebird'; import {Address} from '../Address'; @@ -26,14 +26,14 @@ import {Address} from '../Address'; */ export class DefaultAddressProvider implements AddressProvider { - private networkConfig: ClientNetworkConfig; + private networkConfig: ClientNetworkConfigImpl; - constructor(networkConfig: ClientNetworkConfig) { + constructor(networkConfig: ClientNetworkConfigImpl) { this.networkConfig = networkConfig; } loadAddresses(): Promise { - const addresses: string[] = this.networkConfig.addresses; + const addresses: string[] = this.networkConfig.clusterMembers; if (addresses.length === 0) { addresses.push('localhost'); } diff --git a/src/core/MembershipListener.ts b/src/core/MembershipListener.ts index 2cd7ef3be..2361f74c9 100644 --- a/src/core/MembershipListener.ts +++ b/src/core/MembershipListener.ts @@ -20,6 +20,7 @@ import {MembershipEvent} from './MembershipEvent'; * Cluster membership listener. */ export interface MembershipListener { + /** * Invoked when a new member is added to the cluster. * @param {MembershipEvent} membership event @@ -31,4 +32,5 @@ export interface MembershipListener { * @param {MembershipEvent} membership event when an existing member leaves the cluster */ memberRemoved(membership: MembershipEvent): void; + } diff --git a/src/discovery/HazelcastCloudAddressProvider.ts b/src/discovery/HazelcastCloudAddressProvider.ts index 5f13b82ca..fe01e6be3 100644 --- a/src/discovery/HazelcastCloudAddressProvider.ts +++ b/src/discovery/HazelcastCloudAddressProvider.ts @@ -21,6 +21,7 @@ import {ILogger} from '../logging/ILogger'; import {Address} from '../Address'; export class HazelcastCloudAddressProvider implements AddressProvider { + private readonly logger: ILogger; private readonly cloudDiscovery: HazelcastCloudDiscovery; private privateToPublic: Map = new Map(); diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index a9ca783f3..72d97a1e7 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -37,11 +37,11 @@ export class HazelcastCloudDiscovery { private static readonly PUBLIC_ADDRESS_PROPERTY = 'public-address'; private readonly endpointUrl: string; - private readonly connectionTimeoutInMillis: number; + private readonly connectionTimeoutMillis: number; constructor(endpointUrl: string, connectionTimeoutInMillis: number) { this.endpointUrl = endpointUrl; - this.connectionTimeoutInMillis = connectionTimeoutInMillis; + this.connectionTimeoutMillis = connectionTimeoutInMillis; } public static createUrlEndpoint(properties: Properties, cloudToken: string): string { @@ -62,6 +62,7 @@ export class HazelcastCloudDiscovery { const endpointUrlOptions = { host: url.host, path: url.path, + timeout: this.connectionTimeoutMillis, }; let dataAsAString = ''; diff --git a/src/index.ts b/src/index.ts index 23f8446e1..6ee8f7cf3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,8 +19,6 @@ import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); import * as Aggregators from './aggregation/Aggregators'; import {ClientInfo} from './ClientInfo'; import * as Config from './config/Config'; -import {ConfigBuilder} from './config/ConfigBuilder'; -import {ImportConfig} from './config/ImportConfig'; import * as Predicates from './core/Predicate'; import {IterationType} from './core/Predicate'; import HazelcastClient from './HazelcastClient'; @@ -39,13 +37,12 @@ import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializatio import {HazelcastJsonValue} from './core/HazelcastJsonValue'; import {RoundRobinLB} from './util/RoundRobinLB'; import {RandomLB} from './util/RandomLB'; -import { LoadBalancer } from './LoadBalancer'; -import { AbstractLoadBalancer } from './util/AbstractLoadBalancer'; +import {LoadBalancer} from './LoadBalancer'; +import {AbstractLoadBalancer} from './util/AbstractLoadBalancer'; export { HazelcastClient as Client, Config, - ConfigBuilder, ClientInfo, IMap, Address, @@ -55,7 +52,6 @@ export { ReadResultSet, IterationType, Aggregators, - ImportConfig, FieldDefinition, ClassDefinition, ClassDefinitionBuilder, diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index a5f877df6..8d1cc3fdb 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -67,7 +67,7 @@ export class ClusterService implements Cluster { constructor(client: HazelcastClient) { this.client = client; - this.labels = new Set(client.getConfig().labels); + this.labels = new Set(client.getConfig().clientLabels); this.logger = client.getLoggingService().getLogger(); this.connectionManager = client.getConnectionManager(); } diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 67740e727..3d82dba6a 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -151,8 +151,8 @@ export class InvocationService { this.connectionManager = hazelcastClient.getConnectionManager(); this.partitionService = hazelcastClient.getPartitionService(); this.logger = this.client.getLoggingService().getLogger(); - this.smartRoutingEnabled = hazelcastClient.getConfig().networkConfig.smartRouting; - if (hazelcastClient.getConfig().networkConfig.smartRouting) { + this.smartRoutingEnabled = hazelcastClient.getConfig().network.smartRouting; + if (hazelcastClient.getConfig().network.smartRouting) { this.doInvoke = this.invokeSmart; } else { this.doInvoke = this.invokeNonSmart; diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 394f65cc7..90d237af9 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -17,7 +17,7 @@ import * as Long from 'long'; import {EvictionPolicy} from '../config/EvictionPolicy'; import {InMemoryFormat} from '../config/InMemoryFormat'; -import {NearCacheConfig} from '../config/NearCacheConfig'; +import {NearCacheConfigImpl} from '../config/NearCacheConfig'; import {DataKeyedHashMap} from '../DataStoreHashMap'; import {Data} from '../serialization/Data'; import {SerializationService} from '../serialization/SerializationService'; @@ -85,7 +85,7 @@ export class NearCacheImpl implements NearCache { private compareFunc: (x: DataRecord, y: DataRecord) => number; private ready: Promise.Resolver; - constructor(nearCacheConfig: NearCacheConfig, serializationService: SerializationService) { + constructor(nearCacheConfig: NearCacheConfigImpl, serializationService: SerializationService) { this.serializationService = serializationService; this.name = nearCacheConfig.name; this.invalidateOnChange = nearCacheConfig.invalidateOnChange; diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index 23ba77849..cf7227cbe 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -34,14 +34,12 @@ import { AddressHelper, cancelRepetitionTask, DeferredPromise, - loadNameFromPath, scheduleWithRepetition, shuffleArray, Task, } from '../Util'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {ILogger} from '../logging/ILogger'; -import {SSLOptionsFactory} from '../connection/SSLOptionsFactory'; import {Address} from '../Address'; import {HeartbeatManager} from '../HeartbeatManager'; import {UuidUtil} from '../util/UuidUtil'; @@ -49,7 +47,7 @@ import {WaitStrategy} from './WaitStrategy'; import {ReconnectMode} from '../config/ConnectionStrategyConfig'; import {LoadBalancer} from '../LoadBalancer'; import {UUID} from '../core/UUID'; -import {ClientConfig} from '../config/Config'; +import {ClientConfigImpl} from '../config/Config'; import {LifecycleState} from '../LifecycleService'; import {ClientMessage} from '../ClientMessage'; import {BuildInfo} from '../BuildInfo'; @@ -127,15 +125,15 @@ export class ClientConnectionManager extends EventEmitter { super(); this.client = client; this.loadBalancer = client.getLoadBalancer(); - this.labels = Array.from(client.getConfig().labels); + this.labels = client.getConfig().clientLabels; this.logger = this.client.getLoggingService().getLogger(); this.connectionTimeoutMillis = this.initConnectionTimeoutMillis(); this.heartbeatManager = new HeartbeatManager(client, this); this.authenticationTimeout = this.heartbeatManager.getHeartbeatTimeout(); this.shuffleMemberList = client.getConfig().properties['hazelcast.client.shuffle.member.list'] as boolean; - this.isSmartRoutingEnabled = client.getConfig().networkConfig.smartRouting; + this.isSmartRoutingEnabled = client.getConfig().network.smartRouting; this.waitStrategy = this.initWaitStrategy(client.getConfig()); - const connectionStrategyConfig = client.getConfig().connectionStrategyConfig; + const connectionStrategyConfig = client.getConfig().connectionStrategy; this.asyncStart = connectionStrategyConfig.asyncStart; this.reconnectMode = connectionStrategyConfig.reconnectMode; } @@ -317,15 +315,15 @@ export class ClientConnectionManager extends EventEmitter { } } - private initWaitStrategy(config: ClientConfig): WaitStrategy { - const connectionStrategyConfig = config.connectionStrategyConfig; - const retryConfig = connectionStrategyConfig.connectionRetryConfig; + private initWaitStrategy(config: ClientConfigImpl): WaitStrategy { + const connectionStrategyConfig = config.connectionStrategy; + const retryConfig = connectionStrategyConfig.connectionRetry; return new WaitStrategy(retryConfig.initialBackoffMillis, retryConfig.maxBackoffMillis, retryConfig.multiplier, retryConfig.clusterConnectTimeoutMillis, retryConfig.jitter, this.logger); } private initConnectionTimeoutMillis(): number { - const networkConfig = this.client.getConfig().networkConfig; + const networkConfig = this.client.getConfig().network; const connTimeout = networkConfig.connectionTimeout; return connTimeout === 0 ? SET_TIMEOUT_MAX_DELAY : connTimeout; } @@ -494,17 +492,15 @@ export class ClientConnectionManager extends EventEmitter { } private triggerConnect(translatedAddress: Address): Promise { - if (this.client.getConfig().networkConfig.sslConfig.enabled) { - if (this.client.getConfig().networkConfig.sslConfig.sslOptions) { - const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions; + if (this.client.getConfig().network.ssl.enabled) { + if (this.client.getConfig().network.ssl.sslOptions) { + const opts = this.client.getConfig().network.ssl.sslOptions; return this.connectTLSSocket(translatedAddress, opts); - } else if (this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig) { - const factoryConfig = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryConfig; - const factoryProperties = this.client.getConfig().networkConfig.sslConfig.sslOptionsFactoryProperties; - let factory: SSLOptionsFactory; - if (factoryConfig.path) { - factory = new (loadNameFromPath(factoryConfig.path, factoryConfig.exportedName))(); - } else { + } else if (this.client.getConfig().network.ssl.sslOptionsFactory + || this.client.getConfig().network.ssl.sslOptionsFactoryProperties) { + const factoryProperties = this.client.getConfig().network.ssl.sslOptionsFactoryProperties; + let factory = this.client.getConfig().network.ssl.sslOptionsFactory; + if (factory == null) { factory = new BasicSSLOptionsFactory(); } return factory.init(factoryProperties).then(() => { @@ -512,7 +508,7 @@ export class ClientConnectionManager extends EventEmitter { }); } else { // the default behavior when ssl is enabled - const opts = this.client.getConfig().networkConfig.sslConfig.sslOptions = { + const opts = this.client.getConfig().network.ssl.sslOptions = { checkServerIdentity: (): any => null, rejectUnauthorized: true, }; diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/FlakeIdGeneratorProxy.ts index feb8c5683..eaba99933 100644 --- a/src/proxy/FlakeIdGeneratorProxy.ts +++ b/src/proxy/FlakeIdGeneratorProxy.ts @@ -17,7 +17,7 @@ import * as Promise from 'bluebird'; import * as Long from 'long'; import {FlakeIdGeneratorNewIdBatchCodec} from '../codec/FlakeIdGeneratorNewIdBatchCodec'; -import {FlakeIdGeneratorConfig} from '../config/FlakeIdGeneratorConfig'; +import {FlakeIdGeneratorConfigImpl} from '../config/FlakeIdGeneratorConfig'; import HazelcastClient from '../HazelcastClient'; import {BaseProxy} from './BaseProxy'; import {AutoBatcher, Batch} from './flakeid/AutoBatcher'; @@ -26,7 +26,7 @@ import {FlakeIdGenerator} from './FlakeIdGenerator'; export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator { private autoBatcher: AutoBatcher; - private config: FlakeIdGeneratorConfig; + private config: FlakeIdGeneratorConfigImpl; constructor(client: HazelcastClient, serviceName: string, name: string) { super(client, serviceName, name); diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index 7bdc7a16c..cb2e9cee0 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -76,14 +76,16 @@ export interface IMap extends DistributedObject { * you may consider indexing these fields. * 

      *   const imap = client.getMap('employees');
-     *   const ageIndex = new IndexConfig();
-     *   ageIndex.type = IndexType.SORTED;
-     *   ageIndex.addAttribute('age');
-     *   const activeIndex = new IndexConfig();
-     *   activeIndex.type = IndexType.HASH;
-     *   activeIndex.addAttribute('active');
-     *   imap.addIndex(ageIndex);  // Sorted index for range queries
-     *   imap.addIndex(activeIndex); // Hash index for equality predicates
+     *   // Sorted index for range queries:
+     *   imap.addIndex({
+     *       type: 'SORTED',
+     *       attributes: ['age']
+     *   });
+     *   // Hash index for equality predicates:
+     *   imap.addIndex({
+     *       type: 'HASH',
+     *       attributes: ['active']
+     *   });
      *
* Index attribute should either have a getter method or be public. * You should also make sure to add the indexes before adding diff --git a/src/proxy/topic/TopicOverloadPolicy.ts b/src/proxy/topic/TopicOverloadPolicy.ts index 7136e907f..c34ceeb77 100644 --- a/src/proxy/topic/TopicOverloadPolicy.ts +++ b/src/proxy/topic/TopicOverloadPolicy.ts @@ -15,6 +15,7 @@ */ export enum TopicOverloadPolicy { + /** * Using this policy, a message that has not expired can be overwritten. * No matter the retention period set, the overwrite will just overwrite the item. @@ -23,21 +24,21 @@ export enum TopicOverloadPolicy { * But it will benefit producers and fast consumers since they are able to continue. * This policy sacrifices the slow producer in favor of fast producers/consumers. */ - DISCARD_OLDEST, + DISCARD_OLDEST = 'DISCARD_OLDEST', /** * The message that was to be published, is discarded. */ - DISCARD_NEWEST, + DISCARD_NEWEST = 'DISCARD_NEWEST', /** * The caller will wait till there space in the ringbuffer. */ - BLOCK, + BLOCK = 'BLOCK', /** * The publish call immediately fails. */ - ERROR, + ERROR = 'ERROR', } diff --git a/src/serialization/Data.ts b/src/serialization/Data.ts index 594ab4f34..22ac6a7d9 100644 --- a/src/serialization/Data.ts +++ b/src/serialization/Data.ts @@ -53,7 +53,7 @@ export interface Data { hasPartitionHash(): boolean; /** - * Returns hashcode for this data + * Returns hash code for this data */ hashCode(): number; @@ -66,7 +66,11 @@ export interface Data { } +/** + * Defines interface for output data writer. + */ export interface DataOutput { + clear(): void; isBigEndian(): boolean; @@ -124,9 +128,11 @@ export interface DataOutput { writeUTFArray(val: string[]): void; writeZeroBytes(count: number): void; + } export interface PositionalDataOutput extends DataOutput { + pwrite(position: number, byte: number | Buffer): void; pwriteBoolean(position: number, val: boolean): void; @@ -146,9 +152,14 @@ export interface PositionalDataOutput extends DataOutput { pwriteLong(position: number, long: Long): void; pwriteShort(position: number, short: number): void; + } +/** + * Defines interface for input data reader. + */ export interface DataInput { + isBigEndian(): boolean; position(newPosition?: number): number; @@ -202,4 +213,5 @@ export interface DataInput { reset(): void; skipBytes(count: number): void; + } diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index bcf41798e..8225a9c87 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -18,9 +18,35 @@ import Long = require('long'); import {BitsUtil} from '../BitsUtil'; import {DataInput, DataOutput} from './Data'; import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; -import {Serializer} from './SerializationService'; import {HazelcastJsonValue} from '../core/HazelcastJsonValue'; +/** + * Defines common interface for default and custom serializers. + */ +export interface Serializer { + + /** + * Returns type id. + */ + getId(): number; + + /** + * Deserializes input data into an object. + * + * @param input input data reader + */ + read(input: DataInput): T; + + /** + * Serializes an object into binary data. + * + * @param output output data writer + * @param object object to be serialized + */ + write(output: DataOutput, object: T): void; + +} + export class StringSerializer implements Serializer { getId(): number { @@ -66,10 +92,12 @@ export class BooleanSerializer implements Serializer { } } +export const NULL_TYPE_ID = 0; + export class NullSerializer implements Serializer { getId(): number { - return 0; + return NULL_TYPE_ID; } read(input: DataInput): any { diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index ec948360d..d4aca8e8f 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -16,6 +16,7 @@ import {murmur} from '../invocation/Murmur'; import {Data} from './Data'; +import {NULL_TYPE_ID} from './DefaultSerializer'; export const PARTITION_HASH_OFFSET = 0; export const TYPE_OFFSET = 4; @@ -28,9 +29,8 @@ export class HeapData implements Data { constructor(buffer: Buffer) { if (buffer != null && buffer.length > 0 && buffer.length < HEAP_DATA_OVERHEAD) { - throw new RangeError('Data should be either empty or should contain more than ' + HEAP_DATA_OVERHEAD - + ' bytes! -> ' - + buffer); + throw new RangeError('Data should be either empty or should contain more than ' + + HEAP_DATA_OVERHEAD + ' bytes! -> ' + buffer); } this.payload = buffer; } @@ -47,8 +47,7 @@ export class HeapData implements Data { */ public getType(): number { if (this.totalSize() === 0) { - // TODO serialization null type - return 0; + return NULL_TYPE_ID; } return this.payload.readIntBE(TYPE_OFFSET, 4); } diff --git a/src/serialization/Serializable.ts b/src/serialization/Serializable.ts index 0ba77ca1b..fec774c37 100644 --- a/src/serialization/Serializable.ts +++ b/src/serialization/Serializable.ts @@ -18,6 +18,7 @@ import {DataInput, DataOutput} from './Data'; import {PortableReader, PortableWriter} from './portable/PortableSerializer'; export interface IdentifiedDataSerializable { + readData(input: DataInput): any; writeData(output: DataOutput): void; @@ -25,13 +26,17 @@ export interface IdentifiedDataSerializable { getFactoryId(): number; getClassId(): number; + } export interface IdentifiedDataSerializableFactory { + create(type: number): IdentifiedDataSerializable; + } export interface Portable { + getFactoryId(): number; getClassId(): number; @@ -39,12 +44,23 @@ export interface Portable { writePortable(writer: PortableWriter): void; readPortable(reader: PortableReader): void; + } export interface VersionedPortable extends Portable { + getVersion(): number; + } export interface PortableFactory { + create(classId: number): Portable; + +} + +export interface CustomSerializable { + + hzGetCustomId(): number; + } diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 69b0618ff..46437bf3e 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -17,12 +17,16 @@ import {AggregatorFactory} from '../aggregation/AggregatorFactory'; import {ClusterDataFactory} from '../ClusterDataFactory'; import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; -import {SerializationConfig} from '../config/SerializationConfig'; -import {RELIABLE_TOPIC_MESSAGE_FACTORY_ID, ReliableTopicMessageFactory} from '../proxy/topic/ReliableTopicMessage'; +import {SerializationConfigImpl} from '../config/SerializationConfig'; +import { + RELIABLE_TOPIC_MESSAGE_FACTORY_ID, + ReliableTopicMessageFactory, +} from '../proxy/topic/ReliableTopicMessage'; import * as Util from '../Util'; import {Data, DataInput, DataOutput} from './Data'; import * as DefaultPredicates from './DefaultPredicates'; import { + Serializer, BooleanArraySerializer, BooleanSerializer, ByteArraySerializer, @@ -53,11 +57,11 @@ import {ObjectDataInput, PositionalObjectDataOutput} from './ObjectData'; import {PortableSerializer} from './portable/PortableSerializer'; import {PREDICATE_FACTORY_ID, PredicateFactory} from './PredicateFactory'; import {IdentifiedDataSerializableFactory} from './Serializable'; -import HazelcastClient from '../HazelcastClient'; import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; import {RestValueFactory, REST_VALUE_FACTORY_ID} from '../core/RestValue'; export interface SerializationService { + toData(object: any, paritioningStrategy?: any): Data; toObject(data: Data): any; @@ -65,26 +69,16 @@ export interface SerializationService { writeObject(out: DataOutput, object: any): void; readObject(inp: DataInput): any; -} - -export interface Serializer { - getId(): number; - - read(input: DataInput): any; - write(output: DataOutput, object: any): void; } export class SerializationServiceV1 implements SerializationService { private registry: { [id: number]: Serializer }; private serializerNameToId: { [name: string]: number }; - private numberType: string; - private serializationConfig: SerializationConfig; - private client: HazelcastClient; + private serializationConfig: SerializationConfigImpl; - constructor(client: HazelcastClient, serializationConfig: SerializationConfig) { - this.client = client; + constructor(serializationConfig: SerializationConfigImpl) { this.serializationConfig = serializationConfig; this.registry = {}; this.serializerNameToId = {}; @@ -276,13 +270,6 @@ export class SerializationServiceV1 implements SerializationService { for (const id in this.serializationConfig.dataSerializableFactories) { factories[id] = this.serializationConfig.dataSerializableFactories[id]; } - const factoryConfigs = this.serializationConfig.dataSerializableFactoryConfigs; - for (const id in factoryConfigs) { - const path = factoryConfigs[id].path; - const exportedName = factoryConfigs[id].exportedName; - const factoryConstructor = Util.loadNameFromPath(path, exportedName); - factories[id] = new factoryConstructor(); - } factories[PREDICATE_FACTORY_ID] = new PredicateFactory(DefaultPredicates); factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = new ReliableTopicMessageFactory(); factories[ClusterDataFactoryHelper.FACTORY_ID] = new ClusterDataFactory(); @@ -292,30 +279,16 @@ export class SerializationServiceV1 implements SerializationService { } protected registerCustomSerializers(): void { - const customSerializersArray: any[] = this.serializationConfig.customSerializers; - customSerializersArray.forEach((candidate) => { + const customSerializers = this.serializationConfig.customSerializers; + for (const key in customSerializers) { + const candidate = customSerializers[key]; this.assertValidCustomSerializer(candidate); this.registerSerializer('!custom' + candidate.getId(), candidate); - }); - const customSerializerConfigs = this.serializationConfig.customSerializerConfigs; - for (const typeId in customSerializerConfigs) { - const serializerConfig = customSerializerConfigs[typeId]; - const customSerializer = new (Util.loadNameFromPath(serializerConfig.path, serializerConfig.exportedName))(); - this.registerSerializer('!custom' + typeId, customSerializer); } } protected registerGlobalSerializer(): void { - let candidate: any = null; - if (this.serializationConfig.globalSerializerConfig != null) { - const exportedName = this.serializationConfig.globalSerializerConfig.exportedName; - const path = this.serializationConfig.globalSerializerConfig.path; - const serializerFactory = Util.loadNameFromPath(path, exportedName); - candidate = new serializerFactory(); - } - if (candidate == null) { - candidate = this.serializationConfig.globalSerializer; - } + const candidate: any = this.serializationConfig.globalSerializer; if (candidate == null) { return; } diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index dd4d1b1b0..32003b42c 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -14,18 +14,18 @@ * limitations under the License. */ -import {SerializationService, Serializer} from '../SerializationService'; +import {SerializationService} from '../SerializationService'; import {PortableContext} from './PortableContext'; import {Portable, PortableFactory} from '../Serializable'; +import {Serializer} from '../DefaultSerializer'; import {DataInput, PositionalDataOutput} from '../Data'; import {DefaultPortableReader} from './DefaultPortableReader'; import {MorphingPortableReader} from './MorphingPortableReader'; import {ClassDefinition, FieldType} from './ClassDefinition'; import {DefaultPortableWriter} from './DefaultPortableWriter'; import * as Long from 'long'; -import {SerializationConfig} from '../../config/SerializationConfig'; +import {SerializationConfigImpl} from '../../config/SerializationConfig'; import {HazelcastSerializationError} from '../../HazelcastError'; -import * as Util from '../../Util'; export class PortableSerializer implements Serializer { @@ -33,17 +33,10 @@ export class PortableSerializer implements Serializer { private factories: { [id: number]: PortableFactory }; private service: SerializationService; - constructor(service: SerializationService, serializationConfig: SerializationConfig) { + constructor(service: SerializationService, serializationConfig: SerializationConfigImpl) { this.service = service; this.portableContext = new PortableContext(this.service, serializationConfig.portableVersion); this.factories = serializationConfig.portableFactories; - const factoryConfigs = serializationConfig.portableFactoryConfigs; - for (const id in factoryConfigs) { - const exportedName = factoryConfigs[id].exportedName; - const path = factoryConfigs[id].path; - const factoryConstructor = Util.loadNameFromPath(path, exportedName); - this.factories[id] = new factoryConstructor(); - } } getId(): number { diff --git a/src/util/AbstractLoadBalancer.ts b/src/util/AbstractLoadBalancer.ts index 3721c8edc..20ac01f54 100644 --- a/src/util/AbstractLoadBalancer.ts +++ b/src/util/AbstractLoadBalancer.ts @@ -17,7 +17,7 @@ import {LoadBalancer} from '../LoadBalancer'; import {InitialMembershipListener} from '../core/InitialMembershipListener'; import {Cluster} from '../core/Cluster'; -import {ClientConfig} from '../config/Config'; +import {ClientConfigImpl} from '../config/Config'; import {InitialMembershipEvent} from '../core/InitialMembershipEvent'; import {MembershipEvent} from '../core/MembershipEvent'; import {Member} from '../core/Member'; @@ -28,7 +28,7 @@ export abstract class AbstractLoadBalancer implements LoadBalancer, InitialMembe public abstract next(): Member; - public initLoadBalancer(cluster: Cluster, config: ClientConfig): void { + public initLoadBalancer(cluster: Cluster, config: ClientConfigImpl): void { this.cluster = cluster; cluster.addMembershipListener(this); } diff --git a/src/util/IndexUtil.ts b/src/util/IndexUtil.ts index b87f10355..4d12fbdec 100644 --- a/src/util/IndexUtil.ts +++ b/src/util/IndexUtil.ts @@ -14,9 +14,10 @@ * limitations under the License. */ -import {IndexConfig} from '../config/IndexConfig'; +import {IndexConfig, InternalIndexConfig} from '../config/IndexConfig'; import {IndexType} from '../config/IndexType'; -import {BitmapIndexOptions} from '../config/BitmapIndexOptions'; +import {UniqueKeyTransformation, InternalBitmapIndexOptions} from '../config/BitmapIndexOptions'; +import {tryGetEnum} from '../Util'; /** * Maximum number of attributes allowed in the index. @@ -29,34 +30,39 @@ const MAX_ATTRIBUTES = 255; const THIS_PATTERN = new RegExp('^this\\.'); export class IndexUtil { + /** - * Validate provided index config and normalize it's name and attribute names. + * Validates provided index config and normalizes it's name and attribute names. * * @param mapName Name of the map - * @param config Index config. + * @param config User-provided index config. * @return Normalized index config. * @throws TypeError If index configuration is invalid. */ - static validateAndNormalize(mapName: string, config: IndexConfig): IndexConfig { + static validateAndNormalize(mapName: string, config: IndexConfig): InternalIndexConfig { // Validate attributes const originalAttributeNames = config.attributes; if (originalAttributeNames.length === 0) { - throw new TypeError('Index must have at least one attribute: ' + config.toString()); + throw new TypeError('Index must have at least one attribute: ' + config); } if (originalAttributeNames.length > MAX_ATTRIBUTES) { - throw new TypeError('Index cannot have more than ' + MAX_ATTRIBUTES + ' attributes: ' + config.toString()); + throw new TypeError('Index cannot have more than ' + MAX_ATTRIBUTES + ' attributes: ' + config); } - if (config.type === IndexType.BITMAP && originalAttributeNames.length > 1) { - throw new TypeError('Composite bitmap indexes are not supported: ' + config.toString()); + let type = InternalIndexConfig.DEFAULT_TYPE; + if (config.type) { + type = tryGetEnum(IndexType, config.type); + } + if (type === IndexType.BITMAP && originalAttributeNames.length > 1) { + throw new TypeError('Composite bitmap indexes are not supported: ' + config); } const normalizedAttributeNames = new Array(originalAttributeNames.length); for (let i = 0; i < originalAttributeNames.length; i++) { let originalAttributeName = originalAttributeNames[i]; - this.validateAttribute(config, originalAttributeName); + this.validateAttribute(config.name, originalAttributeName); originalAttributeName = originalAttributeName.trim(); const normalizedAttributeName = this.canonicalizeAttribute(originalAttributeName); @@ -68,11 +74,11 @@ export class IndexUtil { if (duplicateOriginalAttributeName === originalAttributeName) { throw new TypeError('Duplicate attribute name [attributeName= ' - + originalAttributeName + ', indexConfig=' + config.toString() + ']'); + + originalAttributeName + ', indexConfig=' + config + ']'); } else { throw new TypeError('Duplicate attribute names [attributeName1=' + duplicateOriginalAttributeName + ', attributeName2=' - + originalAttributeName + ', indexConfig=' + config.toString() + ']'); + + originalAttributeName + ', indexConfig=' + config + ']'); } } @@ -81,21 +87,20 @@ export class IndexUtil { // Construct final index let name = config.name; - if (name != null && name.trim().length === 0) { name = null; } - const normalizedConfig = this.buildNormalizedConfig(mapName, config.type, name, normalizedAttributeNames); - if (config.type === IndexType.BITMAP) { + const normalizedConfig = this.buildNormalizedConfig(mapName, type, name, normalizedAttributeNames); + if (type === IndexType.BITMAP) { let uniqueKey = config.bitmapIndexOptions.uniqueKey; - const uniqueKeyTransformation = config.bitmapIndexOptions.uniqueKeyTransformation; - this.validateAttribute(config, uniqueKey); + this.validateAttribute(config.name, uniqueKey); uniqueKey = this.canonicalizeAttribute(uniqueKey); normalizedConfig.bitmapIndexOptions.uniqueKey = uniqueKey; - normalizedConfig.bitmapIndexOptions.uniqueKeyTransformation = uniqueKeyTransformation; + normalizedConfig.bitmapIndexOptions.uniqueKeyTransformation = + tryGetEnum(UniqueKeyTransformation, config.bitmapIndexOptions.uniqueKeyTransformation); } return normalizedConfig; } @@ -106,19 +111,16 @@ export class IndexUtil { * @param config Index config. * @param attributeName Attribute name. */ - static validateAttribute(config: IndexConfig, attributeName: string): void { + static validateAttribute(indexName: string, attributeName: string): void { if (attributeName == null) { - throw new TypeError('Attribute name cannot be null: ' + config); + throw new TypeError('Attribute name cannot be null: ' + indexName); } - const attributeName0 = attributeName.trim(); - if (attributeName0.length === 0) { - throw new TypeError('Attribute name cannot be empty: ' + config); + throw new TypeError('Attribute name cannot be empty: ' + indexName); } - if (attributeName0.endsWith('.')) { - throw new TypeError('Attribute name cannot end with dot [config= ' + config + throw new TypeError('Attribute name cannot end with dot [config= ' + indexName + ', attribute=' + attributeName + ']'); } } @@ -134,17 +136,18 @@ export class IndexUtil { return attribute.replace(THIS_PATTERN, ''); } - private static buildNormalizedConfig(mapName: string, indexType: IndexType, indexName: string, - normalizedAttributeNames: string[]): IndexConfig { - const newConfig = new IndexConfig(); - newConfig.bitmapIndexOptions = new BitmapIndexOptions(); + private static buildNormalizedConfig(mapName: string, + indexType: IndexType, + indexName: string, + normalizedAttributeNames: string[]): InternalIndexConfig { + const newConfig = new InternalIndexConfig(); + newConfig.bitmapIndexOptions = new InternalBitmapIndexOptions(); newConfig.type = indexType; let name = indexName == null ? mapName + '_' + this.getIndexTypeName(indexType) : null; - for (const normalizedAttributeName of normalizedAttributeNames) { - newConfig.addAttribute(normalizedAttributeName); - + this.validateAttribute(indexName, normalizedAttributeName) + newConfig.attributes.push(normalizedAttributeName); if (name != null) { name += '_' + normalizedAttributeName; } diff --git a/test/AutoPipeliningDisabledTest.js b/test/AutoPipeliningDisabledTest.js index 126554c5c..6d8d82869 100644 --- a/test/AutoPipeliningDisabledTest.js +++ b/test/AutoPipeliningDisabledTest.js @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; const expect = require('chai').expect; const HazelcastClient = require('../.').Client; -const Config = require('../.').Config; const Controller = require('./RC'); describe('AutoPipeliningDisabledTest', function () { @@ -28,10 +26,12 @@ describe('AutoPipeliningDisabledTest', function () { let map; const createClient = (clusterId) => { - const cfg = new Config.ClientConfig(); - cfg.clusterName = clusterId; - cfg.properties['hazelcast.client.autopipelining.enabled'] = false; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: clusterId, + properties: { + ['hazelcast.client.autopipelining.enabled']: false + } + }); }; before(function () { diff --git a/test/BuildInfoTest.js b/test/BuildInfoTest.js index 0ccd733e7..fee9a1a40 100644 --- a/test/BuildInfoTest.js +++ b/test/BuildInfoTest.js @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var BuildInfo = require('../lib/BuildInfo').BuildInfo; -var assert = require('chai').assert; +const BuildInfo = require('../lib/BuildInfo').BuildInfo; +const assert = require('chai').assert; describe('BuildInfo', function () { it('version calculation test', function () { diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index 4cf62f329..38dd1b8de 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -13,24 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('./RC'); -var expect = require('chai').expect; +const expect = require('chai').expect; +const sinon = require('sinon'); +const assert = require('chai').assert; +const sandbox = sinon.createSandbox(); -var MapProxy = require('../lib/proxy/MapProxy').MapProxy; -var ConnectionManager = require('../lib/network/ClientConnectionManager').ClientConnectionManager; -var ClientConnection = require('../lib/network/ClientConnection').ClientConnection; -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; -var sinon = require('sinon'); -var assert = require('chai').assert; -var sandbox = sinon.createSandbox(); +const Controller = require('./RC'); +const MapProxy = require('../lib/proxy/MapProxy').MapProxy; +const ConnectionManager = require('../lib/network/ClientConnectionManager').ClientConnectionManager; +const ClientConnection = require('../lib/network/ClientConnection').ClientConnection; +const HazelcastClient = require('../.').Client; describe('Generic proxy test', function () { - var cluster; - var client; - var map; - var list; + + let cluster, client, map, list; afterEach(function () { sandbox.restore(); @@ -47,26 +45,26 @@ describe('Generic proxy test', function () { }); it('Client without active connection should return unknown version', function () { - var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); + const connectionManagerStub = sandbox.stub(ConnectionManager.prototype); connectionManagerStub.getActiveConnections.returns({}); - var clientStub = sandbox.stub(HazelcastClient.prototype); + const clientStub = sandbox.stub(HazelcastClient.prototype); clientStub.getConnectionManager.returns(connectionManagerStub); - var mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); + const mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); assert.equal(mapProxy.getConnectedServerVersion(), -1); }); it('Client with a 3.7 server connection should return the version', function () { - var connectionStub = sandbox.stub(ClientConnection.prototype); + const connectionStub = sandbox.stub(ClientConnection.prototype); connectionStub.getConnectedServerVersion.returns('30700'); - var connectionManagerStub = sandbox.stub(ConnectionManager.prototype); + const connectionManagerStub = sandbox.stub(ConnectionManager.prototype); connectionManagerStub.getActiveConnections.returns({ 'localhost': connectionStub }); - var clientStub = sandbox.stub(HazelcastClient.prototype); + const clientStub = sandbox.stub(HazelcastClient.prototype); clientStub.getConnectionManager.returns(connectionManagerStub); - var mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); + const mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); assert.equal(mapProxy.getConnectedServerVersion(), 30700); }); @@ -75,9 +73,9 @@ describe('Generic proxy test', function () { cluster = response; return Controller.startMember(cluster.id); }).then(function () { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(config); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id + }); }).then(function (res) { client = res; return client.getMap('Furkan').then(function (m) { diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index 9283a7e74..1207391e3 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('./RC'); -var expect = require('chai').expect; -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; -var Util = require('./Util'); +const Controller = require('./RC'); +const expect = require('chai').expect; +const HazelcastClient = require('../.').Client; +const Util = require('./Util'); describe('Client reconnect', function () { - var cluster; - var client; + let cluster, client; afterEach(function () { client.shutdown(); @@ -32,18 +31,19 @@ describe('Client reconnect', function () { it('member restarts, while map.put in progress', function () { this.timeout(9000); - var member; - var map; + let member, map; return Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function (m) { member = m; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 1000, + 'hazelcast.client.heartbeat.timeout': 3000 + } + }); }).then(function (cl) { client = cl; return client.getMap('test'); @@ -63,19 +63,22 @@ describe('Client reconnect', function () { it('member restarts, while map.put in progress 2', function (done) { this.timeout(5000); - var member; - var map; + let member, map; Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function (m) { member = m; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; - cfg.networkConfig.connectionTimeout = 10000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + connectionTimeout: 10000 + }, + properties: { + 'hazelcast.client.heartbeat.interval': 1000, + 'hazelcast.client.heartbeat.timeout': 3000 + } + }); }).then(function (cl) { client = cl; return client.getMap('test'); @@ -100,18 +103,19 @@ describe('Client reconnect', function () { it('create proxy while member is down, member comes back', function (done) { this.timeout(10000); - var member; - var map; + let member, map; Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); }).then(function (m) { member = m; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 1000, + 'hazelcast.client.heartbeat.timeout': 3000 + } + }); }).then(function (cl) { client = cl; return Controller.terminateMember(cluster.id, member.uuid); diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 8b28a10fb..136d4174d 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('./RC'); -var expect = require('chai').expect; -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; +const Controller = require('./RC'); +const expect = require('chai').expect; +const HazelcastClient = require('../.').Client; + +describe('ClusterServiceTest', function () { -describe('ClusterService', function () { this.timeout(25000); - var cluster; - var member1; - var client; + let cluster, member1, client; beforeEach(function () { return Controller.createCluster(null, null).then(function (res) { @@ -31,11 +30,13 @@ describe('ClusterService', function () { return Controller.startMember(cluster.id); }).then(function (res) { member1 = res; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 5000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 1000, + 'hazelcast.client.heartbeat.timeout': 5000 + } + }); }).then(function (res) { client = res; }); @@ -47,10 +48,8 @@ describe('ClusterService', function () { }); it('should know when a new member joins to cluster', function (done) { - var member2; - - var membershipListener = { - memberAdded: function (membershipEvent) { + const membershipListener = { + memberAdded: (membershipEvent) => { expect(client.clusterService.getSize()).to.be.eq(2); done(); } @@ -58,16 +57,14 @@ describe('ClusterService', function () { client.clusterService.addMembershipListener(membershipListener); - Controller.startMember(cluster.id).then(function (res) { - member2 = res; - }); + Controller.startMember(cluster.id).catch(done); }); it('should know when a member leaves cluster', function (done) { - var member2; + let member2; - var membershipListener = { - memberRemoved: function (membershipEvent) { + const membershipListener = { + memberRemoved: (membershipEvent) => { expect(client.getClusterService().getSize()).to.be.eq(1); done(); } @@ -78,18 +75,17 @@ describe('ClusterService', function () { Controller.startMember(cluster.id).then(function (res) { member2 = res; Controller.shutdownMember(cluster.id, member2.uuid); - }); + }).catch(done); }); it('getMemberList returns correct list after a member is removed', function (done) { - var member2; - var member3; + let member2, member3; - var membershipListener = { - memberRemoved: function (membershipEvent) { - var remainingMemberList = client.getClusterService().getMemberList(); + const membershipListener = { + memberRemoved: (membershipEvent) => { + const remainingMemberList = client.getClusterService().getMemberList(); expect(remainingMemberList).to.have.length(2); - var portList = remainingMemberList.map(function (member) { + const portList = remainingMemberList.map(function (member) { return member.address.port; }); expect(portList).to.have.members([member1.port, member3.port]); @@ -105,20 +101,25 @@ describe('ClusterService', function () { }).then(function (res) { member3 = res; Controller.shutdownMember(cluster.id, member2.uuid); - }); + }).catch(done); }); it('should throw when wrong host addresses given in config', function (done) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 2000; - cfg.networkConfig.addresses = [ - '0.0.0.0:5709', - '0.0.0.1:5710' - ]; - - var falseStart = false; - HazelcastClient.newHazelcastClient(cfg).catch(function (err) { + let falseStart = false; + HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + clusterMembers: [ + '0.0.0.0:5709', + '0.0.0.1:5710' + ] + }, + connectionStrategy: { + connectionRetry: { + clusterConnectTimeoutMillis: 2000 + } + } + }).catch(function (err) { done(); }).then(function (client) { if (client) { @@ -127,22 +128,24 @@ describe('ClusterService', function () { } }).then(function () { if (falseStart) { - done(Error('Client falsely started with wrong addresses')); + done(new Error('Client falsely started with wrong addresses')); } }); }); it('should throw with wrong cluster name', function (done) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = 'wrong'; - cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 2000; - - HazelcastClient.newHazelcastClient(cfg).then(function (newClient) { + HazelcastClient.newHazelcastClient({ + clusterName: 'wrong', + connectionStrategy: { + connectionRetry: { + clusterConnectTimeoutMillis: 2000 + } + } + }).then(function (newClient) { newClient.shutdown(); done(new Error('Client falsely started with wrong cluster name')); }).catch(function (err) { done(); }); }); -}) -; +}); diff --git a/test/ConnectionManagerTest.js b/test/ConnectionManagerTest.js index afcb96133..97f87d5f6 100644 --- a/test/ConnectionManagerTest.js +++ b/test/ConnectionManagerTest.js @@ -13,34 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); +const chai = require('chai'); chai.should(); chai.use(require('chai-as-promised')); -var expect = chai.expect; +const expect = chai.expect; +const net = require('net'); -var net = require('net'); - -var Config = require('../.').Config; -var Hazelcast = require('../.').Client; -var Controller = require('./RC'); -var Errors = require('../').HazelcastErrors; -var Address = require('../.').Address; +const Controller = require('./RC'); +const HazelcastClient = require('../.').Client; +const Errors = require('../').HazelcastErrors; +const Address = require('../.').Address; describe('ConnectionManager', function () { - var cluster; - var member; - var client; - var testend; - var server; + let cluster, client; + let testend, server; before(function () { return Controller.createCluster(null, null).then(function (cl) { cluster = cl; return Controller.startMember(cluster.id); - }).then(function (m) { - member = m; }); }); @@ -60,10 +54,9 @@ describe('ConnectionManager', function () { return Controller.terminateCluster(cluster.id); }); - function startUnresponsiveServer(port) { server = net.createServer(function (socket) { - //no-response + // no-response }); server.listen(port); } @@ -73,31 +66,34 @@ describe('ConnectionManager', function () { } it('gives up connecting after timeout', function () { - var timeoutTime = 1000; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.networkConfig.connectionTimeout = timeoutTime; + const timeoutTime = 1000; startUnresponsiveServer(9999); - return Hazelcast.newHazelcastClient(cfg).then(function (cl) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + connectionTimeout: timeoutTime + } + }).then(function (cl) { client = cl; - return client.getConnectionManager().getOrConnect(new Address('localhost',9999)); + return client.getConnectionManager().getOrConnect(new Address('localhost', 9999)); }).should.eventually.be.rejected; }); it('does not give up when timeout=0', function (done) { this.timeout(8000); - var timeoutTime = 0; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.networkConfig.connectionTimeout = timeoutTime; + const timeoutTime = 0; startUnresponsiveServer(9999); - - var scheduled = setTimeout(function () { + const scheduled = setTimeout(function () { done(); - }, 6000);//5000 is default timeout. client should still be trying. + }, 6000); // 5000 is default timeout. The client should be still trying - Hazelcast.newHazelcastClient(cfg).then(function (cl) { + HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + connectionTimeout: timeoutTime + } + }).then(function (cl) { client = cl; return client.getConnectionManager().getOrConnect(new Address('localhost',9999)); }).then(function (value) { @@ -113,13 +109,20 @@ describe('ConnectionManager', function () { it('should throw IllegalStateError if there is an incompatible server', function () { client = null; - var timeoutTime = 100; - var cfg = new Config.ClientConfig(); - cfg.networkConfig.connectionTimeout = timeoutTime; - cfg.networkConfig.addresses = ['127.0.0.1:9999']; - cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 2000; + const timeoutTime = 100; startUnresponsiveServer(9999); - return expect(Hazelcast.newHazelcastClient(cfg)).to.be.rejectedWith(Errors.IllegalStateError); - }); + return expect(HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + clusterMembers: ['127.0.0.1:9999'], + connectionTimeout: timeoutTime + }, + connectionStrategy: { + connectionRetry: { + clusterConnectTimeoutMillis: 2000 + } + } + })).to.be.rejectedWith(Errors.IllegalStateError); + }); }); diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index ab54ba338..4a38b799a 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -13,20 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var Config = require('../.').Config; -var Controller = require('./RC'); -var HazelcastClient = require('../.').Client; -var DeferredPromise = require('../lib/Util').DeferredPromise; +const expect = require('chai').expect; +const RC = require('./RC'); +const HazelcastClient = require('../.').Client; +const DeferredPromise = require('../lib/Util').DeferredPromise; -var dummyConfig = new Config.ClientConfig(); -dummyConfig.networkConfig.smartRouting = false; - -var smartConfig = new Config.ClientConfig(); -smartConfig.networkConfig.smartRouting = true; - -var configParams = [ +const dummyConfig = { + network: { + smartRouting: false + } +}; +const smartConfig = { + network: { + smartRouting: true + } +}; +const configParams = [ dummyConfig, smartConfig ]; @@ -43,16 +47,15 @@ ManagedObjects.prototype.getObject = function (func, name) { }; ManagedObjects.prototype.destroyAll = function () { - var promises = []; + const promises = []; this.managedObjects.forEach(function (obj) { promises.push(obj.destroy()); }); - return Promise.all(promises); }; ManagedObjects.prototype.destroy = function (name) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); this.managedObjects.filter((el) => { if (el.getName() === name) { el.destroy().then(function () { @@ -66,14 +69,12 @@ ManagedObjects.prototype.destroy = function (name) { configParams.forEach(function (cfg) { describe('HazelcastClient', function () { this.timeout(4000); - var cluster; - var client; - var managed; + let cluster, client, managed; before(function () { - return Controller.createCluster(null, null).then(function (res) { + return RC.createCluster(null, null).then(function (res) { cluster = res; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (member) { cfg.clusterName = cluster.id; return HazelcastClient.newHazelcastClient(cfg); @@ -92,7 +93,7 @@ configParams.forEach(function (cfg) { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('getDistributedObject returns empty array when there is no distributed object', function () { @@ -105,7 +106,7 @@ configParams.forEach(function (cfg) { }); it('getLocalEndpoint returns correct info', function () { - var info = client.getLocalEndpoint(); + const info = client.getLocalEndpoint(); expect(info.localAddress.host).to.equal(client.getConnectionManager().getRandomConnection().localAddress.host); expect(info.localAddress.port).to.equal(client.getConnectionManager().getRandomConnection().localAddress.port); expect(info.uuid).to.deep.equal(client.getConnectionManager().getClientUuid()); @@ -119,7 +120,7 @@ configParams.forEach(function (cfg) { setTimeout(function () { client.getDistributedObjects().then(function (distObjects) { try { - names = distObjects.map((o) => { + const names = distObjects.map((o) => { return o.getName(); }); expect(names).to.have.members(['map', 'set']); @@ -140,7 +141,7 @@ configParams.forEach(function (cfg) { managed.destroy('map1').then(function () { client.getDistributedObjects().then(function (distObjects) { try { - var names = distObjects.map(function (o) { + const names = distObjects.map(function (o) { return o.getName(); }); expect(names).to.have.members(['map2', 'map3']); diff --git a/test/LifecycleServiceTest.js b/test/LifecycleServiceTest.js index 1f0172aba..9de6f953f 100644 --- a/test/LifecycleServiceTest.js +++ b/test/LifecycleServiceTest.js @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var RC = require('./RC'); -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; -var expect = require('chai').expect; +const RC = require('./RC'); +const HazelcastClient = require('../.').Client; +const expect = require('chai').expect; describe('LifecycleService', function () { - var cluster; - var client; + + let cluster; before(function () { return RC.createCluster(null, null).then(function (res) { @@ -35,38 +35,8 @@ describe('LifecycleService', function () { }); it('client should emit STARTING, STARTED, CONNECTED, SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events in order', function (done) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var expectedState = 'STARTING'; - cfg.listeners.addLifecycleListener( - function (state) { - if (state === 'STARTING' && expectedState === 'STARTING') { - expectedState = 'STARTED' - } else if (state === 'STARTED' && expectedState === 'STARTED') { - expectedState = 'CONNECTED'; - } else if (state === 'CONNECTED' && expectedState === 'CONNECTED') { - expectedState = 'SHUTTING_DOWN'; - } else if (state === 'SHUTTING_DOWN' && expectedState === 'SHUTTING_DOWN') { - expectedState = 'DISCONNECTED'; - } else if (state === 'DISCONNECTED' && expectedState === 'DISCONNECTED') { - expectedState = 'SHUTDOWN'; - } else if (state === 'SHUTDOWN' && expectedState === 'SHUTDOWN') { - done(); - } else { - done('Got lifecycle event ' + state + ' instead of ' + expectedState); - } - } - ); - HazelcastClient.newHazelcastClient(cfg).then(function (client) { - client.shutdown(); - }); - }); - - it('client should emit STARTING, STARTED, CONNECTED, SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events in order (via import config)', function (done) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var expectedState = 'STARTING'; - exports.lifecycleListener = function (state) { + let expectedState = 'STARTING'; + const listener = (state) => { if (state === 'STARTING' && expectedState === 'STARTING') { expectedState = 'STARTED' } else if (state === 'STARTED' && expectedState === 'STARTED') { @@ -83,23 +53,19 @@ describe('LifecycleService', function () { done('Got lifecycle event ' + state + ' instead of ' + expectedState); } }; - cfg.listenerConfigs.push({ - type: 'lifecycle', - importConfig: { - path: __filename, - exportedName: 'lifecycleListener' - } - }); - HazelcastClient.newHazelcastClient(cfg).then(function (client) { + HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + lifecycleListeners: [ listener ] + }).then(function (client) { client.shutdown(); }); }); it('event listener should get SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events when added after startup', function (done) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var expectedState = 'SHUTTING_DOWN'; - HazelcastClient.newHazelcastClient(cfg).then(function (client) { + let expectedState = 'SHUTTING_DOWN'; + HazelcastClient.newHazelcastClient({ + clusterName: cluster.id + }).then(function (client) { client.lifecycleService.on('lifecycleEvent', function (state) { if (state === 'SHUTTING_DOWN' && expectedState === 'SHUTTING_DOWN') { expectedState = 'DISCONNECTED'; @@ -116,9 +82,9 @@ describe('LifecycleService', function () { }); it('isRunning returns correct values at lifecycle stages', function (done) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - HazelcastClient.newHazelcastClient(cfg).then(function (client) { + HazelcastClient.newHazelcastClient({ + clusterName: cluster.id + }).then(function (client) { client.lifecycleService.on('lifecycleEvent', function (state) { if (state === 'STARTING') { @@ -135,7 +101,7 @@ describe('LifecycleService', function () { expect(client.lifecycleService.isRunning()).to.be.false; done(); } else { - done('Got lifecycle event ' + state + ' instead of ' + expectedState); + done('Got unexpected lifecycle event: ' + state); } } ); diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index 910c78a17..d80237c90 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -13,18 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var RC = require('./RC'); -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; -var expect = require('chai').expect; -var Util = require('./Util'); - +const RC = require('./RC'); +const HazelcastClient = require('../.').Client; +const expect = require('chai').expect; +const Util = require('./Util'); [true, false].forEach(function (isSmartService) { describe('ListenerService[smart=' + isSmartService + ']', function () { - var cluster; - var client; + let cluster, client; before(function () { return RC.createCluster(null, null).then(function (res) { @@ -36,10 +34,12 @@ var Util = require('./Util'); }); beforeEach(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.networkConfig.smartRouting = isSmartService; - return HazelcastClient.newHazelcastClient(cfg).then(function (c) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + smartRouting: isSmartService + } + }).then(function (c) { client = c; }); }); @@ -53,7 +53,7 @@ var Util = require('./Util'); }); it('listener is invoked when a new object is created', function (done) { - var listenerId; + let listenerId; client.addDistributedObjectListener(function (distributedObjectEvent) { expect(distributedObjectEvent.objectName).to.eq('mapToListen'); expect(distributedObjectEvent.serviceName).to.eq('hz:impl:mapService'); @@ -68,8 +68,7 @@ var Util = require('./Util'); }); it('listener is invoked when an object is removed[smart=' + isSmartService + ']', function (done) { - var map; - var listenerId; + let map, listenerId; client.addDistributedObjectListener(function (distributedObjectEvent) { if (distributedObjectEvent.eventType === 'destroyed' && distributedObjectEvent.objectName === 'mapToRemove') { expect(distributedObjectEvent.objectName).to.eq('mapToRemove'); @@ -103,5 +102,4 @@ var Util = require('./Util'); }); }); }); - }); diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 1580ed1d3..293387120 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('./RC'); -var expect = require('chai').expect; -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; -var Util = require('./Util'); -var Promise = require('bluebird'); +const Controller = require('./RC'); +const expect = require('chai').expect; +const HazelcastClient = require('../.').Client; +const Util = require('./Util'); +const Promise = require('bluebird'); -describe('Listeners on reconnect', function () { +describe('ListenersOnReconnectTest', function () { this.timeout(40000); - var client; - var members = []; - var cluster; - var map; + let client; + const members = []; + let cluster; + let map; beforeEach(function () { return Controller.createCluster(null, null).then(function (cl) { @@ -42,7 +42,7 @@ describe('Listeners on reconnect', function () { }); }); - function closeTwoMembersOfThreeAndTestListener(done, isSmart, membersToClose, turnoffMember) { + function closeTwoMembersOutOfThreeAndTestListener(done, isSmart, membersToClose, turnoffMember) { Controller.startMember(cluster.id).then(function (m) { members[0] = m; return Controller.startMember(cluster.id); @@ -51,19 +51,23 @@ describe('Listeners on reconnect', function () { return Controller.startMember(cluster.id); }).then(function (m) { members[2] = m; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 3000; - cfg.networkConfig.smartRouting = isSmart; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + smartRouting: isSmart + }, + properties: { + 'hazelcast.client.heartbeat.interval': 1000, + 'hazelcast.client.heartbeat.timeout': 3000 + } + }); }).then(function (cl) { client = cl; return client.getMap('testmap'); }).then(function (mp) { map = mp; - var listenerObject = { - added: function (entryEvent) { + const listener = { + added: (entryEvent) => { try { expect(entryEvent.name).to.equal('testmap'); expect(entryEvent.key).to.equal('keyx'); @@ -77,7 +81,7 @@ describe('Listeners on reconnect', function () { } } }; - return map.addEntryListener(listenerObject, 'keyx', true); + return map.addEntryListener(listener, 'keyx', true); }).then(function () { return Promise.all([ turnoffMember(cluster.id, members[membersToClose[0]].uuid), @@ -100,45 +104,49 @@ describe('Listeners on reconnect', function () { */ it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, isSmart, [1, 2], Controller.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], Controller.terminateMember); }); it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 1], Controller.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], Controller.terminateMember); }); it('kill two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 2], Controller.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], Controller.terminateMember); }); it('shutdown two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, isSmart, [1, 2], Controller.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], Controller.shutdownMember); }); it('shutdown two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 1], Controller.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], Controller.shutdownMember); }); it('shutdown two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOfThreeAndTestListener(done, isSmart, [0, 2], Controller.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], Controller.shutdownMember); }); it('restart member, listener still receives map.put event [smart=' + isSmart + ']', function (done) { - var member; + let member; Controller.startMember(cluster.id).then(function (m) { member = m; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.networkConfig.smartRouting = isSmart; - cfg.properties['hazelcast.client.heartbeat.interval'] = 1000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + smartRouting: isSmart + }, + properties: { + 'hazelcast.client.heartbeat.interval': 1000 + } + }); }).then(function (cl) { client = cl; return client.getMap('testmap'); }).then(function (mp) { map = mp; - var listenerObject = { - added: function (entryEvent) { + const listener = { + added: (entryEvent) => { try { expect(entryEvent.name).to.equal('testmap'); expect(entryEvent.key).to.equal('keyx'); @@ -152,7 +160,7 @@ describe('Listeners on reconnect', function () { } } }; - return map.addEntryListener(listenerObject, 'keyx', true); + return map.addEntryListener(listener, 'keyx', true); }).then(function () { return Controller.terminateMember(cluster.id, member.uuid); }).then(function () { @@ -160,7 +168,6 @@ describe('Listeners on reconnect', function () { }).then(function () { return Util.promiseWaitMilliseconds(5000); }).then(function () { - console.log("here"); return map.put('keyx', 'valx'); }); }); diff --git a/test/LoggingTest.js b/test/LoggingTest.js index a686c2846..bf33b8d3c 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; + +const expect = require('chai').expect; +const sinon = require('sinon'); +const winston = require('winston'); +const Controller = require('./RC'); +const HazelcastClient = require('../.').Client; +const LogLevel = require('../.').LogLevel; -var expect = require('chai').expect; -var sinon = require('sinon'); -var winston = require('winston'); -var Config = require('../.').Config; -var Controller = require('./RC'); -var HazelcastClient = require('../.').Client; -var LogLevel = require('../.').LogLevel; describe('Logging Test', function () { - var cluster; - var client; - var winstonAdapter = { + let cluster, client; + + const winstonAdapter = { logger: winston.createLogger({ transports: [ - new (winston.transports.Console)() + new winston.transports.Console() ] }), - levels: [ 'error', 'warn', @@ -39,27 +39,21 @@ describe('Logging Test', function () { 'debug', 'silly' ], - log: function (level, objectName, message, furtherInfo) { this.logger.log(this.levels[level], objectName + ' ' + message, furtherInfo); }, - error: function (objectName, message, furtherInfo) { this.log(LogLevel.ERROR, objectName, message, furtherInfo); }, - debug: function (objectName, message, furtherInfo) { this.log(LogLevel.DEBUG, objectName, message, furtherInfo); }, - warn: function (objectName, message, furtherInfo) { this.log(LogLevel.WARN, objectName, message, furtherInfo); }, - info: function (objectName, message, furtherInfo) { this.log(LogLevel.INFO, objectName, message, furtherInfo); }, - trace: function (objectName, message, furtherInfo) { this.log(LogLevel.TRACE, objectName, message, furtherInfo); } @@ -89,80 +83,88 @@ describe('Logging Test', function () { }); it('winston should emit logging event', function () { - var loggingHappened = false; + let loggingHappened = false; winstonAdapter.logger.transports[0].on('logged', function (transport, level, msg, meta) { loggingHappened = true; }); - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.customLogger = winstonAdapter; - return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + customLogger: winstonAdapter + }).then(function (hz) { client = hz; return expect(loggingHappened).to.be.true; }); }); it('no logging', function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.logging.level'] = LogLevel.OFF; - return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.logging.level': LogLevel.OFF + } + }).then(function (hz) { client = hz; return sinon.assert.notCalled(console.log); }); }); it('default logging in case of empty property', function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id + }).then(function (hz) { client = hz; return sinon.assert.called(console.log); }); }); it('default logging in case of default property', function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.logging.level'] = LogLevel.INFO; - return HazelcastClient.newHazelcastClient(cfg).then(function (hz) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.logging.level': LogLevel.INFO + } + }).then(function (hz) { client = hz; return sinon.assert.called(console.log); }); }); it('error in case of unknown property value', function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.customLogger = 'unknw'; - return expect(HazelcastClient.newHazelcastClient.bind(this, cfg)).to.throw(Error); + return expect(HazelcastClient.newHazelcastClient.bind(this, { + clusterName: cluster.id, + customLogger: 'unknw' + })).to.throw(Error); }); it('default logging, default level', function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg).then(function (cl) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id + }).then(function (cl) { client = cl; return sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); }); }); it('default logging, error level', function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.logging.level'] = LogLevel.ERROR; - return HazelcastClient.newHazelcastClient(cfg).then(function (cl) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.logging.level': LogLevel.ERROR + } + }).then(function (cl) { client = cl; return sinon.assert.notCalled(console.log); }); }); it('default logging, trace level', function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.logging.level'] = LogLevel.TRACE; - return HazelcastClient.newHazelcastClient(cfg).then(function (cl) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.logging.level': LogLevel.TRACE + } + }).then(function (cl) { client = cl; sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'TRACE'); diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index ce26223ca..e768ea5e3 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('./RC'); -var expect = require('chai').expect; -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; -var Util = require('./Util'); +const Controller = require('./RC'); +const expect = require('chai').expect; +const HazelcastClient = require('../.').Client; +const Util = require('./Util'); describe('Lost connection', function () { - var cluster; - var oldMember; - var client; + + let cluster, oldMember, client; + before(function () { return Controller.createCluster(null, null).then(function (res) { cluster = res; @@ -32,11 +32,13 @@ describe('Lost connection', function () { }).then(function (m) { oldMember = m; }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 500; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 500, + 'hazelcast.client.heartbeat.timeout': 2000 + } + }); }).then(function (cl) { client = cl; }); @@ -49,9 +51,9 @@ describe('Lost connection', function () { it('M2 starts, M1 goes down, client connects to M2', function (done) { this.timeout(32000); - var newMember; - var membershipListener = { - memberAdded: function (membershipEvent) { + let newMember; + const membershipListener = { + memberAdded: (membershipEvent) => { Controller.shutdownMember(cluster.id, oldMember.uuid).then(function () { return Util.promiseWaitMilliseconds(4000); }).then(function () { diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index dcb022e5b..e33efee0a 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -13,29 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var HazelcastClient = require('../.').Client; -var Config = require('../.').Config; -var Controller = require('./RC'); -var expect = require('chai').expect; -var DeferredPromise = require('../lib/Util').DeferredPromise; -var MemberAttributeOperationType = require('../.').MemberAttributeOperationType; -var MemberEvent = require('../lib/invocation/ClusterService').MemberEvent; +const HazelcastClient = require('../.').Client; +const Controller = require('./RC'); +const expect = require('chai').expect; +const DeferredPromise = require('../lib/Util').DeferredPromise; +const MemberEvent = require('../lib/invocation/ClusterService').MemberEvent; describe('MembershipListener', function () { + this.timeout(20000); - var cluster; - var member; - var client; + let cluster, client; + beforeEach(function () { return Controller.createCluster(null, null).then(function (res) { cluster = res; return Controller.startMember(cluster.id) }).then(function (res) { - member = res; - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(config); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id + }); }).then(function (res) { client = res; }); @@ -47,11 +45,11 @@ describe('MembershipListener', function () { }); it('sees member added event', function () { - var newMember; - var listenerCalledResolver = DeferredPromise(); + let newMember; + const listenerCalledResolver = DeferredPromise(); - var membershipListener = { - memberAdded: function (membershipEvent) { + const membershipListener = { + memberAdded: (membershipEvent) => { listenerCalledResolver.resolve(membershipEvent); } }; @@ -69,19 +67,17 @@ describe('MembershipListener', function () { }); it('sees member added event and other listener\'s event ', function () { - var newMember; - var err = undefined; - var listenerCalledResolver = DeferredPromise(); - var listenedSecondListener = false; + let newMember; + const listenerCalledResolver = DeferredPromise(); + let listenedSecondListener = false; - var membershipListener = { - memberAdded: function (membershipEvent) { + const membershipListener = { + memberAdded: (membershipEvent) => { listenerCalledResolver.resolve(membershipEvent); } }; - - var membershipListener2 = { - memberAdded: function (membershipEvent) { + const membershipListener2 = { + memberAdded: (membershipEvent) => { listenedSecondListener = true; } }; @@ -102,11 +98,11 @@ describe('MembershipListener', function () { }); it('if same listener is added twice, gets same event twice', function () { - var newMember; - var counter = 0; + let newMember; + let counter = 0; - var membershipListener = { - memberAdded: function () { + const membershipListener = { + memberAdded: (membershipEvent) => { counter++; } }; @@ -120,15 +116,14 @@ describe('MembershipListener', function () { }); it('sees member removed event', function () { - var newMember; - var listenerCalledResolver = DeferredPromise(); + let newMember; + const listenerCalledResolver = DeferredPromise(); - var membershipListener = { - memberRemoved: function (membershipEvent) { + const membershipListener = { + memberRemoved: (membershipEvent) => { listenerCalledResolver.resolve(membershipEvent); } }; - client.clusterService.addMembershipListener(membershipListener); return Controller.startMember(cluster.id).then(function (res) { diff --git a/test/RC.js b/test/RC.js index a1edecf95..0406458c8 100644 --- a/test/RC.js +++ b/test/RC.js @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var RemoteController = require('./remote_controller/Controller'); -var DeferredPromise = require('../lib/Util').DeferredPromise; +const RemoteController = require('./remote_controller/Controller'); +const DeferredPromise = require('../lib/Util').DeferredPromise; -var controller = new RemoteController('localhost', 9701); +const controller = new RemoteController('localhost', 9701); function createCluster(hzVersion, config) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.createCluster(hzVersion, config, function (err, cluster) { if (err) return deferred.reject(err); return deferred.resolve(cluster); @@ -29,7 +30,7 @@ function createCluster(hzVersion, config) { } function startMember(clusterId) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.startMember(clusterId, function (err, member) { if (err) return deferred.reject(err); return deferred.resolve(member); @@ -38,7 +39,7 @@ function startMember(clusterId) { } function exit() { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.exit(function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -47,7 +48,7 @@ function exit() { } function shutdownMember(clusterId, memberUuid) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.shutdownMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -56,7 +57,7 @@ function shutdownMember(clusterId, memberUuid) { } function shutdownCluster(clusterId) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.shutdownCluster(clusterId, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -65,7 +66,7 @@ function shutdownCluster(clusterId) { } function terminateMember(clusterId, memberUuid) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.terminateMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -74,7 +75,7 @@ function terminateMember(clusterId, memberUuid) { } function terminateCluster(clusterId) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.terminateCluster(clusterId, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -83,7 +84,7 @@ function terminateCluster(clusterId) { } function executeOnController(clusterId, script, lang) { - var deferred = DeferredPromise(); + const deferred = DeferredPromise(); controller.executeOnController(clusterId, script, lang, function (err, res) { if (err) return deferred.reject(err); if (res.success === false) return deferred.reject(res.message); diff --git a/test/RepetitionTaskTest.js b/test/RepetitionTaskTest.js index 1a60318c5..fb7384ee1 100644 --- a/test/RepetitionTaskTest.js +++ b/test/RepetitionTaskTest.js @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; - -var Util = require("../lib/Util"); -var TestUtil = require('./Util'); +const expect = require('chai').expect; +const Util = require("../lib/Util"); +const TestUtil = require('./Util'); describe('Repetition Task', function () { it('should be cancelled before timeout', function () { - var counter = 0; - var task = Util.scheduleWithRepetition(function () { + let counter = 0; + const task = Util.scheduleWithRepetition(function () { counter++; }, 50, 75); @@ -38,8 +38,8 @@ describe('Repetition Task', function () { }); it('should be cancelled after timeout', function () { - var counter = 0; - var task = Util.scheduleWithRepetition(function () { + let counter = 0; + const task = Util.scheduleWithRepetition(function () { counter++; }, 50, 75); @@ -54,8 +54,8 @@ describe('Repetition Task', function () { }); it('should be cancelled after interval', function () { - var counter = 0; - var task = Util.scheduleWithRepetition(function () { + let counter = 0; + const task = Util.scheduleWithRepetition(function () { counter++; }, 50, 75); @@ -70,8 +70,7 @@ describe('Repetition Task', function () { }); it('should not throw when cancelled twice', function () { - var task = Util.scheduleWithRepetition(function () { - }, 100, 200); + const task = Util.scheduleWithRepetition(() => {}, 100, 200); Util.cancelRepetitionTask(task); Util.cancelRepetitionTask(task); diff --git a/test/Util.js b/test/Util.js index 523eda604..0a46f0a13 100644 --- a/test/Util.js +++ b/test/Util.js @@ -13,35 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var BuildInfo = require('../lib/BuildInfo').BuildInfo; -var UuidUtil = require('../lib/util/UuidUtil').UuidUtil; +const expect = require('chai').expect; +const BuildInfo = require('../lib/BuildInfo').BuildInfo; +const UuidUtil = require('../lib/util/UuidUtil').UuidUtil; -var promiseLater = function (time, func) { +const promiseLater = function (time, func) { if (func === undefined) { - func = function () { - }; + func = () => {}; } - return new Promise(function (resolve, reject) { + return new Promise(function (resolve) { setTimeout(function () { resolve(func()); }, time); }); }; -var expectAlmostEqual = function (actual, expected) { +const expectAlmostEqual = function (actual, expected) { if (expected === null) { return expect(actual).to.equal(expected); } - var typeExpected = typeof expected; + const typeExpected = typeof expected; if (typeExpected === 'number') { return expect(actual).to.be.closeTo(expected, 0.0001); } if (typeExpected === 'object') { return (function () { - var membersEqual = true; - for (var i in expected) { + let membersEqual = true; + for (const i in expected) { if (expectAlmostEqual(actual[i], expected[i])) { membersEqual = false; break; @@ -63,8 +63,8 @@ exports.fillMap = function (map, size, keyPrefix, valuePrefix) { if (valuePrefix == void 0) { valuePrefix = 'val'; } - var entries = []; - for (var i = 0; i < size; i++) { + const entries = []; + for (let i = 0; i < size; i++) { entries.push([keyPrefix + i, valuePrefix + i]); } return map.putAll(entries); @@ -80,14 +80,15 @@ exports.markEnterprise = function (_this) { }; exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { + let actNumber; if (process.env['SERVER_VERSION']) { - var actNumber = BuildInfo.calculateServerVersionFromString(process.env['SERVER_VERSION']); + actNumber = BuildInfo.calculateServerVersionFromString(process.env['SERVER_VERSION']); } else if (client != null) { - var actNumber = client.getConnectionManager().getRandomConnection().getConnectedServerVersion(); + actNumber = client.getConnectionManager().getRandomConnection().getConnectedServerVersion(); } else { return; } - var expNumber = BuildInfo.calculateServerVersionFromString(expectedVersion); + const expNumber = BuildInfo.calculateServerVersionFromString(expectedVersion); if (actNumber === BuildInfo.UNKNOWN_VERSION_ID || actNumber < expNumber) { _this.skip(); } diff --git a/test/config/ConfigBuilderHazelcastCloudTest.js b/test/config/ConfigBuilderHazelcastCloudTest.js new file mode 100644 index 000000000..f5e4fb90d --- /dev/null +++ b/test/config/ConfigBuilderHazelcastCloudTest.js @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const expect = require('chai').expect; +require('chai').use(require('chai-as-promised')); +const path = require('path'); +const ClientConfigImpl = require('../../lib/config/Config').ClientConfigImpl; +const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; + +describe('ConfigBuilderHazelcastCloudTest', function () { + + function loadJson(jsonPath) { + const config = require(path.join(__dirname, jsonPath)); + return new ConfigBuilder(config).build(); + } + + it('hazelcastCloud_full', function () { + const config = loadJson('configurations/full.json'); + expect(config.network.hazelcastCloud.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); + }); + + it('hazelcastCloud_enabled_nullToken', function () { + return expect(() => loadJson('configurations/invalid-cloud.json')).to.throw(Error); + }); + + it('hazelcastCloud_defaults', function () { + const clientConfig = new ClientConfigImpl(); + expect(clientConfig.network.hazelcastCloud.discoveryToken).to.be.null; + }); + + it('hazelcastCloud_enabled', function () { + const config = loadJson('configurations/cloud-enabled.json'); + expect(config.network.hazelcastCloud.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); + }); +}); diff --git a/test/config/ConfigBuilderSSLTest.js b/test/config/ConfigBuilderSSLTest.js new file mode 100644 index 000000000..e3523e28c --- /dev/null +++ b/test/config/ConfigBuilderSSLTest.js @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const chai = require('chai'); +chai.use(require('chai-as-promised')); +const expect = chai.expect; +const path = require('path'); + +const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +const Errors = require('../..').HazelcastErrors; + +describe('ConfigBuilderSSLTest', function () { + + function loadJson(jsonPath) { + const config = require(path.join(__dirname, jsonPath)); + return new ConfigBuilder(config).build(); + } + + it('if both sslOptions and factory are set, should throw error', function () { + expect(() => loadJson('configurations/invalid-ssl-enabled.json')).to.throw(Errors.HazelcastError); + expect(() => loadJson('configurations/invalid-ssl-disabled.json')).to.throw(Errors.HazelcastError); + }); + + it('ssl is disabled but options are set', function () { + const config = loadJson('configurations/ssl-disabled-options-set.json'); + const networkCfg = config.network; + expect(networkCfg.ssl.enabled).to.be.false; + expect(networkCfg.ssl.sslOptions.ca).to.be.equal('ca.pem'); + expect(networkCfg.ssl.sslOptions.cert).to.be.equal('cert.pem'); + expect(networkCfg.ssl.sslOptions.key).to.be.equal('key.pem'); + expect(networkCfg.ssl.sslOptionsFactory).to.be.null; + }); +}); diff --git a/test/declarative_config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js similarity index 59% rename from test/declarative_config/ConfigBuilderTest.js rename to test/config/ConfigBuilderTest.js index bb6f48d60..155df7bdb 100644 --- a/test/declarative_config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -13,27 +13,60 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -var expect = require('chai').expect; -var path = require('path'); -var ConfigBuilder = require('../../').ConfigBuilder; -var Config = require('../../').Config; -var AddressHelper = require("../../lib/Util").AddressHelper; -var ReconnectMode = require('../../lib/config/ConnectionStrategyConfig').ReconnectMode; - -describe('ConfigBuilder Test', function () { - var fullConfig; +'use strict'; + +const expect = require('chai').expect; +const path = require('path'); +const Config = require('../..').Config; +const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +const AddressHelper = require('../../lib/Util').AddressHelper; +const ReconnectMode = require('../../lib/config/ConnectionStrategyConfig').ReconnectMode; + +describe('ConfigBuilderTest', function () { + + let fullConfig; + const lifecycleListener = () => {}; + const membershipListener = { + memberAdded: () => {}, + memberRemoved: () => {} + }; + const dataSerializableFactory = { + factoryId: 1, + create: () => {} + }; + const portableFactory = { + factoryId: 2, + create: () => {} + }; + const customSerializer = { + getId: () => 3, + hzGetCustomId: () => 3 + }; + customSerializer.typeId = 3; + const globalSerializer = () => {}; + const customLoadBalancer = { + initLoadBalancer: () => {}, + next: () => {} + }; before(function () { - var configBuilder = new ConfigBuilder(); - process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, 'configurations/full.json'); - return configBuilder.loadConfig().then(function () { - fullConfig = configBuilder.build(); - }); - }); - - after(function () { - delete process.env['HAZELCAST_CLIENT_CONFIG']; + const inputConfig = require(path.join(__dirname, 'configurations/full.json')); + inputConfig.lifecycleListeners = [ + lifecycleListener + ]; + inputConfig.membershipListeners = [ + membershipListener + ]; + inputConfig.serialization.dataSerializableFactories = { + 1: dataSerializableFactory + }; + inputConfig.serialization.portableFactories = { + 2: portableFactory + }; + inputConfig.serialization.customSerializers = [customSerializer]; + inputConfig.serialization.globalSerializer = globalSerializer; + inputConfig.loadBalancer.customLoadBalancer = customLoadBalancer; + fullConfig = new ConfigBuilder(inputConfig).build(); }); it('clusterName', function () { @@ -45,30 +78,29 @@ describe('ConfigBuilder Test', function () { }); it('clientLabels', function () { - var labels = fullConfig.labels; - expect(labels.size).to.equal(2); - expect(labels.has('label1')).to.be.true; - expect(labels.has('label2')).to.be.true; + const labels = fullConfig.clientLabels; + expect(labels.length).to.equal(2); + expect(labels.includes('label1')).to.be.true; + expect(labels.includes('label2')).to.be.true; }); it('connectionStrategy', function () { - var connectionStrategyConfig = fullConfig.connectionStrategyConfig; + const connectionStrategyConfig = fullConfig.connectionStrategy; expect(connectionStrategyConfig.asyncStart).to.be.true; expect(connectionStrategyConfig.reconnectMode).to.equal(ReconnectMode.ASYNC); - var connectionRetryConfig = connectionStrategyConfig.connectionRetryConfig; + const connectionRetryConfig = connectionStrategyConfig.connectionRetry; expect(connectionRetryConfig.initialBackoffMillis).to.equal(2000); expect(connectionRetryConfig.maxBackoffMillis).to.equal(60000); expect(connectionRetryConfig.multiplier).to.equal(3); expect(connectionRetryConfig.clusterConnectTimeoutMillis).to.equal(5000); expect(connectionRetryConfig.jitter).to.equal(0.5); - }); - it('networkConfig', function () { - var networkCfg = fullConfig.networkConfig; + it('network', function () { + const networkCfg = fullConfig.network; - var addresses0 = AddressHelper.getSocketAddresses(networkCfg.addresses[0]); + const addresses0 = AddressHelper.getSocketAddresses(networkCfg.clusterMembers[0]); expect(addresses0[0].host).to.equal('127.0.0.9'); expect(addresses0[0].port).to.equal(5701); expect(addresses0[1].host).to.equal('127.0.0.9'); @@ -77,29 +109,29 @@ describe('ConfigBuilder Test', function () { expect(addresses0[2].port).to.equal(5703); expect(addresses0.length).to.equal(3); - var addresses1 = AddressHelper.getSocketAddresses(networkCfg.addresses[1]); + const addresses1 = AddressHelper.getSocketAddresses(networkCfg.clusterMembers[1]); expect(addresses1[0].host).to.equal('127.0.0.2'); expect(addresses1[0].port).to.equal(5702); expect(addresses1.length).to.equal(1); - - var address0 = AddressHelper.createAddressFromString(networkCfg.addresses[0]); - var address1 = AddressHelper.createAddressFromString(networkCfg.addresses[1]); + const address0 = AddressHelper.createAddressFromString(networkCfg.clusterMembers[0]); + const address1 = AddressHelper.createAddressFromString(networkCfg.clusterMembers[1]); expect(address0.host).to.equal('127.0.0.9'); expect(address0.port).to.be.undefined; expect(address1.host).to.equal('127.0.0.2'); expect(address1.port).to.equal(5702); expect(networkCfg.smartRouting).to.be.false; expect(networkCfg.connectionTimeout).to.equal(6000); - expect(networkCfg.sslConfig.enabled).to.be.true; - expect(networkCfg.sslConfig.sslOptions).to.be.null; - expect(networkCfg.sslConfig.sslOptionsFactoryConfig.path).to.equal('path/to/file'); - expect(networkCfg.sslConfig.sslOptionsFactoryConfig.exportedName).to.equal('exportedName'); - expect(networkCfg.sslConfig.sslOptionsFactoryProperties['userDefinedProperty1']).to.equal('userDefinedValue'); + expect(networkCfg.ssl.enabled).to.be.true; + expect(networkCfg.ssl.sslOptions).to.be.not.null; + expect(networkCfg.ssl.sslOptions.ca).to.equal('ca.pem'); + expect(networkCfg.ssl.sslOptions.cert).to.equal('cert.pem'); + expect(networkCfg.ssl.sslOptions.key).to.equal('key.pem'); + expect(networkCfg.ssl.sslOptions.servername).to.equal('foo.bar.com'); }); it('properties', function () { - var properties = fullConfig.properties; + const properties = fullConfig.properties; expect(properties['hazelcast.client.heartbeat.interval']).to.equal(1000); expect(properties['hazelcast.client.heartbeat.timeout']).to.equal(10000); expect(properties['hazelcast.client.invocation.retry.pause.millis']).to.equal(4000); @@ -118,30 +150,28 @@ describe('ConfigBuilder Test', function () { }); it('serialization', function () { - var serializationCfg = fullConfig.serializationConfig; + const serializationCfg = fullConfig.serialization; + expect(serializationCfg.defaultNumberType).to.equal('integer'); expect(serializationCfg.isBigEndian).to.equal(false); expect(serializationCfg.portableVersion).to.equal(1); expect(serializationCfg.jsonStringDeserializationPolicy) .to.equal(Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION); - expect(serializationCfg.dataSerializableFactoryConfigs[0].path).to.equal('path/to/file'); - expect(serializationCfg.dataSerializableFactoryConfigs[0].exportedName).to.equal('exportedName'); - expect(serializationCfg.portableFactoryConfigs[1].path).to.equal('path/to/file'); - expect(serializationCfg.portableFactoryConfigs[1].exportedName).to.equal('exportedName'); + expect(Object.keys(serializationCfg.dataSerializableFactories).length).to.equal(1); + expect(serializationCfg.dataSerializableFactories['1']).to.equal(dataSerializableFactory); - expect(serializationCfg.globalSerializerConfig.exportedName).to.equal('exportedName'); - expect(serializationCfg.globalSerializerConfig.path).to.equal('path/to/file'); + expect(Object.keys(serializationCfg.portableFactories).length).to.equal(1); + expect(serializationCfg.portableFactories['2']).to.equal(portableFactory); - expect(serializationCfg.customSerializerConfigs[2].exportedName).to.equal('CustomSerializer1'); - expect(serializationCfg.customSerializerConfigs[2].path).to.equal('path/to/custom'); + expect(serializationCfg.customSerializers.length).to.equal(1); + expect(serializationCfg.customSerializers[0]).to.equal(customSerializer); - expect(serializationCfg.customSerializerConfigs[3].exportedName).to.equal('CustomSerializer2'); - expect(serializationCfg.customSerializerConfigs[3].path).to.equal('path/to/custom'); + expect(serializationCfg.globalSerializer).to.equal(globalSerializer); }); it('nearCaches', function () { - var nearCacheConfigs = fullConfig.nearCacheConfigs; + const nearCacheConfigs = fullConfig.nearCaches; expect(nearCacheConfigs['nc-map'].name).to.equal('nc-map'); expect(nearCacheConfigs['nc-map'].invalidateOnChange).to.be.false; expect(nearCacheConfigs['nc-map'].maxIdleSeconds).to.equal(2); @@ -164,7 +194,7 @@ describe('ConfigBuilder Test', function () { }); it('reliableTopics', function () { - var rtConfigs = fullConfig.reliableTopicConfigs; + const rtConfigs = fullConfig.reliableTopics; expect(rtConfigs['rt1'].name).to.equal('rt1'); expect(rtConfigs['rt1'].readBatchSize).to.equal(35); expect(rtConfigs['rt1'].overloadPolicy).to.equal(Config.TopicOverloadPolicy.DISCARD_NEWEST); @@ -174,18 +204,20 @@ describe('ConfigBuilder Test', function () { expect(rtConfigs['rt2'].overloadPolicy).to.equal(Config.TopicOverloadPolicy.DISCARD_NEWEST); }); - it('listenerConfig', function () { - var listenerConfig = fullConfig.listenerConfigs; - expect(listenerConfig[0].type).to.equal('lifecycle'); - expect(listenerConfig[0].importConfig.exportedName).to.equal('listener'); - expect(listenerConfig[0].importConfig.path).to.equal('path/to/file'); - expect(listenerConfig[1].type).to.equal('membership'); - expect(listenerConfig[1].importConfig.exportedName).to.equal('listener2'); - expect(listenerConfig[1].importConfig.path).to.equal('path/to/file'); + it('lifecycleListeners', function () { + const listenerConfig = fullConfig.lifecycleListeners; + expect(listenerConfig.length).to.equal(1); + expect(listenerConfig[0]).to.equal(lifecycleListener); + }); + + it('membershipListeners', function () { + const listenerConfig = fullConfig.membershipListeners; + expect(listenerConfig.length).to.equal(1); + expect(listenerConfig[0]).to.equal(membershipListener); }); - it('flakeIdGeneratorConfigs', function () { - var flakeIdConfigs = fullConfig.flakeIdGeneratorConfigs; + it('flakeIdGenerators', function () { + const flakeIdConfigs = fullConfig.flakeIdGenerators; expect(flakeIdConfigs['flakeid'].name).to.equal('flakeid'); expect(flakeIdConfigs['flakeid'].prefetchCount).to.equal(123); expect(150000).to.be.equal(flakeIdConfigs['flakeid'].prefetchValidityMillis); @@ -195,7 +227,8 @@ describe('ConfigBuilder Test', function () { }) it('loadBalancer', function () { - var loadBalancer = fullConfig.loadBalancer; - expect(loadBalancer.constructor.name).to.equal('RandomLB'); + const loadBalancer = fullConfig.loadBalancer; + expect(loadBalancer.type).to.equal(Config.LoadBalancerType.RANDOM); + expect(loadBalancer.customLoadBalancer).to.equal(customLoadBalancer); }); }); diff --git a/test/config/ConfigPatternMatcherTest.js b/test/config/ConfigPatternMatcherTest.js new file mode 100644 index 000000000..a756d1889 --- /dev/null +++ b/test/config/ConfigPatternMatcherTest.js @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const expect = require('chai').expect; +const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; +const FlakeIdGeneratorConfigImpl = require('../../lib/config/FlakeIdGeneratorConfig').FlakeIdGeneratorConfigImpl; +const Errors = require('../..').HazelcastErrors; + +describe('ConfigPatternMatcherTest', function () { + + const inputConfig = { + flakeIdGenerators: {} + }; + const f1 = { + prefetchValidityMillis: 111, + prefetchCount: 44 + }; + const f2 = { + prefetchValidityMillis: 1176451, + prefetchCount: 534 + }; + const f3 = { + prefetchValidityMillis: 114, + prefetchCount: 14 + }; + const f4 = { + prefetchValidityMillis: 42, + prefetchCount: 4 + }; + + beforeEach(function () { + inputConfig.flakeIdGenerators['pref*'] = f2; + inputConfig.flakeIdGenerators['*postf'] = f3; + inputConfig.flakeIdGenerators['pref*postf'] = f4; + }); + + function assertConfig(actual, expected, name) { + for (const prop in actual) { + if (typeof actual[prop] !== 'function') { + if (prop === 'name') { + expect(actual[prop]).to.be.equal(name); + } else { + expect(actual[prop]).to.be.equal(expected[prop]); + } + } + } + } + + it('lookupByPattern', function () { + const config = new ConfigBuilder(inputConfig).build(); + + assertConfig(config.getFlakeIdGeneratorConfig('pref123postf'), f4, 'pref123postf'); + assertConfig(config.getFlakeIdGeneratorConfig('123postf'), f3, '123postf'); + assertConfig(config.getFlakeIdGeneratorConfig('pref123'), f2, 'pref123'); + assertConfig(config.getFlakeIdGeneratorConfig('unconfigured'), new FlakeIdGeneratorConfigImpl(), 'unconfigured'); + }); + + it('lookupByPattern with explicit default', function () { + inputConfig.flakeIdGenerators['default'] = f1; + const config = new ConfigBuilder(inputConfig).build(); + + assertConfig(config.getFlakeIdGeneratorConfig('pref123postf'), f4, 'pref123postf'); + assertConfig(config.getFlakeIdGeneratorConfig('123postf'), f3, '123postf'); + assertConfig(config.getFlakeIdGeneratorConfig('pref123'), f2, 'pref123'); + assertConfig(config.getFlakeIdGeneratorConfig('unconfigured'), f1, 'unconfigured'); + }); + + it('duplicate pattern throws', function () { + inputConfig.flakeIdGenerators['abcde*'] = f2; + const config = new ConfigBuilder(inputConfig).build(); + + expect(config.getFlakeIdGeneratorConfig.bind(inputConfig, 'abcde.somemore.postf')).to.throw(Errors.ConfigurationError); + }); +}); diff --git a/src/config/ImportConfig.ts b/test/config/ResolvePathTest.js similarity index 57% rename from src/config/ImportConfig.ts rename to test/config/ResolvePathTest.js index d7cafcb51..5c62b8bcf 100644 --- a/src/config/ImportConfig.ts +++ b/test/config/ResolvePathTest.js @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -export interface ImportConfig { - path: string; - exportedName: string; -} +const expect = require('chai').expect; +const path = require('path'); +const Util = require('../../lib/Util'); -export interface ListenerImportConfig { - importConfig: ImportConfig; - type: string; -} +describe('ResolvePath Test', function () { + it('Util.resolvePath test', function () { + expect(Util.resolvePath('.')).to.equal(process.cwd()); + expect(Util.resolvePath('filename')).to.equal(path.join(process.cwd(), 'filename')); + expect(Util.resolvePath('..')).to.equal(path.join(process.cwd(), '..')); + }) +}); diff --git a/test/declarative_config/SchemaValidationTest.js b/test/config/SchemaValidationTest.js similarity index 74% rename from test/declarative_config/SchemaValidationTest.js rename to test/config/SchemaValidationTest.js index eebafb6c3..74eb9a8e8 100644 --- a/test/declarative_config/SchemaValidationTest.js +++ b/test/config/SchemaValidationTest.js @@ -13,33 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var validate = require('jsonschema').validate; -var fs = require('fs'); -var path = require('path'); +const expect = require('chai').expect; +const validate = require('jsonschema').validate; +const fs = require('fs'); +const path = require('path'); describe('SchemaValidationTest', function () { - var schema; + let schema; before(function () { schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../config-schema.json'), 'utf8')); }); function validateCandidate(candidate) { - var candidateJson = JSON.parse(candidate); + const candidateJson = JSON.parse(candidate); return validate(candidateJson, schema, {nestedErrors: true}); } it('hazelcast-client-full.json passes validation', function () { - var fulljson = fs.readFileSync(path.resolve(__dirname, 'configurations/full.json'), 'utf8'); + const fulljson = fs.readFileSync(path.resolve(__dirname, 'configurations/full.json'), 'utf8'); expect(validateCandidate(fulljson).valid).to.be.true; }); it('invalid configuration is caught by the validator', function () { - var invalidJson = fs.readFileSync(path.resolve(__dirname, 'configurations/invalid.json'), 'utf8'); + const invalidJson = fs.readFileSync(path.resolve(__dirname, 'configurations/invalid.json'), 'utf8'); expect(validateCandidate(invalidJson).errors[0]).to.exist.with.property('message', 'must have a minimum value of 1000'); }); }); - diff --git a/test/config/configurations/cloud-enabled.json b/test/config/configurations/cloud-enabled.json new file mode 100644 index 000000000..e0b1d9c9a --- /dev/null +++ b/test/config/configurations/cloud-enabled.json @@ -0,0 +1,7 @@ +{ + "network": { + "hazelcastCloud": { + "discoveryToken": "EXAMPLE_TOKEN" + } + } +} diff --git a/test/declarative_config/configurations/full.json b/test/config/configurations/full.json similarity index 59% rename from test/declarative_config/configurations/full.json rename to test/config/configurations/full.json index 6f2c037c6..afb0e2966 100644 --- a/test/declarative_config/configurations/full.json +++ b/test/config/configurations/full.json @@ -31,18 +31,15 @@ "connectionTimeout": 6000, "ssl": { "enabled": true, - "sslOptions": null, - "factory": { - "path": "path/to/file", - "exportedName": "exportedName", - "properties": { - "userDefinedProperty1": "userDefinedValue" - } + "sslOptions": { + "ca": "ca.pem", + "cert": "cert.pem", + "key": "key.pem", + "servername": "foo.bar.com" } }, "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN", - "enabled": false + "discoveryToken": "EXAMPLE_TOKEN" } }, "connectionStrategy": { @@ -56,57 +53,24 @@ "jitter": 0.5 } }, - "listeners": [ - { - "type": "lifecycle", - "path": "path/to/file", - "exportedName": "listener" - }, - { - "type": "membership", - "path": "path/to/file", - "exportedName": "listener2" - } - ], "serialization": { "defaultNumberType": "integer", "isBigEndian": false, - "dataSerializableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 0 - } - ], - "portableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 1 - } - ], "portableVersion": 1, - "globalSerializer": { - "path": "path/to/file", - "exportedName": "exportedName" - }, - "serializers": [ - { - "path": "path/to/custom", - "exportedName": "CustomSerializer1", - "typeId": 2 - }, - { - "path": "path/to/custom", - "exportedName": "CustomSerializer2", - "typeId": 3 - } - ], "jsonStringDeserializationPolicy": "no_deserialization" }, - "nearCaches": [ - { - "name": "nc-map", + "nearCaches": { + "nc-map": { + "invalidateOnChange": false, + "maxIdleSeconds": 2, + "inMemoryFormat": "object", + "timeToLiveSeconds": 3, + "evictionPolicy": "lru", + "evictionMaxSize": 3000, + "evictionSamplingCount": 4, + "evictionSamplingPoolSize": 8 + }, + "nc-map2": { "invalidateOnChange": false, "maxIdleSeconds": 2, "inMemoryFormat": "object", @@ -116,35 +80,28 @@ "evictionSamplingCount": 4, "evictionSamplingPoolSize": 8 } - ], - "reliableTopics": [ - { - "name": "rt1", + }, + "reliableTopics": { + "rt1": { "readBatchSize": 35, "overloadPolicy": "discard_newest" }, - { - "name": "rt2", + "rt2": { "readBatchSize": 15, "overloadPolicy": "discard_newest" } - ], - "flakeIdGeneratorConfigs": [ - { - "name": "flakeid", + }, + "flakeIdGenerators": { + "flakeid": { "prefetchCount": 123, "prefetchValidityMillis": 150000 }, - { - "name": "flakeid2", + "flakeid2": { "prefetchCount": 1234, "prefetchValidityMillis": 1900000 } - ], + }, "loadBalancer": { "type": "random" - }, - "import": [ - "near-cache.json" - ] + } } diff --git a/test/declarative_config/configurations/invalid-cloud.json b/test/config/configurations/invalid-cloud.json similarity index 50% rename from test/declarative_config/configurations/invalid-cloud.json rename to test/config/configurations/invalid-cloud.json index e5806d162..264050b0b 100644 --- a/test/declarative_config/configurations/invalid-cloud.json +++ b/test/config/configurations/invalid-cloud.json @@ -1,8 +1,7 @@ { "network": { "hazelcastCloud": { - "discoveryToken": null, - "enabled": true + "discoveryToken": null } } } diff --git a/test/declarative_config/configurations/invalid-ssl-disabled.json b/test/config/configurations/invalid-ssl-disabled.json similarity index 76% rename from test/declarative_config/configurations/invalid-ssl-disabled.json rename to test/config/configurations/invalid-ssl-disabled.json index 89ae97c22..8a5fbcdb2 100644 --- a/test/declarative_config/configurations/invalid-ssl-disabled.json +++ b/test/config/configurations/invalid-ssl-disabled.json @@ -3,7 +3,7 @@ "ssl": { "enabled": false, "sslOptions": {}, - "factory": {} + "sslOptionsFactory": {} } } } diff --git a/test/declarative_config/configurations/invalid-ssl-enabled.json b/test/config/configurations/invalid-ssl-enabled.json similarity index 75% rename from test/declarative_config/configurations/invalid-ssl-enabled.json rename to test/config/configurations/invalid-ssl-enabled.json index e1653c5fd..eb12088f0 100644 --- a/test/declarative_config/configurations/invalid-ssl-enabled.json +++ b/test/config/configurations/invalid-ssl-enabled.json @@ -3,7 +3,7 @@ "ssl": { "enabled": true, "sslOptions": {}, - "factory": {} + "sslOptionsFactory": {} } } } diff --git a/test/declarative_config/configurations/invalid.json b/test/config/configurations/invalid.json similarity index 100% rename from test/declarative_config/configurations/invalid.json rename to test/config/configurations/invalid.json diff --git a/test/declarative_config/configurations/ssl-disabled-options-set.json b/test/config/configurations/ssl-disabled-options-set.json similarity index 85% rename from test/declarative_config/configurations/ssl-disabled-options-set.json rename to test/config/configurations/ssl-disabled-options-set.json index f58e1367a..5bd8a96f8 100644 --- a/test/declarative_config/configurations/ssl-disabled-options-set.json +++ b/test/config/configurations/ssl-disabled-options-set.json @@ -7,8 +7,7 @@ "cert": "cert.pem", "key": "key.pem", "servername": "foo.bar.com" - }, - "factory": null + } } } } diff --git a/test/declarative_config/ConfigBuilderHazelcastCloudTest.js b/test/declarative_config/ConfigBuilderHazelcastCloudTest.js deleted file mode 100644 index 3c060c627..000000000 --- a/test/declarative_config/ConfigBuilderHazelcastCloudTest.js +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - - -var expect = require('chai').expect; -var ClientConfig = require('../../').Config.ClientConfig; -require('chai').use(require('chai-as-promised')); -var path = require('path'); -var ConfigBuilder = require('../../').ConfigBuilder; - -describe('ConfigBuilderHazelcastCloud Test', function () { - var configFull; - - afterEach(function () { - delete process.env['HAZELCAST_CLIENT_CONFIG']; - }); - - function loadJson(jsonPath) { - var configBuilder = new ConfigBuilder(); - process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, jsonPath); - return configBuilder.loadConfig().then(function () { - configFull = configBuilder.build(); - }); - } - - it('cloudConfig', function () { - return loadJson('configurations/full.json').then(function () { - var networkConfig = configFull.networkConfig; - expect(networkConfig.cloudConfig.enabled).to.be.false; - expect(networkConfig.cloudConfig.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); - }); - }); - - it('cloudConfig_enabled_nullToken', function () { - return expect(loadJson('configurations/invalid-cloud.json')).to.be.rejectedWith(Error); - }); - - it('cloudConfig_defaults', function () { - var clientConfig = new ClientConfig(); - expect(clientConfig.networkConfig.cloudConfig.enabled).to.be.false; - expect(clientConfig.networkConfig.cloudConfig.discoveryToken).to.be.null; - - }); - - it('cloudConfig_enabled', function () { - return loadJson('configurations/cloud-enabled.json').then(function () { - var networkConfig = configFull.networkConfig; - expect(networkConfig.cloudConfig.enabled).to.be.true; - expect(networkConfig.cloudConfig.discoveryToken).to.be.equal('EXAMPLE_TOKEN'); - }); - }); -}); diff --git a/test/declarative_config/ConfigBuilderSSLTest.js b/test/declarative_config/ConfigBuilderSSLTest.js deleted file mode 100644 index d590d9b8a..000000000 --- a/test/declarative_config/ConfigBuilderSSLTest.js +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var chai = require('chai'); -chai.use(require('chai-as-promised')); -var expect = chai.expect; -var path = require('path'); - -var ConfigBuilder = require('../../').ConfigBuilder; -var Config = require('../../').Config; -var Errors = require('../..').HazelcastErrors; - -describe('ConfigBuilderSSLTest', function () { - var configFull; - - afterEach(function () { - delete process.env['HAZELCAST_CLIENT_CONFIG']; - }); - - function loadJson(jsonPath) { - var configBuilder = new ConfigBuilder(); - process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, jsonPath); - return configBuilder.loadConfig().then(function () { - configFull = configBuilder.build(); - }); - } - - it('if both sslOptions and factory are set, should throw error', function () { - expect(loadJson('configurations/invalid-ssl-enabled.json')).to.be.rejectedWith(Errors.HazelcastError); - expect(loadJson('configurations/invalid-ssl-disabled.json')).to.be.rejectedWith(Errors.HazelcastError); - }); - - it('when path is undefined, exportedName should be BasicSSLOptionsFactory, otherwise should throw error', function () { - return expect(loadJson('configurations/invalid-ssl-factory.json')).to.be.rejectedWith(Errors.HazelcastError); - }); - - it('ssl is disabled but factory is set', function () { - return loadJson('configurations/ssl-disabled-factory-set.json').then(function () { - var networkCfg = configFull.networkConfig; - - expect(networkCfg.sslConfig.enabled).to.be.false; - expect(networkCfg.sslConfig.sslOptions).to.be.null; - expect(networkCfg.sslConfig.sslOptionsFactoryConfig.path).to.be.equal('path/to/file'); - expect(networkCfg.sslConfig.sslOptionsFactoryConfig.exportedName).to.be.equal('exportedName'); - expect(networkCfg.sslConfig.sslOptionsFactoryProperties['userDefinedProperty1']).to.equal('userDefinedValue'); - }) - }); - - it('ssl is disabled but options are set', function () { - return loadJson('configurations/ssl-disabled-options-set.json').then(function () { - var networkCfg = configFull.networkConfig; - - expect(networkCfg.sslConfig.enabled).to.be.false; - expect(networkCfg.sslConfig.sslOptions.ca).to.be.equal('ca.pem'); - expect(networkCfg.sslConfig.sslOptions.cert).to.be.equal('cert.pem'); - expect(networkCfg.sslConfig.sslOptions.key).to.be.equal('key.pem'); - expect(networkCfg.sslConfig.sslOptionsFactoryConfig).to.be.null; - }) - }); -}); - diff --git a/test/declarative_config/ConfigLocationTest.js b/test/declarative_config/ConfigLocationTest.js deleted file mode 100644 index 476f5e74e..000000000 --- a/test/declarative_config/ConfigLocationTest.js +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var expect = require('chai').expect; -var path = require('path'); -var ConfigBuilder = require('../../').ConfigBuilder; -var fs = require('fs'); -var path = require('path'); -var RuntimeUtil = require('../../lib/Util'); - -describe('ConfigLocationTest', function () { - var DEFAULT_JSON_LOCATION = path.resolve(process.cwd(), 'hazelcast-client.json'); - var ENV_VARIABLE_NAME = 'HAZELCAST_CLIENT_CONFIG'; - - afterEach(function () { - try { - fs.unlinkSync(DEFAULT_JSON_LOCATION); - } catch (e) { - // - } finally { - delete process.env[ENV_VARIABLE_NAME]; - } - }); - - it('Prefers environment variable location over default location', function () { - //create a hazelcast-client.json at current working directory so we can be sure it is ignored. - fs.writeFileSync(DEFAULT_JSON_LOCATION, '' + - '{' + - ' "clusterName": "wrongName"' + - '}'); - process.env[ENV_VARIABLE_NAME] = path.join(__dirname, 'configurations/full.json'); - var configBuilder = new ConfigBuilder(); - return configBuilder.loadConfig().then(function () { - return expect(configBuilder.build().clusterName).equals('testCluster'); - }); - }); - - it('Prefers default location json file over default config', function () { - fs.writeFileSync(DEFAULT_JSON_LOCATION, '' + - '{' + - ' "clusterName": "newName"' + - '}'); - var configBuilder = new ConfigBuilder(); - return configBuilder.loadConfig().then(function () { - return expect(configBuilder.build().clusterName).equals('newName'); - }); - }); - - it('Starts with default configuration if no config', function () { - var configBuilder = new ConfigBuilder(); - return configBuilder.loadConfig().then(function () { - return expect(configBuilder.build().clusterName).equals('dev'); - }); - }); - - it('Util.resolvePath test', function () { - expect(RuntimeUtil.resolvePath('.')).to.equal(process.cwd()); - expect(RuntimeUtil.resolvePath('filename')).to.equal(path.join(process.cwd(), 'filename')); - expect(RuntimeUtil.resolvePath('..')).to.equal(path.join(process.cwd(), '..')); - process.env[ENV_VARIABLE_NAME] = 'aRelativeBase/config.json'; - expect(RuntimeUtil.resolvePath('.')).to.equal(path.join(process.cwd(), 'aRelativeBase')); - expect(RuntimeUtil.resolvePath('filename')).to.equal(path.join(process.cwd(), 'aRelativeBase', 'filename')); - expect(RuntimeUtil.resolvePath('..')).to.equal(process.cwd()); - process.env[ENV_VARIABLE_NAME] = '/anAbsoluteBase/config.json'; - var root = path.parse(process.cwd()).root; - expect(RuntimeUtil.resolvePath('.')).to.equal(path.join(root, 'anAbsoluteBase')); - expect(RuntimeUtil.resolvePath('filename')).to.equal(path.join(root, 'anAbsoluteBase', 'filename')); - expect(RuntimeUtil.resolvePath('..')).to.equal(root); - }) -}); diff --git a/test/declarative_config/ConfigPatternMatcherTest.js b/test/declarative_config/ConfigPatternMatcherTest.js deleted file mode 100644 index 1f47b7b81..000000000 --- a/test/declarative_config/ConfigPatternMatcherTest.js +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ -var expect = require('chai').expect; -var Config = require('../..').Config; -var HzError = require('../..').HazelcastErrors; - -describe('ConfigPatternMatcherTest', function () { - - var cfg = new Config.ClientConfig(); - var f1 = new Config.FlakeIdGeneratorConfig(); - f1.prefetchValidityMillis = 111; - f1.prefetchCount = 44; - - var f2 = new Config.FlakeIdGeneratorConfig(); - f2.prefetchValidityMillis = 1176451; - f2.prefetchCount = 534; - - var f3 = new Config.FlakeIdGeneratorConfig(); - f2.prefetchValidityMillis = 114; - f2.prefetchCount = 14; - - var f4 = new Config.FlakeIdGeneratorConfig(); - f4.prefetchValidityMillis = 114; - f4.prefetchCount = 14; - - beforeEach(function () { - cfg.flakeIdGeneratorConfigs['pref*'] = f2; - cfg.flakeIdGeneratorConfigs['*postf'] = f3; - cfg.flakeIdGeneratorConfigs['pref*postf'] = f4; - }); - - function assertConfig(actual, expected, name) { - for (var prop in actual) { - if (typeof actual[prop] !== 'function') { - if (prop === 'name') { - expect(actual[prop]).to.be.equal(name); - } else { - expect(actual[prop]).to.be.equal(expected[prop]); - } - } - } - - } - - it('lookupByPattern', function () { - assertConfig(cfg.getFlakeIdGeneratorConfig('pref123postf'), f4, 'pref123postf'); - assertConfig(cfg.getFlakeIdGeneratorConfig('123postf'), f3, '123postf'); - assertConfig(cfg.getFlakeIdGeneratorConfig('pref123'), f2, 'pref123'); - assertConfig(cfg.getFlakeIdGeneratorConfig('unconfigured'), new Config.FlakeIdGeneratorConfig(), 'unconfigured'); - }); - - it('lookupByPattern with explicit default', function () { - cfg.flakeIdGeneratorConfigs['default'] = f1; - assertConfig(cfg.getFlakeIdGeneratorConfig('pref123postf'), f4, 'pref123postf'); - assertConfig(cfg.getFlakeIdGeneratorConfig('123postf'), f3, '123postf'); - assertConfig(cfg.getFlakeIdGeneratorConfig('pref123'), f2, 'pref123'); - assertConfig(cfg.getFlakeIdGeneratorConfig('unconfigured'), f1, 'unconfigured'); - }); - - it('duplicate pattern throws', function () { - cfg.flakeIdGeneratorConfigs['abcde*'] = f2; - expect(cfg.getFlakeIdGeneratorConfig.bind(cfg, 'abcde.somemore.postf')).to.throw(HzError.ConfigurationError); - }); -}); diff --git a/test/declarative_config/configurations/cloud-enabled.json b/test/declarative_config/configurations/cloud-enabled.json deleted file mode 100644 index a3e901235..000000000 --- a/test/declarative_config/configurations/cloud-enabled.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "network": { - "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN", - "enabled": true - } - } -} diff --git a/test/declarative_config/configurations/invalid-ssl-factory.json b/test/declarative_config/configurations/invalid-ssl-factory.json deleted file mode 100644 index a65707503..000000000 --- a/test/declarative_config/configurations/invalid-ssl-factory.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": { - "ssl": { - "enabled": true, - "factory": { - "exportedName": "NonExistingOptionsFactory", - "properties": { - "caPath": "ca.pem", - "certPath": "cert.pem" - } - } - } - } -} diff --git a/test/declarative_config/configurations/near-cache.json b/test/declarative_config/configurations/near-cache.json deleted file mode 100644 index 4a2c24c46..000000000 --- a/test/declarative_config/configurations/near-cache.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "nearCaches": [ - { - "name": "nc-map2", - "invalidateOnChange": false, - "maxIdleSeconds": 2, - "inMemoryFormat": "object", - "timeToLiveSeconds": 3, - "evictionPolicy": "lru", - "evictionMaxSize": 3000, - "evictionSamplingCount": 4, - "evictionSamplingPoolSize": 8 - } - ] -} diff --git a/test/declarative_config/configurations/ssl-disabled-factory-set.json b/test/declarative_config/configurations/ssl-disabled-factory-set.json deleted file mode 100644 index 66b715c37..000000000 --- a/test/declarative_config/configurations/ssl-disabled-factory-set.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "network": { - "ssl": { - "enabled": false, - "sslOptions": null, - "factory": { - "path": "path/to/file", - "exportedName": "exportedName", - "properties": { - "userDefinedProperty1": "userDefinedValue" - } - } - } - } -} diff --git a/test/discovery/HazelcastCloudConfigTest.js b/test/discovery/HazelcastCloudConfigTest.js index ca4704665..7a7cb0ba6 100644 --- a/test/discovery/HazelcastCloudConfigTest.js +++ b/test/discovery/HazelcastCloudConfigTest.js @@ -13,33 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; +const expect = require('chai').expect; +const ClientConfigImpl = require('../../lib/config/Config').ClientConfigImpl; +const HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; -var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; -var ClientConfig = require('../../').Config.ClientConfig; - -describe('Hazelcast ClientCloudConfig Test', function () { +describe('HazelcastClientCloudConfigTest', function () { it('defaultCloudUrlEndpoint', function () { - var config = new ClientConfig(); - - var token = 'TOKEN'; - config.networkConfig.cloudConfig.discoveryToken = token; + const config = new ClientConfigImpl(); + const token = 'TOKEN'; + config.network.hazelcastCloud.discoveryToken = token; - var urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(config.properties, token); + const urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(config.properties, token); expect(urlEndpoint).to.be.equal('https://coordinator.hazelcast.cloud/cluster/discovery?token=TOKEN'); }); it('customCloudUrlEndpoint', function () { - var config = new ClientConfig(); - - var token = 'TOKEN'; - config.networkConfig.cloudConfig.discoveryToken = token; + const config = new ClientConfigImpl(); + const token = 'TOKEN'; + config.network.hazelcastCloud.discoveryToken = token; config.properties['hazelcast.client.cloud.url'] = 'https://custom'; - var urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(config.properties, token); + const urlEndpoint = HazelcastCloudDiscovery.createUrlEndpoint(config.properties, token); expect(urlEndpoint).to.be.equal('https://custom/cluster/discovery?token=TOKEN'); }); diff --git a/test/discovery/HazelcastCloudDiscoveryTest.js b/test/discovery/HazelcastCloudDiscoveryTest.js index 5c716add2..400b8d943 100644 --- a/test/discovery/HazelcastCloudDiscoveryTest.js +++ b/test/discovery/HazelcastCloudDiscoveryTest.js @@ -13,35 +13,39 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Address = require('../../lib/Address').Address; -var expect = require('chai').expect; -var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; +const expect = require('chai').expect; +const Address = require('../../lib/Address').Address; +const HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; -describe('HazelcastCloudDiscovery Test', function () { - var hazelcastCloudDiscovery = new HazelcastCloudDiscovery(); +describe('HazelcastCloudDiscoveryTest', function () { - it('parseResponse', function () { - var response = '[{"private-address":"100.96.5.1","public-address":"10.113.44.139:31115"},' + - '{"private-address":"100.96.4.2","public-address":"10.113.44.130:31115"}]'; + const hazelcastCloudDiscovery = new HazelcastCloudDiscovery(); + + it('should parse response', function () { + const response = '[{"private-address":"100.96.5.1","public-address":"10.113.44.139:31115"},' + + '{"private-address":"100.96.4.2","public-address":"10.113.44.130:31115"}]'; + + const privateToPublicAddresses = hazelcastCloudDiscovery.parseResponse(response); - var privateToPublicAddresses = hazelcastCloudDiscovery.parseResponse(response); expect(privateToPublicAddresses.size).to.equal(2); - expect(new Address('10.113.44.139', 31115)).to.deep.equal( - privateToPublicAddresses.get(new Address('100.96.5.1', 31115).toString())); - expect(new Address('10.113.44.130', 31115)).to.deep.equal( - privateToPublicAddresses.get(new Address('100.96.4.2', 31115).toString())); + expect(new Address('10.113.44.139', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.5.1', 31115).toString())); + expect(new Address('10.113.44.130', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.4.2', 31115).toString())); }); - it('parseResponse_withDifferentPortOnPrivateAddress', function () { - var response = '[{"private-address":"100.96.5.1:5701","public-address":"10.113.44.139:31115"},' + - '{"private-address":"100.96.4.2:5701","public-address":"10.113.44.130:31115"}]'; + it('should parse response with different port on private address', function () { + const response = '[{"private-address":"100.96.5.1:5701","public-address":"10.113.44.139:31115"},' + + '{"private-address":"100.96.4.2:5701","public-address":"10.113.44.130:31115"}]'; + + const privateToPublicAddresses = hazelcastCloudDiscovery.parseResponse(response); - var privateToPublicAddresses = hazelcastCloudDiscovery.parseResponse(response); expect(privateToPublicAddresses.size).to.equal(2); - expect(new Address('10.113.44.139', 31115)).to.deep.equal( - privateToPublicAddresses.get(new Address('100.96.5.1', 5701).toString())); - expect(new Address('10.113.44.130', 31115)).to.deep.equal( - privateToPublicAddresses.get(new Address('100.96.4.2', 5701).toString())); + expect(new Address('10.113.44.139', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.5.1', 5701).toString())); + expect(new Address('10.113.44.130', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.4.2', 5701).toString())); }); }); diff --git a/test/discovery/HazelcastCloudProviderTest.js b/test/discovery/HazelcastCloudProviderTest.js index 6342733df..14a3ff983 100644 --- a/test/discovery/HazelcastCloudProviderTest.js +++ b/test/discovery/HazelcastCloudProviderTest.js @@ -13,34 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; +const sinon = require('sinon'); +const expect = require('chai').expect; +const Promise = require('bluebird'); +const LogLevel = require('../../lib/').LogLevel; -var IllegalStateError = require('../../').HazelcastErrors.IllegalStateError; +const IllegalStateError = require('../../').HazelcastErrors.IllegalStateError; +const LoggingService = require('../../lib/logging/LoggingService').LoggingService; +const Address = require('../../lib/Address').Address; +const HazelcastCloudAddressProvider = require('../../lib/discovery/HazelcastCloudAddressProvider').HazelcastCloudAddressProvider; +const HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; -var Address = require('../../lib/Address').Address; -var sinon = require('sinon'); -var expect = require('chai').expect; -var LoggingService = require('../../lib/logging/LoggingService').LoggingService; -var Promise = require('bluebird'); -var LogLevel = require('../../lib/').LogLevel; +describe('HazelcastCloudProviderTest', function () { -var HazelcastCloudAddressProvider = require('../../lib/discovery/HazelcastCloudAddressProvider').HazelcastCloudAddressProvider; -var HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; - -describe('HazelcastCloudProvider Test', function () { - var expectedAddresses = new Map(); - var hazelcastCloudDiscovery; - var provider; + const expectedAddresses = new Map(); + let hazelcastCloudDiscovery; + let provider; before(function () { expectedAddresses.set('10.0.0.1:5701', new Address('198.51.100.1', 5701)); expectedAddresses.set('10.0.0.1:5702', new Address('198.51.100.1', 5702)); expectedAddresses.set('10.0.0.2:5701', new Address('198.51.100.2', 5701)); - }); beforeEach(() => { - var logger = new LoggingService(null, LogLevel.INFO).getLogger(); + const logger = new LoggingService(null, LogLevel.INFO).getLogger(); hazelcastCloudDiscovery = new HazelcastCloudDiscovery(); sinon.stub(HazelcastCloudDiscovery.prototype, 'discoverNodes').callsFake(() => Promise.resolve(expectedAddresses)); @@ -54,7 +53,6 @@ describe('HazelcastCloudProvider Test', function () { } }); - it('loadAddresses', function () { return provider.loadAddresses().then((res) => { return expect(res).to.have.length(3); @@ -94,7 +92,7 @@ describe('HazelcastCloudProvider Test', function () { }); it('translate_whenNotFound_thenReturnNull', function () { - var notAvailableAddress = new Address('127.0.0.3', 5701); + const notAvailableAddress = new Address('127.0.0.3', 5701); return provider.translate(notAvailableAddress).then((res) => { return expect(res).to.be.null; }); diff --git a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js index 36c6da213..da8bba213 100644 --- a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js +++ b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js @@ -13,62 +13,62 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; - -var chai = require('chai'); +const chai = require('chai'); chai.use(require('chai-as-promised')); -var expect = chai.expect; -var HazelcastClient = require('../../.').Client; -var Config = require('../../.').Config; -var Err = require('../../.').HazelcastErrors; -var Controller = require('./../RC'); -var Util = require('../Util'); +const expect = chai.expect; +const HazelcastClient = require('../../.').Client; +const Errors = require('../../.').HazelcastErrors; +const RC = require('./../RC'); +const Util = require('../Util'); describe("FlakeIdGeneratorOutOfRangeTest", function () { - var cluster; - var client; - var flakeIdGenerator; + let cluster, client; + let flakeIdGenerator; afterEach(function () { return flakeIdGenerator.destroy().then(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); }); function assignOverflowedNodeId(clusterId, instanceNum) { - var script = + const script = 'function assignOverflowedNodeId() {' + ' instance_' + instanceNum + '.getCluster().getLocalMember().setMemberListJoinVersion(100000);' + ' return instance_' + instanceNum + '.getCluster().getLocalMember().getMemberListJoinVersion();' + '}' + 'result=""+assignOverflowedNodeId();'; - return Controller.executeOnController(clusterId, script, 1); + return RC.executeOnController(clusterId, script, 1); } - for (var repeat = 0; repeat < 10; repeat++) { + for (let repeat = 0; repeat < 10; repeat++) { it('newId succeeds as long as there is one suitable member in the cluster (repeat: ' + repeat + '/10)', function () { this.timeout(30000); - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { return assignOverflowedNodeId(cluster.id, Util.getRandomInt(0, 2)); }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.networkConfig.smartRouting = false; - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + smartRouting: false + } + }); }).then(function (value) { client = value; return client.getFlakeIdGenerator('test'); }).then(function (idGenerator) { flakeIdGenerator = idGenerator; - var promise = Promise.resolve(); - for (var i = 0; i < 100; i++) { + let promise = Promise.resolve(); + for (let i = 0; i < 100; i++) { promise = promise.then(function () { return flakeIdGenerator.newId(); }); @@ -80,25 +80,25 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { it('throws NodeIdOutOfRangeError when there is no server with a join id smaller than 2^16', function () { this.timeout(20000); - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { return assignOverflowedNodeId(cluster.id, 0); }).then(function () { return assignOverflowedNodeId(cluster.id, 1); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id + }); }).then(function (cl) { client = cl; return client.getFlakeIdGenerator('test'); }).then(function (idGenerator) { flakeIdGenerator = idGenerator; - return expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(Err.HazelcastError); + return expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(Errors.HazelcastError); }); }); }); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index 453c73813..006b82016 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -13,39 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; - -var expect = require('chai').expect; -var HazelcastClient = require('../../.').Client; -var Controller = require('./../RC'); -var Config = require('../../.').Config; -var Util = require('./../Util'); -var Promise = require('bluebird'); -var Long = require('long'); +const expect = require('chai').expect; +const HazelcastClient = require('../../.').Client; +const RC = require('./../RC'); +const Util = require('./../Util'); +const Promise = require('bluebird'); +const Long = require('long'); describe("FlakeIdGeneratorProxyTest", function () { - var FLAKE_ID_STEP = 1 << 16; - var SHORT_TERM_BATCH_SIZE = 3; - var SHORT_TERM_VALIDITY_MILLIS = 3000; + const FLAKE_ID_STEP = 1 << 16; + const SHORT_TERM_BATCH_SIZE = 3; + const SHORT_TERM_VALIDITY_MILLIS = 3000; - var cluster; - var client; - var flakeIdGenerator; + let cluster, client; + let flakeIdGenerator; before(function () { - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var flakeConfig = new Config.FlakeIdGeneratorConfig(); - flakeConfig.prefetchValidityMillis = SHORT_TERM_VALIDITY_MILLIS; - flakeConfig.prefetchCount = SHORT_TERM_BATCH_SIZE; - flakeConfig.name = 'shortterm'; - cfg.flakeIdGeneratorConfigs['shortterm'] = flakeConfig; - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + flakeIdGenerators: { + 'shortterm': { + prefetchValidityMillis: SHORT_TERM_VALIDITY_MILLIS, + prefetchCount: SHORT_TERM_BATCH_SIZE + } + } + }).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -57,7 +56,7 @@ describe("FlakeIdGeneratorProxyTest", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); function addToListFunction(l) { @@ -76,9 +75,9 @@ describe("FlakeIdGeneratorProxyTest", function () { it('newId returns a unique long', function () { return client.getFlakeIdGenerator('test').then(function (idGenerator) { flakeIdGenerator = idGenerator; - var promise = Promise.resolve(); - var idList = []; - for (var i = 0; i < 10; i++) { + let promise = Promise.resolve(); + const idList = []; + for (let i = 0; i < 10; i++) { promise = promise.then(function () { return Promise.all([ flakeIdGenerator.newId().then(addToListFunction(idList)), @@ -94,16 +93,17 @@ describe("FlakeIdGeneratorProxyTest", function () { idList.sort(function (a, b) { return (a.greaterThan(b) ? 1 : (a.lessThan(b) ? -1 : 0)); }); - for (var i = 1; i < idList.length; i++) { + for (let i = 1; i < idList.length; i++) { expect(idList[i]).to.be.instanceOf(Long); - expect(idList[i - 1].equals(idList[i]), 'Expected ' + idList[i - 1] + ' ' + idList[i] + 'to be different.').to.be.false; + expect(idList[i - 1].equals(idList[i]), 'Expected ' + idList[i - 1] + ' ' + idList[i] + 'to be different.') + .to.be.false; } }); }); }); it('subsequent ids are from the same batch', function () { - var firstId; + let firstId; return client.getFlakeIdGenerator('test').then(function (idGenerator) { flakeIdGenerator = idGenerator; return flakeIdGenerator.newId() @@ -116,7 +116,7 @@ describe("FlakeIdGeneratorProxyTest", function () { }); it('ids are from new batch after validity period', function () { - var firstId; + let firstId; return client.getFlakeIdGenerator('shortterm').then(function (idGenerator) { flakeIdGenerator = idGenerator; return flakeIdGenerator.newId() @@ -126,13 +126,14 @@ describe("FlakeIdGeneratorProxyTest", function () { }).then(function () { return flakeIdGenerator.newId(); }).then(function (secondId) { - var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); - return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; + const borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); + return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId) + .to.be.true; }); }); it('ids are from new batch after prefetched ones are exhausted', function () { - var firstId; + let firstId; return client.getFlakeIdGenerator('shortterm').then(function (idGenerator) { flakeIdGenerator = idGenerator; return flakeIdGenerator.newId() @@ -140,16 +141,16 @@ describe("FlakeIdGeneratorProxyTest", function () { firstId = id; return flakeIdGenerator.newId(); }).then(function () { - //after this we exhausted the batch at hand + // after this we exhausted the batch at hand return flakeIdGenerator.newId(); }).then(function () { return Util.promiseWaitMilliseconds(100); }).then(function () { return flakeIdGenerator.newId(); }).then(function (secondId) { - var borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); - return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId).to.be.true; + const borderId = firstId.add(FLAKE_ID_STEP * SHORT_TERM_BATCH_SIZE); + return expect(secondId.greaterThan(borderId), 'Expected ' + secondId + ' to be greater than ' + borderId) + .to.be.true; }); - ; }); }); diff --git a/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js index bd68329c1..5a24e33b0 100644 --- a/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js +++ b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js @@ -13,31 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var Client = require('../../.').Client; -var Config = require('../../.').Config.ClientConfig; -var RC = require('./../RC'); -var HazelcastJsonValue = require('../../.').HazelcastJsonValue; -var JsonStringDeserializationPolicy = require('../../.').JsonStringDeserializationPolicy; +const expect = require('chai').expect; +const Client = require('../../.').Client; +const RC = require('./../RC'); +const HazelcastJsonValue = require('../../.').HazelcastJsonValue; +const JsonStringDeserializationPolicy = require('../../.').JsonStringDeserializationPolicy; describe('HazelcastJsonValue with HazelcastJsonValueSerializer', function () { - var cluster; - var client; - var map; - var object = { 'a': 1 }; - var hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); + + let cluster, client; + let map; + const object = { 'a': 1 }; + const hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); before(function () { return RC.createCluster().then(function (response) { cluster = response; return RC.startMember(cluster.id); }).then(function () { - var config = new Config(); - config.clusterName = cluster.id; - config.serializationConfig - .jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; - return Client.newHazelcastClient(config).then(function (hazelcastClient) { + return Client.newHazelcastClient({ + clusterName: cluster.id, + serialization: { + jsonStringDeserializationPolicy: JsonStringDeserializationPolicy.NO_DESERIALIZATION + } + }).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -79,16 +80,14 @@ describe('HazelcastJsonValue with HazelcastJsonValueSerializer', function () { }); it('storing invalid Json strings', function () { - var invalidString = '{a}'; - var hzJsonValueInvalid = new HazelcastJsonValue(invalidString); + const invalidString = '{a}'; + const hzJsonValueInvalid = new HazelcastJsonValue(invalidString); return map.put(1, hzJsonValueInvalid).then(function () { return map.get(1); }).then(function (value) { expect(value).to.be.an.instanceof(HazelcastJsonValue); expect(value).to.be.deep.equal(hzJsonValueInvalid); - expect(function () { - JSON.parse(value.toString()) - }).to.throw(SyntaxError); + expect(() => JSON.parse(value.toString())).to.throw(SyntaxError); }); }); }); diff --git a/test/hazelcast_json_value/HJVJsonSerializerTest.js b/test/hazelcast_json_value/HJVJsonSerializerTest.js index d9841cd3f..67fc3dbcb 100644 --- a/test/hazelcast_json_value/HJVJsonSerializerTest.js +++ b/test/hazelcast_json_value/HJVJsonSerializerTest.js @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); +const chai = require('chai'); chai.use(require('chai-as-promised')); -var expect = require('chai').expect; -var Client = require('../../.').Client; -const Config = require('../../.').Config; -var RC = require('./../RC'); -var HazelcastJsonValue = require('../../.').HazelcastJsonValue; +const expect = require('chai').expect; +const Client = require('../../.').Client; +const RC = require('./../RC'); +const HazelcastJsonValue = require('../../.').HazelcastJsonValue; describe('HazelcastJsonValue with JsonSerializer', function () { - var cluster; - var client; - var map; - var object = { 'a': 1 }; - var hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); + + let cluster, client; + let map; + const object = { 'a': 1 }; + const hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); before(function () { return RC.createCluster().then(function (response) { cluster = response; return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg).then(function (hazelcastClient) { + return Client.newHazelcastClient({ + clusterName: cluster.id + }).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -74,7 +74,7 @@ describe('HazelcastJsonValue with JsonSerializer', function () { }); it('storing invalid Json strings', function () { - var invalidString = '{a}'; + const invalidString = '{a}'; return map.put(1, new HazelcastJsonValue(invalidString)).then(function () { return expect(map.get(1)).to.be.rejectedWith(SyntaxError); }); diff --git a/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js index bad7e1cf4..3ebe25c82 100644 --- a/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js +++ b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); +const chai = require('chai'); chai.use(require('chai-as-promised')); -var expect = require('chai').expect; -var Client = require('../../.').Client; -const Config = require('../../.').Config; -var RC = require('./../RC'); -var Predicates = require('../../.').Predicates; -var HazelcastJsonValue = require('../../.').HazelcastJsonValue; +const expect = require('chai').expect; +const Client = require('../../.').Client; +const RC = require('./../RC'); +const Predicates = require('../../.').Predicates; +const HazelcastJsonValue = require('../../.').HazelcastJsonValue; describe('HazelcastJsonValue query test', function () { - var cluster; - var client; - var map; - var object = { 'a': 1 }; + + let cluster, client; + let map; + const object = { 'a': 1 }; before(function () { return RC.createCluster().then(function (response) { cluster = response; return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg).then(function (hazelcastClient) { + return Client.newHazelcastClient({ + clusterName: cluster.id + }).then(function (hazelcastClient) { client = hazelcastClient; }); }); @@ -61,7 +61,7 @@ describe('HazelcastJsonValue query test', function () { }); it('querying over JavaScript objects', function () { - var objects = [ + const objects = [ [0, {'a': 1}], [1, {'a': 3}] ]; @@ -73,7 +73,7 @@ describe('HazelcastJsonValue query test', function () { }); it('querying over nested attributes', function () { - var objects = [ + const objects = [ [0, {'a': 1, 'b': {'c': 1}}], [1, {'a': 3, 'b': {'c': 3}}] ]; @@ -85,7 +85,7 @@ describe('HazelcastJsonValue query test', function () { }); it('querying over keys', function () { - var hzJsonValue2 = new HazelcastJsonValue('{ "a": 3 }'); + const hzJsonValue2 = new HazelcastJsonValue('{ "a": 3 }'); return map.put(object, 1).then(function () { return map.put(hzJsonValue2, 2); }).then(function () { @@ -96,8 +96,8 @@ describe('HazelcastJsonValue query test', function () { }); it('querying nested attributes over keys', function () { - var object1 = {'a': 1, 'b': {'c': 1}}; - var object2 = {'a': 1, 'b': {'c': 3}}; + const object1 = {'a': 1, 'b': {'c': 1}}; + const object2 = {'a': 1, 'b': {'c': 3}}; return map.put(object1, 1).then(function () { return map.put(object2, 2); }).then(function () { diff --git a/test/hazelcast_json_value/HazelcastJsonValueTest.js b/test/hazelcast_json_value/HazelcastJsonValueTest.js index c94e8dfcb..e3475c908 100644 --- a/test/hazelcast_json_value/HazelcastJsonValueTest.js +++ b/test/hazelcast_json_value/HazelcastJsonValueTest.js @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var assert = require('assert'); -var HazelcastJsonValue = require('../../.').HazelcastJsonValue; +const expect = require('chai').expect; +const assert = require('assert'); +const HazelcastJsonValue = require('../../.').HazelcastJsonValue; describe('HazelcastJsonValue', function () { it('constructing HazelcastJsonValue with null or undefined', function () { diff --git a/test/heartbeat/HeartbeatFromClientTest.js b/test/heartbeat/HeartbeatFromClientTest.js index 2e0b5331a..c9d98de4b 100644 --- a/test/heartbeat/HeartbeatFromClientTest.js +++ b/test/heartbeat/HeartbeatFromClientTest.js @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var RC = require('../RC'); -var HazelcastClient = require('../../').Client; -var expect = require('chai').expect; -var Config = require('../../').Config; -var Util = require('../Util'); -var fs = require('fs'); +const RC = require('../RC'); +const HazelcastClient = require('../../').Client; +const expect = require('chai').expect; +const Util = require('../Util'); +const fs = require('fs'); describe('Heartbeat', function () { - this.timeout(30000); - var cluster; + this.timeout(30000); + let cluster; beforeEach(function () { - var serverConfig = fs.readFileSync(__dirname + '/short-heartbeat.xml', 'utf8'); + const serverConfig = fs.readFileSync(__dirname + '/short-heartbeat.xml', 'utf8'); return RC.createCluster(null, serverConfig).then(function (resp) { cluster = resp; }); @@ -38,21 +38,21 @@ describe('Heartbeat', function () { }); it('client sends heartbeat periodically even when server continuously pushes messages', function () { - var MAP_NAME = 'testmap'; - var member; - var client1; - var client2; - var connectionClosedEventCount = 0; + const MAP_NAME = 'testmap'; + let client1, client2; + let connectionClosedEventCount = 0; - var mapFromClient1; - var mapFromClient2; - var pushTask; + let mapFromClient1; + let mapFromClient2; + let pushTask; - var clientConfig = new Config.ClientConfig(); - clientConfig.clusterName = cluster.id; - clientConfig.properties['hazelcast.client.heartbeat.interval'] = 1000; + const clientConfig = { + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 1000 + } + }; return RC.startMember(cluster.id).then(function (m) { - member = m; return HazelcastClient.newHazelcastClient(clientConfig); }).then(function (c) { client1 = c; @@ -67,21 +67,21 @@ describe('Heartbeat', function () { mapFromClient1 = m; return mapFromClient1.addEntryListener({ added: function () { - //no-op + // no-op }, updated: function () { - //no-op + // no-op } }) }).then(function () { return client2.getMap(MAP_NAME); }).then(function (m) { - var counter = 0; + let counter = 0; mapFromClient2 = m; pushTask = setInterval(function () { mapFromClient2.put('testkey', counter++); }, 1000); - return Util.promiseLater(15000, function () {}); + return Util.promiseLater(15000, () => {}); }).then(function () { clearInterval(pushTask); expect(connectionClosedEventCount).to.equal(0); diff --git a/test/heartbeat/HeartbeatFromServerTest.js b/test/heartbeat/HeartbeatFromServerTest.js index 5ca39a061..4d10fe6c3 100644 --- a/test/heartbeat/HeartbeatFromServerTest.js +++ b/test/heartbeat/HeartbeatFromServerTest.js @@ -13,19 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var RC = require('../RC'); -var HazelcastClient = require('../../').Client; -var Config = require('../../').Config; -var Util = require('../Util'); -var DeferredPromise = require('../../lib/Util').DeferredPromise; -var Address = require('../../').Address; -var TargetDisconnectedError = require('../../lib/HazelcastError').TargetDisconnectedError; +const RC = require('../RC'); +const HazelcastClient = require('../../').Client; +const Util = require('../Util'); +const DeferredPromise = require('../../lib/Util').DeferredPromise; +const Address = require('../../').Address; +const TargetDisconnectedError = require('../../lib/HazelcastError').TargetDisconnectedError; describe('Heartbeat', function () { + this.timeout(50000); + let cluster; - var cluster; + function simulateHeartbeatLost(client, address, timeout) { + const connection = client.connectionManager.getConnectionFromAddress(address); + connection.lastReadTimeMillis = connection.getLastReadTimeMillis() - timeout; + } + + function warmUpConnectionToAddressWithRetry(client, address, retryCount) { + return client.connectionManager.getOrConnect(address).then(function (conn) { + if (conn != null) { + return conn; + } else if (conn == null && retryCount > 0) { + return Util.promiseWaitMilliseconds(300).then(function () { + return warmUpConnectionToAddressWithRetry(client, address, retryCount - 1); + }); + } else { + throw new Error('Could not warm up connection to ' + address); + } + }); + } beforeEach(function () { return RC.createCluster(null, null).then(function (resp) { @@ -38,20 +57,22 @@ describe('Heartbeat', function () { }); it('connectionRemoved fired when second member stops heartbeating', function (done) { - var client; - var memberAddedPromise = new DeferredPromise(); + let client; + const memberAddedPromise = new DeferredPromise(); RC.startMember(cluster.id).then(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 500; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 500, + 'hazelcast.client.heartbeat.timeout': 2000 + } + }); }).then(function (resp) { client = resp; }).then(function () { - var membershipListener = { + const membershipListener = { memberAdded: function (membershipEvent) { - var address = new Address(membershipEvent.member.address.host, membershipEvent.member.address.port); + const address = new Address(membershipEvent.member.address.host, membershipEvent.member.address.port); warmUpConnectionToAddressWithRetry(client, address); memberAddedPromise.resolve(); } @@ -62,10 +83,10 @@ describe('Heartbeat', function () { return RC.startMember(cluster.id); }).then(function (member2) { client.getConnectionManager().once('connectionRemoved', function (connection) { - var remoteAddress = connection.getRemoteAddress(); + const remoteAddress = connection.getRemoteAddress(); if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { if (connection.closedReason === 'Heartbeat timed out' - && connection.closedCause instanceof TargetDisconnectedError) { + && connection.closedCause instanceof TargetDisconnectedError) { done(); client.shutdown(); } else { @@ -74,32 +95,31 @@ describe('Heartbeat', function () { } } else { done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is removed instead of ' - + member2.host + ':' + member2.port)) + + member2.host + ':' + member2.port)); } }); - return memberAddedPromise.promise.then(function () { simulateHeartbeatLost(client, new Address(member2.host, member2.port), 2000); - }) + }); }).catch(done); }); it('connectionAdded fired when second member comes back', function (done) { - var client; - var member1; - var member2; - var memberAddedPromise = new DeferredPromise(); + let client; + let member2; + const memberAddedPromise = new DeferredPromise(); RC.startMember(cluster.id).then(function (m) { - member1 = m; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.heartbeat.interval'] = 500; - cfg.properties['hazelcast.client.heartbeat.timeout'] = 2000; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 500, + 'hazelcast.client.heartbeat.timeout': 2000 + } + }); }).then(function (resp) { client = resp; - var membershipListener = { + const membershipListener = { memberAdded: function (membershipEvent) { memberAddedPromise.resolve(); } @@ -114,7 +134,7 @@ describe('Heartbeat', function () { return warmUpConnectionToAddressWithRetry(client, new Address(member2.host, member2.port), 3); }).then(() => { client.getConnectionManager().once('connectionRemoved', function (connection) { - var remoteAddress = connection.getRemoteAddress(); + const remoteAddress = connection.getRemoteAddress(); if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { if (!(connection.closedReason === 'Heartbeat timed out' || connection.closedCause instanceof TargetDisconnectedError)) { @@ -123,39 +143,20 @@ describe('Heartbeat', function () { } } else { done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is removed instead of ' - + member2.host + ':' + member2.port)) + + member2.host + ':' + member2.port)); } }); client.getConnectionManager().once('connectionAdded', function (connection) { - var remoteAddress = connection.getRemoteAddress(); + const remoteAddress = connection.getRemoteAddress(); if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { done(); client.shutdown(); } else { done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is added instead of ' - + member2.host + ':' + member2.port)) + + member2.host + ':' + member2.port)); } }); simulateHeartbeatLost(client, new Address(member2.host, member2.port), 2000); }).catch(done); }); - - function simulateHeartbeatLost(client, address, timeout) { - var connection = client.connectionManager.getConnectionFromAddress(address); - connection.lastReadTimeMillis = connection.getLastReadTimeMillis() - timeout; - } - - function warmUpConnectionToAddressWithRetry(client, address, retryCount) { - return client.connectionManager.getOrConnect(address).then(function (conn) { - if (conn != null) { - return conn; - } else if (conn == null && retryCount > 0) { - return Util.promiseWaitMilliseconds(300).then(function () { - return warmUpConnectionToAddressWithRetry(client, address, retryCount - 1); - }); - } else { - throw new Error('Could not warm up connection to ' + address); - } - }); - } }); diff --git a/test/integration/ClientLabelTest.js b/test/integration/ClientLabelTest.js index 9b64c6091..b16526fd3 100644 --- a/test/integration/ClientLabelTest.js +++ b/test/integration/ClientLabelTest.js @@ -18,15 +18,12 @@ const expect = require('chai').expect; const Client = require('../../.').Client; -const Config = require('../../.').Config; const Controller = require('../RC'); describe('ClientLabelTest', function () { this.timeout(32000); - - let cluster; - let client; + let cluster, client; before(function () { return Controller.createCluster(null, null) @@ -44,26 +41,21 @@ describe('ClientLabelTest', function () { return Controller.terminateCluster(cluster.id); }); - it('labels should be received on member side', function () { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - config.labels.add("testLabel"); - - return Client.newHazelcastClient(config) - .then((c) => { - client = c; - - const script = 'var client = instance_0.getClientService().getConnectedClients().iterator().next();\n' + - 'result = client.getLabels().iterator().next();\n'; - - return Controller.executeOnController(cluster.id, script, 1); - }) - .then((res) => { - expect(res.result).to.not.be.null; - - expect(res.result.toString()).to.equal('testLabel'); - }); + return Client.newHazelcastClient({ + clusterName: cluster.id, + clientLabels: ['testLabel'] + }).then((c) => { + client = c; + + const script = 'var client = instance_0.getClientService().getConnectedClients().iterator().next();\n' + + 'result = client.getLabels().iterator().next();\n'; + + return Controller.executeOnController(cluster.id, script, 1); + }).then((res) => { + expect(res.result).to.not.be.null; + expect(res.result.toString()).to.equal('testLabel'); + }); }); }); diff --git a/test/integration/ConnectionStrategyTest.js b/test/integration/ConnectionStrategyTest.js index 96176bd7b..d6fcca895 100644 --- a/test/integration/ConnectionStrategyTest.js +++ b/test/integration/ConnectionStrategyTest.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; const chai = require('chai'); @@ -22,8 +21,7 @@ chai.use(chaiAsPromised); const expect = require('chai').expect; const Client = require('../../.').Client; -const Config = require('../../.').Config; -const Controller = require('../RC'); +const RC = require('../RC'); const TestUtil = require('../Util'); const Errors = require('../../.').HazelcastErrors; const Util = require('../../lib/Util'); @@ -33,75 +31,72 @@ const LifecycleState = require('../../lib/LifecycleService').LifecycleState; describe('ConnectionStrategyTest', function () { this.timeout(32000); + let cluster, client; - let cluster; - let client; - - - beforeEach(function () { + beforeEach(() => { client = null; cluster = null; }); - afterEach(function () { + afterEach(() => { if (client != null) { client.shutdown(); } - if (cluster != null) { - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); } }); it('client with async start throws when there is no cluster', function () { - const config = new Config.ClientConfig(); - config.connectionStrategyConfig.asyncStart = true; - - return Client.newHazelcastClient(config) - .then((c) => { - client = c; - return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); - }); + return Client.newHazelcastClient({ + connectionStrategy: { + asyncStart: true + } + }).then((c) => { + client = c; + return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); + }); }); it('client with async start throws after shutdown when there is no cluster', function () { - const config = new Config.ClientConfig(); - config.connectionStrategyConfig.asyncStart = true; - - return Client.newHazelcastClient(config) - .then((c) => { - client = c; - client.shutdown(); - return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientNotActiveError); - }) + return Client.newHazelcastClient({ + connectionStrategy: { + asyncStart: true + } + }).then((c) => { + client = c; + client.shutdown(); + return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientNotActiveError); + }) }); it('client with async start connects to cluster', function () { - const config = new Config.ClientConfig(); - - config.networkConfig.addresses.push('localhost:5701'); - + const config = { + network: { + clusterMembers: ['localhost:5701'] + }, + lifecycleListeners: [], + connectionStrategy: { + asyncStart: true + } + }; const connected = Util.DeferredPromise(); - config.listeners.addLifecycleListener((state) => { + config.lifecycleListeners.push((state) => { if (state === LifecycleState.CONNECTED) { connected.resolve(); } }); - config.connectionStrategyConfig.asyncStart = true; - - return Controller.createCluster(null, null) + return RC.createCluster(null, null) .then((c) => { - cluster = c; - config.clusterName = cluster.id; - - return Client.newHazelcastClient(config); + cluster = c; + config.clusterName = cluster.id; + return Client.newHazelcastClient(config); }) .then((c) => { - client = c; - + client = c; expect(client.getLifecycleService().isRunning()).to.be.true; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then(() => { return connected.promise; @@ -112,26 +107,28 @@ describe('ConnectionStrategyTest', function () { }); it('client with OFF reconnect mode does not reconnect when the member dies and another starts', function () { - const config = new Config.ClientConfig(); - - config.connectionStrategyConfig.reconnectMode = ReconnectMode.OFF; - config.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = Number.MAX_SAFE_INTEGER; - + const config = { + lifecycleListeners: [], + connectionStrategy: { + reconnectMode: ReconnectMode.OFF, + connectionRetry: { + clusterConnectTimeoutMillis: Number.MAX_SAFE_INTEGER + } + } + }; const shutdown = Util.DeferredPromise(); - config.listeners.addLifecycleListener((state) => { + config.lifecycleListeners.push((state) => { if (state === LifecycleState.SHUTDOWN) { shutdown.resolve(); } }); - let map; - let member; - - return Controller.createCluster(null, null) + let map, member; + return RC.createCluster(null, null) .then((c) => { cluster = c; config.clusterName = cluster.id; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then((m) => { member = m; @@ -147,41 +144,43 @@ describe('ConnectionStrategyTest', function () { return map.put(1, 5); }) .then(() => { - return Controller.shutdownMember(cluster.id, member.uuid); + return RC.shutdownMember(cluster.id, member.uuid); }) .then(() => { - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then(() => { return shutdown.promise; }) .then(() => { return expect(map.put(1, 5)).to.be.rejectedWith(Errors.ClientNotActiveError); - }) + }); }); it('client with ASYNC reconnect mode reconnects when the member dies and another starts ', function () { - const config = new Config.ClientConfig(); - - config.connectionStrategyConfig.reconnectMode = ReconnectMode.ASYNC; - config.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = Number.MAX_SAFE_INTEGER; - + const config = { + lifecycleListeners: [], + connectionStrategy: { + reconnectMode: ReconnectMode.ASYNC, + connectionRetry: { + clusterConnectTimeoutMillis: Number.MAX_SAFE_INTEGER + } + } + }; const disconnected = Util.DeferredPromise(); const reconnected = Util.DeferredPromise(); - config.listeners.addLifecycleListener((state) => { + config.lifecycleListeners.push((state) => { if (state === LifecycleState.DISCONNECTED) { disconnected.resolve(); } }); - let member; - let map; - - return Controller.createCluster(null, null) + let member, map; + return RC.createCluster(null, null) .then((c) => { cluster = c; config.clusterName = cluster.id; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then((m) => { member = m; @@ -193,12 +192,11 @@ describe('ConnectionStrategyTest', function () { }) .then((m) => { map = m; - // No exception at this point return map.put(1, 5); }) .then(() => { - return Controller.shutdownMember(cluster.id, member.uuid); + return RC.shutdownMember(cluster.id, member.uuid); }) .then(() => { return disconnected.promise; @@ -212,28 +210,26 @@ describe('ConnectionStrategyTest', function () { reconnected.resolve(); } }); - - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then((m) => { return reconnected.promise; }) .then(() => { expect(client.getLifecycleService().isRunning()).to.be.true; - return map.put(1, 2); }) }); it('client with async start should should reject get partition specific proxy calls when there is no cluster', function () { - const config = new Config.ClientConfig(); - config.connectionStrategyConfig.asyncStart = true; - - return Client.newHazelcastClient(config) - .then((c) => { - client = c; - return expect(client.getList(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); - }); + return Client.newHazelcastClient({ + connectionStrategy: { + asyncStart: true + } + }).then((c) => { + client = c; + return expect(client.getList(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); + }); }); }); diff --git a/test/integration/DistributedObjectsTest.js b/test/integration/DistributedObjectsTest.js index bb596a6be..1303a89b8 100644 --- a/test/integration/DistributedObjectsTest.js +++ b/test/integration/DistributedObjectsTest.js @@ -22,16 +22,13 @@ chai.use(chaiAsPromised); const expect = require('chai').expect; const Client = require('../../.').Client; -const Config = require('../../.').Config; const Controller = require('../RC'); const Util = require('../Util'); describe('DistributedObjectsTest', function () { this.timeout(32000); - - let cluster; - let client; + let cluster, client; const toNamespace = (distributedObjects) => { return distributedObjects.map((distObj) => distObj.getServiceName() + distObj.getName()); @@ -44,9 +41,9 @@ describe('DistributedObjectsTest', function () { return Controller.startMember(cluster.id); }) .then(() => { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return Client.newHazelcastClient(config); + return Client.newHazelcastClient({ + clusterName: cluster.id + }); }) .then((c) => { client = c; @@ -110,11 +107,7 @@ describe('DistributedObjectsTest', function () { }) .then((objects) => { expect(objects).to.have.deep.members([map, set, queue]); - - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - - return Client.newHazelcastClient(config); + return Client.newHazelcastClient({ clusterName: cluster.id }); }) .then((c) => { otherClient = c; @@ -137,10 +130,7 @@ describe('DistributedObjectsTest', function () { let map, set, queue; let otherClient; - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - - return Client.newHazelcastClient(config) + return Client.newHazelcastClient({ clusterName: cluster.id }) .then((c) => { otherClient = c; return client.getMap(Util.randomString()) diff --git a/test/integration/InitialMembershipListenerTest.js b/test/integration/InitialMembershipListenerTest.js index ba845ee2a..f7916a631 100644 --- a/test/integration/InitialMembershipListenerTest.js +++ b/test/integration/InitialMembershipListenerTest.js @@ -22,7 +22,6 @@ chai.use(chaiAsPromised); const expect = require('chai').expect; const Client = require('../../.').Client; -const Config = require('../../.').Config; const Controller = require('../RC'); const Util = require('../../lib/Util'); @@ -54,21 +53,22 @@ describe('InitialMembershipListenerTest', function () { }); it('receives available member when added before client start', function (done) { - const config = new Config.ClientConfig(); - const membershipListener = { - init: (event) => { - const members = event.members; - expect(members).to.have.lengthOf(1); - const member = members[0]; - expect(member.address.host).to.equal(initialMember.host); - expect(member.address.port).to.equal(initialMember.port); - done(); - } + const config = { + clusterName: cluster.id, + membershipListeners: [ + { + init: (event) => { + const members = event.members; + expect(members).to.have.lengthOf(1); + const member = members[0]; + expect(member.address.host).to.equal(initialMember.host); + expect(member.address.port).to.equal(initialMember.port); + done(); + } + } + ] }; - config.clusterName = cluster.id; - config.listeners.addMembershipListener(membershipListener); - Client.newHazelcastClient(config) .then((c) => { client = c; @@ -76,7 +76,6 @@ describe('InitialMembershipListenerTest', function () { }); it('receives available member when added after client start', function (done) { - const config = new Config.ClientConfig(); const membershipListener = { init: (event) => { const members = event.members; @@ -88,20 +87,17 @@ describe('InitialMembershipListenerTest', function () { } }; - config.clusterName = cluster.id; - Client.newHazelcastClient(config) + Client.newHazelcastClient({ clusterName: cluster.id }) .then((c) => { client = c; - client.getClusterService().addMembershipListener(membershipListener); }); }); it('receives events after initial event', function (done) { let newMember; - let newMemberResolved = Util.DeferredPromise(); + const newMemberResolved = Util.DeferredPromise(); - const config = new Config.ClientConfig(); const membershipListener = { init: (event) => { const members = event.members; @@ -123,14 +119,14 @@ describe('InitialMembershipListenerTest', function () { }); } }; - - config.clusterName = cluster.id; - config.listeners.addMembershipListener(membershipListener); + const config = { + clusterName: cluster.id, + membershipListeners: [membershipListener] + }; Client.newHazelcastClient(config) .then((c) => { client = c; - return Controller.startMember(cluster.id); }) .then((m) => { diff --git a/test/javaclasses/CustomComparator.js b/test/javaclasses/CustomComparator.js index 3ac1140f9..9eb02c6c7 100644 --- a/test/javaclasses/CustomComparator.js +++ b/test/javaclasses/CustomComparator.js @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var IterationType = require('../../lib/').IterationType; +const IterationType = require('../../lib/').IterationType; /** - * * @param type * 0 -> lexicographical order * 1 -> reverse lexicographical @@ -48,8 +48,8 @@ CustomComparator.prototype.readData = function (inp) { }; CustomComparator.prototype.sort = function (e1, e2) { - var str1; - var str2; + let str1; + let str2; switch (this.iterationType) { case IterationType.KEY: str1 = e1[0].toString(); diff --git a/test/javaclasses/IdentifiedFactory.js b/test/javaclasses/IdentifiedFactory.js index cb55b9ae8..b37630c65 100644 --- a/test/javaclasses/IdentifiedFactory.js +++ b/test/javaclasses/IdentifiedFactory.js @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var IdentifiedEntryProcessor = require('./IdentifiedEntryProcessor'); -var DistortInvalidationMetadataEntryProcessor = require('./DistortInvalidationMetadataEntryProcessor'); -var CustomComparator = require('./CustomComparator'); -var PrefixFilter = require('./PrefixFilter'); +const IdentifiedEntryProcessor = require('./IdentifiedEntryProcessor'); +const DistortInvalidationMetadataEntryProcessor = require('./DistortInvalidationMetadataEntryProcessor'); +const CustomComparator = require('./CustomComparator'); +const PrefixFilter = require('./PrefixFilter'); function IdentifiedFactory() { } diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index 3b67f7b95..1469cca9e 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -13,37 +13,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; -var Config = require("../../lib/index.js").Config; -var Controller = require('./../RC'); -var ItemEventType = require('../../lib/core/ItemListener').ItemEventType; +const expect = require('chai').expect; +const RC = require('./../RC'); +const Client = require('../..').Client; +const ItemEventType = require('../..').ItemEventType; -describe("List Proxy", function () { +describe('ListProxyTest', function () { - var cluster; - var client; - var listInstance; + let cluster; + let client; + let listInstance; before(function () { this.timeout(10000); - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { - client = hazelcastClient; - }); + return Client.newHazelcastClient({ clusterName: cluster.id }) + .then(function (hazelcastClient) { + client = hazelcastClient; + }); }); }); beforeEach(function () { return client.getList('test').then(function (list) { listInstance = list; - }) + }); }); afterEach(function () { @@ -52,11 +51,10 @@ describe("List Proxy", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - - it("appends one item", function () { + it('appends one item', function () { return listInstance.add(1).then(function () { return listInstance.size(); }).then(function (size) { @@ -64,7 +62,7 @@ describe("List Proxy", function () { }); }); - it("inserts one item at index", function () { + it('inserts one item at index', function () { return listInstance.addAll([1, 2, 3]).then(function () { return listInstance.addAt(1, 5); }).then(function () { @@ -74,7 +72,7 @@ describe("List Proxy", function () { }); }); - it("clears", function () { + it('clears', function () { return listInstance.addAll([1, 2, 3]).then(function () { return listInstance.clear(); }).then(function () { @@ -84,8 +82,7 @@ describe("List Proxy", function () { }); }); - - it("inserts all elements of array at index", function () { + it('inserts all elements of array at index', function () { return listInstance.addAll([1, 2, 3]).then(function () { return listInstance.addAllAt(1, [5, 6]); }).then(function () { @@ -95,9 +92,8 @@ describe("List Proxy", function () { }); }); - - it("gets item at index", function () { - var input = [1, 2, 3]; + it('gets item at index', function () { + const input = [1, 2, 3]; return listInstance.addAll(input).then(function () { return listInstance.get(1); }).then(function (result) { @@ -105,8 +101,8 @@ describe("List Proxy", function () { }); }); - it("removes item at index", function () { - var input = [1, 2, 3]; + it('removes item at index', function () { + const input = [1, 2, 3]; return listInstance.addAll(input).then(function () { return listInstance.removeAt(1); }).then(function (removed) { @@ -117,8 +113,8 @@ describe("List Proxy", function () { }); }); - it("replaces item at index", function () { - var input = [1, 2, 3]; + it('replaces item at index', function () { + const input = [1, 2, 3]; return listInstance.addAll(input).then(function () { return listInstance.set(1, 6); }).then(function (replaced) { @@ -129,9 +125,8 @@ describe("List Proxy", function () { }); }); - - it("contains", function () { - var input = [1, 2, 3]; + it('contains', function () { + const input = [1, 2, 3]; return listInstance.addAll(input).then(function () { return listInstance.contains(1); }).then(function (contains) { @@ -139,8 +134,8 @@ describe("List Proxy", function () { }); }); - it("does not contain", function () { - var input = [1, 2, 3]; + it('does not contain', function () { + const input = [1, 2, 3]; return listInstance.addAll(input).then(function () { return listInstance.contains(5); }).then(function (contains) { @@ -148,7 +143,7 @@ describe("List Proxy", function () { }); }); - it("contains all", function () { + it('contains all', function () { return listInstance.addAll([1, 2, 3]).then(function () { return listInstance.containsAll([1, 2]); }).then(function (contains) { @@ -156,7 +151,7 @@ describe("List Proxy", function () { }); }); - it("does not contain all", function () { + it('does not contain all', function () { return listInstance.addAll([1, 2, 3]).then(function () { return listInstance.containsAll([3, 4]); }).then(function (contains) { @@ -164,14 +159,13 @@ describe("List Proxy", function () { }); }); - it("is empty", function () { + it('is empty', function () { return listInstance.isEmpty().then(function (empty) { expect(empty).to.be.true; }); }); - - it("is not empty", function () { + it('is not empty', function () { return listInstance.add(1).then(function (empty) { return listInstance.isEmpty(); }).then(function (empty) { @@ -179,8 +173,7 @@ describe("List Proxy", function () { }); }); - - it("removes an entry", function () { + it('removes an entry', function () { return listInstance.addAll([1, 2, 3]).then(function () { return listInstance.remove(1) }).then(function () { @@ -190,7 +183,7 @@ describe("List Proxy", function () { }); }); - it("removes an entry by index", function () { + it('removes an entry by index', function () { return listInstance.addAll([1, 2, 3]).then(function () { return listInstance.removeAt(1) }).then(function () { @@ -200,7 +193,7 @@ describe("List Proxy", function () { }); }); - it("removes multiple entries", function () { + it('removes multiple entries', function () { return listInstance.addAll([1, 2, 3, 4]).then(function () { return listInstance.removeAll([1, 2]); }).then(function () { @@ -210,7 +203,7 @@ describe("List Proxy", function () { }); }); - it("retains multiple entries", function () { + it('retains multiple entries', function () { return listInstance.addAll([1, 2, 3, 4]).then(function () { return listInstance.retainAll([1, 2]); }).then(function () { @@ -220,7 +213,7 @@ describe("List Proxy", function () { }); }); - it("finds index of the element", function () { + it('finds index of the element', function () { return listInstance.addAll([1, 2, 4, 4]).then(function () { return listInstance.indexOf(4); }).then(function (index) { @@ -228,7 +221,7 @@ describe("List Proxy", function () { }); }); - it("finds last index of the element", function () { + it('finds last index of the element', function () { return listInstance.addAll([1, 2, 4, 4]).then(function () { return listInstance.lastIndexOf(4); }).then(function (index) { @@ -236,7 +229,7 @@ describe("List Proxy", function () { }); }); - it("returns a sub list", function () { + it('returns a sub list', function () { return listInstance.addAll([1, 2, 3, 4, 5, 6]).then(function () { return listInstance.subList(1, 5); }).then(function (subList) { @@ -244,9 +237,9 @@ describe("List Proxy", function () { }); }); - it("listens for added entry", function (done) { + it('listens for added entry', function (done) { this.timeout(5000); - var listener = { + const listener = { itemAdded: function (itemEvent) { expect(itemEvent.name).to.be.equal('test'); expect(itemEvent.item).to.be.equal(1); @@ -259,13 +252,13 @@ describe("List Proxy", function () { listInstance.add(1); }).catch(function (e) { done(e); - }) + }); }); - it("listens for added and removed entry", function (done) { + it('listens for added and removed entry', function (done) { this.timeout(5000); - var added = false; - var listener = { + let added = false; + const listener = { itemAdded: function (itemEvent) { expect(itemEvent.name).to.be.equal('test'); expect(itemEvent.item).to.be.equal(2); @@ -288,12 +281,12 @@ describe("List Proxy", function () { return listInstance.remove(2); }).catch(function (e) { done(e); - }) + }); }); - it("listens for removed entry with value included", function (done) { + it('listens for removed entry with value included', function (done) { this.timeout(5000); - var listener = { + const listener = { itemRemoved: function (itemEvent) { expect(itemEvent.name).to.be.equal('test'); expect(itemEvent.item).to.be.equal(1); @@ -308,12 +301,12 @@ describe("List Proxy", function () { return listInstance.remove(1); }).catch(function (e) { done(e); - }) + }); }); - it("listens for removed entry with value not included", function (done) { + it('listens for removed entry with value not included', function (done) { this.timeout(5000); - var listener = { + const listener = { itemRemoved: function (itemEvent) { expect(itemEvent.name).to.be.equal('test'); expect(itemEvent.item).to.be.equal(null); @@ -328,25 +321,22 @@ describe("List Proxy", function () { return listInstance.remove(1); }).catch(function (e) { done(e); - }) + }); }); - - it("remove entry listener", function () { + it('remove entry listener', function () { this.timeout(5000); return listInstance.addItemListener({ - itemRemoved: function (itemEvent) { expect(itemEvent.name).to.be.equal('test'); expect(itemEvent.item).to.be.equal(1); expect(itemEvent.eventType).to.be.equal(ItemEventType.REMOVED); expect(itemEvent.member).to.not.be.equal(null); - done(); } }).then(function (registrationId) { return listInstance.removeItemListener(registrationId); }).then(function (removed) { expect(removed).to.be.true; - }) + }); }); }); diff --git a/test/map/MapAggregatorsDoubleTest.js b/test/map/MapAggregatorsDoubleTest.js index 602c2babb..66bd36811 100644 --- a/test/map/MapAggregatorsDoubleTest.js +++ b/test/map/MapAggregatorsDoubleTest.js @@ -13,28 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('../RC'); -var Client = require('../../').Client; -var Config = require('../../.').Config; -var Aggregators = require('../../').Aggregators; -var Predicates = require('../../').Predicates; -var _fillMap = require('../Util').fillMap; -var expect = require('chai').expect; +const RC = require('../RC'); +const Client = require('../../').Client; +const Aggregators = require('../../').Aggregators; +const Predicates = require('../../').Predicates; +const fillMap = require('../Util').fillMap; +const expect = require('chai').expect; describe('MapAggregatorsDoubleTest', function () { - var cluster; - var client; - var map; + + let cluster, client; + let map; before(function () { - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (cl) { client = cl; return client.getMap('aggregatorsMap'); @@ -45,11 +43,11 @@ describe('MapAggregatorsDoubleTest', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { - return _fillMap(map, 50, 'key', 0); + return fillMap(map, 50, 'key', 0); }); afterEach(function () { @@ -69,9 +67,10 @@ describe('MapAggregatorsDoubleTest', function () { }); it('count with predicate', function () { - return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterEqual('this', 1)).then(function (count) { - return expect(count.toNumber()).to.equal(49); - }); + return map.aggregateWithPredicate(Aggregators.count(), Predicates.greaterEqual('this', 1)) + .then(function (count) { + return expect(count.toNumber()).to.equal(49); + }); }); it('doubleAvg', function () { @@ -87,9 +86,10 @@ describe('MapAggregatorsDoubleTest', function () { }); it('doubleAvg with predicate', function () { - return map.aggregateWithPredicate(Aggregators.doubleAvg(), Predicates.greaterEqual('this', 47)).then(function (avg) { - return expect(avg).to.equal(48); - }); + return map.aggregateWithPredicate(Aggregators.doubleAvg(), Predicates.greaterEqual('this', 47)) + .then(function (avg) { + return expect(avg).to.equal(48); + }); }); it('doubleSum', function () { @@ -105,9 +105,10 @@ describe('MapAggregatorsDoubleTest', function () { }); it('doubleSum with predicate', function () { - return map.aggregateWithPredicate(Aggregators.doubleSum(), Predicates.greaterEqual('this', 47)).then(function (avg) { - return expect(avg).to.equal(144); - }); + return map.aggregateWithPredicate(Aggregators.doubleSum(), Predicates.greaterEqual('this', 47)) + .then(function (avg) { + return expect(avg).to.equal(144); + }); }); it('floatingPointSum', function () { @@ -123,9 +124,10 @@ describe('MapAggregatorsDoubleTest', function () { }); it('floatingPointSum with predicate', function () { - return map.aggregateWithPredicate(Aggregators.floatingPointSum(), Predicates.greaterEqual('this', 47)).then(function (sum) { - return expect(sum).to.equal(144); - }); + return map.aggregateWithPredicate(Aggregators.floatingPointSum(), Predicates.greaterEqual('this', 47)) + .then(function (sum) { + return expect(sum).to.equal(144); + }); }); it('numberAvg', function () { @@ -141,9 +143,10 @@ describe('MapAggregatorsDoubleTest', function () { }); it('numberAvg with predicate', function () { - return map.aggregateWithPredicate(Aggregators.numberAvg(), Predicates.greaterEqual('this', 47)).then(function (avg) { - return expect(avg).to.equal(48); - }); + return map.aggregateWithPredicate(Aggregators.numberAvg(), Predicates.greaterEqual('this', 47)) + .then(function (avg) { + return expect(avg).to.equal(48); + }); }); it('max', function () { @@ -159,9 +162,10 @@ describe('MapAggregatorsDoubleTest', function () { }); it('max with predicate', function () { - return map.aggregateWithPredicate(Aggregators.max(), Predicates.lessEqual('this', 3)).then(function (avg) { - return expect(avg).to.equal(3); - }); + return map.aggregateWithPredicate(Aggregators.max(), Predicates.lessEqual('this', 3)) + .then(function (avg) { + return expect(avg).to.equal(3); + }); }); it('min', function () { @@ -177,8 +181,9 @@ describe('MapAggregatorsDoubleTest', function () { }); it('min with predicate', function () { - return map.aggregateWithPredicate(Aggregators.min(), Predicates.greaterEqual('this', 3)).then(function (avg) { - return expect(avg).to.equal(3); - }); + return map.aggregateWithPredicate(Aggregators.min(), Predicates.greaterEqual('this', 3)) + .then(function (avg) { + return expect(avg).to.equal(3); + }); }); }); diff --git a/test/map/MapAggregatorsIntTest.js b/test/map/MapAggregatorsIntTest.js index 0c4997a34..9d4cc1c12 100644 --- a/test/map/MapAggregatorsIntTest.js +++ b/test/map/MapAggregatorsIntTest.js @@ -13,29 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('../RC'); -var Client = require('../../').Client; -var Config = require('../../.').Config; -var Aggregators = require('../../').Aggregators; -var Predicates = require('../../').Predicates; -var _fillMap = require('../Util').fillMap; -var expect = require('chai').expect; +const RC = require('../RC'); +const Client = require('../../').Client; +const Aggregators = require('../../').Aggregators; +const Predicates = require('../../').Predicates; +const fillMap = require('../Util').fillMap; +const expect = require('chai').expect; describe('MapAggregatorsIntTest', function () { - var cluster; - var client; - var map; + + let cluster, client; + let map; before(function () { - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.serializationConfig.defaultNumberType = 'integer'; - return Client.newHazelcastClient(cfg); + return Client.newHazelcastClient({ + clusterName: cluster.id, + serialization: { + defaultNumberType: 'integer' + } + }); }).then(function (cl) { client = cl; return client.getMap('aggregatorsMap'); @@ -46,11 +48,11 @@ describe('MapAggregatorsIntTest', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { - return _fillMap(map, 50, 'key', 0); + return fillMap(map, 50, 'key', 0); }); afterEach(function () { @@ -70,9 +72,10 @@ describe('MapAggregatorsIntTest', function () { }); it('intAvg with predicate', function () { - return map.aggregateWithPredicate(Aggregators.integerAvg(), Predicates.greaterEqual('this', 47)).then(function (avg) { - return expect(avg).to.equal(48); - }); + return map.aggregateWithPredicate(Aggregators.integerAvg(), Predicates.greaterEqual('this', 47)) + .then(function (avg) { + return expect(avg).to.equal(48); + }); }); it('intSum', function () { @@ -88,9 +91,10 @@ describe('MapAggregatorsIntTest', function () { }); it('intSum with predicate', function () { - return map.aggregateWithPredicate(Aggregators.integerSum(), Predicates.greaterEqual('this', 47)).then(function (sum) { - return expect(sum.toNumber()).to.equal(144); - }); + return map.aggregateWithPredicate(Aggregators.integerSum(), Predicates.greaterEqual('this', 47)) + .then(function (sum) { + return expect(sum.toNumber()).to.equal(144); + }); }); @@ -107,8 +111,9 @@ describe('MapAggregatorsIntTest', function () { }); it('fixedPointSum with predicate', function () { - return map.aggregateWithPredicate(Aggregators.fixedPointSum(), Predicates.greaterEqual('this', 47)).then(function (sum) { - return expect(sum.toNumber()).to.equal(144); - }); + return map.aggregateWithPredicate(Aggregators.fixedPointSum(), Predicates.greaterEqual('this', 47)) + .then(function (sum) { + return expect(sum.toNumber()).to.equal(144); + }); }); }); diff --git a/test/map/MapAggregatorsLongTest.js b/test/map/MapAggregatorsLongTest.js index dc6205860..4673d2b0e 100644 --- a/test/map/MapAggregatorsLongTest.js +++ b/test/map/MapAggregatorsLongTest.js @@ -13,30 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('../RC'); -var Client = require('../../').Client; -var Config = require('../../.').Config; -var Aggregators = require('../../').Aggregators; -var Predicates = require('../../').Predicates; -var Long = require('long'); -var expect = require('chai').expect; +const RC = require('../RC'); +const Client = require('../../').Client; +const Aggregators = require('../../').Aggregators; +const Predicates = require('../../').Predicates; +const Long = require('long'); +const expect = require('chai').expect; describe('MapAggregatorsLongTest', function () { - var cluster; - var client; - var map; - var entryCount = 50; + + let cluster, client; + let map; + const entryCount = 50; before(function () { - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.serializationConfig.defaultNumberType = 'long'; - return Client.newHazelcastClient(cfg); + return Client.newHazelcastClient({ + clusterName: cluster.id, + serialization: { + defaultNumberType: 'long' + } + }); }).then(function (cl) { client = cl; return client.getMap('aggregatorsMap'); @@ -47,12 +49,12 @@ describe('MapAggregatorsLongTest', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { - var entries = []; - for (var i = 0; i < entryCount; i++) { + const entries = []; + for (let i = 0; i < entryCount; i++) { entries.push(['key' + i, Long.fromNumber(i)]); } return map.putAll(entries); @@ -75,9 +77,10 @@ describe('MapAggregatorsLongTest', function () { }); it('longAvg with predicate', function () { - return map.aggregateWithPredicate(Aggregators.longAvg(), Predicates.greaterEqual('this', Long.fromNumber(47))).then(function (avg) { - return expect(avg).to.equal(48); - }); + return map.aggregateWithPredicate(Aggregators.longAvg(), Predicates.greaterEqual('this', Long.fromNumber(47))) + .then(function (avg) { + return expect(avg).to.equal(48); + }); }); it('longSum', function () { @@ -93,8 +96,9 @@ describe('MapAggregatorsLongTest', function () { }); it('longSum with predicate', function () { - return map.aggregateWithPredicate(Aggregators.longSum(), Predicates.greaterEqual('this', Long.fromNumber(47))).then(function (sum) { - return expect(sum.toNumber()).to.equal(144); - }); + return map.aggregateWithPredicate(Aggregators.longSum(), Predicates.greaterEqual('this', Long.fromNumber(47))) + .then(function (sum) { + return expect(sum.toNumber()).to.equal(144); + }); }); }); diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index 0f1719708..ab58d05f5 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -13,54 +13,55 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var Client = require('../../').Client; -var Config = require('../../.').Config; -var Predicates = require('../../.').Predicates; -var Controller = require('../RC'); -var fs = require('fs'); -var _fillMap = require('../Util').fillMap; +const expect = require('chai').expect; +const Client = require('../../').Client; +const Predicates = require('../../.').Predicates; +const RC = require('../RC'); +const fs = require('fs'); +const fillMap = require('../Util').fillMap; -var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); -var IdentifiedEntryProcessor = require('../javaclasses/IdentifiedEntryProcessor'); +const IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +const IdentifiedEntryProcessor = require('../javaclasses/IdentifiedEntryProcessor'); describe('Entry Processor', function () { - var MAP_SIZE = 1000; - var cluster; - var client; - var map; - - function _createConfig(clusterName) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = clusterName; - cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); - return cfg; - } + + const MAP_SIZE = 1000; + let cluster, client; + let map; before(function () { - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function (member) { - var cfg = _createConfig(cluster.id); - return Client.newHazelcastClient(cfg); - }).then(function (cli) { - client = cli; - }); + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')) + .then(function (res) { + cluster = res; + return RC.startMember(cluster.id); + }) + .then(function (member) { + return Client.newHazelcastClient({ + clusterName: cluster.id, + serialization: { + dataSerializableFactories: { + 66: new IdentifiedFactory() + } + } + }); + }) + .then(function (cli) { + client = cli; + }); }); after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { return client.getMap('map-to-be-processed').then(function (mp) { map = mp; - return _fillMap(map, MAP_SIZE, '', ''); + return fillMap(map, MAP_SIZE, '', ''); }); - }); afterEach(function () { @@ -90,21 +91,24 @@ describe('Entry Processor', function () { it('executeOnEntries with predicate should modify entries', function () { this.timeout(4000); - return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function () { - return map.getAll(["0", "1", "2"]); - }).then(function (entries) { - return expect(entries).to.deep.have.members([['0', 'processed'], ['1', 'processed'], ['2', '2']]); - }); + return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')) + .then(function () { + return map.getAll(["0", "1", "2"]); + }) + .then(function (entries) { + return expect(entries).to.deep.have.members([['0', 'processed'], ['1', 'processed'], ['2', '2']]); + }); }); it('executeOnEntries with predicate should return modified entries', function () { this.timeout(4000); - return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')).then(function (entries) { - expect(entries).to.have.lengthOf(2); - expect(entries.every(function (entry) { - return entry[1] == 'processed'; - })).to.be.true; - }); + return map.executeOnEntries(new IdentifiedEntryProcessor('processed'), Predicates.regex('this', '^[01]$')) + .then(function (entries) { + expect(entries).to.have.lengthOf(2); + expect(entries.every(function (entry) { + return entry[1] == 'processed'; + })).to.be.true; + }); }); it('executeOnKey should return modified value', function () { @@ -125,9 +129,10 @@ describe('Entry Processor', function () { it('executeOnKeys should return modified entries', function () { this.timeout(4000); - return map.executeOnKeys(['4', '5'], new IdentifiedEntryProcessor('processed')).then(function (entries) { - return expect(entries).to.deep.have.members([['4', 'processed'], ['5', 'processed']]); - }); + return map.executeOnKeys(['4', '5'], new IdentifiedEntryProcessor('processed')) + .then(function (entries) { + return expect(entries).to.deep.have.members([['4', 'processed'], ['5', 'processed']]); + }); }); it('executeOnKeys should modify the entries', function () { diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index 72fcce2af..83e8aa690 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -13,22 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('../../.').Client; -const Config = require('../../.').Config; -var Controller = require('../RC'); -var expect = require('chai').expect; -var Promise = require('bluebird'); +const Client = require('../../.').Client; +const RC = require('../RC'); +const expect = require('chai').expect; +const Promise = require('bluebird'); describe('Map Partition Aware', function () { - var cluster; - var numOfEntries = 10000; - var memberCount = 3; - var members = []; - var client; - var map; - var mapName = 'testMap'; + let cluster, client; + const numOfEntries = 10000; + const memberCount = 3; + let members = []; + const mapName = 'testMap'; + let map; function PartitionAwareKey(key, partitionKey) { this.key = key; @@ -47,9 +46,9 @@ describe('Map Partition Aware', function () { 'result=""+getLocalMapStats();'; } - function _fillMap(map, size) { - var entryList = []; - for (var i = 0; i < size; i++) { + function fillMap(map, size) { + const entryList = []; + for (let i = 0; i < size; i++) { entryList.push([new PartitionAwareKey('' + i, 'specificKey'), '' + Math.random()]); } return map.putAll(entryList); @@ -58,17 +57,15 @@ describe('Map Partition Aware', function () { before(function () { expect(memberCount, 'This test should have at least 2 members.').to.be.at.least(2); this.timeout(30000); - return Controller.createCluster(null, null).then(function (c) { + return RC.createCluster(null, null).then(function (c) { cluster = c; - for (var i = 0; i < memberCount; i++) { - members.push(Controller.startMember(cluster.id)); + for (let i = 0; i < memberCount; i++) { + members.push(RC.startMember(cluster.id)); } return Promise.all(members); }).then(function (m) { members = m; - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (cl) { client = cl; }); @@ -77,7 +74,7 @@ describe('Map Partition Aware', function () { after(function () { this.timeout(30000); client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { @@ -92,25 +89,26 @@ describe('Map Partition Aware', function () { it('put', function () { this.timeout(15000); - return _fillMap(map, numOfEntries).then(function (newVal) { - var promises = members.map(function (member, index) { - return Controller.executeOnController(cluster.id, getLocalMapStats(index), 1); + return fillMap(map, numOfEntries).then(function (newVal) { + const promises = members.map(function (member, index) { + return RC.executeOnController(cluster.id, getLocalMapStats(index), 1); }); return Promise.all(promises); }).then(function (stats) { - var entriesPerMember = stats.map(function (item) { + const entriesPerMember = stats.map(function (item) { return Number(item.result); }); - var expectedArray = [numOfEntries]; - for (var i = 0; i < memberCount - 1; i++) { + const expectedArray = [numOfEntries]; + for (let i = 0; i < memberCount - 1; i++) { expectedArray.push(0); } - return expect(entriesPerMember, 'One member should have all of the entries. The rest will have 0 entries.').to.have.members(expectedArray); + return expect(entriesPerMember, 'One member should have all of the entries. The rest will have 0 entries.') + .to.have.members(expectedArray); }); }); it('get', function () { - var key = new PartitionAwareKey('key', 'partKey'); + const key = new PartitionAwareKey('key', 'partKey'); return map.put(key, 'value').then(function () { return map.get(key); }).then(function (val) { diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 24f47543d..2831b4505 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -13,32 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var HazelcastClient = require("../..").Client; -var Config = require('../..').Config; -var Predicates = require("../..").Predicates; -var assert = require('assert'); -var Promise = require("bluebird"); -var Controller = require('./../RC'); -var Util = require('./../Util'); -var fs = require('fs'); - -var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); -var CustomComparator = require('../javaclasses/CustomComparator'); - -describe("Predicates", function () { - - var cluster; - var client; - var map; - - function _createConfig(clusterName) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = clusterName; - cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); - return cfg; - } +const expect = require('chai').expect; +const assert = require('assert'); +const Promise = require('bluebird'); +const fs = require('fs'); + +const RC = require('./../RC'); +const HazelcastClient = require('../..').Client; +const Predicates = require('../..').Predicates; +const IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +const CustomComparator = require('../javaclasses/CustomComparator'); + +describe('MapPredicateTest', function () { + + let cluster; + let client; + let map; function createReverseValueComparator() { return new CustomComparator(1, Predicates.IterationType.ENTRY); @@ -46,20 +38,30 @@ describe("Predicates", function () { before(function () { this.timeout(32000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function (member) { - return HazelcastClient.newHazelcastClient(_createConfig(cluster.id)).then(function (hazelcastClient) { + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_identifiedfactory.xml', 'utf8')) + .then(function (res) { + cluster = res; + return RC.startMember(cluster.id); + }) + .then(function (member) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + serialization: { + dataSerializableFactories: { + 66: new IdentifiedFactory() + } + } + }) + }) + .then(function (hazelcastClient) { client = hazelcastClient; }); - }); }); beforeEach(function () { return client.getMap('test').then(function (mp) { map = mp; - return _fillMap(); + return fillMap(); }); }); @@ -69,15 +71,15 @@ describe("Predicates", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - function _fillMap(size) { - if (size == void 0) { + function fillMap(size) { + if (size === undefined) { size = 50; } - var promises = []; - for (var i = 0; i < size; i++) { + const promises = []; + for (let i = 0; i < size; i++) { promises.push(map.put('key' + i, i)); } return Promise.all(promises); @@ -118,6 +120,7 @@ describe("Predicates", function () { }); it('Like', function () { + let localMap; return client.getMap('likePredMap').then(function (mp) { localMap = mp; return localMap.put('temp', 'tempval'); @@ -131,7 +134,7 @@ describe("Predicates", function () { }); it('ILike', function () { - var localMap; + let localMap; return client.getMap('likePredMap').then(function (mp) { localMap = mp; return localMap.putAll([['temp', 'tempval'], ['TEMP', 'TEMPVAL']]); @@ -149,12 +152,12 @@ describe("Predicates", function () { }); it('InstanceOf', function () { - var assertionList = Array.apply(null, {length: 50}).map(Number.call, Number); + const assertionList = Array.apply(null, {length: 50}).map(Number.call, Number); return testPredicate(Predicates.instanceOf('java.lang.Double'), assertionList); }); it('NotEqual', function () { - var assertionList = Array.apply(null, {length: 49}).map(Number.call, Number); + const assertionList = Array.apply(null, {length: 49}).map(Number.call, Number); return testPredicate(Predicates.notEqual('this', 49), assertionList); }); @@ -163,7 +166,10 @@ describe("Predicates", function () { }); it('Or', function () { - return testPredicate(Predicates.or(Predicates.greaterEqual('this', 49), Predicates.lessEqual('this', 0)), [0, 49]); + return testPredicate( + Predicates.or(Predicates.greaterEqual('this', 49), Predicates.lessEqual('this', 0)), + [0, 49] + ); }); it('Between', function () { @@ -175,6 +181,7 @@ describe("Predicates", function () { }); it('Regex', function () { + let localMap; return client.getMap('regexMap').then(function (mp) { localMap = mp; return localMap.putAll([['06', 'ankara'], ['07', 'antalya']]) @@ -192,47 +199,47 @@ describe("Predicates", function () { }); it('True', function () { - var assertionList = Array.apply(null, {length: 50}).map(Number.call, Number); + const assertionList = Array.apply(null, {length: 50}).map(Number.call, Number); return testPredicate(Predicates.alwaysTrue(), assertionList); }); it('Paging with reverse comparator should have elements in reverse order', function () { - var paging = Predicates.paging(Predicates.lessThan('this', 10), 3, createReverseValueComparator()); + const paging = Predicates.paging(Predicates.lessThan('this', 10), 3, createReverseValueComparator()); return testPredicate(paging, [9, 8, 7], true); }); it('Paging first page should have first two items', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); return testPredicate(paging, [40, 41]); }); it('Paging nextPage should have 3rd and 4th items', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.nextPage(); return testPredicate(paging, [42, 43]); }); it('Paging fourth page should have 7th and 8th items', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(4); return testPredicate(paging, [48, 49]); }); it('Paging #getPage should return approprate value', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(4); return expect(paging.getPage()).to.equal(4); }); it('Paging #getPageSize should return 2', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); return expect(paging.getPageSize()).to.equal(2); }); it('Paging previousPage', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(4); paging.previousPage(); @@ -240,7 +247,7 @@ describe("Predicates", function () { }); it('Get 4th page, then previous page', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(4); return map.valuesWithPredicate(paging).then(function () { paging.previousPage(); @@ -249,7 +256,7 @@ describe("Predicates", function () { }); it('Get 3rd page, then next page', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(3); return map.valuesWithPredicate(paging).then(function () { paging.nextPage(); @@ -258,26 +265,26 @@ describe("Predicates", function () { }); it('Get 10th page (which does not exist) should return empty list', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 40), 2); paging.setPage(10); return testPredicate(paging, []); }); it('Last page has only one element although page size is 2', function () { - var paging = Predicates.paging(Predicates.greaterEqual('this', 41), 2); + const paging = Predicates.paging(Predicates.greaterEqual('this', 41), 2); paging.setPage(4); return testPredicate(paging, [49]); }); it('There is no element satisfying paging predicate returns empty array', function () { - var paging = Predicates.paging(Predicates.lessThan('this', 0), 2); + const paging = Predicates.paging(Predicates.lessThan('this', 0), 2); return testPredicate(paging, []); }); it('Null inner predicate in PagingPredicate does not filter out items, only does paging', function () { - var paging = Predicates.paging(null, 2); + const paging = Predicates.paging(null, 2); return testPredicate(paging, [0, 1]); }); }); diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index f64c50a54..e4e14ae2c 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -13,52 +13,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -var expect = require("chai").expect; -var HazelcastClient = require("../../").Client; -var Predicates = require("../../").Predicates; -var Config = require('../../').Config; -var Promise = require("bluebird"); -var Controller = require('./../RC'); -var Util = require('./../Util'); -var fs = require('fs'); -var _fillMap = require('../Util').fillMap; - +'use strict'; + +const expect = require('chai').expect; +const HazelcastClient = require('../../').Client; +const Config = require('../../').Config; +const Predicates = require('../../').Predicates; +const Promise = require('bluebird'); +const RC = require('./../RC'); +const Util = require('./../Util'); +const fs = require('fs'); +const fillMap = require('../Util').fillMap; function createController(nearCacheEnabled) { if (nearCacheEnabled) { - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')) + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')); } else { - return Controller.createCluster(null, null); + return RC.createCluster(null, null); } } function createClient(nearCacheEnabled, clusterName) { - const cfg = new Config.ClientConfig(); - cfg.clusterName = clusterName; + const cfg = { + clusterName, + nearCaches: {} + }; if (nearCacheEnabled) { - var ncc = new Config.NearCacheConfig(); - ncc.name = 'test'; - ncc.timeToLiveSeconds = 1; - cfg.nearCacheConfigs['test'] = ncc; + cfg.nearCaches['test'] = { timeToLiveSeconds: 1 }; } return HazelcastClient.newHazelcastClient(cfg); } -describe('MapProxy', function () { +describe('MapProxyTest', function () { [false, true].forEach(function (nearCacheEnabled) { + describe('Near Cache: ' + nearCacheEnabled, function () { - describe("Near Cache: " + nearCacheEnabled, function () { - - var cluster; - var client; - var map; + let cluster, client; + let map; before(function () { this.timeout(32000); return createController(nearCacheEnabled).then(function (res) { cluster = res; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (m) { return createClient(nearCacheEnabled, cluster.id).then(function (hazelcastClient) { client = hazelcastClient; @@ -69,7 +66,7 @@ describe('MapProxy', function () { beforeEach(function () { return client.getMap('test').then(function (mp) { map = mp; - return _fillMap(map); + return fillMap(map); }); }); @@ -79,10 +76,10 @@ describe('MapProxy', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - function _generateLockScript(mapName, keyName) { + function generateLockScript(mapName, keyName) { return 'function lockByServer() {' + ' var map = instance_0.getMap("' + mapName + '");' + ' map.lock(' + keyName + ');' + @@ -91,7 +88,7 @@ describe('MapProxy', function () { 'result=""+lockByServer();'; } - function _generateUnlockScript(mapName, keyName) { + function generateUnlockScript(mapName, keyName) { return 'function lockByServer() {' + ' var map = instance_0.getMap("' + mapName + '");' + ' map.unlock(' + keyName + ');' + @@ -204,15 +201,15 @@ describe('MapProxy', function () { [true, false].forEach(function (shouldUsePutAll) { it(shouldUsePutAll ? 'putAll' : 'setAll', function (done) { - var arr = [ + const arr = [ ['pa_k0', 'pa_v0'], ['pa_k1', 'pa_v1'], ['pa_k2', 'pa_v2'], ['pa_k3', 'pa_v3'], ['pa_k4', 'pa_v4'] ]; - var returnedCorrectly = 0; - var verify = function (expected) { + let returnedCorrectly = 0; + const verify = function (expected) { return function (val) { try { expect(val).to.equal(expected); @@ -225,7 +222,7 @@ describe('MapProxy', function () { } }; }; - var promise; + let promise; if (shouldUsePutAll) { promise = map.putAll(arr); } else { @@ -267,9 +264,8 @@ describe('MapProxy', function () { }); it('entrySet_notNull', function () { - var entryMap; - - var samples = [ + let entryMap; + const samples = [ ['k1', 'v1'], ['k2', 'v2'], ['k3', 'v3'] @@ -290,7 +286,7 @@ describe('MapProxy', function () { }); it('entrySet_null', function () { - var entryMap; + let entryMap; return client.getMap('null-entry-map').then(function (mp) { entryMap = mp; return entryMap.entrySet(); @@ -324,14 +320,14 @@ describe('MapProxy', function () { }); it('forceUnlock', function () { - var script = + const script = 'function lockByServer() {' + ' var map = instance_0.getMap("' + map.getName() + '");' + ' map.lock("key0");' + ' return map.isLocked("key0")' + '}' + 'result=""+lockByServer();'; - return Controller.executeOnController(cluster.id, script, 1).then(function (s) { + return RC.executeOnController(cluster.id, script, 1).then(function (s) { return map.forceUnlock('key0'); }).then(function () { return map.isLocked('key0'); @@ -497,14 +493,15 @@ describe('MapProxy', function () { }); it('addIndex', function () { - const orderedIndexCfg = new Config.IndexConfig(); - orderedIndexCfg.name = 'length'; - orderedIndexCfg.addAttribute('this'); - - const unorderedIndexCfg = new Config.IndexConfig(); - unorderedIndexCfg.name = 'length'; - unorderedIndexCfg.type = Config.IndexType.HASH; - unorderedIndexCfg.addAttribute('this'); + const orderedIndexCfg = { + name: 'length', + attributes: ['this'] + }; + const unorderedIndexCfg = { + name: 'length', + type: 'HASH', + attributes: ['this'] + }; return Promise.all([ map.addIndex(orderedIndexCfg), @@ -519,29 +516,35 @@ describe('MapProxy', function () { }); it('tryLock_fail', function () { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function (s) { - return map.tryLock('key0'); - }).then(function (success) { - return expect(success).to.be.false; - }); + return RC.executeOnController(cluster.id, generateLockScript(map.getName(), '"key0"'), 1) + .then(function (s) { + return map.tryLock('key0'); + }) + .then(function (success) { + return expect(success).to.be.false; + }); }); it('tryLock_success with timeout', function () { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { - var promise = map.tryLock('key0', 1000); - Controller.executeOnController(cluster.id, _generateUnlockScript(map.getName(), '"key0"'), 1); - return promise; - }).then(function (success) { - return expect(success).to.be.true; - }); + return RC.executeOnController(cluster.id, generateLockScript(map.getName(), '"key0"'), 1) + .then(function () { + const promise = map.tryLock('key0', 1000); + RC.executeOnController(cluster.id, generateUnlockScript(map.getName(), '"key0"'), 1); + return promise; + }) + .then(function (success) { + return expect(success).to.be.true; + }); }); it('tryLock_fail with timeout', function () { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { - return map.tryLock('key0', 1000); - }).then(function (success) { - return expect(success).to.be.false; - }); + return RC.executeOnController(cluster.id, generateLockScript(map.getName(), '"key0"'), 1) + .then(function () { + return map.tryLock('key0', 1000); + }) + .then(function (success) { + return expect(success).to.be.false; + }); }); it('tryPut success', function () { @@ -551,29 +554,33 @@ describe('MapProxy', function () { }); it('tryPut fail', function () { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { - return map.tryPut('key0', 'val0', 200); - }).then(function (success) { - return expect(success).to.be.false; - }) + return RC.executeOnController(cluster.id, generateLockScript(map.getName(), '"key0"'), 1) + .then(function () { + return map.tryPut('key0', 'val0', 200); + }) + .then(function (success) { + return expect(success).to.be.false; + }); }); it('tryRemove success', function () { return map.tryRemove('key0', 1000).then(function (success) { return expect(success).to.be.true; - }) + }); }); it('tryRemove fail', function () { - return Controller.executeOnController(cluster.id, _generateLockScript(map.getName(), '"key0"'), 1).then(function () { - return map.tryRemove('key0', 200); - }).then(function (success) { - return expect(success).to.be.false; - }) + return RC.executeOnController(cluster.id, generateLockScript(map.getName(), '"key0"'), 1) + .then(function () { + return map.tryRemove('key0', 200); + }) + .then(function (success) { + return expect(success).to.be.false; + }); }); it('addEntryListener on map, entryAdded fires because predicate returns true for that entry', function (done) { - var listenerObject = { + const listenerObject = { added: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -588,13 +595,14 @@ describe('MapProxy', function () { } } }; - map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10')).then(function () { - map.put('key10', 'val10'); - }); + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10')) + .then(function () { + map.put('key10', 'val10'); + }); }); it('addEntryListener on key, entryAdded fires because predicate returns true for that entry', function (done) { - var listenerObject = { + const listenerObject = { added: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -609,13 +617,14 @@ describe('MapProxy', function () { } } }; - map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10').then(function () { - map.put('key10', 'val10'); - }); + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10') + .then(function () { + map.put('key10', 'val10'); + }); }); - it('addEntryListener on key, entryAdded fires because predicate returns true for that entry, inlVal=yes', function (done) { - var listenerObject = { + it('addEntryListener on key, entryAdded fires because predicate returns true for that entry, inlVal=yes', (done) => { + const listenerObject = { added: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -629,13 +638,14 @@ describe('MapProxy', function () { } } }; - map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10', true).then(function () { - map.put('key10', 'val10'); - }); + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10', true) + .then(function () { + map.put('key10', 'val10'); + }); }); it('addEntryListener with predicate on map entryAdded', function (done) { - var listenerObject = { + const listenerObject = { added: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -650,13 +660,14 @@ describe('MapProxy', function () { } } }; - map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10', true).then(function () { - map.put('key10', 'val10'); - }); + map.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10'), 'key10', true) + .then(function () { + map.put('key10', 'val10'); + }); }); it('addEntryListener on map entryAdded', function (done) { - var listenerObject = { + const listenerObject = { added: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -677,7 +688,7 @@ describe('MapProxy', function () { }); it('addEntryListener on map entryUpdated', function (done) { - var listenerObject = { + const listenerObject = { updated: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -698,7 +709,7 @@ describe('MapProxy', function () { }); it('addEntryListener on key entryRemoved', function (done) { - var listenerObject = { + const listenerObject = { removed: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -719,7 +730,7 @@ describe('MapProxy', function () { }); it('addEntryListener on key entryRemoved includeValue=true', function (done) { - var listenerObject = { + const listenerObject = { removed: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -740,7 +751,7 @@ describe('MapProxy', function () { }); it('addEntryListener on key evicted includeValue=true', function (done) { - var listenerObject = { + const listenerObject = { evicted: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -761,7 +772,7 @@ describe('MapProxy', function () { }); it('addEntryListener on map evictAll', function (done) { - var listenerObject = { + const listenerObject = { mapEvicted: function (mapEvent) { try { expect(mapEvent.name).to.equal('test'); @@ -779,7 +790,7 @@ describe('MapProxy', function () { }); it('addEntryListener on map clearAll', function (done) { - var listenerObject = { + const listenerObject = { mapCleared: function (mapEvent) { try { expect(mapEvent.name).to.equal('test'); @@ -797,7 +808,7 @@ describe('MapProxy', function () { }); it('addEntryListener on map entryExpired includeValue=true', function (done) { - var listenerObj = { + const listenerObj = { expired: function (entryEvent) { try { expect(entryEvent.name).to.equal('test'); @@ -812,7 +823,6 @@ describe('MapProxy', function () { } } }; - map.addEntryListener(listenerObj, undefined, true) .then(function () { return map.put('expiringKey', 'expiringValue', 1000); @@ -862,29 +872,32 @@ describe('MapProxy', function () { }); it('entrySetWithPredicate paging', function () { - return map.entrySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function (entrySet) { - expect(entrySet.length).to.equal(1); - expect(entrySet[0]).to.deep.equal(['key3', 'val3']); - }); + return map.entrySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)) + .then(function (entrySet) { + expect(entrySet.length).to.equal(1); + expect(entrySet[0]).to.deep.equal(['key3', 'val3']); + }); }); it('keySetWithPredicate paging', function () { - return map.keySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function (keySet) { - expect(keySet.length).to.equal(1); - expect(keySet[0]).to.equal('key3'); - }); + return map.keySetWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)) + .then(function (keySet) { + expect(keySet.length).to.equal(1); + expect(keySet[0]).to.equal('key3'); + }); }); it('valuesWithPredicate paging', function () { - return map.valuesWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)).then(function (values) { - expect(values.toArray().length).to.equal(1); - expect(values.toArray()[0]).to.equal('val3'); - }); + return map.valuesWithPredicate(Predicates.paging(Predicates.greaterEqual('this', 'val3'), 1)) + .then(function (values) { + expect(values.toArray().length).to.equal(1); + expect(values.toArray()[0]).to.equal('val3'); + }); }); it('destroy', function () { - var dmap; - var newMap; + let dmap; + let newMap; return client.getMap('map-to-be-destroyed').then(function (mp) { dmap = mp; return dmap.put('key', 'val'); diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index 4f7664ff2..4ff3bb303 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -13,41 +13,42 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; -const Config = require("../../lib/index.js").Config; -var Controller = require('./../RC'); -var fs = require('fs'); -var _fillMap = require('../Util').fillMap; -var promiseWaitMilliseconds = require('../Util').promiseWaitMilliseconds; +'use strict'; + +const expect = require("chai").expect; +const fs = require('fs'); +const HazelcastClient = require("../../lib/index.js").Client; +const RC = require('./../RC'); +const fillMap = require('../Util').fillMap; +const promiseWaitMilliseconds = require('../Util').promiseWaitMilliseconds; const Util = require('../Util'); describe('MapStore', function () { - var cluster; - var client; - var map; + + let cluster; + let client; + let map; before(function () { this.timeout(32000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_mapstore.xml', 'utf8')).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function (member) { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_mapstore.xml', 'utf8')) + .then(function (res) { + cluster = res; + return RC.startMember(cluster.id); + }) + .then(function (member) { + return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + }) + .then(function (hazelcastClient) { client = hazelcastClient; }); - }); }); beforeEach(function () { return client.getMap('mapstore-test').then(function (mp) { map = mp; - return _fillMap(map); + return fillMap(map); }); - }); afterEach(function () { @@ -56,11 +57,11 @@ describe('MapStore', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('loadAll with no arguments loads all keys', function () { - return _fillMap(map).then(function () { + return fillMap(map).then(function () { return map.evictAll(); }).then(function () { return map.loadAll(); @@ -175,7 +176,7 @@ describe('MapStore', function () { }); it('addEntryListener on map entryLoaded includeValue=true', function (done) { - var listenerObj = { + const listener = { loaded: function (entryEvent) { try { expect(entryEvent.name).to.equal('mapstore-test'); @@ -191,7 +192,7 @@ describe('MapStore', function () { } }; - map.addEntryListener(listenerObj, undefined, true) + map.addEntryListener(listener, undefined, true) .then(function () { return map.put('some-key', 'some-value', 100) }).then(function () { diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index 64a1d3337..473da9d49 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -13,60 +13,63 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var fs = require('fs'); +const expect = require('chai').expect; +const fs = require('fs'); -var DeferredPromise = require('../../lib/Util').DeferredPromise; -var getRandomInt = require('../Util').getRandomInt; -var Controller = require('../RC'); - -var Config = require('../../.').Config; -var HazelcastClient = require('../../.').Client; +const DeferredPromise = require('../../lib/Util').DeferredPromise; +const getRandomInt = require('../Util').getRandomInt; +const RC = require('../RC'); +const HazelcastClient = require('../../.').Client; describe('NearCachedMapStress', function () { - var cluster; - var client1; - var validatingClient; - var numberOfEntries = 1000; - var mapName = 'stressncmap'; - var runningOperations = 0; - var completedOperations = 0; - var concurrencyLevel = 32; - var totalNumOperations = 100000; - var completedDeferred = DeferredPromise(); - var putPercent = 15; - var removePercent = 20; - var getPercent = 100 - putPercent - removePercent; - var totalGetOperations = 0; + let cluster, client1; + let validatingClient; + let runningOperations = 0; + let completedOperations = 0; + let totalGetOperations = 0; + const numberOfEntries = 1000; + const mapName = 'stressncmap'; + const concurrencyLevel = 32; + const totalNumOperations = 100000; + const completedDeferred = DeferredPromise(); + const putPercent = 15; + const removePercent = 20; + const getPercent = 100 - putPercent - removePercent; before(function () { - var cfg = new Config.ClientConfig(); - var ncc = new Config.NearCacheConfig(); - ncc.name = mapName; - ncc.invalidateOnChange = true; - cfg.nearCacheConfigs[mapName] = ncc; - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function (member) { - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (cl) { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - client1 = cl; - return HazelcastClient.newHazelcastClient(config); - }).then(function (cl) { - validatingClient = cl; - }); + const cfg = { + nearCaches: { + [mapName]: { + invalidateOnChange: true + } + } + }; + + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')) + .then(function (res) { + cluster = res; + return RC.startMember(cluster.id); + }) + .then(function (member) { + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg); + }) + .then(function (cl) { + client1 = cl; + return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + }) + .then(function (cl) { + validatingClient = cl; + }); }); after(function () { client1.shutdown(); validatingClient.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); function completeOperation() { @@ -79,7 +82,7 @@ describe('NearCachedMapStress', function () { it('stress test with put, get and remove', function (done) { this.timeout(120000); - var map; + let map; client1.getMap(mapName).then(function (mp) { map = mp; (function innerOperation() { @@ -90,7 +93,7 @@ describe('NearCachedMapStress', function () { setTimeout(innerOperation, 1); } else { runningOperations++; - var op = getRandomInt(0, 100); + const op = getRandomInt(0, 100); if (op < putPercent) { map.put(getRandomInt(0, numberOfEntries), getRandomInt(0, 10000)).then(completeOperation); } else if (op < putPercent + removePercent) { @@ -104,14 +107,13 @@ describe('NearCachedMapStress', function () { })(); }); - completedDeferred.promise.then(function () { - var p = []; - //Value correctness check - for (var i = 0; i < numberOfEntries; i++) { + const p = []; + // Value correctness check + for (let i = 0; i < numberOfEntries; i++) { (function () { - var key = i; - var promise = validatingClient.getMap(mapName).then(function (mp) { + const key = i; + const promise = validatingClient.getMap(mapName).then(function (mp) { return mp.get(key); }).then(function (expected) { return client1.getMap(mapName).then(function (mp) { @@ -123,9 +125,9 @@ describe('NearCachedMapStress', function () { p.push(promise); })(); } - //Near cache usage check + // Near cache usage check Promise.all(p).then(function () { - var stats; + let stats; client1.getMap(mapName).then(function (mp) { stats = mp.nearCache.getStatistics(); expect(stats.hitCount + stats.missCount).to.equal(totalGetOperations + numberOfEntries); diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 08a8c074c..8d1298fd0 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -13,45 +13,48 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var HazelcastClient = require("../../.").Client; -var Controller = require('./../RC'); -var Util = require('./../Util'); -var Config = require('../../.').Config; -var fs = require('fs'); -var _fillMap = require('../Util').fillMap; +const expect = require('chai').expect; +const HazelcastClient = require('../../.').Client; +const RC = require('./../RC'); +const Util = require('./../Util'); +const fs = require('fs'); +const fillMap = require('../Util').fillMap; +describe('NearCachedMapTest', function () { -describe("NearCachedMap", function () { [true, false].forEach(function (invalidateOnChange) { describe('invalidate on change=' + invalidateOnChange, function () { - var cluster; - var client1; - var client2; - var map1; - var map2; + + let cluster, client1, client2; + let map1, map2; before(function () { this.timeout(32000); - const cfg = new Config.ClientConfig(); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function (member) { - cfg.clusterName = cluster.id; - var ncc = new Config.NearCacheConfig(); - ncc.name = 'nc-map'; - ncc.invalidateOnChange = invalidateOnChange; - cfg.nearCacheConfigs['ncc-map'] = ncc; - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client1 = hazelcastClient; - }); - }).then(function () { - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client2 = hazelcastClient; + const cfg = { + nearCaches: { + 'ncc-map': { + invalidateOnChange + } + } + }; + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8')) + .then(function (res) { + cluster = res; + return RC.startMember(cluster.id); + }) + .then(function (member) { + cfg.clusterName = cluster.id; + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + client1 = hazelcastClient; + }); + }) + .then(function () { + return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + client2 = hazelcastClient; + }); }); - }); }); beforeEach(function () { @@ -61,7 +64,7 @@ describe("NearCachedMap", function () { return client2.getMap('ncc-map'); }).then(function (mp) { map2 = mp; - return _fillMap(map1); + return fillMap(map1); }); }); @@ -72,7 +75,7 @@ describe("NearCachedMap", function () { after(function () { client1.shutdown(); client2.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); function getNearCacheStats(map) { @@ -80,7 +83,7 @@ describe("NearCachedMap", function () { } function expectStats(map, hit, miss, entryCount) { - var stats = getNearCacheStats(map); + const stats = getNearCacheStats(map); expect(stats.hitCount).to.equal(hit); expect(stats.missCount).to.equal(miss); return expect(stats.entryCount).to.equal(entryCount); @@ -90,7 +93,7 @@ describe("NearCachedMap", function () { return map1.get('key0').then(function () { return map1.get('key0'); }).then(function (val) { - var stats = getNearCacheStats(map1); + const stats = getNearCacheStats(map1); expect(val).to.equal('val0'); expect(stats.missCount).to.equal(1); expect(stats.entryCount).to.equal(1); @@ -104,7 +107,7 @@ describe("NearCachedMap", function () { }).then(function () { return map1.get('key1'); }).then(function (val) { - var stats = getNearCacheStats(map1); + const stats = getNearCacheStats(map1); expect(val).to.be.null; expect(stats.hitCount).to.equal(0); expect(stats.missCount).to.equal(2); @@ -118,7 +121,7 @@ describe("NearCachedMap", function () { }).then(function () { return map1.get('key1'); }).then(function (val) { - var stats = getNearCacheStats(map1); + const stats = getNearCacheStats(map1); expect(val).to.be.equal('something else'); expect(stats.hitCount).to.equal(0); expect(stats.missCount).to.equal(2); diff --git a/test/multimap/MultiMapProxyListenersTest.js b/test/multimap/MultiMapProxyListenersTest.js index 99a221c7a..0ae2cd80e 100644 --- a/test/multimap/MultiMapProxyListenersTest.js +++ b/test/multimap/MultiMapProxyListenersTest.js @@ -13,33 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; -const Config = require("../../lib/index.js").Config; -var Controller = require('./../RC'); +const expect = require("chai").expect; +const HazelcastClient = require("../../lib/index.js").Client; +const RC = require('./../RC'); const Util = require('./../Util'); describe("MultiMap Proxy Listener", function () { this.timeout(10000); - - var cluster; - var client; - - var map; + let cluster; + let client; + let map; before(function () { this.timeout(10000); - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client = hazelcastClient; - }) + return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + }).then(function (hazelcastClient) { + client = hazelcastClient; }); }); @@ -55,12 +51,11 @@ describe("MultiMap Proxy Listener", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); function Listener(eventName, doneCallback, expectedName, expectedKey, expectedValue, expectedOldValue, expectedMergingValue) { - this[eventName] = function (entryEvent) { try { expect(entryEvent.name).to.equal(expectedName); @@ -79,7 +74,7 @@ describe("MultiMap Proxy Listener", function () { // Add tests it("listens for add with value excluded", function (done) { - var listener = new Listener("added", done, "test", "foo", null, null, null); + const listener = new Listener("added", done, "test", "foo", null, null, null); map.addEntryListener(listener, null, false).then(function () { map.put("foo", "bar"); @@ -88,7 +83,7 @@ describe("MultiMap Proxy Listener", function () { it("listens for add with value included", function (done) { - var listener = new Listener("added", done, "test", "foo", "bar", null, null); + const listener = new Listener("added", done, "test", "foo", "bar", null, null); map.addEntryListener(listener, null, true).then(function () { map.put("foo", "bar"); @@ -96,7 +91,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for add to specific key", function (done) { - var listener = new Listener("added", done, "test", "foo", null, null, null); + const listener = new Listener("added", done, "test", "foo", null, null, null); map.addEntryListener(listener, "foo", false).then(function () { map.put("foo", "bar"); @@ -104,7 +99,7 @@ describe("MultiMap Proxy Listener", function () { }); it("does not react to add on the wrong key", function (done) { - var listener = { + const listener = { added: function () { done("Reacted to update on the wrong key"); } @@ -122,7 +117,7 @@ describe("MultiMap Proxy Listener", function () { // Remove tests it("listens for remove with value excluded", function (done) { - var listener = new Listener("removed", done, "test", "foo", null, null, null); + const listener = new Listener("removed", done, "test", "foo", null, null, null); map.addEntryListener(listener, null, false).then(function () { return map.put("foo", "bar"); @@ -132,7 +127,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for remove with value included", function (done) { - var listener = new Listener("removed", done, "test", "foo", null, "bar", null); + const listener = new Listener("removed", done, "test", "foo", null, "bar", null); map.addEntryListener(listener, null, true).then(function () { return map.put("foo", "bar"); @@ -142,7 +137,7 @@ describe("MultiMap Proxy Listener", function () { }); it("listens for remove on specific key", function (done) { - var listener = new Listener("added", done, "test", "foo", null, null, null); + const listener = new Listener("added", done, "test", "foo", null, null, null); map.addEntryListener(listener, "foo", false).then(function () { return map.put("foo", "bar"); @@ -152,7 +147,7 @@ describe("MultiMap Proxy Listener", function () { }); it("does not react to remove on the wrong key", function (done) { - var listener = { + const listener = { added: function () { done("Reacted to update on the wrong key"); } @@ -173,7 +168,7 @@ describe("MultiMap Proxy Listener", function () { it("listens for clear", function (done) { this.timeout(10000); - var listener = { + const listener = { mapCleared: function (mapEvent) { try { expect(mapEvent.name).to.be.equal("test"); @@ -213,7 +208,7 @@ describe("MultiMap Proxy Listener", function () { let expectedEventCount = 3; const listener = (key, values) => { return { - added: event => { + added: (event) => { expect(event.key).to.equal(key); expect(values).to.include(event.value); expectedEventCount--; @@ -224,7 +219,7 @@ describe("MultiMap Proxy Listener", function () { } } } - } + }; map.addEntryListener(listener('a', [1]), 'a') .then(() => map.addEntryListener(listener('b', [2, 22]), 'b')) diff --git a/test/multimap/MultiMapProxyLockTest.js b/test/multimap/MultiMapProxyLockTest.js index 9495abdb0..07b8ccd40 100644 --- a/test/multimap/MultiMapProxyLockTest.js +++ b/test/multimap/MultiMapProxyLockTest.js @@ -13,37 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; -const Config = require("../../lib/index.js").Config; -var Controller = require('./../RC'); -var Util = require('./../Util'); -var Promise = require('bluebird'); +const expect = require('chai').expect; +const Promise = require('bluebird'); +const RC = require('./../RC'); +const Client = require('../..').Client; -describe("MultiMap Proxy Lock", function () { +describe('MultiMapProxyLockTest', function () { - var cluster; - var clientOne; - var clientTwo; + let cluster; + let clientOne; + let clientTwo; - var mapOne; - var mapTwo; + let mapOne; + let mapTwo; before(function () { this.timeout(10000); - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; + const cfg = { clusterName: cluster.id }; return Promise.all([ - HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - clientOne = hazelcastClient; + Client.newHazelcastClient(cfg).then(function (client) { + clientOne = client; }), - HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - clientTwo = hazelcastClient; + Client.newHazelcastClient(cfg).then(function (client) { + clientTwo = client; }) ]); }); @@ -65,13 +63,13 @@ describe("MultiMap Proxy Lock", function () { after(function () { clientOne.shutdown(); clientTwo.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - it("locks and unlocks", function () { + it('locks and unlocks', function () { this.timeout(10000); - var startTime = Date.now(); + const startTime = Date.now(); return mapOne.put(1, 2).then(function () { return mapOne.lock(1); }).then(function () { @@ -80,23 +78,23 @@ describe("MultiMap Proxy Lock", function () { }, 1000); return mapTwo.lock(1) }).then(function () { - var elapsed = Date.now() - startTime; + const elapsed = Date.now() - startTime; expect(elapsed).to.be.greaterThan(995); }); }); - it("unlocks after lease expired", function () { + it('unlocks after lease expired', function () { this.timeout(10000); - var startTime = Date.now(); + const startTime = Date.now(); return mapOne.lock(1, 1000).then(function () { return mapTwo.lock(1); }).then(function () { - var elapsed = Date.now() - startTime; + const elapsed = Date.now() - startTime; expect(elapsed).to.be.greaterThan(995); }); }); - it("gives up attempt to lock after timeout is exceeded", function () { + it('gives up attempt to lock after timeout is exceeded', function () { this.timeout(10000); return mapOne.lock(1).then(function () { return mapTwo.tryLock(1, 1000); @@ -105,42 +103,40 @@ describe("MultiMap Proxy Lock", function () { }); }); - it("acquires lock before timeout is exceeded", function () { + it('acquires lock before timeout is exceeded', function () { this.timeout(10000); - var startTime = Date.now(); + const startTime = Date.now(); return mapOne.lock(1, 1000).then(function () { return mapTwo.tryLock(1, 2000); }).then(function (acquired) { - var elapsed = Date.now() - startTime; + const elapsed = Date.now() - startTime; expect(acquired).to.be.true; expect(elapsed).to.be.greaterThan(995); }) }); - it("acquires the lock before timeout and unlocks after lease expired", function () { + it('acquires the lock before timeout and unlocks after lease expired', function () { this.timeout(10000); - var startTime = Date.now(); + const startTime = Date.now(); return mapOne.lock(1, 1000).then(function () { return mapTwo.tryLock(1, 2000, 1000); }).then(function () { - var elapsed = Date.now() - startTime; + const elapsed = Date.now() - startTime; expect(elapsed).to.be.greaterThan(995); return mapOne.lock(1, 2000); }).then(function () { - var elapsed = Date.now() - startTime; + const elapsed = Date.now() - startTime; expect(elapsed).to.be.greaterThan(995); }); - }); - it("correctly reports lock status when unlocked", function () { + it('correctly reports lock status when unlocked', function () { return mapOne.isLocked(1).then(function (locked) { expect(locked).to.be.false; }); }); - - it("correctly reports lock status when locked", function () { + it('correctly reports lock status when locked', function () { return mapOne.lock(1).then(function () { return mapOne.isLocked(1); }).then(function (locked) { @@ -151,7 +147,7 @@ describe("MultiMap Proxy Lock", function () { }); }); - it("force unlocks", function () { + it('force unlocks', function () { return mapOne.lock(1).then(function () { return mapOne.lock(1); }).then(function () { @@ -169,6 +165,4 @@ describe("MultiMap Proxy Lock", function () { expect(locked).to.be.false; }); }); - - }); diff --git a/test/multimap/MultiMapProxyTest.js b/test/multimap/MultiMapProxyTest.js index dd8262edf..524613e52 100644 --- a/test/multimap/MultiMapProxyTest.js +++ b/test/multimap/MultiMapProxyTest.js @@ -13,32 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var HazelcastClient = require("../../lib/index.js").Client; -const Config = require("../../lib/index.js").Config; -var Controller = require('./../RC'); -var Util = require('./../Util'); -var Promise = require('bluebird'); +const expect = require('chai').expect; +const Promise = require('bluebird'); +const RC = require('./../RC'); +const Client = require('../..').Client; +const Util = require('../Util'); -describe("MultiMap Proxy", function () { +describe('MultiMapProxyTest', function () { - var cluster; - var client; - - var map; + let cluster; + let client; + let map; before(function () { this.timeout(10000); - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client = hazelcastClient; - }) + return Client.newHazelcastClient({ + clusterName: cluster.id + }); + }).then(function (hazelcastClient) { + client = hazelcastClient; }); }); @@ -54,10 +53,10 @@ describe("MultiMap Proxy", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - it("adds and retrieves a single item", function () { + it('adds and retrieves a single item', function () { return map.put(1, 1).then(function () { return map.get(1); }).then(function (values) { @@ -65,7 +64,7 @@ describe("MultiMap Proxy", function () { }); }); - it("adds and retrieves multiple items", function () { + it('adds and retrieves multiple items', function () { return map.put(1, 1).then(function () { return map.put(1, 2); }).then(function () { @@ -75,7 +74,7 @@ describe("MultiMap Proxy", function () { }); }); - it("reports change after put", function () { + it('reports change after put', function () { return map.put(1, 1).then(function () { return map.put(1, 2); }).then(function (changed) { @@ -83,7 +82,7 @@ describe("MultiMap Proxy", function () { }); }); - it("reports no change after put", function () { + it('reports no change after put', function () { return map.put(1, 1).then(function () { return map.put(1, 1); }).then(function (changed) { @@ -91,8 +90,8 @@ describe("MultiMap Proxy", function () { }); }); - it("adds and removes a single entry", function () { - var puts = [map.put(1, 1), map.put(1, 3), map.put(1, 5)]; + it('adds and removes a single entry', function () { + const puts = [map.put(1, 1), map.put(1, 3), map.put(1, 5)]; return Promise.all(puts).then(function () { return map.remove(1, 3); }).then(function () { @@ -102,7 +101,7 @@ describe("MultiMap Proxy", function () { }); }); - it("reports change after remove", function () { + it('reports change after remove', function () { return map.put(1, 1).then(function () { return map.remove(1, 1); }).then(function (removed) { @@ -110,7 +109,7 @@ describe("MultiMap Proxy", function () { }); }); - it("reports no change after remove", function () { + it('reports no change after remove', function () { return map.put(1, 1).then(function () { return map.remove(1, 2); }).then(function (removed) { @@ -118,8 +117,8 @@ describe("MultiMap Proxy", function () { }); }); - it("removes all values from key", function () { - var puts = [map.put(1, 1), map.put(1, 3), map.put(1, 5)]; + it('removes all values from key', function () { + const puts = [map.put(1, 1), map.put(1, 3), map.put(1, 5)]; return Promise.all(puts).then(function () { return map.removeAll(1); }).then(function (oldValues) { @@ -130,8 +129,8 @@ describe("MultiMap Proxy", function () { }); }); - it("returns a key set", function () { - var puts = [map.put(1, 1), map.put(2, 3), map.put(3, 5)]; + it('returns a key set', function () { + const puts = [map.put(1, 1), map.put(2, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.keySet(); }).then(function (keySet) { @@ -139,8 +138,8 @@ describe("MultiMap Proxy", function () { }); }); - it("returns all values", function () { - var puts = [map.put(1, 1), map.put(2, 3), map.put(3, 5)]; + it('returns all values', function () { + const puts = [map.put(1, 1), map.put(2, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.values(); }).then(function (values) { @@ -148,29 +147,26 @@ describe("MultiMap Proxy", function () { }); }); - it("returns entry set", function () { - var puts = [map.put(1, 1), map.put(2, 3), map.put(3, 5)]; + it('returns entry set', function () { + const puts = [map.put(1, 1), map.put(2, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.entrySet(); }).then(function (entrySet) { - var initialValue = {}; - - var entries = entrySet.reduce(function (obj, tuple) { + const initialValue = {}; + const entries = entrySet.reduce(function (obj, tuple) { obj[tuple[0]] = tuple[1]; return obj; }, initialValue); - - var expected = { + const expected = { 1: 1, 2: 3, 3: 5 }; - expect(entries).to.deep.equal(expected); }); }); - it("contains a key", function () { + it('contains a key', function () { return map.put(1, 1).then(function () { return map.containsKey(1); }).then(function (contains) { @@ -178,7 +174,7 @@ describe("MultiMap Proxy", function () { }); }); - it("does not contain a key", function () { + it('does not contain a key', function () { return map.put(1, 1).then(function () { return map.containsKey(4); }).then(function (contains) { @@ -186,8 +182,8 @@ describe("MultiMap Proxy", function () { }); }); - it("contains a value", function () { - var puts = [map.put(1, 2), map.put(1, 3), map.put(3, 5)]; + it('contains a value', function () { + const puts = [map.put(1, 2), map.put(1, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.containsValue(3); }).then(function (contains) { @@ -195,8 +191,8 @@ describe("MultiMap Proxy", function () { }); }); - it("contains an entry", function () { - var puts = [map.put(1, 2), map.put(1, 3), map.put(3, 5)]; + it('contains an entry', function () { + const puts = [map.put(1, 2), map.put(1, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.containsEntry(1, 3); }).then(function (contains) { @@ -204,8 +200,8 @@ describe("MultiMap Proxy", function () { }); }); - it("does not contain an entry", function () { - var puts = [map.put(1, 2), map.put(1, 3), map.put(3, 5)]; + it('does not contain an entry', function () { + const puts = [map.put(1, 2), map.put(1, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.containsEntry(1, 5); }).then(function (contains) { @@ -213,8 +209,8 @@ describe("MultiMap Proxy", function () { }); }); - it("returns correct size", function () { - var puts = [map.put(1, 1), map.put(1, 3), map.put(3, 5)]; + it('returns correct size', function () { + const puts = [map.put(1, 1), map.put(1, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.size(); }).then(function (size) { @@ -222,8 +218,8 @@ describe("MultiMap Proxy", function () { }); }); - it("returns correct value count", function () { - var puts = [map.put(1, 1), map.put(1, 3), map.put(3, 5)]; + it('returns correct value count', function () { + const puts = [map.put(1, 1), map.put(1, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.valueCount(1); }).then(function (valueCount) { @@ -231,8 +227,8 @@ describe("MultiMap Proxy", function () { }); }); - it("clears", function () { - var puts = [map.put(1, 1), map.put(1, 3), map.put(3, 5)]; + it('clears', function () { + const puts = [map.put(1, 1), map.put(1, 3), map.put(3, 5)]; return Promise.all(puts).then(function () { return map.clear(); }).then(function () { diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index 29c31e8fe..f70232fb5 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -13,36 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('../RC'); -var Client = require('../..').Client; -var Config = require('../..').Config; -var fs = require('fs'); -var IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); -var DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortInvalidationMetadataEntryProcessor'); -var Promise = require('bluebird'); -var expect = require('chai').expect; +const expect = require('chai').expect; +const fs = require('fs'); +const Promise = require('bluebird'); +const RC = require('../RC'); +const Client = require('../..').Client; + +const IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +const DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortInvalidationMetadataEntryProcessor'); describe('Invalidation metadata distortion', function () { - var cluster; - var member; - var client; - var validationClient; - var mapName = 'nc-map'; - var mapSize = 10; + let cluster; + let client; + let validationClient; + const mapName = 'nc-map'; + const mapSize = 10; before(function () { - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function (cl) { - cluster = cl; - return Controller.startMember(cluster.id); - }).then(function (mem) { - member = mem; - }); + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')) + .then(function (cl) { + cluster = cl; + return RC.startMember(cluster.id); + }); }); after(function () { - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); afterEach(function () { @@ -51,15 +50,19 @@ describe('Invalidation metadata distortion', function () { }); function createConfig(withNearCache) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; + const cfg = { + clusterName: cluster.id, + nearCaches: {}, + serialization: { + defaultNumberType: 'integer', + dataSerializableFactories: { + 66: new IdentifiedFactory() + } + } + }; if (withNearCache) { - var ncc = new Config.NearCacheConfig(); - ncc.name = mapName; - cfg.nearCacheConfigs[mapName] = ncc; + cfg.nearCaches[mapName] = {}; } - cfg.serializationConfig.defaultNumberType = "integer"; - cfg.serializationConfig.dataSerializableFactories[66] = new IdentifiedFactory(); return cfg; } @@ -75,23 +78,25 @@ describe('Invalidation metadata distortion', function () { it('lost invalidation', function (done) { this.timeout(13000); - var stopTest = false; - var map; - var populatePromises = []; - var ignoredKey = mapSize; + let stopTest = false; + let map; + const populatePromises = []; + const ignoredKey = mapSize; client.getMap(mapName).then(function (mp) { map = mp; - for (var i = 0; i < mapSize; i++) { + for (let i = 0; i < mapSize; i++) { populatePromises.push(map.put(i, i)); } populatePromises.push(map.put(ignoredKey, ignoredKey)); }).then(function () { return Promise.all(populatePromises).then(function () { - map.executeOnKey(ignoredKey, new DistortInvalidationMetadataEntryProcessor(mapName, mapSize, 5)).then(function () { - stopTest = true; - }).catch(function (err) { - done(err); - }); + map.executeOnKey(ignoredKey, new DistortInvalidationMetadataEntryProcessor(mapName, mapSize, 5)) + .then(function () { + stopTest = true; + }) + .catch(function (err) { + done(err); + }); setTimeout(populateNearCacheAndCompare, 100); }) }); @@ -109,20 +114,20 @@ describe('Invalidation metadata distortion', function () { function populateNearCacheAndCompare() { if (!stopTest) { - var promises = []; - for (var i = 0; i < mapSize; i++) { + const promises = []; + for (let i = 0; i < mapSize; i++) { promises.push(map.get(i)); } Promise.all(promises).then(function () { setTimeout(populateNearCacheAndCompare, 0); }); } else { - var comparisonPromises = []; - for (var i = 0; i < mapSize; i++) { + const comparisonPromises = []; + for (let i = 0; i < mapSize; i++) { comparisonPromises.push(compareActualAndExpected(map, validationClient.getMap(mapName), i)); } Promise.all(comparisonPromises).then(() => { - done() + done(); }).catch(done); } } diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index fe25cec98..5da3db0bb 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -13,55 +13,77 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var RC = require('../RC'); -var HazelcastClient = require('../../').Client; -var expect = require('chai').expect; -var Config = require('../../').Config; -var fs = require('fs'); -var Long = require('long'); -var Util = require('../Util'); -var DeferredPromise = require('../../lib/Util').DeferredPromise; +const RC = require('../RC'); +const HazelcastClient = require('../../').Client; +const expect = require('chai').expect; +const fs = require('fs'); +const Long = require('long'); +const Util = require('../Util'); +const DeferredPromise = require('../../lib/Util').DeferredPromise; describe('LostInvalidation', function () { this.timeout(30000); - var cluster; - var member; - var client; - var modifyingClient; + let cluster; + let member; + let client; + let modifyingClient; - var entryCount = 1000; - var mapName = 'ncmap'; + const entryCount = 1000; + const mapName = 'ncmap'; - function createConfig() { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var ncConfig = new Config.NearCacheConfig(); - ncConfig.name = mapName; - cfg.nearCacheConfigs[mapName] = ncConfig; - cfg.properties['hazelcast.invalidation.reconciliation.interval.seconds'] = 1; - cfg.properties['hazelcast.invalidation.min.reconciliation.interval.seconds'] = 1; - cfg.properties['hazelcast.invalidation.max.tolerated.miss.count'] = 2; - return cfg; + function blockInvalidationEvents(client, nearCachedMap, notifyAfterNumberOfEvents) { + const listenerId = nearCachedMap.invalidationListenerId; + const clientRegistrationKey = client.getListenerService().activeRegistrations + .get(listenerId).get(client.getConnectionManager().getRandomConnection()); + const correlationId = clientRegistrationKey.correlationId; + const handler = client.getInvocationService().eventHandlers[correlationId].handler; + const deferred = DeferredPromise(); + let numberOfBlockedInvalidations = 0; + client.getInvocationService().eventHandlers[correlationId].handler = function () { + numberOfBlockedInvalidations++; + if (notifyAfterNumberOfEvents !== undefined && notifyAfterNumberOfEvents === numberOfBlockedInvalidations) { + deferred.resolve(); + } + }; + return { + handler, + correlationId, + notificationHandler: deferred.promise + }; + } + + function unblockInvalidationEvents(client, metadata) { + client.getInvocationService().eventHandlers[metadata.correlationId].handler = metadata.handler; } before(function () { - return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')).then(function (resp) { - cluster = resp; - return RC.startMember(cluster.id); - }).then(function (m) { - member = m; - }); + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_eventual_nearcache.xml', 'utf8')) + .then(function (resp) { + cluster = resp; + return RC.startMember(cluster.id); + }) + .then(function (m) { + member = m; + }); }); beforeEach(function () { - return HazelcastClient.newHazelcastClient(createConfig()).then(function (resp) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + nearCaches: { + [mapName]: {} + }, + properties: { + 'hazelcast.invalidation.reconciliation.interval.seconds': 1, + 'hazelcast.invalidation.min.reconciliation.interval.seconds': 1, + 'hazelcast.invalidation.max.tolerated.miss.count': 2 + } + }).then(function (resp) { client = resp; - - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); + return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); }).then(function (resp) { modifyingClient = resp; }); @@ -77,10 +99,12 @@ describe('LostInvalidation', function () { }); it('client eventually receives an update for which the invalidation event was dropped', function () { - var key = 'key'; - var value = 'val'; - var updatedval = 'updatedval'; - var invalidationHandlerStub; + const key = 'key'; + const value = 'val'; + const updatedval = 'updatedval'; + let map; + let invalidationHandlerStub; + return client.getMap(mapName).then(function (mp) { map = mp; return Util.promiseWaitMilliseconds(100) @@ -108,30 +132,31 @@ describe('LostInvalidation', function () { }); it('lost invalidation stress test', function () { - var invalidationHandlerStub; - var map; - var entries = []; + let invalidationHandlerStub; + let map; + let entries = []; + return client.getMap(mapName).then(function (mp) { map = mp; return Util.promiseWaitMilliseconds(100); }).then(function (resp) { invalidationHandlerStub = blockInvalidationEvents(client, map); - for (var i = 0; i < entryCount; i++) { + for (let i = 0; i < entryCount; i++) { entries.push([i, i]); } return modifyingClient.getMap(mapName); }).then(function (mp) { return mp.putAll(entries); }).then(function () { - var requestedKeys = []; - for (var i = 0; i < entryCount; i++) { + const requestedKeys = []; + for (let i = 0; i < entryCount; i++) { requestedKeys.push(i); } - //populate near cache + // populate near cache return map.getAll(requestedKeys); }).then(function () { entries = []; - for (var i = 0; i < entryCount; i++) { + for (let i = 0; i < entryCount; i++) { entries.push([i, i + entryCount]); } return modifyingClient.getMap(mapName); @@ -141,9 +166,9 @@ describe('LostInvalidation', function () { unblockInvalidationEvents(client, invalidationHandlerStub); return Util.promiseWaitMilliseconds(2000); }).then(function () { - var promises = []; - for (var i = 0; i < entryCount; i++) { - var promise = (function (key) { + const promises = []; + for (let i = 0; i < entryCount; i++) { + const promise = (function (key) { return map.get(key).then((val) => { return expect(val).to.equal(key + entryCount); }); @@ -153,24 +178,4 @@ describe('LostInvalidation', function () { return Promise.all(promises); }); }); - - function blockInvalidationEvents(client, nearCachedMap, notifyAfterNumberOfEvents) { - var listenerId = nearCachedMap.invalidationListenerId; - var clientRegistrationKey = client.getListenerService().activeRegistrations.get(listenerId).get(client.getConnectionManager().getRandomConnection()); - var correlationId = clientRegistrationKey.correlationId; - var handler = client.getInvocationService().eventHandlers[correlationId].handler; - var numberOfBlockedInvalidations = 0; - var deferred = DeferredPromise(); - client.getInvocationService().eventHandlers[correlationId].handler = function () { - numberOfBlockedInvalidations++; - if (notifyAfterNumberOfEvents !== undefined && notifyAfterNumberOfEvents === numberOfBlockedInvalidations) { - deferred.resolve(); - } - }; - return {handler: handler, correlationId: correlationId, notificationHandler: deferred.promise}; - } - - function unblockInvalidationEvents(client, metadata) { - client.getInvocationService().eventHandlers[metadata.correlationId].handler = metadata.handler; - } }); diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index e366c613f..40e674136 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -13,34 +13,54 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var RC = require('../RC'); -var HazelcastClient = require('../../').Client; -var expect = require('chai').expect; -var Config = require('../../').Config; -var fs = require('fs'); -var Util = require('../Util'); -var DeferredPromise = require('../../lib/Util').DeferredPromise; +const RC = require('../RC'); +const HazelcastClient = require('../../').Client; +const expect = require('chai').expect; +const fs = require('fs'); +const Util = require('../Util'); +const DeferredPromise = require('../../lib/Util').DeferredPromise; + +describe('MigratedDataTest', function () { -describe('MigratedData', function () { this.timeout(20000); - var cluster; - var member1; - var member2; - var client; + let cluster; + let member1, member2; + let client; + + const mapName = 'ncmap'; - var mapName = 'ncmap'; + function waitForPartitionTableEvent(partitionService) { + const deferred = DeferredPromise(); + const expectedPartitionCount = partitionService.partitionCount; - function createConfig() { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var ncConfig = new Config.NearCacheConfig(); - ncConfig.name = mapName; - cfg.nearCacheConfigs[mapName] = ncConfig; - cfg.properties['hazelcast.invalidation.reconciliation.interval.seconds'] = 1; - cfg.properties['hazelcast.invalidation.min.reconciliation.interval.seconds'] = 1; - return cfg; + function checkPartitionTable(remainingTries) { + if (partitionService.partitionTable.partitions.size === expectedPartitionCount) { + deferred.resolve(); + } else if (remainingTries > 0) { + setTimeout(checkPartitionTable, 1000, remainingTries - 1); + } else { + deferred.reject(new Error('Partition table is not received!')); + } + } + checkPartitionTable(10); + return deferred.promise; + } + + function waitUntilPartitionMovesTo(partitionService, partitionId, uuid) { + const deferred = DeferredPromise(); + (function resolveOrTimeout(remainingTries) { + if (partitionService.getPartitionOwner(partitionId).toString() === uuid) { + deferred.resolve(); + } else if (remainingTries > 0) { + setTimeout(resolveOrTimeout, 1000, remainingTries - 1); + } else { + deferred.reject(new Error('Partition ' + partitionId + ' was not moved to ' + uuid)); + } + })(20); + return deferred.promise; } before(function () { @@ -56,7 +76,16 @@ describe('MigratedData', function () { }); beforeEach(function () { - return HazelcastClient.newHazelcastClient(createConfig()).then(function (resp) { + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + nearCaches: { + [mapName]: {} + }, + properties: { + 'hazelcast.invalidation.reconciliation.interval.seconds': 1, + 'hazelcast.invalidation.min.reconciliation.interval.seconds': 1 + } + }).then(function (resp) { client = resp; }); }); @@ -69,11 +98,12 @@ describe('MigratedData', function () { return RC.terminateCluster(cluster.id); }); - it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', function () { - var map; - var survivingMember; - var key = 1; - var partitionService = client.getPartitionService(); + it('killing a server migrates data to the other node, migrated data has new uuid, near cache discards data with old uuid', () => { + let map; + let survivingMember; + const key = 1; + const partitionService = client.getPartitionService(); + return client.getMap(mapName).then(function (mp) { map = mp; return map.put(key, 1); @@ -84,8 +114,8 @@ describe('MigratedData', function () { }).then(function () { return waitForPartitionTableEvent(partitionService); }).then(function () { - var partitionIdForKey = partitionService.getPartitionId(key); - var keyOwner = partitionService.getPartitionOwner(partitionIdForKey).toString(); + const partitionIdForKey = partitionService.getPartitionId(key); + const keyOwner = partitionService.getPartitionOwner(partitionIdForKey).toString(); if (keyOwner === member1.uuid) { survivingMember = member2; return RC.terminateMember(cluster.id, member1.uuid); @@ -94,48 +124,17 @@ describe('MigratedData', function () { return RC.terminateMember(cluster.id, member2.uuid); } }).then(function () { - var partitionIdForKey = partitionService.getPartitionId(key); + const partitionIdForKey = partitionService.getPartitionId(key); return waitUntilPartitionMovesTo(partitionService, partitionIdForKey, survivingMember.uuid); }).then(function () { return Util.promiseWaitMilliseconds(1500); }).then(function () { return map.get(key); }).then(function () { - var stats = map.nearCache.getStatistics(); + const stats = map.nearCache.getStatistics(); expect(stats.hitCount).to.equal(1); expect(stats.missCount).to.equal(2); expect(stats.entryCount).to.equal(1); }) }); - - function waitForPartitionTableEvent(partitionService) { - var deferred = DeferredPromise(); - var expectedPartitionCount = partitionService.partitionCount; - - function checkPartitionTable(remainingTries) { - if (partitionService.partitionTable.partitions.size === expectedPartitionCount) { - deferred.resolve(); - } else if (remainingTries > 0) { - setTimeout(checkPartitionTable, 1000, remainingTries - 1); - } else { - deferred.reject(new Error('Partition table is not received!')); - } - } - checkPartitionTable(10); - return deferred.promise; - } - - function waitUntilPartitionMovesTo(partitionService, partitionId, uuid) { - var deferred = DeferredPromise(); - (function resolveOrTimeout(remainingTries) { - if (partitionService.getPartitionOwner(partitionId).toString() === uuid) { - deferred.resolve(); - } else if (remainingTries > 0) { - setTimeout(resolveOrTimeout, 1000, remainingTries - 1); - } else { - deferred.reject(new Error('Partition ' + partitionId + ' was not moved to ' + uuid)); - } - })(20); - return deferred.promise; - } }); diff --git a/test/nearcache/NearCacheSimpleInvalidationTest.js b/test/nearcache/NearCacheSimpleInvalidationTest.js index fbf70580a..7005239b2 100644 --- a/test/nearcache/NearCacheSimpleInvalidationTest.js +++ b/test/nearcache/NearCacheSimpleInvalidationTest.js @@ -13,49 +13,43 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var fs = require('fs'); -var chai = require('chai'); -var chaiAsPromised = require('chai-as-promised'); +const fs = require('fs'); +const chai = require('chai'); +const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); -var expect = chai.expect; -var Config = require('../../.').Config; -var Controller = require('../RC'); -var HazelcastClient = require('../../.').Client; +const expect = chai.expect; -describe('NearCacheSimpleInvalidation', function () { - var cluster; - var client; - var updaterClient; - var mapName = 'nccmap'; +const RC = require('../RC'); +const Client = require('../../.').Client; - function createClientConfig() { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var ncConfig = new Config.NearCacheConfig(); - ncConfig.name = mapName; - cfg.nearCacheConfigs[mapName] = ncConfig; - return cfg; - } +describe('NearCacheSimpleInvalidationTest', function () { + + let cluster, client; + let updaterClient; + const mapName = 'nccmap'; [false, true].forEach(function (batchInvalidationEnabled) { describe('batch invalidations enabled=' + batchInvalidationEnabled, function () { before(function () { - if (batchInvalidationEnabled) { - var clusterConfig = null; - } else { - var clusterConfig = fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8'); + let clusterConfig = null; + if (!batchInvalidationEnabled) { + clusterConfig = fs.readFileSync(__dirname + '/hazelcast_nearcache_batchinvalidation_false.xml', 'utf8'); } - return Controller.createCluster(null, clusterConfig).then(function (res) { + return RC.createCluster(null, clusterConfig).then(function (res) { cluster = res; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient(createClientConfig()); + return Client.newHazelcastClient({ + clusterName: cluster.id, + nearCaches: { + [mapName]: {} + } + }); }).then(function (cl) { client = cl; - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (cl) { updaterClient = cl; }); @@ -64,37 +58,37 @@ describe('NearCacheSimpleInvalidation', function () { after(function () { client.shutdown(); updaterClient.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('client observes outside invalidations', function () { - this.timeout(4000); - var entryCount = 1000; - var map; + this.timeout(10000); + const entryCount = 1000; + let map; return client.getMap(mapName).then(function (mp) { map = mp; - var getPromise = Promise.resolve(); - for (var i = 0; i < entryCount; i++) { + let getPromise = Promise.resolve(); + for (let i = 0; i < entryCount; i++) { getPromise = getPromise.then(map.get.bind(map, '' + i)); } return getPromise; }).then(function () { - var stats = map.nearCache.getStatistics(); + const stats = map.nearCache.getStatistics(); expect(stats.missCount).to.equal(entryCount); expect(stats.entryCount).to.equal(entryCount); - var putPromise = Promise.resolve(); - for (var i = 0; i < entryCount; i++) { + let putPromise = Promise.resolve(); + for (let i = 0; i < entryCount; i++) { putPromise = putPromise.then(map.put.bind(map, '' + i, 'changedvalue', undefined)); } return putPromise; }).then(function () { - var getPromise = Promise.resolve(); - for (var i = 0; i < entryCount; i++) { + let getPromise = Promise.resolve(); + for (let i = 0; i < entryCount; i++) { getPromise = getPromise.then(map.get.bind(map, '' + i)); } return getPromise; }).then(function () { - var stats = map.nearCache.getStatistics(); + const stats = map.nearCache.getStatistics(); expect(stats.entryCount).to.equal(entryCount); expect(stats.hitCount).to.equal(0); expect(stats.missCount).to.equal(entryCount * 2); diff --git a/test/nearcache/NearCacheTest.js b/test/nearcache/NearCacheTest.js index 2bf10161a..83c6e893a 100644 --- a/test/nearcache/NearCacheTest.js +++ b/test/nearcache/NearCacheTest.js @@ -13,38 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); -var chaiAsPromised = require('chai-as-promised'); +const chai = require('chai'); +const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); -var expect = chai.expect; -var Config = require('../../.').Config; -var Controller = require('../RC'); -var HazelcastClient = require('../../.').Client; -var DataRecord = require('../../lib/nearcache/DataRecord').DataRecord; -var NearCacheImpl = require('../../lib/nearcache/NearCache').NearCacheImpl; -var EvictionPolicy = Config.EvictionPolicy; -var promiseLater = require('../Util').promiseLater; -var SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; -describe('NearCacheImpl', function () { - var cluster; - var client; - - var invalidateOnChange = [false, true]; - var ttls = [0, 1]; - var evictionPolicy = [EvictionPolicy.LFU, EvictionPolicy.LRU, EvictionPolicy.RANDOM, EvictionPolicy.NONE]; - - var testConfigs = []; - +const expect = chai.expect; + +const DataRecord = require('../../lib/nearcache/DataRecord').DataRecord; +const NearCacheImpl = require('../../lib/nearcache/NearCache').NearCacheImpl; +const { Config } = require('../..'); +const EvictionPolicy = Config.EvictionPolicy; +const SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const { NearCacheConfigImpl } = require('../../lib/config/NearCacheConfig'); +const { SerializationConfigImpl } = require('../../lib/config/SerializationConfig'); +const promiseLater = require('../Util').promiseLater; + +describe('NearCacheTest', function () { + + const invalidateOnChange = [false, true]; + const ttls = [0, 1]; + const evictionPolicy = [EvictionPolicy.LFU, EvictionPolicy.LRU, EvictionPolicy.RANDOM, EvictionPolicy.NONE]; + const testConfigs = []; evictionPolicy.forEach(function (evictionPolicy) { invalidateOnChange.forEach(function (ioc) { ttls.forEach(function (ttl) { - var ncc = new Config.NearCacheConfig(); - ncc.invalidateOnChange = ioc; - ncc.timeToLiveSeconds = ttl; - ncc.evictionMaxSize = 100; - ncc.evictionPolicy = evictionPolicy; - testConfigs.push(ncc); + const testConfig = new NearCacheConfigImpl(); + testConfig.invalidateOnChange = ioc; + testConfig.timeToLiveSeconds = ttl; + testConfig.evictionMaxSize = 100; + testConfig.evictionPolicy = evictionPolicy; + testConfigs.push(testConfig); }); }); }); @@ -58,31 +57,26 @@ describe('NearCacheImpl', function () { equals(other) { return this.val === other.val; } - } + }; } - before(function () { - return Controller.createCluster(null, null).then(function (res) { - cluster = res; - return Controller.startMember(cluster.id); - }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); - }).then(function (cl) { - client = cl; - }); - }); + function createSerializationService() { + const cfg = new SerializationConfigImpl(); + return new SerializationService(cfg); + } - after(function () { - client.shutdown(); - return Controller.terminateCluster(cluster.id); - }); + function promiseBefore(boundaryInSec, func) { + return promiseLater(boundaryInSec * 250, func); + } + + function promiseAfter(boundaryInSec, func) { + return promiseLater(boundaryInSec * 1500, func); + } describe('CacheRecord', function () { it('does not expire if ttl is 0', function (done) { - var rec = new DataRecord(ds('key'), 'value', undefined, 0); + const rec = new DataRecord(ds('key'), 'value', undefined, 0); setTimeout(function () { if (rec.isExpired()) { done(new Error('Unlimited ttl record expired')); @@ -93,7 +87,7 @@ describe('NearCacheImpl', function () { }); it('expires after ttl', function (done) { - var rec = new DataRecord(ds('key'), 'value', undefined, 1); + const rec = new DataRecord(ds('key'), 'value', undefined, 1); setTimeout(function () { if (rec.isExpired()) { done(); @@ -104,7 +98,7 @@ describe('NearCacheImpl', function () { }); it('does not expire before ttl', function (done) { - var rec = new DataRecord(ds('key'), 'value', undefined, 10); + const rec = new DataRecord(ds('key'), 'value', undefined, 10); setTimeout(function () { if (rec.isExpired()) { done(new Error('Record expired before ttl')); @@ -116,7 +110,7 @@ describe('NearCacheImpl', function () { it('expires after maxIdleSeconds', function (done) { this.timeout(4000); - var rec = new DataRecord(ds('key'), 'value', undefined, 100); + const rec = new DataRecord(ds('key'), 'value', undefined, 100); setTimeout(function () { if (rec.isExpired(1)) { done(); @@ -127,7 +121,7 @@ describe('NearCacheImpl', function () { }); it('does not expire while active', function (done) { - var rec = new DataRecord(ds('key'), 'value', undefined, 100); + const rec = new DataRecord(ds('key'), 'value', undefined, 100); setTimeout(function () { rec.setAccessTime(); if (rec.isExpired(1)) { @@ -142,15 +136,13 @@ describe('NearCacheImpl', function () { testConfigs.forEach(function (testConfig) { describe(testConfig.toString(), function () { - - var nearCache; + let nearCache; beforeEach(function () { nearCache = new NearCacheImpl(testConfig, createSerializationService()); nearCache.setReady(); }); - it('simple put/get', function () { nearCache.put(ds('key'), 'val'); return nearCache.get(ds('key')).then((res) => { @@ -158,7 +150,6 @@ describe('NearCacheImpl', function () { }); }); - it('returns undefined for non existing value', function () { return nearCache.get(ds('random')).then(() => { return expect(nearCache.getStatistics().missCount).to.equal(1); @@ -166,53 +157,58 @@ describe('NearCacheImpl', function () { }); it('record does not expire if ttl is 0', function () { - if (nearCache.timeToLiveSeconds != 0) { + if (nearCache.timeToLiveSeconds !== 0) { this.skip(); } nearCache.put(ds('key'), 'val'); - return expect(promiseAfter(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.equal('val'); + return expect(promiseAfter(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))) + .to.eventually.equal('val'); }); it('ttl expire', function () { - if (nearCache.timeToLiveSeconds == 0) { + if (nearCache.timeToLiveSeconds === 0) { this.skip(); } nearCache.put(ds('key'), 'val'); - return expect(promiseAfter(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.be.undefined; + return expect(promiseAfter(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))) + .to.eventually.be.undefined; }); it('ttl does not expire early', function () { nearCache.put(ds('key'), 'val'); - return expect(promiseBefore(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.equal('val'); + return expect(promiseBefore(testConfig.timeToLiveSeconds, nearCache.get.bind(nearCache, ds('key')))) + .to.eventually.equal('val'); }); it('evicted after maxIdleSeconds', function () { - if (nearCache.maxIdleSeconds == 0) { + if (nearCache.maxIdleSeconds === 0) { this.skip(); } nearCache.put(ds('key'), 'val'); - return expect(promiseAfter(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.be.undefined; + return expect(promiseAfter(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))) + .to.eventually.be.undefined; }); it('not evicted after maxIdleSeconds if maxIdleSeconds is 0(unlimited)', function () { - if (nearCache.maxIdleSeconds != 0) { + if (nearCache.maxIdleSeconds !== 0) { this.skip(); } nearCache.put(ds('key'), 'val'); - return expect(promiseAfter(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.equal('val'); + return expect(promiseAfter(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))) + .to.eventually.equal('val'); }); it('not evicted before maxIdleSeconds', function () { nearCache.put(ds('key'), 'val'); - return expect(promiseBefore(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))).to.eventually.equal('val'); + return expect(promiseBefore(testConfig.maxIdleSeconds, nearCache.get.bind(nearCache, ds('key')))) + .to.eventually.equal('val'); }); it('evicts entries after eviction max size is reached', function () { - if (nearCache.evictionPolicy == EvictionPolicy.NONE) { + if (nearCache.evictionPolicy === EvictionPolicy.NONE) { this.skip(); } - var i; - for (i = 0; i < nearCache.evictionMaxSize + 1; i++) { + for (let i = 0; i < nearCache.evictionMaxSize + 1; i++) { nearCache.put(ds('k' + i), 'v' + i); } expect(nearCache.getStatistics().evictedCount).to.equal(1); @@ -223,8 +219,7 @@ describe('NearCacheImpl', function () { if (nearCache.evictionPolicy === EvictionPolicy.NONE || nearCache.timeToLiveSeconds === 0) { this.skip(); } - var i; - for (i = 0; i < nearCache.evictionMaxSize; i++) { + for (let i = 0; i < nearCache.evictionMaxSize; i++) { nearCache.put(ds('k' + i), 'v' + i); } promiseAfter(nearCache.timeToLiveSeconds, function () { @@ -245,33 +240,19 @@ describe('NearCacheImpl', function () { describe('InMemory format', function () { it('Object', function () { - var nearCacheConfig = new Config.NearCacheConfig(); + const nearCacheConfig = new NearCacheConfigImpl(); nearCacheConfig.inMemoryFormat = Config.InMemoryFormat.OBJECT; - var nearCache = new NearCacheImpl(nearCacheConfig, createSerializationService()); + const nearCache = new NearCacheImpl(nearCacheConfig, createSerializationService()); nearCache.put(ds('k'), 'v'); expect(nearCache.internalStore.get(ds('k')).value).to.be.a('string'); }); it('Binary', function () { - var nearCacheConfig = new Config.NearCacheConfig(); + const nearCacheConfig = new NearCacheConfigImpl(); nearCacheConfig.inMemoryFormat = Config.InMemoryFormat.BINARY; - var nearCache = new NearCacheImpl(nearCacheConfig, createSerializationService()); + const nearCache = new NearCacheImpl(nearCacheConfig, createSerializationService()); nearCache.put(ds('k'), 'v'); expect(nearCache.internalStore.get(ds('k')).value).to.not.be.a('string'); }); }); - - function createSerializationService() { - var cfg = new Config.ClientConfig().serializationConfig; - return new SerializationService(undefined, cfg); - } - - function promiseBefore(boundaryInSec, func) { - return promiseLater(boundaryInSec * 250, func); - } - - function promiseAfter(boundaryInSec, func) { - return promiseLater(boundaryInSec * 1500, func); - } - }); diff --git a/test/nearcache/impl/RepairingTaskTest.js b/test/nearcache/impl/RepairingTaskTest.js index e65ae8ad1..f2658a438 100644 --- a/test/nearcache/impl/RepairingTaskTest.js +++ b/test/nearcache/impl/RepairingTaskTest.js @@ -13,25 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('../../../').Client; -var Config = require('../../../').Config; -var Controller = require('../../RC'); -var chai = require('chai'); -var expect = chai.expect; +const Client = require('../../../').Client; +const RC = require('../../RC'); +const chai = require('chai'); +const expect = chai.expect; describe('RepairingTask', function () { - var cluster; - var member; - var client; + let cluster; + let client; before(function () { - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); - }).then(function (me) { - member = me; + return RC.startMember(cluster.id); }); }); @@ -42,17 +39,19 @@ describe('RepairingTask', function () { }); after(function () { - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - function startClientWithReconciliationInterval(reconciliationInterval) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var nccConfig = new Config.NearCacheConfig(); - nccConfig.name = 'test'; - cfg.nearCacheConfigs['test'] = nccConfig; - cfg.properties['hazelcast.invalidation.reconciliation.interval.seconds'] = reconciliationInterval; - return Client.newHazelcastClient(cfg).then(function (cl) { + function startClientWithReconciliationInterval(interval) { + return Client.newHazelcastClient({ + clusterName: cluster.id, + nearCaches: { + 'test': {} + }, + properties: { + 'hazelcast.invalidation.reconciliation.interval.seconds': interval + } + }).then(function (cl) { client = cl; }); } diff --git a/test/pncounter/PNCounterBasicTest.js b/test/pncounter/PNCounterBasicTest.js index dc4ad49e1..82152232f 100644 --- a/test/pncounter/PNCounterBasicTest.js +++ b/test/pncounter/PNCounterBasicTest.js @@ -13,26 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var RC = require('../RC'); -var Client = require('../../').Client; -var Config = require('../../').Config; +const expect = require('chai').expect; +const RC = require('../RC'); +const Client = require('../../').Client; describe('PNCounterBasicTest', function () { - var cluster; - var client; - var pncounter; + let cluster; + let client; + let pnCounter; before(function () { return RC.createCluster(null, null).then(function (cl) { cluster = cl; return RC.startMember(cluster.id); }).then(function (member) { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (cl) { client = cl; }); @@ -45,60 +43,60 @@ describe('PNCounterBasicTest', function () { beforeEach(function () { return client.getPNCounter('pncounter').then(function (counter) { - pncounter = counter; - }) + pnCounter = counter; + }); }); afterEach(function () { - return pncounter.destroy(); + return pnCounter.destroy(); }); function testPNCounterMethod(promise, returnVal, postOperation) { return promise.then(function (value) { expect(value.toNumber()).to.equal(returnVal); - return pncounter.get(); + return pnCounter.get(); }).then(function (value) { return expect(value.toNumber()).to.equal(postOperation); }); } it('get', function () { - return pncounter.getAndAdd(4).then(function (value) { - return pncounter.get(); + return pnCounter.getAndAdd(4).then(function (value) { + return pnCounter.get(); }).then(function (value) { return expect(value.toNumber()).to.equal(4); }); }); it('getAndAdd', function () { - return testPNCounterMethod(pncounter.getAndAdd(3), 0, 3); + return testPNCounterMethod(pnCounter.getAndAdd(3), 0, 3); }); it('addAndGet', function () { - return testPNCounterMethod(pncounter.addAndGet(3), 3, 3); + return testPNCounterMethod(pnCounter.addAndGet(3), 3, 3); }); it('getAndSubtract', function () { - return testPNCounterMethod(pncounter.getAndSubtract(3), 0, -3); + return testPNCounterMethod(pnCounter.getAndSubtract(3), 0, -3); }); it('subtractAndGet', function () { - return testPNCounterMethod(pncounter.subtractAndGet(3), -3, -3); + return testPNCounterMethod(pnCounter.subtractAndGet(3), -3, -3); }); it('decrementAndGet', function () { - return testPNCounterMethod(pncounter.decrementAndGet(3), -1, -1); + return testPNCounterMethod(pnCounter.decrementAndGet(3), -1, -1); }); it('incrementAndGet', function () { - return testPNCounterMethod(pncounter.incrementAndGet(), 1, 1); + return testPNCounterMethod(pnCounter.incrementAndGet(), 1, 1); }); it('getAndDecrement', function () { - return testPNCounterMethod(pncounter.getAndDecrement(), 0, -1); + return testPNCounterMethod(pnCounter.getAndDecrement(), 0, -1); }); it('getAndIncrement', function () { - return testPNCounterMethod(pncounter.getAndIncrement(), 0, 1); + return testPNCounterMethod(pnCounter.getAndIncrement(), 0, 1); }); }); diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index a515fc4aa..8a2159ec9 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -13,36 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); +const chai = require('chai'); chai.use(require('chai-as-promised')); -var expect = require('chai').expect; -var RC = require('../RC'); -var Client = require('../../').Client; -const Config = require('../../').Config; -var Errors = require('../..').HazelcastErrors; -var fs = require('fs'); -var path = require('path'); +const expect = require('chai').expect; +const RC = require('../RC'); +const Client = require('../../').Client; +const Errors = require('../..').HazelcastErrors; +const fs = require('fs'); +const path = require('path'); describe('PNCounterConsistencyTest', function () { - var cluster; - var client; + let cluster; + let client; beforeEach(function () { this.timeout(10000); - return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')).then(function (cl) { - cluster = cl; - return RC.startMember(cluster.id); - }).then(function () { - return RC.startMember(cluster.id); - }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg); - }).then(function (value) { - client = value; - }); + return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')) + .then(function (cl) { + cluster = cl; + return RC.startMember(cluster.id); + }) + .then(function () { + return RC.startMember(cluster.id); + }) + .then(function () { + return Client.newHazelcastClient({ clusterName: cluster.id }); + }) + .then(function (value) { + client = value; + }); }); afterEach(function () { @@ -52,30 +54,30 @@ describe('PNCounterConsistencyTest', function () { }); it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () { - var pncounter; + let pnCounter; return client.getPNCounter('pncounter').then(function (counter) { - pncounter = counter; - return pncounter.getAndAdd(3) + pnCounter = counter; + return pnCounter.getAndAdd(3) }).then(function () { - var currentReplicaAddress = pncounter.currentTargetReplicaAddress; + const currentReplicaAddress = pnCounter.currentTargetReplicaAddress; return RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); }).then(function () { - return expect(pncounter.addAndGet(10)).to.be.rejectedWith(Errors.ConsistencyLostError); + return expect(pnCounter.addAndGet(10)).to.be.rejectedWith(Errors.ConsistencyLostError); }); }); it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () { - var pncounter; + let pnCounter; return client.getPNCounter('pncounter').then(function (counter) { - pncounter = counter; - return pncounter.getAndAdd(3); + pnCounter = counter; + return pnCounter.getAndAdd(3); }).then(function () { - var currentReplicaAddress = pncounter.currentTargetReplicaAddress; + const currentReplicaAddress = pnCounter.currentTargetReplicaAddress; return RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); }).then(function () { - return pncounter.reset(); + return pnCounter.reset(); }).then(function () { - return pncounter.addAndGet(10); + return pnCounter.addAndGet(10); }); }) }); diff --git a/test/pncounter/PNCounterWithLiteMembersTest.js b/test/pncounter/PNCounterWithLiteMembersTest.js index b08a66b69..6383a2d14 100644 --- a/test/pncounter/PNCounterWithLiteMembersTest.js +++ b/test/pncounter/PNCounterWithLiteMembersTest.js @@ -13,39 +13,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); +const chai = require('chai'); chai.use(require('chai-as-promised')); -var expect = chai.expect; -var Controller = require('../RC'); -var Client = require('../..').Client; -const Config = require('../..').Config; -var Errors = require('../..').HazelcastErrors; -var fs = require('fs'); -var path = require('path'); +const expect = chai.expect; +const RC = require('../RC'); +const Client = require('../..').Client; +const Errors = require('../..').HazelcastErrors; +const fs = require('fs'); +const path = require('path'); describe('PNCounterWithLiteMembersTest', function () { - var cluster; - var client; - var pncounter; + let cluster; + let client; + let pncounter; before(function () { - return Controller.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_litemember.xml'), 'utf8')).then(function (cl) { - cluster = cl; - return Controller.startMember(cluster.id); - }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg); - }).then(function (cl) { - client = cl; - }); + return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_litemember.xml'), 'utf8')) + .then(function (cl) { + cluster = cl; + return RC.startMember(cluster.id); + }) + .then(function () { + return Client.newHazelcastClient({ clusterName: cluster.id }); + }) + .then(function (cl) { + client = cl; + }); }); after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index 23ac8e80d..b11637132 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -13,45 +13,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); -var expect = chai.expect; -var chaiAsPromised = require('chai-as-promised'); +const chai = require('chai'); +const expect = chai.expect; +const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); -var Controller = require('./../RC'); -var Util = require('./../Util'); -var Promise = require('bluebird'); -var fs = require('fs'); +const RC = require('./../RC'); +const Util = require('./../Util'); +const Promise = require('bluebird'); +const fs = require('fs'); -var HazelcastClient = require('../../').Client; -var Config = require('../../').Config; -var ItemEventType = require('../../').ItemEventType; +const HazelcastClient = require('../../').Client; +const ItemEventType = require('../../').ItemEventType; -describe("Queue Proxy", function () { +describe('QueueProxyTest', function () { - var cluster; - var client; - var queue; - var serverConfig; + let cluster; + let client; + let queue; before(function () { this.timeout(10000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_queue.xml', 'utf8')).then(function (response) { - cluster = response; - return Controller.startMember(cluster.id); - }).then(function () { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_queue.xml', 'utf8')) + .then(function (response) { + cluster = response; + return RC.startMember(cluster.id); + }) + .then(function () { + return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + }).then(function (hazelcastClient) { client = hazelcastClient; }); - }); }); beforeEach(function () { return client.getQueue('ClientQueueTest').then(function (q) { queue = q; - return _offerToQueue(10); + return offerToQueue(10); }); }); @@ -59,12 +58,12 @@ describe("Queue Proxy", function () { return queue.destroy(); }); - function _offerToQueue(size, prefix) { + function offerToQueue(size, prefix) { if (prefix == null) { prefix = ''; } - var promises = []; - for (var i = 0; i < size; i++) { + const promises = []; + for (let i = 0; i < size; i++) { promises.push(queue.offer(prefix + 'item' + i)); } return Promise.all(promises); @@ -72,7 +71,7 @@ describe("Queue Proxy", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('size', function () { @@ -102,7 +101,7 @@ describe("Queue Proxy", function () { }); it('add throws if queue is full', function () { - return _offerToQueue(5, 'new').then(function () { + return offerToQueue(5, 'new').then(function () { return expect(queue.add('excess_item')).to.eventually.rejected; }); }); @@ -197,7 +196,7 @@ describe("Queue Proxy", function () { }); it('drainTo', function () { - var dummyArr = ['dummy_item']; + const dummyArr = ['dummy_item']; return queue.drainTo(dummyArr).then(function () { expect(dummyArr).to.have.lengthOf(11); expect(dummyArr).to.include.members(['item0', 'dummy_item', 'item3', 'item9']); @@ -205,7 +204,7 @@ describe("Queue Proxy", function () { }); it('drainTo with max elements', function () { - var dummyArr = ['dummy_item']; + const dummyArr = ['dummy_item']; return queue.drainTo(dummyArr, 2).then(function () { expect(dummyArr).to.have.lengthOf(3); expect(dummyArr).to.include.members(['item0', 'dummy_item', 'item1']); @@ -244,7 +243,7 @@ describe("Queue Proxy", function () { }); it('addAll', function () { - var values = ['a', 'b', 'c']; + const values = ['a', 'b', 'c']; return queue.addAll(values).then(function (retVal) { expect(retVal).to.be.true; return queue.toArray(); @@ -254,21 +253,21 @@ describe("Queue Proxy", function () { }); it('containsAll true', function () { - var values = ['item0', 'item1']; + const values = ['item0', 'item1']; return queue.containsAll(values).then(function (ret) { return expect(ret).to.be.true; }); }); it('containsAll true', function () { - var values = ['item0', 'item_absent']; + const values = ['item0', 'item_absent']; return queue.containsAll(values).then(function (ret) { return expect(ret).to.be.false; }); }); it('containsAll true', function () { - var values = []; + const values = []; return queue.containsAll(values).then(function (ret) { return expect(ret).to.be.true; }); @@ -283,7 +282,7 @@ describe("Queue Proxy", function () { }); it('removeAll', function () { - var cand = ['item1', 'item2']; + const cand = ['item1', 'item2']; return queue.removeAll(cand).then(function (retVal) { return expect(retVal).to.be.true; }).then(function () { @@ -294,7 +293,7 @@ describe("Queue Proxy", function () { }); it('retainAll changes queue', function () { - var retains = ['item1', 'item2']; + const retains = ['item1', 'item2']; return queue.retainAll(retains).then(function (r) { return expect(r).to.be.true; }).then(function () { @@ -306,7 +305,7 @@ describe("Queue Proxy", function () { it('retainAll does not change queue', function () { - var retains; + let retains; return queue.toArray().then(function (r) { retains = r; return queue.retainAll(r); diff --git a/test/remote_controller/Controller.js b/test/remote_controller/Controller.js index c6c187843..9bc52ee32 100644 --- a/test/remote_controller/Controller.js +++ b/test/remote_controller/Controller.js @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var thrift = require('thrift'); -var RemoteController = require('./RemoteController'); +const thrift = require('thrift'); +const RemoteController = require('./RemoteController'); function HzRemoteController(host, port) { + const transport = thrift.TBufferedTransport(); + const protocol = thrift.TBinaryProtocol(); - var transport = thrift.TBufferedTransport(); - var protocol = thrift.TBinaryProtocol(); - - var connection = thrift.createConnection('localhost', 9701, { + const connection = thrift.createConnection('localhost', 9701, { transport: transport, protocol: protocol }); diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 28d45a9c4..4cd96e957 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -13,38 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; -var expect = require('chai').expect; -var HazelcastClient = require('../../lib/index.js').Client; -var Config = require('../../lib/index.js').Config; -var Controller = require('./../RC'); -var Util = require('./../Util'); -var fs = require('fs'); -var path = require('path'); -var Promise = require('bluebird'); -var Predicates = require('../../lib/index.js').Predicates; +const expect = require('chai').expect; +const fs = require('fs'); +const path = require('path'); +const Promise = require('bluebird'); +const RC = require('./../RC'); +const Client = require('../..').Client; +const Predicates = require('../..').Predicates; -describe('ReplicatedMap Proxy', function () { +describe('ReplicatedMapProxyTest', function () { - var cluster; - var client; - var rm; - var ONE_HOUR = 3600000; + let cluster; + let client; + let rm; + const ONE_HOUR = 3600000; before(function () { this.timeout(10000); - var config = fs.readFileSync(path.join(__dirname, 'hazelcast_replicatedmap.xml'), 'utf8'); - return Controller.createCluster(null, config).then(function (response) { + const config = fs.readFileSync(path.join(__dirname, 'hazelcast_replicatedmap.xml'), 'utf8'); + return RC.createCluster(null, config).then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { - client = hazelcastClient; - }); + return Client.newHazelcastClient({ clusterName: cluster.id }); + }).then(function (hazelcastClient) { + client = hazelcastClient; }); }); @@ -60,7 +55,7 @@ describe('ReplicatedMap Proxy', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('puts one entry and gets one entry', function () { @@ -246,7 +241,7 @@ describe('ReplicatedMap Proxy', function () { }); it('returns values array sorted with custom comparator', function () { - var expectedArray = ['value3', 'value2', 'value1']; + const expectedArray = ['value3', 'value2', 'value1']; return rm.putAll([ ['key2', 'value2'], ['key3', 'value3'], @@ -277,11 +272,10 @@ describe('ReplicatedMap Proxy', function () { }); it('addEntryListener should be fired on adding new key-value pair', function (done) { - var registrationId; - - var listener = { + let registrationId; + const listener = { added: function (entryEvent) { - var error; + let error; try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('new-key'); @@ -305,14 +299,13 @@ describe('ReplicatedMap Proxy', function () { registrationId = listenerId; return rm.put('new-key', 'value', ONE_HOUR); }); - }); it('addEntryListener listens to remove event', function (done) { - var registrationId; - var listener = { + let registrationId; + const listener = { removed: function (entryEvent) { - var error; + let error; try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key-to-remove'); @@ -341,10 +334,10 @@ describe('ReplicatedMap Proxy', function () { }); it('addEntryListener listens to updated event', function (done) { - var registrationId; - var listener = { + let registrationId; + const listener = { updated: function (entryEvent) { - var error; + let error; try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key-to-update'); @@ -373,10 +366,10 @@ describe('ReplicatedMap Proxy', function () { }); it('addEntryListener listens to clearedAll event', function (done) { - var registrationId; - var listener = { + let registrationId; + const listener = { mapCleared: function (mapEvent) { - var error; + let error; try { expect(mapEvent.name).to.equal('test'); expect(mapEvent.numberOfAffectedEntries).to.equal(4); @@ -407,16 +400,15 @@ describe('ReplicatedMap Proxy', function () { }); it('addEntryListenerToKey should be fired only for selected key', function (done) { - var listeners = []; - - var listener1 = { + let listeners = []; + const listener1 = { added: function (entryEvent) { done(new Error('This listener must not be fired')); } }; - var listener2 = { + const listener2 = { added: function (entryEvent) { - var error; + let error; try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key1'); @@ -449,10 +441,10 @@ describe('ReplicatedMap Proxy', function () { }); it('addEntryListenerWithPredicate', function (done) { - var listenerId; - var listenerObject = { + let listenerId; + const listener = { added: function (entryEvent) { - var error; + let error; try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key10'); @@ -470,7 +462,7 @@ describe('ReplicatedMap Proxy', function () { } }; - rm.addEntryListenerWithPredicate(listenerObject, Predicates.sql('this == val10')) + rm.addEntryListenerWithPredicate(listener, Predicates.sql('this == val10')) .then(function (registrationId) { listenerId = registrationId; return rm.put('key10', 'val10', ONE_HOUR); @@ -478,10 +470,10 @@ describe('ReplicatedMap Proxy', function () { }); it('addEntryListenerToKeyWithPredicate', function (done) { - var listenerId; - var listenerObject = { + let listenerId; + const listenerObject = { added: function (entryEvent) { - var error; + let error; try { expect(entryEvent.name).to.equal('test'); expect(entryEvent.key).to.equal('key'); diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js index f3c2b3502..fb4a4efb3 100644 --- a/test/rest_value/RestValueTest.js +++ b/test/rest_value/RestValueTest.js @@ -17,12 +17,11 @@ 'use strict'; const expect = require('chai').expect; -const HazelcastClient = require('../../lib').Client; -const Config = require('../../lib').Config; -const Controller = require('../RC'); const fs = require('fs'); const http = require('http'); const querystring = require('querystring'); +const Client = require('../../lib').Client; +const RC = require('../RC'); const DeferredPromise = require('../../lib/Util').DeferredPromise; describe('RestValueTest', function () { @@ -33,15 +32,13 @@ describe('RestValueTest', function () { before(function () { this.timeout(32000); - return Controller.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_rest.xml', 'utf8')) + return RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_rest.xml', 'utf8')) .then(c => { cluster = c; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(m => { member = m; - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(config); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(c => { client = c; }); @@ -49,7 +46,7 @@ describe('RestValueTest', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('client should receive REST events from server as RestValue', function (done) { diff --git a/test/ringbuffer/LazyReadResultSetTest.js b/test/ringbuffer/LazyReadResultSetTest.js index 00ddf3924..e86b0065e 100644 --- a/test/ringbuffer/LazyReadResultSetTest.js +++ b/test/ringbuffer/LazyReadResultSetTest.js @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var LazyReadResultSet = require('../../lib/proxy/ringbuffer/LazyReadResultSet').LazyReadResultSet; -var HzErrors = require('../..').HazelcastErrors; +const expect = require('chai').expect; +const LazyReadResultSet = require('../../lib/proxy/ringbuffer/LazyReadResultSet').LazyReadResultSet; +const Errors = require('../..').HazelcastErrors; describe('LazyReadResultSetTest', function () { - var mockSerializationService = { - 'toObject': function (x) { + const mockSerializationService = { + toObject: function (x) { return x + 100; }, - - 'isData': function (x) { + isData: function (x) { return x < 3; } }; it('get', function () { - var set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); + const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); expect(set.get(0)).to.equal(101); expect(set.get(1)).to.equal(102); expect(set.get(2)).to.equal(3); @@ -44,12 +44,12 @@ describe('LazyReadResultSetTest', function () { }); it('getSequence throws UnsupportedOperationError when there is no info', function () { - var set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4]); - expect(set.getSequence.bind(set, 2)).to.throw(HzErrors.UnsupportedOperationError); + const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4]); + expect(set.getSequence.bind(set, 2)).to.throw(Errors.UnsupportedOperationError); }); it('get returns undefined for out of range index', function () { - var set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); + const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); expect(set.get(4)).to.be.undefined; }); }); diff --git a/test/ringbuffer/RingbufferTest.js b/test/ringbuffer/RingbufferTest.js index 787b85268..303e52bff 100644 --- a/test/ringbuffer/RingbufferTest.js +++ b/test/ringbuffer/RingbufferTest.js @@ -13,34 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var HazelcastClient = require('../../').Client; -const Config = require('../../').Config; -var Controller = require('./../RC'); -var Util = require('./../Util'); -var fs = require('fs'); -var PrefixFilter = require('../javaclasses/PrefixFilter'); -var Promise = require('bluebird'); +const expect = require("chai").expect; +const HazelcastClient = require('../../').Client; +const RC = require('./../RC'); +const Util = require('./../Util'); +const fs = require('fs'); +const PrefixFilter = require('../javaclasses/PrefixFilter'); +const Promise = require('bluebird'); describe("Ringbuffer Proxy", function () { - var cluster; - var client; - var rb; + let cluster; + let client; + let rb; before(function () { this.timeout(10000); - var config = fs.readFileSync(__dirname + '/hazelcast_ringbuffer.xml', 'utf8'); - return Controller.createCluster(null, config).then(function (response) { + const config = fs.readFileSync(__dirname + '/hazelcast_ringbuffer.xml', 'utf8'); + return RC.createCluster(null, config).then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { - client = hazelcastClient; - }); + return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + }).then(function (hazelcastClient) { + client = hazelcastClient; }); }); @@ -56,7 +54,7 @@ describe("Ringbuffer Proxy", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it("adds one item and reads back", function () { @@ -106,7 +104,7 @@ describe("Ringbuffer Proxy", function () { }); it("correctly reports head sequence", function () { - var limitedCapacity; + let limitedCapacity; return client.getRingbuffer("capacity").then(function (buffer) { limitedCapacity = buffer; return limitedCapacity.addAll([1, 2, 3, 4, 5]); @@ -118,7 +116,7 @@ describe("Ringbuffer Proxy", function () { }); it("correctly reports remaining capacity", function () { - var ttl = client.getRingbuffer("ttl-cap").then(function (buffer) { + let ttl = client.getRingbuffer("ttl-cap").then(function (buffer) { ttl = buffer; return ttl.addAll([1, 2]); }).then(function () { @@ -130,8 +128,7 @@ describe("Ringbuffer Proxy", function () { it("correctly reports total capacity", function () { return client.getRingbuffer("ttl-cap").then(function (buffer) { - ttl = buffer; - return ttl.capacity(); + return buffer.capacity(); }).then(function (capacity) { expect(capacity.toNumber()).to.equal(5); }); diff --git a/test/serialization/APortable.js b/test/serialization/APortable.js index 856dcb26b..78305e714 100644 --- a/test/serialization/APortable.js +++ b/test/serialization/APortable.js @@ -14,8 +14,10 @@ * limitations under the License. */ -function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, doubles, shorts, floats, ints, longs, strings, - portables, identifiedDataSerializable, customStreamSerializableObject, customByteArraySerializableObject, data) { +function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, + doubles, shorts, floats, ints, longs, strings, portables, + identifiedDataSerializable, customStreamSerializableObject, + customByteArraySerializableObject, data) { if (arguments.length === 0) return; this.bool = bool; this.b = b; @@ -44,11 +46,9 @@ function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, do this.bytesOffset = bytes.slice(1, 3); this.strChars = str.split(''); this.strBytes = Buffer.alloc(this.str.length); - for (var i = 0; i < str.length; i++) { + for (let i = 0; i < str.length; i++) { this.strBytes[i] = this.strChars[i].charCodeAt(0); } - unsignedByte = 137; - unsignedShort = 32867; this.identifiedDataSerializableObject = identifiedDataSerializable; this.portableObject = p; @@ -99,7 +99,7 @@ APortable.prototype.readPortable = function (reader) { this.longsNull = reader.readLongArray("lsNull"); this.stringsNull = reader.readUTFArray("strsNull"); - var dataInput = reader.getRawDataInput(); + const dataInput = reader.getRawDataInput(); this.bool = dataInput.readBoolean(); this.b = dataInput.readByte(); @@ -136,9 +136,9 @@ APortable.prototype.readPortable = function (reader) { dataInput.readCopy(this.bytesFully, this.byteSize); this.bytesOffset = Buffer.alloc(2); dataInput.readCopy(this.bytesOffset, 2); - var strSize = dataInput.readInt(); + const strSize = dataInput.readInt(); this.strChars = Buffer.alloc(strSize); - for (var j = 0; j < strSize; j++) { + for (let j = 0; j < strSize; j++) { this.strChars[j] = dataInput.readChar(); } this.strBytes = Buffer.alloc(strSize); @@ -154,7 +154,8 @@ APortable.prototype.readPortable = function (reader) { this.data = dataInput.readData(); }; -APortable.prototype.writeData = function () { - //TODO +APortable.prototype.writeData = function (writer) { + // no-op }; + module.exports = APortable; diff --git a/test/serialization/AnIdentifiedDataSerializable.js b/test/serialization/AnIdentifiedDataSerializable.js index 2dc4d8ab0..baac24ebe 100644 --- a/test/serialization/AnIdentifiedDataSerializable.js +++ b/test/serialization/AnIdentifiedDataSerializable.js @@ -14,8 +14,10 @@ * limitations under the License. */ -function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, doubles, shorts, floats, ints - , longs, strings, portable, identifiedDataSerializable, customStreamSerializable, customByteArraySerializableObject, data) { +function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, + doubles, shorts, floats, ints, longs, strings, portable, + identifiedDataSerializable, customStreamSerializable, + customByteArraySerializableObject, data) { if (arguments.length === 0) return; this.bool = bool; this.b = b; @@ -42,7 +44,7 @@ function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, this.bytesOffset = bytes.slice(1, 3); this.strChars = str.split(''); this.strBytes = Buffer.alloc(this.str.length); - for (var i = 0; i < str.length; i++) { + for (let i = 0; i < str.length; i++) { this.strBytes[i] = this.strChars[i].charCodeAt(0); } this.unsignedByte = 137; @@ -100,7 +102,7 @@ AnIdentifiedDataSerializable.prototype.readData = function (dataInput) { dataInput.readCopy(this.bytesOffset, 2); this.strSize = dataInput.readInt(); this.strChars = []; - for (var j = 0; j < this.strSize; j++) { + for (let j = 0; j < this.strSize; j++) { this.strChars[j] = dataInput.readChar(); } this.strBytes = Buffer.alloc(this.strSize); @@ -147,7 +149,7 @@ AnIdentifiedDataSerializable.prototype.writeData = function (dataOutput) { dataOutput.writeLongArray(this.longsNull); dataOutput.writeUTFArray(this.stringsNull); - var byteSize = this.bytes.length; + const byteSize = this.bytes.length; dataOutput.write(byteSize); dataOutput.write(this.bytes); dataOutput.write(this.bytes[1]); diff --git a/test/serialization/BinaryCompatibilityTest.js b/test/serialization/BinaryCompatibilityTest.js index f01d75b39..b7bcc0622 100644 --- a/test/serialization/BinaryCompatibilityTest.js +++ b/test/serialization/BinaryCompatibilityTest.js @@ -13,37 +13,41 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var fs = require('fs'); -var ObjectDataInput = require('../../lib/serialization/ObjectData').ObjectDataInput; -var HeapData = require('../../lib/serialization/HeapData').HeapData; -var Config = require('../../.').Config; -var ReferenceObjects = require('./ReferenceObjects'); -var SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; -var AnInnerPortable = require('./AnInnerPortable'); -var AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); -var APortable = require('./APortable'); -var CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; -var CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; -var expectAlmostEqual = require('../Util').expectAlmostEqual; +const fs = require('fs'); +const ObjectDataInput = require('../../lib/serialization/ObjectData').ObjectDataInput; +const HeapData = require('../../lib/serialization/HeapData').HeapData; +const ReferenceObjects = require('./ReferenceObjects'); +const SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; -describe('Binary serialization compatibility test', function () { - var NULL_LENGTH = -1; - var versions = [1]; - var objects = ReferenceObjects.testObjects; - var isBigEndianValues = [true, false]; +const AnInnerPortable = require('./AnInnerPortable'); +const AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); +const APortable = require('./APortable'); +const CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; +const CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; +const expectAlmostEqual = require('../Util').expectAlmostEqual; - var dataMap = {}; +describe('BinaryCompatibilityTest', function () { + + const NULL_LENGTH = -1; + const versions = [1]; + const objects = ReferenceObjects.testObjects; + const isBigEndianValues = [true, false]; + + const dataMap = {}; function createFileName(version) { return version + '.serialization.compatibility.binary'; } function convertEndiannesToByteOrder(isBigEndian) { - if (isBigEndian) + if (isBigEndian) { return 'BIG_ENDIAN'; - else + } else { return 'LITTLE_ENDIAN'; + } } function stripArticle(name) { @@ -65,7 +69,7 @@ describe('Binary serialization compatibility test', function () { } function createSerializationService(isBigEndian, defaultNumberType) { - var cfg = new Config.ClientConfig().serializationConfig; + const cfg = new SerializationConfigImpl(); cfg.portableFactories[ReferenceObjects.PORTABLE_FACTORY_ID] = { create: function (classId) { if (classId === ReferenceObjects.INNER_PORTABLE_CLASS_ID) { @@ -82,50 +86,58 @@ describe('Binary serialization compatibility test', function () { } } }; - cfg.customSerializers.push({ - getId: function () { - return ReferenceObjects.CUSTOM_BYTE_ARRAY_SERILAZABLE_ID; - }, - write: function (out, object) { - out.writeInt(8); - out.writeInt(object.i); - out.writeFloat(object.f); - }, - read: function (inp) { - var len = inp.readInt(); - var buf = Buffer.alloc(len); - inp.readCopy(buf, len); - return new CustomByteArraySerializable(buf.readInt32BE(0), buf.readFloatBE(4)); - } - }); - cfg.customSerializers.push({ - getId: function () { - return ReferenceObjects.CUSTOM_STREAM_SERILAZABLE_ID; - }, - write: function (out, object) { - out.writeInt(object.int); - out.writeFloat(object.float); + cfg.customSerializers = [ + { + getId: function () { + return ReferenceObjects.CUSTOM_BYTE_ARRAY_SERIALIZABLE_ID; + }, + hzGetCustomId: function () { + return ReferenceObjects.CUSTOM_BYTE_ARRAY_SERIALIZABLE_ID; + }, + write: function (out, object) { + out.writeInt(8); + out.writeInt(object.i); + out.writeFloat(object.f); + }, + read: function (inp) { + const len = inp.readInt(); + const buf = Buffer.alloc(len); + inp.readCopy(buf, len); + return new CustomByteArraySerializable(buf.readInt32BE(0), buf.readFloatBE(4)); + } }, - read: function (inp) { - return new CustomStreamSerializable(inp.readInt(), inp.readFloat()); + { + getId: function () { + return ReferenceObjects.CUSTOM_STREAM_SERIALIZABLE_ID; + }, + hzGetCustomId: function () { + return ReferenceObjects.CUSTOM_STREAM_SERIALIZABLE_ID; + }, + write: function (out, object) { + out.writeInt(object.int); + out.writeFloat(object.float); + }, + read: function (inp) { + return new CustomStreamSerializable(inp.readInt(), inp.readFloat()); + } } - }); + ]; cfg.isBigEndian = isBigEndian; cfg.defaultNumberType = defaultNumberType; - return new SerializationService(undefined, cfg) + return new SerializationService(cfg) } before(function () { versions.forEach(function (version) { - var input = new ObjectDataInput(fs.readFileSync(__dirname + '/' + createFileName(version)), 0, null, true, true); + const input = new ObjectDataInput(fs.readFileSync(__dirname + '/' + createFileName(version)), 0, null, true, true); while (input.available() > 0) { - var utflen = input.readUnsignedShort(); - var namebuf = Buffer.alloc(utflen); + const utflen = input.readUnsignedShort(); + const namebuf = Buffer.alloc(utflen); input.readCopy(namebuf, utflen); - var objectKey = namebuf.toString(); - var len = input.readInt(); + const objectKey = namebuf.toString(); + const len = input.readInt(); if (len !== NULL_LENGTH) { - var otherBuffer = Buffer.alloc(len); + const otherBuffer = Buffer.alloc(len); input.readCopy(otherBuffer, len); dataMap[objectKey] = new HeapData(otherBuffer); } @@ -135,26 +147,26 @@ describe('Binary serialization compatibility test', function () { }); }); - for (var vn in objects) { + for (const vn in objects) { (function () { - var varName = vn; - var object = objects[varName]; + const varName = vn; + const object = objects[varName]; if (objects.hasOwnProperty(varName)) { versions.forEach(function (version) { isBigEndianValues.forEach(function (isBigEndian) { it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version, function () { this.timeout(10000); - var key = createObjectKey(varName, version, isBigEndian); - var service = createSerializationService(isBigEndian, 'integer'); - var deserialized = service.toObject(dataMap[key]); + const key = createObjectKey(varName, version, isBigEndian); + const service = createSerializationService(isBigEndian, 'integer'); + const deserialized = service.toObject(dataMap[key]); expectAlmostEqual(deserialized, object); }); if (!ReferenceObjects.skipOnSerialize[varName]) { it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version + ' serialize deserialize', function () { this.timeout(10000); - var service = createSerializationService(isBigEndian, stripArticle(varName).toLowerCase()); - var data = service.toData(object); - var deserialized = service.toObject(data); + const service = createSerializationService(isBigEndian, stripArticle(varName).toLowerCase()); + const data = service.toData(object); + const deserialized = service.toObject(data); expectAlmostEqual(deserialized, object); }); } diff --git a/test/serialization/CustomSerializerTest.js b/test/serialization/CustomSerializerTest.js index 447eb8905..3de1591a9 100644 --- a/test/serialization/CustomSerializerTest.js +++ b/test/serialization/CustomSerializerTest.js @@ -13,42 +13,50 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Config = require('../../.').Config; -var SerializationService = require('../../lib/serialization/SerializationService'); -var expect = require('chai').expect; -describe('Custom Serializer', function () { - var service; +const expect = require('chai').expect; +const SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; - function CustomObject(surname) { - this.surname = surname; +describe('CustomSerializerTest', function () { + + let service; + + class CustomObject { + constructor(surname) { + this.surname = surname; + } + + hzGetCustomId() { + return 10; + } } - CustomObject.prototype.hzGetCustomId = function () { - return 10; - }; before(function () { - var cfg = new Config.ClientConfig(); - cfg.serializationConfig.customSerializers.push({ - getId: function () { - return 10; - }, - write: function (out, emp) { - out.writeUTF(emp.surname); - }, - read: function (inp) { - var obj = new CustomObject(); - obj.surname = inp.readUTF(); - return obj; + const cfg = new SerializationConfigImpl(); + cfg.customSerializers = [ + { + getId: function () { + return 10; + }, + write: function (out, emp) { + out.writeUTF(emp.surname); + }, + read: function (inp) { + const obj = new CustomObject(); + obj.surname = inp.readUTF(); + return obj; + } } - }); - service = new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig); + ]; + service = new SerializationServiceV1(cfg); }); it('write-read', function () { - var emp = new CustomObject('iman'); - var serialized = service.toData(emp); - var deserialized = service.toObject(serialized); + const emp = new CustomObject('iman'); + const serialized = service.toData(emp); + const deserialized = service.toObject(serialized); return expect(deserialized).to.deep.equal(emp); }); }); diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index a50956995..7cc1be8b0 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('../../.').Client; -var Config = require('../../.').Config; -var RC = require('../RC'); -var expect = require('chai').expect; -var RestValue = require('../../lib/core/RestValue').RestValue; +const Client = require('../../.').Client; +const RC = require('../RC'); +const expect = require('chai').expect; +const RestValue = require('../../lib/core/RestValue').RestValue; -describe('Default serializers with live instance', function () { - var cluster; - var client; - var map; +describe('DefaultSerializersLiveTest', function () { + + let cluster, client; + let map; before(function () { return RC.createCluster(null, null).then(function (res) { @@ -31,9 +31,7 @@ describe('Default serializers with live instance', function () { }).then(function () { return RC.startMember(cluster.id); }).then(function () { - var config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return Client.newHazelcastClient(config); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (cl) { client = cl; return client.getMap('test').then(function (mp) { @@ -47,7 +45,7 @@ describe('Default serializers with live instance', function () { return RC.terminateCluster(cluster.id); }); - function _generateGet(key) { + function generateGet(key) { return 'var StringArray = Java.type("java.lang.String[]");' + 'function foo() {' + ' var map = instance_0.getMap("' + map.getName() + '");' + @@ -63,7 +61,7 @@ describe('Default serializers with live instance', function () { it('string', function () { return map.put('testStringKey', 'testStringValue').then(function () { - return RC.executeOnController(cluster.id, _generateGet('testStringKey'), 1); + return RC.executeOnController(cluster.id, generateGet('testStringKey'), 1); }).then(function (response) { return expect(response.result.toString()).to.equal('testStringValue'); }) @@ -71,7 +69,7 @@ describe('Default serializers with live instance', function () { it('utf8 sample string test', function () { return map.put('key', 'Iñtërnâtiônàlizætiøn').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); + return RC.executeOnController(cluster.id, generateGet('key'), 1); }).then(function (response) { return expect(response.result.toString()).to.equal('Iñtërnâtiônàlizætiøn'); }); @@ -79,7 +77,7 @@ describe('Default serializers with live instance', function () { it('number', function () { return map.put('a', 23).then(function () { - return RC.executeOnController(cluster.id, _generateGet('a'), 1); + return RC.executeOnController(cluster.id, generateGet('a'), 1); }).then(function (response) { return expect(Number.parseInt(response.result.toString())).to.equal(23); }) @@ -87,7 +85,7 @@ describe('Default serializers with live instance', function () { it('array', function () { return map.put('a', ['a', 'v', 'vg']).then(function () { - return RC.executeOnController(cluster.id, _generateGet('a'), 1); + return RC.executeOnController(cluster.id, generateGet('a'), 1); }).then(function (response) { return expect(response.result.toString()).to.equal(['a', 'v', 'vg'].toString()); }) @@ -119,7 +117,7 @@ describe('Default serializers with live instance', function () { it('emoji string test on RC', function () { return map.put('key', '1⚐中💦2😭‍🙆😔5').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); + return RC.executeOnController(cluster.id, generateGet('key'), 1); }).then(function (response) { return expect(response.result.toString()).to.equal('1⚐中💦2😭‍🙆😔5'); }); @@ -127,7 +125,7 @@ describe('Default serializers with live instance', function () { it('utf8 characters test on RC', function () { return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); + return RC.executeOnController(cluster.id, generateGet('key'), 1); }).then(function (response) { return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); }); @@ -135,19 +133,19 @@ describe('Default serializers with live instance', function () { it('utf8 characters test on RC with surrogates', function () { return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06').then(function () { - return RC.executeOnController(cluster.id, _generateGet('key'), 1); + return RC.executeOnController(cluster.id, generateGet('key'), 1); }).then(function (response) { return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); }); }); it('rest value', function () { - // Making sure that the object is properly de-serialized at the server - var restValue = new RestValue(); + // Make sure that the object is properly de-serialized at the server + const restValue = new RestValue(); restValue.value = '{\'test\':\'data\'}'; restValue.contentType = 'text/plain'; - var script = 'var map = instance_0.getMap("' + map.getName() + '");\n' + + const script = 'var map = instance_0.getMap("' + map.getName() + '");\n' + 'var restValue = map.get("key");\n' + 'var contentType = restValue.getContentType();\n' + 'var value = restValue.getValue();\n' + @@ -160,7 +158,7 @@ describe('Default serializers with live instance', function () { return RC.executeOnController(cluster.id, script, 1); }) .then(function (response) { - var result = JSON.parse(response.result.toString()); + const result = JSON.parse(response.result.toString()); expect(result.contentType).to.equal(restValue.contentType); expect(result.value).to.equal(restValue.value); }); diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index 0a098558c..5ca962661 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -13,21 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var Long = require('long'); -var Config = require('../../.').Config; -var SerializationService = require('../../lib/serialization/SerializationService'); -var Predicates = require('../../.').Predicates; -var RestValue = require('../../lib/core/RestValue').RestValue; +const expect = require('chai').expect; +const Long = require('long'); +const SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; +const Predicates = require('../../.').Predicates; +const RestValue = require('../../lib/core/RestValue').RestValue; -describe('Default serializers Test', function () { +describe('DefaultSerializersTest', function () { - var restValue = new RestValue(); + const restValue = new RestValue(); restValue.value = '{"test":"data"}'; restValue.contentType = 'text/plain'; - var parameters = [ + const parameters = [ 14, 545.3, 1 << 63, @@ -70,15 +71,15 @@ describe('Default serializers Test', function () { parameters.forEach(function (obj) { it('type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) + ', value: ' + JSON.stringify(obj), function () { - var serializationConfig = new Config.ClientConfig().serializationConfig; - var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig); - var serialized = serializationService.toData(obj); + const config = new SerializationConfigImpl(); + const serializationService = new SerializationServiceV1(config); + const serialized = serializationService.toData(obj); expect(serializationService.toObject(serialized)).to.deep.equal(obj); } ); }); - var defaultNumberTypes = [ + const defaultNumberTypes = [ 'double', 'short', 'integer', @@ -88,30 +89,28 @@ describe('Default serializers Test', function () { defaultNumberTypes.forEach(function (type) { it('convert default number type: ' + type, function () { + let num = 56; if (type === 'long') { - var num = Long.fromNumber(56); - } else { - var num = 56; + num = Long.fromNumber(56); } - var serializationConfig = new Config.ClientConfig().serializationConfig; - serializationConfig.defaultNumberType = type; - var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig); - var serialized = serializationService.toData(num); + const config = new SerializationConfigImpl(); + config.defaultNumberType = type; + const serializationService = new SerializationServiceV1(config); + const serialized = serializationService.toData(num); expect(serializationService.toObject(serialized)).to.deep.equal(num); }) }); defaultNumberTypes.forEach(function (type) { it('convert array of default number type: ' + type, function () { + let nums = [56, 101]; if (type === 'long') { - var nums = [Long.fromNumber(56), Long.fromNumber(101)]; - } else { - var nums = [56, 101]; + nums = [Long.fromNumber(56), Long.fromNumber(101)]; } - var serializationConfig = new Config.ClientConfig().serializationConfig; - serializationConfig.defaultNumberType = type; - var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig); - var serialized = serializationService.toData(nums); + const config = new SerializationConfigImpl(); + config.defaultNumberType = type; + const serializationService = new SerializationServiceV1(config); + const serialized = serializationService.toData(nums); expect(serializationService.toObject(serialized)).to.deep.equal(nums); }) }); diff --git a/test/serialization/GlobalSerializerTest.js b/test/serialization/GlobalSerializerTest.js index 3d59b4157..21655d610 100644 --- a/test/serialization/GlobalSerializerTest.js +++ b/test/serialization/GlobalSerializerTest.js @@ -13,20 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Config = require('../../.').Config; -var SerializationService = require('../../lib/serialization/SerializationService'); -var expect = require('chai').expect; -describe('Global Serializer', function () { - var service; +const expect = require('chai').expect; +const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; +const SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; + +describe('GlobalSerializerTest', function () { + + let service; function CustomObject(surname) { this.surname = surname; } before(function () { - var cfg = new Config.ClientConfig(); - cfg.serializationConfig.globalSerializer = { + const cfg = new SerializationConfigImpl(); + cfg.globalSerializer = { getId: function () { return 10; }, @@ -34,18 +37,18 @@ describe('Global Serializer', function () { out.writeUTF(emp.surname); }, read: function (inp) { - var obj = new CustomObject(); + const obj = new CustomObject(); obj.surname = inp.readUTF(); return obj; } }; - service = new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig); + service = new SerializationServiceV1(cfg); }); it('write-read', function () { - var emp = new CustomObject('iman'); - var serialized = service.toData(emp); - var deserialized = service.toObject(serialized); + const emp = new CustomObject('iman'); + const serialized = service.toData(emp); + const deserialized = service.toObject(serialized); return expect(deserialized).to.deep.equal(emp); }); }); diff --git a/test/serialization/IdentifiedDataSerializableTest.js b/test/serialization/IdentifiedDataSerializableTest.js index e9799be27..6b7ee6e1a 100644 --- a/test/serialization/IdentifiedDataSerializableTest.js +++ b/test/serialization/IdentifiedDataSerializableTest.js @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var SerializationService = require('../../lib/serialization/SerializationService'); -var Config = require('../../.').Config; -var Long = require('long'); -var Util = require('../Util'); -describe('Identified Data Serializable', function () { - var IdentifiedDataClass = function (a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings) { +const Long = require('long'); +const { SerializationConfigImpl } = require('../../lib/config/SerializationConfig'); +const { SerializationServiceV1 } = require('../../lib/serialization/SerializationService'); +const Util = require('../Util'); + +describe('IdentifiedDataSerializableTest', function () { + const IdentifiedDataClass = function (a_byte, a_boolean, a_character, a_short, an_integer, + a_long, a_float, a_double, a_string, bytes, booleans, + chars, shorts, integers, longs, floats, doubles, strings) { this.a_byte = a_byte; this.a_boolean = a_boolean; this.a_character = a_character; @@ -93,7 +96,7 @@ describe('Identified Data Serializable', function () { return 1; }; - var identifiedFactory = { + const identifiedFactory = { create: function (type) { if (type === 1) { return new IdentifiedDataClass(); @@ -101,18 +104,22 @@ describe('Identified Data Serializable', function () { } }; - var service; + let service; it('serialize deserialize identified data serializable', function () { - var cfg = new Config.ClientConfig(); - cfg.serializationConfig.dataSerializableFactories[1] = identifiedFactory; - service = new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig); - var dd = new IdentifiedDataClass(99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], - [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], - [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto']); - var serialized = service.toData(dd); - var deserialized = service.toObject(serialized); + const cfg = new SerializationConfigImpl(); + cfg.dataSerializableFactories[1] = identifiedFactory; + service = new SerializationServiceV1(cfg); + const dd = new IdentifiedDataClass( + 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, + 'hazelcast', [99, 100, 101], [true, false, false, true], + ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], + [233.2, 65.88, 657.345], [43645.325, 887.56756], + ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'] + ); + const serialized = service.toData(dd); + const deserialized = service.toObject(serialized); Util.expectAlmostEqual(deserialized, dd); }); diff --git a/test/serialization/JsonSerializersTest.js b/test/serialization/JsonSerializersTest.js index 97f200926..184d7a8eb 100644 --- a/test/serialization/JsonSerializersTest.js +++ b/test/serialization/JsonSerializersTest.js @@ -13,47 +13,54 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var Config = require('../../.').Config; -var SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; -var HazelcastJsonValue = require('../../.').HazelcastJsonValue; +const expect = require('chai').expect; +const SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; +const JsonStringDeserializationPolicy = require('../../.').JsonStringDeserializationPolicy; +const HazelcastJsonValue = require('../../.').HazelcastJsonValue; -describe('Json serializers test', function () { - var object = { key: 'value' }; - var hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); +describe('JsonSerializersTest', function () { + + const object = { key: 'value' }; + const hzJsonValue = new HazelcastJsonValue(JSON.stringify(object)); it('jsonSerializer serialize-deserialize object', function () { - var serializationService = new SerializationServiceV1(undefined, new Config.ClientConfig().serializationConfig); - var serialized = serializationService.toData(object); + const serializationService = new SerializationServiceV1(new SerializationConfigImpl()); + const serialized = serializationService.toData(object); expect(serializationService.toObject(serialized)).to.deep.equal(object); }); it('jsonSerializer serialize-deserialize HazelcastJsonValue', function () { - var serializationService = new SerializationServiceV1(undefined, new Config.ClientConfig().serializationConfig); - var serialized = serializationService.toData(hzJsonValue); + const serializationService = new SerializationServiceV1(new SerializationConfigImpl()); + const serialized = serializationService.toData(hzJsonValue); expect(serializationService.toObject(serialized)).to.deep.equal(object); }); it('hazelcastJsonValueSerializer serialize-deserialize object', function () { - var serializationConfig = new Config.ClientConfig().serializationConfig; + const serializationConfig = new SerializationConfigImpl(); serializationConfig - .jsonStringDeserializationPolicy = Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION; - var serializationService = new SerializationServiceV1(undefined, serializationConfig); - var serialized = serializationService.toData(object); - var deserialized = serializationService.toObject(serialized); + .jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; + const serializationService = new SerializationServiceV1(serializationConfig); + + const serialized = serializationService.toData(object); + const deserialized = serializationService.toObject(serialized); + expect(deserialized).to.be.an.instanceof(HazelcastJsonValue); expect(deserialized).to.deep.equal(hzJsonValue); expect(JSON.parse(deserialized.toString())).to.deep.equal(object); }); it('hazelcastJsonValueSerializer serialize-deserialize HazelcastJsonValue', function () { - var serializationConfig = new Config.ClientConfig().serializationConfig; + const serializationConfig = new SerializationConfigImpl(); serializationConfig - .jsonStringDeserializationPolicy = Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION; - var serializationService = new SerializationServiceV1(undefined, serializationConfig); - var serialized = serializationService.toData(hzJsonValue); - var deserialized = serializationService.toObject(serialized); + .jsonStringDeserializationPolicy = JsonStringDeserializationPolicy.NO_DESERIALIZATION; + + const serializationService = new SerializationServiceV1(serializationConfig); + const serialized = serializationService.toData(hzJsonValue); + const deserialized = serializationService.toObject(serialized); + expect(deserialized).to.be.an.instanceof(HazelcastJsonValue); expect(deserialized).to.deep.equal(hzJsonValue); expect(JSON.parse(deserialized.toString())).to.deep.equal(object); diff --git a/test/serialization/ObjectDataTest.js b/test/serialization/ObjectDataTest.js index e5fcdfc63..02b3c5bce 100644 --- a/test/serialization/ObjectDataTest.js +++ b/test/serialization/ObjectDataTest.js @@ -13,16 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var Long = require('long'); -var ObjectData = require('../../lib/serialization/ObjectData'); -var ODInp = ObjectData.ObjectDataInput; -var ODOut = ObjectData.ObjectDataOutput; +const expect = require('chai').expect; +const Long = require('long'); + +const ObjectData = require('../../lib/serialization/ObjectData'); +const ODInp = ObjectData.ObjectDataInput; +const ODOut = ObjectData.ObjectDataOutput; describe('ObjectData Test', function () { - var out = new ODOut(null, true); + const out = new ODOut(null, true); before(function () { out.write(15); out.write(Buffer.from(['t'.charCodeAt(0), 'e'.charCodeAt(0), 's'.charCodeAt(0), 't'.charCodeAt(0)])); @@ -55,7 +57,7 @@ describe('ObjectData Test', function () { }); it('read', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); + const inp = new ODInp(out.toBuffer(), 0, null, true); expect(inp.read()).to.equal(15); expect(inp.read()).to.equal('t'.charCodeAt(0)); expect(inp.read()).to.equal('e'.charCodeAt(0)); @@ -65,7 +67,7 @@ describe('ObjectData Test', function () { expect(inp.readBooleanArray()).to.deep.equal([true, false, false, true, true]); expect(inp.readByte()).to.equal(255); expect(inp.readByteArray()).to.deep.equal([0, 1, 255]); - var readBytes = []; + const readBytes = []; readBytes.push(inp.readByte()); readBytes.push(inp.readByte()); readBytes.push(inp.readByte()); @@ -102,20 +104,20 @@ describe('ObjectData Test', function () { }); it('read from pos', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); + const inp = new ODInp(out.toBuffer(), 0, null, true); inp.read(); expect(inp.read(0)).to.equal(15); }); it('position', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); + const inp = new ODInp(out.toBuffer(), 0, null, true); inp.read(); inp.position(0); expect(inp.read()).to.equal(15); }); it('non integer position does not affect', function () { - var inp = new ODInp(out.toBuffer(), 0, null, true); + const inp = new ODInp(out.toBuffer(), 0, null, true); inp.read(); inp.position(0.5); expect(inp.read()).to.equal('t'.charCodeAt(0)); diff --git a/test/serialization/PortableSerializationTest.js b/test/serialization/PortableSerializationTest.js new file mode 100644 index 000000000..34688614b --- /dev/null +++ b/test/serialization/PortableSerializationTest.js @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; +const SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const Long = require('long'); +const Util = require('../Util'); + +const PortableObject = require('./PortableObjects').PortableObject; +const PortableObjectV2 = require('./PortableObjects').PortableObjectV2; +const InnerPortableObject = require('./PortableObjects').InnerPortableObject; +const SimplePortableV3 = require('./PortableObjects').SimplePortableV3; + +describe('PortableSerializationTest', function () { + + function createSerializationService(Ctor) { + const cfg = new SerializationConfigImpl(); + cfg.portableFactories[10] = { + create: function (classId) { + if (classId === 111) { + return new Ctor(); + } else if (classId === 222) { + return new InnerPortableObject(); + } else if (classId === 21) { + return new SimplePortableV3(); + } + } + }; + return new SerializationServiceV1(cfg); + } + + it('write-read', function () { + const service = createSerializationService(PortableObject); + const emp = new PortableObject( + 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, + 'hazelcast', new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], + [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], + [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + ); + + const serialized = service.toData(emp); + const deserialized = service.toObject(serialized); + + Util.expectAlmostEqual(deserialized, emp); + }); + + it('write-read v2', function () { + const service = createSerializationService(PortableObjectV2); + + const emp = new PortableObjectV2( + 'a_new_value', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, + new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], + [233.2, 65.88, 657.345], [43645.325, 887.56756], + ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], + [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + ); + + const serialized = service.toData(emp); + const deserialized = service.toObject(serialized); + + Util.expectAlmostEqual(deserialized, emp); + }); + + it('old write - new read cross versions', function () { + const oldService = createSerializationService(PortableObject); + const newService = createSerializationService(PortableObjectV2); + + const empv1 = new PortableObject( + 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, + 'hazelcast', new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], + [233.2, 65.88, 657.345], [43645.325, 887.56756], + ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], + [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + ); + const empv2 = new PortableObjectV2( + undefined, 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, + new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], + [233.2, 65.88, 657.345], [43645.325, 887.56756], + ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], + [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + ); + + const serialized = oldService.toData(empv1); + const deserialized = newService.toObject(serialized); + + Util.expectAlmostEqual(deserialized, empv2); + }); + + it('v3 portable containing a v2 inner portable', function () { + const service = createSerializationService(PortableObjectV2); + + const innerPortableV2 = new PortableObjectV2( + 'propstring', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, + new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], + [233.2, 65.88, 657.345], [43645.325, 887.56756], + ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], + [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + ); + + const portableV3 = new SimplePortableV3(innerPortableV2); + const serialized = service.toData(portableV3); + const deserialized = service.toObject(serialized); + + Util.expectAlmostEqual(deserialized, portableV3); + }) +}); diff --git a/test/serialization/PortableSerializersLiveTest.js b/test/serialization/PortableSerializersLiveTest.js index afe16b115..04c3e0be8 100644 --- a/test/serialization/PortableSerializersLiveTest.js +++ b/test/serialization/PortableSerializersLiveTest.js @@ -13,36 +13,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Client = require('../../.').Client; -var Config = require('../../.').Config; -var RC = require('../RC'); -var expect = require('chai').expect; -var SimplePortable = require('./PortableObjects').SimplePortable; -var InnerPortable = require('./PortableObjects').InnerPortableObject; -var Promise = require('bluebird'); +const expect = require('chai').expect; +const Promise = require('bluebird'); -describe('Default serializers with live instance', function () { - var cluster; - var member; - var client; - var map; +const Client = require('../../.').Client; +const RC = require('../RC'); +const SimplePortable = require('./PortableObjects').SimplePortable; +const InnerPortable = require('./PortableObjects').InnerPortableObject; + +describe('PortableSerializersLiveTest', function () { + + let cluster, client; + let map; function getClientConfig(clusterName) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = clusterName; - cfg.serializationConfig.portableFactories[10] = { - create: function (classId) { - if (classId === 222) { - return new InnerPortable(); - } else if (classId === 21) { - return new SimplePortable(); - } else { - return null; + return { + clusterName, + serialization: { + portableFactories: { + 10: { + create: function (classId) { + if (classId === 222) { + return new InnerPortable(); + } else if (classId === 21) { + return new SimplePortable(); + } else { + return null; + } + } + } } } }; - return cfg; } before(function () { @@ -51,7 +55,6 @@ describe('Default serializers with live instance', function () { }).then(function () { return RC.startMember(cluster.id); }).then(function (m) { - member = m; return Client.newHazelcastClient(getClientConfig(cluster.id)); }).then(function (cl) { client = cl; @@ -67,8 +70,8 @@ describe('Default serializers with live instance', function () { }); it('client can write and read two different serializable objects of the same factory', function () { - var simplePortable = new SimplePortable('atext'); - var innerPortable = new InnerPortable('str1', 'str2'); + const simplePortable = new SimplePortable('atext'); + const innerPortable = new InnerPortable('str1', 'str2'); return map.put('simpleportable', simplePortable).then(function () { return map.put('innerportable', innerPortable); }).then(function () { @@ -83,8 +86,8 @@ describe('Default serializers with live instance', function () { }); it('client can read two different serializable objects of the same factory (written by another client)', function () { - var simplePortable = new SimplePortable('atext'); - var innerPortable = new InnerPortable('str1', 'str2'); + const simplePortable = new SimplePortable('atext'); + const innerPortable = new InnerPortable('str1', 'str2'); return map.putAll([['simpleportable', simplePortable], ['innerportable', innerPortable]]).then(function () { client.shutdown(); }).then(function () { diff --git a/test/serialization/PortableTest.js b/test/serialization/PortableTest.js deleted file mode 100644 index d636b168b..000000000 --- a/test/serialization/PortableTest.js +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -var Config = require('../../.').Config; -var SerializationService = require('../../lib/serialization/SerializationService'); -var Long = require('long'); -var Util = require('../Util'); -var PortableObject = require('./PortableObjects').PortableObject; -var PortableObjectV2 = require('./PortableObjects').PortableObjectV2; -var InnerPortableObject = require('./PortableObjects').InnerPortableObject; -var SimplePortableV3 = require('./PortableObjects').SimplePortableV3; - -describe('Portable Serialization', function () { - function createSerializationService(constructorFunction) { - var cfg = new Config.ClientConfig(); - cfg.serializationConfig.portableFactories[10] = { - create: function (classId) { - if (classId === 111) { - return new constructorFunction(); - } else if (classId === 222) { - return new InnerPortableObject(); - } else if (classId === 21) { - return new SimplePortableV3(); - } - } - }; - return new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig); - } - - it('write-read', function () { - var service = createSerializationService(PortableObject); - - var emp = new PortableObject(99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], - [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], - [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')]); - - var serialized = service.toData(emp); - var deserialized = service.toObject(serialized); - Util.expectAlmostEqual(deserialized, emp); - }); - - it('write-read v2', function () { - var service = createSerializationService(PortableObjectV2); - - var emp = new PortableObjectV2('a_new_value', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], - [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], - [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')]); - - var serialized = service.toData(emp); - var deserialized = service.toObject(serialized); - Util.expectAlmostEqual(deserialized, emp); - }); - - it('old write - new read cross versions', function () { - var oldService = createSerializationService(PortableObject); - var newService = createSerializationService(PortableObjectV2); - - var empv1 = new PortableObject(99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], - [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], - [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')]); - - var empv2 = new PortableObjectV2(undefined, 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], - [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], - [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')]); - - var serialized = oldService.toData(empv1); - var deserialized = newService.toObject(serialized); - Util.expectAlmostEqual(deserialized, empv2); - }); - - it('v3 portable containing a v2 inner portable', function () { - var service = createSerializationService(PortableObjectV2); - - var innerPortableV2 = new PortableObjectV2('propstring', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], - [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], - [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')]); - - var portableV3 = new SimplePortableV3(innerPortableV2); - var serialized = service.toData(portableV3); - var deserialized = service.toObject(serialized); - Util.expectAlmostEqual(deserialized, portableV3); - }) -}); diff --git a/test/serialization/ReferenceObjects.js b/test/serialization/ReferenceObjects.js index 63ee35e66..87cdefc03 100644 --- a/test/serialization/ReferenceObjects.js +++ b/test/serialization/ReferenceObjects.js @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Long = require('long'); -var AnInnerPortable = require('./AnInnerPortable'); -var AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); -var APortable = require('./APortable'); -var CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; -var CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; -var HeapData = require('../../lib/serialization/HeapData').HeapData; +const Long = require('long'); +const AnInnerPortable = require('./AnInnerPortable'); +const AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); +const APortable = require('./APortable'); +const CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; +const CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; +const HeapData = require('../../lib/serialization/HeapData').HeapData; -var to = {}; +const to = {}; to.aNULL = null; to.aBoolean = true; to.aByte = 113; @@ -32,18 +33,17 @@ to.aShort = -500; to.aFloat = 900.5678; to.anInteger = 56789; to.aLong = Long.fromNumber(-50992225); -to.aString = ''; //TODO +to.aString = ''; -for (var ci = 0; ci < 65535; ci++) { +for (let ci = 0; ci < 65535; ci++) { if (!(ci >= 55296 && ci < 57344)) { to.aString += String.fromCharCode(ci); } } -for (var ci = 65535 - to.aString.length; ci > 0; ci--) { +for (let ci = 65535 - to.aString.length; ci > 0; ci--) { to.aString += String.fromCharCode(0); } - to.booleans = [true, false, true]; to.bytes = [112, 4, -1, 4, 112, -35, 43]; to.chars = ['a', 'b', 'c']; @@ -61,14 +61,19 @@ to.aCustomByteArraySerializable = new CustomByteArraySerializable(to.anInteger, exports.aData = new HeapData(Buffer.from('111313123131313131')); -to.AnIdentifiedDataSerializable = new AnIdentifiedDataSerializable(to.aBoolean, to.aByte, to.aCharacter, to.aDouble, to.aShort - , to.aFloat, to.anInteger, to.aLong, to.aString, to.booleans, to.bytes, to.chars, to.doubles, to.shorts, to.floats - , to.ints, to.longs, to.Strings, to.AnInnerPortable, null, to.aCustomStreamSerializable, to.aCustomByteArraySerializable, - exports.aData); -to.APortable = new APortable(to.aBoolean, to.aByte, to.aCharacter, to.aDouble, to.aShort, to.aFloat, to.anInteger, to.aLong, - to.aString, to.AnInnerPortable, to.booleans, to.bytes, to.chars, to.doubles, to.shorts, to.floats, to.ints, to.longs, - to.Strings, exports.portables, to.AnIdentifiedDataSerializable, to.aCustomStreamSerializable, to.aCustomByteArraySerializable, - exports.aData); +to.AnIdentifiedDataSerializable = new AnIdentifiedDataSerializable( + to.aBoolean, to.aByte, to.aCharacter, to.aDouble, to.aShort, to.aFloat, + to.anInteger, to.aLong, to.aString, to.booleans, to.bytes, to.chars, to.doubles, + to.shorts, to.floats, to.ints, to.longs, to.Strings, to.AnInnerPortable, null, + to.aCustomStreamSerializable, to.aCustomByteArraySerializable, exports.aData +); +to.APortable = new APortable( + to.aBoolean, to.aByte, to.aCharacter, to.aDouble, to.aShort, to.aFloat, + to.anInteger, to.aLong, to.aString, to.AnInnerPortable, to.booleans, to.bytes, + to.chars, to.doubles, to.shorts, to.floats, to.ints, to.longs, to.Strings, + exports.portables, to.AnIdentifiedDataSerializable, to.aCustomStreamSerializable, + to.aCustomByteArraySerializable, exports.aData +); to.aDate = new Date(Date.UTC(1990, 2, 1, 0, 0, 0, 0)); to.aClass = 'java.math.BigDecimal'; @@ -84,6 +89,5 @@ exports.PORTABLE_CLASS_ID = 1; exports.INNER_PORTABLE_CLASS_ID = 2; exports.IDENTIFIED_DATA_SERIALIZABLE_FACTORY_ID = 1; exports.IDENTIFIED_DATA_SERIALIZABLE_CLASS_ID = 1; -exports.CUSTOM_BYTE_ARRAY_SERILAZABLE_ID = 2; -exports.CUSTOM_STREAM_SERILAZABLE_ID = 1; - +exports.CUSTOM_BYTE_ARRAY_SERIALIZABLE_ID = 2; +exports.CUSTOM_STREAM_SERIALIZABLE_ID = 1; diff --git a/test/serialization/SerializationServiceTest.js b/test/serialization/SerializationServiceTest.js index 8b082e299..c5038e48e 100644 --- a/test/serialization/SerializationServiceTest.js +++ b/test/serialization/SerializationServiceTest.js @@ -13,100 +13,63 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; -var IdentifiedEntryProcessor = require('../javaclasses/IdentifiedEntryProcessor'); -var Config = require('../../').Config; -var Path = require('path'); +const expect = require('chai').expect; +const SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; describe('SerializationServiceTest', function () { - var identifiedDataSerializableFactoryConfig = { - path: __filename, - exportedName: 'IDataSerializableFactory' - }; + it('should use data serializable factory', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.dataSerializableFactories[1] = new IDataSerializableFactory(); - var portableSerializableFactoryConfig = { - path: __filename, - exportedName: 'PortableFactory' - }; + const serializationService = new SerializationService(serializationConfig); - var globalSerializerConfig = { - path: __filename, - exportedName: 'GlobalSerializer' - }; - - var customSerializerConfig = { - path: __filename, - exportedName: 'CustomSerializer' - }; - - var identifiedDataSerializableFactoryDefaultExportConfig = { - path: Path.resolve(__filename, '../../javaclasses/IdentifiedFactory.js') - }; - - it('adds data serializable factory by its name', function () { - var serializationConfig = new Config.SerializationConfig(); - serializationConfig.dataSerializableFactoryConfigs[1] = identifiedDataSerializableFactoryConfig; - - var serializationService = new SerializationService(undefined, serializationConfig); - - var data = serializationService.toData(new IDataSerializable(3)); - var object = serializationService.toObject(data); + const data = serializationService.toData(new IDataSerializable(3)); + const object = serializationService.toObject(data); expect(object.val).to.equal(3); }); - it('adds portable factory by its name', function () { - var serializationConfig = new Config.SerializationConfig(); - serializationConfig.portableFactoryConfigs[2] = portableSerializableFactoryConfig; + it('should use portable factory', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.portableFactories[2] = new PortableFactory(); - var serializationService = new SerializationService(undefined, serializationConfig); + const serializationService = new SerializationService(serializationConfig); - var data = serializationService.toData(new Portable(3)); - var object = serializationService.toObject(data); + const data = serializationService.toData(new Portable(3)); + const object = serializationService.toObject(data); expect(object.val).to.equal(3); }); - it('adds custom serializer by its name', function () { - var serializationConfig = new Config.SerializationConfig(); - serializationConfig.customSerializerConfigs[44] = customSerializerConfig; + it('should use custom serializer', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.customSerializers.push(new CustomSerializer()); - var serializationService = new SerializationService(undefined, serializationConfig); + const serializationService = new SerializationService(serializationConfig); - var data = serializationService.toData(new CustomObject(3)); - var object = serializationService.toObject(data); + const data = serializationService.toData(new CustomObject(3)); + const object = serializationService.toObject(data); expect(object.val).to.equal(3); expect(object.self).to.equal(object); }); - it('adds global serializer by its name', function () { - var serializationConfig = new Config.SerializationConfig(); - serializationConfig.globalSerializerConfig = globalSerializerConfig; + it('should use global serializer', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.globalSerializer = new GlobalSerializer(); - var serializationService = new SerializationService(undefined, serializationConfig); + const serializationService = new SerializationService(serializationConfig); - var data = serializationService.toData(new AnyObject(3)); - var object = serializationService.toObject(data); + const data = serializationService.toData(new AnyObject(3)); + const object = serializationService.toObject(data); expect(object.val).to.equal(3); expect(object.self).to.equal(object); }); - - it('adds identified factory without named export', function () { - var serializationConfig = new Config.SerializationConfig(); - serializationConfig.dataSerializableFactoryConfigs[66] = identifiedDataSerializableFactoryDefaultExportConfig; - - var serializationService = new SerializationService(undefined, serializationConfig); - - var data = serializationService.toData(new IdentifiedEntryProcessor('x')); - var object = serializationService.toObject(data); - - expect(object.value).to.equal('x'); - }) }); function IDataSerializable(val) { @@ -130,7 +93,6 @@ IDataSerializable.prototype.getFactoryId = function () { }; function IDataSerializableFactory() { - } IDataSerializableFactory.prototype.create = function (type) { @@ -160,7 +122,6 @@ Portable.prototype.writePortable = function (writer) { }; function PortableFactory() { - } PortableFactory.prototype.create = function (classId) { @@ -171,11 +132,11 @@ PortableFactory.prototype.create = function (classId) { function AnyObject(val) { this.val = val; - this.self = this;//putting a reference to self so json serializer cannot be used. making sure global serializer is used in test. + // Put a reference to self so json serializer cannot be used. Make sure global serializer is used in test. + this.self = this; } function GlobalSerializer() { - } GlobalSerializer.prototype.getId = function () { @@ -183,7 +144,7 @@ GlobalSerializer.prototype.getId = function () { }; GlobalSerializer.prototype.read = function (inp) { - var obj = new AnyObject(); + const obj = new AnyObject(); obj.val = inp.readInt(); return obj; }; @@ -194,7 +155,8 @@ GlobalSerializer.prototype.write = function (outp, obj) { function CustomObject(val) { this.val = val; - this.self = this;//putting a reference to self so json serializer cannot be used. making sure global serializer is used in test. + // Put a reference to self so json serializer cannot be used. Make sure global serializer is used in test. + this.self = this; } CustomObject.prototype.hzGetCustomId = function () { @@ -202,7 +164,6 @@ CustomObject.prototype.hzGetCustomId = function () { }; function CustomSerializer() { - } CustomSerializer.prototype.getId = function () { @@ -210,7 +171,7 @@ CustomSerializer.prototype.getId = function () { }; CustomSerializer.prototype.read = function (reader) { - var obj = new CustomObject(); + const obj = new CustomObject(); obj.val = reader.readInt(); return obj; }; @@ -219,7 +180,6 @@ CustomSerializer.prototype.write = function (writer, obj) { writer.writeInt(obj.val); }; - exports.IDataSerializableFactory = IDataSerializableFactory; exports.PortableFactory = PortableFactory; exports.GlobalSerializer = GlobalSerializer; diff --git a/test/serialization/config/Address.js b/test/serialization/config/Address.js index 67738138e..a2b139666 100644 --- a/test/serialization/config/Address.js +++ b/test/serialization/config/Address.js @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; function Address(street, zipCode, city, state) { this.street = street; @@ -44,7 +45,6 @@ Address.prototype.readData = function (objectDataInput) { }; function MyIdentifiedFactory() { - } MyIdentifiedFactory.prototype.create = function (type) { diff --git a/test/serialization/config/CustomSerializerTest.js b/test/serialization/config/CustomSerializerConfigTest.js similarity index 51% rename from test/serialization/config/CustomSerializerTest.js rename to test/serialization/config/CustomSerializerConfigTest.js index 3b0a6dd60..2d80944e7 100644 --- a/test/serialization/config/CustomSerializerTest.js +++ b/test/serialization/config/CustomSerializerConfigTest.js @@ -13,49 +13,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('../../RC'); -var expect = require('chai').expect; -var path = require('path'); -const ConfigBuilder = require('../../../').ConfigBuilder; +const expect = require('chai').expect; +const RC = require('../../RC'); +const Client = require('../../../').Client; +const { Musician, MusicianSerializer } = require('./Musician'); -var Client = require('../../../').Client; -var Musician = require('./Musician').Musician; +describe('CustomSerializerConfigTest', function () { -describe('CustomSerializer', function () { - var cluster; - var client; + let cluster; + let client; before(function () { - process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, 'customserializer.json'); - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }); }); after(function () { - delete process.env['HAZELCAST_CLIENT_CONFIG']; client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - it('should be configured declaratively', function () { - var m = new Musician('Furkan'); - const configBuilder = new ConfigBuilder(); - return configBuilder.loadConfig() - .then(() => { - const cfg = configBuilder.build(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg); - }) + function createConfig(clusterName) { + return { + clusterName, + serialization: { + customSerializers: [new MusicianSerializer()] + } + }; + } + + it('should be configured programmatically', function () { + const musician = new Musician('Furkan'); + return Client.newHazelcastClient(createConfig(cluster.id)) .then(function (cl) { client = cl; - expect(client.getSerializationService().findSerializerFor(m).getId()).to.be.equal(10); - var map; + expect(client.getSerializationService().findSerializerFor(musician).getId()).to.be.equal(10); + let map; return client.getMap('musicians').then(function (mp) { map = mp; - return map.put('neyzen', m); + return map.put('neyzen', musician); }).then(function () { return map.get('neyzen'); }).then(function (res) { @@ -64,4 +64,3 @@ describe('CustomSerializer', function () { }); }); }); - diff --git a/test/serialization/config/FactoriesTest.js b/test/serialization/config/FactoriesTest.js index 4c0eead64..89edec495 100644 --- a/test/serialization/config/FactoriesTest.js +++ b/test/serialization/config/FactoriesTest.js @@ -13,31 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Controller = require('../../RC'); -var expect = require('chai').expect; -var path = require('path'); +const expect = require('chai').expect; +const RC = require('../../RC'); +const Client = require('../../../').Client; +const { MyPortableFactory, Foo } = require('./Foo'); +const { MyIdentifiedFactory, Address } = require('./Address'); -var Client = require('../../../').Client; -var Foo = require('./Foo').Foo; -var Address = require('./Address').Address; -const ConfigBuilder = require('../../../').ConfigBuilder; +describe('FactoriesTest', function () { -describe('Factories', function () { - var cluster; - var client; + let cluster; + let client; before(function () { - process.env['HAZELCAST_CLIENT_CONFIG'] = path.join(__dirname, 'customserializer.json'); - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }); }); after(function () { - delete process.env['HAZELCAST_CLIENT_CONFIG']; - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); afterEach(function () { @@ -46,17 +43,25 @@ describe('Factories', function () { } }); - it('should be configured declaratively', function () { - const configBuilder = new ConfigBuilder(); - return configBuilder.loadConfig() - .then(() => { - const cfg = configBuilder.build(); - cfg.clusterName = cluster.id; - return Client.newHazelcastClient(cfg); - }) + function createConfig(clusterName) { + return { + clusterName, + serialization: { + dataSerializableFactories: { + 1: new MyIdentifiedFactory() + }, + portableFactories: { + 1: new MyPortableFactory() + } + } + }; + } + + it('should be configured programmatically', function () { + return Client.newHazelcastClient(createConfig(cluster.id)) .then(function (cl) { client = cl; - var map; + let map; return client.getMap('furkan').then(function (mp) { map = mp; return map.put('foo', new Foo("elma")); diff --git a/test/serialization/config/Foo.js b/test/serialization/config/Foo.js index 09ab5b9da..2d63940f2 100644 --- a/test/serialization/config/Foo.js +++ b/test/serialization/config/Foo.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +'use strict'; function Foo(foo) { this.foo = foo; @@ -36,7 +36,6 @@ Foo.prototype.readPortable = function (portableReader) { } function MyPortableFactory() { - } MyPortableFactory.prototype.create = function (type) { diff --git a/test/serialization/config/Musician.js b/test/serialization/config/Musician.js index c9b251dc9..a81cc2a1c 100644 --- a/test/serialization/config/Musician.js +++ b/test/serialization/config/Musician.js @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; function Musician(name) { this.name = name; @@ -23,25 +24,23 @@ Musician.prototype.hzGetCustomId = function () { }; function MusicianSerializer() { - } MusicianSerializer.prototype.getId = function () { return 10; } - MusicianSerializer.prototype.write = function (objectDataOutput, object) { objectDataOutput.writeInt(object.name.length); - for (var i = 0; i < object.name.length; i++) { + for (let i = 0; i < object.name.length; i++) { objectDataOutput.writeInt(object.name.charCodeAt(i)); } } MusicianSerializer.prototype.read = function (objectDataInput) { - var len = objectDataInput.readInt(); - var name = ''; - for (var i = 0; i < len; i++) { + const len = objectDataInput.readInt(); + let name = ''; + for (let i = 0; i < len; i++) { name = name + String.fromCharCode(objectDataInput.readInt()); } return new Musician(name); diff --git a/test/serialization/config/customserializer.json b/test/serialization/config/customserializer.json deleted file mode 100644 index aa0dde390..000000000 --- a/test/serialization/config/customserializer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "serialization": { - "defaultNumberType": "integer", - "isBigEndian": false, - "dataSerializableFactories": [ - { - "path": "Address.js", - "exportedName": "MyIdentifiedFactory", - "factoryId": 1 - } - ], - "portableFactories": [ - { - "path": "Foo.js", - "exportedName": "MyPortableFactory", - "factoryId": 1 - } - ], - "serializers": [ - { - "path": "Musician.js", - "exportedName": "MusicianSerializer", - "typeId": 10 - } - ] - } -} diff --git a/test/serialization/portable/ClassDefinitionTest.js b/test/serialization/portable/ClassDefinitionTest.js index 07c36a27c..3e20687f2 100644 --- a/test/serialization/portable/ClassDefinitionTest.js +++ b/test/serialization/portable/ClassDefinitionTest.js @@ -13,26 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require('chai').expect; -var assert = require('chai').assert; -var CD = require('../../../').ClassDefinition; -var FD = require('../../../').FieldDefinition; -var FT = require('../../../').FieldDefinition; +const expect = require('chai').expect; +const { ClassDefinition, FieldDefinition } = require('../../../'); describe('ClassDefinitionTest', function () { - var a = new CD(1, 2, 3); - it('getFieldType():firstField should be type of FT.INT.', function () { - a.addFieldDefinition(new FD(0, 'firstField', FT.INT, 10, 10)); - var type = a.getFieldType('firstField'); - expect(type).equal(FT.INT); + const a = new ClassDefinition(1, 2, 3); + + it('getFieldType():firstField should be type of FD.INT.', function () { + a.addFieldDefinition(new FieldDefinition(0, 'firstField', FieldDefinition.INT, 10, 10)); + const type = a.getFieldType('firstField'); + expect(type).equal(FieldDefinition.INT); }); - it('getFieldType():secondField should be type of FT.STRING.', function () { - a.addFieldDefinition(new FD(1, 'secondField', FT.CHAR_ARRAY, 11, 11)); - var type = a.getFieldType('secondField'); - expect(type).equal(FT.CHAR_ARRAY); + it('getFieldType():secondField should be type of FD.STRING.', function () { + a.addFieldDefinition(new FieldDefinition(1, 'secondField', FieldDefinition.CHAR_ARRAY, 11, 11)); + const type = a.getFieldType('secondField'); + expect(type).equal(FieldDefinition.CHAR_ARRAY); }); it('getFieldType():thirdField should be null because we will not add it. (It does not exist.)', function () { @@ -41,12 +40,12 @@ describe('ClassDefinitionTest', function () { it('hasField():field was added so it should be return true.', function () { - a.addFieldDefinition(new FD(2, 'aField', FT.INT, 10, 10)); + a.addFieldDefinition(new FieldDefinition(2, 'aField', FieldDefinition.INT, 10, 10)); expect(a.hasField('aField')).to.be.true; }); it('hasField():field was not added so it should be return false.', function () { - var res = a.hasField('anotherField'); + const res = a.hasField('anotherField'); expect(res).to.be.false; }); @@ -67,24 +66,23 @@ describe('ClassDefinitionTest', function () { }); it('equals():When parameter passed is not a ClassDefinitionObject.', function () { - var a1 = new CD(); - var b1 = new FD(); - var res = a1.equals(b1); + const a1 = new ClassDefinition(); + const b1 = new FieldDefinition(); + const res = a1.equals(b1); expect(res).to.equal(false); }); it('equals():When one of the fields (or more) is not matched with the parameter.', function () { - var a1 = new CD(1, 3, 4); - var b1 = new CD(1, 3, 6); - var res = a1.equals(b1); + const a1 = new ClassDefinition(1, 3, 4); + const b1 = new ClassDefinition(1, 3, 6); + const res = a1.equals(b1); expect(res).to.equal(false); }); it('equals():When parameter is equal.', function () { - var a1 = new CD(1, 3, 6); - var b1 = new CD(1, 3, 6); - var res = a1.equals(b1); + const a1 = new ClassDefinition(1, 3, 6); + const b1 = new ClassDefinition(1, 3, 6); + const res = a1.equals(b1); expect(res).to.equal(true); }); - }); diff --git a/test/serialization/portable/NestedPortableVersionTest.js b/test/serialization/portable/NestedPortableVersionTest.js index 42fc83d54..bc3ab3280 100644 --- a/test/serialization/portable/NestedPortableVersionTest.js +++ b/test/serialization/portable/NestedPortableVersionTest.js @@ -13,17 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var Config = require('../../../.').Config; -var SerializationService = require('../../../lib/serialization/SerializationService'); -var Parent = require('../PortableObjects').Parent; -var Child = require('../PortableObjects').Child; -var Util = require('../../Util'); +const SerializationConfigImpl = require('../../../lib/config/SerializationConfig').SerializationConfigImpl; +const SerializationServiceV1 = require('../../../lib/serialization/SerializationService').SerializationServiceV1; +const Parent = require('../PortableObjects').Parent; +const Child = require('../PortableObjects').Child; +const Util = require('../../Util'); -describe('Nested Portable Version', function () { +describe('NestedPortableVersionTest', function () { it('compatible versions', function () { - var sc = new Config.SerializationConfig(); + const sc = new SerializationConfigImpl(); sc.portableVersion = 6; sc.portableFactories[1] = { create: function (classId) { @@ -36,18 +37,17 @@ describe('Nested Portable Version', function () { } }; - var ss1 = new SerializationService.SerializationServiceV1(undefined, sc); - var ss2 = new SerializationService.SerializationServiceV1(undefined, sc); + const ss1 = new SerializationServiceV1(sc); + const ss2 = new SerializationServiceV1(sc); // make sure ss2 cached class definition of child ss2.toData(new Child("Furkan")); // serialized parent from ss1 - var p = new Parent(new Child("Furkan")); - var data = ss1.toData(p); + const p = new Parent(new Child("Furkan")); + const data = ss1.toData(p); // cached class definition of child and the class definition from data coming from ss1 should be compatible Util.expectAlmostEqual(p, ss2.toObject(data)); }); - }); diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index f9331f285..507cea196 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -13,39 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var Controller = require('./../RC'); -var Util = require('./../Util'); +const expect = require('chai').expect; +const RC = require('./../RC'); +const Client = require('../..').Client; +const ItemEventType = require('../..').ItemEventType; -var HazelcastClient = require("../../lib/index.js").Client; -var Config = require("../../lib/index.js").Config; -var ItemEventType = require('../../lib/core/ItemListener').ItemEventType; +describe('SetProxyTest', function () { -describe("Set Proxy", function () { - - var cluster; - var client; - var setInstance; + let cluster; + let client; + let setInstance; before(function () { this.timeout(10000); - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - const config = new Config.ClientConfig(); - config.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { - client = hazelcastClient; - }); + return Client.newHazelcastClient({ clusterName: cluster.id }); + }).then(function (hazelcastClient) { + client = hazelcastClient; }); }); beforeEach(function () { return client.getSet('test').then(function (s) { setInstance = s; - }) + }); }); afterEach(function () { @@ -54,19 +50,18 @@ describe("Set Proxy", function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - - it("adds one item", function () { + it('adds one item', function () { return setInstance.add(1).then(function () { return setInstance.size().then(function (size) { expect(size).to.equal(1); }); - }) + }); }); - it("adds all", function () { + it('adds all', function () { return setInstance.addAll([1, 2, 3]).then(function () { return setInstance.size().then(function (size) { expect(size).to.equal(3); @@ -74,8 +69,8 @@ describe("Set Proxy", function () { }); }); - it("toArray", function () { - var input = [1, 2, 3]; + it('toArray', function () { + const input = [1, 2, 3]; return setInstance.addAll(input).then(function () { return setInstance.toArray().then(function (all) { expect(all.sort()).to.deep.equal(input); @@ -83,8 +78,8 @@ describe("Set Proxy", function () { }); }); - it("contains", function () { - var input = [1, 2, 3]; + it('contains', function () { + const input = [1, 2, 3]; return setInstance.addAll(input).then(function () { return setInstance.contains(1).then(function (contains) { expect(contains).to.be.true; @@ -96,7 +91,7 @@ describe("Set Proxy", function () { }); }); - it("contains all", function () { + it('contains all', function () { return setInstance.addAll([1, 2, 3]).then(function () { return setInstance.containsAll([1, 2]).then(function (contains) { expect(contains).to.be.true; @@ -109,18 +104,18 @@ describe("Set Proxy", function () { }); - it("is empty", function () { + it('is empty', function () { return setInstance.isEmpty().then(function (empty) { expect(empty).to.be.true; return setInstance.add(1); }).then(function () { return setInstance.isEmpty().then(function (empty) { expect(empty).to.be.false; - }) - }) + }); + }); }); - it("removes an entry", function () { + it('removes an entry', function () { return setInstance.addAll([1, 2, 3]).then(function () { return setInstance.remove(1) }).then(function () { @@ -130,7 +125,7 @@ describe("Set Proxy", function () { }); }); - it("removes multiple entries", function () { + it('removes multiple entries', function () { return setInstance.addAll([1, 2, 3, 4]).then(function () { return setInstance.removeAll([1, 2]); }).then(function () { @@ -140,7 +135,7 @@ describe("Set Proxy", function () { }); }); - it("retains multiple entries", function () { + it('retains multiple entries', function () { return setInstance.addAll([1, 2, 3, 4]).then(function () { return setInstance.retainAll([1, 2]); }).then(function () { @@ -160,7 +155,7 @@ describe("Set Proxy", function () { }); }); - it("listens for added entry", function (done) { + it('listens for added entry', function (done) { this.timeout(5000); setInstance.addItemListener({ itemAdded: function (itemEvent) { @@ -177,7 +172,7 @@ describe("Set Proxy", function () { }); }); - it("listens for added and removed entry", function (done) { + it('listens for added and removed entry', function (done) { this.timeout(5000); setInstance.addItemListener({ itemAdded: function (itemEvent) { @@ -202,7 +197,7 @@ describe("Set Proxy", function () { }); }); - it("listens for removed entry", function (done) { + it('listens for removed entry', function (done) { this.timeout(5000); setInstance.addItemListener({ itemRemoved: function (itemEvent) { @@ -221,8 +216,7 @@ describe("Set Proxy", function () { }); }); - - it("remove entry listener", function () { + it('remove entry listener', function () { this.timeout(5000); return setInstance.addItemListener({ itemRemoved: function (itemEvent) { @@ -236,8 +230,6 @@ describe("Set Proxy", function () { return setInstance.removeItemListener(registrationId); }).then(function (removed) { expect(removed).to.be.true; - }) + }); }); - - }); diff --git a/test/ssl/BasicSSLOptionsFactoryTest.js b/test/ssl/BasicSSLOptionsFactoryTest.js index f9813ddec..b8e0fa477 100644 --- a/test/ssl/BasicSSLOptionsFactoryTest.js +++ b/test/ssl/BasicSSLOptionsFactoryTest.js @@ -13,27 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require("chai"); -var expect = chai.expect; -var Path = require('path'); -var HazelcastError = require('../..').HazelcastErrors.HazelcastError; -var BasicSSLOptionsFactory = require('../../lib/connection/BasicSSLOptionsFactory').BasicSSLOptionsFactory; +const chai = require("chai"); +const expect = chai.expect; +const path = require('path'); +const HazelcastError = require('../..').HazelcastErrors.HazelcastError; +const BasicSSLOptionsFactory = require('../../lib/connection/BasicSSLOptionsFactory').BasicSSLOptionsFactory; describe('BasicSSLOptionsFactoryTest', function () { it('factory creates sslOptions object with all supported fields', function () { - var options = { + const options = { servername: 'foo.bar.com', rejectUnauthorized: true, - caPath: Path.join(__dirname, './server1-cert.pem'), - keyPath: Path.join(__dirname, './client1-key.pem'), - certPath: Path.join(__dirname, './client1-cert.pem'), + caPath: path.join(__dirname, './server1-cert.pem'), + keyPath: path.join(__dirname, './client1-key.pem'), + certPath: path.join(__dirname, './client1-cert.pem'), ciphers: 'cipherliststring' }; - var factory = new BasicSSLOptionsFactory(); + const factory = new BasicSSLOptionsFactory(); return factory.init(options).then(function () { - var optsObject = factory.getSSLOptions(); + const optsObject = factory.getSSLOptions(); expect(optsObject.servername).to.equal('foo.bar.com'); expect(optsObject.rejectUnauthorized).to.be.true; expect(optsObject.ca).to.be.instanceOf(Buffer); @@ -44,7 +45,7 @@ describe('BasicSSLOptionsFactoryTest', function () { }); it('BasicSSLOptionsFactory throws when provided with non-object properties', function () { - var factory = new BasicSSLOptionsFactory(); + const factory = new BasicSSLOptionsFactory(); return expect(factory.init.bind(factory, 3)).to.throw(HazelcastError); - }) + }); }); diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index b559ab9b4..7299d7d47 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -13,97 +13,113 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require("chai"); -var expect = chai.expect; -var fs = require('fs'); -var chaiAsPromised = require("chai-as-promised"); +const chai = require("chai"); +const expect = chai.expect; +const chaiAsPromised = require("chai-as-promised"); chai.use(chaiAsPromised); -var Client = require("../../.").Client; -var Controller = require('./../RC'); -var Config = require('../..').Config; -var HzErrors = require('../..').HazelcastErrors; -var markEnterprise = require('../Util').markEnterprise; -var Path = require('path'); +const fs = require('fs'); +const path = require('path'); -describe('SSL Client Authentication Test', function () { - var cluster; - var member; +const Client = require("../../.").Client; +const RC = require('./../RC'); +const Errors = require('../..').HazelcastErrors; +const markEnterprise = require('../Util').markEnterprise; - var maRequiredXML = __dirname + '/hazelcast-ma-required.xml'; - var maOptionalXML = __dirname + '/hazelcast-ma-optional.xml'; +describe('ClientSSLAuthenticationTest', function () { + + let cluster; + + const maRequiredXML = __dirname + '/hazelcast-ma-required.xml'; + const maOptionalXML = __dirname + '/hazelcast-ma-optional.xml'; before(function () { markEnterprise(this); }); function createMemberWithXML(serverXML) { - return Controller.createCluster(null, fs.readFileSync(serverXML, 'utf8')).then(function (cl) { + return RC.createCluster(null, fs.readFileSync(serverXML, 'utf8')).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); - }).then(function (m) { - member = m; + return RC.startMember(cluster.id); }); } - function createClientConfigWithSSLOptsUsingProgrammaticConfiguration(key, cert, ca) { - var sslOpts = { - servername: 'foo.bar.com', - rejectUnauthorized: true, - ca: fs.readFileSync(Path.join(__dirname, ca)), - key: fs.readFileSync(Path.join(__dirname, key)), - cert: fs.readFileSync(Path.join(__dirname, cert)) + function createClientConfigWithBasicSSLOptionsFactory(key, cert, ca) { + return { + clusterName: cluster.id, + network: { + clusterMembers: ['127.0.0.1:5701'], + ssl: { + enabled: true, + sslOptionsFactoryProperties: { + servername: 'foo.bar.com', + rejectUnauthorized: true, + caPath: path.resolve(__dirname, ca), + keyPath: path.resolve(__dirname, key), + certPath: path.resolve(__dirname, cert) + } + } + }, + connectionStrategy: { + connectionRetry: { + clusterConnectTimeoutMillis: 1000 + } + } }; - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.networkConfig.addresses.push('127.0.0.1:5701'); - cfg.networkConfig.sslConfig.enabled = true; - cfg.networkConfig.sslConfig.sslOptions = sslOpts; - cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 1000; - return cfg; } - function createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory(key, cert, ca) { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.networkConfig.addresses.push('127.0.0.1:5701'); - cfg.networkConfig.sslConfig.enabled = true; - cfg.networkConfig.sslConfig.sslOptionsFactoryConfig = { - exportedName: 'BasicSSLOptionsFactory' - }; - cfg.networkConfig.sslConfig.sslOptionsFactoryProperties = { - caPath: Path.resolve(__dirname, ca), - keyPath: Path.resolve(__dirname, key), - certPath: Path.resolve(__dirname, cert), + function createClientConfigWithSSLOpts(key, cert, ca) { + const sslOpts = { + servername: 'foo.bar.com', rejectUnauthorized: true, - servername: 'foo.bar.com' + ca: fs.readFileSync(path.join(__dirname, ca)), + key: fs.readFileSync(path.join(__dirname, key)), + cert: fs.readFileSync(path.join(__dirname, cert)) + }; + return { + clusterName: cluster.id, + network: { + clusterMembers: ['127.0.0.1:5701'], + ssl: { + enabled: true, + sslOptions: sslOpts + } + }, + connectionStrategy: { + connectionRetry: { + clusterConnectTimeoutMillis: 1000 + } + } }; - cfg.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 1000; - return cfg; } [false, true].forEach(function (value) { + let createClientConfigFn; + let title; if (value) { - var createClientConfigWithSSLOpts = createClientConfigWithSSLOptsUsingBasicSSLOptionsFactory; - var title = 'via BasicSSLOptionsFactory'; + createClientConfigFn = createClientConfigWithBasicSSLOptionsFactory; + title = 'via BasicSSLOptionsFactory'; } else { - var createClientConfigWithSSLOpts = createClientConfigWithSSLOptsUsingProgrammaticConfiguration; - var title = 'via programmatic configuration'; + createClientConfigFn = createClientConfigWithSSLOpts; + title = 'via programmatic configuration'; } describe(title, function () { - before(function () { - markEnterprise(this); + beforeEach(function () { + this.timeout(10000); }); afterEach(function () { - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('ma:required, they both know each other should connect', function () { return createMemberWithXML(maRequiredXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server1-cert.pem')); + return Client.newHazelcastClient(createClientConfigFn( + './client1-key.pem', './client1-cert.pem', './server1-cert.pem' + )); }).then(function (client) { client.shutdown(); }); @@ -111,28 +127,33 @@ describe('SSL Client Authentication Test', function () { it('ma:required, server knows client, client does not know server should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server2-cert.pem'))) - .to.be.rejectedWith(HzErrors.IllegalStateError); + return expect(Client.newHazelcastClient(createClientConfigFn( + './client1-key.pem', './client1-cert.pem', './server2-cert.pem' + ))).to.be.rejectedWith(Errors.IllegalStateError); }); }); it('ma:required, server does not know client, client knows server should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', - './server1-cert.pem'))).to.be.rejectedWith(HzErrors.IllegalStateError); + return expect(Client.newHazelcastClient(createClientConfigFn( + './client2-key.pem', './client2-cert.pem', './server1-cert.pem' + ))).to.be.rejectedWith(Errors.IllegalStateError); }); }); it('ma:required, neither one knows the other should fail', function () { return createMemberWithXML(maRequiredXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', - './server2-cert.pem'))).to.be.rejectedWith(HzErrors.IllegalStateError); + return expect(Client.newHazelcastClient(createClientConfigFn( + './client2-key.pem', './client2-cert.pem', './server2-cert.pem' + ))).to.be.rejectedWith(Errors.IllegalStateError); }); }); it('ma:optional, they both know each other should connect', function () { return createMemberWithXML(maOptionalXML).then(function () { - return Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server1-cert.pem')); + return Client.newHazelcastClient(createClientConfigFn( + './client1-key.pem', './client1-cert.pem', './server1-cert.pem' + )); }).then(function (client) { client.shutdown(); }); @@ -140,25 +161,27 @@ describe('SSL Client Authentication Test', function () { it('ma:optional, server knows client, client does not know server should fail', function () { return createMemberWithXML(maOptionalXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client1-key.pem', './client1-cert.pem', './server2-cert.pem'))) - .to.be.rejectedWith(HzErrors.IllegalStateError); + return expect(Client.newHazelcastClient(createClientConfigFn( + './client1-key.pem', './client1-cert.pem', './server2-cert.pem' + ))).to.be.rejectedWith(Errors.IllegalStateError); }); }); it('ma:optional, server does not know client, client knows server should fail', function () { return createMemberWithXML(maOptionalXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server1-cert.pem'))) - .to.be.rejectedWith(HzErrors.IllegalStateError); + return expect(Client.newHazelcastClient(createClientConfigFn( + './client2-key.pem', './client2-cert.pem', './server1-cert.pem' + ))).to.be.rejectedWith(Errors.IllegalStateError); }); }); it('ma:optional, neither knows the other should fail', function () { return createMemberWithXML(maOptionalXML).then(function () { - return expect(Client.newHazelcastClient(createClientConfigWithSSLOpts('./client2-key.pem', './client2-cert.pem', './server2-cert.pem'))) - .to.be.rejectedWith(HzErrors.IllegalStateError); + return expect(Client.newHazelcastClient(createClientConfigFn( + './client2-key.pem', './client2-cert.pem', './server2-cert.pem' + ))).to.be.rejectedWith(Errors.IllegalStateError); }); }); }); }); - }); diff --git a/test/ssl/ClientSSLTest.js b/test/ssl/ClientSSLTest.js index 8f176c502..dc81e5562 100644 --- a/test/ssl/ClientSSLTest.js +++ b/test/ssl/ClientSSLTest.js @@ -13,74 +13,86 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var chai = require('chai'); +const chai = require('chai'); chai.use(require('chai-as-promised')); -var expect = chai.expect; -var fs = require('fs'); -var Promise = require('bluebird'); -var path = require('path'); +const expect = chai.expect; +const fs = require('fs'); -var markEnterprise = require('../Util').markEnterprise; -var Controller = require('./../RC'); +const markEnterprise = require('../Util').markEnterprise; +const RC = require('./../RC'); -var HazelcastClient = require("../../").Client; -var Errors = require('../..').HazelcastErrors; -var Config = require('../..').Config; +const HazelcastClient = require("../../").Client; +const Errors = require('../..').HazelcastErrors; -describe("Client with SSL enabled", function () { +describe('ClientSSLTest', function () { - var cluster; - var client; - var serverConfig; + let cluster; + let client; + let serverConfig; + + before(function () { + markEnterprise(this); + }); beforeEach(function () { this.timeout(20000); - //markEnterprise(this); serverConfig = fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8'); }); afterEach(function () { this.timeout(20000); - //markEnterprise(this); if (client) { client.shutdown(); client = null; } - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); function createCluster(sConfig) { - return Controller.createCluster(null, sConfig).then(function (response) { + return RC.createCluster(null, sConfig).then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }); } it('should not be able to connect to the server with invalid certificate', function () { - var sConfig = serverConfig + const sConfig = serverConfig .replace('[serverCertificate]', 'com/hazelcast/nio/ssl-mutual-auth/server1.keystore') .replace('[password]', 'password'); return createCluster(sConfig).then(function () { - var clientConfig = new Config.ClientConfig(); - clientConfig.clusterName = cluster.id; - clientConfig.networkConfig.sslConfig.enabled = true; - clientConfig.networkConfig.addresses.push('127.0.0.1:5701'); - clientConfig.connectionStrategyConfig.connectionRetryConfig.clusterConnectTimeoutMillis = 1000; - return expect(HazelcastClient.newHazelcastClient(clientConfig)).to.be.rejectedWith(Errors.IllegalStateError); + return expect(HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + clusterMembers: ['127.0.0.1:5701'], + ssl: { + enabled: true + } + }, + connectionStrategy: { + connectionRetry: { + clusterConnectTimeoutMillis: 1000 + } + } + })).to.be.rejectedWith(Errors.IllegalStateError); }) }); it('should be able to connect to the server with valid certificate', function () { - var sConfig = serverConfig + const sConfig = serverConfig .replace('[serverCertificate]', 'com/hazelcast/nio/ssl/letsencrypt.jks') .replace('[password]', '123456'); return createCluster(sConfig).then(function () { - var clientConfig = new Config.ClientConfig(); - clientConfig.clusterName = cluster.id; - clientConfig.networkConfig.sslConfig.enabled = true; - clientConfig.networkConfig.addresses.push('127.0.0.1:5701'); - return HazelcastClient.newHazelcastClient(clientConfig); + return HazelcastClient.newHazelcastClient({ + clusterName: cluster.id, + network: { + clusterMembers: ['127.0.0.1:5701'], + ssl: { + enabled: true + } + } + }); }).then(function (hazelcastClient) { client = hazelcastClient; return expect(client.lifecycleService.isRunning()).to.be.true; diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index 2b11c6aaf..9388ec385 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -13,24 +13,60 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; +const Statistics = require("../../lib/statistics/Statistics").Statistics; +const expect = require('chai').expect; +const BuildInfo = require('../../lib/BuildInfo').BuildInfo; -var Statistics = require("../../lib/statistics/Statistics").Statistics; -var expect = require('chai').expect; -var BuildInfo = require('../../lib/BuildInfo').BuildInfo; +const RC = require('../RC'); +const Client = require('../../').Client; +const TestUtil = require('../Util'); +const Util = require('../../lib/Util'); +const os = require('os'); -var RC = require('../RC'); -var Client = require('../../').Client; -var TestUtil = require('../Util'); -var Util = require('../../lib/Util'); -var Config = require('../../').Config; -var os = require('os'); +function getClientStatisticsFromServer(cluster, client) { + const clientUuid = client.getConnectionManager().getClientUuid(); + const script = + 'stats = instance_0.getOriginal().node.getClientEngine().getClientStatistics()\n' + + 'keys = stats.keySet().toArray()\n' + + 'for(i=0; i < keys.length; i++) {\n' + + ' if (keys[i].toString().equals("'+ clientUuid + '")) {\n' + + ' result = stats.get(keys[i]).clientAttributes()\n' + + ' break\n' + + ' }\n' + + '}\n'; + return RC.executeOnController(cluster.id, script, 1).then(function (response) { + if (response.result != null) { + return response.result.toString(); + } + return null; + }); +} + +function extractStringStatValue(stats, statName) { + const re = new RegExp(statName + '=(.*?)(?:,|$)'); + const matches = stats.match(re); + return matches[1]; +} + +function extractFloatStatValue(stats, statName) { + return Number.parseFloat(extractStringStatValue(stats, statName)); +} + +function extractBooleanStatValue(stats, statName) { + return 'true' === extractStringStatValue(stats, statName); +} + +function extractIntStatValue(stats, statName) { + return Number.parseInt(extractStringStatValue(stats, statName)); +} describe('Statistics with default period', function () { - var cluster; - var client; - var map; + let cluster; + let client; + let map; before(function () { return RC.createCluster(null, null).then(function (res) { @@ -38,14 +74,17 @@ describe('Statistics with default period', function () { }).then(function () { return RC.startMember(cluster.id); }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - var ncc = new Config.NearCacheConfig(); - ncc.name = 'nearCachedMap*'; - ncc.invalidateOnChange = false; - cfg.nearCacheConfigs['nearCachedMap*'] = ncc; - cfg.properties['hazelcast.client.statistics.enabled'] = true; - return Client.newHazelcastClient(cfg).then(function (cl) { + return Client.newHazelcastClient({ + clusterName: cluster.id, + nearCaches: { + 'nearCachedMap*': { + invalidateOnChange: false + } + }, + properties: { + 'hazelcast.client.statistics.enabled': true + } + }).then(function (cl) { client = cl; }) }); @@ -66,6 +105,11 @@ describe('Statistics with default period', function () { return map.destroy(); }); + function contains(base, search) { + const firstIndex = base.indexOf(search); + return firstIndex > -1 && firstIndex == base.lastIndexOf(search); + } + it('should be enabled via configuration', function () { return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); @@ -121,23 +165,19 @@ describe('Statistics with default period', function () { }).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (stats) { - var nearCacheStats = 'nc.' + map.getName(); + const nearCacheStats = 'nc.' + map.getName(); expect(contains(stats, nearCacheStats + '.hits=1')).to.be.true; expect(contains(stats, nearCacheStats + '.creationTime=')).to.be.true; expect(contains(stats, nearCacheStats + '.misses=1')).to.be.true; expect(contains(stats, nearCacheStats + '.ownedEntryCount=1')).to.be.true; }); }); - - function contains(base, search) { - var firstIndex = base.indexOf(search); - return firstIndex > -1 && firstIndex == base.lastIndexOf(search); - } }); describe('Statistics with non-default period', function () { - var cluster; - var client; + + let cluster; + let client; before(function () { return RC.createCluster(null, null).then(function (res) { @@ -145,11 +185,13 @@ describe('Statistics with non-default period', function () { }).then(function () { return RC.startMember(cluster.id); }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.statistics.enabled'] = true; - cfg.properties['hazelcast.client.statistics.period.seconds'] = 2; - return Client.newHazelcastClient(cfg).then(function (cl) { + return Client.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.statistics.enabled': true, + 'hazelcast.client.statistics.period.seconds': 2 + } + }).then(function (cl) { client = cl; }); }); @@ -161,7 +203,7 @@ describe('Statistics with non-default period', function () { }); it('should not change before period', function () { - var stats1; + let stats1; return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (st) { @@ -173,7 +215,7 @@ describe('Statistics with non-default period', function () { }); it('should change after period', function () { - var stats1; + let stats1; return TestUtil.promiseWaitMilliseconds(1000).then(function () { return getClientStatisticsFromServer(cluster, client); }).then(function (st) { @@ -188,8 +230,9 @@ describe('Statistics with non-default period', function () { }); describe('Statistics with negative period', function () { - var client; - var cluster; + + let client; + let cluster; before(function () { return RC.createCluster(null, null).then(function (res) { @@ -197,11 +240,13 @@ describe('Statistics with negative period', function () { }).then(function () { return RC.startMember(cluster.id); }).then(function () { - var cfg = new Config.ClientConfig(); - cfg.clusterName = cluster.id; - cfg.properties['hazelcast.client.statistics.enabled'] = true; - cfg.properties['hazelcast.client.statistics.period.seconds'] = -2; - return Client.newHazelcastClient(cfg) + return Client.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.statistics.enabled': true, + 'hazelcast.client.statistics.period.seconds': -2 + } + }); }).then(function (cl) { client = cl; }); @@ -220,40 +265,3 @@ describe('Statistics with negative period', function () { }); }); }); - -function getClientStatisticsFromServer(cluster, client) { - var clientUuid = client.getConnectionManager().getClientUuid(); - var script = - 'stats = instance_0.getOriginal().node.getClientEngine().getClientStatistics()\n' + - 'keys = stats.keySet().toArray()\n' + - 'for(i=0; i < keys.length; i++) {\n' + - ' if (keys[i].toString().equals("'+ clientUuid + '")) {\n' + - ' result = stats.get(keys[i]).clientAttributes()\n' + - ' break\n' + - ' }\n' + - '}\n'; - return RC.executeOnController(cluster.id, script, 1).then(function (response) { - if (response.result != null) { - return response.result.toString(); - } - return null; - }); -} - -function extractStringStatValue(stats, statName) { - var re = new RegExp(statName + '=(.*?)(?:,|$)'); - var matches = stats.match(re); - return matches[1]; -} - -function extractFloatStatValue(stats, statName) { - return Number.parseFloat(extractStringStatValue(stats, statName)); -} - -function extractBooleanStatValue(stats, statName) { - return 'true' === extractStringStatValue(stats, statName); -} - -function extractIntStatValue(stats, statName) { - return Number.parseInt(extractStringStatValue(stats, statName)); -} diff --git a/test/topic/TopicTest.js b/test/topic/TopicTest.js index 3bf53b9b1..67b666461 100644 --- a/test/topic/TopicTest.js +++ b/test/topic/TopicTest.js @@ -13,175 +13,161 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; -var expect = require("chai").expect; -var index = require("../../lib/index.js"); +const expect = require('chai').expect; +const fs = require('fs'); +const Long = require('long'); +const Promise = require('bluebird'); -var HazelcastClient = index.Client; -var Config = index.Config; -var TopicOverloadPolicy = index.TopicOverloadPolicy.TopicOverloadPolicy; -var Controller = require('./../RC'); -var ReliableTopicMessage = require('../../lib/proxy/topic/ReliableTopicMessage').ReliableTopicMessage; -var fs = require('fs'); -var Long = require('long'); -var Promise = require('bluebird'); +const RC = require('./../RC'); +const Client = require('../..').Client; +const TopicOverloadPolicy = require('../..').TopicOverloadPolicy.TopicOverloadPolicy; +const ReliableTopicMessage = require('../../lib/proxy/topic/ReliableTopicMessage').ReliableTopicMessage; -var createConfig = function (clusterName) { - var config = new Config.ClientConfig(); - config.clusterName = clusterName; +describe('TopicTest', function () { - var discard = new Config.ReliableTopicConfig(); - discard.overloadPolicy = TopicOverloadPolicy.DISCARD_NEWEST; - - var overwrite = new Config.ReliableTopicConfig(); - overwrite.overloadPolicy = TopicOverloadPolicy.DISCARD_OLDEST; - - config.reliableTopicConfigs["discard"] = discard; - config.reliableTopicConfigs["overwrite"] = overwrite; - return config; -}; - -var generateItems = function (client, howMany) { - var all = []; - - for (var i = 1; i <= howMany; i++) { - var reliableTopicMessage = new ReliableTopicMessage(); - reliableTopicMessage.payload = client.getSerializationService().toData(i); - reliableTopicMessage.publishTime = Long.fromNumber(new Date().getTime()); - reliableTopicMessage.publisherAddress = client.getClusterService().getLocalClient().localAddress; - all.push(reliableTopicMessage); + this.timeout(40000); + let cluster; + let clientOne; + let clientTwo; + + function createConfig(clusterName) { + return { + clusterName, + reliableTopics : { + 'discard': { + overloadPolicy: TopicOverloadPolicy.DISCARD_NEWEST + }, + 'overwrite': { + overloadPolicy: TopicOverloadPolicy.DISCARD_OLDEST + } + } + }; } - return all; -}; -describe("Reliable Topic Proxy", function () { - var cluster; - var clientOne; - var clientTwo; - - this.timeout(40000); + function generateItems(client, howMany) { + const all = []; + for (let i = 1; i <= howMany; i++) { + const reliableTopicMessage = new ReliableTopicMessage(); + reliableTopicMessage.payload = client.getSerializationService().toData(i); + reliableTopicMessage.publishTime = Long.fromNumber(new Date().getTime()); + reliableTopicMessage.publisherAddress = client.getClusterService().getLocalClient().localAddress; + all.push(reliableTopicMessage); + } + return all; + } before(function () { this.timeout(40000); - var config = fs.readFileSync(__dirname + '/hazelcast_topic.xml', 'utf8'); - return Controller.createCluster(null, config).then(function (response) { + const memberConfig = fs.readFileSync(__dirname + '/hazelcast_topic.xml', 'utf8'); + return RC.createCluster(null, memberConfig).then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - var config = createConfig(cluster.id); - + const config = createConfig(cluster.id); return Promise.all([ - HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { + Client.newHazelcastClient(config).then(function (hazelcastClient) { clientOne = hazelcastClient; }), - HazelcastClient.newHazelcastClient(config).then(function (hazelcastClient) { + Client.newHazelcastClient(config).then(function (hazelcastClient) { clientTwo = hazelcastClient; }) ]); }); }); - after(function () { clientOne.shutdown(); clientTwo.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); - it("writes and reads messages", function (done) { - var topicName = 't' + Math.random(); - var topicOne; - var topicTwo; + it('writes and reads messages', function (done) { + const topicName = 't' + Math.random(); + let topicOne; + let topicTwo; clientOne.getReliableTopic(topicName).then(function (t) { topicOne = t; return clientTwo.getReliableTopic(topicName); }).then(function (t) { topicTwo = t; topicTwo.addMessageListener(function (msg) { - if (msg.messageObject["value"] === "foo") { + if (msg.messageObject['value'] === 'foo') { done(); } }); setTimeout(function () { - topicOne.publish({"value": "foo"}); + topicOne.publish({'value': 'foo'}); }, 500); }); }); it('removed message listener does not receive items after removal', function (done) { - var topicName = 't' + Math.random(); - var topicOne; - var topicTwo; + const topicName = 't' + Math.random(); + let topicOne; + let topicTwo; clientOne.getReliableTopic(topicName).then(function (topic) { topicOne = topic; return clientTwo.getReliableTopic(topicName); }).then(function (topic) { topicTwo = topic; - var receivedMessages = 0; - - var id = topicTwo.addMessageListener(function (msg) { + let receivedMessages = 0; + const id = topicTwo.addMessageListener(function (msg) { receivedMessages++; if (receivedMessages > 2) { done(new Error('Kept receiving messages after message listener is removed.')); } }); - topicOne.publish({"value0": "foo0"}); - topicOne.publish({"value1": "foo1"}); + topicOne.publish({'value0': 'foo0'}); + topicOne.publish({'value1': 'foo1'}); setTimeout(function () { topicTwo.removeMessageListener(id); - topicOne.publish({"value2": "foo2"}); - topicOne.publish({"value3": "foo3"}); - topicOne.publish({"value4": "foo4"}); - topicOne.publish({"value5": "foo5"}); + topicOne.publish({'value2': 'foo2'}); + topicOne.publish({'value3': 'foo3'}); + topicOne.publish({'value4': 'foo4'}); + topicOne.publish({'value5': 'foo5'}); setTimeout(done, 500); }, 500); }); - }); - it("blocks when there is no more space", function () { - var topic; - var ringbuffer; - return clientOne.getReliableTopic("blocking").then(function (t) { + it('blocks when there is no more space', function () { + let topic; + let ringbuffer; + return clientOne.getReliableTopic('blocking').then(function (t) { topic = t; return topic.getRingbuffer(); }).then(function (rb) { ringbuffer = rb; return ringbuffer.capacity(); }).then(function (capacity) { - var all = []; - - for (var i = 0; i < capacity.toNumber() + 1; i++) { + const all = []; + for (let i = 0; i < capacity.toNumber() + 1; i++) { all.push(i); } - return ringbuffer.addAll(all); }).then(function () { - var startTime = Date.now(); + const startTime = Date.now(); return topic.publish(-50).then(function () { - /* - Here we check that the call was indeed blocking - until the TTL of the first inserted entry has passed - */ - - var elapsed = Date.now() - startTime; - + // Here we check that the call was indeed blocking + // until the TTL of the first inserted entry has passed + const elapsed = Date.now() - startTime; if (elapsed > 2000) { return; } else { - throw new Error("Message was published too fast, expected at least a 2 second delay, got: " + elapsed); + throw new Error('Message was published too fast, expected at least a 2 second delay, got: ' + elapsed); } }); }); - }); - it("continues operating when stale sequence is reached", function (done) { + it('continues operating when stale sequence is reached', function (done) { this.skip(); - var topic; - var ringbuffer; - clientOne.getReliableTopic("stale").then(function (t) { + let topic; + let ringbuffer; + clientOne.getReliableTopic('stale').then(function (t) { topic = t; return topic.getRingbuffer(); }).then(function (rb) { @@ -191,44 +177,41 @@ describe("Reliable Topic Proxy", function () { done(); } }); - - var all = generateItems(clientOne, 20); + const all = generateItems(clientOne, 20); ringbuffer.addAll(all); }); }); - it("discards the item when there is no more space", function () { - var topic; - return clientOne.getReliableTopic("discard").then(function (t) { + it('discards the item when there is no more space', function () { + let topic; + let ringbuffer; + return clientOne.getReliableTopic('discard').then(function (t) { topic = t; return topic.getRingbuffer(); }).then(function (rb) { ringbuffer = rb; - var all = generateItems(clientOne, 10); - + const all = generateItems(clientOne, 10); ringbuffer.addAll(all); - return topic.publish(11); }).then(function () { return ringbuffer.tailSequence(); }).then(function (seq) { return ringbuffer.readOne(seq); }).then(function (item) { - var obj = clientOne.getSerializationService().toObject(item.payload); + const obj = clientOne.getSerializationService().toObject(item.payload); expect(obj).to.equal(10); }); }); - it("overwrites the oldest item when there is no more space", function () { - var topic; - var ringbuffer; - return clientOne.getReliableTopic("overwrite").then(function (t) { + it('overwrites the oldest item when there is no more space', function () { + let topic; + let ringbuffer; + return clientOne.getReliableTopic('overwrite').then(function (t) { topic = t; return topic.getRingbuffer(); }).then(function (rb) { ringbuffer = rb; - var all = generateItems(clientOne, 10); - + const all = generateItems(clientOne, 10); ringbuffer.addAll(all); return topic.publish(11); }).then(function () { @@ -236,9 +219,8 @@ describe("Reliable Topic Proxy", function () { }).then(function (seq) { return ringbuffer.readOne(seq); }).then(function (item) { - var obj = clientOne.getSerializationService().toObject(item.payload); + const obj = clientOne.getSerializationService().toObject(item.payload); expect(obj).to.equal(11); }); - }) - + }); }); diff --git a/test/unit/AddressHelperTest.js b/test/unit/AddressHelperTest.js index 8c123df9a..f352d0e39 100644 --- a/test/unit/AddressHelperTest.js +++ b/test/unit/AddressHelperTest.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; const AddressHelper = require('../../lib/Util').AddressHelper; From ce511a4a9438f1143d48fd67fea529ed37adcdb1 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Fri, 7 Aug 2020 15:12:16 +0300 Subject: [PATCH 274/685] Improve client API (#563) Includes the following: * Convert getters into properties for CustomSerializable, Serializer, Portable, IdentifiedDataSerializable, PartitionAware * Convert IdentifiedDataSerializableFactory and PortableFactory into functions * Rename input/output arguments into reader/writer in Portable samples * Convert enum values to strings for ItemEventType, OverflowPolicy, IterationType * Extract interface for PagingPredicate * Fix hazelcast.logging.level property handling * Remove configuration sample JSON files * Move JSON schema into ./test * Also contains minor code style and jsdoc improvements --- DOCUMENTATION.md | 234 ++++++--------- code_samples/custom_serializer.js | 9 +- code_samples/global_serializer.js | 4 +- code_samples/identified_data_serializable.js | 26 +- code_samples/jaas_sample/admin_client.js | 4 +- code_samples/jaas_sample/reader_client.js | 4 +- code_samples/jaas_sample/user_pass_cred.js | 26 +- .../jaas_sample/user_pass_cred_factory.js | 12 +- .../org-website/CustomSerializerSample.js | 9 +- .../org-website/EntryProcessorSample.js | 23 +- .../org-website/GlobalSerializerSample.js | 4 +- .../IdentifiedDataSerializableSample.js | 22 +- .../org-website/PortableSerializableSample.js | 38 +-- code_samples/org-website/QuerySample.js | 38 +-- code_samples/paging_predicate.js | 36 ++- code_samples/portable_multiversion_sample.js | 128 +++----- code_samples/querying_with_SQL.js | 2 +- hazelcast-client-default.json | 66 ---- hazelcast-client-full.json | 150 ---------- src/Address.ts | 12 +- src/ClusterDataFactory.ts | 16 +- src/ClusterDataFactoryHelper.ts | 20 -- src/DistributedObject.ts | 8 +- src/HazelcastClient.ts | 2 +- src/LoadBalancer.ts | 4 +- src/aggregation/Aggregator.ts | 78 ++--- src/aggregation/AggregatorFactory.ts | 87 +++--- src/config/Config.ts | 3 +- src/config/LoadBalancerConfig.ts | 8 +- src/core/Comparator.ts | 15 +- src/core/DistributedObjectListener.ts | 5 +- src/core/ItemListener.ts | 25 +- src/core/MapListener.ts | 6 +- src/core/MembershipEvent.ts | 25 +- src/core/MembershipListener.ts | 10 +- src/core/OverflowPolicy.ts | 29 +- src/core/PartitionAware.ts | 9 +- src/core/Predicate.ts | 100 ++++++- src/core/ReadOnlyLazyList.ts | 27 +- src/core/RestValue.ts | 32 +- src/core/SimpleEntryView.ts | 59 +++- src/index.ts | 2 +- src/invocation/ClusterService.ts | 11 +- src/invocation/InvocationService.ts | 13 +- src/logging/DefaultLogger.ts | 6 +- src/logging/ILogger.ts | 14 +- src/logging/LoggingService.ts | 20 +- src/protocol/PagingPredicateHolder.ts | 18 +- src/proxy/BaseProxy.ts | 4 +- src/proxy/FlakeIdGenerator.ts | 2 - src/proxy/IList.ts | 6 +- src/proxy/IMap.ts | 6 +- src/proxy/MapProxy.ts | 10 +- src/proxy/PNCounter.ts | 2 - src/proxy/Ringbuffer.ts | 2 +- src/proxy/flakeid/AutoBatcher.ts | 1 - src/proxy/ringbuffer/ReadResultSet.ts | 15 +- src/proxy/ringbuffer/RingbufferProxy.ts | 16 +- .../topic/ReliableTopicListenerRunner.ts | 70 +++-- src/proxy/topic/ReliableTopicMessage.ts | 23 +- src/proxy/topic/ReliableTopicProxy.ts | 10 - src/serialization/DefaultPredicates.ts | 282 ++++++++++-------- src/serialization/DefaultSerializer.ts | 122 +++----- src/serialization/PredicateFactory.ts | 54 ---- src/serialization/Serializable.ts | 105 +++++-- src/serialization/SerializationService.ts | 65 ++-- .../portable/ClassDefinitionContext.ts | 7 +- .../portable/ClassDefinitionWriter.ts | 16 +- src/serialization/portable/PortableContext.ts | 22 +- .../portable/PortableSerializer.ts | 15 +- src/util/IndexUtil.ts | 4 +- test/LoggingTest.js | 10 +- test/MembershipListenerTest.js | 6 +- config-schema.json => test/config-schema.json | 1 - test/config/ConfigBuilderTest.js | 18 +- test/config/SchemaValidationTest.js | 2 +- test/config/configurations/full.json | 2 +- test/javaclasses/CustomComparator.js | 10 +- ...stortInvalidationMetadataEntryProcessor.js | 10 +- test/javaclasses/IdentifiedEntryProcessor.js | 10 +- test/javaclasses/IdentifiedFactory.js | 17 +- test/javaclasses/PrefixFilter.js | 11 +- test/map/ComparatorFactory.js | 14 +- test/map/MapEntryProcessorTest.js | 4 +- test/map/MapPartitionAwareTest.js | 6 +- test/map/MapPredicateTest.js | 4 +- .../InvalidationMetadataDistortionTest.js | 4 +- test/serialization/APortable.js | 11 +- .../AnIdentifiedDataSerializable.js | 12 +- test/serialization/AnInnerPortable.js | 12 +- test/serialization/BinaryCompatibilityTest.js | 30 +- test/serialization/CustomSerializerTest.js | 9 +- test/serialization/GlobalSerializerTest.js | 4 +- .../IdentifiedDataSerializableTest.js | 19 +- test/serialization/PortableObjects.js | 124 +++----- .../PortableSerializationTest.js | 38 ++- .../PortableSerializersLiveTest.js | 18 +- .../serialization/SerializationServiceTest.js | 158 ++++------ test/serialization/config/Address.js | 19 +- .../config/CustomSerializerConfigTest.js | 2 +- test/serialization/config/FactoriesTest.js | 8 +- test/serialization/config/Foo.js | 17 +- test/serialization/config/Musician.js | 9 +- .../portable/NestedPortableVersionTest.js | 14 +- test/statistics/StatisticsTest.js | 6 +- 105 files changed, 1311 insertions(+), 1686 deletions(-) delete mode 100644 hazelcast-client-default.json delete mode 100644 hazelcast-client-full.json delete mode 100644 src/ClusterDataFactoryHelper.ts delete mode 100644 src/serialization/PredicateFactory.ts rename config-schema.json => test/config-schema.json (98%) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 406408537..113578dbe 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -599,6 +599,9 @@ class Employee { constructor(id, name) { this.id = id; this.name = name; + // IdentifiedDataSerializable interface properties: + this.factoryId = 1000; + this.classId = 100; } readData(input) { @@ -610,31 +613,21 @@ class Employee { output.writeInt(this.id); output.writeUTF(this.name); } - - getFactoryId() { - return 1000; - } - - getClassId() { - return 100; - } } ``` -> **NOTE: Refer to the following [API Documentation section](http://hazelcast.github.io/hazelcast-nodejs-client/api/4.0.0/docs/modules/_serialization_data_.html) to understand methods available on the `input`/`output` objects.** +> **NOTE: Refer to `DataInput`/`DataOutput` interfaces in the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) to understand methods available on the `input`/`output` objects.** -The `IdentifiedDataSerializable` interface uses `getClassId()` and `getFactoryId()` to reconstitute the object. To complete the implementation, `IdentifiedDataSerializableFactory` should also be implemented and put into the `serialization.dataSerializableFactories` config option. The factory's responsibility is to return an instance of the right `IdentifiedDataSerializable` object, given the `classId`. +The `IdentifiedDataSerializable` interface uses `classId` and `factoryId` properties to reconstitute the object. To complete the implementation, `IdentifiedDataSerializableFactory` factory function should also be implemented and put into the `serialization.dataSerializableFactories` config option. The factory's responsibility is to return an instance of the right `IdentifiedDataSerializable` object, given the `classId`. -A sample `IdentifiedDataSerializableFactory` could be implemented as follows: +A sample `IdentifiedDataSerializableFactory` function could be implemented as follows: ```javascript -class SampleDataSerializableFactory { - create(type) { - if (type === 100) { - return new Employee(); - } - return null; +function sampleDataSerializableFactory(classId) { + if (classId === 100) { + return new Employee(); } + return null; } ``` @@ -644,7 +637,7 @@ The last step is to register the `IdentifiedDataSerializableFactory` in the conf const cfg = { serialization: { dataSerializableFactories: { - 1000: new SampleDataSerializableFactory() + 1000: sampleDataSerializableFactory } } }; @@ -674,43 +667,37 @@ class Customer { this.name = name; this.id = id; this.lastOrder = lastOrder; + // Portable interface properties: + this.factoryId = 1; this.classId = 1; } - readPortable(input) { - this.name = input.readUTF('name'); - this.id = input.readInt('id'); - this.lastOrder = input.readLong('lastOrder').toNumber(); + readPortable(reader) { + this.name = reader.readUTF('name'); + this.id = reader.readInt('id'); + this.lastOrder = reader.readLong('lastOrder').toNumber(); } - writePortable(output) { - output.writeUTF('name', this.name); - output.writeInt('id', this.id); - output.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); - } - - getFactoryId() { - return PortableFactory.factoryId; - } - - getClassId() { - return this.classId; + writePortable(writer) { + writer.writeUTF('name', this.name); + writer.writeInt('id', this.id); + writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); } } ``` -Similar to `IdentifiedDataSerializable`, a `Portable` object must provide `classId` and `factoryId`. The factory object will be used to create the `Portable` object given the `classId`. +> **NOTE: Refer to `PortableReader`/`PortableWriter` interfaces in the [API Documentation](http://hazelcast.github.io/hazelcast-nodejs-client/api/current/docs/) to understand methods available on the `reader`/`writer` objects.** + +Similar to `IdentifiedDataSerializable`, a `Portable` object must provide `classId` and `factoryId`. The factory function will be used to create the `Portable` object given the `classId`. -A sample `PortableFactory` could be implemented as follows: +A sample `PortableFactory` function could be implemented as follows: ```javascript -class PortableFactory { - create(classId) { - if (classId === 1) { - return new Customer(); - } - return null; +function portableFactory(classId) { + if (classId === 1) { + return new Customer(); } + return null; } ``` @@ -720,7 +707,7 @@ The last step is to register the `PortableFactory` in the config. const cfg = { serialization: { portableFactories: { - 1: new PortableFactory() + 1: portableFactory } } }; @@ -744,9 +731,9 @@ const cfg = { } ``` -If you update the class by changing the type of one of the fields or by adding a new field, it is a good idea to upgrade the version of the class, rather than sticking to the global version specified in the configuration. In the Node.js client, you can achieve this by simply adding the `getVersion()` method to your class’s implementation of `Portable`, and setting the `ClassVersion` to be different than the default global version. +If you update the class by changing the type of one of the fields or by adding a new field, it is a good idea to upgrade the version of the class, rather than sticking to the global version specified in the configuration. In the Node.js client, you can achieve this by simply adding the `version` property to your implementation of `Portable`, and setting the `version` to be different than the default global version. -> **NOTE: If you do not use the `getVersion()` method in your `Portable` implementation, it will have the global version, by default.** +> **NOTE: If you do not use the `version` property in your `Portable` implementation, it will have the global version, by default.** Here is an example implementation of creating a version 2 for the `Foo` class: @@ -755,28 +742,20 @@ class Foo { constructor(foo, foo2) { this.foo = foo; this.foo2 = foo2; + // VersionedPortable interface properties: + this.factoryId = 1; + this.classId = 1; + this.version = 2; } - readPortable(input) { - this.foo = input.readUTF('foo'); - this.foo2 = input.readUTF('foo2'); - } - - writePortable(output) { - output.writeUTF('foo', this.foo); - output.writeUTF('foo2', this.foo2); - } - - getFactoryId() { - return 1; - } - - getClassId() { - return 1; + readPortable(reader) { + this.foo = reader.readUTF('foo'); + this.foo2 = reader.readUTF('foo2'); } - getVersion() { - return 2; + writePortable(writer) { + writer.writeUTF('foo', this.foo); + writer.writeUTF('foo2', this.foo2); } } ``` @@ -810,22 +789,21 @@ Let's say you have an object `CustomSerializable` and you would like to customiz class CustomSerializable { constructor(value) { this.value = value; - } - - hzGetCustomId() { - return 10; + // CustomSerializable interface properties: + this.hzCustomId = 10; } } ``` -Note that the `hzGetCustomId()` should return type id of the `CustomSerializable`. +Note that the `hzCustomId` property should return type id of the `CustomSerializable`. -Now you need to implement acustom `CustomSerializer` which will will serialize `CustomSerializable`. +Now you need to implement a custom `Serializer` which will serialize `CustomSerializable` objects. ```javascript class CustomSerializer { - getId() { - return 10; + constructor() { + // Serializer interface properties: + this.id = 10; } read(input) { @@ -875,8 +853,9 @@ A sample global serializer that integrates with a third party serializer is show ```javascript class GlobalSerializer { - getId() { - return 20; + constructor() { + // Serializer interface properties: + this.id = 20; } read(input) { @@ -1775,6 +1754,8 @@ The following is an example for `EntryProcessor` which is an `IdentifiedDataSeri class IdentifiedEntryProcessor { constructor(value) { this.value = value; + this.factoryId = 5; + this.classId = 1; } readData(input) { @@ -1784,14 +1765,6 @@ class IdentifiedEntryProcessor { writeData(output) { output.writeUTF(this.value); } - - getFactoryId() { - return 5; - } - - getClassId() { - return 1; - } } ``` @@ -1819,27 +1792,27 @@ public class IdentifiedEntryProcessor public IdentifiedEntryProcessor() { } - @Override + @Override public int getFactoryId() { return IdentifiedFactory.FACTORY_ID; } - @Override - public int getId() { + @Override + public int getClassId() { return CLASS_ID; } - @Override + @Override public void writeData(ObjectDataOutput out) throws IOException { out.writeUTF(value); } - @Override + @Override public void readData(ObjectDataInput in) throws IOException { value = in.readUTF(); } - @Override + @Override public Object process(Map.Entry entry) { entry.setValue(value); return value; @@ -1861,7 +1834,7 @@ public class IdentifiedFactory implements DataSerializableFactory { public static final int FACTORY_ID = 5; - @Override + @Override public IdentifiedDataSerializable create(int typeId) { if (typeId == IdentifiedEntryProcessor.CLASS_ID) { return new IdentifiedEntryProcessor(); @@ -1947,28 +1920,22 @@ class Employee { this.age = age; this.active = active; this.salary = salary; + this.factoryId = 1; + this.classId = 1; } - readPortable(input) { - this.name = input.readUTF(); - this.age = input.readInt(); - this.active = input.readBoolean(); - this.salary = input.readDouble(); - } - - writePortable(output) { - output.writeUTF(this.name); - output.writeInt(this.age); - output.writeBoolean(this.active); - output.writeDouble(this.salary); - } - - getClassId() { - return 1; + readPortable(reader) { + this.name = reader.readUTF(); + this.age = reader.readInt(); + this.active = reader.readBoolean(); + this.salary = reader.readDouble(); } - getFactoryId() { - return 1; + writePortable(writer) { + writer.writeUTF(this.name); + writer.writeInt(this.age); + writer.writeBoolean(this.active); + writer.writeDouble(this.salary); } } ``` @@ -2074,8 +2041,7 @@ await personMap.put('Alice', 35); await personMap.put('Andy', 37); await personMap.put('Bob', 22); // Run the query -// The following is an equialent of `new SqlPredicate('__key like A%')` -const predicate = new Predicates.sql('__key like A%'); +const predicate = Predicates.sql('__key like A%'); const startingWithA = await personMap.valuesWithPredicate(predicate); // Prints: // 35 @@ -2093,7 +2059,7 @@ await personMap.put('Alice', 35); await personMap.put('Andy', 37); await personMap.put('Bob', 22); // Run the query -const predicate = new Predicates.greaterEqual('this', 27); +const predicate = Predicates.greaterEqual('this', 27); const olderThan27 = await return personMap.valuesWithPredicate(predicate); // Prints: // 35 37 @@ -2346,15 +2312,13 @@ class OrderKey { constructor(orderId, customerId) { this.orderId = orderId; this.customerId = customerId; - } - - getPartitionKey() { - return this.customerId; + // PartitionAware interface properties: + this.partitionKey = customerId; } } ``` -Notice that `OrderKey` implements `PartitionAware` interface and that `getPartitionKey()` method returns the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. +Notice that `OrderKey` implements `PartitionAware` interface and that `partitionKey` property contains the `customerId`. This will make sure that the `Customer` entry and its `Order`s will be stored on the same member. ```javascript const customersMap = await client.getMap('customers'); @@ -2870,26 +2834,20 @@ class UsernamePasswordCredentials { this.username = username; this.password = Buffer.from(password, 'utf8'); this.endpoint = endpoint; + this.factoryId = -1; + this.classId = 1; } - readPortable = function (input) { - this.username = input.readUTF('principal'); - this.endpoint = input.readUTF('endpoint'); - this.password = input.readByteArray('pwd'); - } - - writePortable(output) { - output.writeUTF('principal', this.username); - output.writeUTF('endpoint', this.endpoint); - output.writeByteArray('pwd', this.password); - } - - getFactoryId() { - return -1; + readPortable(reader) { + this.username = reader.readUTF('principal'); + this.endpoint = reader.readUTF('endpoint'); + this.password = reader.readByteArray('pwd'); } - getClassId() { - return 1; + writePortable(writer) { + writer.writeUTF('principal', this.username); + writer.writeUTF('endpoint', this.endpoint); + writer.writeByteArray('pwd', this.password); } } @@ -2902,29 +2860,27 @@ And below is the `Factory` implementation for the `Portable` implementation of ` ```javascript const { UsernamePasswordCredentials } = require('./user_pass_cred'); -class UsernamePasswordCredentialsFactory() { - create(classId) { - if (classId === 1) { - return new UsernamePasswordCredentials(); - } - return null; +function usernamePasswordCredentialsFactory(classId) { + if (classId === 1) { + return new UsernamePasswordCredentials(); } + return null; } -exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; +exports.usernamePasswordCredentialsFactory = usernamePasswordCredentialsFactory; ``` Now, you can start your client by registering the `Portable` factory and giving the credentials as follows. ```javascript const { UsernamePasswordCredentials } = require('./user_pass_cred'); -const { UsernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); +const { usernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); const cfg = { serialization: { portableVersion: 1, portableFactories: { - [-1]: new UsernamePasswordCredentialsFactory() + [-1]: usernamePasswordCredentialsFactory } }, customCredentials: new UsernamePasswordCredentials('admin', 'password', '127.0.0.1') diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index 8bf267d90..6590974a1 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -22,16 +22,13 @@ class TimeOfDay { this.hour = hour; this.minute = minute; this.second = second; - } - - hzGetCustomId() { - return 42; + this.hzCustomId = 42; } } class CustomSerializer { - getId() { - return 42; + constructor() { + this.id = 42; } write(output, timeofday) { diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index 316b0f99a..665b467a2 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -34,9 +34,7 @@ selfReferringObject.self = selfReferringObject; globalSerializer: { mousseSerialize: mousse.serialize, mousseDeserialize: mousse.deserialize, - getId: function () { - return 10; - }, + id: 10, write: function (output, obj) { output.writeUTF(this.mousseSerialize(obj)) }, diff --git a/code_samples/identified_data_serializable.js b/code_samples/identified_data_serializable.js index 86604e592..00f17dc34 100644 --- a/code_samples/identified_data_serializable.js +++ b/code_samples/identified_data_serializable.js @@ -21,6 +21,8 @@ class Employee { constructor(id, name) { this.id = id; this.name = name; + this.factoryId = 1000; + this.classId = 100; } readData(input) { @@ -32,23 +34,6 @@ class Employee { output.writeInt(this.id); output.writeUTF(this.name); } - - getFactoryId() { - return 1000; - } - - getClassId() { - return 100; - } -} - -class SampleDataSerializableFactory { - create(type) { - if (type === 100) { - return new Employee(); - } - return null; - } } (async () => { @@ -56,7 +41,12 @@ class SampleDataSerializableFactory { const client = await Client.newHazelcastClient({ serialization: { dataSerializableFactories: { - 1000: new SampleDataSerializableFactory() + 1000: (classId) => { + if (classId === 100) { + return new Employee(); + } + return null; + } } } }); diff --git a/code_samples/jaas_sample/admin_client.js b/code_samples/jaas_sample/admin_client.js index e87a5839c..7efc74688 100644 --- a/code_samples/jaas_sample/admin_client.js +++ b/code_samples/jaas_sample/admin_client.js @@ -17,14 +17,14 @@ const { Client } = require('hazelcast-client'); const { UsernamePasswordCredentials } = require('./user_pass_cred'); -const { UsernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); +const { usernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); (async () => { try { const adminClient = await Client.newHazelcastClient({ serialization: { portableFactories: { - 1: new UsernamePasswordCredentialsFactory() + 1: usernamePasswordCredentialsFactory } }, customCredentials: new UsernamePasswordCredentials('admin', 'password1', '127.0.0.1') diff --git a/code_samples/jaas_sample/reader_client.js b/code_samples/jaas_sample/reader_client.js index 1f692e566..93fa04b3b 100644 --- a/code_samples/jaas_sample/reader_client.js +++ b/code_samples/jaas_sample/reader_client.js @@ -17,14 +17,14 @@ const { Client } = require('hazelcast-client'); const { UsernamePasswordCredentials } = require('./user_pass_cred'); -const { UsernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); +const { usernamePasswordCredentialsFactory } = require('./user_pass_cred_factory'); (async () => { try { const readerClient = await Client.newHazelcastClient({ serialization: { portableFactories: { - 1: new UsernamePasswordCredentialsFactory() + 1: usernamePasswordCredentialsFactory } }, customCredentials: new UsernamePasswordCredentials('reader', 'password2', '127.0.0.1') diff --git a/code_samples/jaas_sample/user_pass_cred.js b/code_samples/jaas_sample/user_pass_cred.js index 9170c2fda..033a76022 100644 --- a/code_samples/jaas_sample/user_pass_cred.js +++ b/code_samples/jaas_sample/user_pass_cred.js @@ -20,26 +20,20 @@ class UsernamePasswordCredentials { this.username = username; this.password = password; this.endpoint = endpoint; + this.factoryId = 1; + this.classId = 1; } - readPortable(input) { - this.username = input.readUTF('username'); - this.endpoint = input.readUTF('password'); - this.password = input.readUTF('endpoint'); + readPortable(reader) { + this.username = reader.readUTF('username'); + this.endpoint = reader.readUTF('password'); + this.password = reader.readUTF('endpoint'); } - writePortable(output) { - output.writeUTF('username', this.username); - output.writeUTF('password', this.password); - output.writeUTF('endpoint', this.endpoint); - } - - getFactoryId() { - return 1; - } - - getClassId() { - return 1; + writePortable(writer) { + writer.writeUTF('username', this.username); + writer.writeUTF('password', this.password); + writer.writeUTF('endpoint', this.endpoint); } } diff --git a/code_samples/jaas_sample/user_pass_cred_factory.js b/code_samples/jaas_sample/user_pass_cred_factory.js index f4ab4b9d8..ebc6b9ad6 100644 --- a/code_samples/jaas_sample/user_pass_cred_factory.js +++ b/code_samples/jaas_sample/user_pass_cred_factory.js @@ -17,13 +17,11 @@ const UsernamePasswordCredentials = require('./user_pass_cred'); -class UsernamePasswordCredentialsFactory { - create(classId) { - if (classId === 1) { - return new UsernamePasswordCredentials(); - } - return null; +function usernamePasswordCredentialsFactory(classId) { + if (classId === 1) { + return new UsernamePasswordCredentials(); } + return null; } -exports.UsernamePasswordCredentialsFactory = UsernamePasswordCredentialsFactory; +exports.usernamePasswordCredentialsFactory = usernamePasswordCredentialsFactory; diff --git a/code_samples/org-website/CustomSerializerSample.js b/code_samples/org-website/CustomSerializerSample.js index c774816ac..d72299d56 100644 --- a/code_samples/org-website/CustomSerializerSample.js +++ b/code_samples/org-website/CustomSerializerSample.js @@ -20,16 +20,13 @@ const { Client } = require('hazelcast-client'); class CustomSerializable { constructor(value) { this.value = value; - } - - hzGetCustomId() { - return 10; + this.hzCustomId = 10; } } class CustomSerializer { - getId() { - return 10; + constructor() { + this.id = 10; } read(input) { diff --git a/code_samples/org-website/EntryProcessorSample.js b/code_samples/org-website/EntryProcessorSample.js index 7c60be9e7..ac27434a7 100644 --- a/code_samples/org-website/EntryProcessorSample.js +++ b/code_samples/org-website/EntryProcessorSample.js @@ -19,7 +19,8 @@ const { Client } = require('hazelcast-client'); class IdentifiedEntryProcessor { constructor(value) { - // Constructor function + this.factoryId = 1; + this.classId = 9; } readData(input) { @@ -27,23 +28,13 @@ class IdentifiedEntryProcessor { writeData(output) { } - - getFactoryId() { - return 1; - } - - getClassId() { - return 9; - } } -class EntryProcessorDataSerializableFactory() { - create(type) { - if (type === 1) { - return new IdentifiedEntryProcessor(); - } - return null; +function entryProcessorDataSerializableFactory(classId) { + if (classId === 1) { + return new IdentifiedEntryProcessor(); } + return null; } (async () => { @@ -53,7 +44,7 @@ class EntryProcessorDataSerializableFactory() { const hz = await Client.newHazelcastClient({ serialization: { dataSerializableFactories: { - 1: new EntryProcessorDataSerializableFactory() + 1: entryProcessorDataSerializableFactory } } }); diff --git a/code_samples/org-website/GlobalSerializerSample.js b/code_samples/org-website/GlobalSerializerSample.js index d7f5cccfd..4386cf66c 100644 --- a/code_samples/org-website/GlobalSerializerSample.js +++ b/code_samples/org-website/GlobalSerializerSample.js @@ -18,8 +18,8 @@ const { Client } = require('hazelcast-client'); class GlobalSerializer { - getId() { - return 20; + constructor() { + this.id = 20; } read(input) { diff --git a/code_samples/org-website/IdentifiedDataSerializableSample.js b/code_samples/org-website/IdentifiedDataSerializableSample.js index af55d9b3f..2b2bf1e44 100644 --- a/code_samples/org-website/IdentifiedDataSerializableSample.js +++ b/code_samples/org-website/IdentifiedDataSerializableSample.js @@ -21,6 +21,8 @@ class Employee { constructor(id, name) { this.id = id; this.name = name; + this.factoryId = 1000; + this.classId = 100; } readData(input) { @@ -32,23 +34,13 @@ class Employee { output.writeInt(this.id); output.writeUTF(this.name); } - - getFactoryId() { - return 1000; - } - - getClassId() { - return 100; - } } -class SampleDataSerializableFactory { - create(type) { - if (type === 100) { - return new Employee(); - } - return null; +function sampleDataSerializableFactory(classId) { + if (classId === 100) { + return new Employee(); } + return null; } (async () => { @@ -58,7 +50,7 @@ class SampleDataSerializableFactory { const hz = await Client.newHazelcastClient({ serialization: { dataSerializableFactories: { - 1000: new SampleDataSerializableFactory() + 1000: sampleDataSerializableFactory } } }); diff --git a/code_samples/org-website/PortableSerializableSample.js b/code_samples/org-website/PortableSerializableSample.js index 9a71b842e..1442c832e 100644 --- a/code_samples/org-website/PortableSerializableSample.js +++ b/code_samples/org-website/PortableSerializableSample.js @@ -23,36 +23,28 @@ class Customer { this.name = name; this.id = id; this.lastOrder = lastOrder; + this.factoryId = 1; + this.classId = 1; } - readPortable(input) { - this.name = input.readUTF('name'); - this.id = input.readInt('id'); - this.lastOrder = input.readLong('lastOrder').toNumber(); + readPortable(reader) { + this.name = reader.readUTF('name'); + this.id = reader.readInt('id'); + this.lastOrder = reader.readLong('lastOrder').toNumber(); } - writePortable(output) { - output.writeUTF('name', this.name); - output.writeInt('id', this.id); - output.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); - } - - getFactoryId() { - return 1; - } - - getClassId() { - return 1; + writePortable(writer) { + writer.writeUTF('name', this.name); + writer.writeInt('id', this.id); + writer.writeLong('lastOrder', Long.fromNumber(this.lastOrder)); } } -class PortableFactory { - create(classId) { - if (classId === 1) { - return new Customer(); - } - return null; +function portableFactory(classId) { + if (classId === 1) { + return new Customer(); } + return null; } (async () => { @@ -62,7 +54,7 @@ class PortableFactory { const hz = await Client.newHazelcastClient({ serialization: { portableFactories: { - 1: new PortableFactory() + 1: portableFactory } } }); diff --git a/code_samples/org-website/QuerySample.js b/code_samples/org-website/QuerySample.js index c9dc8296a..72b10ccf9 100644 --- a/code_samples/org-website/QuerySample.js +++ b/code_samples/org-website/QuerySample.js @@ -25,36 +25,28 @@ class User { this.username = username; this.age = age; this.active = active; + this.factoryId = 1; + this.classId = 1; } - readPortable(input) { - this.username = input.readUTF('username'); - this.age = input.readInt('age'); - this.active = input.readBoolean('active'); + readPortable(reader) { + this.username = reader.readUTF('username'); + this.age = reader.readInt('age'); + this.active = reader.readBoolean('active'); } - writePortable(output) { - output.writeUTF('username', this.username); - output.writeInt('age', this.age); - output.writeBoolean('active', this.active); - } - - getFactoryId() { - return 1; - } - - getClassId() { - return 1; + writePortable(writer) { + writer.writeUTF('username', this.username); + writer.writeInt('age', this.age); + writer.writeBoolean('active', this.active); } } -class PortableFactory { - create(classId) { - if (classId === 1) { - return new User(); - } - return null; +function portableFactory(classId) { + if (classId === 1) { + return new User(); } + return null; } async function generateUsers(usersMap) { @@ -70,7 +62,7 @@ async function generateUsers(usersMap) { const hz = await Client.newHazelcastClient({ serialization: { portableFactories: { - 1: new PortableFactory() + 1: portableFactory } } }); diff --git a/code_samples/paging_predicate.js b/code_samples/paging_predicate.js index 693c4fcc5..cd7c56af1 100644 --- a/code_samples/paging_predicate.js +++ b/code_samples/paging_predicate.js @@ -23,21 +23,30 @@ const { // This comparator is both a comparator and an IdentifiedDataSerializable. // Note that a comparator should be a serializable object (IdentifiedDataSerializable // or Portable) because Hazelcast members should be able to deserialize the -// comparator in order to sort entries. So the same class should be registered +// comparator in order to sort entries. So, the same class should be registered // to Hazelcast server instance. -const comparator = { - getFactoryId: () => 1, - getClassId: () => 10, +class Comparator { + constructor() { + this.factoryId = 1; + this.classId = 10; + } + // This comparator sorts entries according to their keys // in reverse alphabetical order. - sort: (a, b) => { + sort(a, b) { if (a[0] > b[0]) return -1; if (a[0] < b[0]) return 1; return 0; - }, - readData: () => {}, - writeData: () => {} -}; + } + + readData() { + // no-op + } + + writeData() { + // no-op + } +} (async () => { try { @@ -45,8 +54,11 @@ const comparator = { serialization: { // We register our comparator object as IdentifiedDataSerializable dataSerializableFactories: { - 1: { - create: () => comparator + 1: (classId) => { + if (classId === 10) { + return new Comparator(); + } + return null; } } } @@ -60,7 +72,7 @@ const comparator = { const mapSize = await map.size(); console.log(`Added ${mapSize} elements`); - const predicate = Predicates.paging(Predicates.alwaysTrue(), 2, comparator); + const predicate = Predicates.paging(Predicates.alwaysTrue(), 2, new Comparator()); predicate.setPage(0); let values = await map.valuesWithPredicate(predicate); diff --git a/code_samples/portable_multiversion_sample.js b/code_samples/portable_multiversion_sample.js index 18f414798..873349396 100644 --- a/code_samples/portable_multiversion_sample.js +++ b/code_samples/portable_multiversion_sample.js @@ -30,38 +30,27 @@ class Employee { constructor(name, age) { this.name = name; this.age = age; + this.factoryId = 1; + this.classId = 1; + this.version = 1; } - readPortable(input) { - this.name = input.readUTF('name'); - this.age = input.readInt('age'); + readPortable(reader) { + this.name = reader.readUTF('name'); + this.age = reader.readInt('age'); } - writePortable(output) { - output.writeUTF('name', this.name); - output.writeInt('age', this.age); - } - - getFactoryId() { - return 1; - } - - getClassId() { - return 1; - } - - getVersion() { - return 1; + writePortable(writer) { + writer.writeUTF('name', this.name); + writer.writeInt('age', this.age); } } -class PortableFactory { - create(classId) { - if (classId === 1) { - return new Employee(); - } - return null; +function portableFactory(classId) { + if (classId === 1) { + return new Employee(); } + return null; } /* @@ -76,42 +65,30 @@ class Employee2 { this.name = name; this.age = age; this.manager = manager; + this.factoryId = 1; + this.classId = 1; + // Specify version different than the global version. + this.version = 2; } - readPortable(input) { - this.name = input.readUTF('name'); - this.age = input.readInt('age'); - this.manager = input.readUTF('manager'); - } - - writePortable(output) { - output.writeUTF('name', this.name); - output.writeInt('age', this.age); - output.writeUTF('manager', this.manager); - } - - getFactoryId() { - return 1; + readPortable(reader) { + this.name = reader.readUTF('name'); + this.age = reader.readInt('age'); + this.manager = reader.readUTF('manager'); } - getClassId() { - return 1; - } - - // It is necessary to implement this method for multiversion support to work. - getVersion() { - // Specifies version different than the global version. - return 2; + writePortable(writer) { + writer.writeUTF('name', this.name); + writer.writeInt('age', this.age); + writer.writeUTF('manager', this.manager); } } -class PortableFactory2 { - create(classId) { - if (classId === 1) { - return new Employee2(); - } - return null; +function portableFactory2(classId) { + if (classId === 1) { + return new Employee2(); } + return null; } /* @@ -127,40 +104,29 @@ class Employee3 { this.name = name; this.age = age; this.manager = manager; + this.factoryId = 1; + this.classId = 1; + this.version = 3; } - readPortable(input) { - this.name = input.readUTF('name'); - this.age = input.readUTF('age'); - this.manager = input.readUTF('manager'); - } - - writePortable(output) { - output.writeUTF('name', this.name); - output.writeUTF('age', this.age); - output.writeUTF('manager', this.manager); + readPortable(reader) { + this.name = reader.readUTF('name'); + this.age = reader.readUTF('age'); + this.manager = reader.readUTF('manager'); } - getFactoryId() { - return 1; - } - - getClassId() { - return 1; - } - - getVersion() { - return 3; + writePortable(writer) { + writer.writeUTF('name', this.name); + writer.writeUTF('age', this.age); + writer.writeUTF('manager', this.manager); } } -class PortableFactory3 { - create(classId) { - if (classId === 1) { - return new Employee3(); - } - return null; +function portableFactory3(classId) { + if (classId === 1) { + return new Employee3(); } + return null; } (async () => { @@ -169,21 +135,21 @@ class PortableFactory3 { const cfg = { serialization: { portableFactories: { - 1: new PortableFactory() + 1: portableFactory } } }; const cfg2 = { serialization: { portableFactories: { - 1: new PortableFactory2() + 1: portableFactory2 } } }; const cfg3 = { serialization: { portableFactories: { - 1: new PortableFactory3() + 1: portableFactory3 } } }; diff --git a/code_samples/querying_with_SQL.js b/code_samples/querying_with_SQL.js index d3bde3e11..e9ce2127d 100644 --- a/code_samples/querying_with_SQL.js +++ b/code_samples/querying_with_SQL.js @@ -43,7 +43,7 @@ class Customer { ['7', new Customer('Hilary', true, 19)], ]); - const predicate = new Predicates.sql('active AND age < 30'); + const predicate = Predicates.sql('active AND age < 30'); const persons = await personMap.valuesWithPredicate(predicate); for (const person of persons) { console.log(person); diff --git a/hazelcast-client-default.json b/hazelcast-client-default.json deleted file mode 100644 index ba66283ce..000000000 --- a/hazelcast-client-default.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "clusterName": "dev", - "instanceName": null, - "properties": { - "hazelcast.client.heartbeat.interval": 5000, - "hazelcast.client.heartbeat.timeout": 60000, - "hazelcast.client.invocation.retry.pause.millis": 1000, - "hazelcast.client.invocation.timeout.millis": 120000, - "hazelcast.client.cloud.url": "https://coordinator.hazelcast.cloud", - "hazelcast.client.statistics.enabled": false, - "hazelcast.client.statistics.period.seconds": 3, - "hazelcast.invalidation.reconciliation.interval.seconds": 60, - "hazelcast.invalidation.max.tolerated.miss.count": 10, - "hazelcast.invalidation.min.reconciliation.interval.seconds": 30, - "hazelcast.logging.level": 2, - "hazelcast.client.autopipelining.enabled": true, - "hazelcast.client.autopipelining.threshold.bytes": 8192, - "hazelcast.client.socket.no.delay": true, - "hazelcast.client.shuffle.member.list": true - }, - "clientLabels": [], - "network": { - "clusterMembers": [ - "127.0.0.1" - ], - "smartRouting": true, - "redoOperation": false, - "connectionTimeout": 5000, - "ssl": { - "enabled": false, - "sslOptions": null, - "factory": null - }, - "hazelcastCloud": { - "discoveryToken": null - } - }, - "connectionStrategy": { - "asyncStart": false, - "reconnectMode": "on", - "connectionRetry": { - "initialBackoffMillis": 1000, - "maxBackoffMillis": 30000, - "multiplier": 1, - "clusterConnectTimeoutMillis": 20000, - "jitter": 0 - } - }, - "listeners": [], - "serialization": { - "defaultNumberType": "double", - "isBigEndian": true, - "jsonStringDeserializationPolicy": "eager", - "dataSerializableFactories": [], - "portableFactories": [], - "portableVersion": 0, - "globalSerializer": {}, - "serializers": [] - }, - "nearCaches": [], - "reliableTopics": [], - "flakeIdGeneratorConfigs": [], - "loadBalancer": { - "type": "roundRobin" - } -} diff --git a/hazelcast-client-full.json b/hazelcast-client-full.json deleted file mode 100644 index 3dd369b2f..000000000 --- a/hazelcast-client-full.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "clusterName": "dev", - "instanceName": "hazelcastClient", - "properties": { - "hazelcast.client.heartbeat.interval": 5000, - "hazelcast.client.heartbeat.timeout": 60000, - "hazelcast.client.invocation.retry.pause.millis": 1000, - "hazelcast.client.invocation.timeout.millis": 120000, - "hazelcast.client.cloud.url": "https://coordinator.hazelcast.cloud", - "hazelcast.client.statistics.enabled": false, - "hazelcast.client.statistics.period.seconds": 3, - "hazelcast.invalidation.reconciliation.interval.seconds": 60, - "hazelcast.invalidation.max.tolerated.miss.count": 10, - "hazelcast.invalidation.min.reconciliation.interval.seconds": 30, - "hazelcast.logging.level": 2, - "hazelcast.client.autopipelining.enabled": true, - "hazelcast.client.autopipelining.threshold.bytes": 8192, - "hazelcast.client.socket.no.delay": true, - "hazelcast.client.shuffle.member.list": true - }, - "clientLabels": [ - "role admin", - "region foo" - ], - "network": { - "clusterMembers": [ - "127.0.0.1", - "127.0.0.2:5702" - ], - "smartRouting": true, - "redoOperation": false, - "connectionTimeout": 5000, - "ssl": { - "enabled": false, - "sslOptions": null, - "factory": { - "path": "path/to/file", - "exportedName": "exportedName", - "properties": { - "userDefinedProperty1": "userDefinedValue" - } - } - }, - "hazelcastCloud": { - "discoveryToken": "EXAMPLE_TOKEN" - } - }, - "connectionStrategy": { - "asyncStart": false, - "reconnectMode": "on", - "connectionRetry": { - "initialBackoffMillis": 1000, - "maxBackoffMillis": 30000, - "multiplier": 1, - "clusterConnectTimeoutMillis": 20000, - "jitter": 0 - } - }, - "listeners": [ - { - "type": "lifecycle", - "path": "path/to/file", - "exportedName": "listener" - }, - { - "type": "membership", - "path": "path/to/file", - "exportedName": "listener2" - } - ], - "serialization": { - "defaultNumberType": "double", - "isBigEndian": true, - "jsonStringDeserializationPolicy": "eager", - "dataSerializableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 0 - } - ], - "portableFactories": [ - { - "path": "path/to/file", - "exportedName": "exportedName", - "factoryId": 1 - } - ], - "portableVersion": 0, - "globalSerializer": { - "path": "path/to/file", - "exportedName": "exportedName" - }, - "serializers": [ - { - "path": "path/to/custom", - "exportedName": "CustomSerializer1", - "typeId": 2 - }, - { - "path": "path/to/custom", - "exportedName": "CustomSerializer2", - "typeId": 3 - } - ] - }, - "nearCaches": [ - { - "name": "nc-map", - "invalidateOnChange": false, - "maxIdleSeconds": 2, - "inMemoryFormat": "object", - "timeToLiveSeconds": 3, - "evictionPolicy": "lru", - "evictionMaxSize": 3000, - "evictionSamplingCount": 4, - "evictionSamplingPoolSize": 8 - } - ], - "reliableTopics": [ - { - "name": "rt1", - "readBatchSize": 35, - "overloadPolicy": "discard_newest" - }, - { - "name": "rt2", - "readBatchSize": 15, - "overloadPolicy": "discard_newest" - } - ], - "flakeIdGeneratorConfigs": [ - { - "name": "flakeid", - "prefetchCount": 1000, - "prefetchValidityMillis": 30000 - }, - { - "name": "flakeid2", - "prefetchCount": 5000, - "prefetchValidityMillis": 500000 - } - ], - "loadBalancer": { - "type": "random" - }, - "import": [ - "hazelcast-client-near-cache.json" - ] -} diff --git a/src/Address.ts b/src/Address.ts index c1e19880b..a897752bf 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -15,12 +15,14 @@ */ import * as net from 'net'; -import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; +import {CLUSTER_DATA_FACTORY_ID, CLUSTER_DATA_ADDRESS_CLASS_ID} from './ClusterDataFactory'; import {DataInput, DataOutput} from './serialization/Data'; import {IdentifiedDataSerializable} from './serialization/Serializable'; export class Address implements IdentifiedDataSerializable { + factoryId = CLUSTER_DATA_FACTORY_ID; + classId = CLUSTER_DATA_ADDRESS_CLASS_ID; host: string; port: number; type: number; @@ -47,14 +49,6 @@ export class Address implements IdentifiedDataSerializable { output.writeUTF(this.host); } - getFactoryId(): number { - return ClusterDataFactoryHelper.FACTORY_ID; - } - - getClassId(): number { - return ClusterDataFactoryHelper.ADDRESS_ID; - } - equals(other: Address): boolean { if (other === this) { return true; diff --git a/src/ClusterDataFactory.ts b/src/ClusterDataFactory.ts index 9adde1259..92531422b 100644 --- a/src/ClusterDataFactory.ts +++ b/src/ClusterDataFactory.ts @@ -14,17 +14,15 @@ * limitations under the License. */ -import {ClusterDataFactoryHelper} from './ClusterDataFactoryHelper'; -import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './serialization/Serializable'; +import {IdentifiedDataSerializable} from './serialization/Serializable'; import {Address} from './Address'; -export class ClusterDataFactory implements IdentifiedDataSerializableFactory { +export const CLUSTER_DATA_FACTORY_ID = 0; +export const CLUSTER_DATA_ADDRESS_CLASS_ID = 1; - create(type: number): IdentifiedDataSerializable { - if (type === ClusterDataFactoryHelper.ADDRESS_ID) { - return new Address(); - } - - return null; +export function clusterDataFactory(classId: number): IdentifiedDataSerializable { + if (classId === CLUSTER_DATA_ADDRESS_CLASS_ID) { + return new Address(); } + return null; } diff --git a/src/ClusterDataFactoryHelper.ts b/src/ClusterDataFactoryHelper.ts deleted file mode 100644 index 6a50a661d..000000000 --- a/src/ClusterDataFactoryHelper.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -export class ClusterDataFactoryHelper { - static readonly FACTORY_ID = 0; - static readonly ADDRESS_ID = 1; -} diff --git a/src/DistributedObject.ts b/src/DistributedObject.ts index 50416d59a..0ed7c397f 100644 --- a/src/DistributedObject.ts +++ b/src/DistributedObject.ts @@ -16,10 +16,15 @@ import * as Promise from 'bluebird'; +/** + * Base interface for distributed objects. + */ export interface DistributedObject { + /** * Returns the key of the partition that this DistributedObject is assigned to. - * For a partitioned data structure, the returned value will not be null, but otherwise undefined. + * For a partitioned data structure, the returned value will not be `null`, + * but otherwise `undefined`. */ getPartitionKey(): string; @@ -38,4 +43,5 @@ export interface DistributedObject { * Clears all resources taken for this object. */ destroy(): Promise; + } diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index df18bd3d3..f636fdab2 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -86,7 +86,7 @@ export default class HazelcastClient { this.config = config; this.instanceName = config.instanceName || 'hz.client_' + this.id; this.loggingService = new LoggingService(this.config.customLogger, - this.config.properties['hazelcast.logging.level'] as number); + this.config.properties['hazelcast.logging.level'] as string); this.loadBalancer = this.initLoadBalancer(); this.listenerService = new ListenerService(this); this.serializationService = new SerializationServiceV1(this.config.serialization); diff --git a/src/LoadBalancer.ts b/src/LoadBalancer.ts index 7d00ea427..f24db9082 100644 --- a/src/LoadBalancer.ts +++ b/src/LoadBalancer.ts @@ -28,6 +28,7 @@ import {Member} from './core/Member'; *

*/ export interface LoadBalancer { + /** * Initializes the LoadBalancer. * @@ -39,7 +40,8 @@ export interface LoadBalancer { /** * Returns the next member to route to. * - * @return Returns the next member or null if no member is available + * @return Returns the next member or `null` if no member is available */ next(): Member; + } diff --git a/src/aggregation/Aggregator.ts b/src/aggregation/Aggregator.ts index 5f4119eec..f1a38a343 100644 --- a/src/aggregation/Aggregator.ts +++ b/src/aggregation/Aggregator.ts @@ -17,31 +17,30 @@ import * as Long from 'long'; import {DataInput, DataOutput} from '../serialization/Data'; import {IdentifiedDataSerializable} from '../serialization/Serializable'; -import {AggregatorFactory} from './AggregatorFactory'; - -export interface Aggregator { +import * as AggregatorFactory from './AggregatorFactory'; +export interface Aggregator extends IdentifiedDataSerializable { } -export abstract class AbstractAggregator implements IdentifiedDataSerializable, Aggregator { +export abstract class AbstractAggregator implements Aggregator { + + abstract classId: number; + factoryId = AggregatorFactory.AGGREGATOR_FACTORY_ID; protected attributePath: string; constructor(attributePath?: string) { this.attributePath = attributePath; } - getFactoryId(): number { - return AggregatorFactory.FACTORY_ID; - } - - abstract getClassId(): number; - abstract readData(input: DataInput): any; abstract writeData(output: DataOutput): void; } export class CountAggregator extends AbstractAggregator { + + classId = AggregatorFactory.COUNT; + readData(input: DataInput): any { this.attributePath = input.readUTF(); // member side field, not used in client @@ -53,16 +52,11 @@ export class CountAggregator extends AbstractAggregator { // member side field, not used in client output.writeLong(Long.ZERO); } - - getClassId(): number { - return AggregatorFactory.COUNT; - } } export class DoubleAverageAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.DOUBLE_AVG; - } + + classId = AggregatorFactory.DOUBLE_AVG; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -78,9 +72,8 @@ export class DoubleAverageAggregator extends AbstractAggregator { } export class DoubleSumAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.DOUBLE_SUM; - } + + classId = AggregatorFactory.DOUBLE_SUM; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -94,9 +87,8 @@ export class DoubleSumAggregator extends AbstractAggregator { } export class NumberAverageAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.NUMBER_AVG; - } + + classId = AggregatorFactory.NUMBER_AVG; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -112,9 +104,8 @@ export class NumberAverageAggregator extends AbstractAggregator { } export class FixedPointSumAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.FIXED_SUM; - } + + classId = AggregatorFactory.FIXED_SUM; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -128,9 +119,8 @@ export class FixedPointSumAggregator extends AbstractAggregator { } export class FloatingPointSumAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.FLOATING_POINT_SUM; - } + + classId = AggregatorFactory.FLOATING_POINT_SUM; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -144,9 +134,8 @@ export class FloatingPointSumAggregator extends AbstractAggregator { } export class MaxAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.MAX; - } + + classId = AggregatorFactory.MAX; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -160,9 +149,8 @@ export class MaxAggregator extends AbstractAggregator { } export class MinAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.MIN; - } + + classId = AggregatorFactory.MIN; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -176,9 +164,8 @@ export class MinAggregator extends AbstractAggregator { } export class IntegerAverageAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.INT_AVG; - } + + classId = AggregatorFactory.INT_AVG; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -194,9 +181,8 @@ export class IntegerAverageAggregator extends AbstractAggregator { } export class IntegerSumAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.INT_SUM; - } + + classId = AggregatorFactory.INT_SUM; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -210,9 +196,8 @@ export class IntegerSumAggregator extends AbstractAggregator { } export class LongAverageAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.LONG_AVG; - } + + classId = AggregatorFactory.LONG_AVG; readData(input: DataInput): any { this.attributePath = input.readUTF(); @@ -228,9 +213,8 @@ export class LongAverageAggregator extends AbstractAggregator { } export class LongSumAggregator extends AbstractAggregator { - getClassId(): number { - return AggregatorFactory.LONG_SUM; - } + + classId = AggregatorFactory.LONG_SUM; readData(input: DataInput): any { this.attributePath = input.readUTF(); diff --git a/src/aggregation/AggregatorFactory.ts b/src/aggregation/AggregatorFactory.ts index 98f8f925a..f1f64d3c6 100644 --- a/src/aggregation/AggregatorFactory.ts +++ b/src/aggregation/AggregatorFactory.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../serialization/Serializable'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; import { Aggregator, CountAggregator, @@ -32,54 +32,47 @@ import { } from './Aggregator'; import {HazelcastError} from '../HazelcastError'; -export class AggregatorFactory implements IdentifiedDataSerializableFactory { +export const AGGREGATOR_FACTORY_ID = -29; - static readonly FACTORY_ID = -29; +// export const BIG_DECIMAL_AVG = 0; // not implemented in node.js +// export const BIG_DECIMAL_SUM = 1; // not implemented in node.js +// export const BIG_INT_AVG = 2; // not implemented in node.js +// export const BIG_INT_SUM = 3; // not implemented in node.js +export const COUNT = 4; +// export const DISTINCT = 5; // returns java serializable, not usable in node.js +export const DOUBLE_AVG = 6; +export const DOUBLE_SUM = 7; +export const FIXED_SUM = 8; +export const FLOATING_POINT_SUM = 9; +export const INT_AVG = 10; +export const INT_SUM = 11; +export const LONG_AVG = 12; +export const LONG_SUM = 13; +export const MAX = 14; +export const MIN = 15; +export const NUMBER_AVG = 16; +// export const MAX_BY = 17; // needs object to implement Java's Comparable interface +// export const MIN_BY = 18; // needs object to implement Java's Comparable interface - static readonly BIG_DECIMAL_AVG = 0; // not implemented in node.js - static readonly BIG_DECIMAL_SUM = 1; // not implemented in node.js - static readonly BIG_INT_AVG = 2; // not implemented in node.js - static readonly BIG_INT_SUM = 3; // not implemented in node.js - static readonly COUNT = 4; - static readonly DISTINCT = 5; // returns java serializable, not usable in node.js - static readonly DOUBLE_AVG = 6; - static readonly DOUBLE_SUM = 7; - static readonly FIXED_SUM = 8; - static readonly FLOATING_POINT_SUM = 9; - static readonly INT_AVG = 10; - static readonly INT_SUM = 11; - static readonly LONG_AVG = 12; - static readonly LONG_SUM = 13; - static readonly MAX = 14; - static readonly MIN = 15; - static readonly NUMBER_AVG = 16; - static readonly MAX_BY = 17; // needs object to implement Java's Comparable interface - static readonly MIN_BY = 18; // needs object to implement Java's Comparable interface - - private idToConstructor: { [id: number]: Aggregator } = {}; - - constructor() { - this.idToConstructor[AggregatorFactory.COUNT] = CountAggregator; - this.idToConstructor[AggregatorFactory.DOUBLE_AVG] = DoubleAverageAggregator; - this.idToConstructor[AggregatorFactory.DOUBLE_SUM] = DoubleSumAggregator; - this.idToConstructor[AggregatorFactory.FIXED_SUM] = FixedPointSumAggregator; - this.idToConstructor[AggregatorFactory.FLOATING_POINT_SUM] = FloatingPointSumAggregator; - this.idToConstructor[AggregatorFactory.INT_AVG] = IntegerAverageAggregator; - this.idToConstructor[AggregatorFactory.INT_SUM] = IntegerSumAggregator; - this.idToConstructor[AggregatorFactory.LONG_AVG] = LongAverageAggregator; - this.idToConstructor[AggregatorFactory.LONG_SUM] = LongSumAggregator; - this.idToConstructor[AggregatorFactory.MAX] = MaxAggregator; - this.idToConstructor[AggregatorFactory.MIN] = MinAggregator; - this.idToConstructor[AggregatorFactory.NUMBER_AVG] = NumberAverageAggregator; +const idToConstructor: { [id: number]: new () => Aggregator } = { + [COUNT]: CountAggregator, + [DOUBLE_AVG]: DoubleAverageAggregator, + [DOUBLE_SUM]: DoubleSumAggregator, + [FIXED_SUM]: FixedPointSumAggregator, + [FLOATING_POINT_SUM]: FloatingPointSumAggregator, + [INT_AVG]: IntegerAverageAggregator, + [INT_SUM]: IntegerSumAggregator, + [LONG_AVG]: LongAverageAggregator, + [LONG_SUM]: LongSumAggregator, + [MAX]: MaxAggregator, + [MIN]: MinAggregator, + [NUMBER_AVG]: NumberAverageAggregator, +}; +export function aggregatorFactory(classId: number): IdentifiedDataSerializable { + try { + return new idToConstructor[classId](); + } catch (e) { + throw new HazelcastError('There is no known aggregator with type id ' + classId, e); } - - create(type: number): IdentifiedDataSerializable { - try { - return (new (this.idToConstructor[type] as FunctionConstructor)()) as any; - } catch (e) { - throw new HazelcastError('There is no known aggregator with type id ' + type, e); - } - } - } diff --git a/src/config/Config.ts b/src/config/Config.ts index 27ac096d8..c3c6357b9 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -28,7 +28,6 @@ import {Properties} from './Properties'; import {ReliableTopicConfig, ReliableTopicConfigImpl} from './ReliableTopicConfig'; import {SerializationConfig, SerializationConfigImpl} from './SerializationConfig'; import {Statistics} from '../statistics/Statistics'; -import {LogLevel} from '..'; import {ILogger} from '../logging/ILogger'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; import {ConnectionStrategyConfig, ConnectionStrategyConfigImpl, ReconnectMode} from './ConnectionStrategyConfig'; @@ -134,7 +133,7 @@ export class ClientConfigImpl implements ClientConfig { 'hazelcast.invalidation.reconciliation.interval.seconds': 60, 'hazelcast.invalidation.max.tolerated.miss.count': 10, 'hazelcast.invalidation.min.reconciliation.interval.seconds': 30, - 'hazelcast.logging.level': LogLevel.INFO, + 'hazelcast.logging.level': 'INFO', 'hazelcast.client.autopipelining.enabled': true, 'hazelcast.client.autopipelining.threshold.bytes': 8192, 'hazelcast.client.socket.no.delay': true, diff --git a/src/config/LoadBalancerConfig.ts b/src/config/LoadBalancerConfig.ts index b18a8b89f..5fa402f39 100644 --- a/src/config/LoadBalancerConfig.ts +++ b/src/config/LoadBalancerConfig.ts @@ -17,17 +17,17 @@ import {LoadBalancer} from '../LoadBalancer'; /** - * Defines {@link LoadBalancer} implementation used by the client. + * Defines {@link LoadBalancer} type used by the client. */ export enum LoadBalancerType { /** - * This implementation picks the next member randomly. + * This type of load balancer picks the next member randomly. */ RANDOM = 'RANDOM', /** - * This implementation picks each cluster member in turn. + * This type of load balancer picks each cluster member in turn. */ ROUND_ROBIN = 'ROUND_ROBIN', @@ -46,7 +46,7 @@ export interface LoadBalancerConfig { /** * Custom load balancer implementation for the client. When this option is in use, - * `loadBalancerType` setting is ignored. + * `type` option is ignored. */ customLoadBalancer?: LoadBalancer; diff --git a/src/core/Comparator.ts b/src/core/Comparator.ts index 80f2b792a..349832f20 100644 --- a/src/core/Comparator.ts +++ b/src/core/Comparator.ts @@ -17,21 +17,22 @@ /** * Comparator is used to compare two map entries in a distributed map. * A comparator class with the same functionality should be registered - * on Hazelcast server in order to be used in {PagingPredicate}s. - * + * on Hazelcast server in order to be used in PagingPredicates. */ export interface Comparator { + /** * This method is used to determine order of entries when sorting. - * - If return value is a negative value, {a} comes after {b}, - * - If return value is a positive value, {a} comes before {b}, - * - If return value is 0, {a} and {b} are indistinguishable in this sorting mechanism. - * Their order with respect to each other is undefined. + * - If return value is a negative value, `a` comes after `b`, + * - If return value is a positive value, `a` comes before `b`, + * - If return value is 0, `a` and `b` are indistinguishable in this sorting mechanism. + * Their order with respect to each other is undefined. * This method must always return the same result given the same pair of keys. + * * @param a first entry * @param b second entry * @return order index - * */ sort(a: [any, any], b: [any, any]): number; + } diff --git a/src/core/DistributedObjectListener.ts b/src/core/DistributedObjectListener.ts index 9a5ee6467..4ffb63522 100644 --- a/src/core/DistributedObjectListener.ts +++ b/src/core/DistributedObjectListener.ts @@ -15,10 +15,10 @@ */ /** - * DistributedObjectListener notifies when a DistributedObject + * Distributed object listener notifies when a distributed object * is created or destroyed cluster-wide. */ -export type DistributedObjectListener = (distributedObjectListener: DistributedObjectEvent) => void; +export type DistributedObjectListener = (event: DistributedObjectEvent) => void; /** * DistributedObjectEvent is fired when a DistributedObject @@ -46,4 +46,5 @@ export class DistributedObjectEvent { this.serviceName = serviceName; this.objectName = objectName; } + } diff --git a/src/core/ItemListener.ts b/src/core/ItemListener.ts index 4b04faf3c..0ec54937a 100644 --- a/src/core/ItemListener.ts +++ b/src/core/ItemListener.ts @@ -17,15 +17,24 @@ import {Member} from './Member'; /** - * Item listener for IQueue, ISet, IList. + * Item event listener for IQueue, ISet, IList. */ export interface ItemListener { + + /** + * Triggered when an item is added. + */ itemAdded?: ItemEventListener; + + /** + * Triggered when an item is removed. + */ itemRemoved?: ItemEventListener; + } /** - * A type which is used for item events. + * Item event hander function. */ export type ItemEventListener = (itemEvent: ItemEvent) => void; @@ -43,19 +52,17 @@ export class ItemEvent { * The value of the item event. */ item: E; - /** - * The event type. - */ - eventType: ItemEventType; /** * The member that fired this event. */ member: Member; - constructor(name: string, itemEventType: ItemEventType, item: E, member: Member) { + eventType: ItemEventType; + + constructor(name: string, eventType: ItemEventType, item: E, member: Member) { this.name = name; - this.eventType = itemEventType; + this.eventType = eventType; this.item = item; this.member = member; } @@ -63,6 +70,8 @@ export class ItemEvent { } export enum ItemEventType { + ADDED = 1, REMOVED = 2, + } diff --git a/src/core/MapListener.ts b/src/core/MapListener.ts index 1caa87e42..72abc865f 100644 --- a/src/core/MapListener.ts +++ b/src/core/MapListener.ts @@ -18,13 +18,13 @@ import {EntryListener} from './EntryListener'; import {Member} from './Member'; /** - * An interface which is used to get notified upon a map or an entry event. + * Map or entry level event listener. */ export interface MapListener extends EntryListener { } /** - * A type which is used for map events. + * Map event hander function. */ export type MapEventListener = (mapEvent: MapEvent) => void; @@ -37,6 +37,7 @@ export class MapEvent { * The name of the map for this event. */ name: string; + /** * Number of entries affected by this event. */ @@ -52,4 +53,5 @@ export class MapEvent { this.numberOfAffectedEntries = numberOfAffectedEntries; this.member = member; } + } diff --git a/src/core/MembershipEvent.ts b/src/core/MembershipEvent.ts index a10466fc9..4c17aa38f 100644 --- a/src/core/MembershipEvent.ts +++ b/src/core/MembershipEvent.ts @@ -17,29 +17,34 @@ import {Member} from './Member'; /** - * Membership event fired when a new member is added to the cluster and/or when a member leaves the cluster - * or when there is a member attribute change. + * Membership event fired when a new member is added to the cluster and/or + * when a member leaves the cluster or when there is a member attribute change. */ export class MembershipEvent { - /** - * the removed or added member. - */ - member: Member; /** - * the membership event type. + * Removed or added member. */ - eventType: number; + member: Member; /** - * the members at the moment after this event. + * Members list at the moment after this event. */ members: Member[]; - constructor(member: Member, eventType: number, members: Member[]) { + eventType: MemberEvent; + + constructor(member: Member, eventType: MemberEvent, members: Member[]) { this.member = member; this.eventType = eventType; this.members = members; } } + +export enum MemberEvent { + + ADDED = 1, + REMOVED = 2, + +} diff --git a/src/core/MembershipListener.ts b/src/core/MembershipListener.ts index 2361f74c9..be441248c 100644 --- a/src/core/MembershipListener.ts +++ b/src/core/MembershipListener.ts @@ -23,14 +23,16 @@ export interface MembershipListener { /** * Invoked when a new member is added to the cluster. - * @param {MembershipEvent} membership event + * + * @param {MembershipEvent} event event object */ - memberAdded(membership: MembershipEvent): void; + memberAdded(event: MembershipEvent): void; /** * Invoked when an existing member leaves the cluster. - * @param {MembershipEvent} membership event when an existing member leaves the cluster + * + * @param {MembershipEvent} event event object */ - memberRemoved(membership: MembershipEvent): void; + memberRemoved(event: MembershipEvent): void; } diff --git a/src/core/OverflowPolicy.ts b/src/core/OverflowPolicy.ts index a409050f1..dde81d146 100644 --- a/src/core/OverflowPolicy.ts +++ b/src/core/OverflowPolicy.ts @@ -14,7 +14,32 @@ * limitations under the License. */ +/** + * Overflow policy for Ringbuffer and Reliable Topic operations. + */ export enum OverflowPolicy { - OVERWRITE = 0, - FAIL = 1, + + /** + * The new item will overwrite the oldest one regardless of the + * configured time-to-live. + */ + OVERWRITE = 'OVERWRITE', + + /** + * Add operations will keep failing until an oldest item in this + * ringbuffer will reach its time-to-live. + */ + FAIL = 'FAIL', + +} + +export const overflowPolicyToId = (type: OverflowPolicy): number => { + switch (type) { + case OverflowPolicy.OVERWRITE: + return 0; + case OverflowPolicy.FAIL: + return 1; + default: + throw new TypeError('Unexpected type value: ' + type); + } } diff --git a/src/core/PartitionAware.ts b/src/core/PartitionAware.ts index b89ff79bb..ded0cd097 100644 --- a/src/core/PartitionAware.ts +++ b/src/core/PartitionAware.ts @@ -17,13 +17,14 @@ /** * Implementing PartitionAware allows one to override the default partitioning scheme. * Instead of using the keys themselves to spread the data around the cluster the - * key returned by {@link getPartitionKey} is used. + * key contained in `partitionKey` is used. *

* This provides the user with an ability to contain related keys within the same * partition and, consequently, within the same node. *

* In Hazelcast, disparate data structures will be stored on the same partition, - * based on the partition key. For example, if "Steve" was used, then the following would be on one partition. + * based on the partition key. For example, if "Steve" was used, then the following + * would be on one partition. *

    *
  • a customers IMap with an entry of key "Steve"
    • *
  • an orders IMap using a customer key type implementing PartitionAware with key "Steve
    • @@ -32,9 +33,11 @@ *
*/ export interface PartitionAware { + /** * The key that will be used by Hazelcast to specify the partition. * You should give the same key for objects that you want to be in the same partition. */ - getPartitionKey(): T; + partitionKey: T; + } diff --git a/src/core/Predicate.ts b/src/core/Predicate.ts index d10848269..4f863433e 100644 --- a/src/core/Predicate.ts +++ b/src/core/Predicate.ts @@ -27,7 +27,7 @@ import { NotEqualPredicate, NotPredicate, OrPredicate, - PagingPredicate, + PagingPredicateImpl, RegexPredicate, SqlPredicate, TruePredicate, @@ -35,9 +35,62 @@ import { import {IdentifiedDataSerializable} from '../serialization/Serializable'; import {Comparator} from './Comparator'; +/** + * Specifies conditions for entry lookup during iteration over a Map. + */ export interface Predicate extends IdentifiedDataSerializable { } +/** + * This interface is a special Predicate which helps to get a page-by-page + * result of a query. It can be constructed with a page-size, an inner + * predicate for filtering, and a comparator for sorting. + */ +export interface PagingPredicate extends Predicate { + + /** + * Sets the page value to next page. + */ + nextPage(): PagingPredicate; + + /** + * Sets the page value to previous page. + */ + previousPage(): PagingPredicate; + + /** + * Returns the current page value. + */ + getPage(): number; + + /** + * Sets the current page value. + * + * @param page page number + */ + setPage(page: number): PagingPredicate; + + /** + * Returns the page size. + */ + getPageSize(): number; + + /** + * Retrieve the anchor object which is the last value object on the + * previous page. + * + * Note: This method will return "null" anchor on the first page of the query + * result or if the predicate was not applied for the previous page number. + */ + getAnchor(): [number, [any, any]]; + + /** + * Returns the comparator used by this predicate (if any). + */ + getComparator(): Comparator; + +} + export function sql(str: string): Predicate { return new SqlPredicate(str); } @@ -90,8 +143,8 @@ export function notEqual(field: string, value: any): Predicate { return new NotEqualPredicate(field, value); } -export function not(predic: Predicate): Predicate { - return new NotPredicate(predic); +export function not(predicate: Predicate): Predicate { + return new NotPredicate(predicate); } export function or(...predicates: Predicate[]): Predicate { @@ -110,17 +163,47 @@ export function alwaysFalse(): Predicate { return FalsePredicate.INSTANCE; } -export function paging(predicate: Predicate, pageSize: number, comparator: Comparator = null): Predicate { - return new PagingPredicate(predicate, pageSize, comparator); +export function paging(predicate: Predicate, pageSize: number, comparator: Comparator = null): PagingPredicate { + return new PagingPredicateImpl(predicate, pageSize, comparator); } +/** + * Iteration type. + */ export enum IterationType { - KEY, - VALUE, - ENTRY, + + /** + * Iterate over keys. + */ + KEY = 'KEY', + + /** + * Iterate over values. + */ + VALUE = 'VALUE', + + /** + * Iterate over whole entry (so key and value). + */ + ENTRY = 'ENTRY', + +} + +export const iterationTypeToId = (type: IterationType): number => { + switch (type) { + case IterationType.KEY: + return 0; + case IterationType.VALUE: + return 1; + case IterationType.ENTRY: + return 2; + default: + throw new TypeError('Unexpected type value: ' + type); + } } export enum QueryConstants { + /** * Attribute name of the key. */ @@ -130,4 +213,5 @@ export enum QueryConstants { * Attribute name of the "this". */ THIS_ATTRIBUTE_NAME = 'this', + } diff --git a/src/core/ReadOnlyLazyList.ts b/src/core/ReadOnlyLazyList.ts index 01a18a0c2..e8d04788d 100644 --- a/src/core/ReadOnlyLazyList.ts +++ b/src/core/ReadOnlyLazyList.ts @@ -35,7 +35,11 @@ class ReadOnlyLazyListIterator implements Iterator { } -export class ReadOnlyLazyList implements Iterable { +/** + * Represents a list of values with lazy deserialization. + */ +export class ReadOnlyLazyList { + private internalArray: any[]; private serializationService: SerializationService; @@ -44,6 +48,12 @@ export class ReadOnlyLazyList implements Iterable { this.serializationService = serializationService; } + /** + * Returns list's element at the specified index. + * + * @param index element's index + * @returns element + */ get(index: number): T { const dataOrObject = this.internalArray[index]; if (dataOrObject == null) { @@ -58,18 +68,33 @@ export class ReadOnlyLazyList implements Iterable { } } + /** + * Returns the size of the list. + */ size(): number { return this.internalArray.length; } + /** + * Returns an iterator for elements in the list. + */ values(): Iterator { return new ReadOnlyLazyListIterator(this); } + /** + * Returns a slice of the list. + * + * @param start The beginning of the specified portion of the list (inclusive). + * @param end The end of the specified portion of the list (exclusive). + */ slice(start: number, end?: number): ReadOnlyLazyList { return new ReadOnlyLazyList(this.internalArray.slice(start, end), this.serializationService); } + /** + * Returns an array that contains all elements of this list in proper sequence. + */ toArray(): T[] { const arr: T[] = []; const iterator = this.values(); diff --git a/src/core/RestValue.ts b/src/core/RestValue.ts index 1a84d7b3c..4514419f8 100644 --- a/src/core/RestValue.ts +++ b/src/core/RestValue.ts @@ -14,23 +14,29 @@ * limitations under the License. */ -import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../serialization/Serializable'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; import {DataInput, DataOutput} from '../serialization/Data'; export const REST_VALUE_FACTORY_ID = -25; export const REST_VALUE_CLASS_ID = 1; +/** + * Wrapper for values stored via IMDG REST API. + */ export class RestValue implements IdentifiedDataSerializable { + + /** + * Wrapped value. + */ value: string; - contentType: string; - getClassId(): number { - return REST_VALUE_CLASS_ID; - } + /** + * HTTP Content-Type specified for the value. + */ + contentType: string; - getFactoryId(): number { - return REST_VALUE_FACTORY_ID; - } + factoryId = REST_VALUE_FACTORY_ID; + classId = REST_VALUE_CLASS_ID; readData(input: DataInput): any { this.value = input.readUTF(); @@ -43,11 +49,9 @@ export class RestValue implements IdentifiedDataSerializable { } } -export class RestValueFactory implements IdentifiedDataSerializableFactory { - create(type: number): IdentifiedDataSerializable { - if (type === REST_VALUE_CLASS_ID) { - return new RestValue(); - } - return null; +export function restValueFactory(classId: number): IdentifiedDataSerializable { + if (classId === REST_VALUE_CLASS_ID) { + return new RestValue(); } + return null; } diff --git a/src/core/SimpleEntryView.ts b/src/core/SimpleEntryView.ts index dd5b70438..8a22be247 100644 --- a/src/core/SimpleEntryView.ts +++ b/src/core/SimpleEntryView.ts @@ -16,23 +16,75 @@ import * as Long from 'long'; +/** + * Represents a view of a map entry. + */ export class SimpleEntryView { + + /** + * Key of the entry. + */ key: K; + + /** + * Value of the entry. + */ value: V; + + /** + * Cost (in bytes) of the entry. + */ cost: Long; + + /** + * Creation time of the entry. + */ creationTime: Long; + + /** + * Expiration time of the entry. + */ expirationTime: Long; + + /** + * Number of hits of the entry. + */ hits: Long; + + /** + * Last access time for the entry. + */ lastAccessTime: Long; + + /** + * Last time the value was flushed to mapstore. + */ lastStoredTime: Long; + + /** + * Last time the value was updated. + */ lastUpdateTime: Long; + + /** + * Version of the entry. + */ version: Long; + + /** + * Last set time-to-live in milliseconds. + */ ttl: Long; + + /** + * Last set max idle time in milliseconds. + */ maxIdle: Long; - constructor(key: K, value: V, cost: Long, creationTime: Long, expirationTime: Long, hits: Long, lastAccessTime: Long, - lastStoredTime: Long, lastUpdateTime: Long, version: Long, ttl: Long, - maxIdle: Long) { + constructor(key: K, value: V, cost: Long, creationTime: Long, + expirationTime: Long, hits: Long, lastAccessTime: Long, + lastStoredTime: Long, lastUpdateTime: Long, version: Long, + ttl: Long, maxIdle: Long) { this.key = key; this.value = value; this.cost = cost; @@ -46,4 +98,5 @@ export class SimpleEntryView { this.ttl = ttl; this.maxIdle = maxIdle; } + } diff --git a/src/index.ts b/src/index.ts index 6ee8f7cf3..5d6a72816 100644 --- a/src/index.ts +++ b/src/index.ts @@ -32,7 +32,7 @@ import {InMemoryFormat} from './config/InMemoryFormat'; import {ItemEvent, ItemEventType} from './core/ItemListener'; import {MapEvent} from './core/MapListener'; import {EntryEvent} from './core/EntryListener'; -import {LogLevel} from './logging/LoggingService'; +import {LogLevel} from './logging/ILogger'; import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializationPolicy'; import {HazelcastJsonValue} from './core/HazelcastJsonValue'; import {RoundRobinLB} from './util/RoundRobinLB'; diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 8d1cc3fdb..f129daf49 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -23,7 +23,7 @@ import {IllegalStateError, TargetDisconnectedError} from '../HazelcastError'; import {MemberSelector} from '../core/MemberSelector'; import {assertNotNull, DeferredPromise} from '../Util'; import {MembershipListener} from '../core/MembershipListener'; -import {MembershipEvent} from '../core/MembershipEvent'; +import {MembershipEvent, MemberEvent} from '../core/MembershipEvent'; import {UuidUtil} from '../util/UuidUtil'; import {ILogger} from '../logging/ILogger'; import {UUID} from '../core/UUID'; @@ -33,11 +33,6 @@ import {InitialMembershipEvent} from '../core/InitialMembershipEvent'; import {MemberInfo} from '../core/MemberInfo'; import {Cluster} from '../core/Cluster'; -export enum MemberEvent { - ADDED = 1, - REMOVED = 2, -} - class MemberListSnapshot { version: number; readonly members: Map; @@ -84,10 +79,10 @@ export class ClusterService implements Cluster { } /** - * Returns a collection of the members that satisfy the given {@link MemberSelector}. + * Returns an array of the members that satisfy the given {@link MemberSelector}. * * @param selector {@link MemberSelector} instance to filter members to return - * @return members that satisfy the given {@link MemberSelector}. + * @return members that satisfy the given selector. */ public getMembers(selector?: MemberSelector): Member[] { const members = this.getMemberList(); diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 3d82dba6a..ad218ff00 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -106,7 +106,8 @@ export class Invocation { } shouldRetry(err: Error): boolean { - if (this.connection != null && (err instanceof IOError || err instanceof TargetDisconnectedError)) { + if (this.connection != null + && (err instanceof IOError || err instanceof TargetDisconnectedError)) { return false; } @@ -117,7 +118,9 @@ export class Invocation { return false; } - if (err instanceof IOError || err instanceof HazelcastInstanceNotActiveError || err instanceof RetryableHazelcastError) { + if (err instanceof IOError + || err instanceof HazelcastInstanceNotActiveError + || err instanceof RetryableHazelcastError) { return true; } @@ -157,8 +160,10 @@ export class InvocationService { } else { this.doInvoke = this.invokeNonSmart; } - this.invocationRetryPauseMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS] as number; - this.invocationTimeoutMillis = this.client.getConfig().properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS] as number; + this.invocationRetryPauseMillis = + this.client.getConfig().properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS] as number; + this.invocationTimeoutMillis = + this.client.getConfig().properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS] as number; this.isShutdown = false; } diff --git a/src/logging/DefaultLogger.ts b/src/logging/DefaultLogger.ts index a907841aa..9eb933161 100644 --- a/src/logging/DefaultLogger.ts +++ b/src/logging/DefaultLogger.ts @@ -14,13 +14,13 @@ * limitations under the License. */ -import {LogLevel} from './LoggingService'; -import {ILogger} from './ILogger'; +import {ILogger, LogLevel} from './ILogger'; export class DefaultLogger implements ILogger { + private readonly level: number; - constructor(level: number) { + constructor(level: LogLevel) { this.level = level; } diff --git a/src/logging/ILogger.ts b/src/logging/ILogger.ts index f51d9628a..b831d6a67 100644 --- a/src/logging/ILogger.ts +++ b/src/logging/ILogger.ts @@ -14,7 +14,19 @@ * limitations under the License. */ -import {LogLevel} from './LoggingService'; +/** + * Log level for built-in or custom logger. + */ +export enum LogLevel { + + OFF = -1, + ERROR = 0, + WARN = 1, + INFO = 2, + DEBUG = 3, + TRACE = 4, + +} /** * The Hazelcast logging interface. diff --git a/src/logging/LoggingService.ts b/src/logging/LoggingService.ts index 7df53aa2e..bc8808303 100644 --- a/src/logging/LoggingService.ts +++ b/src/logging/LoggingService.ts @@ -16,23 +16,16 @@ import {Property} from '../config/Properties'; import {DefaultLogger} from './DefaultLogger'; -import {ILogger} from './ILogger'; - -export enum LogLevel { - OFF = -1, - ERROR = 0, - WARN = 1, - INFO = 2, - DEBUG = 3, - TRACE = 4, -} +import {ILogger, LogLevel} from './ILogger'; +import {enumFromString} from '../Util'; export class LoggingService { private readonly logger: ILogger; - constructor(customLogger: ILogger, logLevel: number) { + constructor(customLogger: ILogger, level: string) { if (customLogger == null) { + const logLevel = enumFromString(LogLevel, level); this.logger = new DefaultLogger(logLevel); } else if (this.isLogger(customLogger)) { this.logger = customLogger; @@ -43,8 +36,9 @@ export class LoggingService { isLogger(loggingProperty: Property): loggingProperty is ILogger { loggingProperty = (loggingProperty as ILogger); - return loggingProperty.log !== undefined && loggingProperty.error !== undefined && loggingProperty.warn !== undefined && - loggingProperty.info !== undefined && loggingProperty.debug !== undefined && loggingProperty.trace !== undefined; + return loggingProperty.log !== undefined && loggingProperty.error !== undefined + && loggingProperty.warn !== undefined && loggingProperty.info !== undefined + && loggingProperty.debug !== undefined && loggingProperty.trace !== undefined; } getLogger(): ILogger { diff --git a/src/protocol/PagingPredicateHolder.ts b/src/protocol/PagingPredicateHolder.ts index bbf909be5..9359bd66b 100644 --- a/src/protocol/PagingPredicateHolder.ts +++ b/src/protocol/PagingPredicateHolder.ts @@ -17,9 +17,11 @@ import {AnchorDataListHolder} from './AnchorDataListHolder'; import {Data} from '../serialization/Data'; import {SerializationService} from '../serialization/SerializationService'; -import {PagingPredicate} from '../serialization/DefaultPredicates'; +import {PagingPredicateImpl} from '../serialization/DefaultPredicates'; +import {iterationTypeToId} from '../core/Predicate'; export class PagingPredicateHolder { + anchorDataListHolder: AnchorDataListHolder; predicateData: Data; comparatorData: Data; @@ -39,15 +41,15 @@ export class PagingPredicateHolder { this.partitionKeyData = partitionKeyData; } - static of(predicate: PagingPredicate, serializationService: SerializationService): PagingPredicateHolder { + static of(predicate: PagingPredicateImpl, serializationService: SerializationService): PagingPredicateHolder { if (predicate == null) { return null; } - return this.buildHolder(serializationService, predicate); } - private static buildHolder(serializationService: SerializationService, predicate: PagingPredicate): PagingPredicateHolder { + private static buildHolder(serializationService: SerializationService, + predicate: PagingPredicateImpl): PagingPredicateHolder { const anchorList = predicate.getAnchorList(); const anchorDataList = new Array<[Data, Data]>(anchorList.length); const pageList = new Array(anchorList.length); @@ -56,13 +58,15 @@ export class PagingPredicateHolder { const item = anchorList[i]; pageList[i] = item[0]; const anchorEntry = item[1]; - anchorDataList[i] = [serializationService.toData(anchorEntry[0]), serializationService.toData(anchorEntry[1])]; + anchorDataList[i] = + [serializationService.toData(anchorEntry[0]), serializationService.toData(anchorEntry[1])]; } const anchorDataListHolder = new AnchorDataListHolder(pageList, anchorDataList); const predicateData = serializationService.toData(predicate.getPredicate()); const comparatorData = serializationService.toData(predicate.getComparator()); - return new PagingPredicateHolder(anchorDataListHolder, predicateData, comparatorData, predicate.getPageSize(), - predicate.getPage(), predicate.getIterationType().valueOf(), null); + const iterationTypeId = iterationTypeToId(predicate.getIterationType()); + return new PagingPredicateHolder(anchorDataListHolder, predicateData, comparatorData, + predicate.getPageSize(), predicate.getPage(), iterationTypeId, null); } } diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 3ef75a41d..71fec86d4 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -27,8 +27,8 @@ import {UUID} from '../core/UUID'; export class BaseProxy { protected client: HazelcastClient; - protected name: string; - protected serviceName: string; + protected readonly name: string; + protected readonly serviceName: string; constructor(client: HazelcastClient, serviceName: string, name: string) { this.client = client; diff --git a/src/proxy/FlakeIdGenerator.ts b/src/proxy/FlakeIdGenerator.ts index f94208928..2f39cf699 100644 --- a/src/proxy/FlakeIdGenerator.ts +++ b/src/proxy/FlakeIdGenerator.ts @@ -35,8 +35,6 @@ * member with join version smaller than 2^16 in the cluster. The remedy is to restart the cluster: * nodeId will be assigned from zero again. Uniqueness after the restart will be preserved thanks to * the timestamp component. - * - * @requires Hazelcast 3.10 */ import * as Promise from 'bluebird'; import * as Long from 'long'; diff --git a/src/proxy/IList.ts b/src/proxy/IList.ts index 5929da4b2..daa59e14c 100644 --- a/src/proxy/IList.ts +++ b/src/proxy/IList.ts @@ -155,10 +155,12 @@ export interface IList extends DistributedObject { size(): Promise; /** - * Return a view of this list that contains elements between index numbers from `start` (inclusive) to `end` (exclusive) + * Returns a view of this list that contains elements between index numbers from `start` + * (inclusive) to `end` (exclusive) + * * @param start start of the view * @param end end of the view - * @return a view of this list that contains elements between index numbers from `start` (inclusive) to `end` (exclusive) + * @return a view of the list */ subList(start: number, end: number): Promise>; diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index cb2e9cee0..746bfce16 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -34,7 +34,6 @@ export interface IMap extends DistributedObject { * engine they run on the Query infrastructure. Their performance is tens to hundreds times better due to the fact * that they run in parallel for each partition and are highly optimized for speed and low memory consumption. * - * @requires Hazelcast 3.8 * @param aggregator aggregator to aggregate the entries with * @param type of the result * @return the result of the given type @@ -49,7 +48,6 @@ export interface IMap extends DistributedObject { * engine they run on the Query infrastructure. Their performance is tens to hundreds times better due to the fact * that they run in parallel for each partition and are highly optimized for speed and low memory consumption. * - * @requires Hazelcast 3.8 * @param aggregator aggregator to aggregate the entries with * @param predicate predicate to filter the entries with * @param type of the result @@ -108,7 +106,7 @@ export interface IMap extends DistributedObject { addIndex(indexConfig: IndexConfig): Promise; /** - * This method checks whether the map has an item associated with key + * Returns `true` if this map has an item associated with key. * @param key * @throws {RangeError} if key is undefined or null * @return `true` if the map contains the key, `false` otherwise. @@ -116,7 +114,7 @@ export interface IMap extends DistributedObject { containsKey(key: K): Promise; /** - * This method return true if this map has key(s) associated with given value + * Returns `true` if this map has key(s) associated with given value. * @param value * @throws {RangeError} if value is undefined or null * @return `true` if the map has key or keys associated with given value. diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 5469c7090..a5cc3dac4 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -73,7 +73,7 @@ import {IterationType, Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; -import {PagingPredicate} from '../serialization/DefaultPredicates'; +import {PagingPredicateImpl} from '../serialization/DefaultPredicates'; import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; import * as SerializationUtil from '../serialization/SerializationUtil'; import {assertArray, assertNotNull} from '../Util'; @@ -162,7 +162,7 @@ export class MapProxy extends BaseProxy implements IMap { assertNotNull(predicate); const toObject = this.toObject.bind(this); - if (predicate instanceof PagingPredicate) { + if (predicate instanceof PagingPredicateImpl) { predicate.setIterationType(IterationType.ENTRY); const serializationService = this.client.getSerializationService(); const pagingPredicateHolder = PagingPredicateHolder.of(predicate, serializationService); @@ -186,7 +186,7 @@ export class MapProxy extends BaseProxy implements IMap { assertNotNull(predicate); const toObject = this.toObject.bind(this); - if (predicate instanceof PagingPredicate) { + if (predicate instanceof PagingPredicateImpl) { predicate.setIterationType(IterationType.KEY); const serializationService = this.client.getSerializationService(); const pagingPredicateHolder = PagingPredicateHolder.of(predicate, serializationService); @@ -208,7 +208,7 @@ export class MapProxy extends BaseProxy implements IMap { valuesWithPredicate(predicate: Predicate): Promise> { assertNotNull(predicate); - if (predicate instanceof PagingPredicate) { + if (predicate instanceof PagingPredicateImpl) { predicate.setIterationType(IterationType.VALUE); const serializationService = this.client.getSerializationService(); const pagingPredicateHolder = PagingPredicateHolder.of(predicate, serializationService); @@ -817,7 +817,7 @@ export class MapProxy extends BaseProxy implements IMap { } private checkNotPagingPredicate(v: Predicate): void { - if (v instanceof PagingPredicate) { + if (v instanceof PagingPredicateImpl) { throw new RangeError('Paging predicate is not supported.'); } } diff --git a/src/proxy/PNCounter.ts b/src/proxy/PNCounter.ts index f75440984..f26f64de5 100644 --- a/src/proxy/PNCounter.ts +++ b/src/proxy/PNCounter.ts @@ -52,8 +52,6 @@ import {DistributedObject} from '../DistributedObject'; * The CRDT state is kept entirely on non-lite (data) members. If there * aren't any and the methods here are invoked, they will * fail with a `NoDataMemberInClusterError`. - * - * @requires Hazelcast 3.10 */ export interface PNCounter extends DistributedObject { /** diff --git a/src/proxy/Ringbuffer.ts b/src/proxy/Ringbuffer.ts index 68f4ee94a..63af00217 100644 --- a/src/proxy/Ringbuffer.ts +++ b/src/proxy/Ringbuffer.ts @@ -73,7 +73,7 @@ export interface Ringbuffer extends DistributedObject { * if there is no space left in this ringbuffer. If `OVERWRITE` was passed, * the new item will overwrite the oldest one regardless of the configured time-to-live. * - * In the case when FAIL was specified the add operation will keep failing until an oldest item in this + * In the case when `FAIL` was specified the add operation will keep failing until an oldest item in this * ringbuffer will reach its time-to-live. * * The returned value is the sequence number of the added item. You can read the added item using this number. diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index fba0d843f..9b0ebc368 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -22,7 +22,6 @@ import {DeferredPromise} from '../../Util'; export class Batch { private nextIdLong: Long; private increment: Long; - private batchSize: number; private invalidSince: number; private firstInvalidId: Long; diff --git a/src/proxy/ringbuffer/ReadResultSet.ts b/src/proxy/ringbuffer/ReadResultSet.ts index b0ec4f518..e70b70399 100644 --- a/src/proxy/ringbuffer/ReadResultSet.ts +++ b/src/proxy/ringbuffer/ReadResultSet.ts @@ -14,19 +14,21 @@ * limitations under the License. */ +import * as Long from 'long'; + /** * ReadResultSet defines the result of a {@link Ringbuffer.readMany} operation. */ -import * as Long from 'long'; - export interface ReadResultSet { /** * Returns the number of items that have been read before filtering. *

- * If no filter is set, then the readCount will be equal to {@link size}. But if a filter is applied, it could be that items - * are read, but are filtered out. So if you are trying to make another read based on the ReadResultSet then you should - * increment the sequence by readCount and not by size. Otherwise you will be re-reading the same filtered messages. + * If no filter is set, then the readCount will be equal to {@link size}. + * But if a filter is applied, it could be that items are read, but are + * filtered out. So if you are trying to make another read based on the + * ReadResultSet then you should increment the sequence by readCount and + * not by size. Otherwise you will be re-reading the same filtered messages. * * @return the number of items read (including the filtered ones). */ @@ -41,13 +43,12 @@ export interface ReadResultSet { get(index: number): T; /** - * Return the sequence number for the item at the given index. + * Returns the sequence number for the item at the given index. * The method throws if there are no sequences available. * This can happen when the cluster version is lower than 3.9. * * @param index * @throws UnsupportedOperationError if server version is 3.8 or lower. - * @requires Hazelcast 3.9 * @returns the sequence number for the ringbuffer item * undefined if the index is out of bounds. */ diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index 87dfbbb5a..11846c62a 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -24,7 +24,7 @@ import {RingbufferReadOneCodec} from '../../codec/RingbufferReadOneCodec'; import {RingbufferRemainingCapacityCodec} from '../../codec/RingbufferRemainingCapacityCodec'; import {RingbufferSizeCodec} from '../../codec/RingbufferSizeCodec'; import {RingbufferTailSequenceCodec} from '../../codec/RingbufferTailSequenceCodec'; -import {OverflowPolicy} from '../../core/OverflowPolicy'; +import {OverflowPolicy, overflowPolicyToId} from '../../core/OverflowPolicy'; import {Ringbuffer} from '../Ringbuffer'; import {PartitionSpecificProxy} from '../PartitionSpecificProxy'; import {LazyReadResultSet} from './LazyReadResultSet'; @@ -74,7 +74,8 @@ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbu } add(item: E, overflowPolicy: OverflowPolicy = OverflowPolicy.OVERWRITE): Promise { - return this.encodeInvoke(RingbufferAddCodec, overflowPolicy, this.toData(item)) + const policyId = overflowPolicyToId(overflowPolicy); + return this.encodeInvoke(RingbufferAddCodec, policyId, this.toData(item)) .then((clientMessage) => { const response = RingbufferAddCodec.decodeResponse(clientMessage); return response.response; @@ -82,9 +83,10 @@ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbu } addAll(items: E[], overflowPolicy: OverflowPolicy = OverflowPolicy.OVERWRITE): Promise { + const policyId = overflowPolicyToId(overflowPolicy); const dataList = items.map(this.toData.bind(this)); - return this.encodeInvoke(RingbufferAddAllCodec, dataList, overflowPolicy) + return this.encodeInvoke(RingbufferAddAllCodec, dataList, policyId) .then((clientMessage) => { const response = RingbufferAddAllCodec.decodeResponse(clientMessage); return response.response; @@ -103,16 +105,16 @@ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbu }); } - readMany(sequence: number | Long, minCount: number, maxCount: number, filter: any = null): Promise> { - + readMany(sequence: number | Long, + minCount: number, + maxCount: number, + filter: any = null): Promise> { if (Long.fromValue(sequence).lessThan(0)) { throw new RangeError('Sequence number should not be less than zero, was: ' + sequence); } - if (minCount < 0) { throw new RangeError('Min count should not be less than zero, was: ' + sequence); } - if (minCount > maxCount) { throw new RangeError('Min count ' + minCount + 'was larger than max count ' + maxCount); } diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 823c83749..797e8955d 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -36,8 +36,13 @@ export class ReliableTopicListenerRunner { private proxy: ReliableTopicProxy; private listenerId: string; - constructor(listenerId: string, listener: MessageListener, ringbuffer: Ringbuffer, - batchSize: number, serializationService: SerializationService, logger: ILogger, proxy: ReliableTopicProxy) { + constructor(listenerId: string, + listener: MessageListener, + ringbuffer: Ringbuffer, + batchSize: number, + serializationService: SerializationService, + logger: ILogger, + proxy: ReliableTopicProxy) { this.listenerId = listenerId; this.listener = listener; this.ringbuffer = ringbuffer; @@ -48,46 +53,47 @@ export class ReliableTopicListenerRunner { } public next(): void { - if (this.cancelled) { return; } - this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize).then((result: ReadResultSet) => { - if (!this.cancelled) { - for (let i = 0; i < result.size(); i++) { - const msg = new Message(); - const item = result.get(i); - msg.messageObject = this.serializationService.toObject(item.payload); - msg.publisher = item.publisherAddress; - msg.publishingTime = item.publishTime; - setImmediate(this.listener, msg); - this.sequenceNumber++; + this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize) + .then((result: ReadResultSet) => { + if (!this.cancelled) { + for (let i = 0; i < result.size(); i++) { + const msg = new Message(); + const item = result.get(i); + msg.messageObject = this.serializationService.toObject(item.payload); + msg.publisher = item.publisherAddress; + msg.publishingTime = item.publishTime; + setImmediate(this.listener, msg); + this.sequenceNumber++; + } + setImmediate(this.next.bind(this)); } - setImmediate(this.next.bind(this)); - } - }).catch((e) => { - let message: string; - if (e instanceof StaleSequenceError) { - this.ringbuffer.headSequence().then((seq: Long) => { - const newSequence = seq.toNumber(); + }) + .catch((e) => { + let message: string; + if (e instanceof StaleSequenceError) { + this.ringbuffer.headSequence().then((seq: Long) => { + const newSequence = seq.toNumber(); - message = 'Topic "' + this.proxy.getName() + '" ran into a stale sequence. ' + - ' Jumping from old sequence ' + this.sequenceNumber + ' to new sequence ' + newSequence; - this.logger.warn('ReliableTopicListenerRunner', message); + message = 'Topic "' + this.proxy.getName() + '" ran into a stale sequence. ' + + ' Jumping from old sequence ' + this.sequenceNumber + ' to new sequence ' + newSequence; + this.logger.warn('ReliableTopicListenerRunner', message); - this.sequenceNumber = newSequence; - setImmediate(this.next.bind(this)); - }); + this.sequenceNumber = newSequence; + setImmediate(this.next.bind(this)); + }); - return; - } + return; + } - message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; - this.logger.warn('ReliableTopicListenerRunner', message); + message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; + this.logger.warn('ReliableTopicListenerRunner', message); - this.proxy.removeMessageListener(this.listenerId); - }); + this.proxy.removeMessageListener(this.listenerId); + }); } public cancel(): void { diff --git a/src/proxy/topic/ReliableTopicMessage.ts b/src/proxy/topic/ReliableTopicMessage.ts index f30c03048..b978774b2 100644 --- a/src/proxy/topic/ReliableTopicMessage.ts +++ b/src/proxy/topic/ReliableTopicMessage.ts @@ -16,13 +16,16 @@ import * as Long from 'long'; import {Data, DataInput, DataOutput} from '../../serialization/Data'; -import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from '../../serialization/Serializable'; +import {IdentifiedDataSerializable} from '../../serialization/Serializable'; import {Address} from '../../Address'; export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -9; export const RELIABLE_TOPIC_CLASS_ID = 2; export class ReliableTopicMessage implements IdentifiedDataSerializable { + + factoryId = RELIABLE_TOPIC_MESSAGE_FACTORY_ID; + classId = RELIABLE_TOPIC_CLASS_ID; publishTime: Long; publisherAddress: Address; payload: Data; @@ -38,21 +41,11 @@ export class ReliableTopicMessage implements IdentifiedDataSerializable { output.writeObject(this.publisherAddress); output.writeData(this.payload); } - - getFactoryId(): number { - return RELIABLE_TOPIC_MESSAGE_FACTORY_ID; - } - - getClassId(): number { - return RELIABLE_TOPIC_CLASS_ID; - } } -export class ReliableTopicMessageFactory implements IdentifiedDataSerializableFactory { - create(type: number): IdentifiedDataSerializable { - if (type === RELIABLE_TOPIC_CLASS_ID) { - return new ReliableTopicMessage(); - } - return null; +export function reliableTopicMessageFactory(classId: number): IdentifiedDataSerializable { + if (classId === RELIABLE_TOPIC_CLASS_ID) { + return new ReliableTopicMessage(); } + return null; } diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 2bf77edc6..d76795174 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -48,7 +48,6 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { this.batchSize = config.readBatchSize; this.overloadPolicy = config.overloadPolicy; this.serializationService = client.getSerializationService(); - this.name = name; } setRingbuffer(ringbuffer: Ringbuffer): void { @@ -73,13 +72,11 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { removeMessageListener(id: string): boolean { const runner = this.runners[id]; - if (!runner) { return false; } runner.cancel(); - delete this.runners[id]; return true; @@ -114,7 +111,6 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { const runner = this.runners[k]; runner.cancel(); } - return this.ringbuffer.destroy(); } @@ -130,7 +126,6 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { throw new TopicOverloadError('Failed to publish message: ' + reliableTopicMessage + ' on topic: ' + this.getName()); } - return null; }); } @@ -142,9 +137,7 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } private addWithBackoff(reliableTopicMessage: ReliableTopicMessage): Promise { - let resolve: Function; - const promise = new Promise(function (): void { resolve = arguments[0]; }); @@ -158,16 +151,13 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { this.ringbuffer.add(message, OverflowPolicy.FAIL).then((seq: Long) => { if (seq.toNumber() === -1) { let newDelay = delay *= 2; - if (newDelay > TOPIC_MAX_BACKOFF) { newDelay = TOPIC_MAX_BACKOFF; } - this.trySendMessage(message, newDelay, resolve); } else { resolve(); } - }); } diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index 292e906a1..3c479f0cc 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -15,16 +15,31 @@ */ import {Comparator} from '../core/Comparator'; -import {IterationType, Predicate} from '../core/Predicate'; +import {IterationType, Predicate, PagingPredicate} from '../core/Predicate'; import {enumFromString} from '../Util'; import {DataInput, DataOutput} from './Data'; -import {AbstractPredicate} from './PredicateFactory'; +import {IdentifiedDataSerializable} from './Serializable'; + +export const PREDICATE_FACTORY_ID = -20; + +abstract class AbstractPredicate implements Predicate { + + abstract classId: number; + factoryId = PREDICATE_FACTORY_ID; + + abstract readData(input: DataInput): any; + + abstract writeData(output: DataOutput): void; +} export class SqlPredicate extends AbstractPredicate { + static CLASS_ID = 0; + + classId = SqlPredicate.CLASS_ID; private sql: string; - constructor(sql: string) { + constructor(sql?: string) { super(); this.sql = sql; } @@ -36,14 +51,13 @@ export class SqlPredicate extends AbstractPredicate { writeData(output: DataOutput): void { output.writeUTF(this.sql); } - - getClassId(): number { - return 0; - } } export class AndPredicate extends AbstractPredicate { + static CLASS_ID = 1; + + classId = AndPredicate.CLASS_ID; private predicates: Predicate[]; constructor(...predicates: Predicate[]) { @@ -61,23 +75,22 @@ export class AndPredicate extends AbstractPredicate { writeData(output: DataOutput): void { output.writeInt(this.predicates.length); - this.predicates.forEach(function (pred: Predicate): void { - output.writeObject(pred); + this.predicates.forEach(function (predicate: Predicate): void { + output.writeObject(predicate); }); } - - getClassId(): number { - return 1; - } } export class BetweenPredicate extends AbstractPredicate { + static CLASS_ID = 2; + + classId = BetweenPredicate.CLASS_ID; private field: string; private from: any; private to: any; - constructor(field: string, from: any, to: any) { + constructor(field?: string, from?: any, to?: any) { super(); this.field = field; this.from = from; @@ -95,18 +108,17 @@ export class BetweenPredicate extends AbstractPredicate { output.writeObject(this.to); output.writeObject(this.from); } - - getClassId(): number { - return 2; - } } export class EqualPredicate extends AbstractPredicate { + static CLASS_ID = 3; + + classId = EqualPredicate.CLASS_ID; private field: string; private value: any; - constructor(field: string, value: any) { + constructor(field?: string, value?: any) { super(); this.field = field; this.value = value; @@ -121,20 +133,19 @@ export class EqualPredicate extends AbstractPredicate { output.writeUTF(this.field); output.writeObject(this.value); } - - getClassId(): number { - return 3; - } } export class GreaterLessPredicate extends AbstractPredicate { + static CLASS_ID = 4; + + classId = GreaterLessPredicate.CLASS_ID; private field: string; private value: any; private equal: boolean; private less: boolean; - constructor(field: string, value: any, equal: boolean, less: boolean) { + constructor(field?: string, value?: any, equal?: boolean, less?: boolean) { super(); this.field = field; this.value = value; @@ -156,18 +167,17 @@ export class GreaterLessPredicate extends AbstractPredicate { output.writeBoolean(this.equal); output.writeBoolean(this.less); } - - getClassId(): number { - return 4; - } } export class LikePredicate extends AbstractPredicate { + static CLASS_ID = 5; + + classId = LikePredicate.CLASS_ID; private field: string; private expr: string; - constructor(field: string, expr: string) { + constructor(field?: string, expr?: string) { super(); this.field = field; this.expr = expr; @@ -183,23 +193,24 @@ export class LikePredicate extends AbstractPredicate { output.writeUTF(this.field); output.writeUTF(this.expr); } - - getClassId(): number { - return 5; - } } export class ILikePredicate extends LikePredicate { - getClassId(): number { - return 6; - } + + static CLASS_ID = 6; + + classId = ILikePredicate.CLASS_ID; } export class InPredicate extends AbstractPredicate { + + static CLASS_ID = 7; + + classId = InPredicate.CLASS_ID; private field: string; private values: any[]; - constructor(field: string, ...values: any[]) { + constructor(field?: string, ...values: any[]) { super(); this.field = field; this.values = values; @@ -222,17 +233,16 @@ export class InPredicate extends AbstractPredicate { output.writeObject(val); }); } - - getClassId(): number { - return 7; - } } export class InstanceOfPredicate extends AbstractPredicate { + static CLASS_ID = 8; + + classId = InstanceOfPredicate.CLASS_ID; private className: string; - constructor(className: string) { + constructor(className?: string) { super(); this.className = className; } @@ -245,75 +255,75 @@ export class InstanceOfPredicate extends AbstractPredicate { writeData(output: DataOutput): void { output.writeUTF(this.className); } - - getClassId(): number { - return 8; - } } export class NotEqualPredicate extends EqualPredicate { - getClassId(): number { - return 9; - } + + static CLASS_ID = 9; + + classId = NotEqualPredicate.CLASS_ID; } export class NotPredicate extends AbstractPredicate { - private pred: Predicate; - constructor(pred: Predicate) { + static CLASS_ID = 10; + + classId = NotPredicate.CLASS_ID; + private predicate: Predicate; + + constructor(predicate?: Predicate) { super(); - this.pred = pred; + this.predicate = predicate; } readData(input: DataInput): any { - this.pred = input.readObject(); + this.predicate = input.readObject(); return this; } writeData(output: DataOutput): void { - output.writeObject(this.pred); - } - - getClassId(): number { - return 10; + output.writeObject(this.predicate); } } export class OrPredicate extends AbstractPredicate { - private preds: Predicate[]; + static CLASS_ID = 11; - constructor(...preds: Predicate[]) { + classId = OrPredicate.CLASS_ID; + private predicates: Predicate[]; + + constructor(...predicates: Predicate[]) { super(); - this.preds = preds; + this.predicates = predicates; } readData(input: DataInput): any { const s = input.readInt(); - this.preds = []; + this.predicates = []; for (let i = 0; i < s; i++) { - this.preds.push(input.readObject()); + this.predicates.push(input.readObject()); } return this; } writeData(output: DataOutput): void { - output.writeInt(this.preds.length); - this.preds.forEach(function (pred: Predicate): void { - output.writeObject(pred); + output.writeInt(this.predicates.length); + this.predicates.forEach(function (predicate: Predicate): void { + output.writeObject(predicate); }); } - - getClassId(): number { - return 11; - } } export class RegexPredicate extends AbstractPredicate { + + static CLASS_ID = 12; + + classId = RegexPredicate.CLASS_ID; private field: string; private regex: string; - constructor(field: string, regex: string) { + constructor(field?: string, regex?: string) { super(); this.field = field; this.regex = regex; @@ -329,50 +339,46 @@ export class RegexPredicate extends AbstractPredicate { output.writeUTF(this.field); output.writeUTF(this.regex); } - - getClassId(): number { - return 12; - } } export class FalsePredicate extends AbstractPredicate { + static CLASS_ID = 13; + + classId = FalsePredicate.CLASS_ID; static INSTANCE: FalsePredicate = new FalsePredicate(); readData(input: DataInput): any { - // Empty method + // no-op } writeData(output: DataOutput): any { - // Empty method - } - - getClassId(): number { - return 13; + // no-op } } export class TruePredicate extends AbstractPredicate { + static CLASS_ID = 14; + + classId = TruePredicate.CLASS_ID; static INSTANCE: TruePredicate = new TruePredicate(); readData(input: DataInput): any { - // Empty method + // no-op } writeData(output: DataOutput): any { - // Empty method - } - - getClassId(): number { - return 14; + // no-op } } -export class PagingPredicate extends AbstractPredicate { +export class PagingPredicateImpl extends AbstractPredicate implements PagingPredicate { private static NULL_ANCHOR: [number, [any, any]] = [-1, null]; + static CLASS_ID = 15; + classId = PagingPredicateImpl.CLASS_ID; private internalPredicate: Predicate; private pageSize: number; private comparatorObject: Comparator; @@ -380,14 +386,14 @@ export class PagingPredicate extends AbstractPredicate { private iterationType: IterationType = IterationType.ENTRY; private anchorList: Array<[number, [any, any]]> = []; - constructor(internalPredicate: Predicate, pageSize: number, comparator: Comparator) { + constructor(internalPredicate?: Predicate, pageSize?: number, comparator?: Comparator) { super(); if (pageSize <= 0) { throw new TypeError('Page size should be greater than 0!'); } this.pageSize = pageSize; - if (internalPredicate instanceof PagingPredicate) { - throw new TypeError('Nested paging predicate is not supported!'); + if (internalPredicate instanceof PagingPredicateImpl) { + throw new TypeError('Nested paging predicates are not supported!'); } this.internalPredicate = internalPredicate; this.comparatorObject = comparator; @@ -414,7 +420,7 @@ export class PagingPredicate extends AbstractPredicate { output.writeObject(this.comparatorObject); output.writeInt(this.page); output.writeInt(this.pageSize); - output.writeUTF(IterationType[this.iterationType]); + output.writeUTF(this.iterationType); output.writeInt(this.anchorList.length); this.anchorList.forEach(function (anchorEntry: [number, [any, any]]): void { output.writeInt(anchorEntry[0]); @@ -423,13 +429,7 @@ export class PagingPredicate extends AbstractPredicate { }); } - getClassId(): number { - return 15; - } - setIterationType(iterationType: IterationType): void { - this.iterationType = iterationType; - } nextPage(): PagingPredicate { this.page++; @@ -446,30 +446,6 @@ export class PagingPredicate extends AbstractPredicate { return this; } - setAnchor(page: number, anchor: [any, any]): void { - const anchorEntry: [number, [any, any]] = [page, anchor]; - const anchorCount = this.anchorList.length; - if (page < anchorCount) { - this.anchorList[page] = anchorEntry; - } else if (page === anchorCount) { - this.anchorList.push(anchorEntry); - } else { - throw new RangeError('Anchor index is not correct, expected: ' + page + 'found: ' + anchorCount); - } - } - - setAnchorList(anchorList: Array<[number, [any, any]]>): void { - this.anchorList = anchorList; - } - - getPredicate(): Predicate { - return this.internalPredicate; - } - - getAnchorList(): Array<[number, [any, any]]> { - return this.anchorList; - } - getPage(): number { return this.page; } @@ -478,10 +454,14 @@ export class PagingPredicate extends AbstractPredicate { return this.pageSize; } - getNearestAnchorEntry(): [number, [any, any]] { + getComparator(): Comparator { + return this.comparatorObject; + } + + getAnchor(): [number, [any, any]] { const anchorCount = this.anchorList.length; if (this.page === 0 || anchorCount === 0) { - return PagingPredicate.NULL_ANCHOR; + return PagingPredicateImpl.NULL_ANCHOR; } let anchoredEntry: [number, [any, any]]; if (this.page < anchorCount) { @@ -492,11 +472,61 @@ export class PagingPredicate extends AbstractPredicate { return anchoredEntry; } + getPredicate(): Predicate { + return this.internalPredicate; + } + + getAnchorList(): Array<[number, [any, any]]> { + return this.anchorList; + } + + setAnchorList(anchorList: Array<[number, [any, any]]>): void { + this.anchorList = anchorList; + } + getIterationType(): IterationType { return this.iterationType; } - getComparator(): Comparator { - return this.comparatorObject; + setIterationType(iterationType: IterationType): void { + this.iterationType = iterationType; + } + +} + +interface PredicateConstructor { + new (): Predicate; + CLASS_ID: number; +} + +const allPredicates: Array = [ + SqlPredicate, + AndPredicate, + BetweenPredicate, + EqualPredicate, + GreaterLessPredicate, + LikePredicate, + ILikePredicate, + InPredicate, + InstanceOfPredicate, + NotEqualPredicate, + NotPredicate, + OrPredicate, + RegexPredicate, + FalsePredicate, + TruePredicate, + PagingPredicateImpl, +]; + +const idToConstructorMap: { [id: number]: PredicateConstructor } = {}; +for (const predicate of allPredicates) { + idToConstructorMap[predicate.CLASS_ID] = predicate; +} + +export function predicateFactory(classId: number): IdentifiedDataSerializable { + if (idToConstructorMap[classId]) { + return new idToConstructorMap[classId](); + } else { + throw new RangeError(`There is no default predicate with id ${classId}.`); } } diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index 8225a9c87..2f120d60f 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -26,9 +26,9 @@ import {HazelcastJsonValue} from '../core/HazelcastJsonValue'; export interface Serializer { /** - * Returns type id. + * Type id. */ - getId(): number; + id: number; /** * Deserializes input data into an object. @@ -49,9 +49,7 @@ export interface Serializer { export class StringSerializer implements Serializer { - getId(): number { - return -11; - } + id = -11; read(input: DataInput): any { return input.readUTF(); @@ -64,9 +62,7 @@ export class StringSerializer implements Serializer { export class DoubleSerializer implements Serializer { - getId(): number { - return -10; - } + id = -10; read(input: DataInput): any { return input.readDouble(); @@ -79,9 +75,7 @@ export class DoubleSerializer implements Serializer { export class BooleanSerializer implements Serializer { - getId(): number { - return -4; - } + id = -4; read(input: DataInput): any { return input.readBoolean(); @@ -96,9 +90,7 @@ export const NULL_TYPE_ID = 0; export class NullSerializer implements Serializer { - getId(): number { - return NULL_TYPE_ID; - } + id = NULL_TYPE_ID; read(input: DataInput): any { return null; @@ -111,9 +103,7 @@ export class NullSerializer implements Serializer { export class ShortSerializer implements Serializer { - getId(): number { - return -6; - } + id = -6; read(input: DataInput): any { return input.readShort(); @@ -126,9 +116,7 @@ export class ShortSerializer implements Serializer { export class IntegerSerializer implements Serializer { - getId(): number { - return -7; - } + id = -7; read(input: DataInput): any { return input.readInt(); @@ -141,9 +129,7 @@ export class IntegerSerializer implements Serializer { export class LongSerializer implements Serializer { - getId(): number { - return -8; - } + id = -8; read(input: DataInput): any { return input.readLong(); @@ -156,9 +142,7 @@ export class LongSerializer implements Serializer { export class FloatSerializer implements Serializer { - getId(): number { - return -9; - } + id = -9; read(input: DataInput): any { return input.readFloat(); @@ -171,9 +155,7 @@ export class FloatSerializer implements Serializer { export class DateSerializer implements Serializer { - getId(): number { - return -25; - } + id = -25; read(input: DataInput): any { return new Date(input.readLong().toNumber()); @@ -186,9 +168,7 @@ export class DateSerializer implements Serializer { export class BooleanArraySerializer implements Serializer { - getId(): number { - return -13; - } + id = -13; read(input: DataInput): any { return input.readBooleanArray(); @@ -201,9 +181,7 @@ export class BooleanArraySerializer implements Serializer { export class ShortArraySerializer implements Serializer { - getId(): number { - return -15; - } + id = -15; read(input: DataInput): any { return input.readShortArray(); @@ -216,9 +194,7 @@ export class ShortArraySerializer implements Serializer { export class IntegerArraySerializer implements Serializer { - getId(): number { - return -16; - } + id = -16; read(input: DataInput): any { return input.readIntArray(); @@ -231,9 +207,7 @@ export class IntegerArraySerializer implements Serializer { export class LongArraySerializer implements Serializer { - getId(): number { - return -17; - } + id = -17; read(input: DataInput): any { return input.readLongArray(); @@ -246,9 +220,7 @@ export class LongArraySerializer implements Serializer { export class DoubleArraySerializer implements Serializer { - getId(): number { - return -19; - } + id = -19; read(input: DataInput): any { return input.readDoubleArray(); @@ -261,9 +233,7 @@ export class DoubleArraySerializer implements Serializer { export class StringArraySerializer implements Serializer { - getId(): number { - return -20; - } + id = -20; read(input: DataInput): any { return input.readUTFArray(); @@ -276,9 +246,7 @@ export class StringArraySerializer implements Serializer { export class ByteSerializer implements Serializer { - getId(): number { - return -3; - } + id = -3; read(input: DataInput): any { return input.readByte(); @@ -291,9 +259,7 @@ export class ByteSerializer implements Serializer { export class ByteArraySerializer implements Serializer { - getId(): number { - return -12; - } + id = -12; read(input: DataInput): any { return input.readByteArray(); @@ -306,9 +272,7 @@ export class ByteArraySerializer implements Serializer { export class CharSerializer implements Serializer { - getId(): number { - return -5; - } + id = -5; read(input: DataInput): any { return input.readChar(); @@ -321,9 +285,7 @@ export class CharSerializer implements Serializer { export class CharArraySerializer implements Serializer { - getId(): number { - return -14; - } + id = -14; read(input: DataInput): any { return input.readCharArray(); @@ -335,9 +297,8 @@ export class CharArraySerializer implements Serializer { } export class FloatArraySerializer implements Serializer { - getId(): number { - return -18; - } + + id = -18; read(input: DataInput): any { return input.readFloatArray(); @@ -350,9 +311,7 @@ export class FloatArraySerializer implements Serializer { export class JavaClassSerializer implements Serializer { - getId(): number { - return -24; - } + id = -24; read(input: DataInput): any { return input.readUTF(); @@ -365,9 +324,7 @@ export class JavaClassSerializer implements Serializer { export class LinkedListSerializer implements Serializer { - getId(): number { - return -30; - } + id = -30; read(input: DataInput): any { const size = input.readInt(); @@ -382,27 +339,24 @@ export class LinkedListSerializer implements Serializer { } write(output: DataOutput, object: any): void { - // NULL method + // no-op } } export class ArrayListSerializer extends LinkedListSerializer { - getId(): number { - return -29; - } + + id = -29; } export class IdentifiedDataSerializableSerializer implements Serializer { + + id = -2; private factories: { [id: number]: IdentifiedDataSerializableFactory }; constructor(factories: { [id: number]: IdentifiedDataSerializableFactory }) { this.factories = factories; } - getId(): number { - return -2; - } - read(input: DataInput): any { const isIdentified = input.readBoolean(); if (!isIdentified) { @@ -410,27 +364,26 @@ export class IdentifiedDataSerializableSerializer implements Serializer { } const factoryId = input.readInt(); const classId = input.readInt(); - const factory = this.factories[factoryId]; - if (!factory) { + const factoryFn = this.factories[factoryId]; + if (!factoryFn) { throw new RangeError('There is no Identified Data Serializer factory with id ' + factoryId + '.'); } - const object = factory.create(classId); + const object = factoryFn(classId); object.readData(input); return object; } write(output: DataOutput, object: IdentifiedDataSerializable): void { output.writeBoolean(true); - output.writeInt(object.getFactoryId()); - output.writeInt(object.getClassId()); + output.writeInt(object.factoryId); + output.writeInt(object.classId); object.writeData(output); } } export class JsonSerializer implements Serializer { - getId(): number { - return -130; - } + + id = -130; read(input: DataInput): any { return JSON.parse(input.readUTF()); @@ -447,6 +400,7 @@ export class JsonSerializer implements Serializer { } export class HazelcastJsonValueSerializer extends JsonSerializer { + read(input: DataInput): HazelcastJsonValue { return new HazelcastJsonValue(input.readUTF()); } diff --git a/src/serialization/PredicateFactory.ts b/src/serialization/PredicateFactory.ts deleted file mode 100644 index 9628a0a64..000000000 --- a/src/serialization/PredicateFactory.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {Predicate} from '../core/Predicate'; -import {DataInput, DataOutput} from './Data'; -import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; - -export const PREDICATE_FACTORY_ID = -20; - -export abstract class AbstractPredicate implements Predicate { - - abstract readData(input: DataInput): any; - - abstract writeData(output: DataOutput): void; - - getFactoryId(): number { - return PREDICATE_FACTORY_ID; - } - - abstract getClassId(): number; -} - -export class PredicateFactory implements IdentifiedDataSerializableFactory { - - private idToConstructorMap: { [id: number]: FunctionConstructor } = {}; - - constructor(allPredicates: any) { - for (const pred in allPredicates) { - // TODO accessing getClassId from prototype of uninitialized member function is not elegant. - this.idToConstructorMap[(allPredicates[pred].prototype as any).getClassId()] = allPredicates[pred]; - } - } - - create(type: number): IdentifiedDataSerializable { - if (this.idToConstructorMap[type]) { - return (new this.idToConstructorMap[type]()) as any; - } else { - throw new RangeError(`There is no default predicate with id ${type}.`); - } - } -} diff --git a/src/serialization/Serializable.ts b/src/serialization/Serializable.ts index fec774c37..a48bf5463 100644 --- a/src/serialization/Serializable.ts +++ b/src/serialization/Serializable.ts @@ -17,50 +17,109 @@ import {DataInput, DataOutput} from './Data'; import {PortableReader, PortableWriter} from './portable/PortableSerializer'; +/** + * Interface for objects with IdentifiedDataSerializable + * serialization support. + */ export interface IdentifiedDataSerializable { - readData(input: DataInput): any; - + /** + * Factory id of the object. + */ + factoryId: number; + + /** + * Class id of the object. + */ + classId: number; + + /** + * Reads fields of the object from the binary representation. + * + * @param input read helper + */ + readData(input: DataInput): void; + + /** + * Writes fields of the object into the binary representation. + * + * @param output write helper + */ writeData(output: DataOutput): void; - getFactoryId(): number; - - getClassId(): number; - } -export interface IdentifiedDataSerializableFactory { - - create(type: number): IdentifiedDataSerializable; - -} +/** + * Factory function for {@link IdentifiedDataSerializable}. Should return + * an instance of the right {@link IdentifiedDataSerializable} object, given + * the matching `classId`. + * + * @param classId class id + * @returns object for further initialization + */ +export type IdentifiedDataSerializableFactory = (classId: number) => IdentifiedDataSerializable; +/** + * Interface for objects with Portable serialization support. + */ export interface Portable { - getFactoryId(): number; - - getClassId(): number; + /** + * Factory id of the portable object. + */ + factoryId: number; + + /** + * Class id of the portable object. + */ + classId: number; + + /** + * Reads fields of the portable object from the binary representation. + * + * @param reader read helper + */ + readPortable(reader: PortableReader): void; + /** + * Writes fields of the portable object into the binary representation. + * + * @param writer write helper + */ writePortable(writer: PortableWriter): void; - readPortable(reader: PortableReader): void; - } +/** + * Interface for Portable serialization with multiversion support. + */ export interface VersionedPortable extends Portable { - getVersion(): number; + /** + * Version of the portable object. + */ + version: number; } -export interface PortableFactory { - - create(classId: number): Portable; - -} +/** + * Factory function for {@link Portable}. Should return + * an instance of the right {@link Portable} object, given + * the matching `classId`. + * + * @param classId class id + * @returns object for further initialization + */ +export type PortableFactory = (classId: number) => Portable; +/** + * Interface for objects with custom serialization support. + */ export interface CustomSerializable { - hzGetCustomId(): number; + /** + * Custom serializable id. Should match custom serializer's id. + */ + hzCustomId: number; } diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 46437bf3e..ba3e59fd2 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -14,17 +14,15 @@ * limitations under the License. */ -import {AggregatorFactory} from '../aggregation/AggregatorFactory'; -import {ClusterDataFactory} from '../ClusterDataFactory'; -import {ClusterDataFactoryHelper} from '../ClusterDataFactoryHelper'; +import {AGGREGATOR_FACTORY_ID, aggregatorFactory} from '../aggregation/AggregatorFactory'; +import {CLUSTER_DATA_FACTORY_ID, clusterDataFactory} from '../ClusterDataFactory'; import {SerializationConfigImpl} from '../config/SerializationConfig'; import { RELIABLE_TOPIC_MESSAGE_FACTORY_ID, - ReliableTopicMessageFactory, + reliableTopicMessageFactory, } from '../proxy/topic/ReliableTopicMessage'; import * as Util from '../Util'; import {Data, DataInput, DataOutput} from './Data'; -import * as DefaultPredicates from './DefaultPredicates'; import { Serializer, BooleanArraySerializer, @@ -55,10 +53,10 @@ import { import {DATA_OFFSET, HeapData} from './HeapData'; import {ObjectDataInput, PositionalObjectDataOutput} from './ObjectData'; import {PortableSerializer} from './portable/PortableSerializer'; -import {PREDICATE_FACTORY_ID, PredicateFactory} from './PredicateFactory'; +import {PREDICATE_FACTORY_ID, predicateFactory} from './DefaultPredicates'; import {IdentifiedDataSerializableFactory} from './Serializable'; import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; -import {RestValueFactory, REST_VALUE_FACTORY_ID} from '../core/RestValue'; +import {REST_VALUE_FACTORY_ID, restValueFactory} from '../core/RestValue'; export interface SerializationService { @@ -102,14 +100,14 @@ export class SerializationServiceV1 implements SerializationService { const dataOutput = new PositionalObjectDataOutput(this, this.serializationConfig.isBigEndian); const serializer = this.findSerializerFor(object); // Check if object is partition aware - if (object != null && object.getPartitionKey) { - const partitionKey = object.getPartitionKey(); + if (object != null && object.partitionKey != null) { + const partitionKey = object.partitionKey; const serializedPartitionKey = this.toData(partitionKey); dataOutput.writeIntBE(this.calculatePartitionHash(serializedPartitionKey, partitioningStrategy)); } else { dataOutput.writeIntBE(this.calculatePartitionHash(object, partitioningStrategy)); } - dataOutput.writeIntBE(serializer.getId()); + dataOutput.writeIntBE(serializer.id); serializer.write(dataOutput, object); return new HeapData(dataOutput.toBuffer()); } @@ -128,7 +126,7 @@ export class SerializationServiceV1 implements SerializationService { writeObject(out: DataOutput, object: any): void { const serializer = this.findSerializerFor(object); - out.writeInt(serializer.getId()); + out.writeInt(serializer.id); serializer.write(out, object); } @@ -142,11 +140,11 @@ export class SerializationServiceV1 implements SerializationService { if (this.serializerNameToId[name]) { throw new RangeError('Given serializer name is already in the registry.'); } - if (this.registry[serializer.getId()]) { + if (this.registry[serializer.id]) { throw new RangeError('Given serializer id is already in the registry.'); } - this.serializerNameToId[name] = serializer.getId(); - this.registry[serializer.getId()] = serializer; + this.serializerNameToId[name] = serializer.id; + this.registry[serializer.id] = serializer; } /** @@ -214,7 +212,7 @@ export class SerializationServiceV1 implements SerializationService { protected lookupCustomSerializer(obj: any): Serializer { if (this.isCustomSerializable(obj)) { - return this.findSerializerById(obj.hzGetCustomId()); + return this.findSerializerById(obj.hzCustomId); } return null; } @@ -224,11 +222,13 @@ export class SerializationServiceV1 implements SerializationService { } protected isIdentifiedDataSerializable(obj: any): boolean { - return (obj.readData && obj.writeData && obj.getClassId && obj.getFactoryId); + return (obj.readData && obj.writeData + && typeof obj.factoryId === 'number' && typeof obj.classId === 'number'); } protected isPortableSerializable(obj: any): boolean { - return (obj.readPortable && obj.writePortable && obj.getFactoryId && obj.getClassId); + return (obj.readPortable && obj.writePortable + && typeof obj.factoryId === 'number' && typeof obj.classId === 'number'); } protected registerDefaultSerializers(): void { @@ -270,11 +270,11 @@ export class SerializationServiceV1 implements SerializationService { for (const id in this.serializationConfig.dataSerializableFactories) { factories[id] = this.serializationConfig.dataSerializableFactories[id]; } - factories[PREDICATE_FACTORY_ID] = new PredicateFactory(DefaultPredicates); - factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = new ReliableTopicMessageFactory(); - factories[ClusterDataFactoryHelper.FACTORY_ID] = new ClusterDataFactory(); - factories[AggregatorFactory.FACTORY_ID] = new AggregatorFactory(); - factories[REST_VALUE_FACTORY_ID] = new RestValueFactory(); + factories[PREDICATE_FACTORY_ID] = predicateFactory; + factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = reliableTopicMessageFactory; + factories[CLUSTER_DATA_FACTORY_ID] = clusterDataFactory; + factories[AGGREGATOR_FACTORY_ID] = aggregatorFactory; + factories[REST_VALUE_FACTORY_ID] = restValueFactory; this.registerSerializer('identified', new IdentifiedDataSerializableSerializer(factories)); } @@ -283,7 +283,7 @@ export class SerializationServiceV1 implements SerializationService { for (const key in customSerializers) { const candidate = customSerializers[key]; this.assertValidCustomSerializer(candidate); - this.registerSerializer('!custom' + candidate.getId(), candidate); + this.registerSerializer('!custom' + candidate.id, candidate); } } @@ -297,25 +297,24 @@ export class SerializationServiceV1 implements SerializationService { } protected assertValidCustomSerializer(candidate: any): void { - const fGetId = 'getId'; + const idProp = 'id'; const fRead = 'read'; const fWrite = 'write'; - if ( - typeof candidate[fGetId] !== 'function' || - typeof candidate[fRead] !== 'function' || - typeof candidate[fWrite] !== 'function' - ) { - throw new TypeError('Custom serializer should have ' + fGetId + ', ' + fRead + ' and ' + fWrite + ' methods.'); + if (typeof candidate[idProp] !== 'number') { + throw new TypeError('Custom serializer should have ' + idProp + ' property.'); } - const typeId = candidate[fGetId](); + if (typeof candidate[fRead] !== 'function' || typeof candidate[fWrite] !== 'function') { + throw new TypeError('Custom serializer should have ' + fRead + ' and ' + fWrite + ' methods.'); + } + const typeId = candidate[idProp]; if (!Number.isInteger(typeId) || typeId < 1) { throw new TypeError('Custom serializer should have its typeId greater than or equal to 1.'); } } protected isCustomSerializable(object: any): boolean { - const prop = 'hzGetCustomId'; - return (object[prop] && typeof object[prop] === 'function' && object[prop]() >= 1); + const prop = 'hzCustomId'; + return (typeof object[prop] === 'number' && object[prop] >= 1); } protected findSerializerByName(name: string, isArray: boolean): Serializer { diff --git a/src/serialization/portable/ClassDefinitionContext.ts b/src/serialization/portable/ClassDefinitionContext.ts index fd3c4332d..30b2b6a91 100644 --- a/src/serialization/portable/ClassDefinitionContext.ts +++ b/src/serialization/portable/ClassDefinitionContext.ts @@ -44,7 +44,8 @@ export class ClassDefinitionContext { throw new HazelcastSerializationError(`This factory's number is ${this.factoryId}. Intended factory id is ${classDefinition.getFactoryId()}`); } - const cdKey = ClassDefinitionContext.encodeVersionedClassId(classDefinition.getClassId(), classDefinition.getVersion()); + const cdKey = ClassDefinitionContext.encodeVersionedClassId( + classDefinition.getClassId(), classDefinition.getVersion()); const current = this.classDefs[cdKey]; if (current == null) { this.classDefs[cdKey] = classDefinition; @@ -52,8 +53,8 @@ export class ClassDefinitionContext { } if (!current.equals(classDefinition)) { - throw new HazelcastSerializationError(`Incompatible class definition with same class id: - ${classDefinition.getClassId()}`); + throw new HazelcastSerializationError('Incompatible class definition with same class id: ' + + classDefinition.getClassId()); } return classDefinition; diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index 876b228a1..e734d0b23 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -73,8 +73,8 @@ export class ClassDefinitionWriter implements PortableWriter { + 'registering class definition!'); } const version = this.context.getClassVersion(portable); - const nestedClassDef = this.createNestedClassDef(portable, new ClassDefinitionBuilder(portable.getFactoryId(), - portable.getClassId(), version)); + const nestedClassDef = this.createNestedClassDef(portable, + new ClassDefinitionBuilder(portable.factoryId, portable.classId, version)); this.builder.addPortableField(fieldName, nestedClassDef); } @@ -128,17 +128,17 @@ export class ClassDefinitionWriter implements PortableWriter { throw new HazelcastSerializationError('Cannot write null portable array without explicitly ' + 'registering class definition!'); } - const p = portables[0]; - const classId = p.getClassId(); + const portable = portables[0]; + const classId = portable.classId; for (let i = 1; i < portables.length; i++) { - if (portables[i].getClassId() !== classId) { + if (portables[i].classId !== classId) { throw new RangeError('Detected different class-ids in portable array!'); } } - const version = this.context.getClassVersion(p); - const nestedClassDef = this.createNestedClassDef(p, new ClassDefinitionBuilder(p.getFactoryId(), p.getClassId(), - version)); + const version = this.context.getClassVersion(portable); + const nestedClassDef = this.createNestedClassDef(portable, + new ClassDefinitionBuilder(portable.factoryId, portable.classId, version)); this.builder.addPortableArrayField(fieldName, nestedClassDef); } diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index e6974dc53..309febf4a 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -68,7 +68,7 @@ export class PortableContext { fieldFactoryId = input.readInt(); fieldClassId = input.readInt(); - // TODO: what there's a null inner Portable field + // TODO: what if there's a null inner Portable field if (register) { fieldVersion = input.readInt(); this.readClassDefinitionFromInput(input, fieldFactoryId, fieldClassId, fieldVersion); @@ -78,7 +78,7 @@ export class PortableContext { fieldFactoryId = input.readInt(); fieldClassId = input.readInt(); - // TODO: what there's a null inner Portable field + // TODO: what if there's a null inner Portable field if (k > 0) { const p = input.readInt(); input.position(p); @@ -97,13 +97,13 @@ export class PortableContext { return classDefinition; } - lookupOrRegisterClassDefinition(p: Portable): ClassDefinition { - const portableVersion = this.getClassVersion(p); - let cd = this.lookupClassDefinition(p.getFactoryId(), p.getClassId(), portableVersion); + lookupOrRegisterClassDefinition(portable: Portable): ClassDefinition { + const portableVersion = this.getClassVersion(portable); + let cd = this.lookupClassDefinition(portable.factoryId, portable.classId, portableVersion); if (cd == null) { - const writer = new ClassDefinitionWriter(this, new ClassDefinitionBuilder(p.getFactoryId(), p.getClassId(), - portableVersion)); - p.writePortable(writer); + const writer = new ClassDefinitionWriter(this, + new ClassDefinitionBuilder(portable.factoryId, portable.classId, portableVersion)); + portable.writePortable(writer); cd = writer.registerAndGet(); } return cd; @@ -127,11 +127,11 @@ export class PortableContext { } getClassVersion(portable: VersionedPortable | Portable): number { - if ((portable as VersionedPortable).getVersion) { - if ((portable as VersionedPortable).getVersion() < 0) { + if (typeof (portable as VersionedPortable).version === 'number') { + if ((portable as VersionedPortable).version < 0) { throw new RangeError('Version cannot be negative!'); } - return (portable as VersionedPortable).getVersion(); + return (portable as VersionedPortable).version; } else { return this.version; } diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 32003b42c..2f99fcfb7 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -29,6 +29,7 @@ import {HazelcastSerializationError} from '../../HazelcastError'; export class PortableSerializer implements Serializer { + id = -1; private portableContext: PortableContext; private factories: { [id: number]: PortableFactory }; private service: SerializationService; @@ -39,10 +40,6 @@ export class PortableSerializer implements Serializer { this.factories = serializationConfig.portableFactories; } - getId(): number { - return -1; - } - read(input: DataInput): any { const factoryId = input.readInt(); const classId = input.readInt(); @@ -74,8 +71,8 @@ export class PortableSerializer implements Serializer { } write(output: PositionalDataOutput, object: Portable): void { - output.writeInt(object.getFactoryId()); - output.writeInt(object.getClassId()); + output.writeInt(object.factoryId); + output.writeInt(object.classId); this.writeObject(output, object); } @@ -90,11 +87,11 @@ export class PortableSerializer implements Serializer { } private createNewPortableInstance(factoryId: number, classId: number): Portable { - const factory = this.factories[factoryId]; - if (factory == null) { + const factoryFn = this.factories[factoryId]; + if (factoryFn == null) { throw new HazelcastSerializationError(`There is no suitable portable factory for ${factoryId}.`); } - const portable: Portable = factory.create(classId); + const portable: Portable = factoryFn(classId); if (portable == null) { throw new HazelcastSerializationError(`Could not create Portable for class-id: ${classId}`); } diff --git a/src/util/IndexUtil.ts b/src/util/IndexUtil.ts index 4d12fbdec..6dc915fd6 100644 --- a/src/util/IndexUtil.ts +++ b/src/util/IndexUtil.ts @@ -144,7 +144,7 @@ export class IndexUtil { newConfig.bitmapIndexOptions = new InternalBitmapIndexOptions(); newConfig.type = indexType; - let name = indexName == null ? mapName + '_' + this.getIndexTypeName(indexType) : null; + let name = indexName == null ? mapName + '_' + this.indexTypeToName(indexType) : null; for (const normalizedAttributeName of normalizedAttributeNames) { this.validateAttribute(indexName, normalizedAttributeName) newConfig.attributes.push(normalizedAttributeName); @@ -162,7 +162,7 @@ export class IndexUtil { return newConfig; } - private static getIndexTypeName(indexType: IndexType): string { + private static indexTypeToName(indexType: IndexType): string { switch (indexType) { case IndexType.SORTED: return 'sorted'; diff --git a/test/LoggingTest.js b/test/LoggingTest.js index bf33b8d3c..6c73dbcfb 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -22,7 +22,7 @@ const Controller = require('./RC'); const HazelcastClient = require('../.').Client; const LogLevel = require('../.').LogLevel; -describe('Logging Test', function () { +describe('LoggingTest', function () { let cluster, client; @@ -101,7 +101,7 @@ describe('Logging Test', function () { return HazelcastClient.newHazelcastClient({ clusterName: cluster.id, properties: { - 'hazelcast.logging.level': LogLevel.OFF + 'hazelcast.logging.level': 'OFF' } }).then(function (hz) { client = hz; @@ -122,7 +122,7 @@ describe('Logging Test', function () { return HazelcastClient.newHazelcastClient({ clusterName: cluster.id, properties: { - 'hazelcast.logging.level': LogLevel.INFO + 'hazelcast.logging.level': 'INFO' } }).then(function (hz) { client = hz; @@ -150,7 +150,7 @@ describe('Logging Test', function () { return HazelcastClient.newHazelcastClient({ clusterName: cluster.id, properties: { - 'hazelcast.logging.level': LogLevel.ERROR + 'hazelcast.logging.level': 'ERROR' } }).then(function (cl) { client = cl; @@ -162,7 +162,7 @@ describe('Logging Test', function () { return HazelcastClient.newHazelcastClient({ clusterName: cluster.id, properties: { - 'hazelcast.logging.level': LogLevel.TRACE + 'hazelcast.logging.level': 'TRACE' } }).then(function (cl) { client = cl; diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index e33efee0a..54f18190b 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -19,9 +19,9 @@ const HazelcastClient = require('../.').Client; const Controller = require('./RC'); const expect = require('chai').expect; const DeferredPromise = require('../lib/Util').DeferredPromise; -const MemberEvent = require('../lib/invocation/ClusterService').MemberEvent; +const MemberEvent = require('../lib/core/MembershipEvent').MemberEvent; -describe('MembershipListener', function () { +describe('MembershipListenerTest', function () { this.timeout(20000); let cluster, client; @@ -98,7 +98,6 @@ describe('MembershipListener', function () { }); it('if same listener is added twice, gets same event twice', function () { - let newMember; let counter = 0; const membershipListener = { @@ -110,7 +109,6 @@ describe('MembershipListener', function () { client.clusterService.addMembershipListener(membershipListener); return Controller.startMember(cluster.id).then(function (m) { - newMember = m; expect(counter).to.equal(2); }); }); diff --git a/config-schema.json b/test/config-schema.json similarity index 98% rename from config-schema.json rename to test/config-schema.json index a6c72ada8..1856184ef 100644 --- a/config-schema.json +++ b/test/config-schema.json @@ -1,6 +1,5 @@ { "$schema": "http://json-schema.org/schema#", - "id": "https://github.com/hazelcast/hazelcast-nodejs-client/blob/schema/config-schema.json", "title": "Hazelcast Node.js Client Configuration", "type": "object", "definitions": { diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 155df7bdb..d88b2c41f 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -30,20 +30,12 @@ describe('ConfigBuilderTest', function () { memberAdded: () => {}, memberRemoved: () => {} }; - const dataSerializableFactory = { - factoryId: 1, - create: () => {} - }; - const portableFactory = { - factoryId: 2, - create: () => {} - }; + const dataSerializableFactory = () => {}; + const portableFactory = () => {}; const customSerializer = { - getId: () => 3, - hzGetCustomId: () => 3 + id: 3 }; - customSerializer.typeId = 3; - const globalSerializer = () => {}; + const globalSerializer = {}; const customLoadBalancer = { initLoadBalancer: () => {}, next: () => {} @@ -142,7 +134,7 @@ describe('ConfigBuilderTest', function () { expect(properties['hazelcast.invalidation.reconciliation.interval.seconds']).equal(50); expect(properties['hazelcast.invalidation.max.tolerated.miss.count']).to.equal(15); expect(properties['hazelcast.invalidation.min.reconciliation.interval.seconds']).to.equal(60); - expect(properties['hazelcast.logging.level']).to.be.equal(3); + expect(properties['hazelcast.logging.level']).to.be.equal('OFF'); expect(properties['hazelcast.client.autopipelining.enabled']).to.be.false; expect(properties['hazelcast.client.autopipelining.threshold.bytes']).to.equal(1024); expect(properties['hazelcast.client.socket.no.delay']).to.be.false; diff --git a/test/config/SchemaValidationTest.js b/test/config/SchemaValidationTest.js index 74eb9a8e8..275bfe442 100644 --- a/test/config/SchemaValidationTest.js +++ b/test/config/SchemaValidationTest.js @@ -25,7 +25,7 @@ describe('SchemaValidationTest', function () { let schema; before(function () { - schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../config-schema.json'), 'utf8')); + schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../config-schema.json'), 'utf8')); }); function validateCandidate(candidate) { diff --git a/test/config/configurations/full.json b/test/config/configurations/full.json index afb0e2966..498e39a81 100644 --- a/test/config/configurations/full.json +++ b/test/config/configurations/full.json @@ -12,7 +12,7 @@ "hazelcast.invalidation.reconciliation.interval.seconds": 50, "hazelcast.invalidation.max.tolerated.miss.count": 15, "hazelcast.invalidation.min.reconciliation.interval.seconds": 60, - "hazelcast.logging.level": 3, + "hazelcast.logging.level": "OFF", "hazelcast.client.autopipelining.enabled": false, "hazelcast.client.autopipelining.threshold.bytes": 1024, "hazelcast.client.socket.no.delay": false, diff --git a/test/javaclasses/CustomComparator.js b/test/javaclasses/CustomComparator.js index 9eb02c6c7..3d267c106 100644 --- a/test/javaclasses/CustomComparator.js +++ b/test/javaclasses/CustomComparator.js @@ -27,16 +27,10 @@ const IterationType = require('../../lib/').IterationType; function CustomComparator(type, iterationType) { this.type = type; this.iterationType = iterationType; + this.factoryId = 66; + this.classId = 2; } -CustomComparator.prototype.getFactoryId = function () { - return 66; -}; - -CustomComparator.prototype.getClassId = function () { - return 2; -}; - CustomComparator.prototype.writeData = function (outp) { outp.writeInt(this.type); outp.writeInt(this.iterationType); diff --git a/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js index 7f6b59bb7..d23d4b700 100644 --- a/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js +++ b/test/javaclasses/DistortInvalidationMetadataEntryProcessor.js @@ -18,6 +18,8 @@ function DistortInvalidationMetadataEntryProcessor(mapName, mapSize, duration) { this.mapSize = mapSize; this.mapName = mapName; this.duration = duration; + this.factoryId = 66; + this.classId = 3; } DistortInvalidationMetadataEntryProcessor.prototype.readData = function (inp) { @@ -32,12 +34,4 @@ DistortInvalidationMetadataEntryProcessor.prototype.writeData = function (outp) outp.writeInt(this.duration); }; -DistortInvalidationMetadataEntryProcessor.prototype.getFactoryId = function () { - return 66; -}; - -DistortInvalidationMetadataEntryProcessor.prototype.getClassId = function () { - return 3; -}; - module.exports = DistortInvalidationMetadataEntryProcessor; diff --git a/test/javaclasses/IdentifiedEntryProcessor.js b/test/javaclasses/IdentifiedEntryProcessor.js index e2e6b75ca..5b141dc1c 100644 --- a/test/javaclasses/IdentifiedEntryProcessor.js +++ b/test/javaclasses/IdentifiedEntryProcessor.js @@ -16,6 +16,8 @@ function IdentifiedEntryProcessor(value) { this.value = value; + this.factoryId = 66; + this.classId = 1; } IdentifiedEntryProcessor.prototype.readData = function (inp) { @@ -26,12 +28,4 @@ IdentifiedEntryProcessor.prototype.writeData = function (outp) { outp.writeUTF(this.value); }; -IdentifiedEntryProcessor.prototype.getFactoryId = function () { - return 66; -}; - -IdentifiedEntryProcessor.prototype.getClassId = function () { - return 1; -}; - module.exports = IdentifiedEntryProcessor; diff --git a/test/javaclasses/IdentifiedFactory.js b/test/javaclasses/IdentifiedFactory.js index b37630c65..02d3d773e 100644 --- a/test/javaclasses/IdentifiedFactory.js +++ b/test/javaclasses/IdentifiedFactory.js @@ -20,19 +20,16 @@ const DistortInvalidationMetadataEntryProcessor = require('./DistortInvalidation const CustomComparator = require('./CustomComparator'); const PrefixFilter = require('./PrefixFilter'); -function IdentifiedFactory() { -} - -IdentifiedFactory.prototype.create = function (type) { - if (type === 1) { +function identifiedFactory(classId) { + if (classId === 1) { return new IdentifiedEntryProcessor(); - } else if (type === 2) { + } else if (classId === 2) { return new CustomComparator(); - } else if (type === 3) { + } else if (classId === 3) { return new DistortInvalidationMetadataEntryProcessor(); - } else if (type === 4) { + } else if (classId === 4) { return new PrefixFilter(); } -}; +} -module.exports = IdentifiedFactory; +module.exports = identifiedFactory; diff --git a/test/javaclasses/PrefixFilter.js b/test/javaclasses/PrefixFilter.js index 053ddae92..45a79667a 100644 --- a/test/javaclasses/PrefixFilter.js +++ b/test/javaclasses/PrefixFilter.js @@ -13,9 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; function PrefixFilter(prefix) { this.prefix = prefix; + this.factoryId = 66; + this.classId = 4; } PrefixFilter.prototype.readData = function (inp) { @@ -26,12 +29,4 @@ PrefixFilter.prototype.writeData = function (outp) { outp.writeUTF(this.prefix); }; -PrefixFilter.prototype.getFactoryId = function () { - return 66; -}; - -PrefixFilter.prototype.getClassId = function () { - return 4; -}; - module.exports = PrefixFilter; diff --git a/test/map/ComparatorFactory.js b/test/map/ComparatorFactory.js index cf0a5a8f8..629237db4 100644 --- a/test/map/ComparatorFactory.js +++ b/test/map/ComparatorFactory.js @@ -13,27 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; function noop() { - //NO-OP + // no-op } function ReverseValueComparator() { - //Empty + this.factoryId = 1; + this.classId = 1; } ReverseValueComparator.prototype.readData = noop; ReverseValueComparator.prototype.writeData = noop; -ReverseValueComparator.prototype.getFactoryId = function () { - return 1; -}; - -ReverseValueComparator.prototype.getClassId = function () { - return 1; -}; - ReverseValueComparator.prototype.sort = function (o1, o2) { return o2[1] - o1[1]; }; diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index ab58d05f5..450882cba 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -22,7 +22,7 @@ const RC = require('../RC'); const fs = require('fs'); const fillMap = require('../Util').fillMap; -const IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +const identifiedFactory = require('../javaclasses/IdentifiedFactory'); const IdentifiedEntryProcessor = require('../javaclasses/IdentifiedEntryProcessor'); describe('Entry Processor', function () { @@ -42,7 +42,7 @@ describe('Entry Processor', function () { clusterName: cluster.id, serialization: { dataSerializableFactories: { - 66: new IdentifiedFactory() + 66: identifiedFactory } } }); diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index 83e8aa690..567316082 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -20,7 +20,7 @@ const RC = require('../RC'); const expect = require('chai').expect; const Promise = require('bluebird'); -describe('Map Partition Aware', function () { +describe('MapPartitionAwareTest', function () { let cluster, client; const numOfEntries = 10000; @@ -34,10 +34,6 @@ describe('Map Partition Aware', function () { this.partitionKey = partitionKey; } - PartitionAwareKey.prototype.getPartitionKey = function () { - return this.partitionKey; - }; - function getLocalMapStats(serverInstance) { return 'function getLocalMapStats() {' + ' var map = instance_' + serverInstance + '.getMap("' + mapName + '");' + diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 2831b4505..3f9f70436 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -23,7 +23,7 @@ const fs = require('fs'); const RC = require('./../RC'); const HazelcastClient = require('../..').Client; const Predicates = require('../..').Predicates; -const IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +const identifiedFactory = require('../javaclasses/IdentifiedFactory'); const CustomComparator = require('../javaclasses/CustomComparator'); describe('MapPredicateTest', function () { @@ -48,7 +48,7 @@ describe('MapPredicateTest', function () { clusterName: cluster.id, serialization: { dataSerializableFactories: { - 66: new IdentifiedFactory() + 66: identifiedFactory } } }) diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index f70232fb5..af2f7e15d 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -21,7 +21,7 @@ const Promise = require('bluebird'); const RC = require('../RC'); const Client = require('../..').Client; -const IdentifiedFactory = require('../javaclasses/IdentifiedFactory'); +const identifiedFactory = require('../javaclasses/IdentifiedFactory'); const DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortInvalidationMetadataEntryProcessor'); describe('Invalidation metadata distortion', function () { @@ -56,7 +56,7 @@ describe('Invalidation metadata distortion', function () { serialization: { defaultNumberType: 'integer', dataSerializableFactories: { - 66: new IdentifiedFactory() + 66: identifiedFactory } } }; diff --git a/test/serialization/APortable.js b/test/serialization/APortable.js index 78305e714..20ff34c8c 100644 --- a/test/serialization/APortable.js +++ b/test/serialization/APortable.js @@ -56,15 +56,10 @@ function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, this.customByteArraySerializableObject = customByteArraySerializableObject; this.data = data; -} - -APortable.prototype.getClassId = function () { - return 1; -}; -APortable.prototype.getFactoryId = function () { - return 1; -}; + this.factoryId = 1; + this.classId = 1; +} APortable.prototype.readPortable = function (reader) { this.bool = reader.readBoolean("bool"); diff --git a/test/serialization/AnIdentifiedDataSerializable.js b/test/serialization/AnIdentifiedDataSerializable.js index baac24ebe..19ef6777e 100644 --- a/test/serialization/AnIdentifiedDataSerializable.js +++ b/test/serialization/AnIdentifiedDataSerializable.js @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, doubles, shorts, floats, ints, longs, strings, portable, @@ -54,15 +55,10 @@ function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, this.customStreamSerializableObject = customStreamSerializable; this.customByteArraySerializableObject = customByteArraySerializableObject; this.data = data; -} - -AnIdentifiedDataSerializable.prototype.getFactoryId = function () { - return 1; -}; -AnIdentifiedDataSerializable.prototype.getClassId = function () { - return 1; -}; + this.factoryId = 1; + this.classId = 1; +} AnIdentifiedDataSerializable.prototype.readData = function (dataInput) { this.bool = dataInput.readBoolean(); diff --git a/test/serialization/AnInnerPortable.js b/test/serialization/AnInnerPortable.js index 8c7cf93ae..bccb2a108 100644 --- a/test/serialization/AnInnerPortable.js +++ b/test/serialization/AnInnerPortable.js @@ -17,23 +17,20 @@ function AnInnerPortable(anInt, aFloat) { this.anInt = anInt; this.aFloat = aFloat; + this.factoryId = 1; + this.classId = 2; } -AnInnerPortable.prototype.getFactoryId = function () { - return 1; -}; - -AnInnerPortable.prototype.getClassId = function () { - return 2; -}; AnInnerPortable.prototype.writePortable = function (writer) { writer.writeInt('i', this.anInt); writer.writeFloat('f', this.aFloat); }; + AnInnerPortable.prototype.readPortable = function (reader) { this.anInt = reader.readInt('i'); this.aFloat = reader.readFloat('f'); }; + AnInnerPortable.prototype.equals = function (other) { if (other === this) return true; @@ -43,4 +40,5 @@ AnInnerPortable.prototype.equals = function (other) { return false; return true; } + module.exports = AnInnerPortable; diff --git a/test/serialization/BinaryCompatibilityTest.js b/test/serialization/BinaryCompatibilityTest.js index b7bcc0622..c71a6b697 100644 --- a/test/serialization/BinaryCompatibilityTest.js +++ b/test/serialization/BinaryCompatibilityTest.js @@ -70,30 +70,23 @@ describe('BinaryCompatibilityTest', function () { function createSerializationService(isBigEndian, defaultNumberType) { const cfg = new SerializationConfigImpl(); - cfg.portableFactories[ReferenceObjects.PORTABLE_FACTORY_ID] = { - create: function (classId) { + cfg.portableFactories[ReferenceObjects.PORTABLE_FACTORY_ID] = + (classId) => { if (classId === ReferenceObjects.INNER_PORTABLE_CLASS_ID) { return new AnInnerPortable(); } else if (classId === ReferenceObjects.PORTABLE_CLASS_ID) { return new APortable(); } - } - }; - cfg.dataSerializableFactories[ReferenceObjects.IDENTIFIED_DATA_SERIALIZABLE_FACTORY_ID] = { - create: function (type) { - if (type === ReferenceObjects.IDENTIFIED_DATA_SERIALIZABLE_CLASS_ID) { + }; + cfg.dataSerializableFactories[ReferenceObjects.IDENTIFIED_DATA_SERIALIZABLE_FACTORY_ID] = + (classId) => { + if (classId === ReferenceObjects.IDENTIFIED_DATA_SERIALIZABLE_CLASS_ID) { return new AnIdentifiedDataSerializable(); } - } - }; + }; cfg.customSerializers = [ { - getId: function () { - return ReferenceObjects.CUSTOM_BYTE_ARRAY_SERIALIZABLE_ID; - }, - hzGetCustomId: function () { - return ReferenceObjects.CUSTOM_BYTE_ARRAY_SERIALIZABLE_ID; - }, + id: ReferenceObjects.CUSTOM_BYTE_ARRAY_SERIALIZABLE_ID, write: function (out, object) { out.writeInt(8); out.writeInt(object.i); @@ -107,12 +100,7 @@ describe('BinaryCompatibilityTest', function () { } }, { - getId: function () { - return ReferenceObjects.CUSTOM_STREAM_SERIALIZABLE_ID; - }, - hzGetCustomId: function () { - return ReferenceObjects.CUSTOM_STREAM_SERIALIZABLE_ID; - }, + id: ReferenceObjects.CUSTOM_STREAM_SERIALIZABLE_ID, write: function (out, object) { out.writeInt(object.int); out.writeFloat(object.float); diff --git a/test/serialization/CustomSerializerTest.js b/test/serialization/CustomSerializerTest.js index 3de1591a9..ecda1c444 100644 --- a/test/serialization/CustomSerializerTest.js +++ b/test/serialization/CustomSerializerTest.js @@ -26,10 +26,7 @@ describe('CustomSerializerTest', function () { class CustomObject { constructor(surname) { this.surname = surname; - } - - hzGetCustomId() { - return 10; + this.hzCustomId = 10; } } @@ -37,9 +34,7 @@ describe('CustomSerializerTest', function () { const cfg = new SerializationConfigImpl(); cfg.customSerializers = [ { - getId: function () { - return 10; - }, + id: 10, write: function (out, emp) { out.writeUTF(emp.surname); }, diff --git a/test/serialization/GlobalSerializerTest.js b/test/serialization/GlobalSerializerTest.js index 21655d610..2593bcc0e 100644 --- a/test/serialization/GlobalSerializerTest.js +++ b/test/serialization/GlobalSerializerTest.js @@ -30,9 +30,7 @@ describe('GlobalSerializerTest', function () { before(function () { const cfg = new SerializationConfigImpl(); cfg.globalSerializer = { - getId: function () { - return 10; - }, + id: 10, write: function (out, emp) { out.writeUTF(emp.surname); }, diff --git a/test/serialization/IdentifiedDataSerializableTest.js b/test/serialization/IdentifiedDataSerializableTest.js index 6b7ee6e1a..8f93b65ee 100644 --- a/test/serialization/IdentifiedDataSerializableTest.js +++ b/test/serialization/IdentifiedDataSerializableTest.js @@ -42,6 +42,9 @@ describe('IdentifiedDataSerializableTest', function () { this.floats = floats; this.doubles = doubles; this.strings = strings; + + this.factoryId = 1; + this.classId = 1; }; IdentifiedDataClass.prototype.readData = function (inp) { @@ -88,19 +91,9 @@ describe('IdentifiedDataSerializableTest', function () { outp.writeUTFArray(this.strings); }; - IdentifiedDataClass.prototype.getFactoryId = function () { - return 1; - }; - - IdentifiedDataClass.prototype.getClassId = function () { - return 1; - }; - - const identifiedFactory = { - create: function (type) { - if (type === 1) { - return new IdentifiedDataClass(); - } + const identifiedFactory = (classId) => { + if (classId === 1) { + return new IdentifiedDataClass(); } }; diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index 9851145af..fc6fef132 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -13,6 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +'use strict'; + +function InnerPortable(p1, p2) { + this.p1 = p1; + this.p2 = p2; + this.factoryId = 10; + this.classId = 222; +} + +InnerPortable.prototype.readPortable = function (reader) { + this.p1 = reader.readUTF('p1'); + this.p2 = reader.readUTF('p2'); +}; + +InnerPortable.prototype.writePortable = function (writer) { + writer.writeUTF('p1', this.p1); + writer.writeUTF('p2', this.p2); +}; function PortableObject( a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, a_portable, @@ -39,14 +57,10 @@ function PortableObject( this.doubles = doubles; this.strings = strings; this.portables = portables; + this.factoryId = 10; + this.classId = 111; } -PortableObject.prototype.getFactoryId = function () { - return 10; -}; -PortableObject.prototype.getClassId = function () { - return 111; -}; PortableObject.prototype.writePortable = function (writer) { writer.writeByte('a_byte', this.a_byte); writer.writeBoolean('a_boolean', this.a_boolean); @@ -58,9 +72,8 @@ PortableObject.prototype.writePortable = function (writer) { writer.writeDouble('a_double', this.a_double); writer.writeUTF('a_string', this.a_string); writer.writePortable('a_portable', this.a_portable); - writer.writeNullPortable( - 'a_null_portable', InnerPortableObject.prototype.getFactoryId.call(null), - InnerPortableObject.prototype.getClassId.call(null)); + const tmpInnerObj = new InnerPortable(); + writer.writeNullPortable('a_null_portable', tmpInnerObj.factoryId, tmpInnerObj.classId); writer.writeByteArray('bytes', this.bytes); writer.writeBooleanArray('booleans', this.booleans); @@ -73,6 +86,7 @@ PortableObject.prototype.writePortable = function (writer) { writer.writeUTFArray('strings', this.strings); writer.writePortableArray('portables', this.portables); }; + PortableObject.prototype.readPortable = function (reader) { this.a_byte = reader.readByte('a_byte'); this.a_boolean = reader.readBoolean('a_boolean'); @@ -98,29 +112,6 @@ PortableObject.prototype.readPortable = function (reader) { this.portables = reader.readPortableArray('portables'); }; -function InnerPortableObject(p1, p2) { - this.p1 = p1; - this.p2 = p2; -} - -InnerPortableObject.prototype.getFactoryId = function () { - return 10; -}; - -InnerPortableObject.prototype.getClassId = function () { - return 222; -}; - -InnerPortableObject.prototype.readPortable = function (reader) { - this.p1 = reader.readUTF('p1'); - this.p2 = reader.readUTF('p2'); -}; - -InnerPortableObject.prototype.writePortable = function (writer) { - writer.writeUTF('p1', this.p1); - writer.writeUTF('p2', this.p2); -}; - function PortableObjectV2( a_new_prop, a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_portable, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables @@ -147,19 +138,11 @@ function PortableObjectV2( this.doubles = doubles; this.strings = strings; this.portables = portables; -} - -PortableObjectV2.prototype.getVersion = function () { - return 2; -}; -PortableObjectV2.prototype.getFactoryId = function () { - return 10; -}; - -PortableObjectV2.prototype.getClassId = function () { - return 111; -}; + this.factoryId = 10; + this.classId = 111; + this.version = 2; +} PortableObjectV2.prototype.writePortable = function (writer) { writer.writeUTF('a_new_prop', this.a_new_prop); @@ -172,7 +155,8 @@ PortableObjectV2.prototype.writePortable = function (writer) { writer.writeDouble('a_float', this.a_float); //Floats are Double writer.writeDouble('a_double', this.a_double); writer.writePortable('a_portable', this.a_portable); - writer.writeNullPortable('a_null_portable', InnerPortableObject.prototype.getFactoryId.call(null), InnerPortableObject.prototype.getClassId.call(null)); + const tmpInnerObj = new InnerPortable(); + writer.writeNullPortable('a_null_portable', tmpInnerObj.factoryId, tmpInnerObj.classId); writer.writeByteArray('bytes', this.bytes); writer.writeBooleanArray('booleans', this.booleans); @@ -185,6 +169,7 @@ PortableObjectV2.prototype.writePortable = function (writer) { writer.writeUTFArray('strings', this.strings); writer.writePortableArray('portables', this.portables); }; + PortableObjectV2.prototype.readPortable = function (reader) { this.a_new_prop = reader.readUTF('a_new_prop'); this.a_byte = reader.readByte('a_byte'); @@ -212,16 +197,10 @@ PortableObjectV2.prototype.readPortable = function (reader) { function SimplePortable(str) { this.aString = str; + this.factoryId = 10; + this.classId = 21; } -SimplePortable.prototype.getFactoryId = function () { - return 10; -}; - -SimplePortable.prototype.getClassId = function () { - return 21; -}; - SimplePortable.prototype.readPortable = function (reader) { this.aString = reader.readUTF('aString'); }; @@ -232,16 +211,11 @@ SimplePortable.prototype.writePortable = function (writer) { function SimplePortableV3(innerObject) { this.innerObject = innerObject; + this.factoryId = 10; + this.classId = 21; + this.version = 3; } -SimplePortableV3.prototype.getFactoryId = function () { - return 10; -}; - -SimplePortableV3.prototype.getClassId = function () { - return 21; -}; - SimplePortableV3.prototype.readPortable = function (reader) { this.innerObject = reader.readPortable('innerObject'); }; @@ -250,22 +224,12 @@ SimplePortableV3.prototype.writePortable = function (writer) { writer.writePortable('innerObject', this.innerObject); }; -SimplePortableV3.prototype.getVersion = function () { - return 3; -}; - function Parent(child) { this.child = child; + this.factoryId = 1; + this.classId = 1; } -Parent.prototype.getFactoryId = function () { - return 1; -}; - -Parent.prototype.getClassId = function () { - return 1; -}; - Parent.prototype.writePortable = function (writer) { writer.writePortable('child', this.child); }; @@ -276,16 +240,10 @@ Parent.prototype.readPortable = function (reader) { function Child(name) { this.name = name; + this.factoryId = 1; + this.classId = 2; } -Child.prototype.getFactoryId = function () { - return 1; -}; - -Child.prototype.getClassId = function () { - return 2; -}; - Child.prototype.writePortable = function (writer) { writer.writeUTF('name', this.name); }; @@ -294,12 +252,10 @@ Child.prototype.readPortable = function (reader) { this.name = reader.readUTF('name'); }; - exports.PortableObject = PortableObject; exports.PortableObjectV2 = PortableObjectV2; -exports.InnerPortableObject = InnerPortableObject; +exports.InnerPortable = InnerPortable; exports.SimplePortable = SimplePortable; exports.SimplePortableV3 = SimplePortableV3; exports.Parent = Parent; exports.Child = Child; - diff --git a/test/serialization/PortableSerializationTest.js b/test/serialization/PortableSerializationTest.js index 34688614b..f0dbde7b1 100644 --- a/test/serialization/PortableSerializationTest.js +++ b/test/serialization/PortableSerializationTest.js @@ -22,22 +22,20 @@ const Util = require('../Util'); const PortableObject = require('./PortableObjects').PortableObject; const PortableObjectV2 = require('./PortableObjects').PortableObjectV2; -const InnerPortableObject = require('./PortableObjects').InnerPortableObject; +const InnerPortable = require('./PortableObjects').InnerPortable; const SimplePortableV3 = require('./PortableObjects').SimplePortableV3; describe('PortableSerializationTest', function () { function createSerializationService(Ctor) { const cfg = new SerializationConfigImpl(); - cfg.portableFactories[10] = { - create: function (classId) { - if (classId === 111) { - return new Ctor(); - } else if (classId === 222) { - return new InnerPortableObject(); - } else if (classId === 21) { - return new SimplePortableV3(); - } + cfg.portableFactories[10] = (classId) => { + if (classId === 111) { + return new Ctor(); + } else if (classId === 222) { + return new InnerPortable(); + } else if (classId === 21) { + return new SimplePortableV3(); } }; return new SerializationServiceV1(cfg); @@ -47,10 +45,10 @@ describe('PortableSerializationTest', function () { const service = createSerializationService(PortableObject); const emp = new PortableObject( 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + 'hazelcast', new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + [new InnerPortable('elma', 'armut'), new InnerPortable('masa', 'sandalye')] ); const serialized = service.toData(emp); @@ -64,12 +62,12 @@ describe('PortableSerializationTest', function () { const emp = new PortableObjectV2( 'a_new_value', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + [new InnerPortable('elma', 'armut'), new InnerPortable('masa', 'sandalye')] ); const serialized = service.toData(emp); @@ -84,21 +82,21 @@ describe('PortableSerializationTest', function () { const empv1 = new PortableObject( 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + 'hazelcast', new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + [new InnerPortable('elma', 'armut'), new InnerPortable('masa', 'sandalye')] ); const empv2 = new PortableObjectV2( undefined, 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + [new InnerPortable('elma', 'armut'), new InnerPortable('masa', 'sandalye')] ); const serialized = oldService.toData(empv1); @@ -112,12 +110,12 @@ describe('PortableSerializationTest', function () { const innerPortableV2 = new PortableObjectV2( 'propstring', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortableObject('a', 'b'), [99, 100, 101], [true, false, false, true], + new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], - [new InnerPortableObject('elma', 'armut'), new InnerPortableObject('masa', 'sandalye')] + [new InnerPortable('elma', 'armut'), new InnerPortable('masa', 'sandalye')] ); const portableV3 = new SimplePortableV3(innerPortableV2); diff --git a/test/serialization/PortableSerializersLiveTest.js b/test/serialization/PortableSerializersLiveTest.js index 04c3e0be8..5dfc17a82 100644 --- a/test/serialization/PortableSerializersLiveTest.js +++ b/test/serialization/PortableSerializersLiveTest.js @@ -21,7 +21,7 @@ const Promise = require('bluebird'); const Client = require('../../.').Client; const RC = require('../RC'); const SimplePortable = require('./PortableObjects').SimplePortable; -const InnerPortable = require('./PortableObjects').InnerPortableObject; +const InnerPortable = require('./PortableObjects').InnerPortable; describe('PortableSerializersLiveTest', function () { @@ -33,15 +33,13 @@ describe('PortableSerializersLiveTest', function () { clusterName, serialization: { portableFactories: { - 10: { - create: function (classId) { - if (classId === 222) { - return new InnerPortable(); - } else if (classId === 21) { - return new SimplePortable(); - } else { - return null; - } + 10: (classId) => { + if (classId === 222) { + return new InnerPortable(); + } else if (classId === 21) { + return new SimplePortable(); + } else { + return null; } } } diff --git a/test/serialization/SerializationServiceTest.js b/test/serialization/SerializationServiceTest.js index c5038e48e..1babede6d 100644 --- a/test/serialization/SerializationServiceTest.js +++ b/test/serialization/SerializationServiceTest.js @@ -19,61 +19,10 @@ const expect = require('chai').expect; const SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; -describe('SerializationServiceTest', function () { - - it('should use data serializable factory', function () { - const serializationConfig = new SerializationConfigImpl(); - serializationConfig.dataSerializableFactories[1] = new IDataSerializableFactory(); - - const serializationService = new SerializationService(serializationConfig); - - const data = serializationService.toData(new IDataSerializable(3)); - const object = serializationService.toObject(data); - - expect(object.val).to.equal(3); - }); - - it('should use portable factory', function () { - const serializationConfig = new SerializationConfigImpl(); - serializationConfig.portableFactories[2] = new PortableFactory(); - - const serializationService = new SerializationService(serializationConfig); - - const data = serializationService.toData(new Portable(3)); - const object = serializationService.toObject(data); - - expect(object.val).to.equal(3); - }); - - it('should use custom serializer', function () { - const serializationConfig = new SerializationConfigImpl(); - serializationConfig.customSerializers.push(new CustomSerializer()); - - const serializationService = new SerializationService(serializationConfig); - - const data = serializationService.toData(new CustomObject(3)); - const object = serializationService.toObject(data); - - expect(object.val).to.equal(3); - expect(object.self).to.equal(object); - }); - - it('should use global serializer', function () { - const serializationConfig = new SerializationConfigImpl(); - serializationConfig.globalSerializer = new GlobalSerializer(); - - const serializationService = new SerializationService(serializationConfig); - - const data = serializationService.toData(new AnyObject(3)); - const object = serializationService.toObject(data); - - expect(object.val).to.equal(3); - expect(object.self).to.equal(object); - }); -}); - function IDataSerializable(val) { this.val = val; + this.factoryId = 1; + this.classId = 11; } IDataSerializable.prototype.readData = function (input) { @@ -84,35 +33,18 @@ IDataSerializable.prototype.writeData = function (output) { output.writeInt(this.val); }; -IDataSerializable.prototype.getClassId = function () { - return 11; -}; - -IDataSerializable.prototype.getFactoryId = function () { - return 1; -}; - -function IDataSerializableFactory() { -} - -IDataSerializableFactory.prototype.create = function (type) { - if (type === 11) { +function idataSerializableFactory(classId) { + if (classId === 11) { return new IDataSerializable(); } -}; +} function Portable(val) { this.val = val; + this.factoryId = 2; + this.classId = 22; } -Portable.prototype.getClassId = function () { - return 22; -}; - -Portable.prototype.getFactoryId = function () { - return 2; -}; - Portable.prototype.readPortable = function (reader) { this.val = reader.readInt('val'); }; @@ -121,14 +53,11 @@ Portable.prototype.writePortable = function (writer) { writer.writeInt('val', this.val); }; -function PortableFactory() { -} - -PortableFactory.prototype.create = function (classId) { +function portableFactory(classId) { if (classId === 22) { return new Portable(); } -}; +} function AnyObject(val) { this.val = val; @@ -139,9 +68,7 @@ function AnyObject(val) { function GlobalSerializer() { } -GlobalSerializer.prototype.getId = function () { - return 33; -}; +GlobalSerializer.prototype.id = 33; GlobalSerializer.prototype.read = function (inp) { const obj = new AnyObject(); @@ -155,20 +82,15 @@ GlobalSerializer.prototype.write = function (outp, obj) { function CustomObject(val) { this.val = val; + this.hzCustomId = 44; // Put a reference to self so json serializer cannot be used. Make sure global serializer is used in test. this.self = this; } -CustomObject.prototype.hzGetCustomId = function () { - return 44; -}; - function CustomSerializer() { } -CustomSerializer.prototype.getId = function () { - return 44; -}; +CustomSerializer.prototype.id = 44; CustomSerializer.prototype.read = function (reader) { const obj = new CustomObject(); @@ -180,7 +102,55 @@ CustomSerializer.prototype.write = function (writer, obj) { writer.writeInt(obj.val); }; -exports.IDataSerializableFactory = IDataSerializableFactory; -exports.PortableFactory = PortableFactory; -exports.GlobalSerializer = GlobalSerializer; -exports.CustomSerializer = CustomSerializer; +describe('SerializationServiceTest', function () { + + it('should use data serializable factory', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.dataSerializableFactories[1] = idataSerializableFactory; + + const serializationService = new SerializationService(serializationConfig); + + const data = serializationService.toData(new IDataSerializable(3)); + const object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + }); + + it('should use portable factory', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.portableFactories[2] = portableFactory; + + const serializationService = new SerializationService(serializationConfig); + + const data = serializationService.toData(new Portable(3)); + const object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + }); + + it('should use custom serializer', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.customSerializers.push(new CustomSerializer()); + + const serializationService = new SerializationService(serializationConfig); + + const data = serializationService.toData(new CustomObject(3)); + const object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + expect(object.self).to.equal(object); + }); + + it('should use global serializer', function () { + const serializationConfig = new SerializationConfigImpl(); + serializationConfig.globalSerializer = new GlobalSerializer(); + + const serializationService = new SerializationService(serializationConfig); + + const data = serializationService.toData(new AnyObject(3)); + const object = serializationService.toObject(data); + + expect(object.val).to.equal(3); + expect(object.self).to.equal(object); + }); +}); diff --git a/test/serialization/config/Address.js b/test/serialization/config/Address.js index a2b139666..6b643e034 100644 --- a/test/serialization/config/Address.js +++ b/test/serialization/config/Address.js @@ -20,16 +20,10 @@ function Address(street, zipCode, city, state) { this.zipCode = zipCode; this.city = city; this.state = state; + this.factoryId = 1; + this.classId = 1; } -Address.prototype.getClassId = function () { - return 1; -}; - -Address.prototype.getFactoryId = function () { - return 1; -}; - Address.prototype.writeData = function (objectDataOutput) { objectDataOutput.writeUTF(this.street); objectDataOutput.writeInt(this.zipCode); @@ -44,14 +38,11 @@ Address.prototype.readData = function (objectDataInput) { this.state = objectDataInput.readUTF(); }; -function MyIdentifiedFactory() { -} - -MyIdentifiedFactory.prototype.create = function (type) { - if (type === 1) { +function myIdentifiedFactory(classId) { + if (classId === 1) { return new Address(); } } -exports.MyIdentifiedFactory = MyIdentifiedFactory; +exports.myIdentifiedFactory = myIdentifiedFactory; exports.Address = Address; diff --git a/test/serialization/config/CustomSerializerConfigTest.js b/test/serialization/config/CustomSerializerConfigTest.js index 2d80944e7..78f62ddb3 100644 --- a/test/serialization/config/CustomSerializerConfigTest.js +++ b/test/serialization/config/CustomSerializerConfigTest.js @@ -51,7 +51,7 @@ describe('CustomSerializerConfigTest', function () { return Client.newHazelcastClient(createConfig(cluster.id)) .then(function (cl) { client = cl; - expect(client.getSerializationService().findSerializerFor(musician).getId()).to.be.equal(10); + expect(client.getSerializationService().findSerializerFor(musician).id).to.be.equal(10); let map; return client.getMap('musicians').then(function (mp) { map = mp; diff --git a/test/serialization/config/FactoriesTest.js b/test/serialization/config/FactoriesTest.js index 89edec495..752f997c5 100644 --- a/test/serialization/config/FactoriesTest.js +++ b/test/serialization/config/FactoriesTest.js @@ -18,8 +18,8 @@ const expect = require('chai').expect; const RC = require('../../RC'); const Client = require('../../../').Client; -const { MyPortableFactory, Foo } = require('./Foo'); -const { MyIdentifiedFactory, Address } = require('./Address'); +const { myPortableFactory, Foo } = require('./Foo'); +const { myIdentifiedFactory, Address } = require('./Address'); describe('FactoriesTest', function () { @@ -48,10 +48,10 @@ describe('FactoriesTest', function () { clusterName, serialization: { dataSerializableFactories: { - 1: new MyIdentifiedFactory() + 1: myIdentifiedFactory }, portableFactories: { - 1: new MyPortableFactory() + 1: myPortableFactory } } }; diff --git a/test/serialization/config/Foo.js b/test/serialization/config/Foo.js index 2d63940f2..54b9a5647 100644 --- a/test/serialization/config/Foo.js +++ b/test/serialization/config/Foo.js @@ -17,14 +17,8 @@ function Foo(foo) { this.foo = foo; -} - -Foo.prototype.getClassId = function () { - return 1; -} - -Foo.prototype.getFactoryId = function () { - return 1; + this.factoryId = 1; + this.classId = 1; } Foo.prototype.writePortable = function (portableWriter) { @@ -35,14 +29,11 @@ Foo.prototype.readPortable = function (portableReader) { this.foo = portableReader.readUTF('foo'); } -function MyPortableFactory() { -} - -MyPortableFactory.prototype.create = function (type) { +function myPortableFactory(type) { if (type === 1) { return new Foo(); } } -exports.MyPortableFactory = MyPortableFactory; +exports.myPortableFactory = myPortableFactory; exports.Foo = Foo; diff --git a/test/serialization/config/Musician.js b/test/serialization/config/Musician.js index a81cc2a1c..ea48c3dff 100644 --- a/test/serialization/config/Musician.js +++ b/test/serialization/config/Musician.js @@ -17,18 +17,13 @@ function Musician(name) { this.name = name; + this.hzCustomId = 10; } -Musician.prototype.hzGetCustomId = function () { - return 10; -}; - function MusicianSerializer() { } -MusicianSerializer.prototype.getId = function () { - return 10; -} +MusicianSerializer.prototype.id = 10; MusicianSerializer.prototype.write = function (objectDataOutput, object) { objectDataOutput.writeInt(object.name.length); diff --git a/test/serialization/portable/NestedPortableVersionTest.js b/test/serialization/portable/NestedPortableVersionTest.js index bc3ab3280..b71149385 100644 --- a/test/serialization/portable/NestedPortableVersionTest.js +++ b/test/serialization/portable/NestedPortableVersionTest.js @@ -26,15 +26,13 @@ describe('NestedPortableVersionTest', function () { it('compatible versions', function () { const sc = new SerializationConfigImpl(); sc.portableVersion = 6; - sc.portableFactories[1] = { - create: function (classId) { - if (classId === 1) { - return new Parent(); - } else if (classId === 2) { - return new Child(); - } - return null; + sc.portableFactories[1] = (classId) => { + if (classId === 1) { + return new Parent(); + } else if (classId === 2) { + return new Child(); } + return null; }; const ss1 = new SerializationServiceV1(sc); diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index 9388ec385..54f4a1e0b 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -62,7 +62,7 @@ function extractIntStatValue(stats, statName) { return Number.parseInt(extractStringStatValue(stats, statName)); } -describe('Statistics with default period', function () { +describe('StatisticsTest (default period)', function () { let cluster; let client; @@ -174,7 +174,7 @@ describe('Statistics with default period', function () { }); }); -describe('Statistics with non-default period', function () { +describe('StatisticsTest (non-default period)', function () { let cluster; let client; @@ -229,7 +229,7 @@ describe('Statistics with non-default period', function () { }); }); -describe('Statistics with negative period', function () { +describe('StatisticsTest (negative period)', function () { let client; let cluster; From 441d84166582f6d57a7e5a25642ffb1030952401 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 11 Aug 2020 16:08:29 +0300 Subject: [PATCH 275/685] Fix ReliableTopic implementation (#567) Includes the following: * Remove StaleSequenceError handling from ReliableTopicListenerRunner in favor of message loss detection * Add internal error handling into ReliableTopicListenerRunner * Rename test scripts for Reliable Topic and Ringbuffer * Migrate tests for Reliable Topic and Ringbuffer to async/await syntax * Add new tests for Reliable Topic and Ringbuffer --- src/invocation/InvocationService.ts | 15 +- src/proxy/Ringbuffer.ts | 122 +++++++------ src/proxy/ringbuffer/LazyReadResultSet.ts | 17 +- src/proxy/ringbuffer/ReadResultSet.ts | 41 ++++- src/proxy/ringbuffer/RingbufferProxy.ts | 19 ++- .../topic/ReliableTopicListenerRunner.ts | 86 ++++++---- test/ringbuffer/LazyReadResultSetTest.js | 18 +- test/ringbuffer/RingbufferProxyTest.js | 160 ++++++++++++++++++ test/ringbuffer/RingbufferTest.js | 144 ---------------- .../{TopicTest.js => ReliableTopicTest.js} | 156 +++++++---------- 10 files changed, 414 insertions(+), 364 deletions(-) create mode 100644 test/ringbuffer/RingbufferProxyTest.js delete mode 100644 test/ringbuffer/RingbufferTest.js rename test/topic/{TopicTest.js => ReliableTopicTest.js} (52%) diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index ad218ff00..60d2176b7 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -112,8 +112,8 @@ export class Invocation { } if (this.uuid != null && err instanceof TargetNotMemberError) { - // when invocation send to a specific member - // if target is no longer a member, we should not retry + // when invocation is sent to a specific member + // and target is no longer a member, we should not retry // note that this exception could come from the server return false; } @@ -136,12 +136,12 @@ export class Invocation { * Sends requests to appropriate nodes. Resolves waiting promises with responses. */ export class InvocationService { + doInvoke: (invocation: Invocation) => void; private correlationCounter = 1; private eventHandlers: { [id: number]: Invocation } = {}; private pending: { [id: number]: Invocation } = {}; private client: HazelcastClient; - private smartRoutingEnabled: boolean; private readonly invocationRetryPauseMillis: number; private readonly invocationTimeoutMillis: number; private logger: ILogger; @@ -154,7 +154,6 @@ export class InvocationService { this.connectionManager = hazelcastClient.getConnectionManager(); this.partitionService = hazelcastClient.getPartitionService(); this.logger = this.client.getLoggingService().getLogger(); - this.smartRoutingEnabled = hazelcastClient.getConfig().network.smartRouting; if (hazelcastClient.getConfig().network.smartRouting) { this.doInvoke = this.invokeSmart; } else { @@ -391,7 +390,9 @@ export class InvocationService { } /** - * Determines if an error is retryable. The given invocation is rejected with approprate error if the error is not retryable. + * Determines if an error is retryable. The given invocation is rejected with + * appropriate error if the error is not retryable. + * * @param invocation * @param error * @returns `true` if invocation is rejected, `false` otherwise @@ -409,8 +410,8 @@ export class InvocationService { if (invocation.deadline < Date.now()) { this.logger.trace('InvocationService', 'Error will not be retried because invocation timed out'); - invocation.deferred.reject(new InvocationTimeoutError('Invocation ' + invocation.request.getCorrelationId() + ')' - + ' reached its deadline.', error)); + invocation.deferred.reject(new InvocationTimeoutError('Invocation ' + + invocation.request.getCorrelationId() + ') reached its deadline.', error)); return true; } } diff --git a/src/proxy/Ringbuffer.ts b/src/proxy/Ringbuffer.ts index 63af00217..63e5dbca9 100644 --- a/src/proxy/Ringbuffer.ts +++ b/src/proxy/Ringbuffer.ts @@ -23,37 +23,41 @@ import {ReadResultSet} from './ringbuffer/ReadResultSet'; export interface Ringbuffer extends DistributedObject { /** - * @return capacity of this ringbuffer. + * @return capacity of this Ringbuffer */ capacity(): Promise; /** - * Returns the number of the items in this ringbuffer. + * Returns the number of the items in this Ringbuffer. * - * If time-to-live was NOT configured for this ringbuffer, - * the size will always be equal to the capacity after the first loop is completed - * around the ring. This is because no items are getting removed and are overwritten instead. + * If time-to-live was not configured for this ringbuffer, the size will + * always be equal to the capacity after the first loop is completed around + * the ring. This is because no items are getting removed and are + * overwritten instead. * - * @return size of this ringbuffer. + * @return size of this Ringbuffer */ size(): Promise; /** - * Returns the tail sequence. The tail is the side of the ringbuffer at which the items are added. + * Returns the tail sequence. The tail is the side of the Ringbuffer + * at which the items are added. * - * The initial value of the tail sequence is -1. + * The initial value of the tail sequence is `-1`. * - * @return tail sequence of this ringbuffer. + * @return tail sequence of this Ringbuffer */ tailSequence(): Promise; /** - * Returns the head sequence. The head is the side of the ringbuffer where the oldest items are found. + * Returns the head sequence. The head is the side of the ringbuffer + * where the oldest items are found. * * If the ringbuffer is empty, the head will be one more than the tail. * - * The initial value of the head is 0. - * @return head sequence of this ringbuffer. + * The initial value of the head is `0`. + * + * @return head sequence of this Ringbuffer */ headSequence(): Promise; @@ -64,32 +68,38 @@ export interface Ringbuffer extends DistributedObject { * * If the time-to-live was NOT set in the configuration, * the remaining capacity will always be equal to the capacity. - * @return remaining capacity of this ringbuffer. + * + * @return remaining capacity of this Ringbuffer */ remainingCapacity(): Promise; /** - * Adds an item to the tail of this ringbuffer. Overflow policy determines what will happen - * if there is no space left in this ringbuffer. If `OVERWRITE` was passed, - * the new item will overwrite the oldest one regardless of the configured time-to-live. + * Adds an item to the tail of this Ringbuffer. Overflow policy determines + * what will happen if there is no space left in this ringbuffer. + * If `OVERWRITE` was passed, the new item will overwrite the oldest one + * regardless of the configured time-to-live. * - * In the case when `FAIL` was specified the add operation will keep failing until an oldest item in this - * ringbuffer will reach its time-to-live. + * In the case when `FAIL` was specified the add operation will keep failing + * until an oldest item in this Ringbuffer will reach its time-to-live. * - * The returned value is the sequence number of the added item. You can read the added item using this number. + * The returned value is the sequence number of the added item. You can + * read the added item using this number. * - * @param item the item to add. - * @param overflowPolicy overflow policy to be used. - * @return the sequence of the added item or -1 if the insert did not succeed. + * @param item the item to add + * @param overflowPolicy overflow policy to be used + * @return the sequence of the added item or `-1` if the insert did not succeed */ add(item: E, overflowPolicy?: OverflowPolicy): Promise; /** - * Adds all items in the specified array to the tail of this buffer. The behavior of this method is essentially - * the same as the one of the `add` method. + * Adds all items in the specified array to the tail of this Ringbuffer. + * The behavior of this method is essentially the same as the one of + * the `add` method. + * + * The method does not guarantee that the inserted items will have + * contiguous sequence numbers. * - * The method does not guarantee that the inserted items will have contiguous sequence numbers. * @param items items to be added * @param overflowPolicy overflow policy to be used * @return the sequence number of the last written item from the specified array @@ -97,44 +107,52 @@ export interface Ringbuffer extends DistributedObject { addAll(items: E[], overflowPolicy?: OverflowPolicy): Promise; /** - * Reads a single item from this ringbuffer. + * Reads a single item from this Ringbuffer. * * If the sequence is equal to the current tail sequence plus one, * this call will not return a response until an item is added. * If it is more than that, an error will be thrown. * + * Unlike queue's `take`, this method does not remove an item from the + * Ringbuffer. This means that the same item can be read by multiple + * processes. * - * Unlike queue's `take`, this method does not remove an item from the ringbuffer. This means that the same item - * can be read by multiple processes. - * - * - * @param sequence the sequence number of the item to read. - * @return the item that was read. - * @throws `RangeError` if the sequence is: - * smaller then zero; - * smaller than {@link headSequence}; - * more than {@link tailSequence} + 1 + * @param sequence the sequence number of the item to read + * @return the item that was read + * @throws `RangeError` if `sequence` is: + * smaller than `0`, + * or smaller than `headSequence`, + * or greater than `tailSequence + 1` */ readOne(sequence: number | Long): Promise; /** - * Reads a batch of items from this ringbuffer. - * If the number of available items starting at `sequence` is smaller than `maxCount`, - * then this method will not wait for more items to arrive. - * Instead, available items will be returned. - * - * If there are less items available than `minCount`, then this call will not return a response until - * a necessary number of items becomes available. - * - * @param sequence sequence number of the first item to be read. + * Reads a batch of items from the Ringbuffer. If the number of available + * items starting at `sequence` is smaller than `maxCount`, then this + * method will not wait for more items to arrive. Instead, available + * items will be returned. + * + * If there are less items available than `minCount`, then this call will + * not return a response until a necessary number of items becomes available. + * + * If `startSequence` is smaller than the smallest sequence still available + * in the Ringbuffer `headSequence`, then the smallest available + * sequence will be used as the start sequence and the minimum/maximum + * number of items will be attempted to be read from there on. + * + * If `startSequence` is bigger than the last available sequence in the + * Ringbuffer `tailSequence`, then the last available sequence + * plus one will be used as the start sequence and the call will block + * until further items become available and it can read at least the + * minimum number of items. + * + * @param startSequence sequence number of the first item to be read. * @param minCount minimum number of items to be read. * @param maxCount maximum number of items to be read. - * @throws `RangeError` if startSequence is smaller than 0 - * or if startSequence larger than {@link tailSequence} - * or if minCount smaller than 0 - * or if minCount larger than maxCount, - * or if maxCount larger than the capacity of the ringbuffer - * or if maxCount larger than 1000 (to prevent overload) + * @throws `RangeError` if `startSequence` is smaller than `0`, + * or if `minCount` smaller than `0`, + * or if `minCount` larger than `maxCount`, + * or if `maxCount` larger than `1000` (to prevent overload) */ - readMany(sequence: number | Long, minCount: number, maxCount: number): Promise>; + readMany(startSequence: number | Long, minCount: number, maxCount: number): Promise>; } diff --git a/src/proxy/ringbuffer/LazyReadResultSet.ts b/src/proxy/ringbuffer/LazyReadResultSet.ts index 8308cdd2d..8df98fae7 100644 --- a/src/proxy/ringbuffer/LazyReadResultSet.ts +++ b/src/proxy/ringbuffer/LazyReadResultSet.ts @@ -15,22 +15,28 @@ */ import * as Long from 'long'; -import {UnsupportedOperationError} from '../../HazelcastError'; import {Data} from '../../serialization/Data'; import {SerializationService, SerializationServiceV1} from '../../serialization/SerializationService'; import {ReadResultSet} from './ReadResultSet'; export class LazyReadResultSet implements ReadResultSet { + private readCount: number; private items: any[]; private itemSeqs: Long[]; + private nextSeq: Long; private serializationService: SerializationService; - constructor(serializationService: SerializationService, readCount: number, items: Data[], itemSeqs: Long[]) { + constructor(serializationService: SerializationService, + readCount: number, + items: Data[], + itemSeqs: Long[], + nextSeq: Long) { this.serializationService = serializationService; this.readCount = readCount; this.items = items; this.itemSeqs = itemSeqs; + this.nextSeq = nextSeq; } getReadCount(): number { @@ -52,9 +58,6 @@ export class LazyReadResultSet implements ReadResultSet { } getSequence(index: number): Long { - if (this.itemSeqs == null) { - throw new UnsupportedOperationError('Sequence IDs are not available when the cluster version is lower than 3.9'); - } return this.itemSeqs[index]; } @@ -62,4 +65,8 @@ export class LazyReadResultSet implements ReadResultSet { return this.items.length; } + getNextSequenceToReadFrom(): Long { + return this.nextSeq; + } + } diff --git a/src/proxy/ringbuffer/ReadResultSet.ts b/src/proxy/ringbuffer/ReadResultSet.ts index e70b70399..fea262ba2 100644 --- a/src/proxy/ringbuffer/ReadResultSet.ts +++ b/src/proxy/ringbuffer/ReadResultSet.ts @@ -16,6 +16,8 @@ import * as Long from 'long'; +export const SEQUENCE_UNAVAILABLE = -1; + /** * ReadResultSet defines the result of a {@link Ringbuffer.readMany} operation. */ @@ -23,14 +25,14 @@ export interface ReadResultSet { /** * Returns the number of items that have been read before filtering. - *

- * If no filter is set, then the readCount will be equal to {@link size}. + * + * If no filter is set, then the readCount will be equal to `size`. * But if a filter is applied, it could be that items are read, but are * filtered out. So if you are trying to make another read based on the * ReadResultSet then you should increment the sequence by readCount and * not by size. Otherwise you will be re-reading the same filtered messages. * - * @return the number of items read (including the filtered ones). + * @returns the number of items read (including the filtered ones). */ getReadCount(): number; @@ -38,26 +40,49 @@ export interface ReadResultSet { * Gets the item at the given index. * * @param index - * @returns the found item or undefined if the index is out of bounds + * @returns the found item or `undefined` if the index is out of bounds */ get(index: number): T; /** * Returns the sequence number for the item at the given index. - * The method throws if there are no sequences available. - * This can happen when the cluster version is lower than 3.9. * * @param index - * @throws UnsupportedOperationError if server version is 3.8 or lower. * @returns the sequence number for the ringbuffer item - * undefined if the index is out of bounds. + * or `undefined` if the index is out of bounds. */ getSequence(index: number): Long; /** * Returns the result set size. + * * @returns the result set size */ size(): number; + /** + * Returns the sequence of the item following the last read item. This + * sequence can then be used to read items following the ones returned by + * this result set. + * + * Usually this sequence is equal to the sequence used to retrieve this + * result set incremented by the {@link getReadCount()}. In cases when the + * reader tolerates lost items, this is not the case. + * + * For instance, if the reader requests an item with a stale sequence (one + * which has already been overwritten), the read will jump to the oldest + * sequence and read from there. + * + * Similarly, if the reader requests an item in the future (e.g. because + * the partition was lost and the reader was unaware of this), the read + * method will jump back to the newest available sequence. + * Because of these jumps and only in the case when the reader is loss + * tolerant, the next sequence must be retrieved using this method. + * A return value of `SEQUENCE_UNAVAILABLE` (`-1`) means that the + * information is not available. + * + * @returns the sequence of the item following the last item in the result set + */ + getNextSequenceToReadFrom(): Long; + } diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index 11846c62a..d08d9dcba 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -33,6 +33,8 @@ import Long = require('long'); export class RingbufferProxy extends PartitionSpecificProxy implements Ringbuffer { + private static readonly MAX_BATCH_SIZE = 1000; + capacity(): Promise { return this.encodeInvoke(RingbufferCapacityCodec) .then((clientMessage) => { @@ -105,25 +107,28 @@ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbu }); } - readMany(sequence: number | Long, + readMany(startSequence: number | Long, minCount: number, maxCount: number, filter: any = null): Promise> { - if (Long.fromValue(sequence).lessThan(0)) { - throw new RangeError('Sequence number should not be less than zero, was: ' + sequence); + if (Long.fromValue(startSequence).lessThan(0)) { + throw new RangeError('Sequence number should not be less than zero, was: ' + startSequence); } if (minCount < 0) { - throw new RangeError('Min count should not be less than zero, was: ' + sequence); + throw new RangeError('Min count should not be less than zero, was: ' + startSequence); } if (minCount > maxCount) { - throw new RangeError('Min count ' + minCount + 'was larger than max count ' + maxCount); + throw new RangeError('Min count ' + minCount + ' was larger than max count ' + maxCount); + } + if (maxCount > RingbufferProxy.MAX_BATCH_SIZE) { + throw new RangeError('Max count can not be larger than ' + RingbufferProxy.MAX_BATCH_SIZE); } - return this.encodeInvoke(RingbufferReadManyCodec, sequence, minCount, maxCount, this.toData(filter)) + return this.encodeInvoke(RingbufferReadManyCodec, startSequence, minCount, maxCount, this.toData(filter)) .then((clientMessage) => { const response = RingbufferReadManyCodec.decodeResponse(clientMessage); return new LazyReadResultSet(this.client.getSerializationService(), response.readCount, - response.items, response.itemSeqs); + response.items, response.itemSeqs, response.nextSeq); }); } } diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 797e8955d..2f24d8118 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -15,7 +15,11 @@ */ import {ReadResultSet} from '../../'; -import {StaleSequenceError} from '../../HazelcastError'; +import { + InvocationTimeoutError, + ClientNotActiveError, + ClientOfflineError +} from '../../HazelcastError'; import {SerializationService} from '../../serialization/SerializationService'; import {Ringbuffer} from '../Ringbuffer'; import {ReliableTopicMessage} from './ReliableTopicMessage'; @@ -26,7 +30,7 @@ import {ILogger} from '../../logging/ILogger'; export class ReliableTopicListenerRunner { - public sequenceNumber = 0; + sequenceNumber = 0; private listener: MessageListener; private ringbuffer: Ringbuffer; private batchSize: number; @@ -52,52 +56,68 @@ export class ReliableTopicListenerRunner { this.logger = logger; } - public next(): void { + next(): void { if (this.cancelled) { return; } this.ringbuffer.readMany(this.sequenceNumber, 1, this.batchSize) .then((result: ReadResultSet) => { - if (!this.cancelled) { - for (let i = 0; i < result.size(); i++) { - const msg = new Message(); - const item = result.get(i); - msg.messageObject = this.serializationService.toObject(item.payload); - msg.publisher = item.publisherAddress; - msg.publishingTime = item.publishTime; - setImmediate(this.listener, msg); - this.sequenceNumber++; - } - setImmediate(this.next.bind(this)); + if (this.cancelled) { + return; } - }) - .catch((e) => { - let message: string; - if (e instanceof StaleSequenceError) { - this.ringbuffer.headSequence().then((seq: Long) => { - const newSequence = seq.toNumber(); - - message = 'Topic "' + this.proxy.getName() + '" ran into a stale sequence. ' + - ' Jumping from old sequence ' + this.sequenceNumber + ' to new sequence ' + newSequence; - this.logger.warn('ReliableTopicListenerRunner', message); - this.sequenceNumber = newSequence; - setImmediate(this.next.bind(this)); - }); - - return; + const nextSeq = result.getNextSequenceToReadFrom().toNumber(); + const lostCount = nextSeq - result.getReadCount() - this.sequenceNumber; + // If messages were lost, behave as a loss tolerant listener + if (lostCount !== 0) { + this.logger.warn('ReliableTopicListenerRunner', 'Listener of topic: ' + + this.proxy.getName() + ' lost ' + lostCount + ' messages.'); } - message = 'Listener of topic "' + this.proxy.getName() + '" caught an exception, terminating listener. ' + e; - this.logger.warn('ReliableTopicListenerRunner', message); + for (let i = 0; i < result.size(); i++) { + const msg = new Message(); + const item = result.get(i); + msg.messageObject = this.serializationService.toObject(item.payload); + msg.publisher = item.publisherAddress; + msg.publishingTime = item.publishTime; + process.nextTick(this.listener, msg); + } - this.proxy.removeMessageListener(this.listenerId); + this.sequenceNumber = nextSeq; + this.next(); + }) + .catch((err) => { + if (this.handleInternalError(err)) { + this.next(); + } else { + this.proxy.removeMessageListener(this.listenerId); + } }); } - public cancel(): void { + cancel(): void { this.cancelled = true; } + private handleInternalError(err: Error): boolean { + if (err instanceof InvocationTimeoutError) { + this.logger.trace('ReliableTopicListenerRunner', 'Listener of topic: ' + this.proxy.getName() + + ' timed out. Continuing from last known sequence: ' + this.sequenceNumber); + return true; + } else if (err instanceof ClientOfflineError) { + this.logger.trace('ReliableTopicListenerRunner', 'Listener of topic: ' + this.proxy.getName() + + ' got error: ' + err + '. Continuing from last known sequence: ' + this.sequenceNumber); + return true; + } else if (err instanceof ClientNotActiveError) { + this.logger.trace('ReliableTopicListenerRunner', 'Terminating listener of topic: ' + + this.proxy.getName() + '. Reason: HazelcastClient is shutting down.'); + return false; + } else { + this.logger.warn('ReliableTopicListenerRunner', 'Listener of topic: ' + this.proxy.getName() + + ' caught an exception, terminating listener. ' + err); + } + return false; + } + } diff --git a/test/ringbuffer/LazyReadResultSetTest.js b/test/ringbuffer/LazyReadResultSetTest.js index e86b0065e..fbda90e6a 100644 --- a/test/ringbuffer/LazyReadResultSetTest.js +++ b/test/ringbuffer/LazyReadResultSetTest.js @@ -22,16 +22,12 @@ const Errors = require('../..').HazelcastErrors; describe('LazyReadResultSetTest', function () { const mockSerializationService = { - toObject: function (x) { - return x + 100; - }, - isData: function (x) { - return x < 3; - } + toObject: (x) => x + 100, + isData: (x) => x < 3 }; it('get', function () { - const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); + const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14], 15); expect(set.get(0)).to.equal(101); expect(set.get(1)).to.equal(102); expect(set.get(2)).to.equal(3); @@ -41,15 +37,11 @@ describe('LazyReadResultSetTest', function () { expect(set.getSequence(2)).to.equal(13); expect(set.getSequence(3)).to.equal(14); expect(set.getReadCount()).to.equal(4); - }); - - it('getSequence throws UnsupportedOperationError when there is no info', function () { - const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4]); - expect(set.getSequence.bind(set, 2)).to.throw(Errors.UnsupportedOperationError); + expect(set.getNextSequenceToReadFrom()).to.equal(15); }); it('get returns undefined for out of range index', function () { - const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14]); + const set = new LazyReadResultSet(mockSerializationService, 4, [1, 2, 3, 4], [11, 12, 13, 14], 15); expect(set.get(4)).to.be.undefined; }); }); diff --git a/test/ringbuffer/RingbufferProxyTest.js b/test/ringbuffer/RingbufferProxyTest.js new file mode 100644 index 000000000..13f6cf38c --- /dev/null +++ b/test/ringbuffer/RingbufferProxyTest.js @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { expect } = require('chai'); +const { Client, HazelcastErrors } = require('../../'); +const RC = require('./../RC'); +const fs = require('fs'); +const PrefixFilter = require('../javaclasses/PrefixFilter'); +const Promise = require('bluebird'); + +describe('RingbufferProxyTest', function () { + + let cluster; + let client; + let rb; + let ttlRb; + let limitedCapacityRb; + + before(async function () { + this.timeout(10000); + const config = fs.readFileSync(__dirname + '/hazelcast_ringbuffer.xml', 'utf8'); + cluster = await RC.createCluster(null, config); + await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ clusterName: cluster.id }); + }); + + beforeEach(async function () { + rb = await client.getRingbuffer('test'); + ttlRb = await client.getRingbuffer('ttl-cap'); + limitedCapacityRb = await client.getRingbuffer('capacity'); + }); + + afterEach(async function () { + await rb.destroy(); + await ttlRb.destroy(); + await limitedCapacityRb.destroy(); + }); + + after(async function () { + client.shutdown(); + return RC.terminateCluster(cluster.id); + }); + + it('adds one item and reads back', async function () { + const sequence = await rb.add(1); + const item = await rb.readOne(sequence); + expect(item).to.equal(1); + }); + + it('adds multiple items and reads them back one by one', async function () { + await rb.addAll([1, 2, 3]); + const items = await Promise.all([ + rb.readOne(0), rb.readOne(1), rb.readOne(2) + ]); + expect(items).to.deep.equal([1, 2, 3]); + }); + + it('readOne throws on read stale sequence', async function () { + await limitedCapacityRb.addAll([1, 2, 3, 4, 5]); + try { + await limitedCapacityRb.readOne(0); + return Promise.reject('Test failed as readOne did not throw'); + } catch (e) { + expect(e).to.be.an.instanceof(HazelcastErrors.StaleSequenceError); + } + }); + + it('readOne throws on negative sequence', function () { + expect(() => rb.readOne(-1)).to.throw(RangeError); + }); + + it('readMany throws on negative start sequence', function () { + expect(() => rb.readMany(-1)).to.throw(RangeError); + }); + + it('readMany throws on negative min count', function () { + expect(() => rb.readMany(0, -1)).to.throw(RangeError); + }); + + it('readMany throws on min count greater than max count', function () { + expect(() => rb.readMany(0, 2, 1)).to.throw(RangeError); + }); + + it('readMany throws on too large max count', function () { + expect(() => rb.readMany(0, 1, 1001)).to.throw(RangeError); + }); + + it('readMany reads all items at once', async function () { + await rb.addAll([1, 2, 3]); + const items = await rb.readMany(0, 1, 3); + expect(items.get(0)).to.equal(1); + expect(items.get(1)).to.equal(2); + expect(items.get(2)).to.equal(3); + expect(items.getReadCount()).to.equal(3); + expect(items.size()).to.equal(3); + expect(items.getNextSequenceToReadFrom().toNumber()).to.equal(3); + }); + + it('readMany with filter filters the results', async function () { + await rb.addAll(['item1', 'prefixedItem2', 'prefixedItem3']); + const items = await rb.readMany(0, 1, 3, new PrefixFilter('prefixed')); + expect(items.get(0)).to.equal('prefixedItem2'); + expect(items.get(1)).to.equal('prefixedItem3'); + expect(items.getReadCount()).to.equal(3); + expect(items.size()).to.equal(2); + }); + + it('readMany reads newer items when sequence is no longer available', async function () { + await limitedCapacityRb.addAll([1, 2, 3, 4, 5]); + const items = await limitedCapacityRb.readMany(0, 1, 2); + expect(items.get(0)).to.equal(3); + expect(items.get(1)).to.equal(4); + expect(items.getReadCount()).to.equal(2); + expect(items.size()).to.equal(2); + expect(items.getNextSequenceToReadFrom().toNumber()).to.equal(4); + }); + + it('correctly reports tail sequence', async function () { + await rb.addAll([1, 2, 3]); + const sequence = await rb.tailSequence(); + expect(sequence.toNumber()).to.equal(2); + }); + + it('correctly reports head sequence', async function () { + await limitedCapacityRb.addAll([1, 2, 3, 4, 5]); + const sequence = await limitedCapacityRb.headSequence(); + expect(sequence.toNumber()).to.equal(2); + }); + + it('correctly reports remaining capacity', async function () { + await ttlRb.addAll([1, 2]); + const rc = await ttlRb.remainingCapacity(); + expect(rc.toNumber()).to.equal(3); + }); + + it('correctly reports total capacity', async function () { + const capacity = await ttlRb.capacity(); + expect(capacity.toNumber()).to.equal(5); + }); + + it('correctly reports size', async function () { + await rb.addAll([1, 2]); + const size = await rb.size(); + expect(size.toNumber()).to.equal(2); + }); +}); diff --git a/test/ringbuffer/RingbufferTest.js b/test/ringbuffer/RingbufferTest.js deleted file mode 100644 index 303e52bff..000000000 --- a/test/ringbuffer/RingbufferTest.js +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ -'use strict'; - -const expect = require("chai").expect; -const HazelcastClient = require('../../').Client; -const RC = require('./../RC'); -const Util = require('./../Util'); -const fs = require('fs'); -const PrefixFilter = require('../javaclasses/PrefixFilter'); -const Promise = require('bluebird'); - -describe("Ringbuffer Proxy", function () { - - let cluster; - let client; - let rb; - - before(function () { - this.timeout(10000); - const config = fs.readFileSync(__dirname + '/hazelcast_ringbuffer.xml', 'utf8'); - return RC.createCluster(null, config).then(function (response) { - cluster = response; - return RC.startMember(cluster.id); - }).then(function () { - return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); - }).then(function (hazelcastClient) { - client = hazelcastClient; - }); - }); - - beforeEach(function () { - return client.getRingbuffer('test').then(function (buffer) { - rb = buffer; - }) - }); - - afterEach(function () { - return rb.destroy(); - }); - - after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); - }); - - it("adds one item and reads back", function () { - return rb.add(1).then(function (sequence) { - return rb.readOne(sequence).then(function (item) { - expect(item).to.equal(1); - }); - }) - }); - - it("adds multiple items and reads them back one by one", function () { - return rb.addAll([1, 2, 3]).then(function () { - return Promise.all([ - rb.readOne(0), rb.readOne(1), rb.readOne(2) - ]).then(function (items) { - expect(items).to.deep.equal([1, 2, 3]); - }); - }) - }); - - it("reads all items at once", function () { - return rb.addAll([1, 2, 3]).then(function () { - return rb.readMany(0, 1, 3).then(function (items) { - expect(items.get(0)).to.equal(1); - expect(items.get(1)).to.equal(2); - expect(items.get(2)).to.equal(3); - expect(items.getReadCount()).to.equal(3); - }); - }) - }); - - it("readMany with filter filters the results", function () { - return rb.addAll(['item1', 'prefixedItem2', 'prefixedItem3']).then(function () { - return rb.readMany(0, 1, 3, new PrefixFilter('prefixed')).then(function (items) { - expect(items.get(0)).to.equal('prefixedItem2'); - expect(items.get(1)).to.equal('prefixedItem3'); - }); - }) - }); - - it("correctly reports tail sequence", function () { - return rb.addAll([1, 2, 3]).then(function () { - return rb.tailSequence().then(function (sequence) { - expect(sequence.toNumber()).to.equal(2); - }); - }) - }); - - it("correctly reports head sequence", function () { - let limitedCapacity; - return client.getRingbuffer("capacity").then(function (buffer) { - limitedCapacity = buffer; - return limitedCapacity.addAll([1, 2, 3, 4, 5]); - }).then(function () { - return limitedCapacity.headSequence().then(function (sequence) { - expect(sequence.toNumber()).to.equal(2); - }); - }) - }); - - it("correctly reports remaining capacity", function () { - let ttl = client.getRingbuffer("ttl-cap").then(function (buffer) { - ttl = buffer; - return ttl.addAll([1, 2]); - }).then(function () { - return ttl.remainingCapacity().then(function (rc) { - expect(rc.toNumber()).to.equal(3); - }); - }) - }); - - it("correctly reports total capacity", function () { - return client.getRingbuffer("ttl-cap").then(function (buffer) { - return buffer.capacity(); - }).then(function (capacity) { - expect(capacity.toNumber()).to.equal(5); - }); - }); - - it("correctly reports size", function () { - return rb.addAll([1, 2]).then(function () { - return rb.size().then(function (size) { - expect(size.toNumber()).to.equal(2); - }); - }) - }); -}); diff --git a/test/topic/TopicTest.js b/test/topic/ReliableTopicTest.js similarity index 52% rename from test/topic/TopicTest.js rename to test/topic/ReliableTopicTest.js index 67b666461..6cf9b5a20 100644 --- a/test/topic/TopicTest.js +++ b/test/topic/ReliableTopicTest.js @@ -18,14 +18,13 @@ const expect = require('chai').expect; const fs = require('fs'); const Long = require('long'); -const Promise = require('bluebird'); const RC = require('./../RC'); -const Client = require('../..').Client; -const TopicOverloadPolicy = require('../..').TopicOverloadPolicy.TopicOverloadPolicy; -const ReliableTopicMessage = require('../../lib/proxy/topic/ReliableTopicMessage').ReliableTopicMessage; +const { Client } = require('../..'); +const { TopicOverloadPolicy: { TopicOverloadPolicy } } = require('../..'); +const { ReliableTopicMessage } = require('../../lib/proxy/topic/ReliableTopicMessage'); -describe('TopicTest', function () { +describe('ReliableTopicTest', function () { this.timeout(40000); let cluster; @@ -58,26 +57,17 @@ describe('TopicTest', function () { return all; } - before(function () { + before(async function () { this.timeout(40000); const memberConfig = fs.readFileSync(__dirname + '/hazelcast_topic.xml', 'utf8'); - return RC.createCluster(null, memberConfig).then(function (response) { - cluster = response; - return RC.startMember(cluster.id); - }).then(function () { - const config = createConfig(cluster.id); - return Promise.all([ - Client.newHazelcastClient(config).then(function (hazelcastClient) { - clientOne = hazelcastClient; - }), - Client.newHazelcastClient(config).then(function (hazelcastClient) { - clientTwo = hazelcastClient; - }) - ]); - }); + cluster = await RC.createCluster(null, memberConfig); + await RC.startMember(cluster.id); + const config = createConfig(cluster.id); + clientOne = await Client.newHazelcastClient(config); + clientTwo = await Client.newHazelcastClient(config); }); - after(function () { + after(async function () { clientOne.shutdown(); clientTwo.shutdown(); return RC.terminateCluster(cluster.id); @@ -92,7 +82,7 @@ describe('TopicTest', function () { return clientTwo.getReliableTopic(topicName); }).then(function (t) { topicTwo = t; - topicTwo.addMessageListener(function (msg) { + topicTwo.addMessageListener((msg) => { if (msg.messageObject['value'] === 'foo') { done(); } @@ -100,7 +90,7 @@ describe('TopicTest', function () { setTimeout(function () { topicOne.publish({'value': 'foo'}); }, 500); - }); + }).catch(done); }); it('removed message listener does not receive items after removal', function (done) { @@ -113,7 +103,7 @@ describe('TopicTest', function () { }).then(function (topic) { topicTwo = topic; let receivedMessages = 0; - const id = topicTwo.addMessageListener(function (msg) { + const id = topicTwo.addMessageListener(() => { receivedMessages++; if (receivedMessages > 2) { done(new Error('Kept receiving messages after message listener is removed.')); @@ -130,41 +120,31 @@ describe('TopicTest', function () { topicOne.publish({'value5': 'foo5'}); setTimeout(done, 500); }, 500); - }); + }).catch(done); }); - it('blocks when there is no more space', function () { - let topic; - let ringbuffer; - return clientOne.getReliableTopic('blocking').then(function (t) { - topic = t; - return topic.getRingbuffer(); - }).then(function (rb) { - ringbuffer = rb; - return ringbuffer.capacity(); - }).then(function (capacity) { - const all = []; - for (let i = 0; i < capacity.toNumber() + 1; i++) { - all.push(i); - } - return ringbuffer.addAll(all); - }).then(function () { - const startTime = Date.now(); - return topic.publish(-50).then(function () { - // Here we check that the call was indeed blocking - // until the TTL of the first inserted entry has passed - const elapsed = Date.now() - startTime; - if (elapsed > 2000) { - return; - } else { - throw new Error('Message was published too fast, expected at least a 2 second delay, got: ' + elapsed); - } - }); - }); + it('blocks when there is no more space', async function () { + const topic = await clientOne.getReliableTopic('blocking'); + const ringbuffer = topic.getRingbuffer(); + + const capacity = await ringbuffer.capacity(); + const all = []; + for (let i = 0; i < capacity.toNumber() + 1; i++) { + all.push(i); + } + await ringbuffer.addAll(all); + + const startTime = Date.now(); + await topic.publish(-50); + // Here we check that the call was indeed blocking + // until the TTL of the first inserted entry has passed + const elapsed = Date.now() - startTime; + if (elapsed <= 2000) { + throw new Error('Message was published too fast, expected at least a 2 second delay, got: ' + elapsed); + } }); it('continues operating when stale sequence is reached', function (done) { - this.skip(); let topic; let ringbuffer; clientOne.getReliableTopic('stale').then(function (t) { @@ -172,55 +152,41 @@ describe('TopicTest', function () { return topic.getRingbuffer(); }).then(function (rb) { ringbuffer = rb; - topic.addMessageListener(function (e) { - if (e.messageObject === 20) { + topic.addMessageListener(function (m) { + if (m.messageObject === 20) { done(); } }); const all = generateItems(clientOne, 20); ringbuffer.addAll(all); - }); + }).catch(done); }); - it('discards the item when there is no more space', function () { - let topic; - let ringbuffer; - return clientOne.getReliableTopic('discard').then(function (t) { - topic = t; - return topic.getRingbuffer(); - }).then(function (rb) { - ringbuffer = rb; - const all = generateItems(clientOne, 10); - ringbuffer.addAll(all); - return topic.publish(11); - }).then(function () { - return ringbuffer.tailSequence(); - }).then(function (seq) { - return ringbuffer.readOne(seq); - }).then(function (item) { - const obj = clientOne.getSerializationService().toObject(item.payload); - expect(obj).to.equal(10); - }); + it('discards the item when there is no more space', async function () { + const topic = await clientOne.getReliableTopic('discard'); + const ringbuffer = topic.getRingbuffer(); + + const all = generateItems(clientOne, 10); + await ringbuffer.addAll(all); + await topic.publish(11); + + const seq = await ringbuffer.tailSequence(); + const item = await ringbuffer.readOne(seq); + const obj = clientOne.getSerializationService().toObject(item.payload); + expect(obj).to.equal(10); }); - it('overwrites the oldest item when there is no more space', function () { - let topic; - let ringbuffer; - return clientOne.getReliableTopic('overwrite').then(function (t) { - topic = t; - return topic.getRingbuffer(); - }).then(function (rb) { - ringbuffer = rb; - const all = generateItems(clientOne, 10); - ringbuffer.addAll(all); - return topic.publish(11); - }).then(function () { - return ringbuffer.tailSequence(); - }).then(function (seq) { - return ringbuffer.readOne(seq); - }).then(function (item) { - const obj = clientOne.getSerializationService().toObject(item.payload); - expect(obj).to.equal(11); - }); + it('overwrites the oldest item when there is no more space', async function () { + const topic = await clientOne.getReliableTopic('overwrite'); + const ringbuffer = topic.getRingbuffer(); + + const all = generateItems(clientOne, 10); + await ringbuffer.addAll(all); + await topic.publish(11); + + const seq = await ringbuffer.tailSequence(); + const item = await ringbuffer.readOne(seq); + const obj = clientOne.getSerializationService().toObject(item.payload); + expect(obj).to.equal(11); }); }); From c7a804c53105eaa6292ece4f11e8f24f4a917208 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Fri, 14 Aug 2020 10:37:41 +0300 Subject: [PATCH 276/685] Separate internal APIs from public ones (#568) Includes the following: * Marks internal modules and class members with @internal tag which is supported by both tsc and typedoc * Fixes typedoc flags, so that it now ignores internal stuff * Excludes internal modules and members from tsc output * Excludes source maps from tsc output * Moves typings for long and bluebird into non-dev dependencies, as TS users need them (see #537) * Adds test for declarations produced by tsc * Also includes some code improvements, like reformatting, interface extraction, etc. --- .npmignore | 4 +- DOCUMENTATION.md | 6 +- package.json | 14 +- src/Address.ts | 27 +++- src/BitsUtil.ts | 2 + src/BuildInfo.ts | 2 + src/ClientInfo.ts | 4 + src/ClientMessage.ts | 10 ++ src/ClusterDataFactory.ts | 8 +- src/DataStoreHashMap.ts | 2 + src/DistributedObjectInfo.ts | 2 + src/HazelcastClient.ts | 122 +++++++++++++----- src/HazelcastError.ts | 1 + src/HeartbeatManager.ts | 2 + src/LifecycleService.ts | 26 +++- src/ListenerMessageCodec.ts | 2 + src/ListenerService.ts | 3 + src/LoadBalancer.ts | 4 +- src/LockReferenceIdGenerator.ts | 2 + src/PartitionService.ts | 69 ++++++---- src/Util.ts | 40 +++++- src/aggregation/Aggregator.ts | 16 +++ src/aggregation/AggregatorFactory.ts | 15 +++ src/aggregation/Aggregators.ts | 71 +++++----- .../ClientAddClusterViewListenerCodec.ts | 1 + ...ClientAddDistributedObjectListenerCodec.ts | 2 + .../ClientAddPartitionLostListenerCodec.ts | 2 + src/codec/ClientAuthenticationCodec.ts | 6 +- src/codec/ClientAuthenticationCustomCodec.ts | 6 +- src/codec/ClientCreateProxiesCodec.ts | 1 + src/codec/ClientCreateProxyCodec.ts | 1 + src/codec/ClientDeployClassesCodec.ts | 1 + src/codec/ClientDestroyProxyCodec.ts | 1 + src/codec/ClientGetDistributedObjectsCodec.ts | 2 + src/codec/ClientLocalBackupListenerCodec.ts | 2 + src/codec/ClientPingCodec.ts | 1 + ...entRemoveDistributedObjectListenerCodec.ts | 2 + .../ClientRemovePartitionLostListenerCodec.ts | 2 + src/codec/ClientStatisticsCodec.ts | 1 + .../ClientTriggerPartitionAssignmentCodec.ts | 1 + src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 2 + src/codec/ListAddAllCodec.ts | 2 + src/codec/ListAddAllWithIndexCodec.ts | 2 + src/codec/ListAddCodec.ts | 2 + src/codec/ListAddListenerCodec.ts | 2 + src/codec/ListAddWithIndexCodec.ts | 1 + src/codec/ListClearCodec.ts | 1 + src/codec/ListCompareAndRemoveAllCodec.ts | 2 + src/codec/ListCompareAndRetainAllCodec.ts | 2 + src/codec/ListContainsAllCodec.ts | 2 + src/codec/ListContainsCodec.ts | 2 + src/codec/ListGetAllCodec.ts | 2 + src/codec/ListGetCodec.ts | 2 + src/codec/ListIndexOfCodec.ts | 2 + src/codec/ListIsEmptyCodec.ts | 2 + src/codec/ListIteratorCodec.ts | 2 + src/codec/ListLastIndexOfCodec.ts | 2 + src/codec/ListListIteratorCodec.ts | 2 + src/codec/ListRemoveCodec.ts | 2 + src/codec/ListRemoveListenerCodec.ts | 2 + src/codec/ListRemoveWithIndexCodec.ts | 2 + src/codec/ListSetCodec.ts | 2 + src/codec/ListSizeCodec.ts | 2 + src/codec/ListSubCodec.ts | 2 + src/codec/MapAddEntryListenerCodec.ts | 2 + src/codec/MapAddEntryListenerToKeyCodec.ts | 2 + ...AddEntryListenerToKeyWithPredicateCodec.ts | 2 + .../MapAddEntryListenerWithPredicateCodec.ts | 2 + src/codec/MapAddIndexCodec.ts | 1 + src/codec/MapAddInterceptorCodec.ts | 2 + ...apAddNearCacheInvalidationListenerCodec.ts | 2 + src/codec/MapAddPartitionLostListenerCodec.ts | 2 + src/codec/MapAggregateCodec.ts | 2 + src/codec/MapAggregateWithPredicateCodec.ts | 2 + src/codec/MapClearCodec.ts | 1 + src/codec/MapContainsKeyCodec.ts | 2 + src/codec/MapContainsValueCodec.ts | 2 + src/codec/MapDeleteCodec.ts | 1 + .../MapEntriesWithPagingPredicateCodec.ts | 2 + src/codec/MapEntriesWithPredicateCodec.ts | 2 + src/codec/MapEntrySetCodec.ts | 2 + src/codec/MapEventJournalReadCodec.ts | 2 + src/codec/MapEventJournalSubscribeCodec.ts | 2 + src/codec/MapEvictAllCodec.ts | 1 + src/codec/MapEvictCodec.ts | 2 + src/codec/MapExecuteOnAllKeysCodec.ts | 2 + src/codec/MapExecuteOnKeyCodec.ts | 2 + src/codec/MapExecuteOnKeysCodec.ts | 2 + src/codec/MapExecuteWithPredicateCodec.ts | 2 + src/codec/MapFetchEntriesCodec.ts | 2 + src/codec/MapFetchKeysCodec.ts | 2 + ...FetchNearCacheInvalidationMetadataCodec.ts | 2 + src/codec/MapFetchWithQueryCodec.ts | 2 + src/codec/MapFlushCodec.ts | 1 + src/codec/MapForceUnlockCodec.ts | 1 + src/codec/MapGetAllCodec.ts | 2 + src/codec/MapGetCodec.ts | 2 + src/codec/MapGetEntryViewCodec.ts | 2 + src/codec/MapIsEmptyCodec.ts | 2 + src/codec/MapIsLockedCodec.ts | 2 + src/codec/MapKeySetCodec.ts | 2 + .../MapKeySetWithPagingPredicateCodec.ts | 2 + src/codec/MapKeySetWithPredicateCodec.ts | 2 + src/codec/MapLoadAllCodec.ts | 1 + src/codec/MapLoadGivenKeysCodec.ts | 1 + src/codec/MapLockCodec.ts | 1 + src/codec/MapProjectCodec.ts | 2 + src/codec/MapProjectWithPredicateCodec.ts | 2 + src/codec/MapPutAllCodec.ts | 1 + src/codec/MapPutCodec.ts | 2 + src/codec/MapPutIfAbsentCodec.ts | 2 + src/codec/MapPutIfAbsentWithMaxIdleCodec.ts | 2 + src/codec/MapPutTransientCodec.ts | 1 + src/codec/MapPutTransientWithMaxIdleCodec.ts | 2 + src/codec/MapPutWithMaxIdleCodec.ts | 2 + src/codec/MapRemoveAllCodec.ts | 1 + src/codec/MapRemoveCodec.ts | 2 + src/codec/MapRemoveEntryListenerCodec.ts | 2 + src/codec/MapRemoveIfSameCodec.ts | 2 + src/codec/MapRemoveInterceptorCodec.ts | 2 + .../MapRemovePartitionLostListenerCodec.ts | 2 + src/codec/MapReplaceCodec.ts | 2 + src/codec/MapReplaceIfSameCodec.ts | 2 + src/codec/MapSetCodec.ts | 1 + src/codec/MapSetTtlCodec.ts | 2 + src/codec/MapSetWithMaxIdleCodec.ts | 2 + src/codec/MapSizeCodec.ts | 2 + src/codec/MapSubmitToKeyCodec.ts | 2 + src/codec/MapTryLockCodec.ts | 2 + src/codec/MapTryPutCodec.ts | 2 + src/codec/MapTryRemoveCodec.ts | 2 + src/codec/MapUnlockCodec.ts | 1 + src/codec/MapValuesCodec.ts | 2 + .../MapValuesWithPagingPredicateCodec.ts | 2 + src/codec/MapValuesWithPredicateCodec.ts | 2 + src/codec/MultiMapAddEntryListenerCodec.ts | 2 + .../MultiMapAddEntryListenerToKeyCodec.ts | 2 + src/codec/MultiMapClearCodec.ts | 1 + src/codec/MultiMapContainsEntryCodec.ts | 2 + src/codec/MultiMapContainsKeyCodec.ts | 2 + src/codec/MultiMapContainsValueCodec.ts | 2 + src/codec/MultiMapDeleteCodec.ts | 1 + src/codec/MultiMapEntrySetCodec.ts | 2 + src/codec/MultiMapForceUnlockCodec.ts | 1 + src/codec/MultiMapGetCodec.ts | 2 + src/codec/MultiMapIsLockedCodec.ts | 2 + src/codec/MultiMapKeySetCodec.ts | 2 + src/codec/MultiMapLockCodec.ts | 1 + src/codec/MultiMapPutAllCodec.ts | 1 + src/codec/MultiMapPutCodec.ts | 2 + src/codec/MultiMapRemoveCodec.ts | 2 + src/codec/MultiMapRemoveEntryCodec.ts | 2 + src/codec/MultiMapRemoveEntryListenerCodec.ts | 2 + src/codec/MultiMapSizeCodec.ts | 2 + src/codec/MultiMapTryLockCodec.ts | 2 + src/codec/MultiMapUnlockCodec.ts | 1 + src/codec/MultiMapValueCountCodec.ts | 2 + src/codec/MultiMapValuesCodec.ts | 2 + src/codec/PNCounterAddCodec.ts | 2 + src/codec/PNCounterGetCodec.ts | 2 + ...PNCounterGetConfiguredReplicaCountCodec.ts | 2 + src/codec/QueueAddAllCodec.ts | 2 + src/codec/QueueAddListenerCodec.ts | 2 + src/codec/QueueClearCodec.ts | 1 + src/codec/QueueCompareAndRemoveAllCodec.ts | 2 + src/codec/QueueCompareAndRetainAllCodec.ts | 2 + src/codec/QueueContainsAllCodec.ts | 2 + src/codec/QueueContainsCodec.ts | 2 + src/codec/QueueDrainToCodec.ts | 2 + src/codec/QueueDrainToMaxSizeCodec.ts | 2 + src/codec/QueueIsEmptyCodec.ts | 2 + src/codec/QueueIteratorCodec.ts | 2 + src/codec/QueueOfferCodec.ts | 2 + src/codec/QueuePeekCodec.ts | 2 + src/codec/QueuePollCodec.ts | 2 + src/codec/QueuePutCodec.ts | 1 + src/codec/QueueRemainingCapacityCodec.ts | 2 + src/codec/QueueRemoveCodec.ts | 2 + src/codec/QueueRemoveListenerCodec.ts | 2 + src/codec/QueueSizeCodec.ts | 2 + src/codec/QueueTakeCodec.ts | 2 + .../ReplicatedMapAddEntryListenerCodec.ts | 2 + ...ReplicatedMapAddEntryListenerToKeyCodec.ts | 2 + ...AddEntryListenerToKeyWithPredicateCodec.ts | 2 + ...edMapAddEntryListenerWithPredicateCodec.ts | 2 + ...icatedMapAddNearCacheEntryListenerCodec.ts | 2 + src/codec/ReplicatedMapClearCodec.ts | 1 + src/codec/ReplicatedMapContainsKeyCodec.ts | 2 + src/codec/ReplicatedMapContainsValueCodec.ts | 2 + src/codec/ReplicatedMapEntrySetCodec.ts | 2 + src/codec/ReplicatedMapGetCodec.ts | 2 + src/codec/ReplicatedMapIsEmptyCodec.ts | 2 + src/codec/ReplicatedMapKeySetCodec.ts | 2 + src/codec/ReplicatedMapPutAllCodec.ts | 1 + src/codec/ReplicatedMapPutCodec.ts | 2 + src/codec/ReplicatedMapRemoveCodec.ts | 2 + .../ReplicatedMapRemoveEntryListenerCodec.ts | 2 + src/codec/ReplicatedMapSizeCodec.ts | 2 + src/codec/ReplicatedMapValuesCodec.ts | 2 + src/codec/RingbufferAddAllCodec.ts | 2 + src/codec/RingbufferAddCodec.ts | 2 + src/codec/RingbufferCapacityCodec.ts | 2 + src/codec/RingbufferHeadSequenceCodec.ts | 2 + src/codec/RingbufferReadManyCodec.ts | 2 + src/codec/RingbufferReadOneCodec.ts | 2 + src/codec/RingbufferRemainingCapacityCodec.ts | 2 + src/codec/RingbufferSizeCodec.ts | 2 + src/codec/RingbufferTailSequenceCodec.ts | 2 + src/codec/SetAddAllCodec.ts | 2 + src/codec/SetAddCodec.ts | 2 + src/codec/SetAddListenerCodec.ts | 2 + src/codec/SetClearCodec.ts | 1 + src/codec/SetCompareAndRemoveAllCodec.ts | 2 + src/codec/SetCompareAndRetainAllCodec.ts | 2 + src/codec/SetContainsAllCodec.ts | 2 + src/codec/SetContainsCodec.ts | 2 + src/codec/SetGetAllCodec.ts | 2 + src/codec/SetIsEmptyCodec.ts | 2 + src/codec/SetRemoveCodec.ts | 2 + src/codec/SetRemoveListenerCodec.ts | 2 + src/codec/SetSizeCodec.ts | 2 + src/codec/TopicAddMessageListenerCodec.ts | 2 + src/codec/TopicPublishCodec.ts | 1 + src/codec/TopicRemoveMessageListenerCodec.ts | 2 + src/codec/builtin/ByteArrayCodec.ts | 1 + src/codec/builtin/CodecUtil.ts | 1 + src/codec/builtin/DataCodec.ts | 1 + src/codec/builtin/EntryListCodec.ts | 1 + .../builtin/EntryListIntegerIntegerCodec.ts | 1 + .../builtin/EntryListIntegerLongCodec.ts | 1 + .../builtin/EntryListIntegerUUIDCodec.ts | 1 + .../builtin/EntryListLongByteArrayCodec.ts | 1 + .../builtin/EntryListUUIDListIntegerCodec.ts | 1 + src/codec/builtin/EntryListUUIDLongCodec.ts | 1 + src/codec/builtin/EntryListUUIDUUIDCodec.ts | 1 + src/codec/builtin/ErrorsCodec.ts | 1 + src/codec/builtin/FixSizedTypesCodec.ts | 1 + src/codec/builtin/ListDataCodec.ts | 1 + src/codec/builtin/ListIntegerCodec.ts | 1 + src/codec/builtin/ListLongCodec.ts | 1 + src/codec/builtin/ListMultiFrameCodec.ts | 1 + src/codec/builtin/ListUUIDCodec.ts | 1 + src/codec/builtin/LongArrayCodec.ts | 1 + src/codec/builtin/MapCodec.ts | 1 + src/codec/builtin/StringCodec.ts | 1 + src/codec/custom/AddressCodec.ts | 9 +- src/codec/custom/AnchorDataListHolderCodec.ts | 1 + src/codec/custom/BitmapIndexOptionsCodec.ts | 1 + .../custom/DistributedObjectInfoCodec.ts | 1 + src/codec/custom/ErrorHolderCodec.ts | 1 + src/codec/custom/IndexConfigCodec.ts | 1 + src/codec/custom/MemberInfoCodec.ts | 1 + src/codec/custom/MemberVersionCodec.ts | 1 + .../custom/PagingPredicateHolderCodec.ts | 1 + src/codec/custom/SimpleEntryViewCodec.ts | 1 + src/codec/custom/StackTraceElementCodec.ts | 1 + src/config/BitmapIndexOptions.ts | 1 + src/config/ClientCloudConfig.ts | 1 + src/config/ClientNetworkConfig.ts | 1 + src/config/Config.ts | 1 + src/config/ConfigBuilder.ts | 2 + src/config/ConfigPatternMatcher.ts | 2 + src/config/ConnectionRetryConfig.ts | 1 + src/config/ConnectionStrategyConfig.ts | 1 + src/config/FlakeIdGeneratorConfig.ts | 1 + src/config/IndexConfig.ts | 1 + src/config/LoadBalancerConfig.ts | 1 + src/config/NearCacheConfig.ts | 1 + src/config/ReliableTopicConfig.ts | 1 + src/config/SSLConfig.ts | 1 + src/config/SerializationConfig.ts | 1 + src/connection/AddressProvider.ts | 8 +- src/connection/BasicSSLOptionsFactory.ts | 3 + src/connection/DefaultAddressProvider.ts | 7 +- src/connection/SSLOptionsFactory.ts | 15 +++ src/core/Cluster.ts | 37 +++--- src/core/Comparator.ts | 7 +- src/core/EventType.ts | 2 + src/core/HazelcastJsonValue.ts | 3 +- src/core/InitialMembershipEvent.ts | 5 +- src/core/ItemListener.ts | 3 + src/core/Member.ts | 33 ++++- src/core/MemberInfo.ts | 24 ++-- src/core/MemberSelector.ts | 7 +- src/core/MemberSelectors.ts | 13 +- src/core/MembershipEvent.ts | 3 + src/core/OverflowPolicy.ts | 1 + src/core/Predicate.ts | 3 + src/core/ReadOnlyLazyList.ts | 1 + src/core/RestValue.ts | 9 +- src/core/SimpleEntryView.ts | 1 + src/core/UUID.ts | 12 ++ src/core/VectorClock.ts | 4 +- .../HazelcastCloudAddressProvider.ts | 8 +- src/discovery/HazelcastCloudDiscovery.ts | 15 ++- src/index.ts | 20 +-- src/invocation/ClientEventRegistration.ts | 2 + src/invocation/ClusterService.ts | 35 ++--- src/invocation/InvocationService.ts | 9 +- src/invocation/Murmur.ts | 2 + src/invocation/RegistrationKey.ts | 8 +- src/listener/ClusterViewListenerService.ts | 10 +- src/logging/DefaultLogger.ts | 2 + src/logging/LoggingService.ts | 2 + .../AlwaysFreshStaleReadDetectorImpl.ts | 37 ------ src/nearcache/DataRecord.ts | 2 + src/nearcache/MetadataContainer.ts | 3 + src/nearcache/MetadataFetcher.ts | 9 +- src/nearcache/NearCache.ts | 11 +- src/nearcache/NearCacheManager.ts | 7 +- src/nearcache/RepairingHandler.ts | 8 +- src/nearcache/RepairingTask.ts | 6 +- src/nearcache/StaleReadDetector.ts | 47 +++++++ src/nearcache/StaleReadDetectorImpl.ts | 45 ------- src/network/ClientConnection.ts | 25 ++-- src/network/ClientConnectionManager.ts | 45 ++++--- src/network/WaitStrategy.ts | 11 +- src/protocol/AnchorDataListHolder.ts | 2 + src/protocol/AuthenticationStatus.ts | 4 +- src/protocol/ClientProtocolErrorCodes.ts | 2 + src/protocol/ErrorFactory.ts | 2 + src/protocol/ErrorHolder.ts | 1 + src/protocol/PagingPredicateHolder.ts | 2 + src/proxy/BaseProxy.ts | 2 + src/proxy/FlakeIdGeneratorProxy.ts | 5 +- src/proxy/ListProxy.ts | 2 + src/proxy/MapProxy.ts | 2 + src/proxy/MultiMapProxy.ts | 2 + src/proxy/NearCachedMapProxy.ts | 8 +- src/proxy/PNCounterProxy.ts | 24 ++-- src/proxy/PartitionSpecificProxy.ts | 2 + src/proxy/ProxyManager.ts | 15 +-- src/proxy/QueueProxy.ts | 2 + src/proxy/ReplicatedMap.ts | 5 +- src/proxy/ReplicatedMapProxy.ts | 4 +- src/proxy/SetProxy.ts | 2 + src/proxy/flakeid/AutoBatcher.ts | 10 +- src/proxy/ringbuffer/LazyReadResultSet.ts | 2 + src/proxy/ringbuffer/RingbufferProxy.ts | 2 + src/proxy/topic/Message.ts | 16 +++ src/proxy/topic/MessageListener.ts | 4 + .../topic/ReliableTopicListenerRunner.ts | 2 + src/proxy/topic/ReliableTopicMessage.ts | 9 +- src/proxy/topic/ReliableTopicProxy.ts | 13 +- src/proxy/topic/TopicOverloadPolicy.ts | 3 + src/serialization/Data.ts | 9 +- src/serialization/DefaultPredicates.ts | 22 +++- src/serialization/DefaultSerializer.ts | 29 ++++- src/serialization/HeapData.ts | 6 + src/serialization/ObjectData.ts | 4 + src/serialization/SerializationService.ts | 10 +- src/serialization/SerializationUtil.ts | 3 + src/serialization/portable/ClassDefinition.ts | 6 + .../portable/ClassDefinitionBuilder.ts | 2 + .../portable/ClassDefinitionContext.ts | 2 + .../portable/ClassDefinitionWriter.ts | 2 + .../portable/DefaultPortableReader.ts | 2 + .../portable/DefaultPortableWriter.ts | 2 + .../portable/MorphingPortableReader.ts | 2 + src/serialization/portable/PortableContext.ts | 8 +- .../portable/PortableSerializer.ts | 18 ++- src/statistics/Statistics.ts | 2 + src/util/AbstractLoadBalancer.ts | 17 ++- src/util/ArrayComparator.ts | 17 --- src/util/IndexUtil.ts | 2 + src/util/RandomLB.ts | 2 + src/util/RoundRobinLB.ts | 2 + src/util/UuidUtil.ts | 2 + test/ConnectionManagerTest.js | 19 ++- test/discovery/HazelcastCloudDiscoveryTest.js | 20 +-- test/discovery/HazelcastCloudProviderTest.js | 20 +-- test/heartbeat/HeartbeatFromClientTest.js | 12 +- test/heartbeat/HeartbeatFromServerTest.js | 22 ++-- test/list/ListProxyTest.js | 4 +- test/queue/QueueProxyTest.js | 7 +- .../portable/ClassDefinitionTest.js | 2 +- test/set/SetProxyTest.js | 4 +- test/unit/LoadBalancerTest.js | 4 +- test/user_code/UserCodeTest.ts | 13 ++ test/user_code/tsconfig.json | 11 ++ tsconfig.json | 3 +- typedoc.json | 11 ++ 382 files changed, 1416 insertions(+), 509 deletions(-) delete mode 100644 src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts delete mode 100644 src/nearcache/StaleReadDetectorImpl.ts delete mode 100644 src/util/ArrayComparator.ts create mode 100644 test/user_code/UserCodeTest.ts create mode 100644 test/user_code/tsconfig.json create mode 100644 typedoc.json diff --git a/.npmignore b/.npmignore index 9f6f07cae..da03b910b 100644 --- a/.npmignore +++ b/.npmignore @@ -1,4 +1,5 @@ .idea/ +.vscode/ .nyc_output/ benchmark/ code_samples/ @@ -7,6 +8,8 @@ docs/ scripts/ src/ test/ +tsconfig.json +typedoc.json .editorconfig .eslintignore .eslintrc.js @@ -15,6 +18,5 @@ test/ DOCUMENTATION.md download-remote-controller.js *.iml -.editorconfig *.jar *.log diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 113578dbe..5a5dd9bfa 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -2694,7 +2694,7 @@ An example configuration is shown below. ```javascript const readFile = util.promisify(fs.readFile); -class SSLFactory { +class SSLOptionsFactory { async init(properties) { const promises = []; this.keepOrder = properties.userDefinedProperty1; @@ -2732,7 +2732,7 @@ const cfg = { network: { ssl: { enabled: true, - sslOptionsFactory: new SSLFactory(), + sslOptionsFactory: new SSLOptionsFactory(), sslOptionsFactoryProperties: { caPath: 'ca.pem', keyPath: 'key.pem', @@ -2744,7 +2744,7 @@ const cfg = { }; ``` -The client calls the method `init` with the properties section defined in the configuration. Then the client calls the method `getSSLOptions` of `SSLFactory` to create the `options` object. +The client calls the `init()` method with the `properties` configuration option. Then the client calls the `getSSLOptions()` method of `SSLOptionsFactory` to create the `options` object. ## 8.2. Credentials diff --git a/package.json b/package.json index 98a226820..f38d70cb7 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,14 @@ "version": "4.0.0", "description": "Hazelcast - open source In-Memory Data Grid - client for Node.js", "main": "lib/index.js", + "types": "lib/index.d.ts", "dependencies": { "bluebird": "3.7.2", - "long": "4.0.0" + "@types/bluebird": "3.5.32", + "long": "4.0.0", + "@types/long": "4.0.1" }, "devDependencies": { - "@types/bluebird": "^3.5.32", - "@types/long": "^4.0.1", "@types/node": "^8.10.60", "@typescript-eslint/eslint-plugin": "^2.34.0", "@typescript-eslint/parser": "^2.34.0", @@ -24,6 +25,7 @@ "rimraf": "^3.0.2", "sinon": "^9.0.2", "thrift": "^0.12.0", + "typedoc": "^0.18.0", "typescript": "^3.9.5", "winston": "^3.2.1" }, @@ -35,10 +37,11 @@ "compile": "tsc", "pretest": "node download-remote-controller.js", "test": "mocha --recursive", + "validate-user-code": "tsc --build test/user_code/tsconfig.json", "precoverage": "node download-remote-controller.js", "coverage": "rimraf coverage && nyc node_modules/mocha/bin/_mocha -- --recursive --reporter-options mochaFile=report.xml --reporter mocha-junit-reporter", "pregenerate-docs": "rimraf docs", - "generate-docs": "typedoc --out docs/ --exclude **/codec/**/* src/ --excludeExternals --ignoreCompilerErrors --excludePrivate", + "generate-docs": "typedoc --options typedoc.json", "lint": "eslint --ext .ts ." }, "repository": { @@ -57,6 +60,5 @@ "bugs": { "url": "https://github.com/hazelcast/hazelcast-nodejs-client/issues" }, - "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme", - "typings": "./lib/index" + "homepage": "https://github.com/hazelcast/hazelcast-nodejs-client#readme" } diff --git a/src/Address.ts b/src/Address.ts index a897752bf..2a4c6a04b 100644 --- a/src/Address.ts +++ b/src/Address.ts @@ -19,7 +19,30 @@ import {CLUSTER_DATA_FACTORY_ID, CLUSTER_DATA_ADDRESS_CLASS_ID} from './ClusterD import {DataInput, DataOutput} from './serialization/Data'; import {IdentifiedDataSerializable} from './serialization/Serializable'; -export class Address implements IdentifiedDataSerializable { +/** + * Represents a network address (e.g. of the client or a cluster member). + */ +export interface Address { + + /** + * Host name or IP address. + */ + host: string; + + /** + * Port number. + */ + port: number; + + /** + * Returns string representation of the address. + */ + toString(): string; + +} + +/** @internal */ +export class AddressImpl implements Address, IdentifiedDataSerializable { factoryId = CLUSTER_DATA_FACTORY_ID; classId = CLUSTER_DATA_ADDRESS_CLASS_ID; @@ -49,7 +72,7 @@ export class Address implements IdentifiedDataSerializable { output.writeUTF(this.host); } - equals(other: Address): boolean { + equals(other: AddressImpl): boolean { if (other === this) { return true; } diff --git a/src/BitsUtil.ts b/src/BitsUtil.ts index 1e5db18f0..522931421 100644 --- a/src/BitsUtil.ts +++ b/src/BitsUtil.ts @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ +/** @internal */ export class BitsUtil { static BYTE_SIZE_IN_BYTES = 1; static BOOLEAN_SIZE_IN_BYTES = 1; diff --git a/src/BuildInfo.ts b/src/BuildInfo.ts index 66cf5f622..4b57c0ecf 100644 --- a/src/BuildInfo.ts +++ b/src/BuildInfo.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ const clientVersion = require('../package.json').version; +/** @internal */ export class BuildInfo { public static readonly UNKNOWN_VERSION_ID = -1; diff --git a/src/ClientInfo.ts b/src/ClientInfo.ts index 36aa72c11..5184743e2 100644 --- a/src/ClientInfo.ts +++ b/src/ClientInfo.ts @@ -17,6 +17,9 @@ import {Address} from './Address'; import {UUID} from './core/UUID'; +/** + * Local information of the client. + */ export class ClientInfo { /** @@ -43,4 +46,5 @@ export class ClientInfo { * Set of all labels of this client. */ labels: Set; + } diff --git a/src/ClientMessage.ts b/src/ClientMessage.ts index 7c6d32a4b..dbcf8c12c 100644 --- a/src/ClientMessage.ts +++ b/src/ClientMessage.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {BitsUtil} from './BitsUtil'; import {ClientConnection} from './network/ClientConnection'; @@ -20,10 +21,13 @@ import {FixSizedTypesCodec} from './codec/builtin/FixSizedTypesCodec'; const MESSAGE_TYPE_OFFSET = 0; const CORRELATION_ID_OFFSET = MESSAGE_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export const RESPONSE_BACKUP_ACKS_OFFSET = CORRELATION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export const PARTITION_ID_OFFSET = CORRELATION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const FRAGMENTATION_ID_OFFSET = 0; +/** @internal */ export const DEFAULT_FLAGS = 0; const BEGIN_FRAGMENT_FLAG = 1 << 15; const END_FRAGMENT_FLAG = 1 << 14; @@ -34,8 +38,10 @@ const END_DATA_STRUCTURE_FLAG = 1 << 11; const IS_NULL_FLAG = 1 << 10; const IS_EVENT_FLAG = 1 << 9; +/** @internal */ export const SIZE_OF_FRAME_LENGTH_AND_FLAGS = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.SHORT_SIZE_IN_BYTES; +/** @internal */ export class Frame { content: Buffer; flags: number; @@ -105,10 +111,14 @@ export class Frame { } } +/** @internal */ export const NULL_FRAME = new Frame(Buffer.allocUnsafe(0), IS_NULL_FLAG); +/** @internal */ export const BEGIN_FRAME = new Frame(Buffer.allocUnsafe(0), BEGIN_DATA_STRUCTURE_FLAG); +/** @internal */ export const END_FRAME = new Frame(Buffer.allocUnsafe(0), END_DATA_STRUCTURE_FLAG); +/** @internal */ export class ClientMessage { startFrame: Frame; endFrame: Frame; diff --git a/src/ClusterDataFactory.ts b/src/ClusterDataFactory.ts index 92531422b..6f1e38ccf 100644 --- a/src/ClusterDataFactory.ts +++ b/src/ClusterDataFactory.ts @@ -13,16 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {IdentifiedDataSerializable} from './serialization/Serializable'; -import {Address} from './Address'; +import {AddressImpl} from './Address'; +/** @internal */ export const CLUSTER_DATA_FACTORY_ID = 0; +/** @internal */ export const CLUSTER_DATA_ADDRESS_CLASS_ID = 1; +/** @internal */ export function clusterDataFactory(classId: number): IdentifiedDataSerializable { if (classId === CLUSTER_DATA_ADDRESS_CLASS_ID) { - return new Address(); + return new AddressImpl(); } return null; } diff --git a/src/DataStoreHashMap.ts b/src/DataStoreHashMap.ts index 3669c5309..2441f110c 100644 --- a/src/DataStoreHashMap.ts +++ b/src/DataStoreHashMap.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {Data} from './serialization/Data'; +/** @internal */ export class DataKeyedHashMap { size: number; diff --git a/src/DistributedObjectInfo.ts b/src/DistributedObjectInfo.ts index 507c65d0a..a25195703 100644 --- a/src/DistributedObjectInfo.ts +++ b/src/DistributedObjectInfo.ts @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ +/** @internal */ export class DistributedObjectInfo { serviceName: string; name: string; diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index f636fdab2..389c9599f 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -21,14 +21,15 @@ import {ClientConfig, ClientConfigImpl} from './config/Config'; import {ConfigBuilder} from './config/ConfigBuilder'; import {DistributedObject} from './DistributedObject'; import {ClientConnectionManager} from './network/ClientConnectionManager'; +import {Cluster} from './core/Cluster'; import {ClusterService} from './invocation/ClusterService'; import {InvocationService} from './invocation/InvocationService'; -import {LifecycleService} from './LifecycleService'; +import {LifecycleService, LifecycleServiceImpl} from './LifecycleService'; import {ListenerService} from './ListenerService'; import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; import {LoggingService} from './logging/LoggingService'; import {RepairingTask} from './nearcache/RepairingTask'; -import {PartitionService} from './PartitionService'; +import {PartitionService, PartitionServiceImpl} from './PartitionService'; import {ClientErrorFactory} from './protocol/ErrorFactory'; import {FlakeIdGenerator} from './proxy/FlakeIdGenerator'; import {IList} from './proxy/IList'; @@ -57,31 +58,60 @@ import {RoundRobinLB} from './util/RoundRobinLB'; import {ClusterViewListenerService} from './listener/ClusterViewListenerService'; import {ClientMessage} from './ClientMessage'; +/** + * Hazelcast client instance. When you want to use Hazelcast's distributed + * data structures, you must first create a client instance. Multiple + * instances can be created on a single Node.js process. + * + * Client instances should be shut down explicitly. + */ export default class HazelcastClient { + + /** @internal */ private static CLIENT_ID = 0; + /** @internal */ private readonly instanceName: string; + /** @internal */ private readonly id: number = HazelcastClient.CLIENT_ID++; + /** @internal */ private readonly config: ClientConfigImpl; + /** @internal */ private readonly loggingService: LoggingService; + /** @internal */ private readonly serializationService: SerializationService; + /** @internal */ private readonly invocationService: InvocationService; + /** @internal */ private readonly listenerService: ListenerService; + /** @internal */ private readonly connectionManager: ClientConnectionManager; - private readonly partitionService: PartitionService; + /** @internal */ + private readonly partitionService: PartitionServiceImpl; + /** @internal */ private readonly clusterService: ClusterService; - private readonly lifecycleService: LifecycleService; + /** @internal */ + private readonly lifecycleService: LifecycleServiceImpl; + /** @internal */ private readonly proxyManager: ProxyManager; + /** @internal */ private readonly nearCacheManager: NearCacheManager; + /** @internal */ private readonly lockReferenceIdGenerator: LockReferenceIdGenerator; + /** @internal */ private readonly errorFactory: ClientErrorFactory; + /** @internal */ private readonly statistics: Statistics; + /** @internal */ private readonly addressProvider: AddressProvider; + /** @internal */ private readonly loadBalancer: LoadBalancer; + /** @internal */ private readonly clusterViewListenerService: ClusterViewListenerService; - + /** @internal */ private mapRepairingTask: RepairingTask; + /** @internal */ constructor(config: ClientConfigImpl) { this.config = config; this.instanceName = config.instanceName || 'hz.client_' + this.id; @@ -91,13 +121,13 @@ export default class HazelcastClient { this.listenerService = new ListenerService(this); this.serializationService = new SerializationServiceV1(this.config.serialization); this.nearCacheManager = new NearCacheManager(this); - this.partitionService = new PartitionService(this); + this.partitionService = new PartitionServiceImpl(this); this.addressProvider = this.createAddressProvider(); this.connectionManager = new ClientConnectionManager(this); this.invocationService = new InvocationService(this); this.proxyManager = new ProxyManager(this); this.clusterService = new ClusterService(this); - this.lifecycleService = new LifecycleService(this); + this.lifecycleService = new LifecycleServiceImpl(this); this.lockReferenceIdGenerator = new LockReferenceIdGenerator(); this.errorFactory = new ClientErrorFactory(); this.statistics = new Statistics(this); @@ -109,7 +139,7 @@ export default class HazelcastClient { * @param config Default {@link ClientConfig} is used when this parameter is absent. * @returns a new client instance */ - public static newHazelcastClient(config?: ClientConfig): Promise { + static newHazelcastClient(config?: ClientConfig): Promise { const configBuilder = new ConfigBuilder(config); const effectiveConfig = configBuilder.build(); const client = new HazelcastClient(effectiveConfig); @@ -129,7 +159,7 @@ export default class HazelcastClient { * Gathers information of this local client. * @returns {ClientInfo} */ - getLocalEndpoint(): ClientInfo { + getLocalEndpoint(): ClientInfo { return this.clusterService.getLocalClient(); } @@ -266,48 +296,69 @@ export default class HazelcastClient { /** * Returns configuration that this instance started with. * Returned configuration object should not be modified. - * @returns {ClientConfigImpl} + * @returns {ClientConfig} configuration object */ - getConfig(): ClientConfigImpl { + getConfig(): ClientConfig { return this.config; } + /** + * Returns the Cluster to which this client is connected. + */ + getCluster(): Cluster { + return this.clusterService; + } + + /** + * Returns the lifecycle service for this client. + */ + getLifecycleService(): LifecycleService { + return this.lifecycleService; + } + + /** + * Returns the partition service of this client. + */ + getPartitionService(): PartitionService { + return this.partitionService; + } + + /** @internal */ getSerializationService(): SerializationService { return this.serializationService; } + /** @internal */ getInvocationService(): InvocationService { return this.invocationService; } + /** @internal */ getListenerService(): ListenerService { return this.listenerService; } + /** @internal */ getConnectionManager(): ClientConnectionManager { return this.connectionManager; } - getPartitionService(): PartitionService { - return this.partitionService; - } - + /** @internal */ getProxyManager(): ProxyManager { return this.proxyManager; } + /** @internal */ getNearCacheManager(): NearCacheManager { return this.nearCacheManager; } + /** @internal */ getClusterService(): ClusterService { return this.clusterService; } - getLifecycleService(): LifecycleService { - return this.lifecycleService; - } - + /** @internal */ getRepairingTask(): RepairingTask { if (this.mapRepairingTask == null) { this.mapRepairingTask = new RepairingTask(this); @@ -315,52 +366,50 @@ export default class HazelcastClient { return this.mapRepairingTask; } + /** @internal */ getLoggingService(): LoggingService { return this.loggingService; } /** * Registers a distributed object listener to cluster. - * @param listenerFunc Callback function will be called with following arguments. - *

    - *
  • service name
    • - *
  • distributed object name
    • - *
  • name of the event that happened: either 'created' or 'destroyed'
    • - *
+ * @param listener distributed object listener function. * @returns registration id of the listener. */ - addDistributedObjectListener(distributedObjectListener: DistributedObjectListener): Promise { - return this.proxyManager.addDistributedObjectListener(distributedObjectListener); + addDistributedObjectListener(listener: DistributedObjectListener): Promise { + return this.proxyManager.addDistributedObjectListener(listener); } /** * Removes a distributed object listener from cluster. * @param listenerId id of the listener to be removed. - * @returns `true` if registration is removed, `false` otherwise. + * @returns `true` if registration was removed, `false` otherwise. */ removeDistributedObjectListener(listenerId: string): Promise { return this.proxyManager.removeDistributedObjectListener(listenerId); } + /** @internal */ getLockReferenceIdGenerator(): LockReferenceIdGenerator { return this.lockReferenceIdGenerator; } + /** @internal */ getErrorFactory(): ClientErrorFactory { return this.errorFactory; } - /** - * Returns the {@link AddressProvider} of the client. - */ + /** @internal */ getAddressProvider(): AddressProvider { return this.addressProvider; } + /** @internal */ getLoadBalancer(): LoadBalancer { return this.loadBalancer; } + /** @internal */ doShutdown(): void { if (this.mapRepairingTask !== undefined) { this.mapRepairingTask.shutdown(); @@ -379,6 +428,7 @@ export default class HazelcastClient { this.getLifecycleService().shutdown(); } + /** @internal */ onClusterRestart(): void { this.getLoggingService().getLogger() .info('HazelcastClient', 'Clearing local state of the client, because of a cluster restart'); @@ -386,10 +436,12 @@ export default class HazelcastClient { this.clusterService.clearMemberListVersion(); } - public sendStateToCluster(): Promise { + /** @internal */ + sendStateToCluster(): Promise { return this.proxyManager.createDistributedObjectsOnCluster(); } + /** @internal */ private init(): Promise { try { this.lifecycleService.start(); @@ -425,6 +477,7 @@ export default class HazelcastClient { }); } + /** @internal */ private initLoadBalancer(): LoadBalancer { let lb = this.config.loadBalancer.customLoadBalancer; if (lb == null) { @@ -440,8 +493,9 @@ export default class HazelcastClient { return lb; } + /** @internal */ private createAddressProvider(): AddressProvider { - const networkConfig = this.getConfig().network; + const networkConfig = this.config.network; const addressListProvided = networkConfig.clusterMembers.length !== 0; const hazelcastCloudToken = networkConfig.hazelcastCloud.discoveryToken; @@ -459,6 +513,7 @@ export default class HazelcastClient { return new DefaultAddressProvider(networkConfig); } + /** @internal */ private initCloudAddressProvider(): HazelcastCloudAddressProvider { const cloudConfig = this.getConfig().network.hazelcastCloud; const discoveryToken = cloudConfig.discoveryToken; @@ -470,6 +525,7 @@ export default class HazelcastClient { return null; } + /** @internal */ private getConnectionTimeoutMillis(): number { const networkConfig = this.getConfig().network; const connTimeout = networkConfig.connectionTimeout; diff --git a/src/HazelcastError.ts b/src/HazelcastError.ts index 2fcf4da09..0a096eff6 100644 --- a/src/HazelcastError.ts +++ b/src/HazelcastError.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +/** @internal */ export interface HazelcastErrorConstructor { readonly prototype: Error; diff --git a/src/HeartbeatManager.ts b/src/HeartbeatManager.ts index 3159b80f5..9f5ef96d3 100644 --- a/src/HeartbeatManager.ts +++ b/src/HeartbeatManager.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ClientPingCodec} from './codec/ClientPingCodec'; import HazelcastClient from './HazelcastClient'; @@ -28,6 +29,7 @@ const PROPERTY_HEARTBEAT_TIMEOUT = 'hazelcast.client.heartbeat.timeout'; /** * HeartbeatManager manager used by connection manager. + * @internal */ export class HeartbeatManager { private client: HazelcastClient; diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index fa047446c..a7dd6a691 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -63,9 +63,27 @@ export enum LifecycleState { const LIFECYCLE_EVENT_NAME = 'lifecycleEvent'; /** - * LifecycleService + * Lifecycle service for Hazelcast clients. Allows to determine lifecycle + * state of the client and shut it down. */ -export class LifecycleService extends EventEmitter { +export interface LifecycleService { + + /** + * Returns the active state of the client. + * @returns {boolean} + */ + isRunning(): boolean; + + /** + * Shuts down the client. + */ + shutdown(): void; + +} + +/** @internal */ +export class LifecycleServiceImpl extends EventEmitter implements LifecycleService { + private active: boolean; private client: HazelcastClient; private logger: ILogger; @@ -98,13 +116,13 @@ export class LifecycleService extends EventEmitter { return this.active; } - public start(): void { + start(): void { this.emitLifecycleEvent(LifecycleState.STARTING); this.active = true; this.emitLifecycleEvent(LifecycleState.STARTED); } - public shutdown(): void { + shutdown(): void { if (!this.active) { return; } diff --git a/src/ListenerMessageCodec.ts b/src/ListenerMessageCodec.ts index 7dc07f842..6fc203df6 100644 --- a/src/ListenerMessageCodec.ts +++ b/src/ListenerMessageCodec.ts @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ClientMessage} from './ClientMessage'; import {UUID} from './core/UUID'; +/** @internal */ export interface ListenerMessageCodec { encodeAddRequest: (localOnly: boolean) => ClientMessage; decodeAddResponse: (msg: ClientMessage) => UUID; diff --git a/src/ListenerService.ts b/src/ListenerService.ts index 1e56ffd47..e631f497d 100644 --- a/src/ListenerService.ts +++ b/src/ListenerService.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import HazelcastClient from './HazelcastClient'; @@ -26,7 +27,9 @@ import {DeferredPromise} from './Util'; import {UuidUtil} from './util/UuidUtil'; import {ILogger} from './logging/ILogger'; +/** @internal */ export class ListenerService { + private client: HazelcastClient; private logger: ILogger; private isSmartService: boolean; diff --git a/src/LoadBalancer.ts b/src/LoadBalancer.ts index f24db9082..4dce5e7c7 100644 --- a/src/LoadBalancer.ts +++ b/src/LoadBalancer.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientConfigImpl} from './config/Config'; +import {ClientConfig} from './config/Config'; import {Cluster} from './core/Cluster'; import {Member} from './core/Member'; @@ -35,7 +35,7 @@ export interface LoadBalancer { * @param cluster the Cluster this LoadBalancer uses to select members from. * @param config the ClientConfig. */ - initLoadBalancer(cluster: Cluster, config: ClientConfigImpl): void; + initLoadBalancer(cluster: Cluster, config: ClientConfig): void; /** * Returns the next member to route to. diff --git a/src/LockReferenceIdGenerator.ts b/src/LockReferenceIdGenerator.ts index 4f508c3ac..b95daded8 100644 --- a/src/LockReferenceIdGenerator.ts +++ b/src/LockReferenceIdGenerator.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; +/** @internal */ export class LockReferenceIdGenerator { private counter: Long = Long.fromNumber(0); diff --git a/src/PartitionService.ts b/src/PartitionService.ts index e951d275a..c07e8ca57 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -20,18 +20,48 @@ import {ClientConnection} from './network/ClientConnection'; import {UUID} from './core/UUID'; import {ClientOfflineError} from './HazelcastError'; +/** + * Partition service for Hazelcast clients. Allows to retrieve information + * about the partition count, the partition owner or the partitionId of a key. + */ +export interface PartitionService { + + /** + * Returns UUID of owner member for a given partition id. + * + * @param partitionId partition id + * @return UUID of the owner of the partition + * or `undefined` if a partition is not assigned yet + */ + getPartitionOwner(partitionId: number): UUID; + + /** + * Returns partition count of the connected cluster. + * If partition table is not fetched yet, this method returns `0`. + * + * @return the partition count + */ + getPartitionCount(): number; + + /** + * Computes the partition id for a given key. + * + * @param key + * @returns the partition id. + * @throws ClientOfflineError if the partition table has not arrived yet. + */ + getPartitionId(key: any): number; + +} + class PartitionTable { connection: ClientConnection; partitionStateVersion = -1; partitions = new Map(); } -/** - * Partition service for Hazelcast clients. - * - * Allows to retrieve information about the partition count, the partition owner or the partitionId of a key. - */ -export class PartitionService { +/** @internal */ +export class PartitionServiceImpl implements PartitionService { private client: HazelcastClient; private partitionTable = new PartitionTable(); @@ -46,8 +76,8 @@ export class PartitionService { /** * The partitions can be empty on the response, client will not apply the empty partition table. */ - public handlePartitionViewEvent(connection: ClientConnection, partitions: Array<[UUID, number[]]>, - partitionStateVersion: number): void { + handlePartitionViewEvent(connection: ClientConnection, partitions: Array<[UUID, number[]]>, + partitionStateVersion: number): void { this.logger.debug('PartitionService', 'Handling new partition table with partitionStateVersion: ' + partitionStateVersion); if (!this.shouldBeApplied(connection, partitions, partitionStateVersion, this.partitionTable)) { @@ -59,21 +89,11 @@ export class PartitionService { this.partitionTable.partitions = newPartitions; } - /** - * @param partitionId - * @return the owner of the partition or `undefined` if a partition is not assigned yet - */ - public getPartitionOwner(partitionId: number): UUID { + getPartitionOwner(partitionId: number): UUID { return this.getPartitions().get(partitionId); } - /** - * Computes the partition id for a given key. - * @param key - * @returns the partition id. - * @throws ClientOfflineError if the partition table is not arrived yet. - */ - public getPartitionId(key: any): number { + getPartitionId(key: any): number { if (this.partitionCount === 0) { // Partition count can not be zero for the sync mode. // On the sync mode, we are waiting for the first connection to be established. @@ -90,12 +110,7 @@ export class PartitionService { return Math.abs(partitionHash) % this.partitionCount; } - /** - * If partition table is not fetched yet, this method returns zero - * - * @return the partition count - */ - public getPartitionCount(): number { + getPartitionCount(): number { return this.partitionCount; } @@ -104,7 +119,7 @@ export class PartitionService { * @return true if partition count can be set for the first time, or it is equal to * one that is already available, returns false otherwise */ - public checkAndSetPartitionCount(newPartitionCount: number): boolean { + checkAndSetPartitionCount(newPartitionCount: number): boolean { if (this.partitionCount === 0) { this.partitionCount = newPartitionCount; return true; diff --git a/src/Util.ts b/src/Util.ts index 7a4169e40..2cdc2212b 100644 --- a/src/Util.ts +++ b/src/Util.ts @@ -13,25 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as assert from 'assert'; import * as Long from 'long'; import * as Promise from 'bluebird'; import * as Path from 'path'; -import {Address} from './Address'; +import {AddressImpl} from './Address'; +/** @internal */ export function assertNotNull(v: any): void { assert.notEqual(v, null, 'Non null value expected.'); } +/** @internal */ export function assertArray(x: any): void { assert(Array.isArray(x), 'Should be array.'); } +/** @internal */ export function assertString(v: any): void { assert(typeof v === 'string', 'String value expected.'); } +/** @internal */ export function shuffleArray(array: T[]): void { let randomIndex: number; let temp: T; @@ -43,10 +48,12 @@ export function shuffleArray(array: T[]): void { } } +/** @internal */ export function assertNotNegative(v: number, message = 'The value cannot be negative.'): void { assert(v >= 0, message); } +/** @internal */ export function getType(obj: any): string { assertNotNull(obj); if (Long.isLong(obj)) { @@ -61,10 +68,12 @@ export function getType(obj: any): string { } } +/** @internal */ export function enumFromString(enumType: any, value: string): T { return enumType[value]; } +/** @internal */ export function copyObjectShallow(obj: T): T { if (obj === undefined || obj === null) { return obj; @@ -81,6 +90,7 @@ export function copyObjectShallow(obj: T): T { assert(false, 'Object should be undefined or type of object.'); } +/** @internal */ export function tryGetBoolean(val: any): boolean { if (typeof val === 'boolean') { return val; @@ -89,6 +99,7 @@ export function tryGetBoolean(val: any): boolean { } } +/** @internal */ export function tryGetNumber(val: any): number { if (typeof val === 'number') { return val; @@ -97,6 +108,7 @@ export function tryGetNumber(val: any): number { } } +/** @internal */ export function tryGetArray(val: any): any[] { if (Array.isArray(val)) { return val; @@ -105,6 +117,7 @@ export function tryGetArray(val: any): any[] { } } +/** @internal */ export function tryGetString(val: any): string { if (typeof val === 'string') { return val; @@ -113,6 +126,7 @@ export function tryGetString(val: any): string { } } +/** @internal */ export function getStringOrUndefined(val: any): string { try { return tryGetString(val); @@ -121,6 +135,7 @@ export function getStringOrUndefined(val: any): string { } } +/** @internal */ export function getBooleanOrUndefined(val: any): boolean { try { return tryGetBoolean(val); @@ -129,6 +144,7 @@ export function getBooleanOrUndefined(val: any): boolean { } } +/** @internal */ export function tryGetEnum(enumClass: any | { [index: string]: number }, str: string): T { const result = enumClass[str.toUpperCase()]; if (result == null) { @@ -137,16 +153,19 @@ export function tryGetEnum(enumClass: any | { [index: string]: number }, str: return result; } +/** @internal */ export function resolvePath(path: string): string { const basePath = process.cwd(); return Path.resolve(basePath, path); } +/** @internal */ export class AddressHelper { + private static readonly MAX_PORT_TRIES: number = 3; private static readonly INITIAL_FIRST_PORT: number = 5701; - static getSocketAddresses(address: string): Address[] { + static getSocketAddresses(address: string): AddressImpl[] { const addressHolder = this.createAddressFromString(address, -1); let possiblePort = addressHolder.port; let maxPortTryCount = 1; @@ -155,16 +174,16 @@ export class AddressHelper { possiblePort = AddressHelper.INITIAL_FIRST_PORT; } - const addresses: Address[] = []; + const addresses: AddressImpl[] = []; for (let i = 0; i < maxPortTryCount; i++) { - addresses.push(new Address(addressHolder.host, possiblePort + i)); + addresses.push(new AddressImpl(addressHolder.host, possiblePort + i)); } return addresses; } - static createAddressFromString(address: string, defaultPort?: number): Address { + static createAddressFromString(address: string, defaultPort?: number): AddressImpl { const indexBracketStart = address.indexOf('['); const indexBracketEnd = address.indexOf(']', indexBracketStart); const indexColon = address.indexOf(':'); @@ -187,7 +206,7 @@ export class AddressHelper { } else { host = address; } - return new Address(host, port); + return new AddressImpl(host, port); } } @@ -197,17 +216,21 @@ export class AddressHelper { * Upper bound should be an integer. * @param upperBound * @returns A random integer between [0-upperBound) + * @internal */ export function randomInt(upperBound: number): number { return Math.floor(Math.random() * upperBound); } +/** @internal */ export class Task { intervalId: NodeJS.Timer; timeoutId: NodeJS.Timer; } -export function scheduleWithRepetition(callback: (...args: any[]) => void, initialDelay: number, +/** @internal */ +export function scheduleWithRepetition(callback: (...args: any[]) => void, + initialDelay: number, periodMillis: number): Task { const task = new Task(); task.timeoutId = setTimeout(function (): void { @@ -218,6 +241,7 @@ export function scheduleWithRepetition(callback: (...args: any[]) => void, initi return task; } +/** @internal */ export function cancelRepetitionTask(task: Task): void { if (task.intervalId != null) { clearInterval(task.intervalId); @@ -226,6 +250,7 @@ export function cancelRepetitionTask(task: Task): void { } } +/** @internal */ export function DeferredPromise(): Promise.Resolver { let resolve: any; let reject: any; @@ -240,6 +265,7 @@ export function DeferredPromise(): Promise.Resolver { } as Promise.Resolver; } +/** @internal */ export function getNodejsMajorVersion(): number { const versionString = process.version; const versions = versionString.split('.'); diff --git a/src/aggregation/Aggregator.ts b/src/aggregation/Aggregator.ts index f1a38a343..7e49aabe1 100644 --- a/src/aggregation/Aggregator.ts +++ b/src/aggregation/Aggregator.ts @@ -19,9 +19,13 @@ import {DataInput, DataOutput} from '../serialization/Data'; import {IdentifiedDataSerializable} from '../serialization/Serializable'; import * as AggregatorFactory from './AggregatorFactory'; +/** + * Base interface for all aggregators. + */ export interface Aggregator extends IdentifiedDataSerializable { } +/** @internal */ export abstract class AbstractAggregator implements Aggregator { abstract classId: number; @@ -37,6 +41,7 @@ export abstract class AbstractAggregator implements Aggregator { abstract writeData(output: DataOutput): void; } +/** @internal */ export class CountAggregator extends AbstractAggregator { classId = AggregatorFactory.COUNT; @@ -54,6 +59,7 @@ export class CountAggregator extends AbstractAggregator { } } +/** @internal */ export class DoubleAverageAggregator extends AbstractAggregator { classId = AggregatorFactory.DOUBLE_AVG; @@ -71,6 +77,7 @@ export class DoubleAverageAggregator extends AbstractAggregator { } } +/** @internal */ export class DoubleSumAggregator extends AbstractAggregator { classId = AggregatorFactory.DOUBLE_SUM; @@ -86,6 +93,7 @@ export class DoubleSumAggregator extends AbstractAggregator { } } +/** @internal */ export class NumberAverageAggregator extends AbstractAggregator { classId = AggregatorFactory.NUMBER_AVG; @@ -103,6 +111,7 @@ export class NumberAverageAggregator extends AbstractAggregator { } } +/** @internal */ export class FixedPointSumAggregator extends AbstractAggregator { classId = AggregatorFactory.FIXED_SUM; @@ -118,6 +127,7 @@ export class FixedPointSumAggregator extends AbstractAggregator { } } +/** @internal */ export class FloatingPointSumAggregator extends AbstractAggregator { classId = AggregatorFactory.FLOATING_POINT_SUM; @@ -133,6 +143,7 @@ export class FloatingPointSumAggregator extends AbstractAggregator { } } +/** @internal */ export class MaxAggregator extends AbstractAggregator { classId = AggregatorFactory.MAX; @@ -148,6 +159,7 @@ export class MaxAggregator extends AbstractAggregator { } } +/** @internal */ export class MinAggregator extends AbstractAggregator { classId = AggregatorFactory.MIN; @@ -163,6 +175,7 @@ export class MinAggregator extends AbstractAggregator { } } +/** @internal */ export class IntegerAverageAggregator extends AbstractAggregator { classId = AggregatorFactory.INT_AVG; @@ -180,6 +193,7 @@ export class IntegerAverageAggregator extends AbstractAggregator { } } +/** @internal */ export class IntegerSumAggregator extends AbstractAggregator { classId = AggregatorFactory.INT_SUM; @@ -195,6 +209,7 @@ export class IntegerSumAggregator extends AbstractAggregator { } } +/** @internal */ export class LongAverageAggregator extends AbstractAggregator { classId = AggregatorFactory.LONG_AVG; @@ -212,6 +227,7 @@ export class LongAverageAggregator extends AbstractAggregator { } } +/** @internal */ export class LongSumAggregator extends AbstractAggregator { classId = AggregatorFactory.LONG_SUM; diff --git a/src/aggregation/AggregatorFactory.ts b/src/aggregation/AggregatorFactory.ts index f1f64d3c6..d102accfa 100644 --- a/src/aggregation/AggregatorFactory.ts +++ b/src/aggregation/AggregatorFactory.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {IdentifiedDataSerializable} from '../serialization/Serializable'; import { @@ -32,24 +33,37 @@ import { } from './Aggregator'; import {HazelcastError} from '../HazelcastError'; +/** @internal */ export const AGGREGATOR_FACTORY_ID = -29; // export const BIG_DECIMAL_AVG = 0; // not implemented in node.js // export const BIG_DECIMAL_SUM = 1; // not implemented in node.js // export const BIG_INT_AVG = 2; // not implemented in node.js // export const BIG_INT_SUM = 3; // not implemented in node.js +/** @internal */ export const COUNT = 4; // export const DISTINCT = 5; // returns java serializable, not usable in node.js +/** @internal */ export const DOUBLE_AVG = 6; +/** @internal */ export const DOUBLE_SUM = 7; +/** @internal */ export const FIXED_SUM = 8; +/** @internal */ export const FLOATING_POINT_SUM = 9; +/** @internal */ export const INT_AVG = 10; +/** @internal */ export const INT_SUM = 11; +/** @internal */ export const LONG_AVG = 12; +/** @internal */ export const LONG_SUM = 13; +/** @internal */ export const MAX = 14; +/** @internal */ export const MIN = 15; +/** @internal */ export const NUMBER_AVG = 16; // export const MAX_BY = 17; // needs object to implement Java's Comparable interface // export const MIN_BY = 18; // needs object to implement Java's Comparable interface @@ -69,6 +83,7 @@ const idToConstructor: { [id: number]: new () => Aggregator } = { [NUMBER_AVG]: NumberAverageAggregator, }; +/** @internal */ export function aggregatorFactory(classId: number): IdentifiedDataSerializable { try { return new idToConstructor[classId](); diff --git a/src/aggregation/Aggregators.ts b/src/aggregation/Aggregators.ts index 35ca07074..901608531 100644 --- a/src/aggregation/Aggregators.ts +++ b/src/aggregation/Aggregators.ts @@ -15,6 +15,7 @@ */ import { + Aggregator, CountAggregator, DoubleAverageAggregator, DoubleSumAggregator, @@ -33,64 +34,64 @@ import { * @param attributePath extracts values from this path if given * @return an aggregator that counts the input values. * Accepts nulls as input values. - * Aggregation result type Long. + * Aggregation result type `Long`. */ -export function count(attributePath?: string): CountAggregator { +export function count(attributePath?: string): Aggregator { return new CountAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the average of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts only Double input values (primitive and boxed). - * Aggregation result type is number. + * Aggregation result type is `number`. */ -export function doubleAvg(attributePath?: string): DoubleAverageAggregator { +export function doubleAvg(attributePath?: string): Aggregator { return new DoubleAverageAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the sum of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts only Double input values (primitive and boxed). - * Aggregation result type is Double. + * Aggregation result type is `number`. */ -export function doubleSum(attributePath?: string): DoubleSumAggregator { +export function doubleSum(attributePath?: string): Aggregator { return new DoubleSumAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the average of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts generic Number input values. - * Aggregation result type is Double. + * Aggregation result type is `number`. */ -export function numberAvg(attributePath?: string): NumberAverageAggregator { +export function numberAvg(attributePath?: string): Aggregator { return new NumberAverageAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the sum of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts generic Number input values. - * Aggregation result type is {Long}. + * Aggregation result type is `Long`. */ -export function fixedPointSum(attributePath?: string): FixedPointSumAggregator { +export function fixedPointSum(attributePath?: string): Aggregator { return new FixedPointSumAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the sum of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts generic Number input values. - * Aggregation result type is number. + * Aggregation result type is `number`. */ -export function floatingPointSum(attributePath?: string): FloatingPointSumAggregator { +export function floatingPointSum(attributePath?: string): Aggregator { return new FloatingPointSumAggregator(attributePath); } @@ -98,10 +99,10 @@ export function floatingPointSum(attributePath?: string): FloatingPointSumAggreg * @param attributePath extracts values from this path if given * @param type of the input object. * @return an aggregator that calculates the max of the input values. - * Accepts null input values. - * Aggregation result type is + * Accepts `null` input values. + * Aggregation result type is `R`. */ -export function max(attributePath?: string): MaxAggregator { +export function max(attributePath?: string): Aggregator { return new MaxAggregator(attributePath); } @@ -109,53 +110,53 @@ export function max(attributePath?: string): MaxAggregator { * @param attributePath extracts values from this path if given * @param type of the input object. * @return an aggregator that calculates the min of the input values. - * Accepts null input values. - * Aggregation result type is + * Accepts `null` input values. + * Aggregation result type is `R`. */ -export function min(attributePath?: string): MinAggregator { +export function min(attributePath?: string): Aggregator { return new MinAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the average of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts only Integer input values (primitive and boxed). - * Aggregation result type is number. + * Aggregation result type is `number`. */ -export function integerAvg(attributePath?: string): IntegerAverageAggregator { +export function integerAvg(attributePath?: string): Aggregator { return new IntegerAverageAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the sum of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts only Integer input values (primitive and boxed). - * Aggregation result type is {Long}. + * Aggregation result type is `Long`. */ -export function integerSum(attributePath?: string): IntegerSumAggregator { +export function integerSum(attributePath?: string): Aggregator { return new IntegerSumAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the average of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts only Long input values (primitive and boxed). - * Aggregation result type is number. + * Aggregation result type is `number`. */ -export function longAvg(attributePath?: string): LongAverageAggregator { +export function longAvg(attributePath?: string): Aggregator { return new LongAverageAggregator(attributePath); } /** * @param attributePath extracts values from this path if given * @return an aggregator that calculates the sum of the input values. - * Does NOT accept null input values. + * Does NOT accept `null` input values. * Accepts only Long input values (primitive and boxed). - * Aggregation result type is {Long}. + * Aggregation result type is `Long`. */ -export function longSum(attributePath?: string): LongSumAggregator { +export function longSum(attributePath?: string): Aggregator { return new LongSumAggregator(attributePath); } diff --git a/src/codec/ClientAddClusterViewListenerCodec.ts b/src/codec/ClientAddClusterViewListenerCodec.ts index 148ca679b..ce71ac7a9 100644 --- a/src/codec/ClientAddClusterViewListenerCodec.ts +++ b/src/codec/ClientAddClusterViewListenerCodec.ts @@ -37,6 +37,7 @@ const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BY const EVENT_MEMBERS_VIEW_VERSION_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_PARTITIONS_VIEW_VERSION_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ClientAddClusterViewListenerCodec { static encodeRequest(): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index c07f15a71..fed44c1d2 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -33,10 +33,12 @@ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_LOCAL_ONLY_OFFSET + BitsUtil.BOOLEAN_ const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const EVENT_DISTRIBUTED_OBJECT_SOURCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ClientAddDistributedObjectListenerResponseParams { response: UUID; } +/** @internal */ export class ClientAddDistributedObjectListenerCodec { static encodeRequest(localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 18906e074..6e2997ded 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -34,10 +34,12 @@ const EVENT_PARTITION_LOST_PARTITION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil. const EVENT_PARTITION_LOST_LOST_BACKUP_COUNT_OFFSET = EVENT_PARTITION_LOST_PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_PARTITION_LOST_SOURCE_OFFSET = EVENT_PARTITION_LOST_LOST_BACKUP_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ClientAddPartitionLostListenerResponseParams { response: UUID; } +/** @internal */ export class ClientAddPartitionLostListenerCodec { static encodeRequest(localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index 2761af75b..96c9c4962 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -22,7 +22,7 @@ import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; import {CodecUtil} from './builtin/CodecUtil'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; import {AddressCodec} from './custom/AddressCodec'; // hex: 0x000100 @@ -40,9 +40,10 @@ const RESPONSE_PARTITION_COUNT_OFFSET = RESPONSE_SERIALIZATION_VERSION_OFFSET + const RESPONSE_CLUSTER_ID_OFFSET = RESPONSE_PARTITION_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_FAILOVER_SUPPORTED_OFFSET = RESPONSE_CLUSTER_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ClientAuthenticationResponseParams { status: number; - address: Address; + address: AddressImpl; memberUuid: UUID; serializationVersion: number; serverHazelcastVersion: string; @@ -51,6 +52,7 @@ export interface ClientAuthenticationResponseParams { failoverSupported: boolean; } +/** @internal */ export class ClientAuthenticationCodec { static encodeRequest(clusterName: string, username: string, password: string, uuid: UUID, clientType: string, serializationVersion: number, clientHazelcastVersion: string, clientName: string, labels: string[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 148adbcbb..0c122b51a 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -22,7 +22,7 @@ import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; import {ByteArrayCodec} from './builtin/ByteArrayCodec'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; import {AddressCodec} from './custom/AddressCodec'; import {CodecUtil} from './builtin/CodecUtil'; @@ -41,9 +41,10 @@ const RESPONSE_PARTITION_COUNT_OFFSET = RESPONSE_SERIALIZATION_VERSION_OFFSET + const RESPONSE_CLUSTER_ID_OFFSET = RESPONSE_PARTITION_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_FAILOVER_SUPPORTED_OFFSET = RESPONSE_CLUSTER_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ClientAuthenticationCustomResponseParams { status: number; - address: Address; + address: AddressImpl; memberUuid: UUID; serializationVersion: number; serverHazelcastVersion: string; @@ -52,6 +53,7 @@ export interface ClientAuthenticationCustomResponseParams { failoverSupported: boolean; } +/** @internal */ export class ClientAuthenticationCustomCodec { static encodeRequest(clusterName: string, credentials: Buffer, uuid: UUID, clientType: string, serializationVersion: number, clientHazelcastVersion: string, clientName: string, labels: string[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientCreateProxiesCodec.ts b/src/codec/ClientCreateProxiesCodec.ts index ff2fcea2c..4445dc1a4 100644 --- a/src/codec/ClientCreateProxiesCodec.ts +++ b/src/codec/ClientCreateProxiesCodec.ts @@ -27,6 +27,7 @@ const REQUEST_MESSAGE_TYPE = 3584; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ClientCreateProxiesCodec { static encodeRequest(proxies: Array<[string, string]>): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientCreateProxyCodec.ts b/src/codec/ClientCreateProxyCodec.ts index 48c5920f1..6df760062 100644 --- a/src/codec/ClientCreateProxyCodec.ts +++ b/src/codec/ClientCreateProxyCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 1024; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ClientCreateProxyCodec { static encodeRequest(name: string, serviceName: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index 75d59e33f..ad6b4f068 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -28,6 +28,7 @@ const REQUEST_MESSAGE_TYPE = 3328; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ClientDeployClassesCodec { static encodeRequest(classDefinitions: Array<[string, Buffer]>): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientDestroyProxyCodec.ts b/src/codec/ClientDestroyProxyCodec.ts index d2d938a5a..ebeaa73ae 100644 --- a/src/codec/ClientDestroyProxyCodec.ts +++ b/src/codec/ClientDestroyProxyCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 1280; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ClientDestroyProxyCodec { static encodeRequest(name: string, serviceName: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index b71d5b41b..6e0348656 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 2048; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ClientGetDistributedObjectsResponseParams { response: DistributedObjectInfo[]; } +/** @internal */ export class ClientGetDistributedObjectsCodec { static encodeRequest(): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientLocalBackupListenerCodec.ts b/src/codec/ClientLocalBackupListenerCodec.ts index 66d57a459..85a531cfc 100644 --- a/src/codec/ClientLocalBackupListenerCodec.ts +++ b/src/codec/ClientLocalBackupListenerCodec.ts @@ -32,10 +32,12 @@ const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BY const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const EVENT_BACKUP_SOURCE_INVOCATION_CORRELATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ClientLocalBackupListenerResponseParams { response: UUID; } +/** @internal */ export class ClientLocalBackupListenerCodec { static encodeRequest(): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientPingCodec.ts b/src/codec/ClientPingCodec.ts index ee853b33f..ee0fc9e71 100644 --- a/src/codec/ClientPingCodec.ts +++ b/src/codec/ClientPingCodec.ts @@ -25,6 +25,7 @@ const REQUEST_MESSAGE_TYPE = 2816; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ClientPingCodec { static encodeRequest(): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index 2ad922afc..e2bca73d8 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -29,10 +29,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ClientRemoveDistributedObjectListenerResponseParams { response: boolean; } +/** @internal */ export class ClientRemoveDistributedObjectListenerCodec { static encodeRequest(registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index 05a9385f1..76d396760 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -29,10 +29,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ClientRemovePartitionLostListenerResponseParams { response: boolean; } +/** @internal */ export class ClientRemovePartitionLostListenerCodec { static encodeRequest(registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts index ce8e17114..dd989c30a 100644 --- a/src/codec/ClientStatisticsCodec.ts +++ b/src/codec/ClientStatisticsCodec.ts @@ -30,6 +30,7 @@ const REQUEST_MESSAGE_TYPE = 3072; const REQUEST_TIMESTAMP_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMESTAMP_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class ClientStatisticsCodec { static encodeRequest(timestamp: Long, clientAttributes: string, metricsBlob: Buffer): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ClientTriggerPartitionAssignmentCodec.ts b/src/codec/ClientTriggerPartitionAssignmentCodec.ts index ce4e161cf..281a3f16e 100644 --- a/src/codec/ClientTriggerPartitionAssignmentCodec.ts +++ b/src/codec/ClientTriggerPartitionAssignmentCodec.ts @@ -25,6 +25,7 @@ const REQUEST_MESSAGE_TYPE = 4096; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ClientTriggerPartitionAssignmentCodec { static encodeRequest(): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts index e8464b1a6..63984f9c2 100644 --- a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -32,12 +32,14 @@ const RESPONSE_BASE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN const RESPONSE_INCREMENT_OFFSET = RESPONSE_BASE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_BATCH_SIZE_OFFSET = RESPONSE_INCREMENT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface FlakeIdGeneratorNewIdBatchResponseParams { base: Long; increment: Long; batchSize: number; } +/** @internal */ export class FlakeIdGeneratorNewIdBatchCodec { static encodeRequest(name: string, batchSize: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 5c9b3dd83..8f3c1c855 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 329216; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListAddAllResponseParams { response: boolean; } +/** @internal */ export class ListAddAllCodec { static encodeRequest(name: string, valueList: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index 7ceac7d5c..629542a15 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -32,10 +32,12 @@ const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListAddAllWithIndexResponseParams { response: boolean; } +/** @internal */ export class ListAddAllWithIndexCodec { static encodeRequest(name: string, index: number, valueList: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index e29301a3d..96e0cf29b 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 328704; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListAddResponseParams { response: boolean; } +/** @internal */ export class ListAddCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index aaa9f111d..9a57cc487 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -38,10 +38,12 @@ const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZ const EVENT_ITEM_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ITEM_EVENT_TYPE_OFFSET = EVENT_ITEM_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ListAddListenerResponseParams { response: UUID; } +/** @internal */ export class ListAddListenerCodec { static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListAddWithIndexCodec.ts b/src/codec/ListAddWithIndexCodec.ts index a45ffbf4f..55e3e095f 100644 --- a/src/codec/ListAddWithIndexCodec.ts +++ b/src/codec/ListAddWithIndexCodec.ts @@ -30,6 +30,7 @@ const REQUEST_MESSAGE_TYPE = 332032; const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ListAddWithIndexCodec { static encodeRequest(name: string, index: number, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListClearCodec.ts b/src/codec/ListClearCodec.ts index 3aebae119..c1776168a 100644 --- a/src/codec/ListClearCodec.ts +++ b/src/codec/ListClearCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 329984; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ListClearCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index 65f82d8d6..c9d518132 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 329472; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListCompareAndRemoveAllResponseParams { response: boolean; } +/** @internal */ export class ListCompareAndRemoveAllCodec { static encodeRequest(name: string, values: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 52ba7ea9b..11d47b039 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 329728; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListCompareAndRetainAllResponseParams { response: boolean; } +/** @internal */ export class ListCompareAndRetainAllCodec { static encodeRequest(name: string, values: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index 6ab5c6344..e13e4bc81 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 328448; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListContainsAllResponseParams { response: boolean; } +/** @internal */ export class ListContainsAllCodec { static encodeRequest(name: string, values: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index 50b16b9a8..2c09e3bfb 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 328192; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListContainsResponseParams { response: boolean; } +/** @internal */ export class ListContainsCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index 0df8fb71b..a93b3a487 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 330240; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ListGetAllResponseParams { response: Data[]; } +/** @internal */ export class ListGetAllCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index e1227138d..bf94750f7 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 331520; const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ListGetResponseParams { response: Data; } +/** @internal */ export class ListGetCodec { static encodeRequest(name: string, index: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index 5326676d0..f4d221ba5 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 332800; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListIndexOfResponseParams { response: number; } +/** @internal */ export class ListIndexOfCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index e4a26bb82..f05a2c1a8 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 331008; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListIsEmptyResponseParams { response: boolean; } +/** @internal */ export class ListIsEmptyCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 95e54926e..0914b97c5 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 333312; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ListIteratorResponseParams { response: Data[]; } +/** @internal */ export class ListIteratorCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index 3f15374d6..591531e9a 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 332544; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListLastIndexOfResponseParams { response: number; } +/** @internal */ export class ListLastIndexOfCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index 60c3f8ccb..9c6f0c469 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 333568; const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ListListIteratorResponseParams { response: Data[]; } +/** @internal */ export class ListListIteratorCodec { static encodeRequest(name: string, index: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index 2dbda5152..52b8a08eb 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 328960; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListRemoveResponseParams { response: boolean; } +/** @internal */ export class ListRemoveCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index ac5084826..eefeac77f 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListRemoveListenerResponseParams { response: boolean; } +/** @internal */ export class ListRemoveListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index cf6e594d5..3829128ed 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 332288; const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ListRemoveWithIndexResponseParams { response: Data; } +/** @internal */ export class ListRemoveWithIndexCodec { static encodeRequest(name: string, index: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 7f5875cb5..464e9f122 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 331776; const REQUEST_INDEX_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INDEX_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ListSetResponseParams { response: Data; } +/** @internal */ export class ListSetCodec { static encodeRequest(name: string, index: number, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index 38d5cfb70..5081b0ac6 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 327936; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ListSizeResponseParams { response: number; } +/** @internal */ export class ListSizeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index a7ab9d29c..e9990d4f9 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -32,10 +32,12 @@ const REQUEST_FROM_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_TO_OFFSET = REQUEST_FROM_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TO_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ListSubResponseParams { response: Data[]; } +/** @internal */ export class ListSubCodec { static encodeRequest(name: string, from: number, to: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index 80bdb7a48..55e37e120 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -40,10 +40,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MapAddEntryListenerResponseParams { response: UUID; } +/** @internal */ export class MapAddEntryListenerCodec { static encodeRequest(name: string, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index dd244b16a..9f020086c 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -40,10 +40,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MapAddEntryListenerToKeyResponseParams { response: UUID; } +/** @internal */ export class MapAddEntryListenerToKeyCodec { static encodeRequest(name: string, key: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index fbebabc04..6252f4205 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -40,10 +40,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MapAddEntryListenerToKeyWithPredicateResponseParams { response: UUID; } +/** @internal */ export class MapAddEntryListenerToKeyWithPredicateCodec { static encodeRequest(name: string, key: Data, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index b47d3c439..6287211ba 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -40,10 +40,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MapAddEntryListenerWithPredicateResponseParams { response: UUID; } +/** @internal */ export class MapAddEntryListenerWithPredicateCodec { static encodeRequest(name: string, predicate: Data, includeValue: boolean, listenerFlags: number, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index 89e69c350..e09a79805 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -28,6 +28,7 @@ const REQUEST_MESSAGE_TYPE = 76032; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class MapAddIndexCodec { static encodeRequest(name: string, indexConfig: InternalIndexConfig): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index ed00ac11a..d33b9d162 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 70656; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapAddInterceptorResponseParams { response: string; } +/** @internal */ export class MapAddInterceptorCodec { static encodeRequest(name: string, interceptor: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index 98e0bada2..0ab4ab455 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -45,10 +45,12 @@ const EVENT_I_MAP_INVALIDATION_SOURCE_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUt const EVENT_I_MAP_INVALIDATION_PARTITION_UUID_OFFSET = EVENT_I_MAP_INVALIDATION_SOURCE_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const EVENT_I_MAP_INVALIDATION_SEQUENCE_OFFSET = EVENT_I_MAP_INVALIDATION_PARTITION_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MapAddNearCacheInvalidationListenerResponseParams { response: UUID; } +/** @internal */ export class MapAddNearCacheInvalidationListenerCodec { static encodeRequest(name: string, listenerFlags: number, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index 6b0083634..21ce76873 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -34,10 +34,12 @@ const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZ const EVENT_MAP_PARTITION_LOST_PARTITION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_MAP_PARTITION_LOST_UUID_OFFSET = EVENT_MAP_PARTITION_LOST_PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapAddPartitionLostListenerResponseParams { response: UUID; } +/** @internal */ export class MapAddPartitionLostListenerCodec { static encodeRequest(name: string, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index 559a22ce1..b9cbc00bb 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 80128; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapAggregateResponseParams { response: Data; } +/** @internal */ export class MapAggregateCodec { static encodeRequest(name: string, aggregator: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index f1bef4786..33e932f20 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 80384; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapAggregateWithPredicateResponseParams { response: Data; } +/** @internal */ export class MapAggregateWithPredicateCodec { static encodeRequest(name: string, aggregator: Data, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapClearCodec.ts b/src/codec/MapClearCodec.ts index 1c6e08d63..ff46e984c 100644 --- a/src/codec/MapClearCodec.ts +++ b/src/codec/MapClearCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 77056; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class MapClearCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 8b0a3f624..2ae836fee 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapContainsKeyResponseParams { response: boolean; } +/** @internal */ export class MapContainsKeyCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index e48f8e43c..146a97fbd 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 67328; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapContainsValueResponseParams { response: boolean; } +/** @internal */ export class MapContainsValueCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapDeleteCodec.ts b/src/codec/MapDeleteCodec.ts index 21d70cf01..624ae957a 100644 --- a/src/codec/MapDeleteCodec.ts +++ b/src/codec/MapDeleteCodec.ts @@ -31,6 +31,7 @@ const REQUEST_MESSAGE_TYPE = 67840; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MapDeleteCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index 5e7b854c6..f2729e6b6 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -33,11 +33,13 @@ const REQUEST_MESSAGE_TYPE = 79360; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapEntriesWithPagingPredicateResponseParams { response: Array<[Data, Data]>; anchorDataList: AnchorDataListHolder; } +/** @internal */ export class MapEntriesWithPagingPredicateCodec { static encodeRequest(name: string, predicate: PagingPredicateHolder): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index 1fa04e7f6..a424fbef0 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 75776; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapEntriesWithPredicateResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class MapEntriesWithPredicateCodec { static encodeRequest(name: string, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index 583faa2cf..f3312b689 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 75008; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapEntrySetResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class MapEntrySetCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index e41c0dca5..25fe28e18 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -38,6 +38,7 @@ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_SIZE_OFFSET + BitsUtil.INT_SIZE_I const RESPONSE_READ_COUNT_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const RESPONSE_NEXT_SEQ_OFFSET = RESPONSE_READ_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapEventJournalReadResponseParams { readCount: number; items: Data[]; @@ -45,6 +46,7 @@ export interface MapEventJournalReadResponseParams { nextSeq: Long; } +/** @internal */ export class MapEventJournalReadCodec { static encodeRequest(name: string, startSequence: Long, minSize: number, maxSize: number, predicate: Data, projection: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index 4c2b89d32..890fcdc52 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -30,11 +30,13 @@ const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BY const RESPONSE_OLDEST_SEQUENCE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const RESPONSE_NEWEST_SEQUENCE_OFFSET = RESPONSE_OLDEST_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapEventJournalSubscribeResponseParams { oldestSequence: Long; newestSequence: Long; } +/** @internal */ export class MapEventJournalSubscribeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapEvictAllCodec.ts b/src/codec/MapEvictAllCodec.ts index 44407ca9b..73672ba86 100644 --- a/src/codec/MapEvictAllCodec.ts +++ b/src/codec/MapEvictAllCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 73472; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class MapEvictAllCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index 49db0af7e..a61f5dac5 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapEvictResponseParams { response: boolean; } +/** @internal */ export class MapEvictCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index 2abc4158f..caec91f89 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 77824; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapExecuteOnAllKeysResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class MapExecuteOnAllKeysCodec { static encodeRequest(name: string, entryProcessor: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index 21d6a2b47..ce10baf9b 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 77312; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapExecuteOnKeyResponseParams { response: Data; } +/** @internal */ export class MapExecuteOnKeyCodec { static encodeRequest(name: string, entryProcessor: Data, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index 3cfae6731..cb6fc0cec 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 78336; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapExecuteOnKeysResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class MapExecuteOnKeysCodec { static encodeRequest(name: string, entryProcessor: Data, keys: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 1984d2f72..12f6e7bfc 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 78080; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapExecuteWithPredicateResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class MapExecuteWithPredicateCodec { static encodeRequest(name: string, entryProcessor: Data, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index ee9853d68..bad174a7f 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -32,11 +32,13 @@ const REQUEST_MESSAGE_TYPE = 79872; const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapFetchEntriesResponseParams { iterationPointers: Array<[number, number]>; entries: Array<[Data, Data]>; } +/** @internal */ export class MapFetchEntriesCodec { static encodeRequest(name: string, iterationPointers: Array<[number, number]>, batch: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index bea5bbf3d..cc5f1f27c 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -32,11 +32,13 @@ const REQUEST_MESSAGE_TYPE = 79616; const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapFetchKeysResponseParams { iterationPointers: Array<[number, number]>; keys: Data[]; } +/** @internal */ export class MapFetchKeysCodec { static encodeRequest(name: string, iterationPointers: Array<[number, number]>, batch: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index 1eafe38c1..be1d980c9 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -34,11 +34,13 @@ const REQUEST_MESSAGE_TYPE = 81152; const REQUEST_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MapFetchNearCacheInvalidationMetadataResponseParams { namePartitionSequenceList: Array<[string, Array<[number, Long]>]>; partitionUuidList: Array<[number, UUID]>; } +/** @internal */ export class MapFetchNearCacheInvalidationMetadataCodec { static encodeRequest(names: string[], uuid: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index 195ea6e53..9bda64150 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -32,11 +32,13 @@ const REQUEST_MESSAGE_TYPE = 81920; const REQUEST_BATCH_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_BATCH_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapFetchWithQueryResponseParams { results: Data[]; iterationPointers: Array<[number, number]>; } +/** @internal */ export class MapFetchWithQueryCodec { static encodeRequest(name: string, iterationPointers: Array<[number, number]>, batch: number, projection: Data, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapFlushCodec.ts b/src/codec/MapFlushCodec.ts index fc3c45819..b57ec7bd0 100644 --- a/src/codec/MapFlushCodec.ts +++ b/src/codec/MapFlushCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 68096; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class MapFlushCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapForceUnlockCodec.ts b/src/codec/MapForceUnlockCodec.ts index 270270a84..7ae458cc1 100644 --- a/src/codec/MapForceUnlockCodec.ts +++ b/src/codec/MapForceUnlockCodec.ts @@ -31,6 +31,7 @@ const REQUEST_MESSAGE_TYPE = 78592; const REQUEST_REFERENCE_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MapForceUnlockCodec { static encodeRequest(name: string, key: Data, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index b746af27c..fee7489bf 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 74496; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapGetAllResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class MapGetAllCodec { static encodeRequest(name: string, keys: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index 3033b488d..86946188d 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 66048; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapGetResponseParams { response: Data; } +/** @internal */ export class MapGetCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index 87fe5895a..98d33617c 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -35,11 +35,13 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_MAX_IDLE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapGetEntryViewResponseParams { response: SimpleEntryView; maxIdle: Long; } +/** @internal */ export class MapGetEntryViewCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index f527e0a28..e6b67881b 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 76544; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapIsEmptyResponseParams { response: boolean; } +/** @internal */ export class MapIsEmptyCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index ad007647d..09218eb02 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 70144; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapIsLockedResponseParams { response: boolean; } +/** @internal */ export class MapIsLockedCodec { static encodeRequest(name: string, key: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index 05de9f85f..105feb985 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 74240; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapKeySetResponseParams { response: Data[]; } +/** @internal */ export class MapKeySetCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index 58bb01bcb..818ee0e34 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -33,11 +33,13 @@ const REQUEST_MESSAGE_TYPE = 78848; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapKeySetWithPagingPredicateResponseParams { response: Data[]; anchorDataList: AnchorDataListHolder; } +/** @internal */ export class MapKeySetWithPagingPredicateCodec { static encodeRequest(name: string, predicate: PagingPredicateHolder): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index aac89ff71..29e240002 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 75264; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapKeySetWithPredicateResponseParams { response: Data[]; } +/** @internal */ export class MapKeySetWithPredicateCodec { static encodeRequest(name: string, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapLoadAllCodec.ts b/src/codec/MapLoadAllCodec.ts index 9e49b3e70..1ace36342 100644 --- a/src/codec/MapLoadAllCodec.ts +++ b/src/codec/MapLoadAllCodec.ts @@ -28,6 +28,7 @@ const REQUEST_MESSAGE_TYPE = 73728; const REQUEST_REPLACE_EXISTING_VALUES_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REPLACE_EXISTING_VALUES_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +/** @internal */ export class MapLoadAllCodec { static encodeRequest(name: string, replaceExistingValues: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapLoadGivenKeysCodec.ts b/src/codec/MapLoadGivenKeysCodec.ts index 7d39c4733..76c4ebef7 100644 --- a/src/codec/MapLoadGivenKeysCodec.ts +++ b/src/codec/MapLoadGivenKeysCodec.ts @@ -31,6 +31,7 @@ const REQUEST_MESSAGE_TYPE = 73984; const REQUEST_REPLACE_EXISTING_VALUES_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REPLACE_EXISTING_VALUES_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +/** @internal */ export class MapLoadGivenKeysCodec { static encodeRequest(name: string, keys: Data[], replaceExistingValues: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapLockCodec.ts b/src/codec/MapLockCodec.ts index 565119eba..0d19bf0f6 100644 --- a/src/codec/MapLockCodec.ts +++ b/src/codec/MapLockCodec.ts @@ -33,6 +33,7 @@ const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTE const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MapLockCodec { static encodeRequest(name: string, key: Data, threadId: Long, ttl: Long, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 0f670a977..1a78b0b62 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 80640; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapProjectResponseParams { response: Data[]; } +/** @internal */ export class MapProjectCodec { static encodeRequest(name: string, projection: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index a1d176eb7..ab1202bfc 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 80896; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapProjectWithPredicateResponseParams { response: Data[]; } +/** @internal */ export class MapProjectWithPredicateCodec { static encodeRequest(name: string, projection: Data, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapPutAllCodec.ts b/src/codec/MapPutAllCodec.ts index 22afbd543..4a9845d31 100644 --- a/src/codec/MapPutAllCodec.ts +++ b/src/codec/MapPutAllCodec.ts @@ -31,6 +31,7 @@ const REQUEST_MESSAGE_TYPE = 76800; const REQUEST_TRIGGER_MAP_LOADER_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TRIGGER_MAP_LOADER_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +/** @internal */ export class MapPutAllCodec { static encodeRequest(name: string, entries: Array<[Data, Data]>, triggerMapLoader: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index dbb14c770..51b5ba80f 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -33,10 +33,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapPutResponseParams { response: Data; } +/** @internal */ export class MapPutCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index 3e100950d..4f256d8a3 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -33,10 +33,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapPutIfAbsentResponseParams { response: Data; } +/** @internal */ export class MapPutIfAbsentCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts index 18216858d..59542f20d 100644 --- a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts +++ b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts @@ -34,10 +34,12 @@ const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTE const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapPutIfAbsentWithMaxIdleResponseParams { response: Data; } +/** @internal */ export class MapPutIfAbsentWithMaxIdleCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapPutTransientCodec.ts b/src/codec/MapPutTransientCodec.ts index 521838caf..0a7f3afd1 100644 --- a/src/codec/MapPutTransientCodec.ts +++ b/src/codec/MapPutTransientCodec.ts @@ -32,6 +32,7 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MapPutTransientCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapPutTransientWithMaxIdleCodec.ts b/src/codec/MapPutTransientWithMaxIdleCodec.ts index 47fc6bf41..16d063a8a 100644 --- a/src/codec/MapPutTransientWithMaxIdleCodec.ts +++ b/src/codec/MapPutTransientWithMaxIdleCodec.ts @@ -34,10 +34,12 @@ const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTE const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapPutTransientWithMaxIdleResponseParams { response: Data; } +/** @internal */ export class MapPutTransientWithMaxIdleCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapPutWithMaxIdleCodec.ts b/src/codec/MapPutWithMaxIdleCodec.ts index 40b475ef7..986cc9cb9 100644 --- a/src/codec/MapPutWithMaxIdleCodec.ts +++ b/src/codec/MapPutWithMaxIdleCodec.ts @@ -34,10 +34,12 @@ const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTE const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapPutWithMaxIdleResponseParams { response: Data; } +/** @internal */ export class MapPutWithMaxIdleCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapRemoveAllCodec.ts b/src/codec/MapRemoveAllCodec.ts index db4d07dab..cf8a03f3f 100644 --- a/src/codec/MapRemoveAllCodec.ts +++ b/src/codec/MapRemoveAllCodec.ts @@ -28,6 +28,7 @@ const REQUEST_MESSAGE_TYPE = 81408; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class MapRemoveAllCodec { static encodeRequest(name: string, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index 1ec8d0e09..15de505ee 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 66304; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapRemoveResponseParams { response: Data; } +/** @internal */ export class MapRemoveCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index e3ef22462..fbb4a8810 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapRemoveEntryListenerResponseParams { response: boolean; } +/** @internal */ export class MapRemoveEntryListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index f3a691b54..1515200ef 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapRemoveIfSameResponseParams { response: boolean; } +/** @internal */ export class MapRemoveIfSameCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index 48638510e..72a68b4f2 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 70912; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapRemoveInterceptorResponseParams { response: boolean; } +/** @internal */ export class MapRemoveInterceptorCodec { static encodeRequest(name: string, id: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index 1fa437811..b3783b68e 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapRemovePartitionLostListenerResponseParams { response: boolean; } +/** @internal */ export class MapRemovePartitionLostListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index 99ff51e73..2e6c068ec 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 66560; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapReplaceResponseParams { response: Data; } +/** @internal */ export class MapReplaceCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index ebf08a99d..93b512e21 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapReplaceIfSameResponseParams { response: boolean; } +/** @internal */ export class MapReplaceIfSameCodec { static encodeRequest(name: string, key: Data, testValue: Data, value: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapSetCodec.ts b/src/codec/MapSetCodec.ts index 947cdeced..1fe6950e1 100644 --- a/src/codec/MapSetCodec.ts +++ b/src/codec/MapSetCodec.ts @@ -32,6 +32,7 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MapSetCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapSetTtlCodec.ts b/src/codec/MapSetTtlCodec.ts index 3c5fa6b81..15532d401 100644 --- a/src/codec/MapSetTtlCodec.ts +++ b/src/codec/MapSetTtlCodec.ts @@ -32,10 +32,12 @@ const REQUEST_TTL_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapSetTtlResponseParams { response: boolean; } +/** @internal */ export class MapSetTtlCodec { static encodeRequest(name: string, key: Data, ttl: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapSetWithMaxIdleCodec.ts b/src/codec/MapSetWithMaxIdleCodec.ts index 77d66cd68..63f720eef 100644 --- a/src/codec/MapSetWithMaxIdleCodec.ts +++ b/src/codec/MapSetWithMaxIdleCodec.ts @@ -34,10 +34,12 @@ const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTE const REQUEST_MAX_IDLE_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapSetWithMaxIdleResponseParams { response: Data; } +/** @internal */ export class MapSetWithMaxIdleCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, ttl: Long, maxIdle: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index 06fe7fb96..4600eae0f 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 76288; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapSizeResponseParams { response: number; } +/** @internal */ export class MapSizeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 1fc6f6404..56b25bd31 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 77568; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MapSubmitToKeyResponseParams { response: Data; } +/** @internal */ export class MapSubmitToKeyCodec { static encodeRequest(name: string, entryProcessor: Data, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index 424d0a605..70c042582 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -35,10 +35,12 @@ const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapTryLockResponseParams { response: boolean; } +/** @internal */ export class MapTryLockCodec { static encodeRequest(name: string, key: Data, threadId: Long, lease: Long, timeout: Long, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index 365d8daf7..8ff6c002e 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -33,10 +33,12 @@ const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapTryPutResponseParams { response: boolean; } +/** @internal */ export class MapTryPutCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long, timeout: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index d30a2ebc6..e6b97e8b4 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -33,10 +33,12 @@ const REQUEST_TIMEOUT_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MapTryRemoveResponseParams { response: boolean; } +/** @internal */ export class MapTryRemoveCodec { static encodeRequest(name: string, key: Data, threadId: Long, timeout: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapUnlockCodec.ts b/src/codec/MapUnlockCodec.ts index 814df8818..8774df575 100644 --- a/src/codec/MapUnlockCodec.ts +++ b/src/codec/MapUnlockCodec.ts @@ -32,6 +32,7 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_REFERENCE_ID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MapUnlockCodec { static encodeRequest(name: string, key: Data, threadId: Long, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 4754dadff..84f11c722 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 74752; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapValuesResponseParams { response: Data[]; } +/** @internal */ export class MapValuesCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index 409dc36dd..cd315e352 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -33,11 +33,13 @@ const REQUEST_MESSAGE_TYPE = 79104; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapValuesWithPagingPredicateResponseParams { response: Data[]; anchorDataList: AnchorDataListHolder; } +/** @internal */ export class MapValuesWithPagingPredicateCodec { static encodeRequest(name: string, predicate: PagingPredicateHolder): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 073a0fd3b..1e6ca1b40 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 75520; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MapValuesWithPredicateResponseParams { response: Data[]; } +/** @internal */ export class MapValuesWithPredicateCodec { static encodeRequest(name: string, predicate: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index ecc7f3f1e..07238efb2 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -39,10 +39,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapAddEntryListenerResponseParams { response: UUID; } +/** @internal */ export class MultiMapAddEntryListenerCodec { static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index ef7d995cc..50ab941fb 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -39,10 +39,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapAddEntryListenerToKeyResponseParams { response: UUID; } +/** @internal */ export class MultiMapAddEntryListenerToKeyCodec { static encodeRequest(name: string, key: Data, includeValue: boolean, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapClearCodec.ts b/src/codec/MultiMapClearCodec.ts index 211d2afa8..04d8d514f 100644 --- a/src/codec/MultiMapClearCodec.ts +++ b/src/codec/MultiMapClearCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 133888; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class MultiMapClearCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index d076b6d9a..37abf8751 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapContainsEntryResponseParams { response: boolean; } +/** @internal */ export class MultiMapContainsEntryCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index 4f12501e7..b83d03c34 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapContainsKeyResponseParams { response: boolean; } +/** @internal */ export class MultiMapContainsKeyCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index b8358bc36..d5f6a2c51 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 133120; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapContainsValueResponseParams { response: boolean; } +/** @internal */ export class MultiMapContainsValueCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapDeleteCodec.ts b/src/codec/MultiMapDeleteCodec.ts index 72ccfebac..44c83832a 100644 --- a/src/codec/MultiMapDeleteCodec.ts +++ b/src/codec/MultiMapDeleteCodec.ts @@ -31,6 +31,7 @@ const REQUEST_MESSAGE_TYPE = 136704; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MultiMapDeleteCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index 9bf28c82f..0d3846786 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 132608; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapEntrySetResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class MultiMapEntrySetCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapForceUnlockCodec.ts b/src/codec/MultiMapForceUnlockCodec.ts index bba4e3d81..a139e2c7d 100644 --- a/src/codec/MultiMapForceUnlockCodec.ts +++ b/src/codec/MultiMapForceUnlockCodec.ts @@ -31,6 +31,7 @@ const REQUEST_MESSAGE_TYPE = 136192; const REQUEST_REFERENCE_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MultiMapForceUnlockCodec { static encodeRequest(name: string, key: Data, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index d3b101169..9197142dd 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 131584; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapGetResponseParams { response: Data[]; } +/** @internal */ export class MultiMapGetCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index 30cd87306..c3be989ae 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 135680; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapIsLockedResponseParams { response: boolean; } +/** @internal */ export class MultiMapIsLockedCodec { static encodeRequest(name: string, key: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 40e425e94..85eb70b2e 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 132096; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapKeySetResponseParams { response: Data[]; } +/** @internal */ export class MultiMapKeySetCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapLockCodec.ts b/src/codec/MultiMapLockCodec.ts index ad56f4ae6..0af7effe1 100644 --- a/src/codec/MultiMapLockCodec.ts +++ b/src/codec/MultiMapLockCodec.ts @@ -33,6 +33,7 @@ const REQUEST_TTL_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTE const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MultiMapLockCodec { static encodeRequest(name: string, key: Data, threadId: Long, ttl: Long, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapPutAllCodec.ts b/src/codec/MultiMapPutAllCodec.ts index 0cbb1b1db..84fa156eb 100644 --- a/src/codec/MultiMapPutAllCodec.ts +++ b/src/codec/MultiMapPutAllCodec.ts @@ -30,6 +30,7 @@ const REQUEST_MESSAGE_TYPE = 136960; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class MultiMapPutAllCodec { static encodeRequest(name: string, entries: Array<[Data, Data[]]>): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index f04e7a617..daca1e45e 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapPutResponseParams { response: boolean; } +/** @internal */ export class MultiMapPutCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index 00d356e5c..3f77d2012 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 131840; const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapRemoveResponseParams { response: Data[]; } +/** @internal */ export class MultiMapRemoveCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index bd820280e..2393372a0 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapRemoveEntryResponseParams { response: boolean; } +/** @internal */ export class MultiMapRemoveEntryCodec { static encodeRequest(name: string, key: Data, value: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 4b96d424c..6065fda95 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapRemoveEntryListenerResponseParams { response: boolean; } +/** @internal */ export class MultiMapRemoveEntryListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index 2dc7018c2..9b0860b00 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 133632; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapSizeResponseParams { response: number; } +/** @internal */ export class MultiMapSizeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index 1ba856d58..089ada038 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -35,10 +35,12 @@ const REQUEST_REFERENCE_ID_OFFSET = REQUEST_TIMEOUT_OFFSET + BitsUtil.LONG_SIZE_ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapTryLockResponseParams { response: boolean; } +/** @internal */ export class MultiMapTryLockCodec { static encodeRequest(name: string, key: Data, threadId: Long, lease: Long, timeout: Long, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapUnlockCodec.ts b/src/codec/MultiMapUnlockCodec.ts index b3baf7897..6eee654ae 100644 --- a/src/codec/MultiMapUnlockCodec.ts +++ b/src/codec/MultiMapUnlockCodec.ts @@ -32,6 +32,7 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_REFERENCE_ID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REFERENCE_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class MultiMapUnlockCodec { static encodeRequest(name: string, key: Data, threadId: Long, referenceId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index 6fc09823a..24be34e43 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -32,10 +32,12 @@ const REQUEST_THREAD_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTE const REQUEST_INITIAL_FRAME_SIZE = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapValueCountResponseParams { response: number; } +/** @internal */ export class MultiMapValueCountCodec { static encodeRequest(name: string, key: Data, threadId: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index 61de5df0b..d91ec239f 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 132352; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface MultiMapValuesResponseParams { response: Data[]; } +/** @internal */ export class MultiMapValuesCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts index 199caab92..a60a26a51 100644 --- a/src/codec/PNCounterAddCodec.ts +++ b/src/codec/PNCounterAddCodec.ts @@ -35,12 +35,14 @@ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TARGET_REPLICA_UUID_OFFSET + BitsUtil const RESPONSE_VALUE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const RESPONSE_REPLICA_COUNT_OFFSET = RESPONSE_VALUE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface PNCounterAddResponseParams { value: Long; replicaTimestamps: Array<[UUID, Long]>; replicaCount: number; } +/** @internal */ export class PNCounterAddCodec { static encodeRequest(name: string, delta: Long, getBeforeUpdate: boolean, replicaTimestamps: Array<[UUID, Long]>, targetReplicaUUID: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts index ea72e23bc..421d20cf2 100644 --- a/src/codec/PNCounterGetCodec.ts +++ b/src/codec/PNCounterGetCodec.ts @@ -33,12 +33,14 @@ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TARGET_REPLICA_UUID_OFFSET + BitsUtil const RESPONSE_VALUE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const RESPONSE_REPLICA_COUNT_OFFSET = RESPONSE_VALUE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface PNCounterGetResponseParams { value: Long; replicaTimestamps: Array<[UUID, Long]>; replicaCount: number; } +/** @internal */ export class PNCounterGetCodec { static encodeRequest(name: string, replicaTimestamps: Array<[UUID, Long]>, targetReplicaUUID: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts index 16c2b1647..e3150f3d2 100644 --- a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 1901312; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface PNCounterGetConfiguredReplicaCountResponseParams { response: number; } +/** @internal */ export class PNCounterGetConfiguredReplicaCountCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index 4250e1d2f..b3b6ef804 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 200704; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueAddAllResponseParams { response: boolean; } +/** @internal */ export class QueueAddAllCodec { static encodeRequest(name: string, dataList: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index 2e86718f9..ee0084e35 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -38,10 +38,12 @@ const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZ const EVENT_ITEM_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ITEM_EVENT_TYPE_OFFSET = EVENT_ITEM_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface QueueAddListenerResponseParams { response: UUID; } +/** @internal */ export class QueueAddListenerCodec { static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueClearCodec.ts b/src/codec/QueueClearCodec.ts index 965d66d66..c68350646 100644 --- a/src/codec/QueueClearCodec.ts +++ b/src/codec/QueueClearCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 200448; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class QueueClearCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index 820d56b5f..f227f2baf 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 199936; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueCompareAndRemoveAllResponseParams { response: boolean; } +/** @internal */ export class QueueCompareAndRemoveAllCodec { static encodeRequest(name: string, dataList: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index a5ecf34b9..b2bf06dac 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 200192; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueCompareAndRetainAllResponseParams { response: boolean; } +/** @internal */ export class QueueCompareAndRetainAllCodec { static encodeRequest(name: string, dataList: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index c15a533d2..393ae29f5 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 199680; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueContainsAllResponseParams { response: boolean; } +/** @internal */ export class QueueContainsAllCodec { static encodeRequest(name: string, dataList: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index a16a24b5e..845ac4f36 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 199424; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueContainsResponseParams { response: boolean; } +/** @internal */ export class QueueContainsCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index 73dc37f13..1c763e21d 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 198912; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface QueueDrainToResponseParams { response: Data[]; } +/** @internal */ export class QueueDrainToCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index 0339803a3..325d51257 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 199168; const REQUEST_MAX_SIZE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface QueueDrainToMaxSizeResponseParams { response: Data[]; } +/** @internal */ export class QueueDrainToMaxSizeCodec { static encodeRequest(name: string, maxSize: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index e612cb1c3..f521bf056 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 201728; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueIsEmptyResponseParams { response: boolean; } +/** @internal */ export class QueueIsEmptyCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index cab188384..e0912f5a8 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 198656; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface QueueIteratorResponseParams { response: Data[]; } +/** @internal */ export class QueueIteratorCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index 0e436be1f..75aaa78ab 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -32,10 +32,12 @@ const REQUEST_TIMEOUT_MILLIS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MILLIS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueOfferResponseParams { response: boolean; } +/** @internal */ export class QueueOfferCodec { static encodeRequest(name: string, value: Data, timeoutMillis: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index aa4bb017d..810f47168 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 198400; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface QueuePeekResponseParams { response: Data; } +/** @internal */ export class QueuePeekCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index 7143fec4d..a4d9f8eb4 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 197888; const REQUEST_TIMEOUT_MILLIS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MILLIS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface QueuePollResponseParams { response: Data; } +/** @internal */ export class QueuePollCodec { static encodeRequest(name: string, timeoutMillis: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueuePutCodec.ts b/src/codec/QueuePutCodec.ts index af0c9dca9..2075cc3c9 100644 --- a/src/codec/QueuePutCodec.ts +++ b/src/codec/QueuePutCodec.ts @@ -28,6 +28,7 @@ const REQUEST_MESSAGE_TYPE = 197120; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class QueuePutCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index 31730428c..9ec6f05c5 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 201472; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueRemainingCapacityResponseParams { response: number; } +/** @internal */ export class QueueRemainingCapacityCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index 3a77b3cd2..c76eb3192 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 197632; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueRemoveResponseParams { response: boolean; } +/** @internal */ export class QueueRemoveCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index cb3fc5e6e..6ae8d1068 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueRemoveListenerResponseParams { response: boolean; } +/** @internal */ export class QueueRemoveListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index 4df780b7e..20c1c2c54 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 197376; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface QueueSizeResponseParams { response: number; } +/** @internal */ export class QueueSizeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index 2cdd71b72..7b74259ce 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 198144; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface QueueTakeResponseParams { response: Data; } +/** @internal */ export class QueueTakeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index 13ce1dee6..31cf9957a 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -38,10 +38,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapAddEntryListenerResponseParams { response: UUID; } +/** @internal */ export class ReplicatedMapAddEntryListenerCodec { static encodeRequest(name: string, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index ede0e88d6..3e747ecb6 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -38,10 +38,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapAddEntryListenerToKeyResponseParams { response: UUID; } +/** @internal */ export class ReplicatedMapAddEntryListenerToKeyCodec { static encodeRequest(name: string, key: Data, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index 5903bf334..8d39a7b3b 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -38,10 +38,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapAddEntryListenerToKeyWithPredicateResponseParams { response: UUID; } +/** @internal */ export class ReplicatedMapAddEntryListenerToKeyWithPredicateCodec { static encodeRequest(name: string, key: Data, predicate: Data, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index 55f367623..b08b935c3 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -38,10 +38,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapAddEntryListenerWithPredicateResponseParams { response: UUID; } +/** @internal */ export class ReplicatedMapAddEntryListenerWithPredicateCodec { static encodeRequest(name: string, predicate: Data, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index ea5d85de4..1b1da4af0 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -39,10 +39,12 @@ const EVENT_ENTRY_EVENT_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN const EVENT_ENTRY_UUID_OFFSET = EVENT_ENTRY_EVENT_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ENTRY_NUMBER_OF_AFFECTED_ENTRIES_OFFSET = EVENT_ENTRY_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapAddNearCacheEntryListenerResponseParams { response: UUID; } +/** @internal */ export class ReplicatedMapAddNearCacheEntryListenerCodec { static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapClearCodec.ts b/src/codec/ReplicatedMapClearCodec.ts index be330e4eb..e7bf12441 100644 --- a/src/codec/ReplicatedMapClearCodec.ts +++ b/src/codec/ReplicatedMapClearCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 854272; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ReplicatedMapClearCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index d0859bd5e..5bf2a38cd 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 852992; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapContainsKeyResponseParams { response: boolean; } +/** @internal */ export class ReplicatedMapContainsKeyCodec { static encodeRequest(name: string, key: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 7e59815ca..0f14bd84f 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 853248; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapContainsValueResponseParams { response: boolean; } +/** @internal */ export class ReplicatedMapContainsValueCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index 27eb9932b..f85f54020 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 856320; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapEntrySetResponseParams { response: Array<[Data, Data]>; } +/** @internal */ export class ReplicatedMapEntrySetCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index d86b083a4..a526b5315 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 853504; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapGetResponseParams { response: Data; } +/** @internal */ export class ReplicatedMapGetCodec { static encodeRequest(name: string, key: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index c9a78108d..0b81edbb8 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 852736; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapIsEmptyResponseParams { response: boolean; } +/** @internal */ export class ReplicatedMapIsEmptyCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index 577780e8b..c5098bf8f 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 855808; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapKeySetResponseParams { response: Data[]; } +/** @internal */ export class ReplicatedMapKeySetCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapPutAllCodec.ts b/src/codec/ReplicatedMapPutAllCodec.ts index 22cea5071..04e9f5dfd 100644 --- a/src/codec/ReplicatedMapPutAllCodec.ts +++ b/src/codec/ReplicatedMapPutAllCodec.ts @@ -29,6 +29,7 @@ const REQUEST_MESSAGE_TYPE = 854016; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ReplicatedMapPutAllCodec { static encodeRequest(name: string, entries: Array<[Data, Data]>): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index 0d2cb8639..fba0f8afe 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 852224; const REQUEST_TTL_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapPutResponseParams { response: Data; } +/** @internal */ export class ReplicatedMapPutCodec { static encodeRequest(name: string, key: Data, value: Data, ttl: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index d4780ac5f..a2383c88e 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 853760; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapRemoveResponseParams { response: Data; } +/** @internal */ export class ReplicatedMapRemoveCodec { static encodeRequest(name: string, key: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index 369168e7d..0e12af0bb 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapRemoveEntryListenerResponseParams { response: boolean; } +/** @internal */ export class ReplicatedMapRemoveEntryListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index 96a0c9f37..6edd149d7 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 852480; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapSizeResponseParams { response: number; } +/** @internal */ export class ReplicatedMapSizeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index bd65e651a..e53b491d7 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 856064; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface ReplicatedMapValuesResponseParams { response: Data[]; } +/** @internal */ export class ReplicatedMapValuesCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index c482c18c2..5ec14939b 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -33,10 +33,12 @@ const REQUEST_OVERFLOW_POLICY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_OVERFLOW_POLICY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferAddAllResponseParams { response: Long; } +/** @internal */ export class RingbufferAddAllCodec { static encodeRequest(name: string, valueList: Data[], overflowPolicy: number): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 35d650db8..1601016e2 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -32,10 +32,12 @@ const REQUEST_OVERFLOW_POLICY_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_OVERFLOW_POLICY_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferAddResponseParams { response: Long; } +/** @internal */ export class RingbufferAddCodec { static encodeRequest(name: string, overflowPolicy: number, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index 0d65668f6..3be43bb90 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 1508352; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferCapacityResponseParams { response: Long; } +/** @internal */ export class RingbufferCapacityCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index 1495f837e..193f5694e 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 1508096; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferHeadSequenceResponseParams { response: Long; } +/** @internal */ export class RingbufferHeadSequenceCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index 98af54e15..f0905ccf6 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -38,6 +38,7 @@ const REQUEST_INITIAL_FRAME_SIZE = REQUEST_MAX_COUNT_OFFSET + BitsUtil.INT_SIZE_ const RESPONSE_READ_COUNT_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const RESPONSE_NEXT_SEQ_OFFSET = RESPONSE_READ_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferReadManyResponseParams { readCount: number; items: Data[]; @@ -45,6 +46,7 @@ export interface RingbufferReadManyResponseParams { nextSeq: Long; } +/** @internal */ export class RingbufferReadManyCodec { static encodeRequest(name: string, startSequence: Long, minCount: number, maxCount: number, filter: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index 4d4d7006d..b07570aa7 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -32,10 +32,12 @@ const REQUEST_MESSAGE_TYPE = 1509120; const REQUEST_SEQUENCE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const REQUEST_INITIAL_FRAME_SIZE = REQUEST_SEQUENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferReadOneResponseParams { response: Data; } +/** @internal */ export class RingbufferReadOneCodec { static encodeRequest(name: string, sequence: Long): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index 28ba59e31..6ceb701ea 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 1508608; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferRemainingCapacityResponseParams { response: Long; } +/** @internal */ export class RingbufferRemainingCapacityCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index a03b017fe..b8252f37e 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 1507584; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferSizeResponseParams { response: Long; } +/** @internal */ export class RingbufferSizeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index 4a5c887a8..18883b834 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 1507840; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface RingbufferTailSequenceResponseParams { response: Long; } +/** @internal */ export class RingbufferTailSequenceCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index 96be8a65e..0b4ecab62 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 394752; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetAddAllResponseParams { response: boolean; } +/** @internal */ export class SetAddAllCodec { static encodeRequest(name: string, valueList: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index e0ca1c1cc..fcf5c900e 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 394240; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetAddResponseParams { response: boolean; } +/** @internal */ export class SetAddCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index 28067add3..0fbbb2f19 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -38,10 +38,12 @@ const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZ const EVENT_ITEM_UUID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_ITEM_EVENT_TYPE_OFFSET = EVENT_ITEM_UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export interface SetAddListenerResponseParams { response: UUID; } +/** @internal */ export class SetAddListenerCodec { static encodeRequest(name: string, includeValue: boolean, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetClearCodec.ts b/src/codec/SetClearCodec.ts index b7c3769ea..c87a5ab12 100644 --- a/src/codec/SetClearCodec.ts +++ b/src/codec/SetClearCodec.ts @@ -26,6 +26,7 @@ const REQUEST_MESSAGE_TYPE = 395520; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class SetClearCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index 0e1415929..cc890fd1d 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 395008; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetCompareAndRemoveAllResponseParams { response: boolean; } +/** @internal */ export class SetCompareAndRemoveAllCodec { static encodeRequest(name: string, values: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index c97a7b825..bab37aedc 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 395264; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetCompareAndRetainAllResponseParams { response: boolean; } +/** @internal */ export class SetCompareAndRetainAllCodec { static encodeRequest(name: string, values: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index 43a3c9719..cd9743685 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -31,10 +31,12 @@ const REQUEST_MESSAGE_TYPE = 393984; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetContainsAllResponseParams { response: boolean; } +/** @internal */ export class SetContainsAllCodec { static encodeRequest(name: string, items: Data[]): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index f0bd5cf7c..286869f39 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 393728; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetContainsResponseParams { response: boolean; } +/** @internal */ export class SetContainsCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index e4ee471b4..4548c2a5a 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -29,10 +29,12 @@ const REQUEST_MESSAGE_TYPE = 395776; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export interface SetGetAllResponseParams { response: Data[]; } +/** @internal */ export class SetGetAllCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index 4755478f0..7842455c7 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 396544; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetIsEmptyResponseParams { response: boolean; } +/** @internal */ export class SetIsEmptyCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index 0ebae9bf4..9b26246fd 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -30,10 +30,12 @@ const REQUEST_MESSAGE_TYPE = 394496; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetRemoveResponseParams { response: boolean; } +/** @internal */ export class SetRemoveCodec { static encodeRequest(name: string, value: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index 4ae725226..8847cfe80 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetRemoveListenerResponseParams { response: boolean; } +/** @internal */ export class SetRemoveListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index 38c776d77..245d75b6d 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -28,10 +28,12 @@ const REQUEST_MESSAGE_TYPE = 393472; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface SetSizeResponseParams { response: number; } +/** @internal */ export class SetSizeCodec { static encodeRequest(name: string): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index ebcbc898e..6e37e6f69 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -37,10 +37,12 @@ const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZ const EVENT_TOPIC_PUBLISH_TIME_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const EVENT_TOPIC_UUID_OFFSET = EVENT_TOPIC_PUBLISH_TIME_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export interface TopicAddMessageListenerResponseParams { response: UUID; } +/** @internal */ export class TopicAddMessageListenerCodec { static encodeRequest(name: string, localOnly: boolean): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/TopicPublishCodec.ts b/src/codec/TopicPublishCodec.ts index 08ad46e5c..cc8f63f45 100644 --- a/src/codec/TopicPublishCodec.ts +++ b/src/codec/TopicPublishCodec.ts @@ -28,6 +28,7 @@ const REQUEST_MESSAGE_TYPE = 262400; const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class TopicPublishCodec { static encodeRequest(name: string, message: Data): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index 05c18aeab..45d5bbf58 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -30,10 +30,12 @@ const REQUEST_REGISTRATION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_I const REQUEST_INITIAL_FRAME_SIZE = REQUEST_REGISTRATION_ID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export interface TopicRemoveMessageListenerResponseParams { response: boolean; } +/** @internal */ export class TopicRemoveMessageListenerCodec { static encodeRequest(name: string, registrationId: UUID): ClientMessage { const clientMessage = ClientMessage.createForEncode(); diff --git a/src/codec/builtin/ByteArrayCodec.ts b/src/codec/builtin/ByteArrayCodec.ts index b78971488..ee9f15ceb 100644 --- a/src/codec/builtin/ByteArrayCodec.ts +++ b/src/codec/builtin/ByteArrayCodec.ts @@ -16,6 +16,7 @@ import {ClientMessage, Frame} from '../../ClientMessage'; +/** @internal */ export class ByteArrayCodec { static encode(clientMessage: ClientMessage, bytes: Buffer): void { clientMessage.addFrame(new Frame(bytes)); diff --git a/src/codec/builtin/CodecUtil.ts b/src/codec/builtin/CodecUtil.ts index 2fca339a2..7774f5497 100644 --- a/src/codec/builtin/CodecUtil.ts +++ b/src/codec/builtin/CodecUtil.ts @@ -16,6 +16,7 @@ import {ClientMessage, Frame, NULL_FRAME} from '../../ClientMessage'; +/** @internal */ export class CodecUtil { static fastForwardToEndFrame(clientMessage: ClientMessage): void { // We are starting from 1 because of the BEGIN_FRAME we read diff --git a/src/codec/builtin/DataCodec.ts b/src/codec/builtin/DataCodec.ts index a5d50b442..12d614c08 100644 --- a/src/codec/builtin/DataCodec.ts +++ b/src/codec/builtin/DataCodec.ts @@ -19,6 +19,7 @@ import {Data} from '../../serialization/Data'; import {HeapData} from '../../serialization/HeapData'; import {CodecUtil} from './CodecUtil'; +/** @internal */ export class DataCodec { static encode(clientMessage: ClientMessage, data: Data): void { clientMessage.addFrame(new Frame(data.toBuffer())); diff --git a/src/codec/builtin/EntryListCodec.ts b/src/codec/builtin/EntryListCodec.ts index 7c0576707..fd505a63e 100644 --- a/src/codec/builtin/EntryListCodec.ts +++ b/src/codec/builtin/EntryListCodec.ts @@ -17,6 +17,7 @@ import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; import {CodecUtil} from './CodecUtil'; +/** @internal */ export class EntryListCodec { static encode(clientMessage: ClientMessage, entries: Array<[K, V]>, keyEncoder: (msg: ClientMessage, key: K) => void, diff --git a/src/codec/builtin/EntryListIntegerIntegerCodec.ts b/src/codec/builtin/EntryListIntegerIntegerCodec.ts index 3306f2571..597b3e7a6 100644 --- a/src/codec/builtin/EntryListIntegerIntegerCodec.ts +++ b/src/codec/builtin/EntryListIntegerIntegerCodec.ts @@ -20,6 +20,7 @@ import {FixSizedTypesCodec} from './FixSizedTypesCodec'; const ENTRY_SIZE_IN_BYTES = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class EntryListIntegerIntegerCodec { static encode(clientMessage: ClientMessage, entries: Array<[number, number]>): void { const entryCount = entries.length; diff --git a/src/codec/builtin/EntryListIntegerLongCodec.ts b/src/codec/builtin/EntryListIntegerLongCodec.ts index c8f0eb14d..a92b34bcd 100644 --- a/src/codec/builtin/EntryListIntegerLongCodec.ts +++ b/src/codec/builtin/EntryListIntegerLongCodec.ts @@ -21,6 +21,7 @@ import * as Long from 'long'; const ENTRY_SIZE_IN_BYTES = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class EntryListIntegerLongCodec { static encode(clientMessage: ClientMessage, entries: Array<[number, Long]>): void { const entryCount = entries.length; diff --git a/src/codec/builtin/EntryListIntegerUUIDCodec.ts b/src/codec/builtin/EntryListIntegerUUIDCodec.ts index e269e8433..5b24938c7 100644 --- a/src/codec/builtin/EntryListIntegerUUIDCodec.ts +++ b/src/codec/builtin/EntryListIntegerUUIDCodec.ts @@ -21,6 +21,7 @@ import {UUID} from '../../core/UUID'; const ENTRY_SIZE_IN_BYTES = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export class EntryListIntegerUUIDCodec { static encode(clientMessage: ClientMessage, entries: Array<[number, UUID]>): void { const entryCount = entries.length; diff --git a/src/codec/builtin/EntryListLongByteArrayCodec.ts b/src/codec/builtin/EntryListLongByteArrayCodec.ts index 3b1947860..a956b57dd 100644 --- a/src/codec/builtin/EntryListLongByteArrayCodec.ts +++ b/src/codec/builtin/EntryListLongByteArrayCodec.ts @@ -20,6 +20,7 @@ import {ByteArrayCodec} from './ByteArrayCodec'; import {ListLongCodec} from './ListLongCodec'; import {ListMultiFrameCodec} from './ListMultiFrameCodec'; +/** @internal */ export class EntryListLongByteArrayCodec { static encode(clientMessage: ClientMessage, entries: Array<[Long, Buffer]>): void { const entryCount = entries.length; diff --git a/src/codec/builtin/EntryListUUIDListIntegerCodec.ts b/src/codec/builtin/EntryListUUIDListIntegerCodec.ts index 32a11e5d7..fc89aeebf 100644 --- a/src/codec/builtin/EntryListUUIDListIntegerCodec.ts +++ b/src/codec/builtin/EntryListUUIDListIntegerCodec.ts @@ -20,6 +20,7 @@ import {ListIntegerCodec} from './ListIntegerCodec'; import {ListUUIDCodec} from './ListUUIDCodec'; import {ListMultiFrameCodec} from './ListMultiFrameCodec'; +/** @internal */ export class EntryListUUIDListIntegerCodec { static encode(clientMessage: ClientMessage, entries: Array<[UUID, number[]]>): void { const entryCount = entries.length; diff --git a/src/codec/builtin/EntryListUUIDLongCodec.ts b/src/codec/builtin/EntryListUUIDLongCodec.ts index bbcc23820..996cabb15 100644 --- a/src/codec/builtin/EntryListUUIDLongCodec.ts +++ b/src/codec/builtin/EntryListUUIDLongCodec.ts @@ -22,6 +22,7 @@ import {FixSizedTypesCodec} from './FixSizedTypesCodec'; const ENTRY_SIZE_IN_BYTES = BitsUtil.UUID_SIZE_IN_BYTES + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class EntryListUUIDLongCodec { static encode(clientMessage: ClientMessage, entries: Array<[UUID, Long]>): void { const entryCount = entries.length; diff --git a/src/codec/builtin/EntryListUUIDUUIDCodec.ts b/src/codec/builtin/EntryListUUIDUUIDCodec.ts index 00c39d1f0..d8aeba8f5 100644 --- a/src/codec/builtin/EntryListUUIDUUIDCodec.ts +++ b/src/codec/builtin/EntryListUUIDUUIDCodec.ts @@ -21,6 +21,7 @@ import {FixSizedTypesCodec} from './FixSizedTypesCodec'; const ENTRY_SIZE_IN_BYTES = BitsUtil.UUID_SIZE_IN_BYTES + BitsUtil.UUID_SIZE_IN_BYTES; +/** @internal */ export class EntryListUUIDUUIDCodec { static encode(clientMessage: ClientMessage, entries: Array<[UUID, UUID]>): void { const entryCount = entries.length; diff --git a/src/codec/builtin/ErrorsCodec.ts b/src/codec/builtin/ErrorsCodec.ts index ca22579c8..175f5bff0 100644 --- a/src/codec/builtin/ErrorsCodec.ts +++ b/src/codec/builtin/ErrorsCodec.ts @@ -24,6 +24,7 @@ import {ErrorHolderCodec} from '../custom/ErrorHolderCodec'; export const EXCEPTION_MESSAGE_TYPE = 0; +/** @internal */ export class ErrorsCodec { static decode(clientMessage: ClientMessage): ErrorHolder[] { // initial frame diff --git a/src/codec/builtin/FixSizedTypesCodec.ts b/src/codec/builtin/FixSizedTypesCodec.ts index ed9e701bc..0db5d426b 100644 --- a/src/codec/builtin/FixSizedTypesCodec.ts +++ b/src/codec/builtin/FixSizedTypesCodec.ts @@ -18,6 +18,7 @@ import * as Long from 'long'; import {BitsUtil} from '../../BitsUtil'; import {UUID} from '../../core/UUID'; +/** @internal */ export class FixSizedTypesCodec { static encodeInt(buffer: Buffer, offset: number, value: number): void { buffer.writeInt32LE(value, offset); diff --git a/src/codec/builtin/ListDataCodec.ts b/src/codec/builtin/ListDataCodec.ts index 5b193545a..c9895dd3f 100644 --- a/src/codec/builtin/ListDataCodec.ts +++ b/src/codec/builtin/ListDataCodec.ts @@ -19,6 +19,7 @@ import {Data} from '../../serialization/Data'; import {ListMultiFrameCodec} from './ListMultiFrameCodec'; import {DataCodec} from './DataCodec'; +/** @internal */ export class ListDataCodec { static encode(clientMessage: ClientMessage, list: Data[]): void { ListMultiFrameCodec.encode(clientMessage, list, DataCodec.encode); diff --git a/src/codec/builtin/ListIntegerCodec.ts b/src/codec/builtin/ListIntegerCodec.ts index ba7474dfa..9147a1e22 100644 --- a/src/codec/builtin/ListIntegerCodec.ts +++ b/src/codec/builtin/ListIntegerCodec.ts @@ -18,6 +18,7 @@ import {ClientMessage, Frame} from '../../ClientMessage'; import {BitsUtil} from '../../BitsUtil'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; +/** @internal */ export class ListIntegerCodec { static encode(clientMessage: ClientMessage, list: number[]): void { const itemCount = list.length; diff --git a/src/codec/builtin/ListLongCodec.ts b/src/codec/builtin/ListLongCodec.ts index 1d49649f7..7a9f7b423 100644 --- a/src/codec/builtin/ListLongCodec.ts +++ b/src/codec/builtin/ListLongCodec.ts @@ -19,6 +19,7 @@ import * as Long from 'long'; import {BitsUtil} from '../../BitsUtil'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; +/** @internal */ export class ListLongCodec { static encode(clientMessage: ClientMessage, list: Long[]): void { const itemCount = list.length; diff --git a/src/codec/builtin/ListMultiFrameCodec.ts b/src/codec/builtin/ListMultiFrameCodec.ts index ddbc01a37..4dfce27fa 100644 --- a/src/codec/builtin/ListMultiFrameCodec.ts +++ b/src/codec/builtin/ListMultiFrameCodec.ts @@ -17,6 +17,7 @@ import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; import {CodecUtil} from './CodecUtil'; +/** @internal */ export class ListMultiFrameCodec { static encode(clientMessage: ClientMessage, list: T[], encoder: (msg: ClientMessage, value: T) => void): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/builtin/ListUUIDCodec.ts b/src/codec/builtin/ListUUIDCodec.ts index f9e1a7a63..33f9d7dbd 100644 --- a/src/codec/builtin/ListUUIDCodec.ts +++ b/src/codec/builtin/ListUUIDCodec.ts @@ -19,6 +19,7 @@ import {UUID} from '../../core/UUID'; import {BitsUtil} from '../../BitsUtil'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; +/** @internal */ export class ListUUIDCodec { static encode(clientMessage: ClientMessage, list: UUID[]): void { const itemCount = list.length; diff --git a/src/codec/builtin/LongArrayCodec.ts b/src/codec/builtin/LongArrayCodec.ts index 2563ebbbb..337e8acd6 100644 --- a/src/codec/builtin/LongArrayCodec.ts +++ b/src/codec/builtin/LongArrayCodec.ts @@ -18,6 +18,7 @@ import {ClientMessage} from '../../ClientMessage'; import * as Long from 'long'; import {ListLongCodec} from './ListLongCodec'; +/** @internal */ export class LongArrayCodec { static encode(clientMessage: ClientMessage, array: Long[]): void { ListLongCodec.encode(clientMessage, array); diff --git a/src/codec/builtin/MapCodec.ts b/src/codec/builtin/MapCodec.ts index f1004bc17..6aefa8908 100644 --- a/src/codec/builtin/MapCodec.ts +++ b/src/codec/builtin/MapCodec.ts @@ -17,6 +17,7 @@ import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; import {CodecUtil} from './CodecUtil'; +/** @internal */ export class MapCodec { static encode(clientMessage: ClientMessage, map: Map, keyEncoder: (msg: ClientMessage, key: K) => void, diff --git a/src/codec/builtin/StringCodec.ts b/src/codec/builtin/StringCodec.ts index d081b87bf..8c4501c29 100644 --- a/src/codec/builtin/StringCodec.ts +++ b/src/codec/builtin/StringCodec.ts @@ -16,6 +16,7 @@ import {ClientMessage, Frame} from '../../ClientMessage'; +/** @internal */ export class StringCodec { static encode(clientMessage: ClientMessage, value: string): void { clientMessage.addFrame(new Frame(Buffer.from(value, 'utf8'))); diff --git a/src/codec/custom/AddressCodec.ts b/src/codec/custom/AddressCodec.ts index ea48d3a46..ecba8e1ce 100644 --- a/src/codec/custom/AddressCodec.ts +++ b/src/codec/custom/AddressCodec.ts @@ -19,14 +19,15 @@ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; import {BitsUtil} from '../../BitsUtil'; import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {Address} from '../../Address'; +import {AddressImpl} from '../../Address'; import {StringCodec} from '../builtin/StringCodec'; const PORT_OFFSET = 0; const INITIAL_FRAME_SIZE = PORT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class AddressCodec { - static encode(clientMessage: ClientMessage, address: Address): void { + static encode(clientMessage: ClientMessage, address: AddressImpl): void { clientMessage.addFrame(BEGIN_FRAME.copy()); const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); @@ -38,7 +39,7 @@ export class AddressCodec { clientMessage.addFrame(END_FRAME.copy()); } - static decode(clientMessage: ClientMessage): Address { + static decode(clientMessage: ClientMessage): AddressImpl { // begin frame clientMessage.nextFrame(); @@ -49,6 +50,6 @@ export class AddressCodec { CodecUtil.fastForwardToEndFrame(clientMessage); - return new Address(host, port); + return new AddressImpl(host, port); } } diff --git a/src/codec/custom/AnchorDataListHolderCodec.ts b/src/codec/custom/AnchorDataListHolderCodec.ts index 9cf4fb991..1ded8aa68 100644 --- a/src/codec/custom/AnchorDataListHolderCodec.ts +++ b/src/codec/custom/AnchorDataListHolderCodec.ts @@ -22,6 +22,7 @@ import {AnchorDataListHolder} from '../../protocol/AnchorDataListHolder'; import {EntryListCodec} from '../builtin/EntryListCodec'; import {DataCodec} from '../builtin/DataCodec'; +/** @internal */ export class AnchorDataListHolderCodec { static encode(clientMessage: ClientMessage, anchorDataListHolder: AnchorDataListHolder): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/BitmapIndexOptionsCodec.ts b/src/codec/custom/BitmapIndexOptionsCodec.ts index b01319540..bc6ccec0c 100644 --- a/src/codec/custom/BitmapIndexOptionsCodec.ts +++ b/src/codec/custom/BitmapIndexOptionsCodec.ts @@ -25,6 +25,7 @@ import {StringCodec} from '../builtin/StringCodec'; const UNIQUE_KEY_TRANSFORMATION_OFFSET = 0; const INITIAL_FRAME_SIZE = UNIQUE_KEY_TRANSFORMATION_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class BitmapIndexOptionsCodec { static encode(clientMessage: ClientMessage, bitmapIndexOptions: InternalBitmapIndexOptions): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/DistributedObjectInfoCodec.ts b/src/codec/custom/DistributedObjectInfoCodec.ts index b99aec5dd..0b6dfcaed 100644 --- a/src/codec/custom/DistributedObjectInfoCodec.ts +++ b/src/codec/custom/DistributedObjectInfoCodec.ts @@ -20,6 +20,7 @@ import {CodecUtil} from '../builtin/CodecUtil'; import {StringCodec} from '../builtin/StringCodec'; import {DistributedObjectInfo} from '../../DistributedObjectInfo'; +/** @internal */ export class DistributedObjectInfoCodec { static encode(clientMessage: ClientMessage, distributedObjectInfo: DistributedObjectInfo): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/ErrorHolderCodec.ts b/src/codec/custom/ErrorHolderCodec.ts index 6d1881386..2f20d57e4 100644 --- a/src/codec/custom/ErrorHolderCodec.ts +++ b/src/codec/custom/ErrorHolderCodec.ts @@ -27,6 +27,7 @@ import {StackTraceElementCodec} from './StackTraceElementCodec'; const ERROR_CODE_OFFSET = 0; const INITIAL_FRAME_SIZE = ERROR_CODE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class ErrorHolderCodec { static encode(clientMessage: ClientMessage, errorHolder: ErrorHolder): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/IndexConfigCodec.ts b/src/codec/custom/IndexConfigCodec.ts index 36ff00951..a716c31f5 100644 --- a/src/codec/custom/IndexConfigCodec.ts +++ b/src/codec/custom/IndexConfigCodec.ts @@ -27,6 +27,7 @@ import {BitmapIndexOptionsCodec} from './BitmapIndexOptionsCodec'; const TYPE_OFFSET = 0; const INITIAL_FRAME_SIZE = TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class IndexConfigCodec { static encode(clientMessage: ClientMessage, indexConfig: InternalIndexConfig): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/MemberInfoCodec.ts b/src/codec/custom/MemberInfoCodec.ts index 84596b8a0..13e15869b 100644 --- a/src/codec/custom/MemberInfoCodec.ts +++ b/src/codec/custom/MemberInfoCodec.ts @@ -29,6 +29,7 @@ const UUID_OFFSET = 0; const LITE_MEMBER_OFFSET = UUID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; const INITIAL_FRAME_SIZE = LITE_MEMBER_OFFSET + BitsUtil.BOOLEAN_SIZE_IN_BYTES; +/** @internal */ export class MemberInfoCodec { static encode(clientMessage: ClientMessage, memberInfo: MemberInfo): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/MemberVersionCodec.ts b/src/codec/custom/MemberVersionCodec.ts index cf944d244..cad7ea859 100644 --- a/src/codec/custom/MemberVersionCodec.ts +++ b/src/codec/custom/MemberVersionCodec.ts @@ -26,6 +26,7 @@ const MINOR_OFFSET = MAJOR_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const PATCH_OFFSET = MINOR_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; const INITIAL_FRAME_SIZE = PATCH_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export class MemberVersionCodec { static encode(clientMessage: ClientMessage, memberVersion: MemberVersion): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/PagingPredicateHolderCodec.ts b/src/codec/custom/PagingPredicateHolderCodec.ts index c2f3bfa03..d32c1177f 100644 --- a/src/codec/custom/PagingPredicateHolderCodec.ts +++ b/src/codec/custom/PagingPredicateHolderCodec.ts @@ -28,6 +28,7 @@ const PAGE_OFFSET = PAGE_SIZE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const ITERATION_TYPE_ID_OFFSET = PAGE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; const INITIAL_FRAME_SIZE = ITERATION_TYPE_ID_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +/** @internal */ export class PagingPredicateHolderCodec { static encode(clientMessage: ClientMessage, pagingPredicateHolder: PagingPredicateHolder): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/SimpleEntryViewCodec.ts b/src/codec/custom/SimpleEntryViewCodec.ts index 46d62a23e..4382edcc3 100644 --- a/src/codec/custom/SimpleEntryViewCodec.ts +++ b/src/codec/custom/SimpleEntryViewCodec.ts @@ -35,6 +35,7 @@ const TTL_OFFSET = VERSION_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const MAX_IDLE_OFFSET = TTL_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; const INITIAL_FRAME_SIZE = MAX_IDLE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +/** @internal */ export class SimpleEntryViewCodec { static encode(clientMessage: ClientMessage, simpleEntryView: SimpleEntryView): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/codec/custom/StackTraceElementCodec.ts b/src/codec/custom/StackTraceElementCodec.ts index ed57881ce..359a1c37f 100644 --- a/src/codec/custom/StackTraceElementCodec.ts +++ b/src/codec/custom/StackTraceElementCodec.ts @@ -25,6 +25,7 @@ import {StringCodec} from '../builtin/StringCodec'; const LINE_NUMBER_OFFSET = 0; const INITIAL_FRAME_SIZE = LINE_NUMBER_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +/** @internal */ export class StackTraceElementCodec { static encode(clientMessage: ClientMessage, stackTraceElement: StackTraceElement): void { clientMessage.addFrame(BEGIN_FRAME.copy()); diff --git a/src/config/BitmapIndexOptions.ts b/src/config/BitmapIndexOptions.ts index 74845c0d7..c7f5d8b64 100644 --- a/src/config/BitmapIndexOptions.ts +++ b/src/config/BitmapIndexOptions.ts @@ -74,6 +74,7 @@ export interface BitmapIndexOptions { /** * Follows the shape of {@link BitmapIndexOptions}, but doesn't implement it due * to the `uniqueKeyTransformation` enum field. + * @internal */ export class InternalBitmapIndexOptions { diff --git a/src/config/ClientCloudConfig.ts b/src/config/ClientCloudConfig.ts index 06046d2b6..4298e0b9f 100644 --- a/src/config/ClientCloudConfig.ts +++ b/src/config/ClientCloudConfig.ts @@ -26,6 +26,7 @@ export interface ClientCloudConfig { } +/** @internal */ export class ClientCloudConfigImpl implements ClientCloudConfig { discoveryToken: string = null; diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index 003a7a5bc..6d8c06bd4 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -59,6 +59,7 @@ export interface ClientNetworkConfig { } +/** @internal */ export class ClientNetworkConfigImpl implements ClientNetworkConfig { clusterMembers: string[] = []; diff --git a/src/config/Config.ts b/src/config/Config.ts index c3c6357b9..0feb54a31 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -120,6 +120,7 @@ export interface ClientConfig { } +/** @internal */ export class ClientConfigImpl implements ClientConfig { properties: Properties = { diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index fa7e8e676..3ccfb612a 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {HazelcastError} from '../HazelcastError'; import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; @@ -30,6 +31,7 @@ import {LoadBalancerType} from './LoadBalancerConfig'; /** * Responsible for user-defined config validation. Builds the effective config with necessary defaults. + * @internal */ export class ConfigBuilder { diff --git a/src/config/ConfigPatternMatcher.ts b/src/config/ConfigPatternMatcher.ts index aef3255f6..3a7166793 100644 --- a/src/config/ConfigPatternMatcher.ts +++ b/src/config/ConfigPatternMatcher.ts @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ +/** @internal */ export class ConfigPatternMatcher { /** diff --git a/src/config/ConnectionRetryConfig.ts b/src/config/ConnectionRetryConfig.ts index 926317aee..58caac8bc 100644 --- a/src/config/ConnectionRetryConfig.ts +++ b/src/config/ConnectionRetryConfig.ts @@ -59,6 +59,7 @@ export interface ConnectionRetryConfig { /** * Connection Retry Config is controls the period among the retries and when should a client gave up * retrying. Exponential behaviour can be chosen or jitter can be added to wait periods. + * @internal */ export class ConnectionRetryConfigImpl implements ConnectionRetryConfig { diff --git a/src/config/ConnectionStrategyConfig.ts b/src/config/ConnectionStrategyConfig.ts index 0be93e8f6..0cfd8efe6 100644 --- a/src/config/ConnectionStrategyConfig.ts +++ b/src/config/ConnectionStrategyConfig.ts @@ -67,6 +67,7 @@ export interface ConnectionStrategyConfig { } +/** @internal */ export class ConnectionStrategyConfigImpl implements ConnectionStrategyConfig { asyncStart = false; diff --git a/src/config/FlakeIdGeneratorConfig.ts b/src/config/FlakeIdGeneratorConfig.ts index 1fadfb273..22b555f54 100644 --- a/src/config/FlakeIdGeneratorConfig.ts +++ b/src/config/FlakeIdGeneratorConfig.ts @@ -40,6 +40,7 @@ export interface FlakeIdGeneratorConfig { } +/** @internal */ export class FlakeIdGeneratorConfigImpl implements FlakeIdGeneratorConfig { /** diff --git a/src/config/IndexConfig.ts b/src/config/IndexConfig.ts index 7d2c0523d..3315f0f3a 100644 --- a/src/config/IndexConfig.ts +++ b/src/config/IndexConfig.ts @@ -55,6 +55,7 @@ export interface IndexConfig { /** * Follows the shape of {@link IndexConfig}, but doesn't implement it due * to the `type` enum field. + * @internal */ export class InternalIndexConfig { diff --git a/src/config/LoadBalancerConfig.ts b/src/config/LoadBalancerConfig.ts index 5fa402f39..140385fdc 100644 --- a/src/config/LoadBalancerConfig.ts +++ b/src/config/LoadBalancerConfig.ts @@ -52,6 +52,7 @@ export interface LoadBalancerConfig { } +/** @internal */ export class LoadBalancerConfigImpl implements LoadBalancerConfig { type = LoadBalancerType.ROUND_ROBIN; diff --git a/src/config/NearCacheConfig.ts b/src/config/NearCacheConfig.ts index 4607148df..9aced0148 100644 --- a/src/config/NearCacheConfig.ts +++ b/src/config/NearCacheConfig.ts @@ -71,6 +71,7 @@ export interface NearCacheConfig { } +/** @internal */ export class NearCacheConfigImpl implements NearCacheConfig { /** diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts index 4abc33435..9799e076b 100644 --- a/src/config/ReliableTopicConfig.ts +++ b/src/config/ReliableTopicConfig.ts @@ -34,6 +34,7 @@ export interface ReliableTopicConfig { } +/** @internal */ export class ReliableTopicConfigImpl implements ReliableTopicConfig { /** diff --git a/src/config/SSLConfig.ts b/src/config/SSLConfig.ts index 812ae4fc4..0ff4d9f26 100644 --- a/src/config/SSLConfig.ts +++ b/src/config/SSLConfig.ts @@ -53,6 +53,7 @@ export interface SSLConfig { } +/** @internal */ export class SSLConfigImpl implements SSLConfig { enabled = false; diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index d524f12fd..3872164b7 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -70,6 +70,7 @@ export interface SerializationConfig { } +/** @internal */ export class SerializationConfigImpl implements SerializationConfig { defaultNumberType = 'double'; diff --git a/src/connection/AddressProvider.ts b/src/connection/AddressProvider.ts index 0cb9bd3f1..406cb7dfd 100644 --- a/src/connection/AddressProvider.ts +++ b/src/connection/AddressProvider.ts @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; /** * Provides initial addresses for client to find and connect to a node & - * Translates given address if necessary when connecting a service + * Translates given address if necessary when connecting a service. + * @internal */ export interface AddressProvider { @@ -35,6 +37,6 @@ export interface AddressProvider { * @param address to be translated * @return new address if given address is known, otherwise return null */ - translate(address: Address): Promise
; + translate(address: AddressImpl): Promise; } diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts index 4e407e81d..6a4be52c2 100644 --- a/src/connection/BasicSSLOptionsFactory.ts +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -21,6 +21,9 @@ import {HazelcastError} from '../HazelcastError'; import {getBooleanOrUndefined, getStringOrUndefined, resolvePath} from '../Util'; import {SSLOptionsFactory} from './SSLOptionsFactory'; +/** + * Default implementation of {@link SSLOptionsFactory}. + */ export class BasicSSLOptionsFactory implements SSLOptionsFactory { private servername: string; diff --git a/src/connection/DefaultAddressProvider.ts b/src/connection/DefaultAddressProvider.ts index 8b57a6648..2d3a684a2 100644 --- a/src/connection/DefaultAddressProvider.ts +++ b/src/connection/DefaultAddressProvider.ts @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {AddressProvider} from './AddressProvider'; import {ClientNetworkConfigImpl} from '../config/ClientNetworkConfig'; import * as Promise from 'bluebird'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; /** * Default address provider of Hazelcast. - * * Loads addresses from the Hazelcast configuration. + * @internal */ export class DefaultAddressProvider implements AddressProvider { @@ -41,7 +42,7 @@ export class DefaultAddressProvider implements AddressProvider { return Promise.resolve(addresses); } - translate(address: Address): Promise
{ + translate(address: AddressImpl): Promise { return Promise.resolve(address); } } diff --git a/src/connection/SSLOptionsFactory.ts b/src/connection/SSLOptionsFactory.ts index 194866830..4905f2d6c 100644 --- a/src/connection/SSLOptionsFactory.ts +++ b/src/connection/SSLOptionsFactory.ts @@ -17,8 +17,23 @@ import * as Promise from 'bluebird'; import {Properties} from '../config/Properties'; +/** + * Base interface for built-in and user-provided SSL options factories. + */ export interface SSLOptionsFactory { + + /** + * Called during client initialization with the `properties` + * configuration option passed as the argument. + * + * @param properties `properties` configuration option + */ init(properties: Properties): Promise; + /** + * Called after the client initialization to create the `options` + * object. + */ getSSLOptions(): any; + } diff --git a/src/core/Cluster.ts b/src/core/Cluster.ts index 181f35a83..4f5533864 100644 --- a/src/core/Cluster.ts +++ b/src/core/Cluster.ts @@ -19,48 +19,55 @@ import {UUID} from './UUID'; import {Member} from './Member'; import {MemberSelector} from './MemberSelector'; +/** + * Hazelcast cluster interface. It provides access to the members in the + * cluster and one can register for changes in the cluster members. + */ export interface Cluster { + /** * Adds MembershipListener to listen for membership updates. - *

- * The addMembershipListener method returns a register ID. This ID is needed to remove the MembershipListener using the - * {@link removeMembershipListener} method. - *

- * If the MembershipListener implements the {@link InitialMembershipListener} interface, it will also receive - * the {@link InitialMembershipEvent}. - *

- * There is no check for duplicate registrations, so if you register the listener twice, it will get events twice. + * + * The addMembershipListener method returns a register ID. This ID is needed + * to remove the MembershipListener using the {@link removeMembershipListener} method. + * + * If the MembershipListener implements the {@link InitialMembershipListener} interface, + * it will also receive the {@link InitialMembershipEvent}. + * + * There is no check for duplicate registrations, so if you register the listener twice, + * it will get events twice. * * @param listener membership listener * @return the registration ID - * @throws AssertionError if listener is null + * @throws AssertionError if listener is `null` * @see {@link removeMembershipListener} */ addMembershipListener(listener: MembershipListener): UUID; /** - * Removes the specified MembershipListener. - *

+ * Removes the specified {@link MembershipListener}. + * * If the same MembershipListener is registered multiple times, it needs to be removed multiple times. * * This method can safely be called multiple times for the same registration ID; subsequent calls are ignored. * * @param registrationId the registrationId of MembershipListener to remove * @return true if the registration is removed, false otherwise - * @throws AssertionError if the registration ID is null + * @throws AssertionError if the registration ID is `null` * @see {@link addMembershipListener} */ removeMembershipListener(registrationId: UUID): boolean; /** * List of the current members in the cluster. - *

+ * * Every member in the cluster returns the 'members' in the same order. * To obtain the oldest member (the master) in the cluster, you can retrieve the first item in the list. * - * @param memberSelector Optional {@link MemberSelector} instance to filter members to return. - * If not provided, the returned list will contain all the available cluster members. + * @param memberSelector optional {@link MemberSelector} instance to filter members to return. + * If not provided, the returned list will contain all the available cluster members. * @return current members in the cluster */ getMembers(memberSelector?: MemberSelector): Member[]; + } diff --git a/src/core/Comparator.ts b/src/core/Comparator.ts index 349832f20..629b56141 100644 --- a/src/core/Comparator.ts +++ b/src/core/Comparator.ts @@ -17,7 +17,7 @@ /** * Comparator is used to compare two map entries in a distributed map. * A comparator class with the same functionality should be registered - * on Hazelcast server in order to be used in PagingPredicates. + * on Hazelcast cluster members in order to be used in PagingPredicates. */ export interface Comparator { @@ -36,3 +36,8 @@ export interface Comparator { sort(a: [any, any], b: [any, any]): number; } + +/** + * Comparator function to sort elements in a list. + */ +export type ListComparator = (a: T, b: T) => number; diff --git a/src/core/EventType.ts b/src/core/EventType.ts index 52ad70258..22eeb0582 100644 --- a/src/core/EventType.ts +++ b/src/core/EventType.ts @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ +/** @internal */ export enum EventType { ADDED = 1 << 0, REMOVED = 1 << 1, diff --git a/src/core/HazelcastJsonValue.ts b/src/core/HazelcastJsonValue.ts index 7e426c65f..4bac837bf 100644 --- a/src/core/HazelcastJsonValue.ts +++ b/src/core/HazelcastJsonValue.ts @@ -23,7 +23,6 @@ import {assertString} from '../Util'; * JSON strings. * * HazelcastJsonValue is queried using Hazelcast's querying language. - * See {@link https://github.com/hazelcast/hazelcast-nodejs-client#77-distributed-query Distributed Query section}. * * In terms of querying, numbers in JSON strings are treated as either * Long or Double in the Java side. Strings, booleans and null @@ -33,7 +32,7 @@ import {assertString} from '../Util'; * checked for being valid. Ill-formatted json strings may cause false * positive or false negative results in queries. * - * Null values are not allowed. + * Important note: `null` values are not allowed. */ export class HazelcastJsonValue { diff --git a/src/core/InitialMembershipEvent.ts b/src/core/InitialMembershipEvent.ts index 49ac45454..9e070c398 100644 --- a/src/core/InitialMembershipEvent.ts +++ b/src/core/InitialMembershipEvent.ts @@ -17,15 +17,16 @@ import {Member} from './Member'; /** - * An event that is sent when a {@link InitialMembershipListener} registers itself on a cluster. For more - * information, see the {@link InitialMembershipListener}. + * An event that is sent when a {@link InitialMembershipListener} registers itself on a cluster. * * @see MembershipListener * @see MembershipEvent */ export class InitialMembershipEvent { + members: Member[]; + /** @internal */ constructor(members: Member[]) { this.members = members; } diff --git a/src/core/ItemListener.ts b/src/core/ItemListener.ts index 0ec54937a..d23896e92 100644 --- a/src/core/ItemListener.ts +++ b/src/core/ItemListener.ts @@ -58,8 +58,10 @@ export class ItemEvent { */ member: Member; + /** @internal */ eventType: ItemEventType; + /** @internal */ constructor(name: string, eventType: ItemEventType, item: E, member: Member) { this.name = name; this.eventType = eventType; @@ -69,6 +71,7 @@ export class ItemEvent { } +/** @internal */ export enum ItemEventType { ADDED = 1, diff --git a/src/core/Member.ts b/src/core/Member.ts index e98d96ed0..d349f6e90 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -14,27 +14,48 @@ * limitations under the License. */ -import {Address} from '../Address'; +import {Address, AddressImpl} from '../Address'; import {UUID} from './UUID'; import {MemberVersion} from './MemberVersion'; -export class Member { +export interface Member { + /** * Network address of member. */ address: Address; + /** * Unique id of member in cluster. */ uuid: UUID; + + /** + * Lite member flag. + */ + liteMember: boolean; + /** - * true if member is a lite member. + * Returns string representation of this member. */ + toString(): string; + +} + +/** @internal */ +export class MemberImpl implements Member { + + address: AddressImpl; + uuid: UUID; liteMember: boolean; attributes: Map; version: MemberVersion; - constructor(address: Address, uuid: UUID, attributes: Map, liteMember: boolean, version: MemberVersion) { + constructor(address: AddressImpl, + uuid: UUID, + attributes: Map, + liteMember: boolean, + version: MemberVersion) { this.address = address; this.uuid = uuid; this.attributes = attributes; @@ -42,15 +63,13 @@ export class Member { this.version = version; } - equals(other: Member): boolean { + equals(other: MemberImpl): boolean { if (other == null) { return false; } - if (!this.address.equals(other.address)) { return false; } - return this.uuid != null ? this.uuid.equals(other.uuid) : other.uuid === null; } diff --git a/src/core/MemberInfo.ts b/src/core/MemberInfo.ts index f01dd89e2..12cfa3979 100644 --- a/src/core/MemberInfo.ts +++ b/src/core/MemberInfo.ts @@ -13,28 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; import {UUID} from './UUID'; import {MemberVersion} from './MemberVersion'; +/** @internal */ export class MemberInfo { - /** - * Network address of member. - */ - address: Address; - /** - * Unique id of member in cluster. - */ + + address: AddressImpl; uuid: UUID; - /** - * true if member is a lite member. - */ liteMember: boolean; attributes: Map; version: MemberVersion; - constructor(address: Address, uuid: UUID, attributes: Map, liteMember: boolean, version: MemberVersion) { + constructor(address: AddressImpl, + uuid: UUID, + attributes: Map, + liteMember: boolean, + version: MemberVersion) { this.address = address; this.uuid = uuid; this.attributes = attributes; @@ -46,11 +44,9 @@ export class MemberInfo { if (other == null) { return false; } - if (!this.address.equals(other.address)) { return false; } - return this.uuid != null ? this.uuid.equals(other.uuid) : other.uuid === null; } diff --git a/src/core/MemberSelector.ts b/src/core/MemberSelector.ts index 88bb94fc3..d98a474f9 100644 --- a/src/core/MemberSelector.ts +++ b/src/core/MemberSelector.ts @@ -16,6 +16,7 @@ import {Member} from './Member'; -export interface MemberSelector { - select(member: Member): boolean; -} +/** + * Selector function for members. + */ +export type MemberSelector = (member: Member) => boolean; diff --git a/src/core/MemberSelectors.ts b/src/core/MemberSelectors.ts index ada4a9cbb..97e45b3cd 100644 --- a/src/core/MemberSelectors.ts +++ b/src/core/MemberSelectors.ts @@ -13,16 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {Member} from './Member'; -import {MemberSelector} from './MemberSelector'; -export class DataMemberSelector implements MemberSelector { - select(member: Member): boolean { - return !member.liteMember; - } -} - -export class MemberSelectors { - static readonly DATA_MEMBER_SELECTOR = new DataMemberSelector(); -} +/** @internal */ +export const dataMemberSelector = (member: Member): boolean => !member.liteMember; diff --git a/src/core/MembershipEvent.ts b/src/core/MembershipEvent.ts index 4c17aa38f..267588f2e 100644 --- a/src/core/MembershipEvent.ts +++ b/src/core/MembershipEvent.ts @@ -32,8 +32,10 @@ export class MembershipEvent { */ members: Member[]; + /** @internal */ eventType: MemberEvent; + /** @internal */ constructor(member: Member, eventType: MemberEvent, members: Member[]) { this.member = member; this.eventType = eventType; @@ -42,6 +44,7 @@ export class MembershipEvent { } +/** @internal */ export enum MemberEvent { ADDED = 1, diff --git a/src/core/OverflowPolicy.ts b/src/core/OverflowPolicy.ts index dde81d146..52fc2d036 100644 --- a/src/core/OverflowPolicy.ts +++ b/src/core/OverflowPolicy.ts @@ -33,6 +33,7 @@ export enum OverflowPolicy { } +/** @internal */ export const overflowPolicyToId = (type: OverflowPolicy): number => { switch (type) { case OverflowPolicy.OVERWRITE: diff --git a/src/core/Predicate.ts b/src/core/Predicate.ts index 4f863433e..f886efc0c 100644 --- a/src/core/Predicate.ts +++ b/src/core/Predicate.ts @@ -169,6 +169,7 @@ export function paging(predicate: Predicate, pageSize: number, comparator: Compa /** * Iteration type. + * @internal */ export enum IterationType { @@ -189,6 +190,7 @@ export enum IterationType { } +/** @internal */ export const iterationTypeToId = (type: IterationType): number => { switch (type) { case IterationType.KEY: @@ -202,6 +204,7 @@ export const iterationTypeToId = (type: IterationType): number => { } } +/** @internal */ export enum QueryConstants { /** diff --git a/src/core/ReadOnlyLazyList.ts b/src/core/ReadOnlyLazyList.ts index e8d04788d..9a8665ccc 100644 --- a/src/core/ReadOnlyLazyList.ts +++ b/src/core/ReadOnlyLazyList.ts @@ -43,6 +43,7 @@ export class ReadOnlyLazyList { private internalArray: any[]; private serializationService: SerializationService; + /** @internal */ constructor(array: any[], serializationService: SerializationService) { this.internalArray = array; this.serializationService = serializationService; diff --git a/src/core/RestValue.ts b/src/core/RestValue.ts index 4514419f8..40a7ebd6e 100644 --- a/src/core/RestValue.ts +++ b/src/core/RestValue.ts @@ -17,7 +17,9 @@ import {IdentifiedDataSerializable} from '../serialization/Serializable'; import {DataInput, DataOutput} from '../serialization/Data'; +/** @internal */ export const REST_VALUE_FACTORY_ID = -25; +/** @internal */ export const REST_VALUE_CLASS_ID = 1; /** @@ -29,26 +31,29 @@ export class RestValue implements IdentifiedDataSerializable { * Wrapped value. */ value: string; - /** * HTTP Content-Type specified for the value. */ contentType: string; - + /** @internal */ factoryId = REST_VALUE_FACTORY_ID; + /** @internal */ classId = REST_VALUE_CLASS_ID; + /** @internal */ readData(input: DataInput): any { this.value = input.readUTF(); this.contentType = input.readUTF(); } + /** @internal */ writeData(output: DataOutput): void { output.writeUTF(this.value); output.writeUTF(this.contentType); } } +/** @internal */ export function restValueFactory(classId: number): IdentifiedDataSerializable { if (classId === REST_VALUE_CLASS_ID) { return new RestValue(); diff --git a/src/core/SimpleEntryView.ts b/src/core/SimpleEntryView.ts index 8a22be247..cfa576e92 100644 --- a/src/core/SimpleEntryView.ts +++ b/src/core/SimpleEntryView.ts @@ -81,6 +81,7 @@ export class SimpleEntryView { */ maxIdle: Long; + /** @internal */ constructor(key: K, value: V, cost: Long, creationTime: Long, expirationTime: Long, hits: Long, lastAccessTime: Long, lastStoredTime: Long, lastUpdateTime: Long, version: Long, diff --git a/src/core/UUID.ts b/src/core/UUID.ts index 17d4b8884..fbfeb5428 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -16,9 +16,20 @@ import * as Long from 'long'; +/** + * Represents UUIDs used by Hazelcast client. A UUID represents a 128-bit value. + */ export class UUID { + + /** + * Stands for the least significant 64 bits of the UUID. + */ readonly leastSignificant: Long; + /** + * Stands for the most significant 64 bits of the UUID. + */ readonly mostSignificant: Long; + /** @internal */ private cachedString: string; constructor(mostSig: Long, leastSig: Long) { @@ -26,6 +37,7 @@ export class UUID { this.leastSignificant = leastSig; } + /** @internal */ equals(other: UUID): boolean { if (other == null) { return false; diff --git a/src/core/VectorClock.ts b/src/core/VectorClock.ts index 326d53755..cd1a32d16 100644 --- a/src/core/VectorClock.ts +++ b/src/core/VectorClock.ts @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ -export class VectorClock { +/** @internal */ +export class VectorClock { private replicaTimestamps = new Map(); diff --git a/src/discovery/HazelcastCloudAddressProvider.ts b/src/discovery/HazelcastCloudAddressProvider.ts index fe01e6be3..64f2aec3e 100644 --- a/src/discovery/HazelcastCloudAddressProvider.ts +++ b/src/discovery/HazelcastCloudAddressProvider.ts @@ -13,18 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {HazelcastCloudDiscovery} from './HazelcastCloudDiscovery'; import {AddressProvider} from '../connection/AddressProvider'; import * as Promise from 'bluebird'; import {ILogger} from '../logging/ILogger'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; +/** @internal */ export class HazelcastCloudAddressProvider implements AddressProvider { private readonly logger: ILogger; private readonly cloudDiscovery: HazelcastCloudDiscovery; - private privateToPublic: Map = new Map(); + private privateToPublic: Map = new Map(); constructor(endpointUrl: string, connectionTimeoutMillis: number, logger: ILogger) { this.cloudDiscovery = new HazelcastCloudDiscovery(endpointUrl, connectionTimeoutMillis); @@ -41,7 +43,7 @@ export class HazelcastCloudAddressProvider implements AddressProvider { }); } - translate(address: Address): Promise

{ + translate(address: AddressImpl): Promise { if (address == null) { return Promise.resolve(null); } diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index 72d97a1e7..d3e49f627 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {AddressHelper, DeferredPromise} from '../Util'; import {get} from 'https'; @@ -20,13 +21,15 @@ import {IncomingMessage} from 'http'; import * as Promise from 'bluebird'; import {Properties} from '../config/Properties'; import * as URL from 'url'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; /** * Discovery service that discover nodes via hazelcast.cloud * https://coordinator.hazelcast.cloud/cluster/discovery?token= + * @internal */ export class HazelcastCloudDiscovery { + /** * Internal client property to change base url of cloud discovery endpoint. * Used for testing cloud discovery. @@ -49,14 +52,14 @@ export class HazelcastCloudDiscovery { return cloudBaseUrl + this.CLOUD_URL_PATH + cloudToken; } - discoverNodes(): Promise> { + discoverNodes(): Promise> { return this.callService().catch((e) => { throw e; }); } - callService(): Promise> { - const deferred = DeferredPromise>(); + callService(): Promise> { + const deferred = DeferredPromise>(); const url = URL.parse(this.endpointUrl); const endpointUrlOptions = { @@ -82,10 +85,10 @@ export class HazelcastCloudDiscovery { return deferred.promise; } - private parseResponse(data: string): Map { + private parseResponse(data: string): Map { const jsonValue = JSON.parse(data); - const privateToPublicAddresses: Map = new Map(); + const privateToPublicAddresses: Map = new Map(); for (const value of jsonValue) { const privateAddress = value[HazelcastCloudDiscovery.PRIVATE_ADDRESS_PROPERTY]; const publicAddress = value[HazelcastCloudDiscovery.PUBLIC_ADDRESS_PROPERTY]; diff --git a/src/index.ts b/src/index.ts index 5d6a72816..bd8c2b7c0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -20,25 +20,23 @@ import * as Aggregators from './aggregation/Aggregators'; import {ClientInfo} from './ClientInfo'; import * as Config from './config/Config'; import * as Predicates from './core/Predicate'; -import {IterationType} from './core/Predicate'; import HazelcastClient from './HazelcastClient'; import * as HazelcastErrors from './HazelcastError'; import {IMap} from './proxy/IMap'; import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; -import {ClassDefinitionBuilder} from './serialization/portable/ClassDefinitionBuilder'; -import {ClassDefinition, FieldDefinition} from './serialization/portable/ClassDefinition'; import {EvictionPolicy} from './config/EvictionPolicy'; import {InMemoryFormat} from './config/InMemoryFormat'; -import {ItemEvent, ItemEventType} from './core/ItemListener'; +import {ItemEvent} from './core/ItemListener'; import {MapEvent} from './core/MapListener'; import {EntryEvent} from './core/EntryListener'; import {LogLevel} from './logging/ILogger'; import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializationPolicy'; import {HazelcastJsonValue} from './core/HazelcastJsonValue'; -import {RoundRobinLB} from './util/RoundRobinLB'; -import {RandomLB} from './util/RandomLB'; import {LoadBalancer} from './LoadBalancer'; import {AbstractLoadBalancer} from './util/AbstractLoadBalancer'; +import {FieldType} from './serialization/portable/ClassDefinition'; +import {SSLOptionsFactory} from './connection/SSLOptionsFactory'; +import {BasicSSLOptionsFactory} from './connection/BasicSSLOptionsFactory'; export { HazelcastClient as Client, @@ -50,15 +48,10 @@ export { TopicOverloadPolicy, HazelcastErrors, ReadResultSet, - IterationType, Aggregators, - FieldDefinition, - ClassDefinition, - ClassDefinitionBuilder, EvictionPolicy, InMemoryFormat, ItemEvent, - ItemEventType, MapEvent, EntryEvent, LogLevel, @@ -66,6 +59,7 @@ export { HazelcastJsonValue, LoadBalancer, AbstractLoadBalancer, - RoundRobinLB, - RandomLB, + FieldType, + SSLOptionsFactory, + BasicSSLOptionsFactory, }; diff --git a/src/invocation/ClientEventRegistration.ts b/src/invocation/ClientEventRegistration.ts index 0417840d4..9607ab95d 100644 --- a/src/invocation/ClientEventRegistration.ts +++ b/src/invocation/ClientEventRegistration.ts @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {ClientConnection} from '../network/ClientConnection'; import {UUID} from '../core/UUID'; +/** @internal */ export class ClientEventRegistration { readonly serverRegistrationId: UUID; readonly correlationId: number; diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index f129daf49..720390d51 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ClientConnection} from '../network/ClientConnection'; import * as Promise from 'bluebird'; -import {Member} from '../core/Member'; +import {MemberImpl} from '../core/Member'; import {ClientInfo} from '../ClientInfo'; import HazelcastClient from '../HazelcastClient'; import {IllegalStateError, TargetDisconnectedError} from '../HazelcastError'; @@ -35,23 +36,25 @@ import {Cluster} from '../core/Cluster'; class MemberListSnapshot { version: number; - readonly members: Map; - readonly memberList: Member[]; + readonly members: Map; + readonly memberList: MemberImpl[]; - constructor(version: number, members: Map, memberList: Member[]) { + constructor(version: number, members: Map, memberList: MemberImpl[]) { this.version = version; this.members = members; this.memberList = memberList; } } -const EMPTY_SNAPSHOT = new MemberListSnapshot(-1, new Map(), []); +const EMPTY_SNAPSHOT = new MemberListSnapshot(-1, new Map(), []); const INITIAL_MEMBERS_TIMEOUT_IN_MILLIS = 120 * 1000; // 120 seconds /** * Manages the relationship of this client with the cluster. + * @internal */ export class ClusterService implements Cluster { + private client: HazelcastClient; private memberListSnapshot: MemberListSnapshot = EMPTY_SNAPSHOT; private listeners: Map = new Map(); @@ -73,7 +76,7 @@ export class ClusterService implements Cluster { * @param uuid The UUID of the member. * @return The member that was found, or undefined if not found. */ - public getMember(uuid: UUID): Member { + public getMember(uuid: UUID): MemberImpl { assertNotNull(uuid); return this.memberListSnapshot.members.get(uuid.toString()); } @@ -84,15 +87,15 @@ export class ClusterService implements Cluster { * @param selector {@link MemberSelector} instance to filter members to return * @return members that satisfy the given selector. */ - public getMembers(selector?: MemberSelector): Member[] { + public getMembers(selector?: MemberSelector): MemberImpl[] { const members = this.getMemberList(); if (selector == null) { return members; } - const selectedMembers: Member[] = []; + const selectedMembers: MemberImpl[] = []; members.forEach((member) => { - if (selector.select(member)) { + if (selector(member)) { selectedMembers.push(member); } }); @@ -227,10 +230,10 @@ export class ClusterService implements Cluster { }); } - private detectMembershipEvents(prevMembers: Member[], currentMembers: Member[]): MembershipEvent[] { - const newMembers = new Array(); + private detectMembershipEvents(prevMembers: MemberImpl[], currentMembers: MemberImpl[]): MembershipEvent[] { + const newMembers = new Array(); - const deadMembers = new Map(); + const deadMembers = new Map(); for (const member of prevMembers) { deadMembers.set(member.id(), member); } @@ -267,11 +270,11 @@ export class ClusterService implements Cluster { } private createSnapshot(memberListVersion: number, memberInfos: MemberInfo[]): MemberListSnapshot { - const newMembers = new Map(); - const newMemberList = new Array(memberInfos.length); + const newMembers = new Map(); + const newMemberList = new Array(memberInfos.length); let index = 0; for (const memberInfo of memberInfos) { - const member = new Member(memberInfo.address, memberInfo.uuid, memberInfo.attributes, memberInfo.liteMember, + const member = new MemberImpl(memberInfo.address, memberInfo.uuid, memberInfo.attributes, memberInfo.liteMember, memberInfo.version); newMembers.set(memberInfo.uuid.toString(), member); newMemberList[index++] = member; @@ -289,7 +292,7 @@ export class ClusterService implements Cluster { return logString; } - private getMemberList(): Member[] { + private getMemberList(): MemberImpl[] { return this.memberListSnapshot.memberList; } diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 60d2176b7..f540de4ba 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as assert from 'assert'; import * as Promise from 'bluebird'; @@ -33,7 +34,7 @@ import {ClientMessage} from '../ClientMessage'; import {EXCEPTION_MESSAGE_TYPE} from '../codec/builtin/ErrorsCodec'; import {ClientConnectionManager} from '../network/ClientConnectionManager'; import {UUID} from '../core/UUID'; -import {PartitionService} from '../PartitionService'; +import {PartitionServiceImpl} from '../PartitionService'; const MAX_FAST_INVOCATION_COUNT = 5; const PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS = 'hazelcast.client.invocation.retry.pause.millis'; @@ -41,6 +42,7 @@ const PROPERTY_INVOCATION_TIMEOUT_MILLIS = 'hazelcast.client.invocation.timeout. /** * A request to be sent to a hazelcast node. + * @internal */ export class Invocation { @@ -134,6 +136,7 @@ export class Invocation { /** * Sends requests to appropriate nodes. Resolves waiting promises with responses. + * @internal */ export class InvocationService { @@ -147,12 +150,12 @@ export class InvocationService { private logger: ILogger; private isShutdown: boolean; private connectionManager: ClientConnectionManager; - private partitionService: PartitionService; + private partitionService: PartitionServiceImpl; constructor(hazelcastClient: HazelcastClient) { this.client = hazelcastClient; this.connectionManager = hazelcastClient.getConnectionManager(); - this.partitionService = hazelcastClient.getPartitionService(); + this.partitionService = hazelcastClient.getPartitionService() as PartitionServiceImpl; this.logger = this.client.getLoggingService().getLogger(); if (hazelcastClient.getConfig().network.smartRouting) { this.doInvoke = this.invokeSmart; diff --git a/src/invocation/Murmur.ts b/src/invocation/Murmur.ts index 9e7e7097b..ff408781d 100644 --- a/src/invocation/Murmur.ts +++ b/src/invocation/Murmur.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ const seed = 0x01000193; +/** @internal */ export function murmur(key: any): number { let h1: number, h1b: number, k1: number, i: number; diff --git a/src/invocation/RegistrationKey.ts b/src/invocation/RegistrationKey.ts index b159bd6c6..3d92f1ec8 100644 --- a/src/invocation/RegistrationKey.ts +++ b/src/invocation/RegistrationKey.ts @@ -13,17 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {ClientMessage} from '../ClientMessage'; +/** @internal */ export class RegistrationKey { + private readonly userRegistrationId: string; private registerHandlerFunc: Function; private registerRequest: ClientMessage; private codec: ListenerMessageCodec; - constructor(regId: string, codec: ListenerMessageCodec, registerRequest?: ClientMessage, registerHandlerFunc?: Function) { + constructor(regId: string, + codec: ListenerMessageCodec, + registerRequest?: ClientMessage, + registerHandlerFunc?: Function) { this.userRegistrationId = regId; this.registerHandlerFunc = registerHandlerFunc; this.registerRequest = registerRequest; diff --git a/src/listener/ClusterViewListenerService.ts b/src/listener/ClusterViewListenerService.ts index 620f32658..c3472c600 100644 --- a/src/listener/ClusterViewListenerService.ts +++ b/src/listener/ClusterViewListenerService.ts @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import HazelcastClient from '../HazelcastClient'; import {ClientConnectionManager} from '../network/ClientConnectionManager'; -import {PartitionService} from '../PartitionService'; +import {PartitionServiceImpl} from '../PartitionService'; import {ClusterService} from '../invocation/ClusterService'; import {ILogger} from '../logging/ILogger'; import {ClientConnection} from '../network/ClientConnection'; @@ -27,14 +28,15 @@ import {Invocation} from '../invocation/InvocationService'; /** * Adds cluster listener to one of the connections. If that connection is removed, - * it registers connection to any other connection + * it registers connection to any other connection. + * @internal */ export class ClusterViewListenerService { private readonly client: HazelcastClient; private readonly clusterService: ClusterService; private readonly connectionManager: ClientConnectionManager; - private readonly partitionService: PartitionService; + private readonly partitionService: PartitionServiceImpl; private readonly logger: ILogger; private listenerAddedConnection: ClientConnection; @@ -42,7 +44,7 @@ export class ClusterViewListenerService { this.client = client; this.logger = client.getLoggingService().getLogger(); this.connectionManager = client.getConnectionManager(); - this.partitionService = client.getPartitionService(); + this.partitionService = client.getPartitionService() as PartitionServiceImpl; this.clusterService = client.getClusterService(); } diff --git a/src/logging/DefaultLogger.ts b/src/logging/DefaultLogger.ts index 9eb933161..fad296ddc 100644 --- a/src/logging/DefaultLogger.ts +++ b/src/logging/DefaultLogger.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ILogger, LogLevel} from './ILogger'; +/** @internal */ export class DefaultLogger implements ILogger { private readonly level: number; diff --git a/src/logging/LoggingService.ts b/src/logging/LoggingService.ts index bc8808303..4cfb63f7c 100644 --- a/src/logging/LoggingService.ts +++ b/src/logging/LoggingService.ts @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {Property} from '../config/Properties'; import {DefaultLogger} from './DefaultLogger'; import {ILogger, LogLevel} from './ILogger'; import {enumFromString} from '../Util'; +/** @internal */ export class LoggingService { private readonly logger: ILogger; diff --git a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts b/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts deleted file mode 100644 index d10a8b14e..000000000 --- a/src/nearcache/AlwaysFreshStaleReadDetectorImpl.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {DataRecord} from './DataRecord'; -import {MetadataContainer} from './MetadataContainer'; -import {StaleReadDetector} from './StaleReadDetector'; - -export class AlwaysFreshStaleReadDetector implements StaleReadDetector { - isStaleRead(key: any, record: DataRecord): boolean { - return false; - } - - getPartitionId(key: any): number { - return 0; - } - - getMetadataContainer(partitionId: number): MetadataContainer { - return null; - } -} - -const INSTANCE = new AlwaysFreshStaleReadDetector(); - -export {INSTANCE}; diff --git a/src/nearcache/DataRecord.ts b/src/nearcache/DataRecord.ts index 682330c02..3a07d52ef 100644 --- a/src/nearcache/DataRecord.ts +++ b/src/nearcache/DataRecord.ts @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; +/** @internal */ export class DataRecord { static readonly NOT_RESERVED = Long.NEG_ONE; diff --git a/src/nearcache/MetadataContainer.ts b/src/nearcache/MetadataContainer.ts index 73fa6cb55..94df9a520 100644 --- a/src/nearcache/MetadataContainer.ts +++ b/src/nearcache/MetadataContainer.ts @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {UUID} from '../core/UUID'; +/** @internal */ export class MetadataContainer { + private sequence: Long = Long.fromNumber(0); private staleSequence: Long = Long.fromNumber(0); private missedSequenceCount: Long = Long.fromNumber(0); diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index f8868f2ca..35a21a4bd 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -13,28 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {MapFetchNearCacheInvalidationMetadataCodec} from '../codec/MapFetchNearCacheInvalidationMetadataCodec'; -import {MemberSelectors} from '../core/MemberSelectors'; +import * as MemberSelectors from '../core/MemberSelectors'; import {UUID} from '../core/UUID'; import HazelcastClient from '../HazelcastClient'; import {Invocation} from '../invocation/InvocationService'; -import {PartitionService} from '../PartitionService'; import {RepairingHandler} from './RepairingHandler'; import {ILogger} from '../logging/ILogger'; import {ClientMessage} from '../ClientMessage'; +/** @internal */ export class MetadataFetcher { private client: HazelcastClient; - private partitionService: PartitionService; private logger: ILogger; constructor(client: HazelcastClient) { this.logger = client.getLoggingService().getLogger(); this.client = client; - this.partitionService = this.client.getPartitionService(); } initHandler(handler: RepairingHandler): Promise { @@ -84,7 +83,7 @@ export class MetadataFetcher { } protected scanMembers(objectNames: string[]): Array> { - const members = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); + const members = this.client.getClusterService().getMembers(MemberSelectors.dataMemberSelector); const promises: Array> = []; members.forEach((member) => { const request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.uuid); diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 90d237af9..a9334300a 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {EvictionPolicy} from '../config/EvictionPolicy'; @@ -22,11 +23,11 @@ import {DataKeyedHashMap} from '../DataStoreHashMap'; import {Data} from '../serialization/Data'; import {SerializationService} from '../serialization/SerializationService'; import {DeferredPromise, shuffleArray} from '../Util'; -import * as AlwaysFreshStaleReadDetectorImpl from './AlwaysFreshStaleReadDetectorImpl'; import {DataRecord} from './DataRecord'; -import {StaleReadDetector} from './StaleReadDetector'; +import {StaleReadDetector, alwaysFreshDetector} from './StaleReadDetector'; import * as Promise from 'bluebird'; +/** @internal */ export interface NearCacheStatistics { creationTime: number; evictedCount: number; @@ -36,6 +37,7 @@ export interface NearCacheStatistics { entryCount: number; } +/** @internal */ export interface NearCache { put(key: Data, value: any): void; @@ -60,6 +62,7 @@ export interface NearCache { setReady(): void; } +/** @internal */ export class NearCacheImpl implements NearCache { internalStore: DataKeyedHashMap; @@ -74,7 +77,7 @@ export class NearCacheImpl implements NearCache { private evictionSamplingCount: number; private evictionSamplingPoolSize: number; private evictionCandidatePool: DataRecord[]; - private staleReadDetector: StaleReadDetector = AlwaysFreshStaleReadDetectorImpl.INSTANCE; + private staleReadDetector: StaleReadDetector = alwaysFreshDetector; private reservationCounter: Long = Long.ZERO; private evictedCount = 0; @@ -302,7 +305,7 @@ export class NearCacheImpl implements NearCache { } private initInvalidationMetadata(dr: DataRecord): void { - if (this.staleReadDetector === AlwaysFreshStaleReadDetectorImpl.INSTANCE) { + if (this.staleReadDetector === alwaysFreshDetector) { return; } const partitionId = this.staleReadDetector.getPartitionId(dr.key); diff --git a/src/nearcache/NearCacheManager.ts b/src/nearcache/NearCacheManager.ts index 1f249dcbd..fd5171cb5 100644 --- a/src/nearcache/NearCacheManager.ts +++ b/src/nearcache/NearCacheManager.ts @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {NearCache, NearCacheImpl} from './NearCache'; import {SerializationService} from '../serialization/SerializationService'; +import {ClientConfigImpl} from '../config/Config'; import HazelcastClient from '../HazelcastClient'; +/** @internal */ export class NearCacheManager { protected readonly serializationService: SerializationService; @@ -31,9 +34,9 @@ export class NearCacheManager { public getOrCreateNearCache(name: string): NearCache { let nearCache = this.caches.get(name); if (nearCache == null) { - nearCache = new NearCacheImpl(this.client.getConfig().getNearCacheConfig(name), + const config = this.client.getConfig() as ClientConfigImpl; + nearCache = new NearCacheImpl(config.getNearCacheConfig(name), this.client.getSerializationService()); - this.caches.set(name, nearCache); } return nearCache; diff --git a/src/nearcache/RepairingHandler.ts b/src/nearcache/RepairingHandler.ts index 35f0e7fc0..d7979868f 100644 --- a/src/nearcache/RepairingHandler.ts +++ b/src/nearcache/RepairingHandler.ts @@ -13,24 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {UUID} from '../core/UUID'; -import {PartitionService} from '../PartitionService'; +import {PartitionServiceImpl} from '../PartitionService'; import {Data} from '../serialization/Data'; import {MetadataContainer} from './MetadataContainer'; import {NearCache} from './NearCache'; +/** @internal */ export class RepairingHandler { private readonly nearCache: NearCache; private readonly partitionCount: number; - private readonly partitionService: PartitionService; + private readonly partitionService: PartitionServiceImpl; private readonly localUuid: UUID; private readonly name: string; private containers: MetadataContainer[]; - constructor(name: string, partitionService: PartitionService, nearCache: NearCache, localUuid: UUID) { + constructor(name: string, partitionService: PartitionServiceImpl, nearCache: NearCache, localUuid: UUID) { this.nearCache = nearCache; this.name = name; this.partitionService = partitionService; diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index c68107a2e..4a565256f 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as assert from 'assert'; import * as Long from 'long'; @@ -20,6 +21,7 @@ import HazelcastClient from '../HazelcastClient'; import {MetadataFetcher} from './MetadataFetcher'; import {NearCache} from './NearCache'; import {RepairingHandler} from './RepairingHandler'; +import {PartitionServiceImpl} from '../PartitionService'; import * as Promise from 'bluebird'; import {ILogger} from '../logging/ILogger'; import {UUID} from '../core/UUID'; @@ -28,6 +30,7 @@ const PROPERTY_MAX_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.rec const PROPERTY_MIN_RECONCILIATION_INTERVAL_SECONDS = 'hazelcast.invalidation.min.reconciliation.interval.seconds'; const PROPERTY_MAX_TOLERATED_MISS_COUNT = 'hazelcast.invalidation.max.tolerated.miss.count'; +/** @internal */ export class RepairingTask { private antientropyTaskHandle: any; @@ -61,7 +64,8 @@ export class RepairingTask { return Promise.resolve(handler); } - handler = new RepairingHandler(objectName, this.client.getPartitionService(), nearCache, this.localUuid); + const partitionService = this.client.getPartitionService() as PartitionServiceImpl; + handler = new RepairingHandler(objectName, partitionService, nearCache, this.localUuid); return this.metadataFetcher.initHandler(handler).then(() => { this.handlers.set(objectName, handler); if (this.antientropyTaskHandle === undefined) { diff --git a/src/nearcache/StaleReadDetector.ts b/src/nearcache/StaleReadDetector.ts index 88f393cb0..e48ed501d 100644 --- a/src/nearcache/StaleReadDetector.ts +++ b/src/nearcache/StaleReadDetector.ts @@ -13,9 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ + import {DataRecord} from './DataRecord'; import {MetadataContainer} from './MetadataContainer'; +import {RepairingHandler} from './RepairingHandler'; +import {PartitionServiceImpl} from '../PartitionService'; +/** @internal */ export interface StaleReadDetector { isStaleRead(key: any, record: DataRecord): boolean; @@ -23,3 +28,45 @@ export interface StaleReadDetector { getMetadataContainer(partitionId: number): MetadataContainer; } + +/** @internal */ +export class StaleReadDetectorImpl implements StaleReadDetector { + + private readonly repairingHandler: RepairingHandler; + private readonly partitionService: PartitionServiceImpl; + + constructor(handler: RepairingHandler, partitionService: PartitionServiceImpl) { + this.repairingHandler = handler; + this.partitionService = partitionService; + } + + isStaleRead(key: any, record: DataRecord): boolean { + const metadata = this.getMetadataContainer(this.getPartitionId(record.key)); + return !record.hasSameUuid(metadata.getUuid()) || record.getInvalidationSequence().lessThan(metadata.getStaleSequence()); + } + + getMetadataContainer(partitionId: number): MetadataContainer { + return this.repairingHandler.getMetadataContainer(partitionId); + } + + getPartitionId(key: any): number { + return this.partitionService.getPartitionId(key); + } +} + +class AlwaysFreshStaleReadDetectorImpl implements StaleReadDetector { + isStaleRead(key: any, record: DataRecord): boolean { + return false; + } + + getPartitionId(key: any): number { + return 0; + } + + getMetadataContainer(partitionId: number): MetadataContainer { + return null; + } +} + +/** @internal */ +export const alwaysFreshDetector = new AlwaysFreshStaleReadDetectorImpl(); diff --git a/src/nearcache/StaleReadDetectorImpl.ts b/src/nearcache/StaleReadDetectorImpl.ts deleted file mode 100644 index bc829eb69..000000000 --- a/src/nearcache/StaleReadDetectorImpl.ts +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {PartitionService} from '../PartitionService'; -import {DataRecord} from './DataRecord'; -import {MetadataContainer} from './MetadataContainer'; -import {RepairingHandler} from './RepairingHandler'; -import {StaleReadDetector} from './StaleReadDetector'; - -export class StaleReadDetectorImpl implements StaleReadDetector { - - private readonly repairingHandler: RepairingHandler; - private readonly partitionService: PartitionService; - - constructor(handler: RepairingHandler, partitionService: PartitionService) { - this.repairingHandler = handler; - this.partitionService = partitionService; - } - - isStaleRead(key: any, record: DataRecord): boolean { - const metadata = this.getMetadataContainer(this.getPartitionId(record.key)); - return !record.hasSameUuid(metadata.getUuid()) || record.getInvalidationSequence().lessThan(metadata.getStaleSequence()); - } - - getMetadataContainer(partitionId: number): MetadataContainer { - return this.repairingHandler.getMetadataContainer(partitionId); - } - - getPartitionId(key: any): number { - return this.partitionService.getPartitionId(key); - } -} diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index 72f90b9bc..d5ef2114b 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import * as net from 'net'; @@ -22,7 +23,7 @@ import {BuildInfo} from '../BuildInfo'; import HazelcastClient from '../HazelcastClient'; import {IOError} from '../HazelcastError'; import {DeferredPromise} from '../Util'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; import {UUID} from '../core/UUID'; import {ILogger} from '../logging/ILogger'; import {ClientMessage, Frame, SIZE_OF_FRAME_LENGTH_AND_FLAGS} from '../ClientMessage'; @@ -37,6 +38,7 @@ interface OutputQueueItem { resolver: Promise.Resolver; } +/** @internal */ export class PipelinedWriter extends EventEmitter { private readonly socket: net.Socket; @@ -127,6 +129,7 @@ export class PipelinedWriter extends EventEmitter { } } +/** @internal */ export class DirectWriter extends EventEmitter { private readonly socket: net.Socket; @@ -148,6 +151,7 @@ export class DirectWriter extends EventEmitter { } } +/** @internal */ export class ClientMessageReader { private chunks: Buffer[] = []; @@ -235,6 +239,7 @@ export class ClientMessageReader { } } +/** @internal */ export class FragmentedClientMessageHandler { private readonly fragmentedMessages = new Map(); @@ -259,11 +264,12 @@ export class FragmentedClientMessageHandler { } } +/** @internal */ export class ClientConnection { private readonly connectionId: number; - private remoteAddress: Address; + private remoteAddress: AddressImpl; private remoteUuid: UUID; - private readonly localAddress: Address; + private readonly localAddress: AddressImpl; private lastReadTimeMillis: number; private lastWriteTimeMillis: number; private readonly client: HazelcastClient; @@ -271,7 +277,6 @@ export class ClientConnection { private closedTime: number; private closedReason: string; private closedCause: Error; - private connectedServerVersionString: string; private connectedServerVersion: number; private readonly socket: net.Socket; private readonly writer: PipelinedWriter | DirectWriter; @@ -279,7 +284,7 @@ export class ClientConnection { private readonly logger: ILogger; private readonly fragmentedMessageHandler: FragmentedClientMessageHandler; - constructor(client: HazelcastClient, remoteAddress: Address, socket: net.Socket, connectionId: number) { + constructor(client: HazelcastClient, remoteAddress: AddressImpl, socket: net.Socket, connectionId: number) { const enablePipelining = client.getConfig().properties[PROPERTY_PIPELINING_ENABLED] as boolean; const pipeliningThreshold = client.getConfig().properties[PROPERTY_PIPELINING_THRESHOLD] as number; const noDelay = client.getConfig().properties[PROPERTY_NO_DELAY] as boolean; @@ -288,10 +293,9 @@ export class ClientConnection { this.client = client; this.socket = socket; this.remoteAddress = remoteAddress; - this.localAddress = new Address(socket.localAddress, socket.localPort); + this.localAddress = new AddressImpl(socket.localAddress, socket.localPort); this.lastReadTimeMillis = 0; this.closedTime = 0; - this.connectedServerVersionString = null; this.connectedServerVersion = BuildInfo.UNKNOWN_VERSION_ID; this.writer = enablePipelining ? new PipelinedWriter(socket, pipeliningThreshold) : new DirectWriter(socket); this.writer.on('write', () => { @@ -307,7 +311,7 @@ export class ClientConnection { * Returns the address of local port that is associated with this connection. * @returns */ - getLocalAddress(): Address { + getLocalAddress(): AddressImpl { return this.localAddress; } @@ -315,11 +319,11 @@ export class ClientConnection { * Returns the address of remote node that is associated with this connection. * @returns */ - getRemoteAddress(): Address { + getRemoteAddress(): AddressImpl { return this.remoteAddress; } - setRemoteAddress(address: Address): void { + setRemoteAddress(address: AddressImpl): void { this.remoteAddress = address; } @@ -338,7 +342,6 @@ export class ClientConnection { } setConnectedServerVersion(versionString: string): void { - this.connectedServerVersionString = versionString; this.connectedServerVersion = BuildInfo.calculateServerVersionFromString(versionString); } diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index cf7227cbe..bdab32f02 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; @@ -40,7 +41,7 @@ import { } from '../Util'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {ILogger} from '../logging/ILogger'; -import {Address} from '../Address'; +import {AddressImpl} from '../Address'; import {HeartbeatManager} from '../HeartbeatManager'; import {UuidUtil} from '../util/UuidUtil'; import {WaitStrategy} from './WaitStrategy'; @@ -48,14 +49,15 @@ import {ReconnectMode} from '../config/ConnectionStrategyConfig'; import {LoadBalancer} from '../LoadBalancer'; import {UUID} from '../core/UUID'; import {ClientConfigImpl} from '../config/Config'; -import {LifecycleState} from '../LifecycleService'; +import {LifecycleState, LifecycleServiceImpl} from '../LifecycleService'; import {ClientMessage} from '../ClientMessage'; import {BuildInfo} from '../BuildInfo'; import {ClientAuthenticationCustomCodec} from '../codec/ClientAuthenticationCustomCodec'; import {ClientAuthenticationCodec, ClientAuthenticationResponseParams} from '../codec/ClientAuthenticationCodec'; import {AuthenticationStatus} from '../protocol/AuthenticationStatus'; import {Invocation} from '../invocation/InvocationService'; -import {Member} from '../core/Member'; +import {MemberImpl} from '../core/Member'; +import {PartitionServiceImpl} from '../PartitionService'; const CONNECTION_REMOVED_EVENT_NAME = 'connectionRemoved'; const CONNECTION_ADDED_EVENT_NAME = 'connectionAdded'; @@ -94,6 +96,7 @@ enum ClientState { /** * Maintains connections between the client and members of the cluster. + * @internal */ export class ClientConnectionManager extends EventEmitter { @@ -119,7 +122,7 @@ export class ClientConnectionManager extends EventEmitter { private clientState = ClientState.INITIAL; private connectToClusterTaskSubmitted: boolean; private reconnectToMembersTask: Task; - private connectingAddresses = new Set
(); + private connectingAddresses = new Set(); constructor(client: HazelcastClient) { super(); @@ -132,7 +135,7 @@ export class ClientConnectionManager extends EventEmitter { this.authenticationTimeout = this.heartbeatManager.getHeartbeatTimeout(); this.shuffleMemberList = client.getConfig().properties['hazelcast.client.shuffle.member.list'] as boolean; this.isSmartRoutingEnabled = client.getConfig().network.smartRouting; - this.waitStrategy = this.initWaitStrategy(client.getConfig()); + this.waitStrategy = this.initWaitStrategy(client.getConfig() as ClientConfigImpl); const connectionStrategyConfig = client.getConfig().connectionStrategy; this.asyncStart = connectionStrategyConfig.asyncStart; this.reconnectMode = connectionStrategyConfig.reconnectMode; @@ -221,7 +224,7 @@ export class ClientConnectionManager extends EventEmitter { return this.clientUuid; } - public getOrConnect(address: Address): Promise { + public getOrConnect(address: AddressImpl): Promise { if (!this.client.getLifecycleService().isRunning()) { return Promise.reject(new ClientNotActiveError('Client is not active.')); } @@ -244,7 +247,7 @@ export class ClientConnectionManager extends EventEmitter { this.client.getInvocationService().processResponse(msg); }; - let translatedAddress: Address; + let translatedAddress: AddressImpl; let clientConnection: ClientConnection; this.translate(address) .then((translated) => { @@ -318,8 +321,8 @@ export class ClientConnectionManager extends EventEmitter { private initWaitStrategy(config: ClientConfigImpl): WaitStrategy { const connectionStrategyConfig = config.connectionStrategy; const retryConfig = connectionStrategyConfig.connectionRetry; - return new WaitStrategy(retryConfig.initialBackoffMillis, retryConfig.maxBackoffMillis, retryConfig.multiplier, - retryConfig.clusterConnectTimeoutMillis, retryConfig.jitter, this.logger); + return new WaitStrategy(retryConfig.initialBackoffMillis, retryConfig.maxBackoffMillis, + retryConfig.multiplier, retryConfig.clusterConnectTimeoutMillis, retryConfig.jitter, this.logger); } private initConnectionTimeoutMillis(): number { @@ -408,7 +411,7 @@ export class ClientConnectionManager extends EventEmitter { }); } - private tryConnectingToAddress(index: number, addresses: Address[], triedAddresses: Set): Promise { + private tryConnectingToAddress(index: number, addresses: AddressImpl[], triedAddresses: Set): Promise { if (index >= addresses.length) { return Promise.resolve(false); } @@ -426,7 +429,7 @@ export class ClientConnectionManager extends EventEmitter { }); } - private connect(address: Address): Promise { + private connect(address: AddressImpl): Promise { this.logger.info('ConnectionManager', 'Trying to connect to ' + address); return this.getOrConnect(address) .catch((error) => { @@ -437,10 +440,10 @@ export class ClientConnectionManager extends EventEmitter { } private emitLifecycleEvent(state: LifecycleState): void { - this.client.getLifecycleService().emitLifecycleEvent(state); + (this.client.getLifecycleService() as LifecycleServiceImpl).emitLifecycleEvent(state); } - private getPossibleMemberAddresses(): Promise { + private getPossibleMemberAddresses(): Promise { const addresses = this.client.getClusterService().getMembers() .map(((member) => member.address.toString())); @@ -461,7 +464,7 @@ export class ClientConnectionManager extends EventEmitter { shuffleArray(providerAddresses); } const allAddresses = Array.from(new Set([...addresses, ...providerAddresses])); - const result: Address[] = []; + const result: AddressImpl[] = []; for (const address of allAddresses) { result.push(...AddressHelper.getSocketAddresses(address)); } @@ -469,7 +472,7 @@ export class ClientConnectionManager extends EventEmitter { }); } - private getConnectionFromAddress(address: Address): ClientConnection { + private getConnectionFromAddress(address: AddressImpl): ClientConnection { for (const connection of this.getActiveConnections()) { if (connection.getRemoteAddress().equals(address)) { return connection; @@ -491,7 +494,7 @@ export class ClientConnectionManager extends EventEmitter { return deferred.promise; } - private triggerConnect(translatedAddress: Address): Promise { + private triggerConnect(translatedAddress: AddressImpl): Promise { if (this.client.getConfig().network.ssl.enabled) { if (this.client.getConfig().network.ssl.sslOptions) { const opts = this.client.getConfig().network.ssl.sslOptions; @@ -519,7 +522,7 @@ export class ClientConnectionManager extends EventEmitter { } } - private connectTLSSocket(address: Address, configOpts: any): Promise { + private connectTLSSocket(address: AddressImpl, configOpts: any): Promise { const connectionResolver = DeferredPromise(); const socket = tls.connect(address.port, address.host, configOpts); socket.once('secureConnect', () => { @@ -538,7 +541,7 @@ export class ClientConnectionManager extends EventEmitter { return connectionResolver.promise; } - private connectNetSocket(address: Address): Promise { + private connectNetSocket(address: AddressImpl): Promise { const connectionResolver = DeferredPromise(); const socket = net.connect(address.port, address.host); socket.once('connect', () => { @@ -565,7 +568,7 @@ export class ClientConnectionManager extends EventEmitter { this.emit(CONNECTION_REMOVED_EVENT_NAME, connection); } - private translate(target: Address): Promise
{ + private translate(target: AddressImpl): Promise { const addressProvider = this.client.getAddressProvider(); return addressProvider.translate(target) .catch((error: Error) => { @@ -728,7 +731,7 @@ export class ClientConnectionManager extends EventEmitter { } private checkPartitionCount(newPartitionCount: number): void { - const partitionService = this.client.getPartitionService(); + const partitionService = this.client.getPartitionService() as PartitionServiceImpl; if (!partitionService.checkAndSetPartitionCount(newPartitionCount)) { throw new ClientNotAllowedInClusterError('Client can not work with this cluster because it has a different ' + 'partition count. Expected partition count: ' + partitionService.getPartitionCount() + @@ -769,7 +772,7 @@ export class ClientConnectionManager extends EventEmitter { }); } - private tryConnectToAllClusterMembers(members: Member[]): Promise { + private tryConnectToAllClusterMembers(members: MemberImpl[]): Promise { const promises: Array> = []; for (const member of members) { diff --git a/src/network/WaitStrategy.ts b/src/network/WaitStrategy.ts index 3c2aecc4f..dd39824d4 100644 --- a/src/network/WaitStrategy.ts +++ b/src/network/WaitStrategy.ts @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ILogger} from '../logging/ILogger'; import * as Promise from 'bluebird'; +/** @internal */ export class WaitStrategy { + private readonly initialBackoffMillis: number; private readonly maxBackoffMillis: number; private readonly multiplier: number; @@ -28,8 +31,12 @@ export class WaitStrategy { private currentBackoffMillis: number; private clusterConnectAttemptBegin: number; - constructor(initialBackoffMillis: number, maxBackoffMillis: number, multiplier: number, clusterConnectTimeoutMillis: number, - jitter: number, logger: ILogger) { + constructor(initialBackoffMillis: number, + maxBackoffMillis: number, + multiplier: number, + clusterConnectTimeoutMillis: number, + jitter: number, + logger: ILogger) { this.initialBackoffMillis = initialBackoffMillis; this.maxBackoffMillis = maxBackoffMillis; this.multiplier = multiplier; diff --git a/src/protocol/AnchorDataListHolder.ts b/src/protocol/AnchorDataListHolder.ts index f7904b4e3..756c874ba 100644 --- a/src/protocol/AnchorDataListHolder.ts +++ b/src/protocol/AnchorDataListHolder.ts @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {Data} from '../serialization/Data'; import {SerializationService} from '../serialization/SerializationService'; +/** @internal */ export class AnchorDataListHolder { anchorPageList: number[]; anchorDataList: Array<[Data, Data]>; diff --git a/src/protocol/AuthenticationStatus.ts b/src/protocol/AuthenticationStatus.ts index a37e61cd2..c2bab5dfe 100644 --- a/src/protocol/AuthenticationStatus.ts +++ b/src/protocol/AuthenticationStatus.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ /** - * Status codes of authentication results. + * Status codes of authentication results. + * @internal */ export enum AuthenticationStatus { AUTHENTICATED = 0, diff --git a/src/protocol/ClientProtocolErrorCodes.ts b/src/protocol/ClientProtocolErrorCodes.ts index 33cd40e53..cdb9e3232 100644 --- a/src/protocol/ClientProtocolErrorCodes.ts +++ b/src/protocol/ClientProtocolErrorCodes.ts @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ +/** @internal */ export class ClientProtocolErrorCodes { static readonly UNDEFINED = 0; static readonly ARRAY_INDEX_OUT_OF_BOUNDS = 1; diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index 690a025da..b23df4000 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import { AuthenticationError, @@ -57,6 +58,7 @@ import {ErrorHolder} from './ErrorHolder'; type ErrorFactory = (msg: string, cause: Error) => Error; +/** @internal */ export class ClientErrorFactory { private codeToErrorConstructor: Map = new Map(); diff --git a/src/protocol/ErrorHolder.ts b/src/protocol/ErrorHolder.ts index 1f8098738..a212f6fd4 100644 --- a/src/protocol/ErrorHolder.ts +++ b/src/protocol/ErrorHolder.ts @@ -17,6 +17,7 @@ import {StackTraceElement} from './StackTraceElement'; export class ErrorHolder { + errorCode: number; className: string; message: string; diff --git a/src/protocol/PagingPredicateHolder.ts b/src/protocol/PagingPredicateHolder.ts index 9359bd66b..7243b337e 100644 --- a/src/protocol/PagingPredicateHolder.ts +++ b/src/protocol/PagingPredicateHolder.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {AnchorDataListHolder} from './AnchorDataListHolder'; import {Data} from '../serialization/Data'; @@ -20,6 +21,7 @@ import {SerializationService} from '../serialization/SerializationService'; import {PagingPredicateImpl} from '../serialization/DefaultPredicates'; import {iterationTypeToId} from '../core/Predicate'; +/** @internal */ export class PagingPredicateHolder { anchorDataListHolder: AnchorDataListHolder; diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 71fec86d4..8ea5de58b 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {BuildInfo} from '../BuildInfo'; @@ -23,6 +24,7 @@ import {UUID} from '../core/UUID'; /** * Common super class for any proxy. + * @internal */ export class BaseProxy { diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/FlakeIdGeneratorProxy.ts index eaba99933..497e7f0e4 100644 --- a/src/proxy/FlakeIdGeneratorProxy.ts +++ b/src/proxy/FlakeIdGeneratorProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import * as Long from 'long'; @@ -22,7 +23,9 @@ import HazelcastClient from '../HazelcastClient'; import {BaseProxy} from './BaseProxy'; import {AutoBatcher, Batch} from './flakeid/AutoBatcher'; import {FlakeIdGenerator} from './FlakeIdGenerator'; +import {ClientConfigImpl} from '../config/Config'; +/** @internal */ export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator { private autoBatcher: AutoBatcher; @@ -30,7 +33,7 @@ export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator constructor(client: HazelcastClient, serviceName: string, name: string) { super(client, serviceName, name); - this.config = client.getConfig().getFlakeIdGeneratorConfig(name); + this.config = (client.getConfig() as ClientConfigImpl).getFlakeIdGeneratorConfig(name); this.autoBatcher = new AutoBatcher(() => { return this.encodeInvokeOnRandomTarget(FlakeIdGeneratorNewIdBatchCodec, this.config.prefetchCount) .then((clientMessage) => { diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index 17dcf851e..ce3720c83 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {ListAddAllCodec} from '../codec/ListAddAllCodec'; @@ -45,6 +46,7 @@ import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {ClientMessage} from '../ClientMessage'; import {UUID} from '../core/UUID'; +/** @internal */ export class ListProxy extends PartitionSpecificProxy implements IList { add(element: E): Promise { diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index a5cc3dac4..46d6538af 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {Aggregator} from '../aggregation/Aggregator'; @@ -87,6 +88,7 @@ import {IndexUtil} from '../util/IndexUtil'; import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; import {MapEntriesWithPagingPredicateCodec} from '../codec/MapEntriesWithPagingPredicateCodec'; +/** @internal */ export class MapProxy extends BaseProxy implements IMap { aggregate(aggregator: Aggregator): Promise { assertNotNull(aggregator); diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index d64ad9f27..78545d92c 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; @@ -52,6 +53,7 @@ import {UUID} from '../core/UUID'; import * as SerializationUtil from '../serialization/SerializationUtil'; import {MultiMapPutAllCodec} from '../codec/MultiMapPutAllCodec'; +/** @internal */ export class MultiMapProxy extends BaseProxy implements MultiMap { private lockReferenceIdGenerator: LockReferenceIdGenerator = this.client.getLockReferenceIdGenerator(); diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 43003e91f..a00485274 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; @@ -20,14 +21,16 @@ import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec' import {EventType} from '../core/EventType'; import {UUID} from '../core/UUID'; import HazelcastClient from '../HazelcastClient'; +import {PartitionServiceImpl} from '../PartitionService'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {NearCache} from '../nearcache/NearCache'; -import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetectorImpl'; +import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetector'; import {Data} from '../serialization/Data'; import {MapProxy} from './MapProxy'; import {ClientMessage} from '../ClientMessage'; import * as Long from 'long'; +/** @internal */ export class NearCachedMapProxy extends MapProxy { private nearCache: NearCache; @@ -228,7 +231,8 @@ export class NearCachedMapProxy extends MapProxy { private createNearCacheEventHandler(): Promise { const repairingTask = this.client.getRepairingTask(); return repairingTask.registerAndGetHandler(this.getName(), this.nearCache).then((repairingHandler) => { - const staleReadDetector = new StaleReadDetectorImpl(repairingHandler, this.client.getPartitionService()); + const staleReadDetector = new StaleReadDetectorImpl( + repairingHandler, this.client.getPartitionService() as PartitionServiceImpl); this.nearCache.setStaleReadDetector(staleReadDetector); const handle = function (key: Data, sourceUuid: UUID, partitionUuid: UUID, sequence: Long): void { repairingHandler.handle(key, sourceUuid, partitionUuid, sequence); diff --git a/src/proxy/PNCounterProxy.ts b/src/proxy/PNCounterProxy.ts index f9219757e..32132746a 100644 --- a/src/proxy/PNCounterProxy.ts +++ b/src/proxy/PNCounterProxy.ts @@ -13,25 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import * as Long from 'long'; import {PNCounterAddCodec} from '../codec/PNCounterAddCodec'; import {PNCounterGetCodec} from '../codec/PNCounterGetCodec'; import {PNCounterGetConfiguredReplicaCountCodec} from '../codec/PNCounterGetConfiguredReplicaCountCodec'; -import {MemberSelectors} from '../core/MemberSelectors'; +import * as MemberSelectors from '../core/MemberSelectors'; import {VectorClock} from '../core/VectorClock'; import {NoDataMemberInClusterError} from '../HazelcastError'; import {randomInt} from '../Util'; import {BaseProxy} from './BaseProxy'; import {PNCounter} from './PNCounter'; -import {Member} from '../core/Member'; +import {MemberImpl} from '../core/Member'; +/** @internal */ export class PNCounterProxy extends BaseProxy implements PNCounter { - private static readonly EMPTY_ARRAY: Member[] = []; + private static readonly EMPTY_ARRAY: MemberImpl[] = []; private lastObservedVectorClock: VectorClock = new VectorClock(); private maximumReplicaCount = 0; - private currentTargetReplicaAddress: Member; + private currentTargetReplicaAddress: MemberImpl; get(): Promise { return this.invokeInternal(PNCounterProxy.EMPTY_ARRAY, null, PNCounterGetCodec); @@ -80,7 +82,7 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { return Promise.resolve(); } - private invokeInternal(excludedAddresses: Member[], lastError: any, codec: any, ...codecArgs: any[]): Promise { + private invokeInternal(excludedAddresses: MemberImpl[], lastError: any, codec: any, ...codecArgs: any[]): Promise { return this.getCRDTOperationTarget(excludedAddresses).then((target) => { if (target == null) { if (lastError) { @@ -103,7 +105,7 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { }); } - private encodeInvokeInternal(target: Member, codec: any, ...codecArguments: any[]): Promise { + private encodeInvokeInternal(target: MemberImpl, codec: any, ...codecArguments: any[]): Promise { return this.encodeInvokeOnTarget(codec, target.uuid, ...codecArguments, this.lastObservedVectorClock.entrySet(), target.uuid) .then((clientMessage) => { @@ -111,7 +113,7 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { }); } - private getCRDTOperationTarget(excludedAddresses: Member[]): Promise { + private getCRDTOperationTarget(excludedAddresses: MemberImpl[]): Promise { if (this.currentTargetReplicaAddress != null && !excludedAddresses.some(this.currentTargetReplicaAddress.equals.bind(this.currentTargetReplicaAddress))) { return Promise.resolve(this.currentTargetReplicaAddress); @@ -123,7 +125,7 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { } } - private chooseTargetReplica(excludedAddresses: Member[]): Promise { + private chooseTargetReplica(excludedAddresses: MemberImpl[]): Promise { return this.getReplicaAddresses(excludedAddresses).then((replicaAddresses) => { if (replicaAddresses.length === 0) { return null; @@ -132,11 +134,11 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { }); } - private getReplicaAddresses(excludedAddresses: Member[]): Promise { - const dataMembers = this.client.getClusterService().getMembers(MemberSelectors.DATA_MEMBER_SELECTOR); + private getReplicaAddresses(excludedAddresses: MemberImpl[]): Promise { + const dataMembers = this.client.getClusterService().getMembers(MemberSelectors.dataMemberSelector); return this.getMaxConfiguredReplicaCount().then((replicaCount: number) => { const currentCount = Math.min(replicaCount, dataMembers.length); - const replicaAddresses: Member[] = []; + const replicaAddresses: MemberImpl[] = []; for (let i = 0; i < currentCount; i++) { const memberAddress = dataMembers[i]; if (!excludedAddresses.some(memberAddress.equals.bind(memberAddress))) { diff --git a/src/proxy/PartitionSpecificProxy.ts b/src/proxy/PartitionSpecificProxy.ts index 36f01b441..1a4d1c622 100644 --- a/src/proxy/PartitionSpecificProxy.ts +++ b/src/proxy/PartitionSpecificProxy.ts @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import HazelcastClient from '../HazelcastClient'; import {BaseProxy} from './BaseProxy'; import {ClientMessage} from '../ClientMessage'; +/** @internal */ export class PartitionSpecificProxy extends BaseProxy { private partitionId: number; diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index fbd87b693..67d42a35d 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {ClientAddDistributedObjectListenerCodec} from '../codec/ClientAddDistributedObjectListenerCodec'; @@ -36,17 +37,20 @@ import {SetProxy} from './SetProxy'; import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; import {DistributedObjectEvent, DistributedObjectListener} from '../core/DistributedObjectListener'; import {DeferredPromise} from '../Util'; -import {ILogger} from '../logging/ILogger'; import {ClientMessage} from '../ClientMessage'; import {UUID} from '../core/UUID'; import {ClientCreateProxiesCodec} from '../codec/ClientCreateProxiesCodec'; import {BaseProxy} from './BaseProxy'; import {Ringbuffer} from './Ringbuffer'; +import {ClientConfigImpl} from '../config/Config'; +/** @internal */ export const NAMESPACE_SEPARATOR = '/'; const RINGBUFFER_PREFIX = '_hz_rb_'; +/** @internal */ export class ProxyManager { + public static readonly MAP_SERVICE: string = 'hz:impl:mapService'; public static readonly SET_SERVICE: string = 'hz:impl:setService'; public static readonly LOCK_SERVICE: string = 'hz:impl:lockService'; @@ -62,15 +66,9 @@ export class ProxyManager { public readonly service: { [serviceName: string]: any } = {}; private readonly proxies = new Map>(); private readonly client: HazelcastClient; - private readonly logger: ILogger; - private readonly invocationTimeoutMillis: number; - private readonly invocationRetryPauseMillis: number; constructor(client: HazelcastClient) { this.client = client; - this.logger = this.client.getLoggingService().getLogger(); - this.invocationTimeoutMillis = this.client.getInvocationService().getInvocationTimeoutMillis(); - this.invocationRetryPauseMillis = this.client.getInvocationService().getInvocationRetryPauseMillis(); } public init(): void { @@ -208,7 +206,8 @@ export class ProxyManager { private initializeLocalProxy(name: string, serviceName: string, createAtServer: boolean): Promise { let localProxy: DistributedObject; - if (serviceName === ProxyManager.MAP_SERVICE && this.client.getConfig().getNearCacheConfig(name)) { + const config = this.client.getConfig() as ClientConfigImpl; + if (serviceName === ProxyManager.MAP_SERVICE && config.getNearCacheConfig(name)) { localProxy = new NearCachedMapProxy(this.client, serviceName, name); } else { // This call may throw ClientOfflineError for partition specific proxies with async start diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index b739fd7af..87eb085b4 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {QueueAddAllCodec} from '../codec/QueueAddAllCodec'; @@ -44,6 +45,7 @@ import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {ClientMessage} from '../ClientMessage'; import {UUID} from '../core/UUID'; +/** @internal */ export class QueueProxy extends PartitionSpecificProxy implements IQueue { add(item: E): Promise { diff --git a/src/proxy/ReplicatedMap.ts b/src/proxy/ReplicatedMap.ts index b670a72a8..6405c2d8a 100644 --- a/src/proxy/ReplicatedMap.ts +++ b/src/proxy/ReplicatedMap.ts @@ -19,7 +19,7 @@ import {EntryListener} from '../core/EntryListener'; import {Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../DistributedObject'; -import {ArrayComparator} from '../util/ArrayComparator'; +import {ListComparator} from '../core/Comparator'; import Long = require('long'); export interface ReplicatedMap extends DistributedObject { @@ -119,9 +119,10 @@ export interface ReplicatedMap extends DistributedObject { keySet(): Promise; /** + * @param comparator optional ListComparator function to sort the returned elements. * @return a list of values contained in this map. */ - values(comparator?: ArrayComparator): Promise>; + values(comparator?: ListComparator): Promise>; /** * @return Returns entries as an array of key-value pairs. diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index 63073951a..3f70c82b4 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -40,7 +40,7 @@ import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {ListenerMessageCodec} from '../ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {assertNotNull} from '../Util'; -import {ArrayComparator} from '../util/ArrayComparator'; +import {ListComparator} from '../core/Comparator'; import {ReplicatedMap} from './ReplicatedMap'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {MapEvent} from '../core/MapListener'; @@ -154,7 +154,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements }); } - values(comparator?: ArrayComparator): Promise> { + values(comparator?: ListComparator): Promise> { return this.encodeInvoke(ReplicatedMapValuesCodec) .then((clientMessage) => { const response = ReplicatedMapValuesCodec.decodeResponse(clientMessage); diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index e12d18669..e29942ba1 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {SetAddAllCodec} from '../codec/SetAddAllCodec'; @@ -36,6 +37,7 @@ import {PartitionSpecificProxy} from './PartitionSpecificProxy'; import {ClientMessage} from '../ClientMessage'; import {UUID} from '../core/UUID'; +/** @internal */ export class SetProxy extends PartitionSpecificProxy implements ISet { add(entry: E): Promise { diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index 9b0ebc368..30e4f8710 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import * as Long from 'long'; import {DeferredPromise} from '../../Util'; +/** @internal */ export class Batch { + private nextIdLong: Long; private increment: Long; private invalidSince: number; @@ -53,9 +56,10 @@ export class Batch { } } +/** @internal */ export class AutoBatcher { - private readonly NEW_BATCH_AVAILABLE = 'newBatch'; + private static readonly NEW_BATCH_AVAILABLE = 'newBatch'; private queue: Array> = []; private batch: Batch; @@ -65,7 +69,7 @@ export class AutoBatcher { constructor(supplier: () => Promise) { this.supplier = supplier; - this.emitter.on(this.NEW_BATCH_AVAILABLE, this.processIdRequests.bind(this)); + this.emitter.on(AutoBatcher.NEW_BATCH_AVAILABLE, this.processIdRequests.bind(this)); this.emitter.on('error', this.rejectAll.bind(this)); } @@ -99,7 +103,7 @@ export class AutoBatcher { this.supplier().then((batch: Batch) => { this.requestInFlight = false; this.batch = batch; - this.emitter.emit(this.NEW_BATCH_AVAILABLE); + this.emitter.emit(AutoBatcher.NEW_BATCH_AVAILABLE); }).catch((e) => { this.requestInFlight = false; this.emitter.emit('error', e); diff --git a/src/proxy/ringbuffer/LazyReadResultSet.ts b/src/proxy/ringbuffer/LazyReadResultSet.ts index 8df98fae7..78fefeb80 100644 --- a/src/proxy/ringbuffer/LazyReadResultSet.ts +++ b/src/proxy/ringbuffer/LazyReadResultSet.ts @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {Data} from '../../serialization/Data'; import {SerializationService, SerializationServiceV1} from '../../serialization/SerializationService'; import {ReadResultSet} from './ReadResultSet'; +/** @internal */ export class LazyReadResultSet implements ReadResultSet { private readCount: number; diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index d08d9dcba..82708d469 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {RingbufferAddAllCodec} from '../../codec/RingbufferAddAllCodec'; @@ -31,6 +32,7 @@ import {LazyReadResultSet} from './LazyReadResultSet'; import {ReadResultSet} from './ReadResultSet'; import Long = require('long'); +/** @internal */ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbuffer { private static readonly MAX_BATCH_SIZE = 1000; diff --git a/src/proxy/topic/Message.ts b/src/proxy/topic/Message.ts index c6d0b9fae..2dd2735e2 100644 --- a/src/proxy/topic/Message.ts +++ b/src/proxy/topic/Message.ts @@ -17,8 +17,24 @@ import Long = require('long'); import {Address} from '../../Address'; +/** + * Message of Reliable Topic. + */ export class Message { + + /** + * Published message. + */ messageObject: T; + + /** + * Address of the member that published the message. + */ publisher: Address; + + /** + * Time when the message was published (Epoch time). + */ publishingTime: Long; + } diff --git a/src/proxy/topic/MessageListener.ts b/src/proxy/topic/MessageListener.ts index 5ecc480c6..2095a02d1 100644 --- a/src/proxy/topic/MessageListener.ts +++ b/src/proxy/topic/MessageListener.ts @@ -13,6 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import {Message} from './Message'; +/** + * Message listener for Reliable Topic. + */ export type MessageListener = (message: Message) => void; diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 2f24d8118..84667c94a 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ReadResultSet} from '../../'; import { @@ -28,6 +29,7 @@ import {Message} from './Message'; import {MessageListener} from './MessageListener'; import {ILogger} from '../../logging/ILogger'; +/** @internal */ export class ReliableTopicListenerRunner { sequenceNumber = 0; diff --git a/src/proxy/topic/ReliableTopicMessage.ts b/src/proxy/topic/ReliableTopicMessage.ts index b978774b2..3420ddc1f 100644 --- a/src/proxy/topic/ReliableTopicMessage.ts +++ b/src/proxy/topic/ReliableTopicMessage.ts @@ -13,21 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {Data, DataInput, DataOutput} from '../../serialization/Data'; import {IdentifiedDataSerializable} from '../../serialization/Serializable'; -import {Address} from '../../Address'; +import {AddressImpl} from '../../Address'; +/** @internal */ export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -9; +/** @internal */ export const RELIABLE_TOPIC_CLASS_ID = 2; +/** @internal */ export class ReliableTopicMessage implements IdentifiedDataSerializable { factoryId = RELIABLE_TOPIC_MESSAGE_FACTORY_ID; classId = RELIABLE_TOPIC_CLASS_ID; publishTime: Long; - publisherAddress: Address; + publisherAddress: AddressImpl; payload: Data; readData(input: DataInput): any { @@ -43,6 +47,7 @@ export class ReliableTopicMessage implements IdentifiedDataSerializable { } } +/** @internal */ export function reliableTopicMessageFactory(classId: number): IdentifiedDataSerializable { if (classId === RELIABLE_TOPIC_CLASS_ID) { return new ReliableTopicMessage(); diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index d76795174..091448326 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Promise from 'bluebird'; import {OverflowPolicy} from '../../core/OverflowPolicy'; import HazelcastClient from '../../HazelcastClient'; import {TopicOverloadError} from '../../HazelcastError'; -import {Address} from '../../index'; +import {AddressImpl} from '../../Address'; import {SerializationService} from '../../serialization/SerializationService'; import {UuidUtil} from '../../util/UuidUtil'; import {BaseProxy} from '../BaseProxy'; @@ -28,14 +29,18 @@ import {ReliableTopicMessage} from './ReliableTopicMessage'; import {ReliableTopicListenerRunner} from './ReliableTopicListenerRunner'; import {MessageListener} from './MessageListener'; import {TopicOverloadPolicy} from './TopicOverloadPolicy'; +import {ClientConfigImpl} from '../../config/Config'; import Long = require('long'); +/** @internal */ export const TOPIC_INITIAL_BACKOFF = 100; +/** @internal */ export const TOPIC_MAX_BACKOFF = 2000; +/** @internal */ export class ReliableTopicProxy extends BaseProxy implements ITopic { private ringbuffer: Ringbuffer; - private readonly localAddress: Address; + private readonly localAddress: AddressImpl; private readonly batchSize: number; private readonly runners: { [key: string]: ReliableTopicListenerRunner } = {}; private readonly serializationService: SerializationService; @@ -43,8 +48,8 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { constructor(client: HazelcastClient, serviceName: string, name: string) { super(client, serviceName, name); - this.localAddress = client.getClusterService().getLocalClient().localAddress; - const config = client.getConfig().getReliableTopicConfig(name); + this.localAddress = client.getClusterService().getLocalClient().localAddress as AddressImpl; + const config = (client.getConfig() as ClientConfigImpl).getReliableTopicConfig(name); this.batchSize = config.readBatchSize; this.overloadPolicy = config.overloadPolicy; this.serializationService = client.getSerializationService(); diff --git a/src/proxy/topic/TopicOverloadPolicy.ts b/src/proxy/topic/TopicOverloadPolicy.ts index c34ceeb77..b46103e5d 100644 --- a/src/proxy/topic/TopicOverloadPolicy.ts +++ b/src/proxy/topic/TopicOverloadPolicy.ts @@ -14,6 +14,9 @@ * limitations under the License. */ +/** + * Overload policy for Reliable Topic. + */ export enum TopicOverloadPolicy { /** diff --git a/src/serialization/Data.ts b/src/serialization/Data.ts index 22ac6a7d9..f928c46ed 100644 --- a/src/serialization/Data.ts +++ b/src/serialization/Data.ts @@ -16,7 +16,9 @@ import * as Long from 'long'; +/** @internal */ export interface Data { + /** * Returns serialized representation in a buffer */ @@ -67,7 +69,7 @@ export interface Data { } /** - * Defines interface for output data writer. + * Output write helper for {@link IdentifiedDataSerializable} objects. */ export interface DataOutput { @@ -97,6 +99,7 @@ export interface DataOutput { writeChars(chars: string): void; + /** @internal */ writeData(data: Data): void; writeDouble(double: number): void; @@ -131,6 +134,7 @@ export interface DataOutput { } +/** @internal */ export interface PositionalDataOutput extends DataOutput { pwrite(position: number, byte: number | Buffer): void; @@ -156,7 +160,7 @@ export interface PositionalDataOutput extends DataOutput { } /** - * Defines interface for input data reader. + * Input read helper for {@link IdentifiedDataSerializable} objects. */ export interface DataInput { @@ -178,6 +182,7 @@ export interface DataInput { readCharArray(pos?: number): string[]; + /** @internal */ readData(pos?: number): Data; readDouble(pos?: number): number; diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index 3c479f0cc..49f3b7afc 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {Comparator} from '../core/Comparator'; import {IterationType, Predicate, PagingPredicate} from '../core/Predicate'; @@ -20,8 +21,10 @@ import {enumFromString} from '../Util'; import {DataInput, DataOutput} from './Data'; import {IdentifiedDataSerializable} from './Serializable'; +/** @internal */ export const PREDICATE_FACTORY_ID = -20; +/** @internal */ abstract class AbstractPredicate implements Predicate { abstract classId: number; @@ -32,6 +35,7 @@ abstract class AbstractPredicate implements Predicate { abstract writeData(output: DataOutput): void; } +/** @internal */ export class SqlPredicate extends AbstractPredicate { static CLASS_ID = 0; @@ -53,6 +57,7 @@ export class SqlPredicate extends AbstractPredicate { } } +/** @internal */ export class AndPredicate extends AbstractPredicate { static CLASS_ID = 1; @@ -81,6 +86,7 @@ export class AndPredicate extends AbstractPredicate { } } +/** @internal */ export class BetweenPredicate extends AbstractPredicate { static CLASS_ID = 2; @@ -110,6 +116,7 @@ export class BetweenPredicate extends AbstractPredicate { } } +/** @internal */ export class EqualPredicate extends AbstractPredicate { static CLASS_ID = 3; @@ -135,6 +142,7 @@ export class EqualPredicate extends AbstractPredicate { } } +/** @internal */ export class GreaterLessPredicate extends AbstractPredicate { static CLASS_ID = 4; @@ -169,6 +177,7 @@ export class GreaterLessPredicate extends AbstractPredicate { } } +/** @internal */ export class LikePredicate extends AbstractPredicate { static CLASS_ID = 5; @@ -195,6 +204,7 @@ export class LikePredicate extends AbstractPredicate { } } +/** @internal */ export class ILikePredicate extends LikePredicate { static CLASS_ID = 6; @@ -202,6 +212,7 @@ export class ILikePredicate extends LikePredicate { classId = ILikePredicate.CLASS_ID; } +/** @internal */ export class InPredicate extends AbstractPredicate { static CLASS_ID = 7; @@ -235,6 +246,7 @@ export class InPredicate extends AbstractPredicate { } } +/** @internal */ export class InstanceOfPredicate extends AbstractPredicate { static CLASS_ID = 8; @@ -257,6 +269,7 @@ export class InstanceOfPredicate extends AbstractPredicate { } } +/** @internal */ export class NotEqualPredicate extends EqualPredicate { static CLASS_ID = 9; @@ -264,6 +277,7 @@ export class NotEqualPredicate extends EqualPredicate { classId = NotEqualPredicate.CLASS_ID; } +/** @internal */ export class NotPredicate extends AbstractPredicate { static CLASS_ID = 10; @@ -286,6 +300,7 @@ export class NotPredicate extends AbstractPredicate { } } +/** @internal */ export class OrPredicate extends AbstractPredicate { static CLASS_ID = 11; @@ -315,6 +330,7 @@ export class OrPredicate extends AbstractPredicate { } } +/** @internal */ export class RegexPredicate extends AbstractPredicate { static CLASS_ID = 12; @@ -341,6 +357,7 @@ export class RegexPredicate extends AbstractPredicate { } } +/** @internal */ export class FalsePredicate extends AbstractPredicate { static CLASS_ID = 13; @@ -357,6 +374,7 @@ export class FalsePredicate extends AbstractPredicate { } } +/** @internal */ export class TruePredicate extends AbstractPredicate { static CLASS_ID = 14; @@ -373,6 +391,7 @@ export class TruePredicate extends AbstractPredicate { } } +/** @internal */ export class PagingPredicateImpl extends AbstractPredicate implements PagingPredicate { private static NULL_ANCHOR: [number, [any, any]] = [-1, null]; @@ -429,8 +448,6 @@ export class PagingPredicateImpl extends AbstractPredicate implements PagingPred }); } - - nextPage(): PagingPredicate { this.page++; return this; @@ -523,6 +540,7 @@ for (const predicate of allPredicates) { idToConstructorMap[predicate.CLASS_ID] = predicate; } +/** @internal */ export function predicateFactory(classId: number): IdentifiedDataSerializable { if (idToConstructorMap[classId]) { return new idToConstructorMap[classId](); diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializer.ts index 2f120d60f..df1dab01b 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializer.ts @@ -47,6 +47,7 @@ export interface Serializer { } +/** @internal */ export class StringSerializer implements Serializer { id = -11; @@ -60,6 +61,7 @@ export class StringSerializer implements Serializer { } } +/** @internal */ export class DoubleSerializer implements Serializer { id = -10; @@ -73,6 +75,7 @@ export class DoubleSerializer implements Serializer { } } +/** @internal */ export class BooleanSerializer implements Serializer { id = -4; @@ -86,8 +89,10 @@ export class BooleanSerializer implements Serializer { } } +/** @internal */ export const NULL_TYPE_ID = 0; +/** @internal */ export class NullSerializer implements Serializer { id = NULL_TYPE_ID; @@ -97,10 +102,11 @@ export class NullSerializer implements Serializer { } write(output: DataOutput, object: any): void { - // Empty method + // no-op } } +/** @internal */ export class ShortSerializer implements Serializer { id = -6; @@ -114,6 +120,7 @@ export class ShortSerializer implements Serializer { } } +/** @internal */ export class IntegerSerializer implements Serializer { id = -7; @@ -127,6 +134,7 @@ export class IntegerSerializer implements Serializer { } } +/** @internal */ export class LongSerializer implements Serializer { id = -8; @@ -140,6 +148,7 @@ export class LongSerializer implements Serializer { } } +/** @internal */ export class FloatSerializer implements Serializer { id = -9; @@ -153,6 +162,7 @@ export class FloatSerializer implements Serializer { } } +/** @internal */ export class DateSerializer implements Serializer { id = -25; @@ -166,6 +176,7 @@ export class DateSerializer implements Serializer { } } +/** @internal */ export class BooleanArraySerializer implements Serializer { id = -13; @@ -179,6 +190,7 @@ export class BooleanArraySerializer implements Serializer { } } +/** @internal */ export class ShortArraySerializer implements Serializer { id = -15; @@ -192,6 +204,7 @@ export class ShortArraySerializer implements Serializer { } } +/** @internal */ export class IntegerArraySerializer implements Serializer { id = -16; @@ -205,6 +218,7 @@ export class IntegerArraySerializer implements Serializer { } } +/** @internal */ export class LongArraySerializer implements Serializer { id = -17; @@ -218,6 +232,7 @@ export class LongArraySerializer implements Serializer { } } +/** @internal */ export class DoubleArraySerializer implements Serializer { id = -19; @@ -231,6 +246,7 @@ export class DoubleArraySerializer implements Serializer { } } +/** @internal */ export class StringArraySerializer implements Serializer { id = -20; @@ -244,6 +260,7 @@ export class StringArraySerializer implements Serializer { } } +/** @internal */ export class ByteSerializer implements Serializer { id = -3; @@ -257,6 +274,7 @@ export class ByteSerializer implements Serializer { } } +/** @internal */ export class ByteArraySerializer implements Serializer { id = -12; @@ -270,6 +288,7 @@ export class ByteArraySerializer implements Serializer { } } +/** @internal */ export class CharSerializer implements Serializer { id = -5; @@ -283,6 +302,7 @@ export class CharSerializer implements Serializer { } } +/** @internal */ export class CharArraySerializer implements Serializer { id = -14; @@ -296,6 +316,7 @@ export class CharArraySerializer implements Serializer { } } +/** @internal */ export class FloatArraySerializer implements Serializer { id = -18; @@ -309,6 +330,7 @@ export class FloatArraySerializer implements Serializer { } } +/** @internal */ export class JavaClassSerializer implements Serializer { id = -24; @@ -322,6 +344,7 @@ export class JavaClassSerializer implements Serializer { } } +/** @internal */ export class LinkedListSerializer implements Serializer { id = -30; @@ -343,11 +366,13 @@ export class LinkedListSerializer implements Serializer { } } +/** @internal */ export class ArrayListSerializer extends LinkedListSerializer { id = -29; } +/** @internal */ export class IdentifiedDataSerializableSerializer implements Serializer { id = -2; @@ -381,6 +406,7 @@ export class IdentifiedDataSerializableSerializer implements Serializer { } } +/** @internal */ export class JsonSerializer implements Serializer { id = -130; @@ -399,6 +425,7 @@ export class JsonSerializer implements Serializer { } } +/** @internal */ export class HazelcastJsonValueSerializer extends JsonSerializer { read(input: DataInput): HazelcastJsonValue { diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index d4aca8e8f..6ecda38f2 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -13,16 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {murmur} from '../invocation/Murmur'; import {Data} from './Data'; import {NULL_TYPE_ID} from './DefaultSerializer'; +/** @internal */ export const PARTITION_HASH_OFFSET = 0; +/** @internal */ export const TYPE_OFFSET = 4; +/** @internal */ export const DATA_OFFSET = 8; +/** @internal */ export const HEAP_DATA_OVERHEAD: number = DATA_OFFSET; +/** @internal */ export class HeapData implements Data { private payload: Buffer; diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 420be8986..8402394ea 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as assert from 'assert'; import * as Long from 'long'; @@ -24,6 +25,7 @@ import {SerializationService} from './SerializationService'; const OUTPUT_BUFFER_INITIAL_SIZE = HEAP_DATA_OVERHEAD + BitsUtil.LONG_SIZE_IN_BYTES; const MASK_1BYTE = (1 << 8) - 1; +/** @internal */ export class ObjectDataOutput implements DataOutput { protected buffer: Buffer; protected bigEndian: boolean; @@ -233,6 +235,7 @@ export class ObjectDataOutput implements DataOutput { } } +/** @internal */ export class PositionalObjectDataOutput extends ObjectDataOutput implements PositionalDataOutput { pwrite(position: number, byte: number | Buffer): void { if (Buffer.isBuffer(byte)) { @@ -285,6 +288,7 @@ export class PositionalObjectDataOutput extends ObjectDataOutput implements Posi } } +/** @internal */ export class ObjectDataInput implements DataInput { private buffer: Buffer; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index ba3e59fd2..8b06adba4 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {AGGREGATOR_FACTORY_ID, aggregatorFactory} from '../aggregation/AggregatorFactory'; import {CLUSTER_DATA_FACTORY_ID, clusterDataFactory} from '../ClusterDataFactory'; @@ -58,9 +59,10 @@ import {IdentifiedDataSerializableFactory} from './Serializable'; import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; import {REST_VALUE_FACTORY_ID, restValueFactory} from '../core/RestValue'; +/** @internal */ export interface SerializationService { - toData(object: any, paritioningStrategy?: any): Data; + toData(object: any, partitioningStrategy?: any): Data; toObject(data: Data): any; @@ -70,6 +72,7 @@ export interface SerializationService { } +/** @internal */ export class SerializationServiceV1 implements SerializationService { private registry: { [id: number]: Serializer }; @@ -254,10 +257,7 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('javaClass', new JavaClassSerializer()); this.registerSerializer('floatArray', new FloatArraySerializer()); this.registerIdentifiedFactories(); - this.registerSerializer( - '!portable', - new PortableSerializer(this, this.serializationConfig), - ); + this.registerSerializer('!portable', new PortableSerializer(this.serializationConfig)); if (this.serializationConfig.jsonStringDeserializationPolicy === JsonStringDeserializationPolicy.EAGER) { this.registerSerializer('!json', new JsonSerializer()); } else { diff --git a/src/serialization/SerializationUtil.ts b/src/serialization/SerializationUtil.ts index 9952d7111..953f14e58 100644 --- a/src/serialization/SerializationUtil.ts +++ b/src/serialization/SerializationUtil.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {Data} from './Data'; +/** @internal */ export function deserializeEntryList(toObject: Function, entrySet: Array<[Data, Data]>): Array<[K, V]> { const deserializedSet: Array<[K, V]> = []; entrySet.forEach(function (entry): void { @@ -24,6 +26,7 @@ export function deserializeEntryList(toObject: Function, entrySet: Array<[ return deserializedSet; } +/** @internal */ export function serializeList(toData: Function, input: any[]): Data[] { return input.map((each) => { return toData(each); diff --git a/src/serialization/portable/ClassDefinition.ts b/src/serialization/portable/ClassDefinition.ts index 28566cb88..62ff6c13e 100644 --- a/src/serialization/portable/ClassDefinition.ts +++ b/src/serialization/portable/ClassDefinition.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {deepEqual} from 'assert'; +/** @internal */ export class ClassDefinition { private factoryId: number; private classId: number; @@ -94,6 +96,7 @@ export class ClassDefinition { } } +/** @internal */ export class FieldDefinition { private readonly index: number; private readonly fieldName: string; @@ -136,6 +139,9 @@ export class FieldDefinition { } } +/** + * Portable field type. + */ export enum FieldType { PORTABLE = 0, BYTE = 1, diff --git a/src/serialization/portable/ClassDefinitionBuilder.ts b/src/serialization/portable/ClassDefinitionBuilder.ts index d96d1bd3e..69df906c1 100644 --- a/src/serialization/portable/ClassDefinitionBuilder.ts +++ b/src/serialization/portable/ClassDefinitionBuilder.ts @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; import {HazelcastSerializationError} from '../../HazelcastError'; +/** @internal */ export class ClassDefinitionBuilder { private readonly factoryId: number; private readonly classId: number; diff --git a/src/serialization/portable/ClassDefinitionContext.ts b/src/serialization/portable/ClassDefinitionContext.ts index 30b2b6a91..bc23425c0 100644 --- a/src/serialization/portable/ClassDefinitionContext.ts +++ b/src/serialization/portable/ClassDefinitionContext.ts @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {ClassDefinition} from './ClassDefinition'; import {HazelcastSerializationError} from '../../HazelcastError'; +/** @internal */ export class ClassDefinitionContext { private factoryId: number; diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index e734d0b23..54b766374 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {PortableWriter} from './PortableSerializer'; import {ClassDefinition} from './ClassDefinition'; @@ -22,6 +23,7 @@ import * as Long from 'long'; import {ClassDefinitionBuilder} from './ClassDefinitionBuilder'; import {HazelcastSerializationError} from '../../HazelcastError'; +/** @internal */ export class ClassDefinitionWriter implements PortableWriter { private context: PortableContext; private builder: ClassDefinitionBuilder; diff --git a/src/serialization/portable/DefaultPortableReader.ts b/src/serialization/portable/DefaultPortableReader.ts index 5ee3371a8..ea1a5a2db 100644 --- a/src/serialization/portable/DefaultPortableReader.ts +++ b/src/serialization/portable/DefaultPortableReader.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {BitsUtil} from '../../BitsUtil'; @@ -22,6 +23,7 @@ import {Portable} from '../Serializable'; import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; import {PortableReader, PortableSerializer} from './PortableSerializer'; +/** @internal */ export class DefaultPortableReader implements PortableReader { protected serializer: PortableSerializer; diff --git a/src/serialization/portable/DefaultPortableWriter.ts b/src/serialization/portable/DefaultPortableWriter.ts index 76a5eadde..5b5f49dcd 100644 --- a/src/serialization/portable/DefaultPortableWriter.ts +++ b/src/serialization/portable/DefaultPortableWriter.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {PortableSerializer} from './PortableSerializer'; import {PositionalDataOutput} from '../Data'; @@ -21,6 +22,7 @@ import {BitsUtil} from '../../BitsUtil'; import {Portable} from '../Serializable'; import * as Long from 'long'; +/** @internal */ export class DefaultPortableWriter { private serializer: PortableSerializer; private output: PositionalDataOutput; diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index 439ef4dd6..77e97ccc5 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {DefaultPortableReader} from './DefaultPortableReader'; import {PortableSerializer} from './PortableSerializer'; @@ -21,6 +22,7 @@ import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; import {Portable} from '../Serializable'; import * as Long from 'long'; +/** @internal */ export class MorphingPortableReader extends DefaultPortableReader { constructor(portableSerializer: PortableSerializer, input: DataInput, classDefinition: ClassDefinition) { super(portableSerializer, input, classDefinition); diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index 309febf4a..6c69e1be1 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ -import {SerializationService} from '../SerializationService'; import {ClassDefinitionContext} from './ClassDefinitionContext'; import {DataInput} from '../Data'; import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; @@ -23,13 +23,13 @@ import {BitsUtil} from '../../BitsUtil'; import {Portable, VersionedPortable} from '../Serializable'; import {ClassDefinitionBuilder} from './ClassDefinitionBuilder'; +/** @internal */ export class PortableContext { - private service: SerializationService; + private version: number; private classDefContext: { [factoyId: number]: ClassDefinitionContext }; - constructor(service: SerializationService, portableVersion: number) { - this.service = service; + constructor(portableVersion: number) { this.version = portableVersion; this.classDefContext = {}; } diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 2f99fcfb7..9b36ea26d 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import {SerializationService} from '../SerializationService'; import {PortableContext} from './PortableContext'; import {Portable, PortableFactory} from '../Serializable'; import {Serializer} from '../DefaultSerializer'; @@ -27,16 +26,15 @@ import * as Long from 'long'; import {SerializationConfigImpl} from '../../config/SerializationConfig'; import {HazelcastSerializationError} from '../../HazelcastError'; +/** @internal */ export class PortableSerializer implements Serializer { id = -1; - private portableContext: PortableContext; - private factories: { [id: number]: PortableFactory }; - private service: SerializationService; + private readonly portableContext: PortableContext; + private readonly factories: { [id: number]: PortableFactory }; - constructor(service: SerializationService, serializationConfig: SerializationConfigImpl) { - this.service = service; - this.portableContext = new PortableContext(this.service, serializationConfig.portableVersion); + constructor(serializationConfig: SerializationConfigImpl) { + this.portableContext = new PortableContext(serializationConfig.portableVersion); this.factories = serializationConfig.portableFactories; } @@ -99,6 +97,9 @@ export class PortableSerializer implements Serializer { } } +/** + * Writer helper for {@link Portable} objects. + */ export interface PortableWriter { writeInt(fieldName: string, value: number): void; @@ -143,6 +144,9 @@ export interface PortableWriter { writePortableArray(fieldName: string, portables: Portable[]): void; } +/** + * Reader helper for {@link Portable} objects. + */ export interface PortableReader { getVersion(): number; diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts index 03bfe8b5e..5affacb61 100644 --- a/src/statistics/Statistics.ts +++ b/src/statistics/Statistics.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import HazelcastClient from '../HazelcastClient'; import {ClientConnection} from '../network/ClientConnection'; @@ -29,6 +30,7 @@ import * as Long from 'long'; * This class is the main entry point for collecting and sending the client * statistics to the cluster. If the client statistics feature is enabled, * it will be scheduled for periodic statistics collection and sent. + * @internal */ export class Statistics { diff --git a/src/util/AbstractLoadBalancer.ts b/src/util/AbstractLoadBalancer.ts index 20ac01f54..fd6492062 100644 --- a/src/util/AbstractLoadBalancer.ts +++ b/src/util/AbstractLoadBalancer.ts @@ -17,31 +17,36 @@ import {LoadBalancer} from '../LoadBalancer'; import {InitialMembershipListener} from '../core/InitialMembershipListener'; import {Cluster} from '../core/Cluster'; -import {ClientConfigImpl} from '../config/Config'; +import {ClientConfig} from '../config/Config'; import {InitialMembershipEvent} from '../core/InitialMembershipEvent'; import {MembershipEvent} from '../core/MembershipEvent'; import {Member} from '../core/Member'; +/** + * Abstract Load Balancer to be used in built-in and user-provided + * {@link LoadBalancer} implementations. + */ export abstract class AbstractLoadBalancer implements LoadBalancer, InitialMembershipListener { + private members: Member[]; private cluster: Cluster; - public abstract next(): Member; + abstract next(): Member; - public initLoadBalancer(cluster: Cluster, config: ClientConfigImpl): void { + initLoadBalancer(cluster: Cluster, config: ClientConfig): void { this.cluster = cluster; cluster.addMembershipListener(this); } - public init(event: InitialMembershipEvent): void { + init(event: InitialMembershipEvent): void { this.setMembers(); } - public memberAdded(membership: MembershipEvent): void { + memberAdded(membership: MembershipEvent): void { this.setMembers(); } - public memberRemoved(membership: MembershipEvent): void { + memberRemoved(membership: MembershipEvent): void { this.setMembers(); } diff --git a/src/util/ArrayComparator.ts b/src/util/ArrayComparator.ts deleted file mode 100644 index 0ac4dea85..000000000 --- a/src/util/ArrayComparator.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -export type ArrayComparator = (a: T, b: T) => number; diff --git a/src/util/IndexUtil.ts b/src/util/IndexUtil.ts index 6dc915fd6..9d9358bcc 100644 --- a/src/util/IndexUtil.ts +++ b/src/util/IndexUtil.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {IndexConfig, InternalIndexConfig} from '../config/IndexConfig'; import {IndexType} from '../config/IndexType'; @@ -29,6 +30,7 @@ const MAX_ATTRIBUTES = 255; */ const THIS_PATTERN = new RegExp('^this\\.'); +/** @internal */ export class IndexUtil { /** diff --git a/src/util/RandomLB.ts b/src/util/RandomLB.ts index 31f18d804..9a20d3293 100644 --- a/src/util/RandomLB.ts +++ b/src/util/RandomLB.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {AbstractLoadBalancer} from './AbstractLoadBalancer'; import {Member} from '../core/Member'; @@ -20,6 +21,7 @@ import {randomInt} from '../Util'; /** * A {@link LoadBalancer} that selects a random member to route to. + * @internal */ export class RandomLB extends AbstractLoadBalancer { next(): Member { diff --git a/src/util/RoundRobinLB.ts b/src/util/RoundRobinLB.ts index fa97cf31c..4cdce47d0 100644 --- a/src/util/RoundRobinLB.ts +++ b/src/util/RoundRobinLB.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {AbstractLoadBalancer} from './AbstractLoadBalancer'; import {randomInt} from '../Util'; @@ -23,6 +24,7 @@ const INITIAL_SEED_CAP = 1 << 16; /** * A {@link LoadBalancer} implementation that relies on using round robin * to a next member to send a request to. + * @internal */ export class RoundRobinLB extends AbstractLoadBalancer { private index: number; diff --git a/src/util/UuidUtil.ts b/src/util/UuidUtil.ts index 62c82c5ed..d238aaee7 100644 --- a/src/util/UuidUtil.ts +++ b/src/util/UuidUtil.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import * as Long from 'long'; import {UUID} from '../core/UUID'; @@ -23,6 +24,7 @@ function randomUInt(): number { return Math.floor(Math.random() * INT_BOUND); } +/** @internal */ export class UuidUtil { static generate(isUnsigned = true): UUID { const mostS = new Long(randomUInt(), randomUInt(), isUnsigned); diff --git a/test/ConnectionManagerTest.js b/test/ConnectionManagerTest.js index 97f87d5f6..f1041d314 100644 --- a/test/ConnectionManagerTest.js +++ b/test/ConnectionManagerTest.js @@ -22,11 +22,10 @@ const expect = chai.expect; const net = require('net'); const Controller = require('./RC'); -const HazelcastClient = require('../.').Client; -const Errors = require('../').HazelcastErrors; -const Address = require('../.').Address; +const { Client, HazelcastErrors } = require('../'); +const { AddressImpl } = require('../lib/Address'); -describe('ConnectionManager', function () { +describe('ConnectionManagerTest', function () { let cluster, client; let testend, server; @@ -68,14 +67,14 @@ describe('ConnectionManager', function () { it('gives up connecting after timeout', function () { const timeoutTime = 1000; startUnresponsiveServer(9999); - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, network: { connectionTimeout: timeoutTime } }).then(function (cl) { client = cl; - return client.getConnectionManager().getOrConnect(new Address('localhost', 9999)); + return client.getConnectionManager().getOrConnect(new AddressImpl('localhost', 9999)); }).should.eventually.be.rejected; }); @@ -88,14 +87,14 @@ describe('ConnectionManager', function () { done(); }, 6000); // 5000 is default timeout. The client should be still trying - HazelcastClient.newHazelcastClient({ + Client.newHazelcastClient({ clusterName: cluster.id, network: { connectionTimeout: timeoutTime } }).then(function (cl) { client = cl; - return client.getConnectionManager().getOrConnect(new Address('localhost',9999)); + return client.getConnectionManager().getOrConnect(new AddressImpl('localhost',9999)); }).then(function (value) { clearTimeout(scheduled); done(new Error('Client should be retrying!')); @@ -112,7 +111,7 @@ describe('ConnectionManager', function () { const timeoutTime = 100; startUnresponsiveServer(9999); - return expect(HazelcastClient.newHazelcastClient({ + return expect(Client.newHazelcastClient({ clusterName: cluster.id, network: { clusterMembers: ['127.0.0.1:9999'], @@ -123,6 +122,6 @@ describe('ConnectionManager', function () { clusterConnectTimeoutMillis: 2000 } } - })).to.be.rejectedWith(Errors.IllegalStateError); + })).to.be.rejectedWith(HazelcastErrors.IllegalStateError); }); }); diff --git a/test/discovery/HazelcastCloudDiscoveryTest.js b/test/discovery/HazelcastCloudDiscoveryTest.js index 400b8d943..3dca1562d 100644 --- a/test/discovery/HazelcastCloudDiscoveryTest.js +++ b/test/discovery/HazelcastCloudDiscoveryTest.js @@ -16,8 +16,8 @@ 'use strict'; const expect = require('chai').expect; -const Address = require('../../lib/Address').Address; -const HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; +const { AddressImpl } = require('../../lib/Address'); +const { HazelcastCloudDiscovery } = require('../../lib/discovery/HazelcastCloudDiscovery'); describe('HazelcastCloudDiscoveryTest', function () { @@ -30,10 +30,10 @@ describe('HazelcastCloudDiscoveryTest', function () { const privateToPublicAddresses = hazelcastCloudDiscovery.parseResponse(response); expect(privateToPublicAddresses.size).to.equal(2); - expect(new Address('10.113.44.139', 31115)) - .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.5.1', 31115).toString())); - expect(new Address('10.113.44.130', 31115)) - .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.4.2', 31115).toString())); + expect(new AddressImpl('10.113.44.139', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new AddressImpl('100.96.5.1', 31115).toString())); + expect(new AddressImpl('10.113.44.130', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new AddressImpl('100.96.4.2', 31115).toString())); }); it('should parse response with different port on private address', function () { @@ -43,9 +43,9 @@ describe('HazelcastCloudDiscoveryTest', function () { const privateToPublicAddresses = hazelcastCloudDiscovery.parseResponse(response); expect(privateToPublicAddresses.size).to.equal(2); - expect(new Address('10.113.44.139', 31115)) - .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.5.1', 5701).toString())); - expect(new Address('10.113.44.130', 31115)) - .to.deep.equal(privateToPublicAddresses.get(new Address('100.96.4.2', 5701).toString())); + expect(new AddressImpl('10.113.44.139', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new AddressImpl('100.96.5.1', 5701).toString())); + expect(new AddressImpl('10.113.44.130', 31115)) + .to.deep.equal(privateToPublicAddresses.get(new AddressImpl('100.96.4.2', 5701).toString())); }); }); diff --git a/test/discovery/HazelcastCloudProviderTest.js b/test/discovery/HazelcastCloudProviderTest.js index 14a3ff983..4c62392b6 100644 --- a/test/discovery/HazelcastCloudProviderTest.js +++ b/test/discovery/HazelcastCloudProviderTest.js @@ -18,13 +18,13 @@ const sinon = require('sinon'); const expect = require('chai').expect; const Promise = require('bluebird'); -const LogLevel = require('../../lib/').LogLevel; -const IllegalStateError = require('../../').HazelcastErrors.IllegalStateError; -const LoggingService = require('../../lib/logging/LoggingService').LoggingService; -const Address = require('../../lib/Address').Address; -const HazelcastCloudAddressProvider = require('../../lib/discovery/HazelcastCloudAddressProvider').HazelcastCloudAddressProvider; -const HazelcastCloudDiscovery = require('../../lib/discovery/HazelcastCloudDiscovery').HazelcastCloudDiscovery; +const { LogLevel } = require('../../lib/'); +const { HazelcastErrors: { IllegalStateError } } = require('../../'); +const { LoggingService } = require('../../lib/logging/LoggingService'); +const { AddressImpl } = require('../../lib/Address'); +const { HazelcastCloudAddressProvider } = require('../../lib/discovery/HazelcastCloudAddressProvider'); +const { HazelcastCloudDiscovery } = require('../../lib/discovery/HazelcastCloudDiscovery'); describe('HazelcastCloudProviderTest', function () { @@ -33,9 +33,9 @@ describe('HazelcastCloudProviderTest', function () { let provider; before(function () { - expectedAddresses.set('10.0.0.1:5701', new Address('198.51.100.1', 5701)); - expectedAddresses.set('10.0.0.1:5702', new Address('198.51.100.1', 5702)); - expectedAddresses.set('10.0.0.2:5701', new Address('198.51.100.2', 5701)); + expectedAddresses.set('10.0.0.1:5701', new AddressImpl('198.51.100.1', 5701)); + expectedAddresses.set('10.0.0.1:5702', new AddressImpl('198.51.100.1', 5702)); + expectedAddresses.set('10.0.0.2:5701', new AddressImpl('198.51.100.2', 5701)); }); beforeEach(() => { @@ -92,7 +92,7 @@ describe('HazelcastCloudProviderTest', function () { }); it('translate_whenNotFound_thenReturnNull', function () { - const notAvailableAddress = new Address('127.0.0.3', 5701); + const notAvailableAddress = new AddressImpl('127.0.0.3', 5701); return provider.translate(notAvailableAddress).then((res) => { return expect(res).to.be.null; }); diff --git a/test/heartbeat/HeartbeatFromClientTest.js b/test/heartbeat/HeartbeatFromClientTest.js index c9d98de4b..5261eacbb 100644 --- a/test/heartbeat/HeartbeatFromClientTest.js +++ b/test/heartbeat/HeartbeatFromClientTest.js @@ -15,13 +15,13 @@ */ 'use strict'; -const RC = require('../RC'); -const HazelcastClient = require('../../').Client; +const fs = require('fs'); const expect = require('chai').expect; +const RC = require('../RC'); const Util = require('../Util'); -const fs = require('fs'); +const { Client } = require('../../'); -describe('Heartbeat', function () { +describe('HeartbeatFromClientTest', function () { this.timeout(30000); let cluster; @@ -53,13 +53,13 @@ describe('Heartbeat', function () { } }; return RC.startMember(cluster.id).then(function (m) { - return HazelcastClient.newHazelcastClient(clientConfig); + return Client.newHazelcastClient(clientConfig); }).then(function (c) { client1 = c; client1.getConnectionManager().on('connectionClosed', function () { connectionClosedEventCount++; }); - return HazelcastClient.newHazelcastClient(clientConfig); + return Client.newHazelcastClient(clientConfig); }).then(function (c) { client2 = c; return client1.getMap(MAP_NAME); diff --git a/test/heartbeat/HeartbeatFromServerTest.js b/test/heartbeat/HeartbeatFromServerTest.js index 4d10fe6c3..37a7c2a1c 100644 --- a/test/heartbeat/HeartbeatFromServerTest.js +++ b/test/heartbeat/HeartbeatFromServerTest.js @@ -16,13 +16,13 @@ 'use strict'; const RC = require('../RC'); -const HazelcastClient = require('../../').Client; const Util = require('../Util'); -const DeferredPromise = require('../../lib/Util').DeferredPromise; -const Address = require('../../').Address; -const TargetDisconnectedError = require('../../lib/HazelcastError').TargetDisconnectedError; +const { Client } = require('../../'); +const { DeferredPromise } = require('../../lib/Util'); +const { AddressImpl } = require('../../lib/Address'); +const { TargetDisconnectedError } = require('../../lib/HazelcastError'); -describe('Heartbeat', function () { +describe('HeartbeatFromServerTest', function () { this.timeout(50000); let cluster; @@ -60,7 +60,7 @@ describe('Heartbeat', function () { let client; const memberAddedPromise = new DeferredPromise(); RC.startMember(cluster.id).then(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.client.heartbeat.interval': 500, @@ -72,7 +72,7 @@ describe('Heartbeat', function () { }).then(function () { const membershipListener = { memberAdded: function (membershipEvent) { - const address = new Address(membershipEvent.member.address.host, membershipEvent.member.address.port); + const address = new AddressImpl(membershipEvent.member.address.host, membershipEvent.member.address.port); warmUpConnectionToAddressWithRetry(client, address); memberAddedPromise.resolve(); } @@ -100,7 +100,7 @@ describe('Heartbeat', function () { }); return memberAddedPromise.promise.then(function () { - simulateHeartbeatLost(client, new Address(member2.host, member2.port), 2000); + simulateHeartbeatLost(client, new AddressImpl(member2.host, member2.port), 2000); }); }).catch(done); }); @@ -110,7 +110,7 @@ describe('Heartbeat', function () { let member2; const memberAddedPromise = new DeferredPromise(); RC.startMember(cluster.id).then(function (m) { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.client.heartbeat.interval': 500, @@ -131,7 +131,7 @@ describe('Heartbeat', function () { member2 = resp; return memberAddedPromise.promise; }).then(function () { - return warmUpConnectionToAddressWithRetry(client, new Address(member2.host, member2.port), 3); + return warmUpConnectionToAddressWithRetry(client, new AddressImpl(member2.host, member2.port), 3); }).then(() => { client.getConnectionManager().once('connectionRemoved', function (connection) { const remoteAddress = connection.getRemoteAddress(); @@ -156,7 +156,7 @@ describe('Heartbeat', function () { + member2.host + ':' + member2.port)); } }); - simulateHeartbeatLost(client, new Address(member2.host, member2.port), 2000); + simulateHeartbeatLost(client, new AddressImpl(member2.host, member2.port), 2000); }).catch(done); }); }); diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index 1469cca9e..d90dae9d0 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -17,8 +17,8 @@ const expect = require('chai').expect; const RC = require('./../RC'); -const Client = require('../..').Client; -const ItemEventType = require('../..').ItemEventType; +const { Client } = require('../../'); +const { ItemEventType } = require('../../lib/core/ItemListener'); describe('ListProxyTest', function () { diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index b11637132..45c2032ad 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -20,12 +20,11 @@ const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); const RC = require('./../RC'); -const Util = require('./../Util'); const Promise = require('bluebird'); const fs = require('fs'); -const HazelcastClient = require('../../').Client; -const ItemEventType = require('../../').ItemEventType; +const { Client } = require('../../'); +const { ItemEventType } = require('../../lib/core/ItemListener'); describe('QueueProxyTest', function () { @@ -41,7 +40,7 @@ describe('QueueProxyTest', function () { return RC.startMember(cluster.id); }) .then(function () { - return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (hazelcastClient) { client = hazelcastClient; }); diff --git a/test/serialization/portable/ClassDefinitionTest.js b/test/serialization/portable/ClassDefinitionTest.js index 3e20687f2..824ca583b 100644 --- a/test/serialization/portable/ClassDefinitionTest.js +++ b/test/serialization/portable/ClassDefinitionTest.js @@ -16,7 +16,7 @@ 'use strict'; const expect = require('chai').expect; -const { ClassDefinition, FieldDefinition } = require('../../../'); +const { ClassDefinition, FieldDefinition } = require('../../../lib/serialization/portable/ClassDefinition'); describe('ClassDefinitionTest', function () { diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index 507cea196..2845241be 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -17,8 +17,8 @@ const expect = require('chai').expect; const RC = require('./../RC'); -const Client = require('../..').Client; -const ItemEventType = require('../..').ItemEventType; +const { Client } = require('../../'); +const { ItemEventType } = require('../../lib/core/ItemListener'); describe('SetProxyTest', function () { diff --git a/test/unit/LoadBalancerTest.js b/test/unit/LoadBalancerTest.js index 7dd17ad2d..c8269eb5e 100644 --- a/test/unit/LoadBalancerTest.js +++ b/test/unit/LoadBalancerTest.js @@ -16,9 +16,9 @@ 'use strict'; -const RandomLB = require('../../lib').RandomLB; -const RoundRobinLB = require('../../lib').RoundRobinLB; const expect = require('chai').expect; +const { RandomLB } = require('../../lib/util/RandomLB'); +const { RoundRobinLB } = require('../../lib/util/RoundRobinLB'); describe('LoadBalancerTest', function () { diff --git a/test/user_code/UserCodeTest.ts b/test/user_code/UserCodeTest.ts new file mode 100644 index 000000000..520815419 --- /dev/null +++ b/test/user_code/UserCodeTest.ts @@ -0,0 +1,13 @@ +/** + * The following file is used to validates correctness of + * declarations (.d.ts) of the client library + * produced by TypeScript compiler. + */ + +import { Client } from '../../lib'; + +(async () => { + const client = await Client.newHazelcastClient(); + const rb = await client.getRingbuffer('my-rb'); + await rb.add(1); +})(); diff --git a/test/user_code/tsconfig.json b/test/user_code/tsconfig.json new file mode 100644 index 000000000..448c724b0 --- /dev/null +++ b/test/user_code/tsconfig.json @@ -0,0 +1,11 @@ +{ + "compilerOptions": { + "noEmit": true, + "module": "commonjs", + "moduleResolution": "node", + "stripInternal": true + }, + "include": [ + "UserCodeTest.ts" + ] +} diff --git a/tsconfig.json b/tsconfig.json index c389af944..22538e2e3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,8 @@ "es2017.string" ], "removeComments": false, - "sourceMap": true + "sourceMap": false, + "stripInternal": true }, "include": [ "src/index.ts" diff --git a/typedoc.json b/typedoc.json new file mode 100644 index 000000000..69066fd75 --- /dev/null +++ b/typedoc.json @@ -0,0 +1,11 @@ +{ + "out": "docs/", + "inputFiles": "src/", + "exclude": "src/codec/**/*.ts", + "excludeNotExported": true, + "excludeExternals": true, + "stripInternal": true, + "ignoreCompilerErrors": true, + "excludePrivate": true, + "excludeProtected": true +} From 181859ea2cff87492d8851f977ae8f67cc887c80 Mon Sep 17 00:00:00 2001 From: Metin Dumandag Date: Mon, 17 Aug 2020 17:27:46 +0300 Subject: [PATCH 277/685] Remove handled fragmented messages from the map (#571) * Remove handled fragmented messages from the map We should remove handled fragmented messages from fragmentedMessages map to free it up. This PR includes this fix. Also, FragmentedClientMessageHandlerTest is enhanced to check the the map's size before and after merging and handling the end fragment. * address review comments --- src/network/ClientConnection.ts | 29 ++++++++++++------- .../FragmentedClientMessageHandlerTest.js | 18 ++++++++++-- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index d5ef2114b..460a531a4 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -242,6 +242,11 @@ export class ClientMessageReader { /** @internal */ export class FragmentedClientMessageHandler { private readonly fragmentedMessages = new Map(); + private readonly logger: ILogger; + + constructor(logger: ILogger) { + this.logger = logger; + } handleFragmentedMessage(clientMessage: ClientMessage, callback: Function): void { const fragmentationFrame = clientMessage.startFrame; @@ -249,18 +254,20 @@ export class FragmentedClientMessageHandler { clientMessage.dropFragmentationFrame(); if (fragmentationFrame.hasBeginFragmentFlag()) { this.fragmentedMessages.set(fragmentationId, clientMessage); - } else if (fragmentationFrame.hasEndFragmentFlag()) { - const mergedMessage = this.mergeIntoExistingClientMessage(fragmentationId, clientMessage); - callback(mergedMessage); } else { - this.mergeIntoExistingClientMessage(fragmentationId, clientMessage); - } - } + const existingMessage = this.fragmentedMessages.get(fragmentationId); + if (existingMessage == null) { + this.logger.debug('FragmentedClientMessageHandler', + 'A fragmented message without the begin part is received. Fragmentation id: ' + fragmentationId); + return; + } - private mergeIntoExistingClientMessage(fragmentationId: number, clientMessage: ClientMessage): ClientMessage { - const existingMessage = this.fragmentedMessages.get(fragmentationId); - existingMessage.merge(clientMessage); - return existingMessage; + existingMessage.merge(clientMessage); + if (fragmentationFrame.hasEndFragmentFlag()) { + this.fragmentedMessages.delete(fragmentationId); + callback(existingMessage); + } + } } } @@ -304,7 +311,7 @@ export class ClientConnection { this.reader = new ClientMessageReader(); this.connectionId = connectionId; this.logger = this.client.getLoggingService().getLogger(); - this.fragmentedMessageHandler = new FragmentedClientMessageHandler(); + this.fragmentedMessageHandler = new FragmentedClientMessageHandler(this.logger); } /** diff --git a/test/connection/FragmentedClientMessageHandlerTest.js b/test/connection/FragmentedClientMessageHandlerTest.js index 03845f135..ce7f4c3dd 100644 --- a/test/connection/FragmentedClientMessageHandlerTest.js +++ b/test/connection/FragmentedClientMessageHandlerTest.js @@ -24,14 +24,16 @@ const ClientMessageReader = require('../../lib/network/ClientConnection').Client const cm = require('../../lib/ClientMessage'); const FixSizedTypesCodec = require('../../lib/codec/builtin/FixSizedTypesCodec').FixSizedTypesCodec; -describe('FragmentedClientMessageHandler', function () { +describe('FragmentedClientMessageHandlerTest', function () { let reader; let handler; beforeEach(() => { reader = new ClientMessageReader(); - handler = new FragmentedClientMessageHandler(); + handler = new FragmentedClientMessageHandler({ + debug: () => {} + }); }); it('handles fragmented message', function (done) { @@ -62,15 +64,25 @@ describe('FragmentedClientMessageHandler', function () { // Should merge with the above message handler.handleFragmentedMessage(fragment1, () => done(new Error("It should just merge."))); + expect(handler.fragmentedMessages.size).to.equal(1); compareMessages(fragments[1].startFrame.next, endFrame.next); endFrame = fragmentedMessage.endFrame; // Should merge with the above message and run the callback + let isCalled = false; handler.handleFragmentedMessage(fragment2, () => { compareMessages(fragments[2].startFrame.next, endFrame.next); - done(); + isCalled = true; }); + expect(isCalled).to.be.true; + expect(handler.fragmentedMessages.size).to.equal(0); + + // If a message with a missing begin part is received, we should do nothing + handler.handleFragmentedMessage(fragment1, () => done(new Error("It should ignore invalid messages."))) + handler.handleFragmentedMessage(fragment2, () => done(new Error("It should ignore invalid messages."))) + expect(handler.fragmentedMessages.size).to.equal(0); + done(); }); const compareMessages = (frame1, frame2) => { From 7007ee79f78469dd4eecf0127dcd294e86b2d314 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 18 Aug 2020 10:39:20 +0300 Subject: [PATCH 278/685] Fix entry point re-exports (#570) Includes the following: * Introduces index.ts files in subdirs for the purpose of re-exporting public modules * Introduces Portable module which contains public API definitions for portable serialization * Moves modules into subdirs, so the overall structure is more consistent * Merges certain related modules into a single one * Changes MembershipListener registration id type to string (was UUID), so it becomes consistent with registration types for other listeners (e.g. IMap#addEntryListener) * Adds documentation for wildcard names and default DS configurations * Includes a bunch of improvements in tsdoc and code style --- .gitignore | 2 +- .npmignore | 1 + DOCUMENTATION.md | 25 ++- src/HazelcastClient.ts | 44 ++-- src/LifecycleService.ts | 2 +- src/LoadBalancer.ts | 47 ----- src/PartitionService.ts | 5 +- src/aggregation/AggregatorFactory.ts | 2 +- .../index.ts} | 8 +- .../ClientAddClusterViewListenerCodec.ts | 4 +- ...ClientAddDistributedObjectListenerCodec.ts | 4 +- .../ClientAddPartitionLostListenerCodec.ts | 4 +- src/codec/ClientAuthenticationCodec.ts | 6 +- src/codec/ClientAuthenticationCustomCodec.ts | 6 +- src/codec/ClientCreateProxiesCodec.ts | 4 +- src/codec/ClientCreateProxyCodec.ts | 4 +- src/codec/ClientDeployClassesCodec.ts | 4 +- src/codec/ClientDestroyProxyCodec.ts | 4 +- src/codec/ClientGetDistributedObjectsCodec.ts | 6 +- src/codec/ClientLocalBackupListenerCodec.ts | 4 +- src/codec/ClientPingCodec.ts | 4 +- ...entRemoveDistributedObjectListenerCodec.ts | 4 +- .../ClientRemovePartitionLostListenerCodec.ts | 4 +- src/codec/ClientStatisticsCodec.ts | 4 +- .../ClientTriggerPartitionAssignmentCodec.ts | 4 +- src/codec/FlakeIdGeneratorNewIdBatchCodec.ts | 4 +- src/codec/ListAddAllCodec.ts | 4 +- src/codec/ListAddAllWithIndexCodec.ts | 4 +- src/codec/ListAddCodec.ts | 4 +- src/codec/ListAddListenerCodec.ts | 4 +- src/codec/ListAddWithIndexCodec.ts | 4 +- src/codec/ListClearCodec.ts | 4 +- src/codec/ListCompareAndRemoveAllCodec.ts | 4 +- src/codec/ListCompareAndRetainAllCodec.ts | 4 +- src/codec/ListContainsAllCodec.ts | 4 +- src/codec/ListContainsCodec.ts | 4 +- src/codec/ListGetAllCodec.ts | 4 +- src/codec/ListGetCodec.ts | 4 +- src/codec/ListIndexOfCodec.ts | 4 +- src/codec/ListIsEmptyCodec.ts | 4 +- src/codec/ListIteratorCodec.ts | 4 +- src/codec/ListLastIndexOfCodec.ts | 4 +- src/codec/ListListIteratorCodec.ts | 4 +- src/codec/ListRemoveCodec.ts | 4 +- src/codec/ListRemoveListenerCodec.ts | 4 +- src/codec/ListRemoveWithIndexCodec.ts | 4 +- src/codec/ListSetCodec.ts | 4 +- src/codec/ListSizeCodec.ts | 4 +- src/codec/ListSubCodec.ts | 4 +- src/codec/MapAddEntryListenerCodec.ts | 4 +- src/codec/MapAddEntryListenerToKeyCodec.ts | 4 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 4 +- .../MapAddEntryListenerWithPredicateCodec.ts | 4 +- src/codec/MapAddIndexCodec.ts | 4 +- src/codec/MapAddInterceptorCodec.ts | 4 +- ...apAddNearCacheInvalidationListenerCodec.ts | 4 +- src/codec/MapAddPartitionLostListenerCodec.ts | 4 +- src/codec/MapAggregateCodec.ts | 4 +- src/codec/MapAggregateWithPredicateCodec.ts | 4 +- src/codec/MapClearCodec.ts | 4 +- src/codec/MapContainsKeyCodec.ts | 4 +- src/codec/MapContainsValueCodec.ts | 4 +- src/codec/MapDeleteCodec.ts | 4 +- .../MapEntriesWithPagingPredicateCodec.ts | 4 +- src/codec/MapEntriesWithPredicateCodec.ts | 4 +- src/codec/MapEntrySetCodec.ts | 4 +- src/codec/MapEventJournalReadCodec.ts | 4 +- src/codec/MapEventJournalSubscribeCodec.ts | 4 +- src/codec/MapEvictAllCodec.ts | 4 +- src/codec/MapEvictCodec.ts | 4 +- src/codec/MapExecuteOnAllKeysCodec.ts | 4 +- src/codec/MapExecuteOnKeyCodec.ts | 4 +- src/codec/MapExecuteOnKeysCodec.ts | 4 +- src/codec/MapExecuteWithPredicateCodec.ts | 4 +- src/codec/MapFetchEntriesCodec.ts | 4 +- src/codec/MapFetchKeysCodec.ts | 4 +- ...FetchNearCacheInvalidationMetadataCodec.ts | 4 +- src/codec/MapFetchWithQueryCodec.ts | 4 +- src/codec/MapFlushCodec.ts | 4 +- src/codec/MapForceUnlockCodec.ts | 4 +- src/codec/MapGetAllCodec.ts | 4 +- src/codec/MapGetCodec.ts | 4 +- src/codec/MapGetEntryViewCodec.ts | 4 +- src/codec/MapIsEmptyCodec.ts | 4 +- src/codec/MapIsLockedCodec.ts | 4 +- src/codec/MapKeySetCodec.ts | 4 +- .../MapKeySetWithPagingPredicateCodec.ts | 4 +- src/codec/MapKeySetWithPredicateCodec.ts | 4 +- src/codec/MapLoadAllCodec.ts | 4 +- src/codec/MapLoadGivenKeysCodec.ts | 4 +- src/codec/MapLockCodec.ts | 4 +- src/codec/MapProjectCodec.ts | 4 +- src/codec/MapProjectWithPredicateCodec.ts | 4 +- src/codec/MapPutAllCodec.ts | 4 +- src/codec/MapPutCodec.ts | 4 +- src/codec/MapPutIfAbsentCodec.ts | 4 +- src/codec/MapPutIfAbsentWithMaxIdleCodec.ts | 4 +- src/codec/MapPutTransientCodec.ts | 4 +- src/codec/MapPutTransientWithMaxIdleCodec.ts | 4 +- src/codec/MapPutWithMaxIdleCodec.ts | 4 +- src/codec/MapRemoveAllCodec.ts | 4 +- src/codec/MapRemoveCodec.ts | 4 +- src/codec/MapRemoveEntryListenerCodec.ts | 4 +- src/codec/MapRemoveIfSameCodec.ts | 4 +- src/codec/MapRemoveInterceptorCodec.ts | 4 +- .../MapRemovePartitionLostListenerCodec.ts | 4 +- src/codec/MapReplaceCodec.ts | 4 +- src/codec/MapReplaceIfSameCodec.ts | 4 +- src/codec/MapSetCodec.ts | 4 +- src/codec/MapSetTtlCodec.ts | 4 +- src/codec/MapSetWithMaxIdleCodec.ts | 4 +- src/codec/MapSizeCodec.ts | 4 +- src/codec/MapSubmitToKeyCodec.ts | 4 +- src/codec/MapTryLockCodec.ts | 4 +- src/codec/MapTryPutCodec.ts | 4 +- src/codec/MapTryRemoveCodec.ts | 4 +- src/codec/MapUnlockCodec.ts | 4 +- src/codec/MapValuesCodec.ts | 4 +- .../MapValuesWithPagingPredicateCodec.ts | 4 +- src/codec/MapValuesWithPredicateCodec.ts | 4 +- src/codec/MultiMapAddEntryListenerCodec.ts | 4 +- .../MultiMapAddEntryListenerToKeyCodec.ts | 4 +- src/codec/MultiMapClearCodec.ts | 4 +- src/codec/MultiMapContainsEntryCodec.ts | 4 +- src/codec/MultiMapContainsKeyCodec.ts | 4 +- src/codec/MultiMapContainsValueCodec.ts | 4 +- src/codec/MultiMapDeleteCodec.ts | 4 +- src/codec/MultiMapEntrySetCodec.ts | 4 +- src/codec/MultiMapForceUnlockCodec.ts | 4 +- src/codec/MultiMapGetCodec.ts | 4 +- src/codec/MultiMapIsLockedCodec.ts | 4 +- src/codec/MultiMapKeySetCodec.ts | 4 +- src/codec/MultiMapLockCodec.ts | 4 +- src/codec/MultiMapPutAllCodec.ts | 4 +- src/codec/MultiMapPutCodec.ts | 4 +- src/codec/MultiMapRemoveCodec.ts | 4 +- src/codec/MultiMapRemoveEntryCodec.ts | 4 +- src/codec/MultiMapRemoveEntryListenerCodec.ts | 4 +- src/codec/MultiMapSizeCodec.ts | 4 +- src/codec/MultiMapTryLockCodec.ts | 4 +- src/codec/MultiMapUnlockCodec.ts | 4 +- src/codec/MultiMapValueCountCodec.ts | 4 +- src/codec/MultiMapValuesCodec.ts | 4 +- src/codec/PNCounterAddCodec.ts | 4 +- src/codec/PNCounterGetCodec.ts | 4 +- ...PNCounterGetConfiguredReplicaCountCodec.ts | 4 +- src/codec/QueueAddAllCodec.ts | 4 +- src/codec/QueueAddListenerCodec.ts | 4 +- src/codec/QueueClearCodec.ts | 4 +- src/codec/QueueCompareAndRemoveAllCodec.ts | 4 +- src/codec/QueueCompareAndRetainAllCodec.ts | 4 +- src/codec/QueueContainsAllCodec.ts | 4 +- src/codec/QueueContainsCodec.ts | 4 +- src/codec/QueueDrainToCodec.ts | 4 +- src/codec/QueueDrainToMaxSizeCodec.ts | 4 +- src/codec/QueueIsEmptyCodec.ts | 4 +- src/codec/QueueIteratorCodec.ts | 4 +- src/codec/QueueOfferCodec.ts | 4 +- src/codec/QueuePeekCodec.ts | 4 +- src/codec/QueuePollCodec.ts | 4 +- src/codec/QueuePutCodec.ts | 4 +- src/codec/QueueRemainingCapacityCodec.ts | 4 +- src/codec/QueueRemoveCodec.ts | 4 +- src/codec/QueueRemoveListenerCodec.ts | 4 +- src/codec/QueueSizeCodec.ts | 4 +- src/codec/QueueTakeCodec.ts | 4 +- .../ReplicatedMapAddEntryListenerCodec.ts | 4 +- ...ReplicatedMapAddEntryListenerToKeyCodec.ts | 4 +- ...AddEntryListenerToKeyWithPredicateCodec.ts | 4 +- ...edMapAddEntryListenerWithPredicateCodec.ts | 4 +- ...icatedMapAddNearCacheEntryListenerCodec.ts | 4 +- src/codec/ReplicatedMapClearCodec.ts | 4 +- src/codec/ReplicatedMapContainsKeyCodec.ts | 4 +- src/codec/ReplicatedMapContainsValueCodec.ts | 4 +- src/codec/ReplicatedMapEntrySetCodec.ts | 4 +- src/codec/ReplicatedMapGetCodec.ts | 4 +- src/codec/ReplicatedMapIsEmptyCodec.ts | 4 +- src/codec/ReplicatedMapKeySetCodec.ts | 4 +- src/codec/ReplicatedMapPutAllCodec.ts | 4 +- src/codec/ReplicatedMapPutCodec.ts | 4 +- src/codec/ReplicatedMapRemoveCodec.ts | 4 +- .../ReplicatedMapRemoveEntryListenerCodec.ts | 4 +- src/codec/ReplicatedMapSizeCodec.ts | 4 +- src/codec/ReplicatedMapValuesCodec.ts | 4 +- src/codec/RingbufferAddAllCodec.ts | 4 +- src/codec/RingbufferAddCodec.ts | 4 +- src/codec/RingbufferCapacityCodec.ts | 4 +- src/codec/RingbufferHeadSequenceCodec.ts | 4 +- src/codec/RingbufferReadManyCodec.ts | 4 +- src/codec/RingbufferReadOneCodec.ts | 4 +- src/codec/RingbufferRemainingCapacityCodec.ts | 4 +- src/codec/RingbufferSizeCodec.ts | 4 +- src/codec/RingbufferTailSequenceCodec.ts | 4 +- src/codec/SetAddAllCodec.ts | 4 +- src/codec/SetAddCodec.ts | 4 +- src/codec/SetAddListenerCodec.ts | 4 +- src/codec/SetClearCodec.ts | 4 +- src/codec/SetCompareAndRemoveAllCodec.ts | 4 +- src/codec/SetCompareAndRetainAllCodec.ts | 4 +- src/codec/SetContainsAllCodec.ts | 4 +- src/codec/SetContainsCodec.ts | 4 +- src/codec/SetGetAllCodec.ts | 4 +- src/codec/SetIsEmptyCodec.ts | 4 +- src/codec/SetRemoveCodec.ts | 4 +- src/codec/SetRemoveListenerCodec.ts | 4 +- src/codec/SetSizeCodec.ts | 4 +- src/codec/TopicAddMessageListenerCodec.ts | 4 +- src/codec/TopicPublishCodec.ts | 4 +- src/codec/TopicRemoveMessageListenerCodec.ts | 4 +- src/codec/builtin/ByteArrayCodec.ts | 2 +- src/codec/builtin/CodecUtil.ts | 2 +- src/codec/builtin/DataCodec.ts | 2 +- src/codec/builtin/EntryListCodec.ts | 2 +- .../builtin/EntryListIntegerIntegerCodec.ts | 4 +- .../builtin/EntryListIntegerLongCodec.ts | 4 +- .../builtin/EntryListIntegerUUIDCodec.ts | 4 +- .../builtin/EntryListLongByteArrayCodec.ts | 2 +- .../builtin/EntryListUUIDListIntegerCodec.ts | 2 +- src/codec/builtin/EntryListUUIDLongCodec.ts | 4 +- src/codec/builtin/EntryListUUIDUUIDCodec.ts | 4 +- src/codec/builtin/ErrorsCodec.ts | 2 +- src/codec/builtin/FixSizedTypesCodec.ts | 2 +- src/codec/builtin/ListDataCodec.ts | 2 +- src/codec/builtin/ListIntegerCodec.ts | 4 +- src/codec/builtin/ListLongCodec.ts | 4 +- src/codec/builtin/ListMultiFrameCodec.ts | 2 +- src/codec/builtin/ListUUIDCodec.ts | 4 +- src/codec/builtin/LongArrayCodec.ts | 2 +- src/codec/builtin/MapCodec.ts | 2 +- src/codec/builtin/StringCodec.ts | 2 +- src/codec/custom/AddressCodec.ts | 6 +- src/codec/custom/AnchorDataListHolderCodec.ts | 2 +- src/codec/custom/BitmapIndexOptionsCodec.ts | 4 +- .../custom/DistributedObjectInfoCodec.ts | 4 +- src/codec/custom/ErrorHolderCodec.ts | 4 +- src/codec/custom/IndexConfigCodec.ts | 4 +- src/codec/custom/MemberInfoCodec.ts | 4 +- src/codec/custom/MemberVersionCodec.ts | 4 +- .../custom/PagingPredicateHolderCodec.ts | 4 +- src/codec/custom/SimpleEntryViewCodec.ts | 4 +- src/codec/custom/StackTraceElementCodec.ts | 4 +- src/config/Config.ts | 66 +++--- src/config/ConfigBuilder.ts | 12 +- src/config/ConfigPatternMatcher.ts | 4 +- src/config/LoadBalancerConfig.ts | 2 +- src/config/ReliableTopicConfig.ts | 2 +- src/config/SerializationConfig.ts | 9 +- src/config/index.ts | 39 ++++ src/connection/AddressProvider.ts | 2 +- src/connection/BasicSSLOptionsFactory.ts | 8 +- src/connection/DefaultAddressProvider.ts | 2 +- .../index.ts} | 9 +- src/{ => core}/Address.ts | 9 +- src/{ => core}/ClientInfo.ts | 2 +- src/core/Cluster.ts | 7 +- src/{ => core}/DistributedObject.ts | 0 src/{ => core}/DistributedObjectInfo.ts | 0 src/{ => core}/HazelcastError.ts | 3 + src/core/HazelcastJsonValue.ts | 2 +- src/core/InitialMembershipListener.ts | 35 ---- .../LoadBalancer.ts} | 41 +++- src/core/Member.ts | 2 +- src/core/MemberInfo.ts | 2 +- src/core/MemberSelector.ts | 3 + src/core/MemberVersion.ts | 2 + src/core/MembershipEvent.ts | 53 ----- src/core/MembershipListener.ts | 75 ++++++- .../ringbuffer => core}/ReadResultSet.ts | 2 +- src/core/RestValue.ts | 8 +- src/core/index.ts | 41 ++++ .../HazelcastCloudAddressProvider.ts | 2 +- src/discovery/HazelcastCloudDiscovery.ts | 4 +- src/index.ts | 62 ++---- src/invocation/ClientEventRegistration.ts | 2 +- src/invocation/ClusterService.ts | 72 +++---- src/invocation/InvocationService.ts | 10 +- src/invocation/RegistrationKey.ts | 4 +- src/listener/ClusterViewListenerService.ts | 4 +- src/{ => listener}/ListenerMessageCodec.ts | 4 +- src/{ => listener}/ListenerService.ts | 24 +-- src/logging/LoggingService.ts | 2 +- .../index.ts} | 17 +- src/{ => nearcache}/DataStoreHashMap.ts | 2 +- src/nearcache/MetadataFetcher.ts | 8 +- src/nearcache/NearCache.ts | 4 +- src/nearcache/NearCacheManager.ts | 2 +- src/nearcache/RepairingTask.ts | 2 +- src/network/ClientConnection.ts | 16 +- src/network/ClientConnectionManager.ts | 23 +- src/{ => network}/HeartbeatManager.ts | 20 +- src/{ => protocol}/ClientMessage.ts | 6 +- src/protocol/ErrorFactory.ts | 4 +- src/protocol/ErrorHolder.ts | 2 + src/protocol/StackTraceElement.ts | 2 + src/proxy/BaseProxy.ts | 4 +- src/{core => proxy}/EntryListener.ts | 2 +- src/{core => proxy}/EventType.ts | 0 src/proxy/FlakeIdGenerator.ts | 2 +- src/proxy/IList.ts | 4 +- src/proxy/IMap.ts | 13 +- src/proxy/IQueue.ts | 4 +- src/proxy/ISet.ts | 4 +- src/proxy/ITopic.ts | 51 +++++ src/{core => proxy}/ItemListener.ts | 2 +- src/proxy/ListProxy.ts | 12 +- src/{ => proxy}/LockReferenceIdGenerator.ts | 0 src/{core => proxy}/MapListener.ts | 2 +- src/proxy/MapProxy.ts | 15 +- .../{topic/Message.ts => MessageListener.ts} | 9 +- src/proxy/MultiMap.ts | 8 +- src/proxy/MultiMapProxy.ts | 20 +- src/proxy/NearCachedMapProxy.ts | 8 +- src/{core => proxy}/OverflowPolicy.ts | 0 src/proxy/PNCounter.ts | 2 +- src/proxy/PNCounterProxy.ts | 10 +- src/proxy/PartitionSpecificProxy.ts | 4 +- src/proxy/ProxyManager.ts | 12 +- src/proxy/QueueProxy.ts | 9 +- src/proxy/ReplicatedMap.ts | 14 +- src/proxy/ReplicatedMapProxy.ts | 28 +-- src/proxy/Ringbuffer.ts | 8 +- src/proxy/SetProxy.ts | 8 +- src/proxy/{topic => }/TopicOverloadPolicy.ts | 0 src/{core => proxy}/VectorClock.ts | 0 src/proxy/flakeid/AutoBatcher.ts | 2 +- .../{ => flakeid}/FlakeIdGeneratorProxy.ts | 14 +- src/proxy/index.ts | 37 ++++ src/proxy/ringbuffer/LazyReadResultSet.ts | 2 +- src/proxy/ringbuffer/RingbufferProxy.ts | 6 +- .../topic/ReliableTopicListenerRunner.ts | 5 +- src/proxy/topic/ReliableTopicMessage.ts | 2 +- src/proxy/topic/ReliableTopicProxy.ts | 22 +- src/{ => serialization}/ClusterDataFactory.ts | 4 +- src/serialization/DefaultPredicates.ts | 2 +- ...ultSerializer.ts => DefaultSerializers.ts} | 40 +--- src/serialization/HeapData.ts | 2 +- src/serialization/ObjectData.ts | 2 +- src/serialization/Portable.ts | 196 ++++++++++++++++++ src/serialization/Serializable.ts | 77 +++---- src/serialization/SerializationService.ts | 9 +- .../ITopic.ts => serialization/index.ts} | 17 +- src/serialization/portable/ClassDefinition.ts | 27 +-- .../portable/ClassDefinitionBuilder.ts | 5 +- .../portable/ClassDefinitionContext.ts | 2 +- .../portable/ClassDefinitionWriter.ts | 5 +- .../portable/DefaultPortableReader.ts | 10 +- .../portable/DefaultPortableWriter.ts | 6 +- .../portable/MorphingPortableReader.ts | 4 +- src/serialization/portable/PortableContext.ts | 6 +- .../portable/PortableSerializer.ts | 110 +--------- src/statistics/Statistics.ts | 24 +-- src/{ => util}/BitsUtil.ts | 59 +++--- src/util/IndexUtil.ts | 2 +- src/util/RandomLB.ts | 4 +- src/util/RoundRobinLB.ts | 4 +- src/{ => util}/Util.ts | 9 +- test/AutoPipeliningDisabledTest.js | 12 +- test/ClientProxyTest.js | 31 ++- test/ClientReconnectTest.js | 39 ++-- test/ClusterServiceTest.js | 47 +++-- test/ConnectionManagerTest.js | 6 +- test/HazelcastClientTest.js | 6 +- test/LifecycleServiceTest.js | 12 +- test/ListenerServiceTest.js | 8 +- test/ListenersOnReconnectTest.js | 38 ++-- test/LoggingTest.js | 28 +-- test/LostConnectionTest.js | 18 +- test/MembershipListenerTest.js | 26 +-- test/RC.js | 6 +- test/RepetitionTaskTest.js | 4 +- .../config/ConfigBuilderHazelcastCloudTest.js | 5 +- test/config/ConfigBuilderSSLTest.js | 8 +- test/config/ConfigBuilderTest.js | 30 +-- test/config/ConfigPatternMatcherTest.js | 8 +- test/config/ResolvePathTest.js | 4 +- test/connection/ClientMessageReaderTest.js | 4 +- test/connection/DirectWriterTest.js | 6 +- .../FragmentedClientMessageHandlerTest.js | 10 +- test/connection/PipelinedWriterTest.js | 6 +- test/discovery/HazelcastCloudDiscoveryTest.js | 2 +- test/discovery/HazelcastCloudProviderTest.js | 4 +- .../flakeid/FlakeIdGeneratorOutOfRangeTest.js | 10 +- test/flakeid/FlakeIdGeneratorProxyTest.js | 8 +- test/heartbeat/HeartbeatFromServerTest.js | 5 +- test/integration/ConnectionStrategyTest.js | 21 +- .../InitialMembershipListenerTest.js | 12 +- test/list/ListProxyTest.js | 2 +- test/map/MapPredicateTest.js | 5 +- test/map/MapProxyTest.js | 9 +- test/map/NearCachedMapStressTest.js | 10 +- test/map/NearCachedMapTest.js | 8 +- test/nearcache/LostInvalidationsTest.js | 9 +- test/nearcache/MigratedDataTest.js | 8 +- test/nearcache/NearCacheTest.js | 17 +- test/pncounter/PNCounterConsistencyTest.js | 8 +- .../pncounter/PNCounterWithLiteMembersTest.js | 24 +-- test/queue/QueueProxyTest.js | 4 +- test/rest_value/RestValueTest.js | 2 +- test/ringbuffer/LazyReadResultSetTest.js | 3 +- test/ringbuffer/RingbufferProxyTest.js | 8 +- .../DefaultSerializersLiveTest.js | 5 +- .../config/CustomSerializerConfigTest.js | 2 +- test/set/SetProxyTest.js | 2 +- test/ssl/BasicSSLOptionsFactoryTest.js | 3 +- test/ssl/ClientSSLAuthenticationTest.js | 21 +- test/ssl/ClientSSLTest.js | 12 +- test/statistics/StatisticsTest.js | 15 +- test/topic/ReliableTopicTest.js | 3 +- test/unit/AddressHelperTest.js | 5 +- .../unit/protocol/ClientMessageFramingTest.js | 42 ++-- test/unit/protocol/ClientMessageTest.js | 16 +- test/user_code/UserCodeTest.ts | 2 +- 412 files changed, 1789 insertions(+), 1635 deletions(-) delete mode 100644 src/LoadBalancer.ts rename src/{core/MemberSelectors.ts => aggregation/index.ts} (82%) create mode 100644 src/config/index.ts rename src/{proxy/topic/MessageListener.ts => connection/index.ts} (82%) rename src/{ => core}/Address.ts (90%) rename src/{ => core}/ClientInfo.ts (97%) rename src/{ => core}/DistributedObject.ts (100%) rename src/{ => core}/DistributedObjectInfo.ts (100%) rename src/{ => core}/HazelcastError.ts (99%) delete mode 100644 src/core/InitialMembershipListener.ts rename src/{util/AbstractLoadBalancer.ts => core/LoadBalancer.ts} (59%) delete mode 100644 src/core/MembershipEvent.ts rename src/{proxy/ringbuffer => core}/ReadResultSet.ts (97%) create mode 100644 src/core/index.ts rename src/{ => listener}/ListenerMessageCodec.ts (90%) rename src/{ => listener}/ListenerService.ts (93%) rename src/{core/InitialMembershipEvent.ts => logging/index.ts} (64%) rename src/{ => nearcache}/DataStoreHashMap.ts (98%) rename src/{ => network}/HeartbeatManager.ts (86%) rename src/{ => protocol}/ClientMessage.ts (97%) rename src/{core => proxy}/EntryListener.ts (98%) rename src/{core => proxy}/EventType.ts (100%) create mode 100644 src/proxy/ITopic.ts rename src/{core => proxy}/ItemListener.ts (98%) rename src/{ => proxy}/LockReferenceIdGenerator.ts (100%) rename src/{core => proxy}/MapListener.ts (97%) rename src/proxy/{topic/Message.ts => MessageListener.ts} (84%) rename src/{core => proxy}/OverflowPolicy.ts (100%) rename src/proxy/{topic => }/TopicOverloadPolicy.ts (100%) rename src/{core => proxy}/VectorClock.ts (100%) rename src/proxy/{ => flakeid}/FlakeIdGeneratorProxy.ts (79%) create mode 100644 src/proxy/index.ts rename src/{ => serialization}/ClusterDataFactory.ts (89%) rename src/serialization/{DefaultSerializer.ts => DefaultSerializers.ts} (92%) create mode 100644 src/serialization/Portable.ts rename src/{proxy/topic/ITopic.ts => serialization/index.ts} (63%) rename src/{ => util}/BitsUtil.ts (71%) rename src/{ => util}/Util.ts (96%) diff --git a/.gitignore b/.gitignore index b002f5b2f..ee9ef78ea 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ target/* .vscode/* node_modules/* *.iml +report.xml ### Java ### *.class @@ -35,7 +36,6 @@ docs/ # Mac desktop service store files *.DS_Store - package-lock.json # Coverage diff --git a/.npmignore b/.npmignore index da03b910b..e1e9f3277 100644 --- a/.npmignore +++ b/.npmignore @@ -15,6 +15,7 @@ typedoc.json .eslintrc.js .mocharc.json .nycrc.json +report.xml DOCUMENTATION.md download-remote-controller.js *.iml diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 5a5dd9bfa..8b2753661 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -355,7 +355,7 @@ distributed map in the Node.js client. The following example first creates a programmatic configuration object. Then, it starts a client. ```javascript -const { Client } = require('hazelcast-client').Client; +const { Client } = require('hazelcast-client'); (async () => { try { @@ -1359,10 +1359,12 @@ const cfg = { The following are the descriptions of configuration elements and attributes: -* key (`rt1` in the above example): Name of your Reliable Topic. +* key (`rt1` in the above example): Name of your Reliable Topic. Hazelcast client supports wildcard configuration for Reliable Topics. Using an asterisk (`*`) character in the name, different instances of topics can be configured by a single configuration. * `readBatchSize`: Minimum number of messages that Reliable Topic tries to read in batches. Its default value is `10`. * `overloadPolicy`: Policy to handle an overloaded topic. Available values are `DISCARD_OLDEST`, `DISCARD_NEWEST`, `BLOCK` and `ERROR`. Its default value is `BLOCK`. See [Slow Consumers](https://docs.hazelcast.org/docs/latest/manual/html-single/#slow-consumers) for definitions of these policies. +> **NOTE: When you use `default` as the Reliable Topic configuration key, it has a special meaning. Hazelcast client will use that configuration as the default one for all Reliable Topics, unless there is a specific configuration for the topic.** + ### 7.4.9. Using PN Counter Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative counter implementation. It is an eventually consistent counter given there is no member failure. For details, see the [PN Counter section](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#pn-counter) in the Hazelcast IMDG Reference Manual. @@ -1421,10 +1423,12 @@ const cfg = { The following are the descriptions of configuration elements and attributes: -* key (`flakeidgenerator` in the above example): Name of your Flake ID Generator. +* key (`flakeidgenerator` in the above example): Name of your Flake ID Generator. Hazelcast client supports wildcard configuration for Flake ID Generators. Using an asterisk (`*`) character in the name, different instances of generators can be configured by a single configuration. * `prefetchCount`: Count of IDs which are pre-fetched on the background when one call to `FlakeIdGenerator.newId()` is made. Its value must be in the range `1` - `100,000`. Its default value is `100`. * `prefetchValidityMillis`: Specifies for how long the pre-fetched IDs can be used. After this time elapses, a new batch of IDs are fetched. Time unit is milliseconds. Its default value is `600,000` milliseconds (`10` minutes). The IDs contain a timestamp component, which ensures a rough global ordering of them. If an ID is assigned to an object that was created later, it will be out of order. If ordering is not important, set this value to `0`. +> **NOTE: When you use `default` as the Flake ID Generator configuration key, it has a special meaning. Hazelcast client will use that configuration as the default one for all Flake ID Generators, unless there is a specific configuration for the generator.** + ### 7.4.11. Using Lock, Semaphore and Atomic Long Hazelcast IMDG 4.0 introduces CP concurrency primitives with respect to the [CAP principle](http://awoc.wolski.fi/dlib/big-data/Brewer_podc_keynote_2000.pdf), i.e., they always maintain [linearizability](https://aphyr.com/posts/313-strong-consistency-models) and prefer consistency to availability during network partitions and client or server failures. @@ -1970,14 +1974,14 @@ In the above example code, `predicate` verifies whether the entry is active and #### 7.7.1.3. Querying with SQL -You can query with SQL by using the `SqlPredicate` class. Its constructor takes the regular SQL `where` clause, as shown in the below example. +You can query with SQL by using the predicate returned from the `Predicates.sql` function. Its argument takes a regular SQL `where` clause, as shown in the below example. ```javascript -const { SqlPredicate } = require('hazelcast-client'); +const { Predicates } = require('hazelcast-client'); // ... const map = await client.getMap('employee'); // Define the predicate -const predicate = new SqlPredicate('active AND age < 30'); +const predicate = Predicates.sql('active AND age < 30'); // Run the query const employees = await map.valuesWithPredicate(predicate); // Some operations @@ -2075,10 +2079,7 @@ You can query the JSON strings stored inside your Hazelcast clusters. To query a `HazelcastJsonValue` objects can be used both as keys and values in the distributed data structures. Then, it is possible to query these objects using the query methods explained in this section. ```javascript -const { - SqlPredicate, - HazelcastJsonValue -} = require('hazelcast-client'); +const { HazelcastJsonValue } = require('hazelcast-client'); // ... const personMap = await client.getMap('personsMap'); @@ -2372,6 +2373,8 @@ const cfg = { Following are the descriptions of all configuration elements: +- key (`mostlyReadMap` in the above example): Name of your Map for which the Near Cache will be enabled. Hazelcast client supports wildcard configuration for Near Caches. Using an asterisk (`*`) character in the name, different instances of maps can be configured by a single configuration. + - `inMemoryFormat`: Specifies in which format data will be stored in your Near Cache. Note that a map’s in-memory format can be different from that of its Near Cache. Available values are as follows: - `BINARY`: Data will be stored in serialized binary format (default value). - `OBJECT`: Data will be stored in deserialized form. @@ -2392,6 +2395,8 @@ Following are the descriptions of all configuration elements: - `evictionSamplingCount`: Number of random entries that are evaluated to see if some of them are already expired. If there are expired entries, those are removed and there is no need for eviction. Its default value is `8`. - `evictionSamplingPoolSize`: Size of the pool for eviction candidates. The pool is kept sorted according to eviction policy. The entry with the highest score is evicted. Its default value is `16`. +> **NOTE: When you use `default` as the Near Cache configuration key, it has a special meaning. Hazelcast client will use that configuration as the default one for all Maps, unless there is a specific configuration for a Map.** + #### 7.8.2.2. Near Cache Example for Map The following is an example configuration for a Near Cache defined in the `mostlyReadMap` map. According to this configuration, the entries are stored as `OBJECT`'s in this Near Cache and eviction starts when the count of entries reaches `5000`; entries are evicted based on the `LRU` (Least Recently Used) policy. In addition, when an entry is updated or removed on the member side, it is eventually evicted on the client side. diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 389c9599f..7b533950b 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -15,33 +15,40 @@ */ import * as Promise from 'bluebird'; -import {ClientInfo} from './ClientInfo'; +import { + ClientInfo, + Cluster, + DistributedObject, + DistributedObjectListener, + LoadBalancer, + IllegalStateError +} from './core'; import {ClientGetDistributedObjectsCodec} from './codec/ClientGetDistributedObjectsCodec'; import {ClientConfig, ClientConfigImpl} from './config/Config'; import {ConfigBuilder} from './config/ConfigBuilder'; -import {DistributedObject} from './DistributedObject'; import {ClientConnectionManager} from './network/ClientConnectionManager'; -import {Cluster} from './core/Cluster'; import {ClusterService} from './invocation/ClusterService'; import {InvocationService} from './invocation/InvocationService'; import {LifecycleService, LifecycleServiceImpl} from './LifecycleService'; -import {ListenerService} from './ListenerService'; -import {LockReferenceIdGenerator} from './LockReferenceIdGenerator'; +import {ListenerService} from './listener/ListenerService'; import {LoggingService} from './logging/LoggingService'; import {RepairingTask} from './nearcache/RepairingTask'; import {PartitionService, PartitionServiceImpl} from './PartitionService'; import {ClientErrorFactory} from './protocol/ErrorFactory'; -import {FlakeIdGenerator} from './proxy/FlakeIdGenerator'; -import {IList} from './proxy/IList'; -import {IMap} from './proxy/IMap'; -import {IQueue} from './proxy/IQueue'; -import {ReplicatedMap} from './proxy/ReplicatedMap'; -import {Ringbuffer} from './proxy/Ringbuffer'; -import {ISet} from './proxy/ISet'; -import {MultiMap} from './proxy/MultiMap'; -import {PNCounter} from './proxy/PNCounter'; +import { + FlakeIdGenerator, + IList, + IMap, + IQueue, + ISet, + ITopic, + MultiMap, + ReplicatedMap, + Ringbuffer, + PNCounter +} from './proxy'; import {ProxyManager, NAMESPACE_SEPARATOR} from './proxy/ProxyManager'; -import {ITopic} from './proxy/topic/ITopic'; +import {LockReferenceIdGenerator} from './proxy/LockReferenceIdGenerator'; import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; import {AddressProvider} from './connection/AddressProvider'; import {HazelcastCloudAddressProvider} from './discovery/HazelcastCloudAddressProvider'; @@ -49,14 +56,11 @@ import {DefaultAddressProvider} from './connection/DefaultAddressProvider'; import {HazelcastCloudDiscovery} from './discovery/HazelcastCloudDiscovery'; import {Statistics} from './statistics/Statistics'; import {NearCacheManager} from './nearcache/NearCacheManager'; -import {DistributedObjectListener} from './core/DistributedObjectListener'; -import {IllegalStateError} from './HazelcastError'; -import {LoadBalancer} from './LoadBalancer'; import {LoadBalancerType} from './config/LoadBalancerConfig'; import {RandomLB} from './util/RandomLB'; import {RoundRobinLB} from './util/RoundRobinLB'; import {ClusterViewListenerService} from './listener/ClusterViewListenerService'; -import {ClientMessage} from './ClientMessage'; +import {ClientMessage} from './protocol/ClientMessage'; /** * Hazelcast client instance. When you want to use Hazelcast's distributed @@ -65,7 +69,7 @@ import {ClientMessage} from './ClientMessage'; * * Client instances should be shut down explicitly. */ -export default class HazelcastClient { +export class HazelcastClient { /** @internal */ private static CLIENT_ID = 0; diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index a7dd6a691..b7c6ef8c9 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -15,7 +15,7 @@ */ import {EventEmitter} from 'events'; -import HazelcastClient from './HazelcastClient'; +import {HazelcastClient} from './HazelcastClient'; import {ILogger} from './logging/ILogger'; /** diff --git a/src/LoadBalancer.ts b/src/LoadBalancer.ts deleted file mode 100644 index 4dce5e7c7..000000000 --- a/src/LoadBalancer.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {ClientConfig} from './config/Config'; -import {Cluster} from './core/Cluster'; -import {Member} from './core/Member'; - -/** - * {@link LoadBalancer} allows you to send operations to one of a number of endpoints (Members). - * It is up to the implementation to use different load balancing policies. - *

- * If Client is configured with {@link ClientNetworkConfig.smartRouting}, - * only the operations that are not key based will be routed to the endpoint - * returned by the LoadBalancer. If it is not, the LoadBalancer will not be used. - *

- */ -export interface LoadBalancer { - - /** - * Initializes the LoadBalancer. - * - * @param cluster the Cluster this LoadBalancer uses to select members from. - * @param config the ClientConfig. - */ - initLoadBalancer(cluster: Cluster, config: ClientConfig): void; - - /** - * Returns the next member to route to. - * - * @return Returns the next member or `null` if no member is available - */ - next(): Member; - -} diff --git a/src/PartitionService.ts b/src/PartitionService.ts index c07e8ca57..23fb50609 100644 --- a/src/PartitionService.ts +++ b/src/PartitionService.ts @@ -14,11 +14,10 @@ * limitations under the License. */ -import HazelcastClient from './HazelcastClient'; +import {HazelcastClient} from './HazelcastClient'; import {ILogger} from './logging/ILogger'; import {ClientConnection} from './network/ClientConnection'; -import {UUID} from './core/UUID'; -import {ClientOfflineError} from './HazelcastError'; +import {ClientOfflineError, UUID} from './core'; /** * Partition service for Hazelcast clients. Allows to retrieve information diff --git a/src/aggregation/AggregatorFactory.ts b/src/aggregation/AggregatorFactory.ts index d102accfa..556cae44f 100644 --- a/src/aggregation/AggregatorFactory.ts +++ b/src/aggregation/AggregatorFactory.ts @@ -31,7 +31,7 @@ import { MinAggregator, NumberAverageAggregator, } from './Aggregator'; -import {HazelcastError} from '../HazelcastError'; +import {HazelcastError} from '../core'; /** @internal */ export const AGGREGATOR_FACTORY_ID = -29; diff --git a/src/core/MemberSelectors.ts b/src/aggregation/index.ts similarity index 82% rename from src/core/MemberSelectors.ts rename to src/aggregation/index.ts index 97e45b3cd..63975bcb0 100644 --- a/src/core/MemberSelectors.ts +++ b/src/aggregation/index.ts @@ -15,7 +15,9 @@ */ /** @ignore *//** */ -import {Member} from './Member'; +/** + * Public API re-exports. + */ -/** @internal */ -export const dataMemberSelector = (member: Member): boolean => !member.liteMember; +export * from './Aggregator'; +export * as Aggregators from './Aggregators'; diff --git a/src/codec/ClientAddClusterViewListenerCodec.ts b/src/codec/ClientAddClusterViewListenerCodec.ts index ce71ac7a9..88315cc14 100644 --- a/src/codec/ClientAddClusterViewListenerCodec.ts +++ b/src/codec/ClientAddClusterViewListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {MemberInfo} from '../core/MemberInfo'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; import {MemberInfoCodec} from './custom/MemberInfoCodec'; diff --git a/src/codec/ClientAddDistributedObjectListenerCodec.ts b/src/codec/ClientAddDistributedObjectListenerCodec.ts index fed44c1d2..24a1242fc 100644 --- a/src/codec/ClientAddDistributedObjectListenerCodec.ts +++ b/src/codec/ClientAddDistributedObjectListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ClientAddPartitionLostListenerCodec.ts b/src/codec/ClientAddPartitionLostListenerCodec.ts index 6e2997ded..0ae202186 100644 --- a/src/codec/ClientAddPartitionLostListenerCodec.ts +++ b/src/codec/ClientAddPartitionLostListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; // hex: 0x000600 diff --git a/src/codec/ClientAuthenticationCodec.ts b/src/codec/ClientAuthenticationCodec.ts index 96c9c4962..716ea977a 100644 --- a/src/codec/ClientAuthenticationCodec.ts +++ b/src/codec/ClientAuthenticationCodec.ts @@ -15,14 +15,14 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; import {CodecUtil} from './builtin/CodecUtil'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -import {AddressImpl} from '../Address'; +import {AddressImpl} from '../core/Address'; import {AddressCodec} from './custom/AddressCodec'; // hex: 0x000100 diff --git a/src/codec/ClientAuthenticationCustomCodec.ts b/src/codec/ClientAuthenticationCustomCodec.ts index 0c122b51a..6d2fc0746 100644 --- a/src/codec/ClientAuthenticationCustomCodec.ts +++ b/src/codec/ClientAuthenticationCustomCodec.ts @@ -15,14 +15,14 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; import {ByteArrayCodec} from './builtin/ByteArrayCodec'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; -import {AddressImpl} from '../Address'; +import {AddressImpl} from '../core/Address'; import {AddressCodec} from './custom/AddressCodec'; import {CodecUtil} from './builtin/CodecUtil'; diff --git a/src/codec/ClientCreateProxiesCodec.ts b/src/codec/ClientCreateProxiesCodec.ts index 4445dc1a4..177d7d2c3 100644 --- a/src/codec/ClientCreateProxiesCodec.ts +++ b/src/codec/ClientCreateProxiesCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {EntryListCodec} from './builtin/EntryListCodec'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ClientCreateProxyCodec.ts b/src/codec/ClientCreateProxyCodec.ts index 6df760062..e6f6ebf50 100644 --- a/src/codec/ClientCreateProxyCodec.ts +++ b/src/codec/ClientCreateProxyCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x000400 diff --git a/src/codec/ClientDeployClassesCodec.ts b/src/codec/ClientDeployClassesCodec.ts index ad6b4f068..d8a0173ed 100644 --- a/src/codec/ClientDeployClassesCodec.ts +++ b/src/codec/ClientDeployClassesCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {EntryListCodec} from './builtin/EntryListCodec'; import {StringCodec} from './builtin/StringCodec'; import {ByteArrayCodec} from './builtin/ByteArrayCodec'; diff --git a/src/codec/ClientDestroyProxyCodec.ts b/src/codec/ClientDestroyProxyCodec.ts index ebeaa73ae..5f2106dff 100644 --- a/src/codec/ClientDestroyProxyCodec.ts +++ b/src/codec/ClientDestroyProxyCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x000500 diff --git a/src/codec/ClientGetDistributedObjectsCodec.ts b/src/codec/ClientGetDistributedObjectsCodec.ts index 6e0348656..22210b7c7 100644 --- a/src/codec/ClientGetDistributedObjectsCodec.ts +++ b/src/codec/ClientGetDistributedObjectsCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; -import {DistributedObjectInfo} from '../DistributedObjectInfo'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {DistributedObjectInfo} from '../core/DistributedObjectInfo'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; import {DistributedObjectInfoCodec} from './custom/DistributedObjectInfoCodec'; diff --git a/src/codec/ClientLocalBackupListenerCodec.ts b/src/codec/ClientLocalBackupListenerCodec.ts index 85a531cfc..712a71098 100644 --- a/src/codec/ClientLocalBackupListenerCodec.ts +++ b/src/codec/ClientLocalBackupListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import * as Long from 'long'; diff --git a/src/codec/ClientPingCodec.ts b/src/codec/ClientPingCodec.ts index ee0fc9e71..930dcfb1f 100644 --- a/src/codec/ClientPingCodec.ts +++ b/src/codec/ClientPingCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; // hex: 0x000B00 const REQUEST_MESSAGE_TYPE = 2816; diff --git a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts index e2bca73d8..09f0f2aec 100644 --- a/src/codec/ClientRemoveDistributedObjectListenerCodec.ts +++ b/src/codec/ClientRemoveDistributedObjectListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; // hex: 0x000A00 diff --git a/src/codec/ClientRemovePartitionLostListenerCodec.ts b/src/codec/ClientRemovePartitionLostListenerCodec.ts index 76d396760..dd2b78541 100644 --- a/src/codec/ClientRemovePartitionLostListenerCodec.ts +++ b/src/codec/ClientRemovePartitionLostListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; // hex: 0x000700 diff --git a/src/codec/ClientStatisticsCodec.ts b/src/codec/ClientStatisticsCodec.ts index dd989c30a..270eca033 100644 --- a/src/codec/ClientStatisticsCodec.ts +++ b/src/codec/ClientStatisticsCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {ByteArrayCodec} from './builtin/ByteArrayCodec'; diff --git a/src/codec/ClientTriggerPartitionAssignmentCodec.ts b/src/codec/ClientTriggerPartitionAssignmentCodec.ts index 281a3f16e..eebcd7b28 100644 --- a/src/codec/ClientTriggerPartitionAssignmentCodec.ts +++ b/src/codec/ClientTriggerPartitionAssignmentCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; // hex: 0x001000 const REQUEST_MESSAGE_TYPE = 4096; diff --git a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts index 63984f9c2..b229f1fbc 100644 --- a/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts +++ b/src/codec/FlakeIdGeneratorNewIdBatchCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import * as Long from 'long'; diff --git a/src/codec/ListAddAllCodec.ts b/src/codec/ListAddAllCodec.ts index 8f3c1c855..3559d828c 100644 --- a/src/codec/ListAddAllCodec.ts +++ b/src/codec/ListAddAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListAddAllWithIndexCodec.ts b/src/codec/ListAddAllWithIndexCodec.ts index 629542a15..10b5bc26c 100644 --- a/src/codec/ListAddAllWithIndexCodec.ts +++ b/src/codec/ListAddAllWithIndexCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListAddCodec.ts b/src/codec/ListAddCodec.ts index 96e0cf29b..445491d3b 100644 --- a/src/codec/ListAddCodec.ts +++ b/src/codec/ListAddCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListAddListenerCodec.ts b/src/codec/ListAddListenerCodec.ts index 9a57cc487..ad7bddd9a 100644 --- a/src/codec/ListAddListenerCodec.ts +++ b/src/codec/ListAddListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; diff --git a/src/codec/ListAddWithIndexCodec.ts b/src/codec/ListAddWithIndexCodec.ts index 55e3e095f..67bc9d199 100644 --- a/src/codec/ListAddWithIndexCodec.ts +++ b/src/codec/ListAddWithIndexCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListClearCodec.ts b/src/codec/ListClearCodec.ts index c1776168a..9c0afa589 100644 --- a/src/codec/ListClearCodec.ts +++ b/src/codec/ListClearCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x050900 diff --git a/src/codec/ListCompareAndRemoveAllCodec.ts b/src/codec/ListCompareAndRemoveAllCodec.ts index c9d518132..d3d6489b9 100644 --- a/src/codec/ListCompareAndRemoveAllCodec.ts +++ b/src/codec/ListCompareAndRemoveAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListCompareAndRetainAllCodec.ts b/src/codec/ListCompareAndRetainAllCodec.ts index 11d47b039..9a84ea7cb 100644 --- a/src/codec/ListCompareAndRetainAllCodec.ts +++ b/src/codec/ListCompareAndRetainAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListContainsAllCodec.ts b/src/codec/ListContainsAllCodec.ts index e13e4bc81..9078f44a9 100644 --- a/src/codec/ListContainsAllCodec.ts +++ b/src/codec/ListContainsAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListContainsCodec.ts b/src/codec/ListContainsCodec.ts index 2c09e3bfb..0c9672379 100644 --- a/src/codec/ListContainsCodec.ts +++ b/src/codec/ListContainsCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListGetAllCodec.ts b/src/codec/ListGetAllCodec.ts index a93b3a487..d0f68809a 100644 --- a/src/codec/ListGetAllCodec.ts +++ b/src/codec/ListGetAllCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListGetCodec.ts b/src/codec/ListGetCodec.ts index bf94750f7..4dc5c9dc5 100644 --- a/src/codec/ListGetCodec.ts +++ b/src/codec/ListGetCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListIndexOfCodec.ts b/src/codec/ListIndexOfCodec.ts index f4d221ba5..07e7897d2 100644 --- a/src/codec/ListIndexOfCodec.ts +++ b/src/codec/ListIndexOfCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListIsEmptyCodec.ts b/src/codec/ListIsEmptyCodec.ts index f05a2c1a8..46b7153fe 100644 --- a/src/codec/ListIsEmptyCodec.ts +++ b/src/codec/ListIsEmptyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x050D00 diff --git a/src/codec/ListIteratorCodec.ts b/src/codec/ListIteratorCodec.ts index 0914b97c5..4e43009fc 100644 --- a/src/codec/ListIteratorCodec.ts +++ b/src/codec/ListIteratorCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListLastIndexOfCodec.ts b/src/codec/ListLastIndexOfCodec.ts index 591531e9a..51428dd7f 100644 --- a/src/codec/ListLastIndexOfCodec.ts +++ b/src/codec/ListLastIndexOfCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListListIteratorCodec.ts b/src/codec/ListListIteratorCodec.ts index 9c6f0c469..a8058d1d2 100644 --- a/src/codec/ListListIteratorCodec.ts +++ b/src/codec/ListListIteratorCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ListRemoveCodec.ts b/src/codec/ListRemoveCodec.ts index 52b8a08eb..9347681f9 100644 --- a/src/codec/ListRemoveCodec.ts +++ b/src/codec/ListRemoveCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListRemoveListenerCodec.ts b/src/codec/ListRemoveListenerCodec.ts index eefeac77f..703423fd5 100644 --- a/src/codec/ListRemoveListenerCodec.ts +++ b/src/codec/ListRemoveListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ListRemoveWithIndexCodec.ts b/src/codec/ListRemoveWithIndexCodec.ts index 3829128ed..39c4acc8a 100644 --- a/src/codec/ListRemoveWithIndexCodec.ts +++ b/src/codec/ListRemoveWithIndexCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListSetCodec.ts b/src/codec/ListSetCodec.ts index 464e9f122..22e921483 100644 --- a/src/codec/ListSetCodec.ts +++ b/src/codec/ListSetCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ListSizeCodec.ts b/src/codec/ListSizeCodec.ts index 5081b0ac6..7d0581039 100644 --- a/src/codec/ListSizeCodec.ts +++ b/src/codec/ListSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x050100 diff --git a/src/codec/ListSubCodec.ts b/src/codec/ListSubCodec.ts index e9990d4f9..b319aa781 100644 --- a/src/codec/ListSubCodec.ts +++ b/src/codec/ListSubCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/MapAddEntryListenerCodec.ts b/src/codec/MapAddEntryListenerCodec.ts index 55e37e120..9243cfe70 100644 --- a/src/codec/MapAddEntryListenerCodec.ts +++ b/src/codec/MapAddEntryListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapAddEntryListenerToKeyCodec.ts b/src/codec/MapAddEntryListenerToKeyCodec.ts index 9f020086c..a34e1ac01 100644 --- a/src/codec/MapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts index 6252f4205..2b021848e 100644 --- a/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerToKeyWithPredicateCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapAddEntryListenerWithPredicateCodec.ts b/src/codec/MapAddEntryListenerWithPredicateCodec.ts index 6287211ba..33312ec3b 100644 --- a/src/codec/MapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/MapAddEntryListenerWithPredicateCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapAddIndexCodec.ts b/src/codec/MapAddIndexCodec.ts index e09a79805..c135d3b30 100644 --- a/src/codec/MapAddIndexCodec.ts +++ b/src/codec/MapAddIndexCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {InternalIndexConfig} from '../config/IndexConfig'; import {IndexConfigCodec} from './custom/IndexConfigCodec'; diff --git a/src/codec/MapAddInterceptorCodec.ts b/src/codec/MapAddInterceptorCodec.ts index d33b9d162..70f26c92c 100644 --- a/src/codec/MapAddInterceptorCodec.ts +++ b/src/codec/MapAddInterceptorCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts index 0ab4ab455..9d0b8524e 100644 --- a/src/codec/MapAddNearCacheInvalidationListenerCodec.ts +++ b/src/codec/MapAddNearCacheInvalidationListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import * as Long from 'long'; diff --git a/src/codec/MapAddPartitionLostListenerCodec.ts b/src/codec/MapAddPartitionLostListenerCodec.ts index 21ce76873..c0a8e6e57 100644 --- a/src/codec/MapAddPartitionLostListenerCodec.ts +++ b/src/codec/MapAddPartitionLostListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; diff --git a/src/codec/MapAggregateCodec.ts b/src/codec/MapAggregateCodec.ts index b9cbc00bb..938409499 100644 --- a/src/codec/MapAggregateCodec.ts +++ b/src/codec/MapAggregateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapAggregateWithPredicateCodec.ts b/src/codec/MapAggregateWithPredicateCodec.ts index 33e932f20..4f7eeb03c 100644 --- a/src/codec/MapAggregateWithPredicateCodec.ts +++ b/src/codec/MapAggregateWithPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapClearCodec.ts b/src/codec/MapClearCodec.ts index ff46e984c..0ff82c983 100644 --- a/src/codec/MapClearCodec.ts +++ b/src/codec/MapClearCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x012D00 diff --git a/src/codec/MapContainsKeyCodec.ts b/src/codec/MapContainsKeyCodec.ts index 2ae836fee..1aa97a2c9 100644 --- a/src/codec/MapContainsKeyCodec.ts +++ b/src/codec/MapContainsKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapContainsValueCodec.ts b/src/codec/MapContainsValueCodec.ts index 146a97fbd..ce123a04c 100644 --- a/src/codec/MapContainsValueCodec.ts +++ b/src/codec/MapContainsValueCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapDeleteCodec.ts b/src/codec/MapDeleteCodec.ts index 624ae957a..c80726a2a 100644 --- a/src/codec/MapDeleteCodec.ts +++ b/src/codec/MapDeleteCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapEntriesWithPagingPredicateCodec.ts b/src/codec/MapEntriesWithPagingPredicateCodec.ts index f2729e6b6..24d708219 100644 --- a/src/codec/MapEntriesWithPagingPredicateCodec.ts +++ b/src/codec/MapEntriesWithPagingPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; import {PagingPredicateHolderCodec} from './custom/PagingPredicateHolderCodec'; diff --git a/src/codec/MapEntriesWithPredicateCodec.ts b/src/codec/MapEntriesWithPredicateCodec.ts index a424fbef0..500f1cd87 100644 --- a/src/codec/MapEntriesWithPredicateCodec.ts +++ b/src/codec/MapEntriesWithPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapEntrySetCodec.ts b/src/codec/MapEntrySetCodec.ts index f3312b689..e455801cd 100644 --- a/src/codec/MapEntrySetCodec.ts +++ b/src/codec/MapEntrySetCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapEventJournalReadCodec.ts b/src/codec/MapEventJournalReadCodec.ts index 25fe28e18..a2cfd3613 100644 --- a/src/codec/MapEventJournalReadCodec.ts +++ b/src/codec/MapEventJournalReadCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapEventJournalSubscribeCodec.ts b/src/codec/MapEventJournalSubscribeCodec.ts index 890fcdc52..7a1fc92c8 100644 --- a/src/codec/MapEventJournalSubscribeCodec.ts +++ b/src/codec/MapEventJournalSubscribeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import * as Long from 'long'; diff --git a/src/codec/MapEvictAllCodec.ts b/src/codec/MapEvictAllCodec.ts index 73672ba86..ce5588c6a 100644 --- a/src/codec/MapEvictAllCodec.ts +++ b/src/codec/MapEvictAllCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x011F00 diff --git a/src/codec/MapEvictCodec.ts b/src/codec/MapEvictCodec.ts index a61f5dac5..637ebe428 100644 --- a/src/codec/MapEvictCodec.ts +++ b/src/codec/MapEvictCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapExecuteOnAllKeysCodec.ts b/src/codec/MapExecuteOnAllKeysCodec.ts index caec91f89..5b916f615 100644 --- a/src/codec/MapExecuteOnAllKeysCodec.ts +++ b/src/codec/MapExecuteOnAllKeysCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapExecuteOnKeyCodec.ts b/src/codec/MapExecuteOnKeyCodec.ts index ce10baf9b..a8ab6626f 100644 --- a/src/codec/MapExecuteOnKeyCodec.ts +++ b/src/codec/MapExecuteOnKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapExecuteOnKeysCodec.ts b/src/codec/MapExecuteOnKeysCodec.ts index cb6fc0cec..6ecd139a9 100644 --- a/src/codec/MapExecuteOnKeysCodec.ts +++ b/src/codec/MapExecuteOnKeysCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapExecuteWithPredicateCodec.ts b/src/codec/MapExecuteWithPredicateCodec.ts index 12f6e7bfc..cdd164e02 100644 --- a/src/codec/MapExecuteWithPredicateCodec.ts +++ b/src/codec/MapExecuteWithPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapFetchEntriesCodec.ts b/src/codec/MapFetchEntriesCodec.ts index bad174a7f..4a9d85ab5 100644 --- a/src/codec/MapFetchEntriesCodec.ts +++ b/src/codec/MapFetchEntriesCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListIntegerIntegerCodec} from './builtin/EntryListIntegerIntegerCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; diff --git a/src/codec/MapFetchKeysCodec.ts b/src/codec/MapFetchKeysCodec.ts index cc5f1f27c..b275954fe 100644 --- a/src/codec/MapFetchKeysCodec.ts +++ b/src/codec/MapFetchKeysCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListIntegerIntegerCodec} from './builtin/EntryListIntegerIntegerCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts index be1d980c9..4389a774b 100644 --- a/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts +++ b/src/codec/MapFetchNearCacheInvalidationMetadataCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapFetchWithQueryCodec.ts b/src/codec/MapFetchWithQueryCodec.ts index 9bda64150..a2d2f1cdc 100644 --- a/src/codec/MapFetchWithQueryCodec.ts +++ b/src/codec/MapFetchWithQueryCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListIntegerIntegerCodec} from './builtin/EntryListIntegerIntegerCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapFlushCodec.ts b/src/codec/MapFlushCodec.ts index b57ec7bd0..7b499e89f 100644 --- a/src/codec/MapFlushCodec.ts +++ b/src/codec/MapFlushCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x010A00 diff --git a/src/codec/MapForceUnlockCodec.ts b/src/codec/MapForceUnlockCodec.ts index 7ae458cc1..39b540e7d 100644 --- a/src/codec/MapForceUnlockCodec.ts +++ b/src/codec/MapForceUnlockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapGetAllCodec.ts b/src/codec/MapGetAllCodec.ts index fee7489bf..505426f5a 100644 --- a/src/codec/MapGetAllCodec.ts +++ b/src/codec/MapGetAllCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/MapGetCodec.ts b/src/codec/MapGetCodec.ts index 86946188d..3f2dd68df 100644 --- a/src/codec/MapGetCodec.ts +++ b/src/codec/MapGetCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapGetEntryViewCodec.ts b/src/codec/MapGetEntryViewCodec.ts index 98d33617c..0c0ac254d 100644 --- a/src/codec/MapGetEntryViewCodec.ts +++ b/src/codec/MapGetEntryViewCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapIsEmptyCodec.ts b/src/codec/MapIsEmptyCodec.ts index e6b67881b..c0fbdec7d 100644 --- a/src/codec/MapIsEmptyCodec.ts +++ b/src/codec/MapIsEmptyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x012B00 diff --git a/src/codec/MapIsLockedCodec.ts b/src/codec/MapIsLockedCodec.ts index 09218eb02..93c103b20 100644 --- a/src/codec/MapIsLockedCodec.ts +++ b/src/codec/MapIsLockedCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapKeySetCodec.ts b/src/codec/MapKeySetCodec.ts index 105feb985..f93a16a7a 100644 --- a/src/codec/MapKeySetCodec.ts +++ b/src/codec/MapKeySetCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/MapKeySetWithPagingPredicateCodec.ts b/src/codec/MapKeySetWithPagingPredicateCodec.ts index 818ee0e34..183fa5ef1 100644 --- a/src/codec/MapKeySetWithPagingPredicateCodec.ts +++ b/src/codec/MapKeySetWithPagingPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; import {PagingPredicateHolderCodec} from './custom/PagingPredicateHolderCodec'; diff --git a/src/codec/MapKeySetWithPredicateCodec.ts b/src/codec/MapKeySetWithPredicateCodec.ts index 29e240002..acd2e2ac7 100644 --- a/src/codec/MapKeySetWithPredicateCodec.ts +++ b/src/codec/MapKeySetWithPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapLoadAllCodec.ts b/src/codec/MapLoadAllCodec.ts index 1ace36342..c202b68c9 100644 --- a/src/codec/MapLoadAllCodec.ts +++ b/src/codec/MapLoadAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x012000 diff --git a/src/codec/MapLoadGivenKeysCodec.ts b/src/codec/MapLoadGivenKeysCodec.ts index 76c4ebef7..e1615ca2e 100644 --- a/src/codec/MapLoadGivenKeysCodec.ts +++ b/src/codec/MapLoadGivenKeysCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/MapLockCodec.ts b/src/codec/MapLockCodec.ts index 0d19bf0f6..38bfab097 100644 --- a/src/codec/MapLockCodec.ts +++ b/src/codec/MapLockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapProjectCodec.ts b/src/codec/MapProjectCodec.ts index 1a78b0b62..ef4de449c 100644 --- a/src/codec/MapProjectCodec.ts +++ b/src/codec/MapProjectCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapProjectWithPredicateCodec.ts b/src/codec/MapProjectWithPredicateCodec.ts index ab1202bfc..50458d05b 100644 --- a/src/codec/MapProjectWithPredicateCodec.ts +++ b/src/codec/MapProjectWithPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapPutAllCodec.ts b/src/codec/MapPutAllCodec.ts index 4a9845d31..a14c64ece 100644 --- a/src/codec/MapPutAllCodec.ts +++ b/src/codec/MapPutAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapPutCodec.ts b/src/codec/MapPutCodec.ts index 51b5ba80f..7a34f95f0 100644 --- a/src/codec/MapPutCodec.ts +++ b/src/codec/MapPutCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapPutIfAbsentCodec.ts b/src/codec/MapPutIfAbsentCodec.ts index 4f256d8a3..60c3f42d5 100644 --- a/src/codec/MapPutIfAbsentCodec.ts +++ b/src/codec/MapPutIfAbsentCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts index 59542f20d..53156950c 100644 --- a/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts +++ b/src/codec/MapPutIfAbsentWithMaxIdleCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapPutTransientCodec.ts b/src/codec/MapPutTransientCodec.ts index 0a7f3afd1..e2fb6dda9 100644 --- a/src/codec/MapPutTransientCodec.ts +++ b/src/codec/MapPutTransientCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapPutTransientWithMaxIdleCodec.ts b/src/codec/MapPutTransientWithMaxIdleCodec.ts index 16d063a8a..a04c5a530 100644 --- a/src/codec/MapPutTransientWithMaxIdleCodec.ts +++ b/src/codec/MapPutTransientWithMaxIdleCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapPutWithMaxIdleCodec.ts b/src/codec/MapPutWithMaxIdleCodec.ts index 986cc9cb9..c78b9a52a 100644 --- a/src/codec/MapPutWithMaxIdleCodec.ts +++ b/src/codec/MapPutWithMaxIdleCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapRemoveAllCodec.ts b/src/codec/MapRemoveAllCodec.ts index cf8a03f3f..c81e8e23f 100644 --- a/src/codec/MapRemoveAllCodec.ts +++ b/src/codec/MapRemoveAllCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MapRemoveCodec.ts b/src/codec/MapRemoveCodec.ts index 15de505ee..06e86e813 100644 --- a/src/codec/MapRemoveCodec.ts +++ b/src/codec/MapRemoveCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapRemoveEntryListenerCodec.ts b/src/codec/MapRemoveEntryListenerCodec.ts index fbb4a8810..3c2246ec9 100644 --- a/src/codec/MapRemoveEntryListenerCodec.ts +++ b/src/codec/MapRemoveEntryListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapRemoveIfSameCodec.ts b/src/codec/MapRemoveIfSameCodec.ts index 1515200ef..53444e300 100644 --- a/src/codec/MapRemoveIfSameCodec.ts +++ b/src/codec/MapRemoveIfSameCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapRemoveInterceptorCodec.ts b/src/codec/MapRemoveInterceptorCodec.ts index 72a68b4f2..6aef597e9 100644 --- a/src/codec/MapRemoveInterceptorCodec.ts +++ b/src/codec/MapRemoveInterceptorCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x011500 diff --git a/src/codec/MapRemovePartitionLostListenerCodec.ts b/src/codec/MapRemovePartitionLostListenerCodec.ts index b3783b68e..c6877e7b3 100644 --- a/src/codec/MapRemovePartitionLostListenerCodec.ts +++ b/src/codec/MapRemovePartitionLostListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MapReplaceCodec.ts b/src/codec/MapReplaceCodec.ts index 2e6c068ec..ee7427252 100644 --- a/src/codec/MapReplaceCodec.ts +++ b/src/codec/MapReplaceCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapReplaceIfSameCodec.ts b/src/codec/MapReplaceIfSameCodec.ts index 93b512e21..e1d403627 100644 --- a/src/codec/MapReplaceIfSameCodec.ts +++ b/src/codec/MapReplaceIfSameCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapSetCodec.ts b/src/codec/MapSetCodec.ts index 1fe6950e1..5a859bb74 100644 --- a/src/codec/MapSetCodec.ts +++ b/src/codec/MapSetCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapSetTtlCodec.ts b/src/codec/MapSetTtlCodec.ts index 15532d401..fe00298e0 100644 --- a/src/codec/MapSetTtlCodec.ts +++ b/src/codec/MapSetTtlCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapSetWithMaxIdleCodec.ts b/src/codec/MapSetWithMaxIdleCodec.ts index 63f720eef..b976b37a8 100644 --- a/src/codec/MapSetWithMaxIdleCodec.ts +++ b/src/codec/MapSetWithMaxIdleCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapSizeCodec.ts b/src/codec/MapSizeCodec.ts index 4600eae0f..22c5ead70 100644 --- a/src/codec/MapSizeCodec.ts +++ b/src/codec/MapSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x012A00 diff --git a/src/codec/MapSubmitToKeyCodec.ts b/src/codec/MapSubmitToKeyCodec.ts index 56b25bd31..099ffc3e9 100644 --- a/src/codec/MapSubmitToKeyCodec.ts +++ b/src/codec/MapSubmitToKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapTryLockCodec.ts b/src/codec/MapTryLockCodec.ts index 70c042582..2d6f1faf3 100644 --- a/src/codec/MapTryLockCodec.ts +++ b/src/codec/MapTryLockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapTryPutCodec.ts b/src/codec/MapTryPutCodec.ts index 8ff6c002e..61c729752 100644 --- a/src/codec/MapTryPutCodec.ts +++ b/src/codec/MapTryPutCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapTryRemoveCodec.ts b/src/codec/MapTryRemoveCodec.ts index e6b97e8b4..d35e8fec1 100644 --- a/src/codec/MapTryRemoveCodec.ts +++ b/src/codec/MapTryRemoveCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapUnlockCodec.ts b/src/codec/MapUnlockCodec.ts index 8774df575..ad0c0d368 100644 --- a/src/codec/MapUnlockCodec.ts +++ b/src/codec/MapUnlockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MapValuesCodec.ts b/src/codec/MapValuesCodec.ts index 84f11c722..2acb79804 100644 --- a/src/codec/MapValuesCodec.ts +++ b/src/codec/MapValuesCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/MapValuesWithPagingPredicateCodec.ts b/src/codec/MapValuesWithPagingPredicateCodec.ts index cd315e352..bf91f7ece 100644 --- a/src/codec/MapValuesWithPagingPredicateCodec.ts +++ b/src/codec/MapValuesWithPagingPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; import {PagingPredicateHolderCodec} from './custom/PagingPredicateHolderCodec'; diff --git a/src/codec/MapValuesWithPredicateCodec.ts b/src/codec/MapValuesWithPredicateCodec.ts index 1e6ca1b40..a24f5bc53 100644 --- a/src/codec/MapValuesWithPredicateCodec.ts +++ b/src/codec/MapValuesWithPredicateCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MultiMapAddEntryListenerCodec.ts b/src/codec/MultiMapAddEntryListenerCodec.ts index 07238efb2..3427c8c86 100644 --- a/src/codec/MultiMapAddEntryListenerCodec.ts +++ b/src/codec/MultiMapAddEntryListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts index 50ab941fb..51a30f22f 100644 --- a/src/codec/MultiMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/MultiMapAddEntryListenerToKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MultiMapClearCodec.ts b/src/codec/MultiMapClearCodec.ts index 04d8d514f..1f6ef32fe 100644 --- a/src/codec/MultiMapClearCodec.ts +++ b/src/codec/MultiMapClearCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x020B00 diff --git a/src/codec/MultiMapContainsEntryCodec.ts b/src/codec/MultiMapContainsEntryCodec.ts index 37abf8751..ca51e3218 100644 --- a/src/codec/MultiMapContainsEntryCodec.ts +++ b/src/codec/MultiMapContainsEntryCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapContainsKeyCodec.ts b/src/codec/MultiMapContainsKeyCodec.ts index b83d03c34..426acda3b 100644 --- a/src/codec/MultiMapContainsKeyCodec.ts +++ b/src/codec/MultiMapContainsKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapContainsValueCodec.ts b/src/codec/MultiMapContainsValueCodec.ts index d5f6a2c51..227bede12 100644 --- a/src/codec/MultiMapContainsValueCodec.ts +++ b/src/codec/MultiMapContainsValueCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MultiMapDeleteCodec.ts b/src/codec/MultiMapDeleteCodec.ts index 44c83832a..1b9653ba3 100644 --- a/src/codec/MultiMapDeleteCodec.ts +++ b/src/codec/MultiMapDeleteCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapEntrySetCodec.ts b/src/codec/MultiMapEntrySetCodec.ts index 0d3846786..9b4abed1d 100644 --- a/src/codec/MultiMapEntrySetCodec.ts +++ b/src/codec/MultiMapEntrySetCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MultiMapForceUnlockCodec.ts b/src/codec/MultiMapForceUnlockCodec.ts index a139e2c7d..e3333279a 100644 --- a/src/codec/MultiMapForceUnlockCodec.ts +++ b/src/codec/MultiMapForceUnlockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapGetCodec.ts b/src/codec/MultiMapGetCodec.ts index 9197142dd..a34c6ad2b 100644 --- a/src/codec/MultiMapGetCodec.ts +++ b/src/codec/MultiMapGetCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapIsLockedCodec.ts b/src/codec/MultiMapIsLockedCodec.ts index c3be989ae..e1d8ca82e 100644 --- a/src/codec/MultiMapIsLockedCodec.ts +++ b/src/codec/MultiMapIsLockedCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MultiMapKeySetCodec.ts b/src/codec/MultiMapKeySetCodec.ts index 85eb70b2e..2067b3b12 100644 --- a/src/codec/MultiMapKeySetCodec.ts +++ b/src/codec/MultiMapKeySetCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/MultiMapLockCodec.ts b/src/codec/MultiMapLockCodec.ts index 0af7effe1..259cb8c62 100644 --- a/src/codec/MultiMapLockCodec.ts +++ b/src/codec/MultiMapLockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapPutAllCodec.ts b/src/codec/MultiMapPutAllCodec.ts index 84fa156eb..41b2a3fa6 100644 --- a/src/codec/MultiMapPutAllCodec.ts +++ b/src/codec/MultiMapPutAllCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/MultiMapPutCodec.ts b/src/codec/MultiMapPutCodec.ts index daca1e45e..af5bc5d8e 100644 --- a/src/codec/MultiMapPutCodec.ts +++ b/src/codec/MultiMapPutCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapRemoveCodec.ts b/src/codec/MultiMapRemoveCodec.ts index 3f77d2012..0452f6c66 100644 --- a/src/codec/MultiMapRemoveCodec.ts +++ b/src/codec/MultiMapRemoveCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapRemoveEntryCodec.ts b/src/codec/MultiMapRemoveEntryCodec.ts index 2393372a0..98f337141 100644 --- a/src/codec/MultiMapRemoveEntryCodec.ts +++ b/src/codec/MultiMapRemoveEntryCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapRemoveEntryListenerCodec.ts b/src/codec/MultiMapRemoveEntryListenerCodec.ts index 6065fda95..a75b83cf7 100644 --- a/src/codec/MultiMapRemoveEntryListenerCodec.ts +++ b/src/codec/MultiMapRemoveEntryListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/MultiMapSizeCodec.ts b/src/codec/MultiMapSizeCodec.ts index 9b0860b00..c3a739513 100644 --- a/src/codec/MultiMapSizeCodec.ts +++ b/src/codec/MultiMapSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x020A00 diff --git a/src/codec/MultiMapTryLockCodec.ts b/src/codec/MultiMapTryLockCodec.ts index 089ada038..a9b553a6c 100644 --- a/src/codec/MultiMapTryLockCodec.ts +++ b/src/codec/MultiMapTryLockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapUnlockCodec.ts b/src/codec/MultiMapUnlockCodec.ts index 6eee654ae..35cfe2d6e 100644 --- a/src/codec/MultiMapUnlockCodec.ts +++ b/src/codec/MultiMapUnlockCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapValueCountCodec.ts b/src/codec/MultiMapValueCountCodec.ts index 24be34e43..46c3ac74e 100644 --- a/src/codec/MultiMapValueCountCodec.ts +++ b/src/codec/MultiMapValueCountCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/MultiMapValuesCodec.ts b/src/codec/MultiMapValuesCodec.ts index d91ec239f..409689a86 100644 --- a/src/codec/MultiMapValuesCodec.ts +++ b/src/codec/MultiMapValuesCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/PNCounterAddCodec.ts b/src/codec/PNCounterAddCodec.ts index a60a26a51..3f1b2c2b7 100644 --- a/src/codec/PNCounterAddCodec.ts +++ b/src/codec/PNCounterAddCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/PNCounterGetCodec.ts b/src/codec/PNCounterGetCodec.ts index 421d20cf2..9f3d85ff6 100644 --- a/src/codec/PNCounterGetCodec.ts +++ b/src/codec/PNCounterGetCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; import {EntryListUUIDLongCodec} from './builtin/EntryListUUIDLongCodec'; diff --git a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts index e3150f3d2..b2a70fa30 100644 --- a/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts +++ b/src/codec/PNCounterGetConfiguredReplicaCountCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x1D0300 diff --git a/src/codec/QueueAddAllCodec.ts b/src/codec/QueueAddAllCodec.ts index b3b6ef804..116a0d2bd 100644 --- a/src/codec/QueueAddAllCodec.ts +++ b/src/codec/QueueAddAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/QueueAddListenerCodec.ts b/src/codec/QueueAddListenerCodec.ts index ee0084e35..6f7b95824 100644 --- a/src/codec/QueueAddListenerCodec.ts +++ b/src/codec/QueueAddListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; diff --git a/src/codec/QueueClearCodec.ts b/src/codec/QueueClearCodec.ts index c68350646..9bfd0c931 100644 --- a/src/codec/QueueClearCodec.ts +++ b/src/codec/QueueClearCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x030F00 diff --git a/src/codec/QueueCompareAndRemoveAllCodec.ts b/src/codec/QueueCompareAndRemoveAllCodec.ts index f227f2baf..198d8784c 100644 --- a/src/codec/QueueCompareAndRemoveAllCodec.ts +++ b/src/codec/QueueCompareAndRemoveAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/QueueCompareAndRetainAllCodec.ts b/src/codec/QueueCompareAndRetainAllCodec.ts index b2bf06dac..b8105d095 100644 --- a/src/codec/QueueCompareAndRetainAllCodec.ts +++ b/src/codec/QueueCompareAndRetainAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/QueueContainsAllCodec.ts b/src/codec/QueueContainsAllCodec.ts index 393ae29f5..00a30234e 100644 --- a/src/codec/QueueContainsAllCodec.ts +++ b/src/codec/QueueContainsAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/QueueContainsCodec.ts b/src/codec/QueueContainsCodec.ts index 845ac4f36..47eb6e303 100644 --- a/src/codec/QueueContainsCodec.ts +++ b/src/codec/QueueContainsCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/QueueDrainToCodec.ts b/src/codec/QueueDrainToCodec.ts index 1c763e21d..e70f5f661 100644 --- a/src/codec/QueueDrainToCodec.ts +++ b/src/codec/QueueDrainToCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/QueueDrainToMaxSizeCodec.ts b/src/codec/QueueDrainToMaxSizeCodec.ts index 325d51257..223ad5ee1 100644 --- a/src/codec/QueueDrainToMaxSizeCodec.ts +++ b/src/codec/QueueDrainToMaxSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/QueueIsEmptyCodec.ts b/src/codec/QueueIsEmptyCodec.ts index f521bf056..746ce6c6e 100644 --- a/src/codec/QueueIsEmptyCodec.ts +++ b/src/codec/QueueIsEmptyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x031400 diff --git a/src/codec/QueueIteratorCodec.ts b/src/codec/QueueIteratorCodec.ts index e0912f5a8..6f409ed27 100644 --- a/src/codec/QueueIteratorCodec.ts +++ b/src/codec/QueueIteratorCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/QueueOfferCodec.ts b/src/codec/QueueOfferCodec.ts index 75aaa78ab..41b6f9fa0 100644 --- a/src/codec/QueueOfferCodec.ts +++ b/src/codec/QueueOfferCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/QueuePeekCodec.ts b/src/codec/QueuePeekCodec.ts index 810f47168..f466c5f89 100644 --- a/src/codec/QueuePeekCodec.ts +++ b/src/codec/QueuePeekCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/QueuePollCodec.ts b/src/codec/QueuePollCodec.ts index a4d9f8eb4..9995a35f8 100644 --- a/src/codec/QueuePollCodec.ts +++ b/src/codec/QueuePollCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/QueuePutCodec.ts b/src/codec/QueuePutCodec.ts index 2075cc3c9..5e11e4861 100644 --- a/src/codec/QueuePutCodec.ts +++ b/src/codec/QueuePutCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/QueueRemainingCapacityCodec.ts b/src/codec/QueueRemainingCapacityCodec.ts index 9ec6f05c5..9d0384362 100644 --- a/src/codec/QueueRemainingCapacityCodec.ts +++ b/src/codec/QueueRemainingCapacityCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x031300 diff --git a/src/codec/QueueRemoveCodec.ts b/src/codec/QueueRemoveCodec.ts index c76eb3192..50cac354a 100644 --- a/src/codec/QueueRemoveCodec.ts +++ b/src/codec/QueueRemoveCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/QueueRemoveListenerCodec.ts b/src/codec/QueueRemoveListenerCodec.ts index 6ae8d1068..df9e7b09c 100644 --- a/src/codec/QueueRemoveListenerCodec.ts +++ b/src/codec/QueueRemoveListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/QueueSizeCodec.ts b/src/codec/QueueSizeCodec.ts index 20c1c2c54..fd19d7918 100644 --- a/src/codec/QueueSizeCodec.ts +++ b/src/codec/QueueSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x030300 diff --git a/src/codec/QueueTakeCodec.ts b/src/codec/QueueTakeCodec.ts index 7b74259ce..b3f367a3d 100644 --- a/src/codec/QueueTakeCodec.ts +++ b/src/codec/QueueTakeCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapAddEntryListenerCodec.ts b/src/codec/ReplicatedMapAddEntryListenerCodec.ts index 31cf9957a..32bc74bae 100644 --- a/src/codec/ReplicatedMapAddEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts index 3e747ecb6..5c2c085c2 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts index 8d39a7b3b..864b2cae8 100644 --- a/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerToKeyWithPredicateCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts index b08b935c3..49566dc1c 100644 --- a/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts +++ b/src/codec/ReplicatedMapAddEntryListenerWithPredicateCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts index 1b1da4af0..ab7e8b8fa 100644 --- a/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapAddNearCacheEntryListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; diff --git a/src/codec/ReplicatedMapClearCodec.ts b/src/codec/ReplicatedMapClearCodec.ts index e7bf12441..925277755 100644 --- a/src/codec/ReplicatedMapClearCodec.ts +++ b/src/codec/ReplicatedMapClearCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x0D0900 diff --git a/src/codec/ReplicatedMapContainsKeyCodec.ts b/src/codec/ReplicatedMapContainsKeyCodec.ts index 5bf2a38cd..e3b1da379 100644 --- a/src/codec/ReplicatedMapContainsKeyCodec.ts +++ b/src/codec/ReplicatedMapContainsKeyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapContainsValueCodec.ts b/src/codec/ReplicatedMapContainsValueCodec.ts index 0f14bd84f..014ce0b74 100644 --- a/src/codec/ReplicatedMapContainsValueCodec.ts +++ b/src/codec/ReplicatedMapContainsValueCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapEntrySetCodec.ts b/src/codec/ReplicatedMapEntrySetCodec.ts index f85f54020..d027998e6 100644 --- a/src/codec/ReplicatedMapEntrySetCodec.ts +++ b/src/codec/ReplicatedMapEntrySetCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapGetCodec.ts b/src/codec/ReplicatedMapGetCodec.ts index a526b5315..e1e7ba8f8 100644 --- a/src/codec/ReplicatedMapGetCodec.ts +++ b/src/codec/ReplicatedMapGetCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapIsEmptyCodec.ts b/src/codec/ReplicatedMapIsEmptyCodec.ts index 0b81edbb8..2938eb6c4 100644 --- a/src/codec/ReplicatedMapIsEmptyCodec.ts +++ b/src/codec/ReplicatedMapIsEmptyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x0D0300 diff --git a/src/codec/ReplicatedMapKeySetCodec.ts b/src/codec/ReplicatedMapKeySetCodec.ts index c5098bf8f..d21fa6304 100644 --- a/src/codec/ReplicatedMapKeySetCodec.ts +++ b/src/codec/ReplicatedMapKeySetCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/ReplicatedMapPutAllCodec.ts b/src/codec/ReplicatedMapPutAllCodec.ts index 04e9f5dfd..66816fa2a 100644 --- a/src/codec/ReplicatedMapPutAllCodec.ts +++ b/src/codec/ReplicatedMapPutAllCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {EntryListCodec} from './builtin/EntryListCodec'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapPutCodec.ts b/src/codec/ReplicatedMapPutCodec.ts index fba0f8afe..a915fda9e 100644 --- a/src/codec/ReplicatedMapPutCodec.ts +++ b/src/codec/ReplicatedMapPutCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/ReplicatedMapRemoveCodec.ts b/src/codec/ReplicatedMapRemoveCodec.ts index a2383c88e..51b2e5907 100644 --- a/src/codec/ReplicatedMapRemoveCodec.ts +++ b/src/codec/ReplicatedMapRemoveCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts index 0e12af0bb..7a51b2954 100644 --- a/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts +++ b/src/codec/ReplicatedMapRemoveEntryListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/ReplicatedMapSizeCodec.ts b/src/codec/ReplicatedMapSizeCodec.ts index 6edd149d7..7c973503e 100644 --- a/src/codec/ReplicatedMapSizeCodec.ts +++ b/src/codec/ReplicatedMapSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x0D0200 diff --git a/src/codec/ReplicatedMapValuesCodec.ts b/src/codec/ReplicatedMapValuesCodec.ts index e53b491d7..a86212ce6 100644 --- a/src/codec/ReplicatedMapValuesCodec.ts +++ b/src/codec/ReplicatedMapValuesCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/RingbufferAddAllCodec.ts b/src/codec/RingbufferAddAllCodec.ts index 5ec14939b..5b30906f5 100644 --- a/src/codec/RingbufferAddAllCodec.ts +++ b/src/codec/RingbufferAddAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/RingbufferAddCodec.ts b/src/codec/RingbufferAddCodec.ts index 1601016e2..42b4ac9da 100644 --- a/src/codec/RingbufferAddCodec.ts +++ b/src/codec/RingbufferAddCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/RingbufferCapacityCodec.ts b/src/codec/RingbufferCapacityCodec.ts index 3be43bb90..80583b08d 100644 --- a/src/codec/RingbufferCapacityCodec.ts +++ b/src/codec/RingbufferCapacityCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import * as Long from 'long'; diff --git a/src/codec/RingbufferHeadSequenceCodec.ts b/src/codec/RingbufferHeadSequenceCodec.ts index 193f5694e..87d7d1bbf 100644 --- a/src/codec/RingbufferHeadSequenceCodec.ts +++ b/src/codec/RingbufferHeadSequenceCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import * as Long from 'long'; diff --git a/src/codec/RingbufferReadManyCodec.ts b/src/codec/RingbufferReadManyCodec.ts index f0905ccf6..dd9eb1f59 100644 --- a/src/codec/RingbufferReadManyCodec.ts +++ b/src/codec/RingbufferReadManyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/RingbufferReadOneCodec.ts b/src/codec/RingbufferReadOneCodec.ts index b07570aa7..f45bbdc71 100644 --- a/src/codec/RingbufferReadOneCodec.ts +++ b/src/codec/RingbufferReadOneCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import * as Long from 'long'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; diff --git a/src/codec/RingbufferRemainingCapacityCodec.ts b/src/codec/RingbufferRemainingCapacityCodec.ts index 6ceb701ea..7fe43618e 100644 --- a/src/codec/RingbufferRemainingCapacityCodec.ts +++ b/src/codec/RingbufferRemainingCapacityCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import * as Long from 'long'; diff --git a/src/codec/RingbufferSizeCodec.ts b/src/codec/RingbufferSizeCodec.ts index b8252f37e..d1a7e9eb8 100644 --- a/src/codec/RingbufferSizeCodec.ts +++ b/src/codec/RingbufferSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import * as Long from 'long'; diff --git a/src/codec/RingbufferTailSequenceCodec.ts b/src/codec/RingbufferTailSequenceCodec.ts index 18883b834..f95fb6c9a 100644 --- a/src/codec/RingbufferTailSequenceCodec.ts +++ b/src/codec/RingbufferTailSequenceCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import * as Long from 'long'; diff --git a/src/codec/SetAddAllCodec.ts b/src/codec/SetAddAllCodec.ts index 0b4ecab62..71dfda0dd 100644 --- a/src/codec/SetAddAllCodec.ts +++ b/src/codec/SetAddAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/SetAddCodec.ts b/src/codec/SetAddCodec.ts index fcf5c900e..a7865584e 100644 --- a/src/codec/SetAddCodec.ts +++ b/src/codec/SetAddCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/SetAddListenerCodec.ts b/src/codec/SetAddListenerCodec.ts index 0fbbb2f19..795e7315f 100644 --- a/src/codec/SetAddListenerCodec.ts +++ b/src/codec/SetAddListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import {Data} from '../serialization/Data'; diff --git a/src/codec/SetClearCodec.ts b/src/codec/SetClearCodec.ts index c87a5ab12..765f85115 100644 --- a/src/codec/SetClearCodec.ts +++ b/src/codec/SetClearCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x060900 diff --git a/src/codec/SetCompareAndRemoveAllCodec.ts b/src/codec/SetCompareAndRemoveAllCodec.ts index cc890fd1d..85e2b6998 100644 --- a/src/codec/SetCompareAndRemoveAllCodec.ts +++ b/src/codec/SetCompareAndRemoveAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/SetCompareAndRetainAllCodec.ts b/src/codec/SetCompareAndRetainAllCodec.ts index bab37aedc..f5b5d8fd4 100644 --- a/src/codec/SetCompareAndRetainAllCodec.ts +++ b/src/codec/SetCompareAndRetainAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/SetContainsAllCodec.ts b/src/codec/SetContainsAllCodec.ts index cd9743685..5f8302d3e 100644 --- a/src/codec/SetContainsAllCodec.ts +++ b/src/codec/SetContainsAllCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/SetContainsCodec.ts b/src/codec/SetContainsCodec.ts index 286869f39..a16e3776c 100644 --- a/src/codec/SetContainsCodec.ts +++ b/src/codec/SetContainsCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/SetGetAllCodec.ts b/src/codec/SetGetAllCodec.ts index 4548c2a5a..800647007 100644 --- a/src/codec/SetGetAllCodec.ts +++ b/src/codec/SetGetAllCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {ListMultiFrameCodec} from './builtin/ListMultiFrameCodec'; diff --git a/src/codec/SetIsEmptyCodec.ts b/src/codec/SetIsEmptyCodec.ts index 7842455c7..379b1a403 100644 --- a/src/codec/SetIsEmptyCodec.ts +++ b/src/codec/SetIsEmptyCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x060D00 diff --git a/src/codec/SetRemoveCodec.ts b/src/codec/SetRemoveCodec.ts index 9b26246fd..e0e0bfc25 100644 --- a/src/codec/SetRemoveCodec.ts +++ b/src/codec/SetRemoveCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/SetRemoveListenerCodec.ts b/src/codec/SetRemoveListenerCodec.ts index 8847cfe80..4dd882251 100644 --- a/src/codec/SetRemoveListenerCodec.ts +++ b/src/codec/SetRemoveListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/SetSizeCodec.ts b/src/codec/SetSizeCodec.ts index 245d75b6d..903333903 100644 --- a/src/codec/SetSizeCodec.ts +++ b/src/codec/SetSizeCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; // hex: 0x060100 diff --git a/src/codec/TopicAddMessageListenerCodec.ts b/src/codec/TopicAddMessageListenerCodec.ts index 6e37e6f69..6063090a3 100644 --- a/src/codec/TopicAddMessageListenerCodec.ts +++ b/src/codec/TopicAddMessageListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {UUID} from '../core/UUID'; import * as Long from 'long'; diff --git a/src/codec/TopicPublishCodec.ts b/src/codec/TopicPublishCodec.ts index cc8f63f45..a558a648e 100644 --- a/src/codec/TopicPublishCodec.ts +++ b/src/codec/TopicPublishCodec.ts @@ -15,8 +15,8 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; -import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {StringCodec} from './builtin/StringCodec'; import {Data} from '../serialization/Data'; import {DataCodec} from './builtin/DataCodec'; diff --git a/src/codec/TopicRemoveMessageListenerCodec.ts b/src/codec/TopicRemoveMessageListenerCodec.ts index 45d5bbf58..42eca2273 100644 --- a/src/codec/TopicRemoveMessageListenerCodec.ts +++ b/src/codec/TopicRemoveMessageListenerCodec.ts @@ -15,9 +15,9 @@ */ /* eslint-disable max-len */ -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; -import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../ClientMessage'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {StringCodec} from './builtin/StringCodec'; diff --git a/src/codec/builtin/ByteArrayCodec.ts b/src/codec/builtin/ByteArrayCodec.ts index ee9f15ceb..f92d282f6 100644 --- a/src/codec/builtin/ByteArrayCodec.ts +++ b/src/codec/builtin/ByteArrayCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientMessage, Frame} from '../../ClientMessage'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; /** @internal */ export class ByteArrayCodec { diff --git a/src/codec/builtin/CodecUtil.ts b/src/codec/builtin/CodecUtil.ts index 7774f5497..ebf4dbc7f 100644 --- a/src/codec/builtin/CodecUtil.ts +++ b/src/codec/builtin/CodecUtil.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientMessage, Frame, NULL_FRAME} from '../../ClientMessage'; +import {ClientMessage, Frame, NULL_FRAME} from '../../protocol/ClientMessage'; /** @internal */ export class CodecUtil { diff --git a/src/codec/builtin/DataCodec.ts b/src/codec/builtin/DataCodec.ts index 12d614c08..c69eeb5f3 100644 --- a/src/codec/builtin/DataCodec.ts +++ b/src/codec/builtin/DataCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientMessage, Frame, NULL_FRAME} from '../../ClientMessage'; +import {ClientMessage, Frame, NULL_FRAME} from '../../protocol/ClientMessage'; import {Data} from '../../serialization/Data'; import {HeapData} from '../../serialization/HeapData'; import {CodecUtil} from './CodecUtil'; diff --git a/src/codec/builtin/EntryListCodec.ts b/src/codec/builtin/EntryListCodec.ts index fd505a63e..0f5401fad 100644 --- a/src/codec/builtin/EntryListCodec.ts +++ b/src/codec/builtin/EntryListCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; +import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../protocol/ClientMessage'; import {CodecUtil} from './CodecUtil'; /** @internal */ diff --git a/src/codec/builtin/EntryListIntegerIntegerCodec.ts b/src/codec/builtin/EntryListIntegerIntegerCodec.ts index 597b3e7a6..acc546a0b 100644 --- a/src/codec/builtin/EntryListIntegerIntegerCodec.ts +++ b/src/codec/builtin/EntryListIntegerIntegerCodec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, Frame} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; const ENTRY_SIZE_IN_BYTES = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/codec/builtin/EntryListIntegerLongCodec.ts b/src/codec/builtin/EntryListIntegerLongCodec.ts index a92b34bcd..98636dc85 100644 --- a/src/codec/builtin/EntryListIntegerLongCodec.ts +++ b/src/codec/builtin/EntryListIntegerLongCodec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, Frame} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; import * as Long from 'long'; diff --git a/src/codec/builtin/EntryListIntegerUUIDCodec.ts b/src/codec/builtin/EntryListIntegerUUIDCodec.ts index 5b24938c7..d3a560c4e 100644 --- a/src/codec/builtin/EntryListIntegerUUIDCodec.ts +++ b/src/codec/builtin/EntryListIntegerUUIDCodec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, Frame} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; import {UUID} from '../../core/UUID'; diff --git a/src/codec/builtin/EntryListLongByteArrayCodec.ts b/src/codec/builtin/EntryListLongByteArrayCodec.ts index a956b57dd..b0a2f59a0 100644 --- a/src/codec/builtin/EntryListLongByteArrayCodec.ts +++ b/src/codec/builtin/EntryListLongByteArrayCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BEGIN_FRAME, ClientMessage, END_FRAME} from '../../ClientMessage'; +import {BEGIN_FRAME, ClientMessage, END_FRAME} from '../../protocol/ClientMessage'; import * as Long from 'long'; import {ByteArrayCodec} from './ByteArrayCodec'; import {ListLongCodec} from './ListLongCodec'; diff --git a/src/codec/builtin/EntryListUUIDListIntegerCodec.ts b/src/codec/builtin/EntryListUUIDListIntegerCodec.ts index fc89aeebf..a3af1642a 100644 --- a/src/codec/builtin/EntryListUUIDListIntegerCodec.ts +++ b/src/codec/builtin/EntryListUUIDListIntegerCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BEGIN_FRAME, ClientMessage, END_FRAME} from '../../ClientMessage'; +import {BEGIN_FRAME, ClientMessage, END_FRAME} from '../../protocol/ClientMessage'; import {UUID} from '../../core/UUID'; import {ListIntegerCodec} from './ListIntegerCodec'; import {ListUUIDCodec} from './ListUUIDCodec'; diff --git a/src/codec/builtin/EntryListUUIDLongCodec.ts b/src/codec/builtin/EntryListUUIDLongCodec.ts index 996cabb15..cfedc3eec 100644 --- a/src/codec/builtin/EntryListUUIDLongCodec.ts +++ b/src/codec/builtin/EntryListUUIDLongCodec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, Frame} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; import {UUID} from '../../core/UUID'; import * as Long from 'long'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; diff --git a/src/codec/builtin/EntryListUUIDUUIDCodec.ts b/src/codec/builtin/EntryListUUIDUUIDCodec.ts index d8aeba8f5..c2426d4d0 100644 --- a/src/codec/builtin/EntryListUUIDUUIDCodec.ts +++ b/src/codec/builtin/EntryListUUIDUUIDCodec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, Frame} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; import {UUID} from '../../core/UUID'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; diff --git a/src/codec/builtin/ErrorsCodec.ts b/src/codec/builtin/ErrorsCodec.ts index 175f5bff0..76d5e2d0d 100644 --- a/src/codec/builtin/ErrorsCodec.ts +++ b/src/codec/builtin/ErrorsCodec.ts @@ -17,7 +17,7 @@ // Other codecs message types can be in range 0x000100 - 0xFFFFFF // So, it is safe to supply a custom message type for exceptions in // the range 0x000000 - 0x0000FF -import {ClientMessage} from '../../ClientMessage'; +import {ClientMessage} from '../../protocol/ClientMessage'; import {ErrorHolder} from '../../protocol/ErrorHolder'; import {ListMultiFrameCodec} from './ListMultiFrameCodec'; import {ErrorHolderCodec} from '../custom/ErrorHolderCodec'; diff --git a/src/codec/builtin/FixSizedTypesCodec.ts b/src/codec/builtin/FixSizedTypesCodec.ts index 0db5d426b..5ccca501e 100644 --- a/src/codec/builtin/FixSizedTypesCodec.ts +++ b/src/codec/builtin/FixSizedTypesCodec.ts @@ -15,7 +15,7 @@ */ import * as Long from 'long'; -import {BitsUtil} from '../../BitsUtil'; +import {BitsUtil} from '../../util/BitsUtil'; import {UUID} from '../../core/UUID'; /** @internal */ diff --git a/src/codec/builtin/ListDataCodec.ts b/src/codec/builtin/ListDataCodec.ts index c9895dd3f..a8427abd7 100644 --- a/src/codec/builtin/ListDataCodec.ts +++ b/src/codec/builtin/ListDataCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientMessage} from '../../ClientMessage'; +import {ClientMessage} from '../../protocol/ClientMessage'; import {Data} from '../../serialization/Data'; import {ListMultiFrameCodec} from './ListMultiFrameCodec'; import {DataCodec} from './DataCodec'; diff --git a/src/codec/builtin/ListIntegerCodec.ts b/src/codec/builtin/ListIntegerCodec.ts index 9147a1e22..893cf9ec8 100644 --- a/src/codec/builtin/ListIntegerCodec.ts +++ b/src/codec/builtin/ListIntegerCodec.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import {ClientMessage, Frame} from '../../ClientMessage'; -import {BitsUtil} from '../../BitsUtil'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; /** @internal */ diff --git a/src/codec/builtin/ListLongCodec.ts b/src/codec/builtin/ListLongCodec.ts index 7a9f7b423..01e2026b5 100644 --- a/src/codec/builtin/ListLongCodec.ts +++ b/src/codec/builtin/ListLongCodec.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {ClientMessage, Frame} from '../../ClientMessage'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; import * as Long from 'long'; -import {BitsUtil} from '../../BitsUtil'; +import {BitsUtil} from '../../util/BitsUtil'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; /** @internal */ diff --git a/src/codec/builtin/ListMultiFrameCodec.ts b/src/codec/builtin/ListMultiFrameCodec.ts index 4dfce27fa..a2a602a47 100644 --- a/src/codec/builtin/ListMultiFrameCodec.ts +++ b/src/codec/builtin/ListMultiFrameCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; +import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../protocol/ClientMessage'; import {CodecUtil} from './CodecUtil'; /** @internal */ diff --git a/src/codec/builtin/ListUUIDCodec.ts b/src/codec/builtin/ListUUIDCodec.ts index 33f9d7dbd..9958303c0 100644 --- a/src/codec/builtin/ListUUIDCodec.ts +++ b/src/codec/builtin/ListUUIDCodec.ts @@ -14,9 +14,9 @@ * limitations under the License. */ -import {ClientMessage, Frame} from '../../ClientMessage'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; import {UUID} from '../../core/UUID'; -import {BitsUtil} from '../../BitsUtil'; +import {BitsUtil} from '../../util/BitsUtil'; import {FixSizedTypesCodec} from './FixSizedTypesCodec'; /** @internal */ diff --git a/src/codec/builtin/LongArrayCodec.ts b/src/codec/builtin/LongArrayCodec.ts index 337e8acd6..4493765d8 100644 --- a/src/codec/builtin/LongArrayCodec.ts +++ b/src/codec/builtin/LongArrayCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientMessage} from '../../ClientMessage'; +import {ClientMessage} from '../../protocol/ClientMessage'; import * as Long from 'long'; import {ListLongCodec} from './ListLongCodec'; diff --git a/src/codec/builtin/MapCodec.ts b/src/codec/builtin/MapCodec.ts index 6aefa8908..a33e5bfe6 100644 --- a/src/codec/builtin/MapCodec.ts +++ b/src/codec/builtin/MapCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../ClientMessage'; +import {BEGIN_FRAME, ClientMessage, END_FRAME, NULL_FRAME} from '../../protocol/ClientMessage'; import {CodecUtil} from './CodecUtil'; /** @internal */ diff --git a/src/codec/builtin/StringCodec.ts b/src/codec/builtin/StringCodec.ts index 8c4501c29..15d5f2a2a 100644 --- a/src/codec/builtin/StringCodec.ts +++ b/src/codec/builtin/StringCodec.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {ClientMessage, Frame} from '../../ClientMessage'; +import {ClientMessage, Frame} from '../../protocol/ClientMessage'; /** @internal */ export class StringCodec { diff --git a/src/codec/custom/AddressCodec.ts b/src/codec/custom/AddressCodec.ts index ecba8e1ce..51d268a41 100644 --- a/src/codec/custom/AddressCodec.ts +++ b/src/codec/custom/AddressCodec.ts @@ -16,10 +16,10 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; -import {AddressImpl} from '../../Address'; +import {AddressImpl} from '../../core/Address'; import {StringCodec} from '../builtin/StringCodec'; const PORT_OFFSET = 0; diff --git a/src/codec/custom/AnchorDataListHolderCodec.ts b/src/codec/custom/AnchorDataListHolderCodec.ts index 1ded8aa68..2cad877c9 100644 --- a/src/codec/custom/AnchorDataListHolderCodec.ts +++ b/src/codec/custom/AnchorDataListHolderCodec.ts @@ -15,7 +15,7 @@ */ /* eslint-disable max-len */ -import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../ClientMessage'; +import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {ListIntegerCodec} from '../builtin/ListIntegerCodec'; import {AnchorDataListHolder} from '../../protocol/AnchorDataListHolder'; diff --git a/src/codec/custom/BitmapIndexOptionsCodec.ts b/src/codec/custom/BitmapIndexOptionsCodec.ts index bc6ccec0c..7c9a3fedf 100644 --- a/src/codec/custom/BitmapIndexOptionsCodec.ts +++ b/src/codec/custom/BitmapIndexOptionsCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {InternalBitmapIndexOptions} from '../../config/BitmapIndexOptions'; import {StringCodec} from '../builtin/StringCodec'; diff --git a/src/codec/custom/DistributedObjectInfoCodec.ts b/src/codec/custom/DistributedObjectInfoCodec.ts index 0b6dfcaed..67b68e779 100644 --- a/src/codec/custom/DistributedObjectInfoCodec.ts +++ b/src/codec/custom/DistributedObjectInfoCodec.ts @@ -15,10 +15,10 @@ */ /* eslint-disable max-len */ -import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../ClientMessage'; +import {ClientMessage, BEGIN_FRAME, END_FRAME} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {StringCodec} from '../builtin/StringCodec'; -import {DistributedObjectInfo} from '../../DistributedObjectInfo'; +import {DistributedObjectInfo} from '../../core/DistributedObjectInfo'; /** @internal */ export class DistributedObjectInfoCodec { diff --git a/src/codec/custom/ErrorHolderCodec.ts b/src/codec/custom/ErrorHolderCodec.ts index 2f20d57e4..d9a176364 100644 --- a/src/codec/custom/ErrorHolderCodec.ts +++ b/src/codec/custom/ErrorHolderCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {ErrorHolder} from '../../protocol/ErrorHolder'; import {StringCodec} from '../builtin/StringCodec'; diff --git a/src/codec/custom/IndexConfigCodec.ts b/src/codec/custom/IndexConfigCodec.ts index a716c31f5..219c5825c 100644 --- a/src/codec/custom/IndexConfigCodec.ts +++ b/src/codec/custom/IndexConfigCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {InternalIndexConfig} from '../../config/IndexConfig'; import {StringCodec} from '../builtin/StringCodec'; diff --git a/src/codec/custom/MemberInfoCodec.ts b/src/codec/custom/MemberInfoCodec.ts index 13e15869b..2036c2768 100644 --- a/src/codec/custom/MemberInfoCodec.ts +++ b/src/codec/custom/MemberInfoCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {MemberInfo} from '../../core/MemberInfo'; import {AddressCodec} from './AddressCodec'; diff --git a/src/codec/custom/MemberVersionCodec.ts b/src/codec/custom/MemberVersionCodec.ts index cad7ea859..99de101dd 100644 --- a/src/codec/custom/MemberVersionCodec.ts +++ b/src/codec/custom/MemberVersionCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {MemberVersion} from '../../core/MemberVersion'; diff --git a/src/codec/custom/PagingPredicateHolderCodec.ts b/src/codec/custom/PagingPredicateHolderCodec.ts index d32c1177f..eb2e341b0 100644 --- a/src/codec/custom/PagingPredicateHolderCodec.ts +++ b/src/codec/custom/PagingPredicateHolderCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {PagingPredicateHolder} from '../../protocol/PagingPredicateHolder'; import {AnchorDataListHolderCodec} from './AnchorDataListHolderCodec'; diff --git a/src/codec/custom/SimpleEntryViewCodec.ts b/src/codec/custom/SimpleEntryViewCodec.ts index 4382edcc3..3092788c3 100644 --- a/src/codec/custom/SimpleEntryViewCodec.ts +++ b/src/codec/custom/SimpleEntryViewCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {SimpleEntryView} from '../../core/SimpleEntryView'; import {Data} from '../../serialization/Data'; diff --git a/src/codec/custom/StackTraceElementCodec.ts b/src/codec/custom/StackTraceElementCodec.ts index 359a1c37f..284973d0f 100644 --- a/src/codec/custom/StackTraceElementCodec.ts +++ b/src/codec/custom/StackTraceElementCodec.ts @@ -16,8 +16,8 @@ /* eslint-disable max-len */ import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; -import {BitsUtil} from '../../BitsUtil'; -import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../ClientMessage'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; import {CodecUtil} from '../builtin/CodecUtil'; import {StackTraceElement} from '../../protocol/StackTraceElement'; import {StringCodec} from '../builtin/StringCodec'; diff --git a/src/config/Config.ts b/src/config/Config.ts index 0feb54a31..9e4605471 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -14,27 +14,19 @@ * limitations under the License. */ -import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; import {ClientNetworkConfig, ClientNetworkConfigImpl} from './ClientNetworkConfig'; import {ConfigPatternMatcher} from './ConfigPatternMatcher'; -import {EvictionPolicy} from './EvictionPolicy'; import {FlakeIdGeneratorConfig, FlakeIdGeneratorConfigImpl} from './FlakeIdGeneratorConfig'; -import {InMemoryFormat} from './InMemoryFormat'; import {MembershipListener} from '../core/MembershipListener'; import {LifecycleState} from '../LifecycleService'; import {NearCacheConfig, NearCacheConfigImpl} from './NearCacheConfig'; -import {SSLConfig} from './SSLConfig'; import {Properties} from './Properties'; import {ReliableTopicConfig, ReliableTopicConfigImpl} from './ReliableTopicConfig'; import {SerializationConfig, SerializationConfigImpl} from './SerializationConfig'; import {Statistics} from '../statistics/Statistics'; import {ILogger} from '../logging/ILogger'; -import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; -import {ConnectionStrategyConfig, ConnectionStrategyConfigImpl, ReconnectMode} from './ConnectionStrategyConfig'; -import {LoadBalancerType, LoadBalancerConfig, LoadBalancerConfigImpl} from './LoadBalancerConfig'; -import {IndexConfig} from './IndexConfig'; -import {IndexType} from './IndexType'; -import {ConnectionRetryConfig} from './ConnectionRetryConfig'; +import {ConnectionStrategyConfig, ConnectionStrategyConfigImpl} from './ConnectionStrategyConfig'; +import {LoadBalancerConfig, LoadBalancerConfigImpl} from './LoadBalancerConfig'; /** * Top level configuration object of Hazelcast client. @@ -90,16 +82,46 @@ export interface ClientConfig { /** * Near Cache config for the client. + * + * Hazelcast client supports wildcard configuration for Near + * Caches. Using an asterisk (`*`) character in the name, + * different instances of Maps can be configured by a single + * configuration. + * + * When you use `default` as the config key, it has a special + * meaning. Hazelcast client will use that configuration as the + * default one for all Maps, unless there is a specific + * configuration for the Map. */ nearCaches?: { [name: string]: NearCacheConfig }; /** - * Configs for ReliableTopics. + * Configs for Reliable Topics. + * + * Hazelcast client supports wildcard configuration for Reliable + * Topics. Using an asterisk (`*`) character in the name, + * different instances of topics can be configured by a single + * configuration. + * + * When you use `default` as the config key, it has a special + * meaning. Hazelcast client will use that configuration as the + * default one for all Reliable Topics, unless there is + * a specific configuration for the topic. */ reliableTopics?: { [name: string]: ReliableTopicConfig }; /** - * Configs for FlakeIdGenerators. + * Configs for Flake ID Generators. + * + * Hazelcast client supports wildcard configuration for Flake + * ID Generators. Using an asterisk (`*`) character in the name, + * different instances of generators can be configured by a single + * configuration. + * + * When you use `default` as the config key, it has a special + * meaning. Hazelcast client will use that configuration as the + * default one for all Flake ID Generators, unless there is + * a specific configuration for the generator. */ flakeIdGenerators?: { [name: string]: FlakeIdGeneratorConfig }; @@ -211,23 +233,3 @@ export class ClientConfigImpl implements ClientConfig { return null; } } - -export { - ClientNetworkConfig, - TopicOverloadPolicy, - SerializationConfig, - ReliableTopicConfig, - EvictionPolicy, - InMemoryFormat, - NearCacheConfig, - FlakeIdGeneratorConfig, - SSLConfig, - JsonStringDeserializationPolicy, - IndexConfig, - IndexType, - ConnectionStrategyConfig, - ReconnectMode, - ConnectionRetryConfig, - LoadBalancerConfig, - LoadBalancerType, -}; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 3ccfb612a..23a91f9d9 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -15,9 +15,15 @@ */ /** @ignore *//** */ -import {HazelcastError} from '../HazelcastError'; -import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; -import {tryGetArray, tryGetBoolean, tryGetEnum, tryGetNumber, tryGetString} from '../Util'; +import {HazelcastError} from '../core'; +import {TopicOverloadPolicy} from '../proxy'; +import { + tryGetArray, + tryGetBoolean, + tryGetEnum, + tryGetNumber, + tryGetString +} from '../util/Util'; import {ClientConfig, ClientConfigImpl} from './Config'; import {EvictionPolicy} from './EvictionPolicy'; import {FlakeIdGeneratorConfigImpl} from './FlakeIdGeneratorConfig'; diff --git a/src/config/ConfigPatternMatcher.ts b/src/config/ConfigPatternMatcher.ts index 3a7166793..1d548962f 100644 --- a/src/config/ConfigPatternMatcher.ts +++ b/src/config/ConfigPatternMatcher.ts @@ -23,8 +23,8 @@ export class ConfigPatternMatcher { * @param configPatterns * @param itemName * @throws - * @returns `null` if there is no matching pattern - * the best matching pattern otherwis + * @returns `null` if there is no matching pattern; + * the best matching pattern otherwise */ matches(configPatterns: string[], itemName: string): string { let bestMatchingPoint = -1; diff --git a/src/config/LoadBalancerConfig.ts b/src/config/LoadBalancerConfig.ts index 140385fdc..1b5663ea7 100644 --- a/src/config/LoadBalancerConfig.ts +++ b/src/config/LoadBalancerConfig.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {LoadBalancer} from '../LoadBalancer'; +import {LoadBalancer} from '../core/LoadBalancer'; /** * Defines {@link LoadBalancer} type used by the client. diff --git a/src/config/ReliableTopicConfig.ts b/src/config/ReliableTopicConfig.ts index 9799e076b..716487b9f 100644 --- a/src/config/ReliableTopicConfig.ts +++ b/src/config/ReliableTopicConfig.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {TopicOverloadPolicy} from '../proxy/topic/TopicOverloadPolicy'; +import {TopicOverloadPolicy} from '../proxy'; /** * Configuration to be used by the client for the specified ReliableTopic. diff --git a/src/config/SerializationConfig.ts b/src/config/SerializationConfig.ts index 3872164b7..e45af9481 100644 --- a/src/config/SerializationConfig.ts +++ b/src/config/SerializationConfig.ts @@ -14,12 +14,9 @@ * limitations under the License. */ -import { - IdentifiedDataSerializableFactory, - PortableFactory, - CustomSerializable, -} from '../serialization/Serializable'; -import {Serializer} from '../serialization/DefaultSerializer'; +import {IdentifiedDataSerializableFactory, CustomSerializable} from '../serialization/Serializable'; +import {PortableFactory} from '../serialization/Portable'; +import {Serializer} from '../serialization/Serializable'; import {JsonStringDeserializationPolicy} from './JsonStringDeserializationPolicy'; /** diff --git a/src/config/index.ts b/src/config/index.ts new file mode 100644 index 000000000..e905308b9 --- /dev/null +++ b/src/config/index.ts @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +/** + * Public API re-exports. + */ + +export * from './BitmapIndexOptions'; +export * from './ClientCloudConfig'; +export * from './ClientNetworkConfig'; +export * from './Config'; +export * from './ConnectionRetryConfig'; +export * from './ConnectionStrategyConfig'; +export * from './EvictionPolicy'; +export * from './FlakeIdGeneratorConfig'; +export * from './IndexConfig'; +export * from './IndexType'; +export * from './InMemoryFormat'; +export * from './JsonStringDeserializationPolicy'; +export * from './LoadBalancerConfig'; +export * from './NearCacheConfig'; +export * from './Properties'; +export * from './ReliableTopicConfig'; +export * from './SerializationConfig'; +export * from './SSLConfig'; diff --git a/src/connection/AddressProvider.ts b/src/connection/AddressProvider.ts index 406cb7dfd..3f25b127f 100644 --- a/src/connection/AddressProvider.ts +++ b/src/connection/AddressProvider.ts @@ -16,7 +16,7 @@ /** @ignore *//** */ import * as Promise from 'bluebird'; -import {AddressImpl} from '../Address'; +import {AddressImpl} from '../core/Address'; /** * Provides initial addresses for client to find and connect to a node & diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts index 6a4be52c2..f5dd3d3d6 100644 --- a/src/connection/BasicSSLOptionsFactory.ts +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -17,8 +17,12 @@ import * as Promise from 'bluebird'; import * as fs from 'fs'; import {Properties} from '../config/Properties'; -import {HazelcastError} from '../HazelcastError'; -import {getBooleanOrUndefined, getStringOrUndefined, resolvePath} from '../Util'; +import {HazelcastError} from '../core'; +import { + getBooleanOrUndefined, + getStringOrUndefined, + resolvePath +} from '../util/Util'; import {SSLOptionsFactory} from './SSLOptionsFactory'; /** diff --git a/src/connection/DefaultAddressProvider.ts b/src/connection/DefaultAddressProvider.ts index 2d3a684a2..521bb620a 100644 --- a/src/connection/DefaultAddressProvider.ts +++ b/src/connection/DefaultAddressProvider.ts @@ -18,7 +18,7 @@ import {AddressProvider} from './AddressProvider'; import {ClientNetworkConfigImpl} from '../config/ClientNetworkConfig'; import * as Promise from 'bluebird'; -import {AddressImpl} from '../Address'; +import {AddressImpl} from '../core/Address'; /** * Default address provider of Hazelcast. diff --git a/src/proxy/topic/MessageListener.ts b/src/connection/index.ts similarity index 82% rename from src/proxy/topic/MessageListener.ts rename to src/connection/index.ts index 2095a02d1..73bb6f3d9 100644 --- a/src/proxy/topic/MessageListener.ts +++ b/src/connection/index.ts @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -import {Message} from './Message'; +/** @ignore *//** */ /** - * Message listener for Reliable Topic. + * Public API re-exports. */ -export type MessageListener = (message: Message) => void; + +export * from './BasicSSLOptionsFactory'; +export * from './SSLOptionsFactory'; diff --git a/src/Address.ts b/src/core/Address.ts similarity index 90% rename from src/Address.ts rename to src/core/Address.ts index 2a4c6a04b..1356efb0a 100644 --- a/src/Address.ts +++ b/src/core/Address.ts @@ -15,9 +15,12 @@ */ import * as net from 'net'; -import {CLUSTER_DATA_FACTORY_ID, CLUSTER_DATA_ADDRESS_CLASS_ID} from './ClusterDataFactory'; -import {DataInput, DataOutput} from './serialization/Data'; -import {IdentifiedDataSerializable} from './serialization/Serializable'; +import { + CLUSTER_DATA_FACTORY_ID, + CLUSTER_DATA_ADDRESS_CLASS_ID +} from '../serialization/ClusterDataFactory'; +import {DataInput, DataOutput} from '../serialization/Data'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; /** * Represents a network address (e.g. of the client or a cluster member). diff --git a/src/ClientInfo.ts b/src/core/ClientInfo.ts similarity index 97% rename from src/ClientInfo.ts rename to src/core/ClientInfo.ts index 5184743e2..13fece0a7 100644 --- a/src/ClientInfo.ts +++ b/src/core/ClientInfo.ts @@ -15,7 +15,7 @@ */ import {Address} from './Address'; -import {UUID} from './core/UUID'; +import {UUID} from './UUID'; /** * Local information of the client. diff --git a/src/core/Cluster.ts b/src/core/Cluster.ts index 4f5533864..99508fb64 100644 --- a/src/core/Cluster.ts +++ b/src/core/Cluster.ts @@ -15,7 +15,6 @@ */ import {MembershipListener} from './MembershipListener'; -import {UUID} from './UUID'; import {Member} from './Member'; import {MemberSelector} from './MemberSelector'; @@ -42,7 +41,7 @@ export interface Cluster { * @throws AssertionError if listener is `null` * @see {@link removeMembershipListener} */ - addMembershipListener(listener: MembershipListener): UUID; + addMembershipListener(listener: MembershipListener): string; /** * Removes the specified {@link MembershipListener}. @@ -51,12 +50,12 @@ export interface Cluster { * * This method can safely be called multiple times for the same registration ID; subsequent calls are ignored. * - * @param registrationId the registrationId of MembershipListener to remove + * @param listenerId the registration ID of MembershipListener to remove * @return true if the registration is removed, false otherwise * @throws AssertionError if the registration ID is `null` * @see {@link addMembershipListener} */ - removeMembershipListener(registrationId: UUID): boolean; + removeMembershipListener(listenerId: string): boolean; /** * List of the current members in the cluster. diff --git a/src/DistributedObject.ts b/src/core/DistributedObject.ts similarity index 100% rename from src/DistributedObject.ts rename to src/core/DistributedObject.ts diff --git a/src/DistributedObjectInfo.ts b/src/core/DistributedObjectInfo.ts similarity index 100% rename from src/DistributedObjectInfo.ts rename to src/core/DistributedObjectInfo.ts diff --git a/src/HazelcastError.ts b/src/core/HazelcastError.ts similarity index 99% rename from src/HazelcastError.ts rename to src/core/HazelcastError.ts index 0a096eff6..03d0f5552 100644 --- a/src/HazelcastError.ts +++ b/src/core/HazelcastError.ts @@ -21,6 +21,9 @@ export interface HazelcastErrorConstructor { new(message: string, cause?: Error): HazelcastError; } +/** + * Base class for all specific errors thrown by Hazelcast client. + */ export class HazelcastError extends Error { cause: Error; diff --git a/src/core/HazelcastJsonValue.ts b/src/core/HazelcastJsonValue.ts index 4bac837bf..1a1cc2914 100644 --- a/src/core/HazelcastJsonValue.ts +++ b/src/core/HazelcastJsonValue.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {assertString} from '../Util'; +import {assertString} from '../util/Util'; /** * HazelcastJsonValue is a wrapper for JSON formatted strings. It is preferred diff --git a/src/core/InitialMembershipListener.ts b/src/core/InitialMembershipListener.ts deleted file mode 100644 index 51a608f11..000000000 --- a/src/core/InitialMembershipListener.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {MembershipListener} from './MembershipListener'; -import {InitialMembershipEvent} from './InitialMembershipEvent'; - -/** - * The InitialMembershipListener is a {@link MembershipListener} that first receives a - * {@link InitialMembershipEvent} when it is registered so it immediately knows which members are available. After - * that event has been received, it will receive the normal MembershipEvents. - * - * When the InitialMembershipListener already is registered on a cluster and is registered again on the same - * Cluster instance, it will not receive an additional MembershipInitializeEvent. This is a once only event. - */ -export interface InitialMembershipListener extends MembershipListener { - /** - * Called when this listener is registered. - * - * @param event the MembershipInitializeEvent received when the listener is registered - */ - init(event: InitialMembershipEvent): void; -} diff --git a/src/util/AbstractLoadBalancer.ts b/src/core/LoadBalancer.ts similarity index 59% rename from src/util/AbstractLoadBalancer.ts rename to src/core/LoadBalancer.ts index fd6492062..9988f504e 100644 --- a/src/util/AbstractLoadBalancer.ts +++ b/src/core/LoadBalancer.ts @@ -14,13 +14,42 @@ * limitations under the License. */ -import {LoadBalancer} from '../LoadBalancer'; -import {InitialMembershipListener} from '../core/InitialMembershipListener'; -import {Cluster} from '../core/Cluster'; import {ClientConfig} from '../config/Config'; -import {InitialMembershipEvent} from '../core/InitialMembershipEvent'; -import {MembershipEvent} from '../core/MembershipEvent'; -import {Member} from '../core/Member'; +import {Cluster} from './Cluster'; +import {Member} from './Member'; +import { + InitialMembershipListener, + InitialMembershipEvent, + MembershipEvent +} from './MembershipListener'; + +/** + * {@link LoadBalancer} allows you to send operations to one of a number of endpoints (Members). + * It is up to the implementation to use different load balancing policies. + *

+ * If Client is configured with {@link ClientNetworkConfig.smartRouting}, + * only the operations that are not key based will be routed to the endpoint + * returned by the LoadBalancer. If it is not, the LoadBalancer will not be used. + *

+ */ +export interface LoadBalancer { + + /** + * Initializes the LoadBalancer. + * + * @param cluster the Cluster this LoadBalancer uses to select members from. + * @param config the ClientConfig. + */ + initLoadBalancer(cluster: Cluster, config: ClientConfig): void; + + /** + * Returns the next member to route to. + * + * @return Returns the next member or `null` if no member is available + */ + next(): Member; + +} /** * Abstract Load Balancer to be used in built-in and user-provided diff --git a/src/core/Member.ts b/src/core/Member.ts index d349f6e90..bb95f2e24 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {Address, AddressImpl} from '../Address'; +import {Address, AddressImpl} from './Address'; import {UUID} from './UUID'; import {MemberVersion} from './MemberVersion'; diff --git a/src/core/MemberInfo.ts b/src/core/MemberInfo.ts index 12cfa3979..e50cf977c 100644 --- a/src/core/MemberInfo.ts +++ b/src/core/MemberInfo.ts @@ -15,7 +15,7 @@ */ /** @ignore *//** */ -import {AddressImpl} from '../Address'; +import {AddressImpl} from './Address'; import {UUID} from './UUID'; import {MemberVersion} from './MemberVersion'; diff --git a/src/core/MemberSelector.ts b/src/core/MemberSelector.ts index d98a474f9..9a2187ece 100644 --- a/src/core/MemberSelector.ts +++ b/src/core/MemberSelector.ts @@ -20,3 +20,6 @@ import {Member} from './Member'; * Selector function for members. */ export type MemberSelector = (member: Member) => boolean; + +/** @internal */ +export const dataMemberSelector = (member: Member): boolean => !member.liteMember; diff --git a/src/core/MemberVersion.ts b/src/core/MemberVersion.ts index 6a76bd3a8..177f75694 100644 --- a/src/core/MemberVersion.ts +++ b/src/core/MemberVersion.ts @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ +/** @internal */ export class MemberVersion { major: number; minor: number; diff --git a/src/core/MembershipEvent.ts b/src/core/MembershipEvent.ts deleted file mode 100644 index 267588f2e..000000000 --- a/src/core/MembershipEvent.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. - * - * Licensed 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. - */ - -import {Member} from './Member'; - -/** - * Membership event fired when a new member is added to the cluster and/or - * when a member leaves the cluster or when there is a member attribute change. - */ -export class MembershipEvent { - - /** - * Removed or added member. - */ - member: Member; - - /** - * Members list at the moment after this event. - */ - members: Member[]; - - /** @internal */ - eventType: MemberEvent; - - /** @internal */ - constructor(member: Member, eventType: MemberEvent, members: Member[]) { - this.member = member; - this.eventType = eventType; - this.members = members; - } - -} - -/** @internal */ -export enum MemberEvent { - - ADDED = 1, - REMOVED = 2, - -} diff --git a/src/core/MembershipListener.ts b/src/core/MembershipListener.ts index be441248c..538f3c376 100644 --- a/src/core/MembershipListener.ts +++ b/src/core/MembershipListener.ts @@ -14,7 +14,43 @@ * limitations under the License. */ -import {MembershipEvent} from './MembershipEvent'; +import {Member} from './Member'; + +/** + * Membership event fired when a new member is added to the cluster and/or + * when a member leaves the cluster or when there is a member attribute change. + */ +export class MembershipEvent { + + /** + * Removed or added member. + */ + member: Member; + + /** + * Members list at the moment after this event. + */ + members: Member[]; + + /** @internal */ + eventType: MemberEvent; + + /** @internal */ + constructor(member: Member, eventType: MemberEvent, members: Member[]) { + this.member = member; + this.eventType = eventType; + this.members = members; + } + +} + +/** @internal */ +export enum MemberEvent { + + ADDED = 1, + REMOVED = 2, + +} /** * Cluster membership listener. @@ -36,3 +72,40 @@ export interface MembershipListener { memberRemoved(event: MembershipEvent): void; } + +/** + * An event that is sent when a {@link InitialMembershipListener} registers itself on a cluster. + * + * @see MembershipListener + * @see MembershipEvent + */ +export class InitialMembershipEvent { + + members: Member[]; + + /** @internal */ + constructor(members: Member[]) { + this.members = members; + } +} + +/** + * The InitialMembershipListener is a {@link MembershipListener} that first + * receives an {@link InitialMembershipEvent} when it is registered so it + * immediately knows which members are available. After that event has + * been received, it will receive the normal MembershipEvents. + * + * When the InitialMembershipListener already is registered on a cluster + * and is registered again on the same Cluster instance, it will not + * receive an additional MembershipInitializeEvent. This is a once only event. + */ +export interface InitialMembershipListener extends MembershipListener { + + /** + * Called when this listener is registered. + * + * @param event the MembershipInitializeEvent received when the listener is registered + */ + init(event: InitialMembershipEvent): void; + +} diff --git a/src/proxy/ringbuffer/ReadResultSet.ts b/src/core/ReadResultSet.ts similarity index 97% rename from src/proxy/ringbuffer/ReadResultSet.ts rename to src/core/ReadResultSet.ts index fea262ba2..834129bb5 100644 --- a/src/proxy/ringbuffer/ReadResultSet.ts +++ b/src/core/ReadResultSet.ts @@ -19,7 +19,7 @@ import * as Long from 'long'; export const SEQUENCE_UNAVAILABLE = -1; /** - * ReadResultSet defines the result of a {@link Ringbuffer.readMany} operation. + * Defines the result of a {@link Ringbuffer.readMany} operation. */ export interface ReadResultSet { diff --git a/src/core/RestValue.ts b/src/core/RestValue.ts index 40a7ebd6e..4a8c7dba4 100644 --- a/src/core/RestValue.ts +++ b/src/core/RestValue.ts @@ -35,18 +35,18 @@ export class RestValue implements IdentifiedDataSerializable { * HTTP Content-Type specified for the value. */ contentType: string; - /** @internal */ + /** @ignore */ factoryId = REST_VALUE_FACTORY_ID; - /** @internal */ + /** @ignore */ classId = REST_VALUE_CLASS_ID; - /** @internal */ + /** @ignore */ readData(input: DataInput): any { this.value = input.readUTF(); this.contentType = input.readUTF(); } - /** @internal */ + /** @ignore */ writeData(output: DataOutput): void { output.writeUTF(this.value); output.writeUTF(this.contentType); diff --git a/src/core/index.ts b/src/core/index.ts new file mode 100644 index 000000000..381bd9eb7 --- /dev/null +++ b/src/core/index.ts @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +/** + * Public API re-exports. + */ + +export * from './Address'; +export * from './ClientInfo'; +export * from './Cluster'; +export * from './Comparator'; +export * from './DistributedObject'; +export * from './DistributedObjectListener'; +export * from './HazelcastError'; +export * from './HazelcastJsonValue'; +export * from './LoadBalancer'; +export * from './Member'; +export * from './MemberSelector'; +export * from './MembershipListener'; +export * from './PartitionAware'; +export {Predicate, PagingPredicate} from './Predicate'; +export * as Predicates from './Predicate'; +export * from './ReadOnlyLazyList'; +export * from './ReadResultSet'; +export * from './RestValue'; +export * from './SimpleEntryView'; +export * from './UUID'; diff --git a/src/discovery/HazelcastCloudAddressProvider.ts b/src/discovery/HazelcastCloudAddressProvider.ts index 64f2aec3e..012e5bbb7 100644 --- a/src/discovery/HazelcastCloudAddressProvider.ts +++ b/src/discovery/HazelcastCloudAddressProvider.ts @@ -19,7 +19,7 @@ import {HazelcastCloudDiscovery} from './HazelcastCloudDiscovery'; import {AddressProvider} from '../connection/AddressProvider'; import * as Promise from 'bluebird'; import {ILogger} from '../logging/ILogger'; -import {AddressImpl} from '../Address'; +import {AddressImpl} from '../core/Address'; /** @internal */ export class HazelcastCloudAddressProvider implements AddressProvider { diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index d3e49f627..5c77554a8 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -15,13 +15,13 @@ */ /** @ignore *//** */ -import {AddressHelper, DeferredPromise} from '../Util'; +import {AddressHelper, DeferredPromise} from '../util/Util'; import {get} from 'https'; import {IncomingMessage} from 'http'; import * as Promise from 'bluebird'; import {Properties} from '../config/Properties'; import * as URL from 'url'; -import {AddressImpl} from '../Address'; +import {AddressImpl} from '../core/Address'; /** * Discovery service that discover nodes via hazelcast.cloud diff --git a/src/index.ts b/src/index.ts index bd8c2b7c0..9651e9abe 100644 --- a/src/index.ts +++ b/src/index.ts @@ -13,53 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ -import {Address} from './Address'; -import TopicOverloadPolicy = require('./proxy/topic/TopicOverloadPolicy'); -import * as Aggregators from './aggregation/Aggregators'; -import {ClientInfo} from './ClientInfo'; -import * as Config from './config/Config'; -import * as Predicates from './core/Predicate'; -import HazelcastClient from './HazelcastClient'; -import * as HazelcastErrors from './HazelcastError'; -import {IMap} from './proxy/IMap'; -import {ReadResultSet} from './proxy/ringbuffer/ReadResultSet'; -import {EvictionPolicy} from './config/EvictionPolicy'; -import {InMemoryFormat} from './config/InMemoryFormat'; -import {ItemEvent} from './core/ItemListener'; -import {MapEvent} from './core/MapListener'; -import {EntryEvent} from './core/EntryListener'; -import {LogLevel} from './logging/ILogger'; -import {JsonStringDeserializationPolicy} from './config/JsonStringDeserializationPolicy'; -import {HazelcastJsonValue} from './core/HazelcastJsonValue'; -import {LoadBalancer} from './LoadBalancer'; -import {AbstractLoadBalancer} from './util/AbstractLoadBalancer'; -import {FieldType} from './serialization/portable/ClassDefinition'; -import {SSLOptionsFactory} from './connection/SSLOptionsFactory'; -import {BasicSSLOptionsFactory} from './connection/BasicSSLOptionsFactory'; +/** + * Public API re-exports. + */ -export { - HazelcastClient as Client, - Config, - ClientInfo, - IMap, - Address, - Predicates, - TopicOverloadPolicy, - HazelcastErrors, - ReadResultSet, - Aggregators, - EvictionPolicy, - InMemoryFormat, - ItemEvent, - MapEvent, - EntryEvent, - LogLevel, - JsonStringDeserializationPolicy, - HazelcastJsonValue, - LoadBalancer, - AbstractLoadBalancer, - FieldType, - SSLOptionsFactory, - BasicSSLOptionsFactory, -}; +export * from './aggregation'; +export * from './config'; +export * from './connection'; +export * from './core'; +export * from './logging'; +export * from './proxy'; +export * from './serialization'; +export {HazelcastClient as Client} from './HazelcastClient'; +export * from './LifecycleService'; +export * from './PartitionService'; diff --git a/src/invocation/ClientEventRegistration.ts b/src/invocation/ClientEventRegistration.ts index 9607ab95d..c2bc91bc9 100644 --- a/src/invocation/ClientEventRegistration.ts +++ b/src/invocation/ClientEventRegistration.ts @@ -15,7 +15,7 @@ */ /** @ignore *//** */ -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {ClientConnection} from '../network/ClientConnection'; import {UUID} from '../core/UUID'; diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index 720390d51..ab93bed99 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -15,24 +15,28 @@ */ /** @ignore *//** */ -import {ClientConnection} from '../network/ClientConnection'; import * as Promise from 'bluebird'; -import {MemberImpl} from '../core/Member'; -import {ClientInfo} from '../ClientInfo'; -import HazelcastClient from '../HazelcastClient'; -import {IllegalStateError, TargetDisconnectedError} from '../HazelcastError'; +import {ClientConnection} from '../network/ClientConnection'; +import {HazelcastClient} from '../HazelcastClient'; import {MemberSelector} from '../core/MemberSelector'; -import {assertNotNull, DeferredPromise} from '../Util'; -import {MembershipListener} from '../core/MembershipListener'; -import {MembershipEvent, MemberEvent} from '../core/MembershipEvent'; +import {assertNotNull, DeferredPromise} from '../util/Util'; import {UuidUtil} from '../util/UuidUtil'; import {ILogger} from '../logging/ILogger'; -import {UUID} from '../core/UUID'; import {ClientConnectionManager} from '../network/ClientConnectionManager'; -import {InitialMembershipListener} from '../core/InitialMembershipListener'; -import {InitialMembershipEvent} from '../core/InitialMembershipEvent'; +import { + Cluster, + MemberImpl, + ClientInfo, + UUID, + MembershipListener, + MembershipEvent, + MemberEvent, + InitialMembershipListener, + InitialMembershipEvent, + IllegalStateError, + TargetDisconnectedError +} from '../core'; import {MemberInfo} from '../core/MemberInfo'; -import {Cluster} from '../core/Cluster'; class MemberListSnapshot { version: number; @@ -76,18 +80,12 @@ export class ClusterService implements Cluster { * @param uuid The UUID of the member. * @return The member that was found, or undefined if not found. */ - public getMember(uuid: UUID): MemberImpl { + getMember(uuid: UUID): MemberImpl { assertNotNull(uuid); return this.memberListSnapshot.members.get(uuid.toString()); } - /** - * Returns an array of the members that satisfy the given {@link MemberSelector}. - * - * @param selector {@link MemberSelector} instance to filter members to return - * @return members that satisfy the given selector. - */ - public getMembers(selector?: MemberSelector): MemberImpl[] { + getMembers(selector?: MemberSelector): MemberImpl[] { const members = this.getMemberList(); if (selector == null) { return members; @@ -107,14 +105,14 @@ export class ClusterService implements Cluster { * * @return The current number of members. */ - public getSize(): number { + getSize(): number { return this.memberListSnapshot.members.size; } /** * @return The {@link ClientInfo} instance representing the local client. */ - public getLocalClient(): ClientInfo { + getLocalClient(): ClientInfo { const connectionManager = this.client.getConnectionManager(); const connection: ClientConnection = connectionManager.getRandomConnection(); const localAddress = connection != null ? connection.getLocalAddress() : null; @@ -126,15 +124,11 @@ export class ClusterService implements Cluster { return info; } - /** - * @param listener The listener to be registered. - * @return The registration ID - */ - public addMembershipListener(listener: MembershipListener): UUID { + addMembershipListener(listener: MembershipListener): string { assertNotNull(listener); - const registrationId = UuidUtil.generate(); - this.listeners.set(registrationId.toString(), listener); + const registrationId = UuidUtil.generate().toString(); + this.listeners.set(registrationId, listener); if (this.isInitialMembershipListener(listener)) { const members = this.getMemberList(); @@ -148,22 +142,18 @@ export class ClusterService implements Cluster { return registrationId; } - /** - * @param registrationId The registrationId of the listener to be removed. - * @return true if successfully removed, false otherwise. - */ - public removeMembershipListener(registrationId: UUID): boolean { - assertNotNull(registrationId); - return this.listeners.delete(registrationId.toString()); + removeMembershipListener(listenerId: string): boolean { + assertNotNull(listenerId); + return this.listeners.delete(listenerId); } - public start(configuredListeners: MembershipListener[]): void { + start(configuredListeners: MembershipListener[]): void { for (const listener of configuredListeners) { this.addMembershipListener(listener); } } - public waitInitialMemberListFetched(): Promise { + waitInitialMemberListFetched(): Promise { return this.initialListFetched.promise .timeout(INITIAL_MEMBERS_TIMEOUT_IN_MILLIS) .catch((error) => { @@ -171,20 +161,20 @@ export class ClusterService implements Cluster { }); } - public clearMemberListVersion(): void { + clearMemberListVersion(): void { this.logger.trace('ClusterService', 'Resetting the member list version'); if (this.memberListSnapshot !== EMPTY_SNAPSHOT) { this.memberListSnapshot.version = 0; } } - public reset(): void { + reset(): void { this.logger.trace('ClusterService', 'Resetting the cluster snapshot'); this.initialListFetched = DeferredPromise(); this.memberListSnapshot = EMPTY_SNAPSHOT; } - public handleMembersViewEvent(memberListVersion: number, memberInfos: MemberInfo[]): void { + handleMembersViewEvent(memberListVersion: number, memberInfos: MemberInfo[]): void { if (this.memberListSnapshot === EMPTY_SNAPSHOT) { this.applyInitialState(memberListVersion, memberInfos); this.initialListFetched.resolve(); diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index f540de4ba..29dd5ead9 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import * as Promise from 'bluebird'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import { ClientNotActiveError, HazelcastInstanceNotActiveError, @@ -26,14 +26,14 @@ import { RetryableHazelcastError, TargetDisconnectedError, TargetNotMemberError, -} from '../HazelcastError'; + UUID +} from '../core'; import {ClientConnection} from '../network/ClientConnection'; -import {DeferredPromise} from '../Util'; +import {DeferredPromise} from '../util/Util'; import {ILogger} from '../logging/ILogger'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; import {EXCEPTION_MESSAGE_TYPE} from '../codec/builtin/ErrorsCodec'; import {ClientConnectionManager} from '../network/ClientConnectionManager'; -import {UUID} from '../core/UUID'; import {PartitionServiceImpl} from '../PartitionService'; const MAX_FAST_INVOCATION_COUNT = 5; diff --git a/src/invocation/RegistrationKey.ts b/src/invocation/RegistrationKey.ts index 3d92f1ec8..0a22ca4bd 100644 --- a/src/invocation/RegistrationKey.ts +++ b/src/invocation/RegistrationKey.ts @@ -15,8 +15,8 @@ */ /** @ignore *//** */ -import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {ClientMessage} from '../ClientMessage'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; +import {ClientMessage} from '../protocol/ClientMessage'; /** @internal */ export class RegistrationKey { diff --git a/src/listener/ClusterViewListenerService.ts b/src/listener/ClusterViewListenerService.ts index c3472c600..90f0de3c6 100644 --- a/src/listener/ClusterViewListenerService.ts +++ b/src/listener/ClusterViewListenerService.ts @@ -15,14 +15,14 @@ */ /** @ignore *//** */ -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import {ClientConnectionManager} from '../network/ClientConnectionManager'; import {PartitionServiceImpl} from '../PartitionService'; import {ClusterService} from '../invocation/ClusterService'; import {ILogger} from '../logging/ILogger'; import {ClientConnection} from '../network/ClientConnection'; import {ClientAddClusterViewListenerCodec} from '../codec/ClientAddClusterViewListenerCodec'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {Invocation} from '../invocation/InvocationService'; diff --git a/src/ListenerMessageCodec.ts b/src/listener/ListenerMessageCodec.ts similarity index 90% rename from src/ListenerMessageCodec.ts rename to src/listener/ListenerMessageCodec.ts index 6fc203df6..bb1e55e8a 100644 --- a/src/ListenerMessageCodec.ts +++ b/src/listener/ListenerMessageCodec.ts @@ -15,8 +15,8 @@ */ /** @ignore *//** */ -import {ClientMessage} from './ClientMessage'; -import {UUID} from './core/UUID'; +import {ClientMessage} from '../protocol/ClientMessage'; +import {UUID} from '../core/UUID'; /** @internal */ export interface ListenerMessageCodec { diff --git a/src/ListenerService.ts b/src/listener/ListenerService.ts similarity index 93% rename from src/ListenerService.ts rename to src/listener/ListenerService.ts index e631f497d..a60907680 100644 --- a/src/ListenerService.ts +++ b/src/listener/ListenerService.ts @@ -16,16 +16,16 @@ /** @ignore *//** */ import * as Promise from 'bluebird'; -import HazelcastClient from './HazelcastClient'; -import {HazelcastError} from './HazelcastError'; -import {ClientConnection} from './network/ClientConnection'; -import {ClientEventRegistration} from './invocation/ClientEventRegistration'; -import {Invocation} from './invocation/InvocationService'; -import {RegistrationKey} from './invocation/RegistrationKey'; +import {HazelcastClient} from '../HazelcastClient'; +import {HazelcastError} from '../core'; +import {ClientConnection} from '../network/ClientConnection'; +import {ClientEventRegistration} from '../invocation/ClientEventRegistration'; +import {Invocation} from '../invocation/InvocationService'; +import {RegistrationKey} from '../invocation/RegistrationKey'; import {ListenerMessageCodec} from './ListenerMessageCodec'; -import {DeferredPromise} from './Util'; -import {UuidUtil} from './util/UuidUtil'; -import {ILogger} from './logging/ILogger'; +import {DeferredPromise} from '../util/Util'; +import {UuidUtil} from '../util/UuidUtil'; +import {ILogger} from '../logging/ILogger'; /** @internal */ export class ListenerService { @@ -116,7 +116,7 @@ export class ListenerService { return deferred.promise; } - registerListener(codec: ListenerMessageCodec, listenerHandlerFunc: Function): Promise { + registerListener(codec: ListenerMessageCodec, listenerHandlerFn: Function): Promise { const activeConnections = this.client.getConnectionManager().getActiveConnections(); const userRegistrationKey: string = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; @@ -127,7 +127,7 @@ export class ListenerService { connectionsOnUserKey = new Map(); this.activeRegistrations.set(userRegistrationKey, connectionsOnUserKey); this.userRegistrationKeyInformation.set(userRegistrationKey, - new RegistrationKey(userRegistrationKey, codec, registerRequest, listenerHandlerFunc)); + new RegistrationKey(userRegistrationKey, codec, registerRequest, listenerHandlerFn)); } for (const connection of activeConnections) { if (connectionsOnUserKey.has(connection)) { @@ -136,7 +136,7 @@ export class ListenerService { // New correlation id will be set on the invoke call const requestCopy = registerRequest.copyWithNewCorrelationId(); const invocation = new Invocation(this.client, requestCopy); - invocation.handler = listenerHandlerFunc as any; + invocation.handler = listenerHandlerFn as any; invocation.connection = connection; this.client.getInvocationService().invokeUrgent(invocation).then((responseMessage) => { const correlationId = responseMessage.getCorrelationId(); diff --git a/src/logging/LoggingService.ts b/src/logging/LoggingService.ts index 4cfb63f7c..ce95ec681 100644 --- a/src/logging/LoggingService.ts +++ b/src/logging/LoggingService.ts @@ -18,7 +18,7 @@ import {Property} from '../config/Properties'; import {DefaultLogger} from './DefaultLogger'; import {ILogger, LogLevel} from './ILogger'; -import {enumFromString} from '../Util'; +import {enumFromString} from '../util/Util'; /** @internal */ export class LoggingService { diff --git a/src/core/InitialMembershipEvent.ts b/src/logging/index.ts similarity index 64% rename from src/core/InitialMembershipEvent.ts rename to src/logging/index.ts index 9e070c398..6cbc0a9a4 100644 --- a/src/core/InitialMembershipEvent.ts +++ b/src/logging/index.ts @@ -13,21 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -import {Member} from './Member'; +/** @ignore *//** */ /** - * An event that is sent when a {@link InitialMembershipListener} registers itself on a cluster. - * - * @see MembershipListener - * @see MembershipEvent + * Public API re-exports. */ -export class InitialMembershipEvent { - - members: Member[]; - /** @internal */ - constructor(members: Member[]) { - this.members = members; - } -} +export * from './ILogger'; diff --git a/src/DataStoreHashMap.ts b/src/nearcache/DataStoreHashMap.ts similarity index 98% rename from src/DataStoreHashMap.ts rename to src/nearcache/DataStoreHashMap.ts index 2441f110c..b3bc15e9b 100644 --- a/src/DataStoreHashMap.ts +++ b/src/nearcache/DataStoreHashMap.ts @@ -15,7 +15,7 @@ */ /** @ignore *//** */ -import {Data} from './serialization/Data'; +import {Data} from '../serialization/Data'; /** @internal */ export class DataKeyedHashMap { diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index 35a21a4bd..de22eb2e9 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -17,13 +17,13 @@ import * as Promise from 'bluebird'; import {MapFetchNearCacheInvalidationMetadataCodec} from '../codec/MapFetchNearCacheInvalidationMetadataCodec'; -import * as MemberSelectors from '../core/MemberSelectors'; +import {dataMemberSelector} from '../core/MemberSelector'; import {UUID} from '../core/UUID'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import {Invocation} from '../invocation/InvocationService'; import {RepairingHandler} from './RepairingHandler'; import {ILogger} from '../logging/ILogger'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; /** @internal */ export class MetadataFetcher { @@ -83,7 +83,7 @@ export class MetadataFetcher { } protected scanMembers(objectNames: string[]): Array> { - const members = this.client.getClusterService().getMembers(MemberSelectors.dataMemberSelector); + const members = this.client.getClusterService().getMembers(dataMemberSelector); const promises: Array> = []; members.forEach((member) => { const request = MapFetchNearCacheInvalidationMetadataCodec.encodeRequest(objectNames, member.uuid); diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index a9334300a..17ebe8a2f 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -19,10 +19,10 @@ import * as Long from 'long'; import {EvictionPolicy} from '../config/EvictionPolicy'; import {InMemoryFormat} from '../config/InMemoryFormat'; import {NearCacheConfigImpl} from '../config/NearCacheConfig'; -import {DataKeyedHashMap} from '../DataStoreHashMap'; import {Data} from '../serialization/Data'; import {SerializationService} from '../serialization/SerializationService'; -import {DeferredPromise, shuffleArray} from '../Util'; +import {DeferredPromise, shuffleArray} from '../util/Util'; +import {DataKeyedHashMap} from './DataStoreHashMap'; import {DataRecord} from './DataRecord'; import {StaleReadDetector, alwaysFreshDetector} from './StaleReadDetector'; import * as Promise from 'bluebird'; diff --git a/src/nearcache/NearCacheManager.ts b/src/nearcache/NearCacheManager.ts index fd5171cb5..f875c3185 100644 --- a/src/nearcache/NearCacheManager.ts +++ b/src/nearcache/NearCacheManager.ts @@ -18,7 +18,7 @@ import {NearCache, NearCacheImpl} from './NearCache'; import {SerializationService} from '../serialization/SerializationService'; import {ClientConfigImpl} from '../config/Config'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; /** @internal */ export class NearCacheManager { diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index 4a565256f..6e47f262f 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import * as Long from 'long'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import {MetadataFetcher} from './MetadataFetcher'; import {NearCache} from './NearCache'; import {RepairingHandler} from './RepairingHandler'; diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index 460a531a4..f72989e2a 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -18,15 +18,17 @@ import * as Promise from 'bluebird'; import * as net from 'net'; import {EventEmitter} from 'events'; -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {BuildInfo} from '../BuildInfo'; -import HazelcastClient from '../HazelcastClient'; -import {IOError} from '../HazelcastError'; -import {DeferredPromise} from '../Util'; -import {AddressImpl} from '../Address'; -import {UUID} from '../core/UUID'; +import {HazelcastClient} from '../HazelcastClient'; +import {AddressImpl, IOError, UUID} from '../core'; +import {DeferredPromise} from '../util/Util'; import {ILogger} from '../logging/ILogger'; -import {ClientMessage, Frame, SIZE_OF_FRAME_LENGTH_AND_FLAGS} from '../ClientMessage'; +import { + ClientMessage, + Frame, + SIZE_OF_FRAME_LENGTH_AND_FLAGS +} from '../protocol/ClientMessage'; const FROZEN_ARRAY = Object.freeze([]) as OutputQueueItem[]; const PROPERTY_PIPELINING_ENABLED = 'hazelcast.client.autopipelining.enabled'; diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index bdab32f02..9105cf9a5 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -17,7 +17,7 @@ import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import { AuthenticationError, ClientNotActiveError, @@ -27,7 +27,11 @@ import { IllegalStateError, InvalidConfigurationError, IOError, -} from '../HazelcastError'; + UUID, + LoadBalancer, + AddressImpl, + MemberImpl +} from '../core'; import {ClientConnection} from './ClientConnection'; import * as net from 'net'; import * as tls from 'tls'; @@ -38,25 +42,24 @@ import { scheduleWithRepetition, shuffleArray, Task, -} from '../Util'; +} from '../util/Util'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {ILogger} from '../logging/ILogger'; -import {AddressImpl} from '../Address'; -import {HeartbeatManager} from '../HeartbeatManager'; +import {HeartbeatManager} from './HeartbeatManager'; import {UuidUtil} from '../util/UuidUtil'; import {WaitStrategy} from './WaitStrategy'; import {ReconnectMode} from '../config/ConnectionStrategyConfig'; -import {LoadBalancer} from '../LoadBalancer'; -import {UUID} from '../core/UUID'; import {ClientConfigImpl} from '../config/Config'; import {LifecycleState, LifecycleServiceImpl} from '../LifecycleService'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; import {BuildInfo} from '../BuildInfo'; import {ClientAuthenticationCustomCodec} from '../codec/ClientAuthenticationCustomCodec'; -import {ClientAuthenticationCodec, ClientAuthenticationResponseParams} from '../codec/ClientAuthenticationCodec'; +import { + ClientAuthenticationCodec, + ClientAuthenticationResponseParams +} from '../codec/ClientAuthenticationCodec'; import {AuthenticationStatus} from '../protocol/AuthenticationStatus'; import {Invocation} from '../invocation/InvocationService'; -import {MemberImpl} from '../core/Member'; import {PartitionServiceImpl} from '../PartitionService'; const CONNECTION_REMOVED_EVENT_NAME = 'connectionRemoved'; diff --git a/src/HeartbeatManager.ts b/src/network/HeartbeatManager.ts similarity index 86% rename from src/HeartbeatManager.ts rename to src/network/HeartbeatManager.ts index 9f5ef96d3..40769a40c 100644 --- a/src/HeartbeatManager.ts +++ b/src/network/HeartbeatManager.ts @@ -15,14 +15,14 @@ */ /** @ignore *//** */ -import {ClientPingCodec} from './codec/ClientPingCodec'; -import HazelcastClient from './HazelcastClient'; -import {ClientConnection} from './network/ClientConnection'; -import {ILogger} from './logging/ILogger'; -import {ClientConnectionManager} from './network/ClientConnectionManager'; -import {cancelRepetitionTask, scheduleWithRepetition, Task} from './Util'; -import {TargetDisconnectedError} from './HazelcastError'; -import {Invocation} from './invocation/InvocationService'; +import {ClientPingCodec} from '../codec/ClientPingCodec'; +import {HazelcastClient} from '../HazelcastClient'; +import {ClientConnection} from './ClientConnection'; +import {ILogger} from '../logging/ILogger'; +import {ClientConnectionManager} from './ClientConnectionManager'; +import {cancelRepetitionTask, scheduleWithRepetition, Task} from '../util/Util'; +import {TargetDisconnectedError} from '../core'; +import {Invocation} from '../invocation/InvocationService'; const PROPERTY_HEARTBEAT_INTERVAL = 'hazelcast.client.heartbeat.interval'; const PROPERTY_HEARTBEAT_TIMEOUT = 'hazelcast.client.heartbeat.timeout'; @@ -32,6 +32,7 @@ const PROPERTY_HEARTBEAT_TIMEOUT = 'hazelcast.client.heartbeat.timeout'; * @internal */ export class HeartbeatManager { + private client: HazelcastClient; private connectionManager: ClientConnectionManager; private readonly heartbeatTimeout: number; @@ -51,7 +52,8 @@ export class HeartbeatManager { * Starts sending periodic heartbeat operations. */ public start(): void { - this.timer = scheduleWithRepetition(this.heartbeatFunction.bind(this), this.heartbeatInterval, this.heartbeatInterval); + this.timer = scheduleWithRepetition( + this.heartbeatFunction.bind(this), this.heartbeatInterval, this.heartbeatInterval); } /** diff --git a/src/ClientMessage.ts b/src/protocol/ClientMessage.ts similarity index 97% rename from src/ClientMessage.ts rename to src/protocol/ClientMessage.ts index dbcf8c12c..1440ab7f8 100644 --- a/src/ClientMessage.ts +++ b/src/protocol/ClientMessage.ts @@ -15,9 +15,9 @@ */ /** @ignore *//** */ -import {BitsUtil} from './BitsUtil'; -import {ClientConnection} from './network/ClientConnection'; -import {FixSizedTypesCodec} from './codec/builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../util/BitsUtil'; +import {ClientConnection} from '../network/ClientConnection'; +import {FixSizedTypesCodec} from '../codec/builtin/FixSizedTypesCodec'; const MESSAGE_TYPE_OFFSET = 0; const CORRELATION_ID_OFFSET = MESSAGE_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index b23df4000..d1e862c68 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -50,9 +50,9 @@ import { UnsupportedOperationError, HazelcastSerializationError, ReachedMaxSizeError, -} from '../HazelcastError'; +} from '../core'; import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; import {ErrorsCodec} from '../codec/builtin/ErrorsCodec'; import {ErrorHolder} from './ErrorHolder'; diff --git a/src/protocol/ErrorHolder.ts b/src/protocol/ErrorHolder.ts index a212f6fd4..79c364d14 100644 --- a/src/protocol/ErrorHolder.ts +++ b/src/protocol/ErrorHolder.ts @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {StackTraceElement} from './StackTraceElement'; +/** @internal */ export class ErrorHolder { errorCode: number; diff --git a/src/protocol/StackTraceElement.ts b/src/protocol/StackTraceElement.ts index 287142fdd..27c2fc486 100644 --- a/src/protocol/StackTraceElement.ts +++ b/src/protocol/StackTraceElement.ts @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ +/** @internal */ export class StackTraceElement { className: string; methodName: string; diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 8ea5de58b..bd5081eec 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -17,9 +17,9 @@ import * as Promise from 'bluebird'; import {BuildInfo} from '../BuildInfo'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import {Data} from '../serialization/Data'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; /** diff --git a/src/core/EntryListener.ts b/src/proxy/EntryListener.ts similarity index 98% rename from src/core/EntryListener.ts rename to src/proxy/EntryListener.ts index 175d8b7b6..4c30d5007 100644 --- a/src/core/EntryListener.ts +++ b/src/proxy/EntryListener.ts @@ -15,7 +15,7 @@ */ import {MapEventListener} from './MapListener'; -import {Member} from './Member'; +import {Member} from '../core'; /** * An interface which is used to get notified upon a map or an entry event. diff --git a/src/core/EventType.ts b/src/proxy/EventType.ts similarity index 100% rename from src/core/EventType.ts rename to src/proxy/EventType.ts diff --git a/src/proxy/FlakeIdGenerator.ts b/src/proxy/FlakeIdGenerator.ts index 2f39cf699..67fa9e19d 100644 --- a/src/proxy/FlakeIdGenerator.ts +++ b/src/proxy/FlakeIdGenerator.ts @@ -38,7 +38,7 @@ */ import * as Promise from 'bluebird'; import * as Long from 'long'; -import {DistributedObject} from '../DistributedObject'; +import {DistributedObject} from '../core/DistributedObject'; export interface FlakeIdGenerator extends DistributedObject { diff --git a/src/proxy/IList.ts b/src/proxy/IList.ts index daa59e14c..2794a65df 100644 --- a/src/proxy/IList.ts +++ b/src/proxy/IList.ts @@ -15,9 +15,9 @@ */ import * as Promise from 'bluebird'; -import {ItemListener} from '../core/ItemListener'; +import {ItemListener} from './ItemListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {DistributedObject} from '../DistributedObject'; +import {DistributedObject} from '../core/DistributedObject'; export interface IList extends DistributedObject { diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index 746bfce16..2750c61a9 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -17,11 +17,14 @@ import * as Promise from 'bluebird'; import {Aggregator} from '../aggregation/Aggregator'; import {SimpleEntryView} from '../core/SimpleEntryView'; -import {MapListener} from '../core/MapListener'; -import {Predicate} from '../core/Predicate'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {DistributedObject} from '../DistributedObject'; -import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; +import {MapListener} from './MapListener'; +import { + Predicate, + ReadOnlyLazyList, + DistributedObject +} from '../core'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; +import {Portable} from '../serialization/Portable'; import {IndexConfig} from '../config/IndexConfig'; export interface IMap extends DistributedObject { diff --git a/src/proxy/IQueue.ts b/src/proxy/IQueue.ts index 207adae83..fdae714fd 100644 --- a/src/proxy/IQueue.ts +++ b/src/proxy/IQueue.ts @@ -15,8 +15,8 @@ */ import * as Promise from 'bluebird'; -import {ItemListener} from '../core/ItemListener'; -import {DistributedObject} from '../DistributedObject'; +import {ItemListener} from './ItemListener'; +import {DistributedObject} from '../core'; export interface IQueue extends DistributedObject { /** diff --git a/src/proxy/ISet.ts b/src/proxy/ISet.ts index ad62e2aff..cddc3e5e1 100644 --- a/src/proxy/ISet.ts +++ b/src/proxy/ISet.ts @@ -15,8 +15,8 @@ */ import * as Promise from 'bluebird'; -import {ItemListener} from '../core/ItemListener'; -import {DistributedObject} from '../DistributedObject'; +import {ItemListener} from './ItemListener'; +import {DistributedObject} from '../core'; export interface ISet extends DistributedObject { /** diff --git a/src/proxy/ITopic.ts b/src/proxy/ITopic.ts new file mode 100644 index 000000000..7497cccd1 --- /dev/null +++ b/src/proxy/ITopic.ts @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Promise from 'bluebird'; +import {DistributedObject} from '../core'; +import {MessageListener} from './MessageListener'; + +export interface ITopic extends DistributedObject { + + /** + * Subscribes to this topic. When a message is published, the + * the given MessageListener is called. + * + * More than one message listener can be added on one instance. + * + * @param listener the MessageListener to add + * @return registration ID + */ + addMessageListener(listener: MessageListener): string; + + /** + * Stops receiving messages for the given message listener. + * + * If the given listener already removed, this method does nothing. + * + * @param listenerId listener registration ID + * @return `true` if registration is removed, `false` otherwise + */ + removeMessageListener(listenerId: string): boolean; + + /** + * Publishes the message to all subscribers of this topic. + * + * @param message the message to publish to all subscribers of this topic + */ + publish(message: E): Promise; + +} diff --git a/src/core/ItemListener.ts b/src/proxy/ItemListener.ts similarity index 98% rename from src/core/ItemListener.ts rename to src/proxy/ItemListener.ts index d23896e92..552383876 100644 --- a/src/core/ItemListener.ts +++ b/src/proxy/ItemListener.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {Member} from './Member'; +import {Member} from '../core'; /** * Item event listener for IQueue, ISet, IList. diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index ce3720c83..b9d85c1fe 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -37,14 +37,16 @@ import {ListRemoveWithIndexCodec} from '../codec/ListRemoveWithIndexCodec'; import {ListSetCodec} from '../codec/ListSetCodec'; import {ListSizeCodec} from '../codec/ListSizeCodec'; import {ListSubCodec} from '../codec/ListSubCodec'; -import {ItemEvent, ItemEventType, ItemListener} from '../core/ItemListener'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ItemEvent, ItemEventType, ItemListener} from './ItemListener'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {IList} from './IList'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {ClientMessage} from '../ClientMessage'; -import {UUID} from '../core/UUID'; +import {ClientMessage} from '../protocol/ClientMessage'; +import { + ReadOnlyLazyList, + UUID +} from '../core'; /** @internal */ export class ListProxy extends PartitionSpecificProxy implements IList { diff --git a/src/LockReferenceIdGenerator.ts b/src/proxy/LockReferenceIdGenerator.ts similarity index 100% rename from src/LockReferenceIdGenerator.ts rename to src/proxy/LockReferenceIdGenerator.ts diff --git a/src/core/MapListener.ts b/src/proxy/MapListener.ts similarity index 97% rename from src/core/MapListener.ts rename to src/proxy/MapListener.ts index 72abc865f..3caf6f9bf 100644 --- a/src/core/MapListener.ts +++ b/src/proxy/MapListener.ts @@ -15,7 +15,7 @@ */ import {EntryListener} from './EntryListener'; -import {Member} from './Member'; +import {Member} from '../core'; /** * Map or entry level event listener. diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 46d6538af..1eed2c2b2 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -67,22 +67,23 @@ import {MapUnlockCodec} from '../codec/MapUnlockCodec'; import {MapValuesCodec} from '../codec/MapValuesCodec'; import {MapValuesWithPagingPredicateCodec} from '../codec/MapValuesWithPagingPredicateCodec'; import {MapValuesWithPredicateCodec} from '../codec/MapValuesWithPredicateCodec'; -import {EventType} from '../core/EventType'; +import {EventType} from './EventType'; import {SimpleEntryView} from '../core/SimpleEntryView'; -import {MapEvent, MapListener} from '../core/MapListener'; +import {MapEvent, MapListener} from './MapListener'; import {IterationType, Predicate} from '../core/Predicate'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {PagingPredicateImpl} from '../serialization/DefaultPredicates'; -import {IdentifiedDataSerializable, Portable} from '../serialization/Serializable'; +import {IdentifiedDataSerializable} from '../serialization/Serializable'; +import {Portable} from '../serialization/Portable'; import * as SerializationUtil from '../serialization/SerializationUtil'; -import {assertArray, assertNotNull} from '../Util'; +import {assertArray, assertNotNull} from '../util/Util'; import {BaseProxy} from './BaseProxy'; import {IMap} from './IMap'; -import {EntryEvent} from '../core/EntryListener'; +import {EntryEvent} from './EntryListener'; import {UUID} from '../core/UUID'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; import {IndexConfig} from '../config/IndexConfig'; import {IndexUtil} from '../util/IndexUtil'; import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; diff --git a/src/proxy/topic/Message.ts b/src/proxy/MessageListener.ts similarity index 84% rename from src/proxy/topic/Message.ts rename to src/proxy/MessageListener.ts index 2dd2735e2..9f214e244 100644 --- a/src/proxy/topic/Message.ts +++ b/src/proxy/MessageListener.ts @@ -14,8 +14,13 @@ * limitations under the License. */ -import Long = require('long'); -import {Address} from '../../Address'; +import * as Long from 'long'; +import {Address} from '../core'; + +/** + * Message listener for Reliable Topic. + */ +export type MessageListener = (message: Message) => void; /** * Message of Reliable Topic. diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index 66abaa7e6..a55b95372 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -15,9 +15,11 @@ */ import * as Promise from 'bluebird'; -import {EntryListener} from '../core/EntryListener'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {DistributedObject} from '../DistributedObject'; +import {EntryListener} from './EntryListener'; +import { + DistributedObject, + ReadOnlyLazyList +} from '../core'; export interface MultiMap extends DistributedObject { diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 78545d92c..025129782 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -16,18 +16,15 @@ /** @ignore *//** */ import * as Promise from 'bluebird'; - import * as Long from 'long'; import {MultiMapForceUnlockCodec} from '../codec/MultiMapForceUnlockCodec'; import {MultiMapIsLockedCodec} from '../codec/MultiMapIsLockedCodec'; import {MultiMapLockCodec} from '../codec/MultiMapLockCodec'; import {MultiMapTryLockCodec} from '../codec/MultiMapTryLockCodec'; import {MultiMapUnlockCodec} from '../codec/MultiMapUnlockCodec'; -import {EventType} from '../core/EventType'; -import {EntryEvent, EntryListener} from '../core/EntryListener'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {LockReferenceIdGenerator} from '../LockReferenceIdGenerator'; +import {EventType} from './EventType'; +import {EntryEvent, EntryListener} from './EntryListener'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {MultiMapAddEntryListenerCodec} from '../codec/MultiMapAddEntryListenerCodec'; import {MultiMapAddEntryListenerToKeyCodec} from '../codec/MultiMapAddEntryListenerToKeyCodec'; @@ -47,16 +44,19 @@ import {MultiMapValueCountCodec} from '../codec/MultiMapValueCountCodec'; import {MultiMapValuesCodec} from '../codec/MultiMapValuesCodec'; import {BaseProxy} from './BaseProxy'; import {MultiMap} from './MultiMap'; -import {MapEvent} from '../core/MapListener'; -import {ClientMessage} from '../ClientMessage'; -import {UUID} from '../core/UUID'; +import {MapEvent} from './MapListener'; +import {ClientMessage} from '../protocol/ClientMessage'; +import { + ReadOnlyLazyList, + UUID +} from '../core'; import * as SerializationUtil from '../serialization/SerializationUtil'; import {MultiMapPutAllCodec} from '../codec/MultiMapPutAllCodec'; /** @internal */ export class MultiMapProxy extends BaseProxy implements MultiMap { - private lockReferenceIdGenerator: LockReferenceIdGenerator = this.client.getLockReferenceIdGenerator(); + private lockReferenceIdGenerator = this.client.getLockReferenceIdGenerator(); private deserializeList = (items: Data[]): X[] => { return items.map(this.toObject.bind(this)); }; diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index a00485274..7b0054eb4 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -18,16 +18,16 @@ import * as Promise from 'bluebird'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; -import {EventType} from '../core/EventType'; +import {EventType} from './EventType'; import {UUID} from '../core/UUID'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import {PartitionServiceImpl} from '../PartitionService'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {NearCache} from '../nearcache/NearCache'; import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetector'; import {Data} from '../serialization/Data'; import {MapProxy} from './MapProxy'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; import * as Long from 'long'; /** @internal */ diff --git a/src/core/OverflowPolicy.ts b/src/proxy/OverflowPolicy.ts similarity index 100% rename from src/core/OverflowPolicy.ts rename to src/proxy/OverflowPolicy.ts diff --git a/src/proxy/PNCounter.ts b/src/proxy/PNCounter.ts index f26f64de5..9bafec80a 100644 --- a/src/proxy/PNCounter.ts +++ b/src/proxy/PNCounter.ts @@ -16,7 +16,7 @@ import * as Promise from 'bluebird'; import * as Long from 'long'; -import {DistributedObject} from '../DistributedObject'; +import {DistributedObject} from '../core/DistributedObject'; /** * PN (Positive-Negative) CRDT counter. diff --git a/src/proxy/PNCounterProxy.ts b/src/proxy/PNCounterProxy.ts index 32132746a..c4867e590 100644 --- a/src/proxy/PNCounterProxy.ts +++ b/src/proxy/PNCounterProxy.ts @@ -20,10 +20,10 @@ import * as Long from 'long'; import {PNCounterAddCodec} from '../codec/PNCounterAddCodec'; import {PNCounterGetCodec} from '../codec/PNCounterGetCodec'; import {PNCounterGetConfiguredReplicaCountCodec} from '../codec/PNCounterGetConfiguredReplicaCountCodec'; -import * as MemberSelectors from '../core/MemberSelectors'; -import {VectorClock} from '../core/VectorClock'; -import {NoDataMemberInClusterError} from '../HazelcastError'; -import {randomInt} from '../Util'; +import {dataMemberSelector} from '../core/MemberSelector'; +import {VectorClock} from './VectorClock'; +import {NoDataMemberInClusterError} from '../core'; +import {randomInt} from '../util/Util'; import {BaseProxy} from './BaseProxy'; import {PNCounter} from './PNCounter'; import {MemberImpl} from '../core/Member'; @@ -135,7 +135,7 @@ export class PNCounterProxy extends BaseProxy implements PNCounter { } private getReplicaAddresses(excludedAddresses: MemberImpl[]): Promise { - const dataMembers = this.client.getClusterService().getMembers(MemberSelectors.dataMemberSelector); + const dataMembers = this.client.getClusterService().getMembers(dataMemberSelector); return this.getMaxConfiguredReplicaCount().then((replicaCount: number) => { const currentCount = Math.min(replicaCount, dataMembers.length); const replicaAddresses: MemberImpl[] = []; diff --git a/src/proxy/PartitionSpecificProxy.ts b/src/proxy/PartitionSpecificProxy.ts index 1a4d1c622..443ca7014 100644 --- a/src/proxy/PartitionSpecificProxy.ts +++ b/src/proxy/PartitionSpecificProxy.ts @@ -16,9 +16,9 @@ /** @ignore *//** */ import * as Promise from 'bluebird'; -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import {BaseProxy} from './BaseProxy'; -import {ClientMessage} from '../ClientMessage'; +import {ClientMessage} from '../protocol/ClientMessage'; /** @internal */ export class PartitionSpecificProxy extends BaseProxy { diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 67d42a35d..b4d1aec3b 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -20,11 +20,11 @@ import {ClientAddDistributedObjectListenerCodec} from '../codec/ClientAddDistrib import {ClientCreateProxyCodec} from '../codec/ClientCreateProxyCodec'; import {ClientDestroyProxyCodec} from '../codec/ClientDestroyProxyCodec'; import {ClientRemoveDistributedObjectListenerCodec} from '../codec/ClientRemoveDistributedObjectListenerCodec'; -import {DistributedObject} from '../DistributedObject'; -import HazelcastClient from '../HazelcastClient'; +import {DistributedObject} from '../core/DistributedObject'; +import {HazelcastClient} from '../HazelcastClient'; import {Invocation} from '../invocation/InvocationService'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; -import {FlakeIdGeneratorProxy} from './FlakeIdGeneratorProxy'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; +import {FlakeIdGeneratorProxy} from './flakeid/FlakeIdGeneratorProxy'; import {ListProxy} from './ListProxy'; import {MapProxy} from './MapProxy'; import {MultiMapProxy} from './MultiMapProxy'; @@ -36,8 +36,8 @@ import {RingbufferProxy} from './ringbuffer/RingbufferProxy'; import {SetProxy} from './SetProxy'; import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; import {DistributedObjectEvent, DistributedObjectListener} from '../core/DistributedObjectListener'; -import {DeferredPromise} from '../Util'; -import {ClientMessage} from '../ClientMessage'; +import {DeferredPromise} from '../util/Util'; +import {ClientMessage} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {ClientCreateProxiesCodec} from '../codec/ClientCreateProxiesCodec'; import {BaseProxy} from './BaseProxy'; diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index 87eb085b4..a30ff25c7 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -36,14 +36,13 @@ import {QueueRemoveCodec} from '../codec/QueueRemoveCodec'; import {QueueRemoveListenerCodec} from '../codec/QueueRemoveListenerCodec'; import {QueueSizeCodec} from '../codec/QueueSizeCodec'; import {QueueTakeCodec} from '../codec/QueueTakeCodec'; -import {ItemEvent, ItemEventType, ItemListener} from '../core/ItemListener'; -import {IllegalStateError} from '../HazelcastError'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ItemEvent, ItemEventType, ItemListener} from './ItemListener'; +import {IllegalStateError, UUID} from '../core'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {IQueue} from './IQueue'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {ClientMessage} from '../ClientMessage'; -import {UUID} from '../core/UUID'; +import {ClientMessage} from '../protocol/ClientMessage'; /** @internal */ export class QueueProxy extends PartitionSpecificProxy implements IQueue { diff --git a/src/proxy/ReplicatedMap.ts b/src/proxy/ReplicatedMap.ts index 6405c2d8a..93e261361 100644 --- a/src/proxy/ReplicatedMap.ts +++ b/src/proxy/ReplicatedMap.ts @@ -14,13 +14,15 @@ * limitations under the License. */ +import * as Long from 'long'; import * as Promise from 'bluebird'; -import {EntryListener} from '../core/EntryListener'; -import {Predicate} from '../core/Predicate'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {DistributedObject} from '../DistributedObject'; -import {ListComparator} from '../core/Comparator'; -import Long = require('long'); +import {EntryListener} from './EntryListener'; +import { + DistributedObject, + ListComparator, + Predicate, + ReadOnlyLazyList +} from '../core'; export interface ReplicatedMap extends DistributedObject { /** diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index 3f70c82b4..ba552bf91 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -15,6 +15,13 @@ */ import * as Promise from 'bluebird'; +import * as Long from 'long'; +import { + Predicate, + ReadOnlyLazyList, + ListComparator, + UUID +} from '../core'; import {ReplicatedMapAddEntryListenerCodec} from '../codec/ReplicatedMapAddEntryListenerCodec'; import {ReplicatedMapAddEntryListenerToKeyCodec} from '../codec/ReplicatedMapAddEntryListenerToKeyCodec'; // eslint-disable-next-line max-len @@ -33,21 +40,16 @@ import {ReplicatedMapRemoveCodec} from '../codec/ReplicatedMapRemoveCodec'; import {ReplicatedMapRemoveEntryListenerCodec} from '../codec/ReplicatedMapRemoveEntryListenerCodec'; import {ReplicatedMapSizeCodec} from '../codec/ReplicatedMapSizeCodec'; import {ReplicatedMapValuesCodec} from '../codec/ReplicatedMapValuesCodec'; -import {EventType} from '../core/EventType'; -import {EntryEvent, EntryListener} from '../core/EntryListener'; -import {Predicate} from '../core/Predicate'; -import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {EventType} from './EventType'; +import {EntryEvent, EntryListener} from './EntryListener'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {Data} from '../serialization/Data'; -import {assertNotNull} from '../Util'; -import {ListComparator} from '../core/Comparator'; +import {assertNotNull} from '../util/Util'; import {ReplicatedMap} from './ReplicatedMap'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {MapEvent} from '../core/MapListener'; -import Long = require('long'); -import {UUID} from '../core/UUID'; -import {ClientMessage} from '../ClientMessage'; -import * as SerializationUtil from '../serialization/SerializationUtil'; +import {MapEvent} from './MapListener'; +import {ClientMessage} from '../protocol/ClientMessage'; +import {deserializeEntryList} from '../serialization/SerializationUtil'; export class ReplicatedMapProxy extends PartitionSpecificProxy implements ReplicatedMap { @@ -171,7 +173,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements return this.encodeInvoke(ReplicatedMapEntrySetCodec) .then((clientMessage) => { const response = ReplicatedMapEntrySetCodec.decodeResponse(clientMessage); - return SerializationUtil.deserializeEntryList(this.toObject.bind(this), response.response); + return deserializeEntryList(this.toObject.bind(this), response.response); }); } diff --git a/src/proxy/Ringbuffer.ts b/src/proxy/Ringbuffer.ts index 63e5dbca9..dd5717928 100644 --- a/src/proxy/Ringbuffer.ts +++ b/src/proxy/Ringbuffer.ts @@ -16,9 +16,11 @@ import * as Promise from 'bluebird'; import * as Long from 'long'; -import {OverflowPolicy} from '../core/OverflowPolicy'; -import {DistributedObject} from '../DistributedObject'; -import {ReadResultSet} from './ringbuffer/ReadResultSet'; +import { + DistributedObject, + ReadResultSet +} from '../core'; +import {OverflowPolicy} from './OverflowPolicy'; export interface Ringbuffer extends DistributedObject { diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index e29942ba1..0a35c6801 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -29,13 +29,13 @@ import {SetIsEmptyCodec} from '../codec/SetIsEmptyCodec'; import {SetRemoveCodec} from '../codec/SetRemoveCodec'; import {SetRemoveListenerCodec} from '../codec/SetRemoveListenerCodec'; import {SetSizeCodec} from '../codec/SetSizeCodec'; -import {ItemEvent, ItemEventType, ItemListener} from '../core/ItemListener'; -import {ListenerMessageCodec} from '../ListenerMessageCodec'; +import {ItemEvent, ItemEventType, ItemListener} from './ItemListener'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; import {Data} from '../serialization/Data'; import {ISet} from './ISet'; import {PartitionSpecificProxy} from './PartitionSpecificProxy'; -import {ClientMessage} from '../ClientMessage'; -import {UUID} from '../core/UUID'; +import {ClientMessage} from '../protocol/ClientMessage'; +import {UUID} from '../core'; /** @internal */ export class SetProxy extends PartitionSpecificProxy implements ISet { diff --git a/src/proxy/topic/TopicOverloadPolicy.ts b/src/proxy/TopicOverloadPolicy.ts similarity index 100% rename from src/proxy/topic/TopicOverloadPolicy.ts rename to src/proxy/TopicOverloadPolicy.ts diff --git a/src/core/VectorClock.ts b/src/proxy/VectorClock.ts similarity index 100% rename from src/core/VectorClock.ts rename to src/proxy/VectorClock.ts diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index 30e4f8710..7ee234e43 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -18,7 +18,7 @@ import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import * as Long from 'long'; -import {DeferredPromise} from '../../Util'; +import {DeferredPromise} from '../../util/Util'; /** @internal */ export class Batch { diff --git a/src/proxy/FlakeIdGeneratorProxy.ts b/src/proxy/flakeid/FlakeIdGeneratorProxy.ts similarity index 79% rename from src/proxy/FlakeIdGeneratorProxy.ts rename to src/proxy/flakeid/FlakeIdGeneratorProxy.ts index 497e7f0e4..0defe3044 100644 --- a/src/proxy/FlakeIdGeneratorProxy.ts +++ b/src/proxy/flakeid/FlakeIdGeneratorProxy.ts @@ -17,13 +17,13 @@ import * as Promise from 'bluebird'; import * as Long from 'long'; -import {FlakeIdGeneratorNewIdBatchCodec} from '../codec/FlakeIdGeneratorNewIdBatchCodec'; -import {FlakeIdGeneratorConfigImpl} from '../config/FlakeIdGeneratorConfig'; -import HazelcastClient from '../HazelcastClient'; -import {BaseProxy} from './BaseProxy'; -import {AutoBatcher, Batch} from './flakeid/AutoBatcher'; -import {FlakeIdGenerator} from './FlakeIdGenerator'; -import {ClientConfigImpl} from '../config/Config'; +import {FlakeIdGeneratorNewIdBatchCodec} from '../../codec/FlakeIdGeneratorNewIdBatchCodec'; +import {FlakeIdGeneratorConfigImpl} from '../../config/FlakeIdGeneratorConfig'; +import {HazelcastClient} from '../../HazelcastClient'; +import {BaseProxy} from '../BaseProxy'; +import {AutoBatcher, Batch} from './AutoBatcher'; +import {FlakeIdGenerator} from '../FlakeIdGenerator'; +import {ClientConfigImpl} from '../../config/Config'; /** @internal */ export class FlakeIdGeneratorProxy extends BaseProxy implements FlakeIdGenerator { diff --git a/src/proxy/index.ts b/src/proxy/index.ts new file mode 100644 index 000000000..b0f028b41 --- /dev/null +++ b/src/proxy/index.ts @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +/** + * Public API re-exports. + */ + +export * from './EntryListener'; +export * from './FlakeIdGenerator'; +export * from './IList'; +export * from './IMap'; +export * from './IQueue'; +export * from './ISet'; +export * from './ItemListener'; +export * from './ITopic'; +export * from './MapListener'; +export * from './MultiMap'; +export * from './OverflowPolicy'; +export * from './PNCounter'; +export * from './ReplicatedMap'; +export * from './Ringbuffer'; +export * from './MessageListener'; +export * from './TopicOverloadPolicy'; diff --git a/src/proxy/ringbuffer/LazyReadResultSet.ts b/src/proxy/ringbuffer/LazyReadResultSet.ts index 78fefeb80..55789500d 100644 --- a/src/proxy/ringbuffer/LazyReadResultSet.ts +++ b/src/proxy/ringbuffer/LazyReadResultSet.ts @@ -18,7 +18,7 @@ import * as Long from 'long'; import {Data} from '../../serialization/Data'; import {SerializationService, SerializationServiceV1} from '../../serialization/SerializationService'; -import {ReadResultSet} from './ReadResultSet'; +import {ReadResultSet} from '../../core'; /** @internal */ export class LazyReadResultSet implements ReadResultSet { diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index 82708d469..2284cddad 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -15,6 +15,7 @@ */ /** @ignore *//** */ +import * as Long from 'long'; import * as Promise from 'bluebird'; import {RingbufferAddAllCodec} from '../../codec/RingbufferAddAllCodec'; import {RingbufferAddCodec} from '../../codec/RingbufferAddCodec'; @@ -25,12 +26,11 @@ import {RingbufferReadOneCodec} from '../../codec/RingbufferReadOneCodec'; import {RingbufferRemainingCapacityCodec} from '../../codec/RingbufferRemainingCapacityCodec'; import {RingbufferSizeCodec} from '../../codec/RingbufferSizeCodec'; import {RingbufferTailSequenceCodec} from '../../codec/RingbufferTailSequenceCodec'; -import {OverflowPolicy, overflowPolicyToId} from '../../core/OverflowPolicy'; +import {OverflowPolicy, overflowPolicyToId} from '../OverflowPolicy'; import {Ringbuffer} from '../Ringbuffer'; import {PartitionSpecificProxy} from '../PartitionSpecificProxy'; import {LazyReadResultSet} from './LazyReadResultSet'; -import {ReadResultSet} from './ReadResultSet'; -import Long = require('long'); +import {ReadResultSet} from '../../core'; /** @internal */ export class RingbufferProxy extends PartitionSpecificProxy implements Ringbuffer { diff --git a/src/proxy/topic/ReliableTopicListenerRunner.ts b/src/proxy/topic/ReliableTopicListenerRunner.ts index 84667c94a..1272522d9 100644 --- a/src/proxy/topic/ReliableTopicListenerRunner.ts +++ b/src/proxy/topic/ReliableTopicListenerRunner.ts @@ -20,13 +20,12 @@ import { InvocationTimeoutError, ClientNotActiveError, ClientOfflineError -} from '../../HazelcastError'; +} from '../../core'; import {SerializationService} from '../../serialization/SerializationService'; import {Ringbuffer} from '../Ringbuffer'; import {ReliableTopicMessage} from './ReliableTopicMessage'; import {ReliableTopicProxy} from './ReliableTopicProxy'; -import {Message} from './Message'; -import {MessageListener} from './MessageListener'; +import {Message, MessageListener} from '../MessageListener'; import {ILogger} from '../../logging/ILogger'; /** @internal */ diff --git a/src/proxy/topic/ReliableTopicMessage.ts b/src/proxy/topic/ReliableTopicMessage.ts index 3420ddc1f..4220f5dc1 100644 --- a/src/proxy/topic/ReliableTopicMessage.ts +++ b/src/proxy/topic/ReliableTopicMessage.ts @@ -18,7 +18,7 @@ import * as Long from 'long'; import {Data, DataInput, DataOutput} from '../../serialization/Data'; import {IdentifiedDataSerializable} from '../../serialization/Serializable'; -import {AddressImpl} from '../../Address'; +import {AddressImpl} from '../../core'; /** @internal */ export const RELIABLE_TOPIC_MESSAGE_FACTORY_ID = -9; diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 091448326..6ed14cdcb 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -15,22 +15,22 @@ */ /** @ignore *//** */ +import * as Long from 'long'; import * as Promise from 'bluebird'; -import {OverflowPolicy} from '../../core/OverflowPolicy'; -import HazelcastClient from '../../HazelcastClient'; -import {TopicOverloadError} from '../../HazelcastError'; -import {AddressImpl} from '../../Address'; +import {OverflowPolicy} from '../OverflowPolicy'; +import {HazelcastClient} from '../../HazelcastClient'; +import {TopicOverloadError} from '../../core'; +import {AddressImpl} from '../../core/Address'; import {SerializationService} from '../../serialization/SerializationService'; import {UuidUtil} from '../../util/UuidUtil'; import {BaseProxy} from '../BaseProxy'; import {Ringbuffer} from '../Ringbuffer'; -import {ITopic} from './ITopic'; +import {ITopic} from '../ITopic'; import {ReliableTopicMessage} from './ReliableTopicMessage'; import {ReliableTopicListenerRunner} from './ReliableTopicListenerRunner'; -import {MessageListener} from './MessageListener'; -import {TopicOverloadPolicy} from './TopicOverloadPolicy'; +import {MessageListener} from '../MessageListener'; +import {TopicOverloadPolicy} from '../TopicOverloadPolicy'; import {ClientConfigImpl} from '../../config/Config'; -import Long = require('long'); /** @internal */ export const TOPIC_INITIAL_BACKOFF = 100; @@ -75,14 +75,14 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { return listenerId; } - removeMessageListener(id: string): boolean { - const runner = this.runners[id]; + removeMessageListener(listenerId: string): boolean { + const runner = this.runners[listenerId]; if (!runner) { return false; } runner.cancel(); - delete this.runners[id]; + delete this.runners[listenerId]; return true; } diff --git a/src/ClusterDataFactory.ts b/src/serialization/ClusterDataFactory.ts similarity index 89% rename from src/ClusterDataFactory.ts rename to src/serialization/ClusterDataFactory.ts index 6f1e38ccf..60ea41c98 100644 --- a/src/ClusterDataFactory.ts +++ b/src/serialization/ClusterDataFactory.ts @@ -15,8 +15,8 @@ */ /** @ignore *//** */ -import {IdentifiedDataSerializable} from './serialization/Serializable'; -import {AddressImpl} from './Address'; +import {IdentifiedDataSerializable} from './Serializable'; +import {AddressImpl} from '../core/Address'; /** @internal */ export const CLUSTER_DATA_FACTORY_ID = 0; diff --git a/src/serialization/DefaultPredicates.ts b/src/serialization/DefaultPredicates.ts index 49f3b7afc..538a8fd16 100644 --- a/src/serialization/DefaultPredicates.ts +++ b/src/serialization/DefaultPredicates.ts @@ -17,7 +17,7 @@ import {Comparator} from '../core/Comparator'; import {IterationType, Predicate, PagingPredicate} from '../core/Predicate'; -import {enumFromString} from '../Util'; +import {enumFromString} from '../util/Util'; import {DataInput, DataOutput} from './Data'; import {IdentifiedDataSerializable} from './Serializable'; diff --git a/src/serialization/DefaultSerializer.ts b/src/serialization/DefaultSerializers.ts similarity index 92% rename from src/serialization/DefaultSerializer.ts rename to src/serialization/DefaultSerializers.ts index df1dab01b..dc702ace0 100644 --- a/src/serialization/DefaultSerializer.ts +++ b/src/serialization/DefaultSerializers.ts @@ -13,39 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ -import Long = require('long'); -import {BitsUtil} from '../BitsUtil'; +import * as Long from 'long'; +import {BitsUtil} from '../util/BitsUtil'; import {DataInput, DataOutput} from './Data'; -import {IdentifiedDataSerializable, IdentifiedDataSerializableFactory} from './Serializable'; -import {HazelcastJsonValue} from '../core/HazelcastJsonValue'; - -/** - * Defines common interface for default and custom serializers. - */ -export interface Serializer { - - /** - * Type id. - */ - id: number; - - /** - * Deserializes input data into an object. - * - * @param input input data reader - */ - read(input: DataInput): T; - - /** - * Serializes an object into binary data. - * - * @param output output data writer - * @param object object to be serialized - */ - write(output: DataOutput, object: T): void; - -} +import { + Serializer, + IdentifiedDataSerializable, + IdentifiedDataSerializableFactory +} from './Serializable'; +import {HazelcastJsonValue} from '../core'; /** @internal */ export class StringSerializer implements Serializer { diff --git a/src/serialization/HeapData.ts b/src/serialization/HeapData.ts index 6ecda38f2..5879da26d 100644 --- a/src/serialization/HeapData.ts +++ b/src/serialization/HeapData.ts @@ -17,7 +17,7 @@ import {murmur} from '../invocation/Murmur'; import {Data} from './Data'; -import {NULL_TYPE_ID} from './DefaultSerializer'; +import {NULL_TYPE_ID} from './DefaultSerializers'; /** @internal */ export const PARTITION_HASH_OFFSET = 0; diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index 8402394ea..e0dbbb14f 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import * as Long from 'long'; -import {BitsUtil} from '../BitsUtil'; +import {BitsUtil} from '../util/BitsUtil'; import {Data, DataInput, DataOutput, PositionalDataOutput} from './Data'; import {HeapData, HEAP_DATA_OVERHEAD} from './HeapData'; import {SerializationService} from './SerializationService'; diff --git a/src/serialization/Portable.ts b/src/serialization/Portable.ts new file mode 100644 index 000000000..8dd30753f --- /dev/null +++ b/src/serialization/Portable.ts @@ -0,0 +1,196 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Long from 'long'; + +/** + * Portable field type. + */ +export enum FieldType { + PORTABLE = 0, + BYTE = 1, + BOOLEAN = 2, + CHAR = 3, + SHORT = 4, + INT = 5, + LONG = 6, + FLOAT = 7, + DOUBLE = 8, + UTF = 9, + PORTABLE_ARRAY = 10, + BYTE_ARRAY = 11, + BOOLEAN_ARRAY = 12, + CHAR_ARRAY = 13, + SHORT_ARRAY = 14, + INT_ARRAY = 15, + LONG_ARRAY = 16, + FLOAT_ARRAY = 17, + DOUBLE_ARRAY = 18, + UTF_ARRAY = 19, +} + +/** + * Writer helper for {@link Portable} objects. + */ +export interface PortableWriter { + writeInt(fieldName: string, value: number): void; + + writeLong(fieldName: string, long: Long): void; + + writeUTF(fieldName: string, str: string): void; + + writeBoolean(fieldName: string, value: boolean): void; + + writeByte(fieldName: string, value: number): void; + + writeChar(fieldName: string, char: string): void; + + writeDouble(fieldName: string, double: number): void; + + writeFloat(fieldName: string, float: number): void; + + writeShort(fieldName: string, value: number): void; + + writePortable(fieldName: string, portable: Portable): void; + + writeNullPortable(fieldName: string, factoryId: number, classId: number): void; + + writeByteArray(fieldName: string, bytes: number[]): void; + + writeBooleanArray(fieldName: string, booleans: boolean[]): void; + + writeCharArray(fieldName: string, chars: string[]): void; + + writeIntArray(fieldName: string, ints: number[]): void; + + writeLongArray(fieldName: string, longs: Long[]): void; + + writeDoubleArray(fieldName: string, doubles: number[]): void; + + writeFloatArray(fieldName: string, floats: number[]): void; + + writeShortArray(fieldName: string, shorts: number[]): void; + + writeUTFArray(fieldName: string, val: string[]): void; + + writePortableArray(fieldName: string, portables: Portable[]): void; +} + +/** + * Reader helper for {@link Portable} objects. + */ +export interface PortableReader { + getVersion(): number; + + hasField(fieldName: string): boolean; + + getFieldNames(): string[]; + + getFieldType(fieldName: string): FieldType; + + readInt(fieldName: string): number; + + readLong(fieldName: string): Long; + + readUTF(fieldName: string): string; + + readBoolean(fieldName: string): boolean; + + readByte(fieldName: string): number; + + readChar(fieldName: string): string; + + readDouble(fieldName: string): number; + + readFloat(fieldName: string): number; + + readShort(fieldName: string): number; + + readPortable(fieldName: string): Portable; + + readByteArray(fieldName: string): number[]; + + readBooleanArray(fieldName: string): boolean[]; + + readCharArray(fieldName: string): string[]; + + readIntArray(fieldName: string): number[]; + + readLongArray(fieldName: string): Long[]; + + readDoubleArray(fieldName: string): number[]; + + readFloatArray(fieldName: string): number[]; + + readShortArray(fieldName: string): number[]; + + readUTFArray(fieldName: string): string[]; + + readPortableArray(fieldName: string): Portable[]; +} + +/** + * Interface for objects with Portable serialization support. + */ +export interface Portable { + + /** + * Factory id of the portable object. + */ + factoryId: number; + + /** + * Class id of the portable object. + */ + classId: number; + + /** + * Reads fields of the portable object from the binary representation. + * + * @param reader read helper + */ + readPortable(reader: PortableReader): void; + + /** + * Writes fields of the portable object into the binary representation. + * + * @param writer write helper + */ + writePortable(writer: PortableWriter): void; + +} + +/** + * Interface for Portable serialization with multiversion support. + */ +export interface VersionedPortable extends Portable { + + /** + * Version of the portable object. + */ + version: number; + +} + +/** + * Factory function for {@link Portable}. Should return + * an instance of the right {@link Portable} object, given + * the matching `classId`. + * + * @param classId class id + * @returns object for further initialization + */ +export type PortableFactory = (classId: number) => Portable; diff --git a/src/serialization/Serializable.ts b/src/serialization/Serializable.ts index a48bf5463..798a6c695 100644 --- a/src/serialization/Serializable.ts +++ b/src/serialization/Serializable.ts @@ -15,102 +15,75 @@ */ import {DataInput, DataOutput} from './Data'; -import {PortableReader, PortableWriter} from './portable/PortableSerializer'; /** - * Interface for objects with IdentifiedDataSerializable - * serialization support. + * Defines common interface for default and custom serializers. */ -export interface IdentifiedDataSerializable { - - /** - * Factory id of the object. - */ - factoryId: number; +export interface Serializer { /** - * Class id of the object. + * Type id. */ - classId: number; + id: number; /** - * Reads fields of the object from the binary representation. + * Deserializes input data into an object. * - * @param input read helper + * @param input input data reader */ - readData(input: DataInput): void; + read(input: DataInput): T; /** - * Writes fields of the object into the binary representation. + * Serializes an object into binary data. * - * @param output write helper + * @param output output data writer + * @param object object to be serialized */ - writeData(output: DataOutput): void; + write(output: DataOutput, object: T): void; } /** - * Factory function for {@link IdentifiedDataSerializable}. Should return - * an instance of the right {@link IdentifiedDataSerializable} object, given - * the matching `classId`. - * - * @param classId class id - * @returns object for further initialization - */ -export type IdentifiedDataSerializableFactory = (classId: number) => IdentifiedDataSerializable; - -/** - * Interface for objects with Portable serialization support. + * Interface for objects with IdentifiedDataSerializable + * serialization support. */ -export interface Portable { +export interface IdentifiedDataSerializable { /** - * Factory id of the portable object. + * Factory id of the object. */ factoryId: number; /** - * Class id of the portable object. + * Class id of the object. */ classId: number; /** - * Reads fields of the portable object from the binary representation. + * Reads fields of the object from the binary representation. * - * @param reader read helper + * @param input read helper */ - readPortable(reader: PortableReader): void; + readData(input: DataInput): void; /** - * Writes fields of the portable object into the binary representation. + * Writes fields of the object into the binary representation. * - * @param writer write helper - */ - writePortable(writer: PortableWriter): void; - -} - -/** - * Interface for Portable serialization with multiversion support. - */ -export interface VersionedPortable extends Portable { - - /** - * Version of the portable object. + * @param output write helper */ - version: number; + writeData(output: DataOutput): void; } /** - * Factory function for {@link Portable}. Should return - * an instance of the right {@link Portable} object, given + * Factory function for {@link IdentifiedDataSerializable}. Should return + * an instance of the right {@link IdentifiedDataSerializable} object, given * the matching `classId`. * * @param classId class id * @returns object for further initialization */ -export type PortableFactory = (classId: number) => Portable; +export type IdentifiedDataSerializableFactory = (classId: number) => IdentifiedDataSerializable; /** * Interface for objects with custom serialization support. diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 8b06adba4..e04d60336 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -16,16 +16,16 @@ /** @ignore *//** */ import {AGGREGATOR_FACTORY_ID, aggregatorFactory} from '../aggregation/AggregatorFactory'; -import {CLUSTER_DATA_FACTORY_ID, clusterDataFactory} from '../ClusterDataFactory'; +import {CLUSTER_DATA_FACTORY_ID, clusterDataFactory} from './ClusterDataFactory'; import {SerializationConfigImpl} from '../config/SerializationConfig'; import { RELIABLE_TOPIC_MESSAGE_FACTORY_ID, reliableTopicMessageFactory, } from '../proxy/topic/ReliableTopicMessage'; -import * as Util from '../Util'; +import * as Util from '../util/Util'; import {Data, DataInput, DataOutput} from './Data'; +import {Serializer, IdentifiedDataSerializableFactory} from './Serializable'; import { - Serializer, BooleanArraySerializer, BooleanSerializer, ByteArraySerializer, @@ -50,12 +50,11 @@ import { ShortSerializer, StringArraySerializer, StringSerializer, -} from './DefaultSerializer'; +} from './DefaultSerializers'; import {DATA_OFFSET, HeapData} from './HeapData'; import {ObjectDataInput, PositionalObjectDataOutput} from './ObjectData'; import {PortableSerializer} from './portable/PortableSerializer'; import {PREDICATE_FACTORY_ID, predicateFactory} from './DefaultPredicates'; -import {IdentifiedDataSerializableFactory} from './Serializable'; import {JsonStringDeserializationPolicy} from '../config/JsonStringDeserializationPolicy'; import {REST_VALUE_FACTORY_ID, restValueFactory} from '../core/RestValue'; diff --git a/src/proxy/topic/ITopic.ts b/src/serialization/index.ts similarity index 63% rename from src/proxy/topic/ITopic.ts rename to src/serialization/index.ts index 805a4c174..13cdc5c70 100644 --- a/src/proxy/topic/ITopic.ts +++ b/src/serialization/index.ts @@ -13,15 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ -import * as Promise from 'bluebird'; -import {DistributedObject} from '../../DistributedObject'; -import {MessageListener} from './MessageListener'; - -export interface ITopic extends DistributedObject { - addMessageListener(listener: MessageListener): string; - - removeMessageListener(id: string): boolean; +/** + * Public API re-exports. + */ - publish(message: E): Promise; -} +export * from './Data'; +export * from './Portable'; +export * from './Serializable'; diff --git a/src/serialization/portable/ClassDefinition.ts b/src/serialization/portable/ClassDefinition.ts index 62ff6c13e..eba94cd01 100644 --- a/src/serialization/portable/ClassDefinition.ts +++ b/src/serialization/portable/ClassDefinition.ts @@ -16,6 +16,7 @@ /** @ignore *//** */ import {deepEqual} from 'assert'; +import {FieldType} from '../Portable'; /** @internal */ export class ClassDefinition { @@ -138,29 +139,3 @@ export class FieldDefinition { return this.version; } } - -/** - * Portable field type. - */ -export enum FieldType { - PORTABLE = 0, - BYTE = 1, - BOOLEAN = 2, - CHAR = 3, - SHORT = 4, - INT = 5, - LONG = 6, - FLOAT = 7, - DOUBLE = 8, - UTF = 9, - PORTABLE_ARRAY = 10, - BYTE_ARRAY = 11, - BOOLEAN_ARRAY = 12, - CHAR_ARRAY = 13, - SHORT_ARRAY = 14, - INT_ARRAY = 15, - LONG_ARRAY = 16, - FLOAT_ARRAY = 17, - DOUBLE_ARRAY = 18, - UTF_ARRAY = 19, -} diff --git a/src/serialization/portable/ClassDefinitionBuilder.ts b/src/serialization/portable/ClassDefinitionBuilder.ts index 69df906c1..8567c1d93 100644 --- a/src/serialization/portable/ClassDefinitionBuilder.ts +++ b/src/serialization/portable/ClassDefinitionBuilder.ts @@ -15,8 +15,9 @@ */ /** @ignore *//** */ -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; -import {HazelcastSerializationError} from '../../HazelcastError'; +import {ClassDefinition, FieldDefinition} from './ClassDefinition'; +import {FieldType} from '../Portable'; +import {HazelcastSerializationError} from '../../core'; /** @internal */ export class ClassDefinitionBuilder { diff --git a/src/serialization/portable/ClassDefinitionContext.ts b/src/serialization/portable/ClassDefinitionContext.ts index bc23425c0..e527ac828 100644 --- a/src/serialization/portable/ClassDefinitionContext.ts +++ b/src/serialization/portable/ClassDefinitionContext.ts @@ -16,7 +16,7 @@ /** @ignore *//** */ import {ClassDefinition} from './ClassDefinition'; -import {HazelcastSerializationError} from '../../HazelcastError'; +import {HazelcastSerializationError} from '../../core'; /** @internal */ export class ClassDefinitionContext { diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index 54b766374..d7cddfcf3 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -15,13 +15,12 @@ */ /** @ignore *//** */ -import {PortableWriter} from './PortableSerializer'; +import {Portable, PortableWriter} from '../Portable'; import {ClassDefinition} from './ClassDefinition'; import {PortableContext} from './PortableContext'; -import {Portable} from '../Serializable'; import * as Long from 'long'; import {ClassDefinitionBuilder} from './ClassDefinitionBuilder'; -import {HazelcastSerializationError} from '../../HazelcastError'; +import {HazelcastSerializationError} from '../../core'; /** @internal */ export class ClassDefinitionWriter implements PortableWriter { diff --git a/src/serialization/portable/DefaultPortableReader.ts b/src/serialization/portable/DefaultPortableReader.ts index ea1a5a2db..5c078ca02 100644 --- a/src/serialization/portable/DefaultPortableReader.ts +++ b/src/serialization/portable/DefaultPortableReader.ts @@ -16,12 +16,12 @@ /** @ignore *//** */ import * as Long from 'long'; -import {BitsUtil} from '../../BitsUtil'; -import {IllegalStateError} from '../../HazelcastError'; +import {BitsUtil} from '../../util/BitsUtil'; +import {IllegalStateError} from '../../core'; import {DataInput} from '../Data'; -import {Portable} from '../Serializable'; -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; -import {PortableReader, PortableSerializer} from './PortableSerializer'; +import {Portable, PortableReader, FieldType} from '../Portable'; +import {ClassDefinition, FieldDefinition} from './ClassDefinition'; +import {PortableSerializer} from './PortableSerializer'; /** @internal */ export class DefaultPortableReader implements PortableReader { diff --git a/src/serialization/portable/DefaultPortableWriter.ts b/src/serialization/portable/DefaultPortableWriter.ts index 5b5f49dcd..b22033b72 100644 --- a/src/serialization/portable/DefaultPortableWriter.ts +++ b/src/serialization/portable/DefaultPortableWriter.ts @@ -17,9 +17,9 @@ import {PortableSerializer} from './PortableSerializer'; import {PositionalDataOutput} from '../Data'; -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; -import {BitsUtil} from '../../BitsUtil'; -import {Portable} from '../Serializable'; +import {ClassDefinition, FieldDefinition} from './ClassDefinition'; +import {BitsUtil} from '../../util/BitsUtil'; +import {Portable, FieldType} from '../Portable'; import * as Long from 'long'; /** @internal */ diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index 77e97ccc5..3a0a47631 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -18,8 +18,8 @@ import {DefaultPortableReader} from './DefaultPortableReader'; import {PortableSerializer} from './PortableSerializer'; import {DataInput} from '../Data'; -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; -import {Portable} from '../Serializable'; +import {ClassDefinition, FieldDefinition} from './ClassDefinition'; +import {Portable, FieldType} from '../Portable'; import * as Long from 'long'; /** @internal */ diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index 6c69e1be1..daceea4f9 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -17,10 +17,10 @@ import {ClassDefinitionContext} from './ClassDefinitionContext'; import {DataInput} from '../Data'; -import {ClassDefinition, FieldDefinition, FieldType} from './ClassDefinition'; +import {ClassDefinition, FieldDefinition} from './ClassDefinition'; import {ClassDefinitionWriter} from './ClassDefinitionWriter'; -import {BitsUtil} from '../../BitsUtil'; -import {Portable, VersionedPortable} from '../Serializable'; +import {BitsUtil} from '../../util/BitsUtil'; +import {Portable, VersionedPortable, FieldType} from '../Portable'; import {ClassDefinitionBuilder} from './ClassDefinitionBuilder'; /** @internal */ diff --git a/src/serialization/portable/PortableSerializer.ts b/src/serialization/portable/PortableSerializer.ts index 9b36ea26d..fcc79421d 100644 --- a/src/serialization/portable/PortableSerializer.ts +++ b/src/serialization/portable/PortableSerializer.ts @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** @ignore *//** */ import {PortableContext} from './PortableContext'; -import {Portable, PortableFactory} from '../Serializable'; -import {Serializer} from '../DefaultSerializer'; +import {Portable, PortableFactory} from '../Portable'; +import {Serializer} from '../Serializable'; import {DataInput, PositionalDataOutput} from '../Data'; import {DefaultPortableReader} from './DefaultPortableReader'; import {MorphingPortableReader} from './MorphingPortableReader'; -import {ClassDefinition, FieldType} from './ClassDefinition'; +import {ClassDefinition} from './ClassDefinition'; import {DefaultPortableWriter} from './DefaultPortableWriter'; -import * as Long from 'long'; import {SerializationConfigImpl} from '../../config/SerializationConfig'; -import {HazelcastSerializationError} from '../../HazelcastError'; +import {HazelcastSerializationError} from '../../core'; /** @internal */ export class PortableSerializer implements Serializer { @@ -96,103 +96,3 @@ export class PortableSerializer implements Serializer { return portable; } } - -/** - * Writer helper for {@link Portable} objects. - */ -export interface PortableWriter { - writeInt(fieldName: string, value: number): void; - - writeLong(fieldName: string, long: Long): void; - - writeUTF(fieldName: string, str: string): void; - - writeBoolean(fieldName: string, value: boolean): void; - - writeByte(fieldName: string, value: number): void; - - writeChar(fieldName: string, char: string): void; - - writeDouble(fieldName: string, double: number): void; - - writeFloat(fieldName: string, float: number): void; - - writeShort(fieldName: string, value: number): void; - - writePortable(fieldName: string, portable: Portable): void; - - writeNullPortable(fieldName: string, factoryId: number, classId: number): void; - - writeByteArray(fieldName: string, bytes: number[]): void; - - writeBooleanArray(fieldName: string, booleans: boolean[]): void; - - writeCharArray(fieldName: string, chars: string[]): void; - - writeIntArray(fieldName: string, ints: number[]): void; - - writeLongArray(fieldName: string, longs: Long[]): void; - - writeDoubleArray(fieldName: string, doubles: number[]): void; - - writeFloatArray(fieldName: string, floats: number[]): void; - - writeShortArray(fieldName: string, shorts: number[]): void; - - writeUTFArray(fieldName: string, val: string[]): void; - - writePortableArray(fieldName: string, portables: Portable[]): void; -} - -/** - * Reader helper for {@link Portable} objects. - */ -export interface PortableReader { - getVersion(): number; - - hasField(fieldName: string): boolean; - - getFieldNames(): string[]; - - getFieldType(fieldName: string): FieldType; - - readInt(fieldName: string): number; - - readLong(fieldName: string): Long; - - readUTF(fieldName: string): string; - - readBoolean(fieldName: string): boolean; - - readByte(fieldName: string): number; - - readChar(fieldName: string): string; - - readDouble(fieldName: string): number; - - readFloat(fieldName: string): number; - - readShort(fieldName: string): number; - - readPortable(fieldName: string): Portable; - - readByteArray(fieldName: string): number[]; - - readBooleanArray(fieldName: string): boolean[]; - - readCharArray(fieldName: string): string[]; - - readIntArray(fieldName: string): number[]; - - readLongArray(fieldName: string): Long[]; - - readDoubleArray(fieldName: string): number[]; - - readFloatArray(fieldName: string): number[]; - - readShortArray(fieldName: string): number[]; - - readUTFArray(fieldName: string): string[]; - - readPortableArray(fieldName: string): Portable[]; -} diff --git a/src/statistics/Statistics.ts b/src/statistics/Statistics.ts index 5affacb61..5482b9fb3 100644 --- a/src/statistics/Statistics.ts +++ b/src/statistics/Statistics.ts @@ -15,12 +15,15 @@ */ /** @ignore *//** */ -import HazelcastClient from '../HazelcastClient'; +import {HazelcastClient} from '../HazelcastClient'; import {ClientConnection} from '../network/ClientConnection'; import {Properties} from '../config/Properties'; import {ClientStatisticsCodec} from '../codec/ClientStatisticsCodec'; -import * as Util from '../Util'; -import {Task} from '../Util'; +import { + scheduleWithRepetition, + cancelRepetitionTask, + Task +} from '../util/Util'; import * as os from 'os'; import {BuildInfo} from '../BuildInfo'; import {ILogger} from '../logging/ILogger'; @@ -83,7 +86,7 @@ export class Statistics { stop(): void { if (this.task != null) { - Util.cancelRepetitionTask(this.task); + cancelRepetitionTask(this.task); } } @@ -91,7 +94,7 @@ export class Statistics { * @param periodSeconds the interval at which the statistics collection and send is being run */ schedulePeriodicStatisticsSendTask(periodSeconds: number): Task { - return Util.scheduleWithRepetition(() => { + return scheduleWithRepetition(() => { const collectionTimestamp = Long.fromNumber(Date.now()); const connection = this.client.getConnectionManager().getRandomConnection(); @@ -126,12 +129,8 @@ export class Statistics { this.registerGauge('os.maxFileDescriptorCount', () => Statistics.EMPTY_STAT_VALUE); this.registerGauge('os.openFileDescriptorCount', () => Statistics.EMPTY_STAT_VALUE); this.registerGauge('os.processCpuTime', () => { - // Nodejs 4 does not support this metric. So we do not print an ugly warning for that. - if (Util.getNodejsMajorVersion() >= 6) { - return process.cpuUsage().user * 1000; // process.cpuUsage returns micoseconds. We convert to nanoseconds. - } else { - return Statistics.EMPTY_STAT_VALUE; - } + // process.cpuUsage returns micoseconds. We convert to nanoseconds + return process.cpuUsage().user * 1000; }); this.registerGauge('os.systemLoadAverage', () => os.loadavg()[0]); this.registerGauge('os.totalPhysicalMemorySize', () => os.totalmem()); @@ -151,7 +150,8 @@ export class Statistics { gaugeFunc(); this.allGauges[gaugeName] = gaugeFunc; } catch (e) { - this.logger.warn('Statistics', 'Could not collect data for gauge ' + gaugeName + ' , it won\'t be registered', e); + this.logger.warn('Statistics', 'Could not collect data for gauge ' + gaugeName + + ' , it won\'t be registered', e); this.allGauges[gaugeName] = (): string => Statistics.EMPTY_STAT_VALUE; } } diff --git a/src/BitsUtil.ts b/src/util/BitsUtil.ts similarity index 71% rename from src/BitsUtil.ts rename to src/util/BitsUtil.ts index 522931421..db03a01b8 100644 --- a/src/BitsUtil.ts +++ b/src/util/BitsUtil.ts @@ -17,35 +17,36 @@ /** @internal */ export class BitsUtil { - static BYTE_SIZE_IN_BYTES = 1; - static BOOLEAN_SIZE_IN_BYTES = 1; - static SHORT_SIZE_IN_BYTES = 2; - static CHAR_SIZE_IN_BYTES = 2; - static INT_SIZE_IN_BYTES = 4; - static FLOAT_SIZE_IN_BYTES = 4; - static LONG_SIZE_IN_BYTES = 8; - static DOUBLE_SIZE_IN_BYTES = 8; - static UUID_SIZE_IN_BYTES: number = BitsUtil.BOOLEAN_SIZE_IN_BYTES + 2 * BitsUtil.LONG_SIZE_IN_BYTES; - - static BIG_ENDIAN = 2; - static LITTLE_ENDIAN = 1; - - static BEGIN_FLAG = 0x80; - static END_FLAG = 0x40; - static BEGIN_END_FLAG: number = BitsUtil.BEGIN_FLAG | BitsUtil.END_FLAG; - static LISTENER_FLAG = 0x01; - - static NULL_ARRAY_LENGTH = -1; - - static FRAME_LENGTH_FIELD_OFFSET = 0; - static VERSION_FIELD_OFFSET: number = BitsUtil.FRAME_LENGTH_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; - static FLAGS_FIELD_OFFSET: number = BitsUtil.VERSION_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - static TYPE_FIELD_OFFSET: number = BitsUtil.FLAGS_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - static CORRELATION_ID_FIELD_OFFSET: number = BitsUtil.TYPE_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; - static PARTITION_ID_FIELD_OFFSET: number = BitsUtil.CORRELATION_ID_FIELD_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - static DATA_OFFSET_FIELD_OFFSET: number = BitsUtil.PARTITION_ID_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; - - static HEADER_SIZE: number = BitsUtil.DATA_OFFSET_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; + + static readonly BYTE_SIZE_IN_BYTES = 1; + static readonly BOOLEAN_SIZE_IN_BYTES = 1; + static readonly SHORT_SIZE_IN_BYTES = 2; + static readonly CHAR_SIZE_IN_BYTES = 2; + static readonly INT_SIZE_IN_BYTES = 4; + static readonly FLOAT_SIZE_IN_BYTES = 4; + static readonly LONG_SIZE_IN_BYTES = 8; + static readonly DOUBLE_SIZE_IN_BYTES = 8; + static readonly UUID_SIZE_IN_BYTES = BitsUtil.BOOLEAN_SIZE_IN_BYTES + 2 * BitsUtil.LONG_SIZE_IN_BYTES; + + static readonly BIG_ENDIAN = 2; + static readonly LITTLE_ENDIAN = 1; + + static readonly BEGIN_FLAG = 0x80; + static readonly END_FLAG = 0x40; + static readonly BEGIN_END_FLAG = BitsUtil.BEGIN_FLAG | BitsUtil.END_FLAG; + static readonly LISTENER_FLAG = 0x01; + + static readonly NULL_ARRAY_LENGTH = -1; + + static readonly FRAME_LENGTH_FIELD_OFFSET = 0; + static readonly VERSION_FIELD_OFFSET = BitsUtil.FRAME_LENGTH_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + static readonly FLAGS_FIELD_OFFSET = BitsUtil.VERSION_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + static readonly TYPE_FIELD_OFFSET = BitsUtil.FLAGS_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + static readonly CORRELATION_ID_FIELD_OFFSET = BitsUtil.TYPE_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; + static readonly PARTITION_ID_FIELD_OFFSET = BitsUtil.CORRELATION_ID_FIELD_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + static readonly DATA_OFFSET_FIELD_OFFSET = BitsUtil.PARTITION_ID_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + + static readonly HEADER_SIZE = BitsUtil.DATA_OFFSET_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; static writeUInt32(buffer: Buffer, pos: number, val: number, isBigEndian: boolean): void { if (isBigEndian) { diff --git a/src/util/IndexUtil.ts b/src/util/IndexUtil.ts index 9d9358bcc..e5385caf3 100644 --- a/src/util/IndexUtil.ts +++ b/src/util/IndexUtil.ts @@ -18,7 +18,7 @@ import {IndexConfig, InternalIndexConfig} from '../config/IndexConfig'; import {IndexType} from '../config/IndexType'; import {UniqueKeyTransformation, InternalBitmapIndexOptions} from '../config/BitmapIndexOptions'; -import {tryGetEnum} from '../Util'; +import {tryGetEnum} from '../util/Util'; /** * Maximum number of attributes allowed in the index. diff --git a/src/util/RandomLB.ts b/src/util/RandomLB.ts index 9a20d3293..ceae823b0 100644 --- a/src/util/RandomLB.ts +++ b/src/util/RandomLB.ts @@ -15,9 +15,9 @@ */ /** @ignore *//** */ -import {AbstractLoadBalancer} from './AbstractLoadBalancer'; +import {AbstractLoadBalancer} from '../core/LoadBalancer'; import {Member} from '../core/Member'; -import {randomInt} from '../Util'; +import {randomInt} from '../util/Util'; /** * A {@link LoadBalancer} that selects a random member to route to. diff --git a/src/util/RoundRobinLB.ts b/src/util/RoundRobinLB.ts index 4cdce47d0..97f9a30fe 100644 --- a/src/util/RoundRobinLB.ts +++ b/src/util/RoundRobinLB.ts @@ -15,8 +15,8 @@ */ /** @ignore *//** */ -import {AbstractLoadBalancer} from './AbstractLoadBalancer'; -import {randomInt} from '../Util'; +import {AbstractLoadBalancer} from '../core/LoadBalancer'; +import {randomInt} from '../util/Util'; import {Member} from '../core/Member'; const INITIAL_SEED_CAP = 1 << 16; diff --git a/src/Util.ts b/src/util/Util.ts similarity index 96% rename from src/Util.ts rename to src/util/Util.ts index 2cdc2212b..6744fd881 100644 --- a/src/Util.ts +++ b/src/util/Util.ts @@ -19,7 +19,7 @@ import * as assert from 'assert'; import * as Long from 'long'; import * as Promise from 'bluebird'; import * as Path from 'path'; -import {AddressImpl} from './Address'; +import {AddressImpl} from '../core/Address'; /** @internal */ export function assertNotNull(v: any): void { @@ -264,10 +264,3 @@ export function DeferredPromise(): Promise.Resolver { promise, } as Promise.Resolver; } - -/** @internal */ -export function getNodejsMajorVersion(): number { - const versionString = process.version; - const versions = versionString.split('.'); - return Number.parseInt(versions[0].substr(1)); -} diff --git a/test/AutoPipeliningDisabledTest.js b/test/AutoPipeliningDisabledTest.js index 6d8d82869..74188f90c 100644 --- a/test/AutoPipeliningDisabledTest.js +++ b/test/AutoPipeliningDisabledTest.js @@ -16,8 +16,8 @@ 'use strict'; const expect = require('chai').expect; -const HazelcastClient = require('../.').Client; -const Controller = require('./RC'); +const RC = require('./RC'); +const { Client } = require('../.'); describe('AutoPipeliningDisabledTest', function () { @@ -26,7 +26,7 @@ describe('AutoPipeliningDisabledTest', function () { let map; const createClient = (clusterId) => { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: clusterId, properties: { ['hazelcast.client.autopipelining.enabled']: false @@ -36,9 +36,9 @@ describe('AutoPipeliningDisabledTest', function () { before(function () { this.timeout(32000); - return Controller.createCluster(null, null).then(c => { + return RC.createCluster(null, null).then(c => { cluster = c; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(_ => { return createClient(cluster.id); }).then(c => { @@ -58,7 +58,7 @@ describe('AutoPipeliningDisabledTest', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('basic map operations work fine', function () { diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index 38dd1b8de..7a2dc89ef 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -15,18 +15,17 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect, assert } = require('chai'); const sinon = require('sinon'); -const assert = require('chai').assert; const sandbox = sinon.createSandbox(); -const Controller = require('./RC'); -const MapProxy = require('../lib/proxy/MapProxy').MapProxy; -const ConnectionManager = require('../lib/network/ClientConnectionManager').ClientConnectionManager; -const ClientConnection = require('../lib/network/ClientConnection').ClientConnection; -const HazelcastClient = require('../.').Client; +const RC = require('./RC'); +const { Client } = require('../.'); +const { MapProxy } = require('../lib/proxy/MapProxy'); +const { ClientConnectionManager } = require('../lib/network/ClientConnectionManager'); +const { ClientConnection } = require('../lib/network/ClientConnection'); -describe('Generic proxy test', function () { +describe('ClientProxyTest', function () { let cluster, client, map, list; @@ -39,15 +38,15 @@ describe('Generic proxy test', function () { }) .then(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); } }); it('Client without active connection should return unknown version', function () { - const connectionManagerStub = sandbox.stub(ConnectionManager.prototype); + const connectionManagerStub = sandbox.stub(ClientConnectionManager.prototype); connectionManagerStub.getActiveConnections.returns({}); - const clientStub = sandbox.stub(HazelcastClient.prototype); + const clientStub = sandbox.stub(Client.prototype); clientStub.getConnectionManager.returns(connectionManagerStub); const mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); @@ -57,11 +56,11 @@ describe('Generic proxy test', function () { it('Client with a 3.7 server connection should return the version', function () { const connectionStub = sandbox.stub(ClientConnection.prototype); connectionStub.getConnectedServerVersion.returns('30700'); - const connectionManagerStub = sandbox.stub(ConnectionManager.prototype); + const connectionManagerStub = sandbox.stub(ClientConnectionManager.prototype); connectionManagerStub.getActiveConnections.returns({ 'localhost': connectionStub }); - const clientStub = sandbox.stub(HazelcastClient.prototype); + const clientStub = sandbox.stub(Client.prototype); clientStub.getConnectionManager.returns(connectionManagerStub); const mapProxy = new MapProxy(clientStub, 'mockMapService', 'mockMap'); @@ -69,11 +68,11 @@ describe('Generic proxy test', function () { }); it('Proxies with the same name should be different for different services', function () { - return Controller.createCluster().then(function (response) { + return RC.createCluster().then(function (response) { cluster = response; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (res) { diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index 1207391e3..c385c06ad 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -15,29 +15,28 @@ */ 'use strict'; -const Controller = require('./RC'); const expect = require('chai').expect; -const HazelcastClient = require('../.').Client; -const Util = require('./Util'); +const RC = require('./RC'); +const { Client } = require('../.'); -describe('Client reconnect', function () { +describe('ClientReconnectTest', function () { let cluster, client; afterEach(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('member restarts, while map.put in progress', function () { this.timeout(9000); let member, map; - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (m) { member = m; - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.client.heartbeat.interval': 1000, @@ -49,9 +48,9 @@ describe('Client reconnect', function () { return client.getMap('test'); }).then(function (mp) { map = mp; - return Controller.terminateMember(cluster.id, member.uuid); + return RC.terminateMember(cluster.id, member.uuid); }).then(function () { - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { return map.put('testkey', 'testvalue'); }).then(function () { @@ -64,12 +63,12 @@ describe('Client reconnect', function () { it('member restarts, while map.put in progress 2', function (done) { this.timeout(5000); let member, map; - Controller.createCluster(null, null).then(function (cl) { + RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (m) { member = m; - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, network: { connectionTimeout: 10000 @@ -84,7 +83,7 @@ describe('Client reconnect', function () { return client.getMap('test'); }).then(function (mp) { map = mp; - return Controller.terminateMember(cluster.id, member.uuid); + return RC.terminateMember(cluster.id, member.uuid); }).then(function () { map.put('testkey', 'testvalue').then(function () { return map.get('testkey'); @@ -97,19 +96,19 @@ describe('Client reconnect', function () { } }); }).then(function () { - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }); }); it('create proxy while member is down, member comes back', function (done) { this.timeout(10000); let member, map; - Controller.createCluster(null, null).then(function (cl) { + RC.createCluster(null, null).then(function (cl) { cluster = cl; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (m) { member = m; - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.client.heartbeat.interval': 1000, @@ -118,7 +117,7 @@ describe('Client reconnect', function () { }); }).then(function (cl) { client = cl; - return Controller.terminateMember(cluster.id, member.uuid); + return RC.terminateMember(cluster.id, member.uuid); }).then(function () { client.getMap('test').then(function (mp) { map = mp; @@ -130,7 +129,7 @@ describe('Client reconnect', function () { expect(val).to.equal('testvalue'); done(); }); - Controller.startMember(cluster.id); + RC.startMember(cluster.id); }) }); }); diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 136d4174d..7cc408da3 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -15,9 +15,9 @@ */ 'use strict'; -const Controller = require('./RC'); +const RC = require('./RC'); const expect = require('chai').expect; -const HazelcastClient = require('../.').Client; +const { Client } = require('../.'); describe('ClusterServiceTest', function () { @@ -25,12 +25,12 @@ describe('ClusterServiceTest', function () { let cluster, member1, client; beforeEach(function () { - return Controller.createCluster(null, null).then(function (res) { + return RC.createCluster(null, null).then(function (res) { cluster = res; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (res) { member1 = res; - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.client.heartbeat.interval': 1000, @@ -44,12 +44,13 @@ describe('ClusterServiceTest', function () { afterEach(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('should know when a new member joins to cluster', function (done) { const membershipListener = { - memberAdded: (membershipEvent) => { + memberAdded: (event) => { + expect(event.members.length).to.be.eq(2); expect(client.clusterService.getSize()).to.be.eq(2); done(); } @@ -57,14 +58,14 @@ describe('ClusterServiceTest', function () { client.clusterService.addMembershipListener(membershipListener); - Controller.startMember(cluster.id).catch(done); + RC.startMember(cluster.id).catch(done); }); it('should know when a member leaves cluster', function (done) { let member2; const membershipListener = { - memberRemoved: (membershipEvent) => { + memberRemoved: (event) => { expect(client.getClusterService().getSize()).to.be.eq(1); done(); } @@ -72,9 +73,9 @@ describe('ClusterServiceTest', function () { client.clusterService.addMembershipListener(membershipListener); - Controller.startMember(cluster.id).then(function (res) { + RC.startMember(cluster.id).then(function (res) { member2 = res; - Controller.shutdownMember(cluster.id, member2.uuid); + RC.shutdownMember(cluster.id, member2.uuid); }).catch(done); }); @@ -82,7 +83,7 @@ describe('ClusterServiceTest', function () { let member2, member3; const membershipListener = { - memberRemoved: (membershipEvent) => { + memberRemoved: (event) => { const remainingMemberList = client.getClusterService().getMemberList(); expect(remainingMemberList).to.have.length(2); const portList = remainingMemberList.map(function (member) { @@ -95,18 +96,18 @@ describe('ClusterServiceTest', function () { client.clusterService.addMembershipListener(membershipListener); - Controller.startMember(cluster.id).then(function (res) { + RC.startMember(cluster.id).then(function (res) { member2 = res; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (res) { member3 = res; - Controller.shutdownMember(cluster.id, member2.uuid); + RC.shutdownMember(cluster.id, member2.uuid); }).catch(done); }); it('should throw when wrong host addresses given in config', function (done) { let falseStart = false; - HazelcastClient.newHazelcastClient({ + Client.newHazelcastClient({ clusterName: cluster.id, network: { clusterMembers: [ @@ -134,7 +135,7 @@ describe('ClusterServiceTest', function () { }); it('should throw with wrong cluster name', function (done) { - HazelcastClient.newHazelcastClient({ + Client.newHazelcastClient({ clusterName: 'wrong', connectionStrategy: { connectionRetry: { @@ -148,4 +149,16 @@ describe('ClusterServiceTest', function () { done(); }); }); + + it('should not run when listener was removed', function (done) { + const membershipListener = { + memberAdded: (event) => { + done(new Error('Listener falsely fired')); + } + }; + const id = client.clusterService.addMembershipListener(membershipListener); + client.clusterService.removeMembershipListener(id); + + setTimeout(done, 3000); + }); }); diff --git a/test/ConnectionManagerTest.js b/test/ConnectionManagerTest.js index f1041d314..9ef60425e 100644 --- a/test/ConnectionManagerTest.js +++ b/test/ConnectionManagerTest.js @@ -22,8 +22,8 @@ const expect = chai.expect; const net = require('net'); const Controller = require('./RC'); -const { Client, HazelcastErrors } = require('../'); -const { AddressImpl } = require('../lib/Address'); +const { Client, IllegalStateError } = require('../'); +const { AddressImpl } = require('../lib/core/Address'); describe('ConnectionManagerTest', function () { @@ -122,6 +122,6 @@ describe('ConnectionManagerTest', function () { clusterConnectTimeoutMillis: 2000 } } - })).to.be.rejectedWith(HazelcastErrors.IllegalStateError); + })).to.be.rejectedWith(IllegalStateError); }); }); diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 4a38b799a..58233a7eb 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -17,8 +17,8 @@ const expect = require('chai').expect; const RC = require('./RC'); -const HazelcastClient = require('../.').Client; -const DeferredPromise = require('../lib/Util').DeferredPromise; +const { Client } = require('../.'); +const { DeferredPromise } = require('../lib/util/Util'); const dummyConfig = { network: { @@ -77,7 +77,7 @@ configParams.forEach(function (cfg) { return RC.startMember(cluster.id); }).then(function (member) { cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); + return Client.newHazelcastClient(cfg); }).then(function (res) { client = res; }); diff --git a/test/LifecycleServiceTest.js b/test/LifecycleServiceTest.js index 9de6f953f..f07167a4f 100644 --- a/test/LifecycleServiceTest.js +++ b/test/LifecycleServiceTest.js @@ -15,11 +15,11 @@ */ 'use strict'; -const RC = require('./RC'); -const HazelcastClient = require('../.').Client; const expect = require('chai').expect; +const RC = require('./RC'); +const { Client } = require('../.'); -describe('LifecycleService', function () { +describe('LifecycleServiceTest', function () { let cluster; @@ -53,7 +53,7 @@ describe('LifecycleService', function () { done('Got lifecycle event ' + state + ' instead of ' + expectedState); } }; - HazelcastClient.newHazelcastClient({ + Client.newHazelcastClient({ clusterName: cluster.id, lifecycleListeners: [ listener ] }).then(function (client) { @@ -63,7 +63,7 @@ describe('LifecycleService', function () { it('event listener should get SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events when added after startup', function (done) { let expectedState = 'SHUTTING_DOWN'; - HazelcastClient.newHazelcastClient({ + Client.newHazelcastClient({ clusterName: cluster.id }).then(function (client) { client.lifecycleService.on('lifecycleEvent', function (state) { @@ -82,7 +82,7 @@ describe('LifecycleService', function () { }); it('isRunning returns correct values at lifecycle stages', function (done) { - HazelcastClient.newHazelcastClient({ + Client.newHazelcastClient({ clusterName: cluster.id }).then(function (client) { client.lifecycleService.on('lifecycleEvent', diff --git a/test/ListenerServiceTest.js b/test/ListenerServiceTest.js index d80237c90..04f56a232 100644 --- a/test/ListenerServiceTest.js +++ b/test/ListenerServiceTest.js @@ -15,13 +15,13 @@ */ 'use strict'; -const RC = require('./RC'); -const HazelcastClient = require('../.').Client; const expect = require('chai').expect; +const RC = require('./RC'); +const { Client } = require('../.'); const Util = require('./Util'); [true, false].forEach(function (isSmartService) { - describe('ListenerService[smart=' + isSmartService + ']', function () { + describe('ListenerServiceTest[smart=' + isSmartService + ']', function () { let cluster, client; before(function () { @@ -34,7 +34,7 @@ const Util = require('./Util'); }); beforeEach(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, network: { smartRouting: isSmartService diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 293387120..f422805b0 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -15,11 +15,11 @@ */ 'use strict'; -const Controller = require('./RC'); const expect = require('chai').expect; -const HazelcastClient = require('../.').Client; -const Util = require('./Util'); const Promise = require('bluebird'); +const RC = require('./RC'); +const { Client } = require('../.'); +const Util = require('./Util'); describe('ListenersOnReconnectTest', function () { @@ -30,7 +30,7 @@ describe('ListenersOnReconnectTest', function () { let map; beforeEach(function () { - return Controller.createCluster(null, null).then(function (cl) { + return RC.createCluster(null, null).then(function (cl) { cluster = cl; }); }); @@ -38,20 +38,20 @@ describe('ListenersOnReconnectTest', function () { afterEach(function () { return map.destroy().then(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); }); function closeTwoMembersOutOfThreeAndTestListener(done, isSmart, membersToClose, turnoffMember) { - Controller.startMember(cluster.id).then(function (m) { + RC.startMember(cluster.id).then(function (m) { members[0] = m; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (m) { members[1] = m; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (m) { members[2] = m; - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, network: { smartRouting: isSmart @@ -104,34 +104,34 @@ describe('ListenersOnReconnectTest', function () { */ it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], Controller.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], RC.terminateMember); }); it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], Controller.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], RC.terminateMember); }); it('kill two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], Controller.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], RC.terminateMember); }); it('shutdown two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], Controller.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], RC.shutdownMember); }); it('shutdown two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], Controller.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], RC.shutdownMember); }); it('shutdown two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], Controller.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], RC.shutdownMember); }); it('restart member, listener still receives map.put event [smart=' + isSmart + ']', function (done) { let member; - Controller.startMember(cluster.id).then(function (m) { + RC.startMember(cluster.id).then(function (m) { member = m; - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, network: { smartRouting: isSmart @@ -162,9 +162,9 @@ describe('ListenersOnReconnectTest', function () { }; return map.addEntryListener(listener, 'keyx', true); }).then(function () { - return Controller.terminateMember(cluster.id, member.uuid); + return RC.terminateMember(cluster.id, member.uuid); }).then(function () { - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function () { return Util.promiseWaitMilliseconds(5000); }).then(function () { diff --git a/test/LoggingTest.js b/test/LoggingTest.js index 6c73dbcfb..4d19260be 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -18,9 +18,9 @@ const expect = require('chai').expect; const sinon = require('sinon'); const winston = require('winston'); -const Controller = require('./RC'); -const HazelcastClient = require('../.').Client; -const LogLevel = require('../.').LogLevel; +const RC = require('./RC'); +const { Client } = require('../.'); +const { LogLevel } = require('../.'); describe('LoggingTest', function () { @@ -60,14 +60,14 @@ describe('LoggingTest', function () { }; before(function () { - return Controller.createCluster(null, null).then(function (res) { + return RC.createCluster(null, null).then(function (res) { cluster = res; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }); }); after(function () { - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); beforeEach(function () { @@ -88,7 +88,7 @@ describe('LoggingTest', function () { loggingHappened = true; }); - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, customLogger: winstonAdapter }).then(function (hz) { @@ -98,7 +98,7 @@ describe('LoggingTest', function () { }); it('no logging', function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'OFF' @@ -110,7 +110,7 @@ describe('LoggingTest', function () { }); it('default logging in case of empty property', function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id }).then(function (hz) { client = hz; @@ -119,7 +119,7 @@ describe('LoggingTest', function () { }); it('default logging in case of default property', function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'INFO' @@ -131,14 +131,14 @@ describe('LoggingTest', function () { }); it('error in case of unknown property value', function () { - return expect(HazelcastClient.newHazelcastClient.bind(this, { + return expect(Client.newHazelcastClient.bind(this, { clusterName: cluster.id, customLogger: 'unknw' })).to.throw(Error); }); it('default logging, default level', function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id }).then(function (cl) { client = cl; @@ -147,7 +147,7 @@ describe('LoggingTest', function () { }); it('default logging, error level', function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'ERROR' @@ -159,7 +159,7 @@ describe('LoggingTest', function () { }); it('default logging, trace level', function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'TRACE' diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index e768ea5e3..426a27725 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -15,24 +15,24 @@ */ 'use strict'; -const Controller = require('./RC'); const expect = require('chai').expect; -const HazelcastClient = require('../.').Client; +const RC = require('./RC'); +const { Client } = require('../.'); const Util = require('./Util'); -describe('Lost connection', function () { +describe('LostConnectionTest', function () { let cluster, oldMember, client; before(function () { - return Controller.createCluster(null, null).then(function (res) { + return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }).then(function (m) { oldMember = m; }).then(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.client.heartbeat.interval': 500, @@ -46,7 +46,7 @@ describe('Lost connection', function () { after(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('M2 starts, M1 goes down, client connects to M2', function (done) { @@ -54,7 +54,7 @@ describe('Lost connection', function () { let newMember; const membershipListener = { memberAdded: (membershipEvent) => { - Controller.shutdownMember(cluster.id, oldMember.uuid).then(function () { + RC.shutdownMember(cluster.id, oldMember.uuid).then(function () { return Util.promiseWaitMilliseconds(4000); }).then(function () { try { @@ -70,7 +70,7 @@ describe('Lost connection', function () { }; client.clusterService.addMembershipListener(membershipListener); - Controller.startMember(cluster.id).then(function (m) { + RC.startMember(cluster.id).then(function (m) { newMember = m; }); }); diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index 54f18190b..71396bc6f 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -15,11 +15,11 @@ */ 'use strict'; -const HazelcastClient = require('../.').Client; -const Controller = require('./RC'); const expect = require('chai').expect; -const DeferredPromise = require('../lib/Util').DeferredPromise; -const MemberEvent = require('../lib/core/MembershipEvent').MemberEvent; +const RC = require('./RC'); +const Client = require('../.').Client; +const { DeferredPromise } = require('../lib/util/Util'); +const { MemberEvent } = require('../lib/core'); describe('MembershipListenerTest', function () { @@ -27,11 +27,11 @@ describe('MembershipListenerTest', function () { let cluster, client; beforeEach(function () { - return Controller.createCluster(null, null).then(function (res) { + return RC.createCluster(null, null).then(function (res) { cluster = res; - return Controller.startMember(cluster.id) + return RC.startMember(cluster.id) }).then(function (res) { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (res) { @@ -41,7 +41,7 @@ describe('MembershipListenerTest', function () { afterEach(function () { client.shutdown(); - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('sees member added event', function () { @@ -55,7 +55,7 @@ describe('MembershipListenerTest', function () { }; client.clusterService.addMembershipListener(membershipListener); - return Controller.startMember(cluster.id).then(function (res) { + return RC.startMember(cluster.id).then(function (res) { newMember = res; return listenerCalledResolver.promise; }).then(function (membershipEvent) { @@ -84,7 +84,7 @@ describe('MembershipListenerTest', function () { client.clusterService.addMembershipListener(membershipListener); client.clusterService.addMembershipListener(membershipListener2); - return Controller.startMember(cluster.id).then(function (res) { + return RC.startMember(cluster.id).then(function (res) { newMember = res; return listenerCalledResolver.promise; }).then(function (membershipEvent) { @@ -108,7 +108,7 @@ describe('MembershipListenerTest', function () { client.clusterService.addMembershipListener(membershipListener); client.clusterService.addMembershipListener(membershipListener); - return Controller.startMember(cluster.id).then(function (m) { + return RC.startMember(cluster.id).then(function (m) { expect(counter).to.equal(2); }); }); @@ -124,9 +124,9 @@ describe('MembershipListenerTest', function () { }; client.clusterService.addMembershipListener(membershipListener); - return Controller.startMember(cluster.id).then(function (res) { + return RC.startMember(cluster.id).then(function (res) { newMember = res; - return Controller.shutdownMember(cluster.id, newMember.uuid); + return RC.shutdownMember(cluster.id, newMember.uuid); }).then(function () { return listenerCalledResolver.promise; }).then(function (membershipEvent) { diff --git a/test/RC.js b/test/RC.js index 0406458c8..84e488327 100644 --- a/test/RC.js +++ b/test/RC.js @@ -15,10 +15,10 @@ */ 'use strict'; -const RemoteController = require('./remote_controller/Controller'); -const DeferredPromise = require('../lib/Util').DeferredPromise; +const RC = require('./remote_controller/Controller'); +const { DeferredPromise } = require('../lib/util/Util'); -const controller = new RemoteController('localhost', 9701); +const controller = new RC('localhost', 9701); function createCluster(hzVersion, config) { const deferred = DeferredPromise(); diff --git a/test/RepetitionTaskTest.js b/test/RepetitionTaskTest.js index fb7384ee1..a1347d5bf 100644 --- a/test/RepetitionTaskTest.js +++ b/test/RepetitionTaskTest.js @@ -16,10 +16,10 @@ 'use strict'; const expect = require('chai').expect; -const Util = require("../lib/Util"); +const Util = require("../lib/util/Util"); const TestUtil = require('./Util'); -describe('Repetition Task', function () { +describe('RepetitionTaskTest', function () { it('should be cancelled before timeout', function () { let counter = 0; diff --git a/test/config/ConfigBuilderHazelcastCloudTest.js b/test/config/ConfigBuilderHazelcastCloudTest.js index f5e4fb90d..a298fa2d7 100644 --- a/test/config/ConfigBuilderHazelcastCloudTest.js +++ b/test/config/ConfigBuilderHazelcastCloudTest.js @@ -18,8 +18,9 @@ const expect = require('chai').expect; require('chai').use(require('chai-as-promised')); const path = require('path'); -const ClientConfigImpl = require('../../lib/config/Config').ClientConfigImpl; -const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; + +const { ClientConfigImpl } = require('../../lib/config/Config'); +const { ConfigBuilder } = require('../../lib/config/ConfigBuilder'); describe('ConfigBuilderHazelcastCloudTest', function () { diff --git a/test/config/ConfigBuilderSSLTest.js b/test/config/ConfigBuilderSSLTest.js index e3523e28c..5be74c2bf 100644 --- a/test/config/ConfigBuilderSSLTest.js +++ b/test/config/ConfigBuilderSSLTest.js @@ -20,8 +20,8 @@ chai.use(require('chai-as-promised')); const expect = chai.expect; const path = require('path'); -const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; -const Errors = require('../..').HazelcastErrors; +const { ConfigBuilder } = require('../../lib/config/ConfigBuilder'); +const { HazelcastError } = require('../..'); describe('ConfigBuilderSSLTest', function () { @@ -31,8 +31,8 @@ describe('ConfigBuilderSSLTest', function () { } it('if both sslOptions and factory are set, should throw error', function () { - expect(() => loadJson('configurations/invalid-ssl-enabled.json')).to.throw(Errors.HazelcastError); - expect(() => loadJson('configurations/invalid-ssl-disabled.json')).to.throw(Errors.HazelcastError); + expect(() => loadJson('configurations/invalid-ssl-enabled.json')).to.throw(HazelcastError); + expect(() => loadJson('configurations/invalid-ssl-disabled.json')).to.throw(HazelcastError); }); it('ssl is disabled but options are set', function () { diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index d88b2c41f..8e245e989 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -17,10 +17,16 @@ const expect = require('chai').expect; const path = require('path'); -const Config = require('../..').Config; -const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; -const AddressHelper = require('../../lib/Util').AddressHelper; -const ReconnectMode = require('../../lib/config/ConnectionStrategyConfig').ReconnectMode; +const { + EvictionPolicy, + JsonStringDeserializationPolicy, + LoadBalancerType, + InMemoryFormat, + TopicOverloadPolicy, +} = require('../..'); +const { ConfigBuilder } = require('../../lib/config/ConfigBuilder'); +const { AddressHelper } = require('../../lib/util/Util'); +const { ReconnectMode } = require('../../lib/config/ConnectionStrategyConfig'); describe('ConfigBuilderTest', function () { @@ -148,7 +154,7 @@ describe('ConfigBuilderTest', function () { expect(serializationCfg.isBigEndian).to.equal(false); expect(serializationCfg.portableVersion).to.equal(1); expect(serializationCfg.jsonStringDeserializationPolicy) - .to.equal(Config.JsonStringDeserializationPolicy.NO_DESERIALIZATION); + .to.equal(JsonStringDeserializationPolicy.NO_DESERIALIZATION); expect(Object.keys(serializationCfg.dataSerializableFactories).length).to.equal(1); expect(serializationCfg.dataSerializableFactories['1']).to.equal(dataSerializableFactory); @@ -167,9 +173,9 @@ describe('ConfigBuilderTest', function () { expect(nearCacheConfigs['nc-map'].name).to.equal('nc-map'); expect(nearCacheConfigs['nc-map'].invalidateOnChange).to.be.false; expect(nearCacheConfigs['nc-map'].maxIdleSeconds).to.equal(2); - expect(nearCacheConfigs['nc-map'].inMemoryFormat).to.equal(Config.InMemoryFormat.OBJECT); + expect(nearCacheConfigs['nc-map'].inMemoryFormat).to.equal(InMemoryFormat.OBJECT); expect(nearCacheConfigs['nc-map'].timeToLiveSeconds).to.equal(3); - expect(nearCacheConfigs['nc-map'].evictionPolicy).to.equal(Config.EvictionPolicy.LRU); + expect(nearCacheConfigs['nc-map'].evictionPolicy).to.equal(EvictionPolicy.LRU); expect(nearCacheConfigs['nc-map'].evictionMaxSize).to.equal(3000); expect(nearCacheConfigs['nc-map'].evictionSamplingCount).to.equal(4); expect(nearCacheConfigs['nc-map'].evictionSamplingPoolSize).to.equal(8); @@ -177,9 +183,9 @@ describe('ConfigBuilderTest', function () { expect(nearCacheConfigs['nc-map2'].name).to.equal('nc-map2'); expect(nearCacheConfigs['nc-map2'].invalidateOnChange).to.be.false; expect(nearCacheConfigs['nc-map2'].maxIdleSeconds).to.equal(2); - expect(nearCacheConfigs['nc-map2'].inMemoryFormat).to.equal(Config.InMemoryFormat.OBJECT); + expect(nearCacheConfigs['nc-map2'].inMemoryFormat).to.equal(InMemoryFormat.OBJECT); expect(nearCacheConfigs['nc-map2'].timeToLiveSeconds).to.equal(3); - expect(nearCacheConfigs['nc-map2'].evictionPolicy).to.equal(Config.EvictionPolicy.LRU); + expect(nearCacheConfigs['nc-map2'].evictionPolicy).to.equal(EvictionPolicy.LRU); expect(nearCacheConfigs['nc-map2'].evictionMaxSize).to.equal(3000); expect(nearCacheConfigs['nc-map2'].evictionSamplingCount).to.equal(4); expect(nearCacheConfigs['nc-map2'].evictionSamplingPoolSize).to.equal(8); @@ -189,11 +195,11 @@ describe('ConfigBuilderTest', function () { const rtConfigs = fullConfig.reliableTopics; expect(rtConfigs['rt1'].name).to.equal('rt1'); expect(rtConfigs['rt1'].readBatchSize).to.equal(35); - expect(rtConfigs['rt1'].overloadPolicy).to.equal(Config.TopicOverloadPolicy.DISCARD_NEWEST); + expect(rtConfigs['rt1'].overloadPolicy).to.equal(TopicOverloadPolicy.DISCARD_NEWEST); expect(rtConfigs['rt2'].name).to.equal('rt2'); expect(rtConfigs['rt2'].readBatchSize).to.equal(15); - expect(rtConfigs['rt2'].overloadPolicy).to.equal(Config.TopicOverloadPolicy.DISCARD_NEWEST); + expect(rtConfigs['rt2'].overloadPolicy).to.equal(TopicOverloadPolicy.DISCARD_NEWEST); }); it('lifecycleListeners', function () { @@ -220,7 +226,7 @@ describe('ConfigBuilderTest', function () { it('loadBalancer', function () { const loadBalancer = fullConfig.loadBalancer; - expect(loadBalancer.type).to.equal(Config.LoadBalancerType.RANDOM); + expect(loadBalancer.type).to.equal(LoadBalancerType.RANDOM); expect(loadBalancer.customLoadBalancer).to.equal(customLoadBalancer); }); }); diff --git a/test/config/ConfigPatternMatcherTest.js b/test/config/ConfigPatternMatcherTest.js index a756d1889..eabc89e13 100644 --- a/test/config/ConfigPatternMatcherTest.js +++ b/test/config/ConfigPatternMatcherTest.js @@ -16,9 +16,9 @@ 'use strict'; const expect = require('chai').expect; -const ConfigBuilder = require('../../lib/config/ConfigBuilder').ConfigBuilder; -const FlakeIdGeneratorConfigImpl = require('../../lib/config/FlakeIdGeneratorConfig').FlakeIdGeneratorConfigImpl; -const Errors = require('../..').HazelcastErrors; +const { ConfigBuilder } = require('../../lib/config/ConfigBuilder'); +const { FlakeIdGeneratorConfigImpl } = require('../../lib/config/FlakeIdGeneratorConfig'); +const { ConfigurationError } = require('../..'); describe('ConfigPatternMatcherTest', function () { @@ -83,6 +83,6 @@ describe('ConfigPatternMatcherTest', function () { inputConfig.flakeIdGenerators['abcde*'] = f2; const config = new ConfigBuilder(inputConfig).build(); - expect(config.getFlakeIdGeneratorConfig.bind(inputConfig, 'abcde.somemore.postf')).to.throw(Errors.ConfigurationError); + expect(config.getFlakeIdGeneratorConfig.bind(inputConfig, 'abcde.somemore.postf')).to.throw(ConfigurationError); }); }); diff --git a/test/config/ResolvePathTest.js b/test/config/ResolvePathTest.js index 5c62b8bcf..1dc714e5a 100644 --- a/test/config/ResolvePathTest.js +++ b/test/config/ResolvePathTest.js @@ -17,9 +17,9 @@ const expect = require('chai').expect; const path = require('path'); -const Util = require('../../lib/Util'); +const Util = require('../../lib/util/Util'); -describe('ResolvePath Test', function () { +describe('ResolvePathTest', function () { it('Util.resolvePath test', function () { expect(Util.resolvePath('.')).to.equal(process.cwd()); expect(Util.resolvePath('filename')).to.equal(path.join(process.cwd(), 'filename')); diff --git a/test/connection/ClientMessageReaderTest.js b/test/connection/ClientMessageReaderTest.js index d560dd45d..b29acf997 100644 --- a/test/connection/ClientMessageReaderTest.js +++ b/test/connection/ClientMessageReaderTest.js @@ -18,8 +18,8 @@ const expect = require('chai').expect; -const ClientMessageReader = require('../../lib/network/ClientConnection').ClientMessageReader; -const cm = require('../../lib/ClientMessage'); +const { ClientMessageReader } = require('../../lib/network/ClientConnection'); +const cm = require('../../lib/protocol/ClientMessage'); const headerSize = cm.SIZE_OF_FRAME_LENGTH_AND_FLAGS; describe('ClientMessageReader', function () { diff --git a/test/connection/DirectWriterTest.js b/test/connection/DirectWriterTest.js index 568a44e00..c570dc68a 100644 --- a/test/connection/DirectWriterTest.js +++ b/test/connection/DirectWriterTest.js @@ -20,10 +20,10 @@ const Socket = require('net').Socket; const sinon = require('sinon'); const expect = require('chai').expect; -const DeferredPromise = require('../../lib/Util').DeferredPromise; -const DirectWriter = require('../../lib/network/ClientConnection').DirectWriter; +const { DeferredPromise } = require('../../lib/util/Util'); +const { DirectWriter } = require('../../lib/network/ClientConnection'); -describe('DirectWriter', function () { +describe('DirectWriterTest', function () { let queue; let mockSocket; diff --git a/test/connection/FragmentedClientMessageHandlerTest.js b/test/connection/FragmentedClientMessageHandlerTest.js index ce7f4c3dd..a0ed71112 100644 --- a/test/connection/FragmentedClientMessageHandlerTest.js +++ b/test/connection/FragmentedClientMessageHandlerTest.js @@ -19,10 +19,12 @@ const expect = require('chai').expect; const crypto = require('crypto'); -const FragmentedClientMessageHandler = require('../../lib/network/ClientConnection').FragmentedClientMessageHandler; -const ClientMessageReader = require('../../lib/network/ClientConnection').ClientMessageReader; -const cm = require('../../lib/ClientMessage'); -const FixSizedTypesCodec = require('../../lib/codec/builtin/FixSizedTypesCodec').FixSizedTypesCodec; +const { + ClientMessageReader, + FragmentedClientMessageHandler +} = require('../../lib/network/ClientConnection'); +const cm = require('../../lib/protocol/ClientMessage'); +const { FixSizedTypesCodec } = require('../../lib/codec/builtin/FixSizedTypesCodec'); describe('FragmentedClientMessageHandlerTest', function () { diff --git a/test/connection/PipelinedWriterTest.js b/test/connection/PipelinedWriterTest.js index e0c7db6e9..fe5b70f98 100644 --- a/test/connection/PipelinedWriterTest.js +++ b/test/connection/PipelinedWriterTest.js @@ -21,10 +21,10 @@ const sinon = require('sinon'); const expect = require('chai').expect; const Promise = require('bluebird'); -const DeferredPromise = require('../../lib/Util').DeferredPromise; -const PipelinedWriter = require('../../lib/network/ClientConnection').PipelinedWriter; +const { DeferredPromise } = require('../../lib/util/Util'); +const { PipelinedWriter } = require('../../lib/network/ClientConnection'); -describe('PipelinedWriter', function () { +describe('PipelinedWriterTest', function () { let writer; let mockSocket; diff --git a/test/discovery/HazelcastCloudDiscoveryTest.js b/test/discovery/HazelcastCloudDiscoveryTest.js index 3dca1562d..28751bda6 100644 --- a/test/discovery/HazelcastCloudDiscoveryTest.js +++ b/test/discovery/HazelcastCloudDiscoveryTest.js @@ -16,7 +16,7 @@ 'use strict'; const expect = require('chai').expect; -const { AddressImpl } = require('../../lib/Address'); +const { AddressImpl } = require('../../lib/core/Address'); const { HazelcastCloudDiscovery } = require('../../lib/discovery/HazelcastCloudDiscovery'); describe('HazelcastCloudDiscoveryTest', function () { diff --git a/test/discovery/HazelcastCloudProviderTest.js b/test/discovery/HazelcastCloudProviderTest.js index 4c62392b6..205b280cd 100644 --- a/test/discovery/HazelcastCloudProviderTest.js +++ b/test/discovery/HazelcastCloudProviderTest.js @@ -20,9 +20,9 @@ const expect = require('chai').expect; const Promise = require('bluebird'); const { LogLevel } = require('../../lib/'); -const { HazelcastErrors: { IllegalStateError } } = require('../../'); +const { IllegalStateError } = require('../../'); const { LoggingService } = require('../../lib/logging/LoggingService'); -const { AddressImpl } = require('../../lib/Address'); +const { AddressImpl } = require('../../lib/core/Address'); const { HazelcastCloudAddressProvider } = require('../../lib/discovery/HazelcastCloudAddressProvider'); const { HazelcastCloudDiscovery } = require('../../lib/discovery/HazelcastCloudDiscovery'); diff --git a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js index da8bba213..86aa70e65 100644 --- a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js +++ b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js @@ -18,9 +18,9 @@ const chai = require('chai'); chai.use(require('chai-as-promised')); const expect = chai.expect; -const HazelcastClient = require('../../.').Client; -const Errors = require('../../.').HazelcastErrors; + const RC = require('./../RC'); +const { Client, HazelcastError } = require('../../.'); const Util = require('../Util'); describe("FlakeIdGeneratorOutOfRangeTest", function () { @@ -56,7 +56,7 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { }).then(function () { return assignOverflowedNodeId(cluster.id, Util.getRandomInt(0, 2)); }).then(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, network: { smartRouting: false @@ -90,7 +90,7 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { }).then(function () { return assignOverflowedNodeId(cluster.id, 1); }).then(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (cl) { @@ -98,7 +98,7 @@ describe("FlakeIdGeneratorOutOfRangeTest", function () { return client.getFlakeIdGenerator('test'); }).then(function (idGenerator) { flakeIdGenerator = idGenerator; - return expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(Errors.HazelcastError); + return expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(HazelcastError); }); }); }); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index 006b82016..2867ac898 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -16,11 +16,11 @@ 'use strict'; const expect = require('chai').expect; -const HazelcastClient = require('../../.').Client; -const RC = require('./../RC'); -const Util = require('./../Util'); const Promise = require('bluebird'); const Long = require('long'); +const RC = require('./../RC'); +const { Client } = require('../../'); +const Util = require('./../Util'); describe("FlakeIdGeneratorProxyTest", function () { @@ -36,7 +36,7 @@ describe("FlakeIdGeneratorProxyTest", function () { cluster = response; return RC.startMember(cluster.id); }).then(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, flakeIdGenerators: { 'shortterm': { diff --git a/test/heartbeat/HeartbeatFromServerTest.js b/test/heartbeat/HeartbeatFromServerTest.js index 37a7c2a1c..b8299078d 100644 --- a/test/heartbeat/HeartbeatFromServerTest.js +++ b/test/heartbeat/HeartbeatFromServerTest.js @@ -18,9 +18,8 @@ const RC = require('../RC'); const Util = require('../Util'); const { Client } = require('../../'); -const { DeferredPromise } = require('../../lib/Util'); -const { AddressImpl } = require('../../lib/Address'); -const { TargetDisconnectedError } = require('../../lib/HazelcastError'); +const { DeferredPromise } = require('../../lib/util/Util'); +const { AddressImpl, TargetDisconnectedError } = require('../../lib/core'); describe('HeartbeatFromServerTest', function () { diff --git a/test/integration/ConnectionStrategyTest.js b/test/integration/ConnectionStrategyTest.js index d6fcca895..5e64e402d 100644 --- a/test/integration/ConnectionStrategyTest.js +++ b/test/integration/ConnectionStrategyTest.js @@ -15,18 +15,17 @@ */ 'use strict'; +const expect = require('chai').expect; const chai = require('chai'); const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); -const expect = require('chai').expect; -const Client = require('../../.').Client; const RC = require('../RC'); +const { Client, ClientOfflineError, ClientNotActiveError } = require('../../'); const TestUtil = require('../Util'); -const Errors = require('../../.').HazelcastErrors; -const Util = require('../../lib/Util'); -const ReconnectMode = require('../../lib/config/ConnectionStrategyConfig').ReconnectMode; -const LifecycleState = require('../../lib/LifecycleService').LifecycleState; +const Util = require('../../lib/util/Util'); +const { ReconnectMode } = require('../../lib/config/ConnectionStrategyConfig'); +const { LifecycleState } = require('../../lib/LifecycleService'); describe('ConnectionStrategyTest', function () { @@ -54,7 +53,7 @@ describe('ConnectionStrategyTest', function () { } }).then((c) => { client = c; - return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); + return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(ClientOfflineError); }); }); @@ -66,7 +65,7 @@ describe('ConnectionStrategyTest', function () { }).then((c) => { client = c; client.shutdown(); - return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientNotActiveError); + return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(ClientNotActiveError); }) }); @@ -153,7 +152,7 @@ describe('ConnectionStrategyTest', function () { return shutdown.promise; }) .then(() => { - return expect(map.put(1, 5)).to.be.rejectedWith(Errors.ClientNotActiveError); + return expect(map.put(1, 5)).to.be.rejectedWith(ClientNotActiveError); }); }); @@ -202,7 +201,7 @@ describe('ConnectionStrategyTest', function () { return disconnected.promise; }) .then(() => { - return expect(map.put(1, 5)).to.be.rejectedWith(Errors.ClientOfflineError); + return expect(map.put(1, 5)).to.be.rejectedWith(ClientOfflineError); }) .then(() => { client.getLifecycleService().on('lifecycleEvent', (state) => { @@ -228,7 +227,7 @@ describe('ConnectionStrategyTest', function () { } }).then((c) => { client = c; - return expect(client.getList(TestUtil.randomString())).to.be.rejectedWith(Errors.ClientOfflineError); + return expect(client.getList(TestUtil.randomString())).to.be.rejectedWith(ClientOfflineError); }); }); diff --git a/test/integration/InitialMembershipListenerTest.js b/test/integration/InitialMembershipListenerTest.js index f7916a631..1977889da 100644 --- a/test/integration/InitialMembershipListenerTest.js +++ b/test/integration/InitialMembershipListenerTest.js @@ -22,8 +22,8 @@ chai.use(chaiAsPromised); const expect = require('chai').expect; const Client = require('../../.').Client; -const Controller = require('../RC'); -const Util = require('../../lib/Util'); +const RC = require('../RC'); +const Util = require('../../lib/util/Util'); describe('InitialMembershipListenerTest', function () { @@ -34,10 +34,10 @@ describe('InitialMembershipListenerTest', function () { let client; beforeEach(function () { - return Controller.createCluster(null, null) + return RC.createCluster(null, null) .then((c) => { cluster = c; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then((m) => { initialMember = m; @@ -49,7 +49,7 @@ describe('InitialMembershipListenerTest', function () { client.shutdown(); } - return Controller.terminateCluster(cluster.id); + return RC.terminateCluster(cluster.id); }); it('receives available member when added before client start', function (done) { @@ -127,7 +127,7 @@ describe('InitialMembershipListenerTest', function () { Client.newHazelcastClient(config) .then((c) => { client = c; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then((m) => { newMember = m; diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index d90dae9d0..933ebb769 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -18,7 +18,7 @@ const expect = require('chai').expect; const RC = require('./../RC'); const { Client } = require('../../'); -const { ItemEventType } = require('../../lib/core/ItemListener'); +const { ItemEventType } = require('../../lib/proxy/ItemListener'); describe('ListProxyTest', function () { diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 3f9f70436..8f22c9071 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -21,8 +21,7 @@ const Promise = require('bluebird'); const fs = require('fs'); const RC = require('./../RC'); -const HazelcastClient = require('../..').Client; -const Predicates = require('../..').Predicates; +const { Client, Predicates } = require('../..'); const identifiedFactory = require('../javaclasses/IdentifiedFactory'); const CustomComparator = require('../javaclasses/CustomComparator'); @@ -44,7 +43,7 @@ describe('MapPredicateTest', function () { return RC.startMember(cluster.id); }) .then(function (member) { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, serialization: { dataSerializableFactories: { diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index e4e14ae2c..5ad16dfbf 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -16,13 +16,12 @@ 'use strict'; const expect = require('chai').expect; -const HazelcastClient = require('../../').Client; -const Config = require('../../').Config; -const Predicates = require('../../').Predicates; const Promise = require('bluebird'); +const fs = require('fs'); + const RC = require('./../RC'); +const { Client, Predicates } = require('../../'); const Util = require('./../Util'); -const fs = require('fs'); const fillMap = require('../Util').fillMap; function createController(nearCacheEnabled) { @@ -41,7 +40,7 @@ function createClient(nearCacheEnabled, clusterName) { if (nearCacheEnabled) { cfg.nearCaches['test'] = { timeToLiveSeconds: 1 }; } - return HazelcastClient.newHazelcastClient(cfg); + return Client.newHazelcastClient(cfg); } describe('MapProxyTest', function () { diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index 473da9d49..ab844aa44 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -18,10 +18,10 @@ const expect = require('chai').expect; const fs = require('fs'); -const DeferredPromise = require('../../lib/Util').DeferredPromise; -const getRandomInt = require('../Util').getRandomInt; const RC = require('../RC'); -const HazelcastClient = require('../../.').Client; +const Client = require('../../.').Client; +const { DeferredPromise } = require('../../lib/util/Util'); +const { getRandomInt } = require('../Util'); describe('NearCachedMapStress', function () { @@ -55,11 +55,11 @@ describe('NearCachedMapStress', function () { }) .then(function (member) { cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg); + return Client.newHazelcastClient(cfg); }) .then(function (cl) { client1 = cl; - return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + return Client.newHazelcastClient({ clusterName: cluster.id }); }) .then(function (cl) { validatingClient = cl; diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index 8d1298fd0..b81259d7d 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -16,10 +16,10 @@ 'use strict'; const expect = require('chai').expect; -const HazelcastClient = require('../../.').Client; +const fs = require('fs'); const RC = require('./../RC'); +const { Client } = require('../../.'); const Util = require('./../Util'); -const fs = require('fs'); const fillMap = require('../Util').fillMap; describe('NearCachedMapTest', function () { @@ -46,12 +46,12 @@ describe('NearCachedMapTest', function () { }) .then(function (member) { cfg.clusterName = cluster.id; - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + return Client.newHazelcastClient(cfg).then(function (hazelcastClient) { client1 = hazelcastClient; }); }) .then(function () { - return HazelcastClient.newHazelcastClient(cfg).then(function (hazelcastClient) { + return Client.newHazelcastClient(cfg).then(function (hazelcastClient) { client2 = hazelcastClient; }); }); diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index 5da3db0bb..18dafb912 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -16,12 +16,11 @@ 'use strict'; const RC = require('../RC'); -const HazelcastClient = require('../../').Client; +const Client = require('../../').Client; const expect = require('chai').expect; const fs = require('fs'); -const Long = require('long'); const Util = require('../Util'); -const DeferredPromise = require('../../lib/Util').DeferredPromise; +const { DeferredPromise } = require('../../lib/util/Util'); describe('LostInvalidation', function () { this.timeout(30000); @@ -71,7 +70,7 @@ describe('LostInvalidation', function () { }); beforeEach(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, nearCaches: { [mapName]: {} @@ -83,7 +82,7 @@ describe('LostInvalidation', function () { } }).then(function (resp) { client = resp; - return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + return Client.newHazelcastClient({ clusterName: cluster.id }); }).then(function (resp) { modifyingClient = resp; }); diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index 40e674136..50555d663 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -15,12 +15,12 @@ */ 'use strict'; -const RC = require('../RC'); -const HazelcastClient = require('../../').Client; const expect = require('chai').expect; const fs = require('fs'); +const RC = require('../RC'); +const { Client } = require('../../'); const Util = require('../Util'); -const DeferredPromise = require('../../lib/Util').DeferredPromise; +const { DeferredPromise } = require('../../lib/util/Util'); describe('MigratedDataTest', function () { @@ -76,7 +76,7 @@ describe('MigratedDataTest', function () { }); beforeEach(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, nearCaches: { [mapName]: {} diff --git a/test/nearcache/NearCacheTest.js b/test/nearcache/NearCacheTest.js index 83c6e893a..46c75b84b 100644 --- a/test/nearcache/NearCacheTest.js +++ b/test/nearcache/NearCacheTest.js @@ -20,14 +20,13 @@ const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); const expect = chai.expect; -const DataRecord = require('../../lib/nearcache/DataRecord').DataRecord; -const NearCacheImpl = require('../../lib/nearcache/NearCache').NearCacheImpl; -const { Config } = require('../..'); -const EvictionPolicy = Config.EvictionPolicy; -const SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; +const { DataRecord } = require('../../lib/nearcache/DataRecord'); +const { NearCacheImpl } = require('../../lib/nearcache/NearCache'); +const { EvictionPolicy, InMemoryFormat } = require('../..'); +const { SerializationServiceV1 } = require('../../lib/serialization/SerializationService'); const { NearCacheConfigImpl } = require('../../lib/config/NearCacheConfig'); const { SerializationConfigImpl } = require('../../lib/config/SerializationConfig'); -const promiseLater = require('../Util').promiseLater; +const { promiseLater } = require('../Util'); describe('NearCacheTest', function () { @@ -62,7 +61,7 @@ describe('NearCacheTest', function () { function createSerializationService() { const cfg = new SerializationConfigImpl(); - return new SerializationService(cfg); + return new SerializationServiceV1(cfg); } function promiseBefore(boundaryInSec, func) { @@ -241,7 +240,7 @@ describe('NearCacheTest', function () { it('Object', function () { const nearCacheConfig = new NearCacheConfigImpl(); - nearCacheConfig.inMemoryFormat = Config.InMemoryFormat.OBJECT; + nearCacheConfig.inMemoryFormat = InMemoryFormat.OBJECT; const nearCache = new NearCacheImpl(nearCacheConfig, createSerializationService()); nearCache.put(ds('k'), 'v'); expect(nearCache.internalStore.get(ds('k')).value).to.be.a('string'); @@ -249,7 +248,7 @@ describe('NearCacheTest', function () { it('Binary', function () { const nearCacheConfig = new NearCacheConfigImpl(); - nearCacheConfig.inMemoryFormat = Config.InMemoryFormat.BINARY; + nearCacheConfig.inMemoryFormat = InMemoryFormat.BINARY; const nearCache = new NearCacheImpl(nearCacheConfig, createSerializationService()); nearCache.put(ds('k'), 'v'); expect(nearCache.internalStore.get(ds('k')).value).to.not.be.a('string'); diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index 8a2159ec9..8a212bc19 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -18,12 +18,12 @@ const chai = require('chai'); chai.use(require('chai-as-promised')); const expect = require('chai').expect; -const RC = require('../RC'); -const Client = require('../../').Client; -const Errors = require('../..').HazelcastErrors; const fs = require('fs'); const path = require('path'); +const RC = require('../RC'); +const { Client, ConsistencyLostError } = require('../../'); + describe('PNCounterConsistencyTest', function () { let cluster; @@ -62,7 +62,7 @@ describe('PNCounterConsistencyTest', function () { const currentReplicaAddress = pnCounter.currentTargetReplicaAddress; return RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); }).then(function () { - return expect(pnCounter.addAndGet(10)).to.be.rejectedWith(Errors.ConsistencyLostError); + return expect(pnCounter.addAndGet(10)).to.be.rejectedWith(ConsistencyLostError); }); }); diff --git a/test/pncounter/PNCounterWithLiteMembersTest.js b/test/pncounter/PNCounterWithLiteMembersTest.js index 6383a2d14..82f62d249 100644 --- a/test/pncounter/PNCounterWithLiteMembersTest.js +++ b/test/pncounter/PNCounterWithLiteMembersTest.js @@ -18,12 +18,12 @@ const chai = require('chai'); chai.use(require('chai-as-promised')); const expect = chai.expect; -const RC = require('../RC'); -const Client = require('../..').Client; -const Errors = require('../..').HazelcastErrors; const fs = require('fs'); const path = require('path'); +const RC = require('../RC'); +const { Client, NoDataMemberInClusterError } = require('../..'); + describe('PNCounterWithLiteMembersTest', function () { let cluster; @@ -60,38 +60,38 @@ describe('PNCounterWithLiteMembersTest', function () { }); it('get throws NoDataMemberInClusterError', function () { - return expect(pncounter.get()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.get()).to.be.rejectedWith(NoDataMemberInClusterError); }); it('getAndAdd throws NoDataMemberInClusterError', function () { - return expect(pncounter.getAndAdd(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.getAndAdd(1)).to.be.rejectedWith(NoDataMemberInClusterError); }); it('addAndGet throws NoDataMemberInClusterError', function () { - return expect(pncounter.addAndGet(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.addAndGet(1)).to.be.rejectedWith(NoDataMemberInClusterError); }); it('getAndSubtract throws NoDataMemberInClusterError', function () { - return expect(pncounter.getAndSubtract(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.getAndSubtract(1)).to.be.rejectedWith(NoDataMemberInClusterError); }); it('subtractAndGet throws NoDataMemberInClusterError', function () { - return expect(pncounter.subtractAndGet(1)).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.subtractAndGet(1)).to.be.rejectedWith(NoDataMemberInClusterError); }); it('getAndDecrement throws NoDataMemberInClusterError', function () { - return expect(pncounter.getAndDecrement()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.getAndDecrement()).to.be.rejectedWith(NoDataMemberInClusterError); }); it('decrementAndGet throws NoDataMemberInClusterError', function () { - return expect(pncounter.decrementAndGet()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.decrementAndGet()).to.be.rejectedWith(NoDataMemberInClusterError); }); it('incrementAndGet throws NoDataMemberInClusterError', function () { - return expect(pncounter.incrementAndGet()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.incrementAndGet()).to.be.rejectedWith(NoDataMemberInClusterError); }); it('getAndIncrement throws NoDataMemberInClusterError', function () { - return expect(pncounter.getAndIncrement()).to.be.rejectedWith(Errors.NoDataMemberInClusterError); + return expect(pncounter.getAndIncrement()).to.be.rejectedWith(NoDataMemberInClusterError); }); }); diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index 45c2032ad..e3017a6b0 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -19,12 +19,12 @@ const chai = require('chai'); const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); -const RC = require('./../RC'); const Promise = require('bluebird'); const fs = require('fs'); +const RC = require('./../RC'); const { Client } = require('../../'); -const { ItemEventType } = require('../../lib/core/ItemListener'); +const { ItemEventType } = require('../../lib/proxy/ItemListener'); describe('QueueProxyTest', function () { diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js index fb4a4efb3..41250947a 100644 --- a/test/rest_value/RestValueTest.js +++ b/test/rest_value/RestValueTest.js @@ -22,7 +22,7 @@ const http = require('http'); const querystring = require('querystring'); const Client = require('../../lib').Client; const RC = require('../RC'); -const DeferredPromise = require('../../lib/Util').DeferredPromise; +const { DeferredPromise } = require('../../lib/util/Util'); describe('RestValueTest', function () { diff --git a/test/ringbuffer/LazyReadResultSetTest.js b/test/ringbuffer/LazyReadResultSetTest.js index fbda90e6a..f007c01e7 100644 --- a/test/ringbuffer/LazyReadResultSetTest.js +++ b/test/ringbuffer/LazyReadResultSetTest.js @@ -16,8 +16,7 @@ 'use strict'; const expect = require('chai').expect; -const LazyReadResultSet = require('../../lib/proxy/ringbuffer/LazyReadResultSet').LazyReadResultSet; -const Errors = require('../..').HazelcastErrors; +const { LazyReadResultSet } = require('../../lib/proxy/ringbuffer/LazyReadResultSet'); describe('LazyReadResultSetTest', function () { diff --git a/test/ringbuffer/RingbufferProxyTest.js b/test/ringbuffer/RingbufferProxyTest.js index 13f6cf38c..455d130be 100644 --- a/test/ringbuffer/RingbufferProxyTest.js +++ b/test/ringbuffer/RingbufferProxyTest.js @@ -16,11 +16,11 @@ 'use strict'; const { expect } = require('chai'); -const { Client, HazelcastErrors } = require('../../'); -const RC = require('./../RC'); +const Promise = require('bluebird'); const fs = require('fs'); +const { Client, StaleSequenceError } = require('../../'); +const RC = require('./../RC'); const PrefixFilter = require('../javaclasses/PrefixFilter'); -const Promise = require('bluebird'); describe('RingbufferProxyTest', function () { @@ -75,7 +75,7 @@ describe('RingbufferProxyTest', function () { await limitedCapacityRb.readOne(0); return Promise.reject('Test failed as readOne did not throw'); } catch (e) { - expect(e).to.be.an.instanceof(HazelcastErrors.StaleSequenceError); + expect(e).to.be.an.instanceof(StaleSequenceError); } }); diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index 7cc1be8b0..9cb3f337d 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -15,10 +15,9 @@ */ 'use strict'; -const Client = require('../../.').Client; -const RC = require('../RC'); const expect = require('chai').expect; -const RestValue = require('../../lib/core/RestValue').RestValue; +const RC = require('../RC'); +const { Client, RestValue } = require('../../'); describe('DefaultSerializersLiveTest', function () { diff --git a/test/serialization/config/CustomSerializerConfigTest.js b/test/serialization/config/CustomSerializerConfigTest.js index 78f62ddb3..63bbaec5f 100644 --- a/test/serialization/config/CustomSerializerConfigTest.js +++ b/test/serialization/config/CustomSerializerConfigTest.js @@ -17,7 +17,7 @@ const expect = require('chai').expect; const RC = require('../../RC'); -const Client = require('../../../').Client; +const { Client } = require('../../../'); const { Musician, MusicianSerializer } = require('./Musician'); describe('CustomSerializerConfigTest', function () { diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index 2845241be..bb8d200c4 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -18,7 +18,7 @@ const expect = require('chai').expect; const RC = require('./../RC'); const { Client } = require('../../'); -const { ItemEventType } = require('../../lib/core/ItemListener'); +const { ItemEventType } = require('../../lib/proxy/ItemListener'); describe('SetProxyTest', function () { diff --git a/test/ssl/BasicSSLOptionsFactoryTest.js b/test/ssl/BasicSSLOptionsFactoryTest.js index b8e0fa477..d3cc4c00e 100644 --- a/test/ssl/BasicSSLOptionsFactoryTest.js +++ b/test/ssl/BasicSSLOptionsFactoryTest.js @@ -18,8 +18,7 @@ const chai = require("chai"); const expect = chai.expect; const path = require('path'); -const HazelcastError = require('../..').HazelcastErrors.HazelcastError; -const BasicSSLOptionsFactory = require('../../lib/connection/BasicSSLOptionsFactory').BasicSSLOptionsFactory; +const { HazelcastError, BasicSSLOptionsFactory } = require('../..'); describe('BasicSSLOptionsFactoryTest', function () { diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index 7299d7d47..e38a5b7d4 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -15,17 +15,16 @@ */ 'use strict'; -const chai = require("chai"); +const chai = require('chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); +const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); const fs = require('fs'); const path = require('path'); -const Client = require("../../.").Client; const RC = require('./../RC'); -const Errors = require('../..').HazelcastErrors; -const markEnterprise = require('../Util').markEnterprise; +const { Client, IllegalStateError } = require('../../'); +const { markEnterprise } = require('../Util'); describe('ClientSSLAuthenticationTest', function () { @@ -129,7 +128,7 @@ describe('ClientSSLAuthenticationTest', function () { return createMemberWithXML(maRequiredXML).then(function () { return expect(Client.newHazelcastClient(createClientConfigFn( './client1-key.pem', './client1-cert.pem', './server2-cert.pem' - ))).to.be.rejectedWith(Errors.IllegalStateError); + ))).to.be.rejectedWith(IllegalStateError); }); }); @@ -137,7 +136,7 @@ describe('ClientSSLAuthenticationTest', function () { return createMemberWithXML(maRequiredXML).then(function () { return expect(Client.newHazelcastClient(createClientConfigFn( './client2-key.pem', './client2-cert.pem', './server1-cert.pem' - ))).to.be.rejectedWith(Errors.IllegalStateError); + ))).to.be.rejectedWith(IllegalStateError); }); }); @@ -145,7 +144,7 @@ describe('ClientSSLAuthenticationTest', function () { return createMemberWithXML(maRequiredXML).then(function () { return expect(Client.newHazelcastClient(createClientConfigFn( './client2-key.pem', './client2-cert.pem', './server2-cert.pem' - ))).to.be.rejectedWith(Errors.IllegalStateError); + ))).to.be.rejectedWith(IllegalStateError); }); }); @@ -163,7 +162,7 @@ describe('ClientSSLAuthenticationTest', function () { return createMemberWithXML(maOptionalXML).then(function () { return expect(Client.newHazelcastClient(createClientConfigFn( './client1-key.pem', './client1-cert.pem', './server2-cert.pem' - ))).to.be.rejectedWith(Errors.IllegalStateError); + ))).to.be.rejectedWith(IllegalStateError); }); }); @@ -171,7 +170,7 @@ describe('ClientSSLAuthenticationTest', function () { return createMemberWithXML(maOptionalXML).then(function () { return expect(Client.newHazelcastClient(createClientConfigFn( './client2-key.pem', './client2-cert.pem', './server1-cert.pem' - ))).to.be.rejectedWith(Errors.IllegalStateError); + ))).to.be.rejectedWith(IllegalStateError); }); }); @@ -179,7 +178,7 @@ describe('ClientSSLAuthenticationTest', function () { return createMemberWithXML(maOptionalXML).then(function () { return expect(Client.newHazelcastClient(createClientConfigFn( './client2-key.pem', './client2-cert.pem', './server2-cert.pem' - ))).to.be.rejectedWith(Errors.IllegalStateError); + ))).to.be.rejectedWith(IllegalStateError); }); }); }); diff --git a/test/ssl/ClientSSLTest.js b/test/ssl/ClientSSLTest.js index dc81e5562..d9d2e33e2 100644 --- a/test/ssl/ClientSSLTest.js +++ b/test/ssl/ClientSSLTest.js @@ -20,11 +20,9 @@ chai.use(require('chai-as-promised')); const expect = chai.expect; const fs = require('fs'); -const markEnterprise = require('../Util').markEnterprise; const RC = require('./../RC'); - -const HazelcastClient = require("../../").Client; -const Errors = require('../..').HazelcastErrors; +const { Client, IllegalStateError } = require("../../"); +const { markEnterprise } = require('../Util'); describe('ClientSSLTest', function () { @@ -62,7 +60,7 @@ describe('ClientSSLTest', function () { .replace('[serverCertificate]', 'com/hazelcast/nio/ssl-mutual-auth/server1.keystore') .replace('[password]', 'password'); return createCluster(sConfig).then(function () { - return expect(HazelcastClient.newHazelcastClient({ + return expect(Client.newHazelcastClient({ clusterName: cluster.id, network: { clusterMembers: ['127.0.0.1:5701'], @@ -75,7 +73,7 @@ describe('ClientSSLTest', function () { clusterConnectTimeoutMillis: 1000 } } - })).to.be.rejectedWith(Errors.IllegalStateError); + })).to.be.rejectedWith(IllegalStateError); }) }); @@ -84,7 +82,7 @@ describe('ClientSSLTest', function () { .replace('[serverCertificate]', 'com/hazelcast/nio/ssl/letsencrypt.jks') .replace('[password]', '123456'); return createCluster(sConfig).then(function () { - return HazelcastClient.newHazelcastClient({ + return Client.newHazelcastClient({ clusterName: cluster.id, network: { clusterMembers: ['127.0.0.1:5701'], diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index 54f4a1e0b..daf2c5987 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -15,15 +15,14 @@ */ 'use strict'; -const Statistics = require("../../lib/statistics/Statistics").Statistics; const expect = require('chai').expect; -const BuildInfo = require('../../lib/BuildInfo').BuildInfo; +const os = require('os'); const RC = require('../RC'); -const Client = require('../../').Client; +const { Client } = require('../../'); +const { BuildInfo } = require('../../lib/BuildInfo'); +const { Statistics } = require("../../lib/statistics/Statistics"); const TestUtil = require('../Util'); -const Util = require('../../lib/Util'); -const os = require('os'); function getClientStatisticsFromServer(cluster, client) { const clientUuid = client.getConnectionManager().getClientUuid(); @@ -137,11 +136,7 @@ describe('StatisticsTest (default period)', function () { expect(extractStringStatValue(stats, 'os.freeSwapSpaceSize')).to.equal(''); expect(extractStringStatValue(stats, 'os.maxFileDescriptorCount')).to.equal(''); expect(extractStringStatValue(stats, 'os.openFileDescriptorCount')).to.equal(''); - if (Util.getNodejsMajorVersion() >= 6) { - expect(extractIntStatValue(stats, 'os.processCpuTime')).to.greaterThan(1000); - } else { - expect(extractStringStatValue(stats, 'os.processCpuTime')).to.equal(''); - } + expect(extractIntStatValue(stats, 'os.processCpuTime')).to.greaterThan(1000); expect(extractFloatStatValue(stats, 'os.systemLoadAverage')).to.be.greaterThan(0); expect(extractIntStatValue(stats, 'os.totalPhysicalMemorySize')).to.equal(os.totalmem()); expect(extractStringStatValue(stats, 'os.totalSwapSpaceSize')).to.equal(''); diff --git a/test/topic/ReliableTopicTest.js b/test/topic/ReliableTopicTest.js index 6cf9b5a20..1d8cdd44f 100644 --- a/test/topic/ReliableTopicTest.js +++ b/test/topic/ReliableTopicTest.js @@ -20,8 +20,7 @@ const fs = require('fs'); const Long = require('long'); const RC = require('./../RC'); -const { Client } = require('../..'); -const { TopicOverloadPolicy: { TopicOverloadPolicy } } = require('../..'); +const { Client, TopicOverloadPolicy } = require('../..'); const { ReliableTopicMessage } = require('../../lib/proxy/topic/ReliableTopicMessage'); describe('ReliableTopicTest', function () { diff --git a/test/unit/AddressHelperTest.js b/test/unit/AddressHelperTest.js index f352d0e39..76e99db2f 100644 --- a/test/unit/AddressHelperTest.js +++ b/test/unit/AddressHelperTest.js @@ -15,10 +15,11 @@ */ 'use strict'; -const AddressHelper = require('../../lib/Util').AddressHelper; +const { AddressHelper } = require('../../lib/util/Util'); const expect = require('chai').expect; -describe('AddressHelper', function () { +describe('AddressHelperTest', function () { + const v4Address = '127.0.0.1'; const v6Address = '2001:0db8:85a3:0000:0000:8a2e:0370:7334'; const port = 8080; diff --git a/test/unit/protocol/ClientMessageFramingTest.js b/test/unit/protocol/ClientMessageFramingTest.js index 7567fe985..362184758 100644 --- a/test/unit/protocol/ClientMessageFramingTest.js +++ b/test/unit/protocol/ClientMessageFramingTest.js @@ -16,30 +16,30 @@ 'use strict'; -const cm = require('../../../lib/ClientMessage'); const expect = require('chai').expect; const Long = require('long'); -const HeapData = require('../../../lib/serialization/HeapData').HeapData; -const UUID = require('../../../lib/core/UUID').UUID; -const ErrorHolder = require('../../../lib/protocol/ErrorHolder').ErrorHolder; -const FixSizedTypesCodec = require('../../../lib/codec/builtin/FixSizedTypesCodec').FixSizedTypesCodec; -const StringCodec = require('../../../lib/codec/builtin/StringCodec').StringCodec; -const ByteArrayCodec = require('../../../lib/codec/builtin/ByteArrayCodec').ByteArrayCodec; -const DataCodec = require('../../../lib/codec/builtin/DataCodec').DataCodec; -const EntryListCodec = require('../../../lib/codec/builtin/EntryListCodec').EntryListCodec; -const EntryListIntegerLongCodec = require('../../../lib/codec/builtin/EntryListIntegerLongCodec').EntryListIntegerLongCodec; -const EntryListIntegerUUIDCodec = require('../../../lib/codec/builtin/EntryListIntegerUUIDCodec').EntryListIntegerUUIDCodec; -const EntryListUUIDListIntegerCodec = require('../../../lib/codec/builtin/EntryListUUIDListIntegerCodec').EntryListUUIDListIntegerCodec; -const EntryListUUIDLongCodec = require('../../../lib/codec/builtin/EntryListUUIDLongCodec').EntryListUUIDLongCodec; -const ListMultiFrameCodec = require('../../../lib/codec/builtin/ListMultiFrameCodec').ListMultiFrameCodec; -const ErrorHolderCodec = require('../../../lib/codec/custom/ErrorHolderCodec').ErrorHolderCodec; -const ErrorsCodec = require('../../../lib/codec/builtin/ErrorsCodec').ErrorsCodec; -const ListIntegerCodec = require('../../../lib/codec/builtin/ListIntegerCodec').ListIntegerCodec; -const ListLongCodec = require('../../../lib/codec/builtin/ListLongCodec').ListLongCodec; -const ListUUIDCodec = require('../../../lib/codec/builtin/ListUUIDCodec').ListUUIDCodec; -const MapCodec = require('../../../lib/codec/builtin/MapCodec').MapCodec; -const CodecUtil = require('../../../lib/codec/builtin/CodecUtil').CodecUtil; +const cm = require('../../../lib/protocol/ClientMessage'); +const { HeapData } = require('../../../lib/serialization/HeapData'); +const { UUID } = require('../../../lib/core/UUID'); +const { ErrorHolder } = require('../../../lib/protocol/ErrorHolder'); +const { FixSizedTypesCodec } = require('../../../lib/codec/builtin/FixSizedTypesCodec'); +const { StringCodec } = require('../../../lib/codec/builtin/StringCodec'); +const { ByteArrayCodec } = require('../../../lib/codec/builtin/ByteArrayCodec'); +const { DataCodec } = require('../../../lib/codec/builtin/DataCodec'); +const { EntryListCodec } = require('../../../lib/codec/builtin/EntryListCodec'); +const { EntryListIntegerLongCodec } = require('../../../lib/codec/builtin/EntryListIntegerLongCodec'); +const { EntryListIntegerUUIDCodec } = require('../../../lib/codec/builtin/EntryListIntegerUUIDCodec'); +const { EntryListUUIDListIntegerCodec } = require('../../../lib/codec/builtin/EntryListUUIDListIntegerCodec'); +const { EntryListUUIDLongCodec } = require('../../../lib/codec/builtin/EntryListUUIDLongCodec'); +const { ListMultiFrameCodec } = require('../../../lib/codec/builtin/ListMultiFrameCodec'); +const { ErrorHolderCodec } = require('../../../lib/codec/custom/ErrorHolderCodec'); +const { ErrorsCodec } = require('../../../lib/codec/builtin/ErrorsCodec'); +const { ListIntegerCodec } = require('../../../lib/codec/builtin/ListIntegerCodec'); +const { ListLongCodec } = require('../../../lib/codec/builtin/ListLongCodec'); +const { ListUUIDCodec } = require('../../../lib/codec/builtin/ListUUIDCodec'); +const { MapCodec } = require('../../../lib/codec/builtin/MapCodec'); +const { CodecUtil } = require('../../../lib/codec/builtin/CodecUtil'); describe('ClientMessageFramingTest', function () { let message; diff --git a/test/unit/protocol/ClientMessageTest.js b/test/unit/protocol/ClientMessageTest.js index c0c4388eb..5895bd732 100644 --- a/test/unit/protocol/ClientMessageTest.js +++ b/test/unit/protocol/ClientMessageTest.js @@ -16,18 +16,18 @@ 'use strict'; -const cm = require('../../../lib/ClientMessage'); const expect = require('chai').expect; const Long = require('long'); -const CodecUtil = require('../../../lib/codec/builtin/CodecUtil').CodecUtil; -const ClientMessage = cm.ClientMessage; -const Frame = cm.Frame; -const BEGIN_FRAME = cm.BEGIN_FRAME; -const END_FRAME = cm.END_FRAME; +const { + ClientMessage, + Frame, + BEGIN_FRAME, + END_FRAME +} = require('../../../lib/protocol/ClientMessage'); +const { CodecUtil } = require('../../../lib/codec/builtin/CodecUtil'); - -describe('ClientMessage', function () { +describe('ClientMessageTest', function () { it('should be encoded and decoded', function () { const cmEncode = ClientMessage.createForEncode(); diff --git a/test/user_code/UserCodeTest.ts b/test/user_code/UserCodeTest.ts index 520815419..9d9d076cf 100644 --- a/test/user_code/UserCodeTest.ts +++ b/test/user_code/UserCodeTest.ts @@ -6,7 +6,7 @@ import { Client } from '../../lib'; -(async () => { +(async (): Promise => { const client = await Client.newHazelcastClient(); const rb = await client.getRingbuffer('my-rb'); await rb.add(1); From f682b11741385440a7a68fac48f270fcb99adbaf Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 20 Aug 2020 10:03:35 +0300 Subject: [PATCH 279/685] Add Buffer type support (#572) Also includes the following: * Fix null case handling in ObjectDataInput#readArray * Improve DataInput method consistency --- DOCUMENTATION.md | 22 +- src/serialization/Data.ts | 8 +- src/serialization/ObjectData.ts | 66 ++- src/serialization/Portable.ts | 4 +- src/serialization/SerializationService.ts | 2 + .../portable/ClassDefinitionWriter.ts | 3 +- .../portable/DefaultPortableReader.ts | 6 +- .../portable/DefaultPortableWriter.ts | 9 +- .../portable/MorphingPortableReader.ts | 7 +- src/util/Util.ts | 2 + test/serialization/APortable.js | 270 ++++++----- .../AnIdentifiedDataSerializable.js | 291 +++++------ test/serialization/BinaryCompatibilityTest.js | 84 ++-- .../DefaultSerializersLiveTest.js | 127 +++-- test/serialization/DefaultSerializersTest.js | 10 +- .../IdentifiedDataSerializableTest.js | 25 +- test/serialization/ObjectDataTest.js | 16 +- test/serialization/PortableObjects.js | 459 +++++++++--------- .../PortableSerializationTest.js | 35 +- test/serialization/ReferenceObjects.js | 2 +- 20 files changed, 751 insertions(+), 697 deletions(-) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 8b2753661..b54a89a76 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -553,18 +553,22 @@ In the following chapters you will learn the description of all options supporte Serialization is the process of converting an object into a stream of bytes to store the object in the memory, a file or database, or transmit it through the network. Its main purpose is to save the state of an object in order to be able to recreate it when needed. The reverse process is called deserialization. Hazelcast offers you its own native serialization methods. You will see these methods throughout this chapter. -Hazelcast serializes all your objects before sending them to the server. The `boolean`, `number`,`string` and `Long` types are serialized natively and you cannot override this behavior. The following table is the conversion of types for the Java server side. +Hazelcast serializes all your objects before sending them to the server. Certain types, like `boolean`, `number`, `string`, and `Long`, are serialized natively and you cannot override this behavior. The following table is the conversion of types for the Java server side. -| Node.js | Java | -|---------|-------------------------------------| -| boolean | Boolean | -| number | Byte, Short, Integer, Float, Double | -| string | String | -| Long | Long | +| Node.js | Java | +|-----------------|---------------------------------------| +| boolean | Boolean | +| number | Byte, Short, Integer, Float, Double | +| string | String | +| Long | Long | +| Buffer | byte[] | +| Object | com.hazelcast.core.HazelcastJsonValue | -> **NOTE: A `number` type is serialized as `Double` by default. You can configure this behavior using the `serialization.defaultNumberType` config option.** +> **NOTE: The `Long` type means the type provided by [long.js library](https://github.com/dcodeIO/long.js).** -Arrays of the above types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `long[]` and `string[]` for the Java server side, respectively. +> **NOTE: A `number` is serialized as `Double` by default. You can configure this behavior using the `serialization.defaultNumberType` config option.** + +Arrays of the `boolean`, `number`, `string`, and `Long` types can be serialized as `boolean[]`, `byte[]`, `short[]`, `int[]`, `float[]`, `double[]`, `string[]`, and `long[]` for the Java server side, respectively. **Serialization Priority** diff --git a/src/serialization/Data.ts b/src/serialization/Data.ts index f928c46ed..3bde5dc8c 100644 --- a/src/serialization/Data.ts +++ b/src/serialization/Data.ts @@ -89,9 +89,7 @@ export interface DataOutput { writeByte(byte: number): void; - writeByteArray(bytes: number[]): void; - - writeBytes(bytes: string): void; + writeByteArray(bytes: Buffer): void; writeChar(char: string): void; @@ -176,7 +174,7 @@ export interface DataInput { readByte(pos?: number): number; - readByteArray(pos?: number): number[]; + readByteArray(pos?: number): Buffer; readChar(pos?: number): string; @@ -219,4 +217,6 @@ export interface DataInput { skipBytes(count: number): void; + available(): number; + } diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index e0dbbb14f..c3a384a4b 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -27,6 +27,7 @@ const MASK_1BYTE = (1 << 8) - 1; /** @internal */ export class ObjectDataOutput implements DataOutput { + protected buffer: Buffer; protected bigEndian: boolean; private service: SerializationService; @@ -84,14 +85,13 @@ export class ObjectDataOutput implements DataOutput { this.write(byte); } - writeByteArray(bytes: number[]): void { - this.writeArray(this.writeByte, bytes); - } - - writeBytes(bytes: string): void { - const len = (bytes != null) ? bytes.length : 0; - for (let i = 0; i < len; i++) { - this.write(bytes.charCodeAt(i)); + writeByteArray(bytes: Buffer): void { + const len = (bytes != null) ? bytes.length : BitsUtil.NULL_ARRAY_LENGTH; + this.writeInt(len); + if (len > 0) { + this.ensureAvailable(len); + bytes.copy(this.buffer, this.pos); + this.pos += len; } } @@ -237,6 +237,7 @@ export class ObjectDataOutput implements DataOutput { /** @internal */ export class PositionalObjectDataOutput extends ObjectDataOutput implements PositionalDataOutput { + pwrite(position: number, byte: number | Buffer): void { if (Buffer.isBuffer(byte)) { byte.copy(this.buffer, position); @@ -297,7 +298,10 @@ export class ObjectDataInput implements DataInput { private bigEndian: boolean; private pos: number; - constructor(buffer: Buffer, offset: number, serializationService: SerializationService, isBigEndian: boolean) { + constructor(buffer: Buffer, + offset: number, + serializationService: SerializationService, + isBigEndian: boolean) { this.buffer = buffer; this.offset = offset; this.service = serializationService; @@ -338,8 +342,25 @@ export class ObjectDataInput implements DataInput { return this.read(pos); } - readByteArray(pos?: number): number[] { - return this.readArray(this.readByte, pos); + readByteArray(pos?: number): Buffer { + const backupPos = this.pos; + if (pos !== undefined) { + this.pos = pos; + } + const len = this.readInt(); + if (len === BitsUtil.NULL_ARRAY_LENGTH) { + if (pos !== undefined) { + this.pos = backupPos; + } + return null; + } + const buf = this.buffer.slice(this.pos, this.pos + len); + if (pos !== undefined) { + this.pos = backupPos; + } else { + this.pos += len; + } + return buf; } readChar(pos?: number): string { @@ -470,13 +491,10 @@ export class ObjectDataInput implements DataInput { if (len === BitsUtil.NULL_ARRAY_LENGTH) { return null; } - const result = this.buffer.toString('utf8', readPos, readPos + len); - if (pos === undefined) { this.pos += len; } - return result; } @@ -492,22 +510,30 @@ export class ObjectDataInput implements DataInput { this.pos += count; } - readCopy(other: Buffer, numBytes: number): void { - this.assertAvailable(numBytes, this.pos); - this.buffer.copy(other, 0, this.pos, this.pos + numBytes); - this.pos += numBytes; - } - available(): number { return this.buffer.length - this.pos; } + // used in binary compatibility tests + private readRaw(numOfBytes: number): Buffer { + this.assertAvailable(numOfBytes, this.pos); + const raw = this.buffer.slice(this.pos, this.pos + numOfBytes); + this.pos += numOfBytes; + return raw; + } + private readArray(func: Function, pos?: number): T[] { const backupPos = this.pos; if (pos !== undefined) { this.pos = pos; } const len = this.readInt(); + if (len === BitsUtil.NULL_ARRAY_LENGTH) { + if (pos !== undefined) { + this.pos = backupPos; + } + return null; + } const arr: T[] = []; for (let i = 0; i < len; i++) { arr.push(func.call(this)); diff --git a/src/serialization/Portable.ts b/src/serialization/Portable.ts index 8dd30753f..550965d97 100644 --- a/src/serialization/Portable.ts +++ b/src/serialization/Portable.ts @@ -68,7 +68,7 @@ export interface PortableWriter { writeNullPortable(fieldName: string, factoryId: number, classId: number): void; - writeByteArray(fieldName: string, bytes: number[]): void; + writeByteArray(fieldName: string, bytes: Buffer): void; writeBooleanArray(fieldName: string, booleans: boolean[]): void; @@ -121,7 +121,7 @@ export interface PortableReader { readPortable(fieldName: string): Portable; - readByteArray(fieldName: string): number[]; + readByteArray(fieldName: string): Buffer; readBooleanArray(fieldName: string): boolean[]; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index e04d60336..f2488196a 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -320,6 +320,8 @@ export class SerializationServiceV1 implements SerializationService { let convertedName: string; if (name === 'number') { convertedName = this.serializationConfig.defaultNumberType; + } else if (name === 'buffer') { + convertedName = 'byteArray'; } else { convertedName = name; } diff --git a/src/serialization/portable/ClassDefinitionWriter.ts b/src/serialization/portable/ClassDefinitionWriter.ts index d7cddfcf3..083e19dd7 100644 --- a/src/serialization/portable/ClassDefinitionWriter.ts +++ b/src/serialization/portable/ClassDefinitionWriter.ts @@ -24,6 +24,7 @@ import {HazelcastSerializationError} from '../../core'; /** @internal */ export class ClassDefinitionWriter implements PortableWriter { + private context: PortableContext; private builder: ClassDefinitionBuilder; @@ -88,7 +89,7 @@ export class ClassDefinitionWriter implements PortableWriter { this.builder.addPortableField(fieldName, nestedClassDef); } - writeByteArray(fieldName: string, bytes: number[]): void { + writeByteArray(fieldName: string, bytes: Buffer): void { this.builder.addByteArrayField(fieldName); } diff --git a/src/serialization/portable/DefaultPortableReader.ts b/src/serialization/portable/DefaultPortableReader.ts index 5c078ca02..99070cd35 100644 --- a/src/serialization/portable/DefaultPortableReader.ts +++ b/src/serialization/portable/DefaultPortableReader.ts @@ -34,7 +34,9 @@ export class DefaultPortableReader implements PortableReader { private finalPos: number; private raw = false; - constructor(serializer: PortableSerializer, input: DataInput, classDefinition: ClassDefinition) { + constructor(serializer: PortableSerializer, + input: DataInput, + classDefinition: ClassDefinition) { this.serializer = serializer; this.input = input; this.classDefinition = classDefinition; @@ -120,7 +122,7 @@ export class DefaultPortableReader implements PortableReader { } } - readByteArray(fieldName: string): number[] { + readByteArray(fieldName: string): Buffer { const pos = this.positionByField(fieldName, FieldType.BYTE_ARRAY); return this.input.readByteArray(pos); } diff --git a/src/serialization/portable/DefaultPortableWriter.ts b/src/serialization/portable/DefaultPortableWriter.ts index b22033b72..fc7dfd504 100644 --- a/src/serialization/portable/DefaultPortableWriter.ts +++ b/src/serialization/portable/DefaultPortableWriter.ts @@ -24,6 +24,7 @@ import * as Long from 'long'; /** @internal */ export class DefaultPortableWriter { + private serializer: PortableSerializer; private output: PositionalDataOutput; private classDefinition: ClassDefinition; @@ -31,7 +32,9 @@ export class DefaultPortableWriter { private offset: number; private begin: number; - constructor(serializer: PortableSerializer, output: PositionalDataOutput, classDefinition: ClassDefinition) { + constructor(serializer: PortableSerializer, + output: PositionalDataOutput, + classDefinition: ClassDefinition) { this.serializer = serializer; this.output = output; this.classDefinition = classDefinition; @@ -108,7 +111,7 @@ export class DefaultPortableWriter { this.output.writeInt(classId); } - writeByteArray(fieldName: string, bytes: number[]): void { + writeByteArray(fieldName: string, bytes: Buffer): void { this.setPosition(fieldName, FieldType.BYTE_ARRAY); this.output.writeByteArray(bytes); } @@ -185,7 +188,7 @@ export class DefaultPortableWriter { const index: number = field.getIndex(); this.output.pwriteInt(this.offset + index * BitsUtil.INT_SIZE_IN_BYTES, pos); this.output.writeShort(fieldName.length); - this.output.writeBytes(fieldName); + this.output.write(Buffer.from(fieldName)); this.output.writeByte(fieldType); return field; } diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index 3a0a47631..afdf6b2c4 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -24,7 +24,10 @@ import * as Long from 'long'; /** @internal */ export class MorphingPortableReader extends DefaultPortableReader { - constructor(portableSerializer: PortableSerializer, input: DataInput, classDefinition: ClassDefinition) { + + constructor(portableSerializer: PortableSerializer, + input: DataInput, + classDefinition: ClassDefinition) { super(portableSerializer, input, classDefinition); } @@ -165,7 +168,7 @@ export class MorphingPortableReader extends DefaultPortableReader { return this.validateCompatibleAndCall(fieldName, FieldType.BOOLEAN_ARRAY, super.readBooleanArray); } - readByteArray(fieldName: string): number[] { + readByteArray(fieldName: string): Buffer { return this.validateCompatibleAndCall(fieldName, FieldType.BYTE_ARRAY, super.readByteArray); } diff --git a/src/util/Util.ts b/src/util/Util.ts index 6744fd881..80432f62c 100644 --- a/src/util/Util.ts +++ b/src/util/Util.ts @@ -58,6 +58,8 @@ export function getType(obj: any): string { assertNotNull(obj); if (Long.isLong(obj)) { return 'long'; + } if (Buffer.isBuffer(obj)) { + return 'buffer'; } else { const t = typeof obj; if (t !== 'object') { diff --git a/test/serialization/APortable.js b/test/serialization/APortable.js index 20ff34c8c..d6fbd09b7 100644 --- a/test/serialization/APortable.js +++ b/test/serialization/APortable.js @@ -13,144 +13,146 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -function APortable(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, - doubles, shorts, floats, ints, longs, strings, portables, - identifiedDataSerializable, customStreamSerializableObject, - customByteArraySerializableObject, data) { - if (arguments.length === 0) return; - this.bool = bool; - this.b = b; - this.c = c; - this.d = d; - this.s = s; - this.f = f; - this.i = i; - this.l = l; - this.str = str; - this.p = p; - - this.booleans = booleans; - this.bytes = bytes; - this.chars = chars; - this.doubles = doubles; - this.shorts = shorts; - this.floats = floats; - this.ints = ints; - this.longs = longs; - this.strings = strings; - this.portables = portables; - - this.byteSize = bytes.length; - this.bytesFully = bytes; - this.bytesOffset = bytes.slice(1, 3); - this.strChars = str.split(''); - this.strBytes = Buffer.alloc(this.str.length); - for (let i = 0; i < str.length; i++) { - this.strBytes[i] = this.strChars[i].charCodeAt(0); +'use strict'; + +class APortable { + + constructor(bool, b, c, d, s, f, i, l, str, p, booleans, bytes, chars, + doubles, shorts, floats, ints, longs, strings, portables, + identifiedDataSerializable, customStreamSerializableObject, + customByteArraySerializableObject, data) { + if (arguments.length === 0) return; + this.bool = bool; + this.b = b; + this.c = c; + this.d = d; + this.s = s; + this.f = f; + this.i = i; + this.l = l; + this.str = str; + this.p = p; + + this.booleans = booleans; + this.bytes = bytes; + this.chars = chars; + this.doubles = doubles; + this.shorts = shorts; + this.floats = floats; + this.ints = ints; + this.longs = longs; + this.strings = strings; + this.portables = portables; + + this.byteSize = bytes.length; + this.bytesFully = bytes; + this.bytesOffset = bytes.slice(1, 3); + this.strChars = str.split(''); + this.strBytes = Buffer.alloc(this.str.length); + for (let i = 0; i < str.length; i++) { + this.strBytes[i] = this.strChars[i].charCodeAt(0); + } + + this.identifiedDataSerializableObject = identifiedDataSerializable; + this.portableObject = p; + this.customStreamSerializableObject = customStreamSerializableObject; + this.customByteArraySerializableObject = customByteArraySerializableObject; + + this.data = data; + + this.factoryId = 1; + this.classId = 1; } - this.identifiedDataSerializableObject = identifiedDataSerializable; - this.portableObject = p; - this.customStreamSerializableObject = customStreamSerializableObject; - this.customByteArraySerializableObject = customByteArraySerializableObject; + readPortable(reader) { + this.bool = reader.readBoolean('bool'); + this.b = reader.readByte('b'); + this.c = reader.readChar('c'); + this.d = reader.readDouble('d'); + this.s = reader.readShort('s'); + this.f = reader.readFloat('f'); + this.i = reader.readInt('i'); + this.l = reader.readLong('l'); + this.str = reader.readUTF('str'); + this.p = reader.readPortable('p'); + + this.booleans = reader.readBooleanArray('booleans'); + this.bytes = reader.readByteArray('bs'); + this.chars = reader.readCharArray('cs'); + this.doubles = reader.readDoubleArray('ds'); + this.shorts = reader.readShortArray('ss'); + this.floats = reader.readFloatArray('fs'); + this.ints = reader.readIntArray('is'); + this.longs = reader.readLongArray('ls'); + this.strings = reader.readUTFArray('strs'); + this.portables = reader.readPortableArray('ps'); + + this.booleansNull = reader.readBooleanArray('booleansNull'); + this.bytesNull = reader.readByteArray('bsNull'); + this.charsNull = reader.readCharArray('csNull'); + this.doublesNull = reader.readDoubleArray('dsNull'); + this.shortsNull = reader.readShortArray('ssNull'); + this.floatsNull = reader.readFloatArray('fsNull'); + this.intsNull = reader.readIntArray('isNull'); + this.longsNull = reader.readLongArray('lsNull'); + this.stringsNull = reader.readUTFArray('strsNull'); + + const dataInput = reader.getRawDataInput(); + + this.bool = dataInput.readBoolean(); + this.b = dataInput.readByte(); + this.c = dataInput.readChar(); + this.d = dataInput.readDouble(); + this.s = dataInput.readShort(); + this.f = dataInput.readFloat(); + this.i = dataInput.readInt(); + this.l = dataInput.readLong(); + this.str = dataInput.readUTF(); + + this.booleans = dataInput.readBooleanArray(); + this.bytes = dataInput.readByteArray(); + this.chars = dataInput.readCharArray(); + this.doubles = dataInput.readDoubleArray(); + this.shorts = dataInput.readShortArray(); + this.floats = dataInput.readFloatArray(); + this.ints = dataInput.readIntArray(); + this.longs = dataInput.readLongArray(); + this.strings = dataInput.readUTFArray(); + + this.booleansNull = dataInput.readBooleanArray(); + this.bytesNull = dataInput.readByteArray(); + this.charsNull = dataInput.readCharArray(); + this.doublesNull = dataInput.readDoubleArray(); + this.shortsNull = dataInput.readShortArray(); + this.floatsNull = dataInput.readFloatArray(); + this.intsNull = dataInput.readIntArray(); + this.longsNull = dataInput.readLongArray(); + this.stringsNull = dataInput.readUTFArray(); + + this.byteSize = dataInput.readByte(); + this.bytesFully = dataInput.readRaw(this.byteSize); + this.bytesOffset = dataInput.readRaw(2); + const strSize = dataInput.readInt(); + this.strChars = Buffer.alloc(strSize); + for (let j = 0; j < strSize; j++) { + this.strChars[j] = dataInput.readChar(); + } + this.strBytes = dataInput.readRaw(strSize); + this.unsignedByte = dataInput.readUnsignedByte(); + this.unsignedShort = dataInput.readUnsignedShort(); + + this.portableObject = dataInput.readObject(); + this.identifiedDataSerializableObject = dataInput.readObject(); + this.customByteArraySerializableObject = dataInput.readObject(); + this.customStreamSerializableObject = dataInput.readObject(); + + this.data = dataInput.readData(); + } - this.data = data; + writeData(writer) { + // no-op + } - this.factoryId = 1; - this.classId = 1; } -APortable.prototype.readPortable = function (reader) { - this.bool = reader.readBoolean("bool"); - this.b = reader.readByte("b"); - this.c = reader.readChar("c"); - this.d = reader.readDouble("d"); - this.s = reader.readShort("s"); - this.f = reader.readFloat("f"); - this.i = reader.readInt("i"); - this.l = reader.readLong("l"); - this.str = reader.readUTF("str"); - this.p = reader.readPortable("p"); - - this.booleans = reader.readBooleanArray("booleans"); - this.bytes = reader.readByteArray("bs"); - this.chars = reader.readCharArray("cs"); - this.doubles = reader.readDoubleArray("ds"); - this.shorts = reader.readShortArray("ss"); - this.floats = reader.readFloatArray("fs"); - this.ints = reader.readIntArray("is"); - this.longs = reader.readLongArray("ls"); - this.strings = reader.readUTFArray("strs"); - this.portables = reader.readPortableArray("ps"); - - this.booleansNull = reader.readBooleanArray("booleansNull"); - this.bytesNull = reader.readByteArray("bsNull"); - this.charsNull = reader.readCharArray("csNull"); - this.doublesNull = reader.readDoubleArray("dsNull"); - this.shortsNull = reader.readShortArray("ssNull"); - this.floatsNull = reader.readFloatArray("fsNull"); - this.intsNull = reader.readIntArray("isNull"); - this.longsNull = reader.readLongArray("lsNull"); - this.stringsNull = reader.readUTFArray("strsNull"); - - const dataInput = reader.getRawDataInput(); - - this.bool = dataInput.readBoolean(); - this.b = dataInput.readByte(); - this.c = dataInput.readChar(); - this.d = dataInput.readDouble(); - this.s = dataInput.readShort(); - this.f = dataInput.readFloat(); - this.i = dataInput.readInt(); - this.l = dataInput.readLong(); - this.str = dataInput.readUTF(); - - this.booleans = dataInput.readBooleanArray(); - this.bytes = dataInput.readByteArray(); - this.chars = dataInput.readCharArray(); - this.doubles = dataInput.readDoubleArray(); - this.shorts = dataInput.readShortArray(); - this.floats = dataInput.readFloatArray(); - this.ints = dataInput.readIntArray(); - this.longs = dataInput.readLongArray(); - this.strings = dataInput.readUTFArray(); - - this.booleansNull = dataInput.readBooleanArray(); - this.bytesNull = dataInput.readByteArray(); - this.charsNull = dataInput.readCharArray(); - this.doublesNull = dataInput.readDoubleArray(); - this.shortsNull = dataInput.readShortArray(); - this.floatsNull = dataInput.readFloatArray(); - this.intsNull = dataInput.readIntArray(); - this.longsNull = dataInput.readLongArray(); - this.stringsNull = dataInput.readUTFArray(); - - this.byteSize = dataInput.readByte(); - this.bytesFully = Buffer.alloc(this.byteSize); - dataInput.readCopy(this.bytesFully, this.byteSize); - this.bytesOffset = Buffer.alloc(2); - dataInput.readCopy(this.bytesOffset, 2); - const strSize = dataInput.readInt(); - this.strChars = Buffer.alloc(strSize); - for (let j = 0; j < strSize; j++) { - this.strChars[j] = dataInput.readChar(); - } - this.strBytes = Buffer.alloc(strSize); - dataInput.readCopy(this.strBytes, strSize); - this.unsignedByte = dataInput.readUnsignedByte(); - this.unsignedShort = dataInput.readUnsignedShort(); - - this.portableObject = dataInput.readObject(); - this.identifiedDataSerializableObject = dataInput.readObject(); - this.customByteArraySerializableObject = dataInput.readObject(); - this.customStreamSerializableObject = dataInput.readObject(); - - this.data = dataInput.readData(); -}; - -APortable.prototype.writeData = function (writer) { - // no-op -}; - module.exports = APortable; diff --git a/test/serialization/AnIdentifiedDataSerializable.js b/test/serialization/AnIdentifiedDataSerializable.js index 19ef6777e..f8e670629 100644 --- a/test/serialization/AnIdentifiedDataSerializable.js +++ b/test/serialization/AnIdentifiedDataSerializable.js @@ -15,153 +15,154 @@ */ 'use strict'; -function AnIdentifiedDataSerializable(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, - doubles, shorts, floats, ints, longs, strings, portable, - identifiedDataSerializable, customStreamSerializable, - customByteArraySerializableObject, data) { - if (arguments.length === 0) return; - this.bool = bool; - this.b = b; - this.c = c; - this.d = d; - this.s = s; - this.f = f; - this.i = i; - this.l = l; - this.str = str; - - this.booleans = booleans; - this.bytes = bytes; - this.chars = chars; - this.doubles = doubles; - this.shorts = shorts; - this.floats = floats; - this.ints = ints; - this.longs = longs; - this.strings = strings; - - this.byteSize = bytes.length; - this.bytesFully = bytes; - this.bytesOffset = bytes.slice(1, 3); - this.strChars = str.split(''); - this.strBytes = Buffer.alloc(this.str.length); - for (let i = 0; i < str.length; i++) { - this.strBytes[i] = this.strChars[i].charCodeAt(0); +class AnIdentifiedDataSerializable { + + constructor(bool, b, c, d, s, f, i, l, str, booleans, bytes, chars, + doubles, shorts, floats, ints, longs, strings, portable, + identifiedDataSerializable, customStreamSerializable, + customByteArraySerializableObject, data) { + if (arguments.length === 0) return; + this.bool = bool; + this.b = b; + this.c = c; + this.d = d; + this.s = s; + this.f = f; + this.i = i; + this.l = l; + this.str = str; + + this.booleans = booleans; + this.bytes = bytes; + this.chars = chars; + this.doubles = doubles; + this.shorts = shorts; + this.floats = floats; + this.ints = ints; + this.longs = longs; + this.strings = strings; + + this.byteSize = bytes.length; + this.bytesFully = bytes; + this.bytesOffset = bytes.slice(1, 3); + this.strChars = str.split(''); + this.strBytes = Buffer.alloc(this.str.length); + for (let i = 0; i < str.length; i++) { + this.strBytes[i] = this.strChars[i].charCodeAt(0); + } + this.unsignedByte = 137; + this.unsignedShort = 32867; + this.portableObject = portable; + this.identifiedDataSerializableObject = identifiedDataSerializable; + this.customStreamSerializableObject = customStreamSerializable; + this.customByteArraySerializableObject = customByteArraySerializableObject; + this.data = data; + + this.factoryId = 1; + this.classId = 1; + } + + readData(dataInput) { + this.bool = dataInput.readBoolean(); + this.b = dataInput.readByte(); + this.c = dataInput.readChar(); + this.d = dataInput.readDouble(); + this.s = dataInput.readShort(); + this.f = dataInput.readFloat(); + this.i = dataInput.readInt(); + this.l = dataInput.readLong(); + this.str = dataInput.readUTF(); + + this.booleans = dataInput.readBooleanArray(); + this.bytes = dataInput.readByteArray(); + this.chars = dataInput.readCharArray(); + this.doubles = dataInput.readDoubleArray(); + this.shorts = dataInput.readShortArray(); + this.floats = dataInput.readFloatArray(); + this.ints = dataInput.readIntArray(); + this.longs = dataInput.readLongArray(); + this.strings = dataInput.readUTFArray(); + + this.booleansNull = dataInput.readBooleanArray(); + this.bytesNull = dataInput.readByteArray(); + this.charsNull = dataInput.readCharArray(); + this.doublesNull = dataInput.readDoubleArray(); + this.shortsNull = dataInput.readShortArray(); + this.floatsNull = dataInput.readFloatArray(); + this.intsNull = dataInput.readIntArray(); + this.longsNull = dataInput.readLongArray(); + this.stringsNull = dataInput.readUTFArray(); + + this.byteSize = dataInput.readByte(); + this.bytesFully = dataInput.readRaw(this.byteSize); + this.bytesOffset = dataInput.readRaw(2); + this.strSize = dataInput.readInt(); + this.strChars = []; + for (let j = 0; j < this.strSize; j++) { + this.strChars[j] = dataInput.readChar(); + } + this.strBytes = dataInput.readRaw(this.strSize); + this.unsignedByte = dataInput.readUnsignedByte(); + this.unsignedShort = dataInput.readUnsignedShort(); + + this.portableObject = dataInput.readObject(); + this.identifiedDataSerializableObject = dataInput.readObject(); + this.customByteArraySerializableObject = dataInput.readObject(); + this.customStreamSerializableObject = dataInput.readObject(); + + this.data = dataInput.readData(); } - this.unsignedByte = 137; - this.unsignedShort = 32867; - this.portableObject = portable; - this.identifiedDataSerializableObject = identifiedDataSerializable; - this.customStreamSerializableObject = customStreamSerializable; - this.customByteArraySerializableObject = customByteArraySerializableObject; - this.data = data; - - this.factoryId = 1; - this.classId = 1; -} -AnIdentifiedDataSerializable.prototype.readData = function (dataInput) { - this.bool = dataInput.readBoolean(); - this.b = dataInput.readByte(); - this.c = dataInput.readChar(); - this.d = dataInput.readDouble(); - this.s = dataInput.readShort(); - this.f = dataInput.readFloat(); - this.i = dataInput.readInt(); - this.l = dataInput.readLong(); - this.str = dataInput.readUTF(); - - this.booleans = dataInput.readBooleanArray(); - this.bytes = dataInput.readByteArray(); - this.chars = dataInput.readCharArray(); - this.doubles = dataInput.readDoubleArray(); - this.shorts = dataInput.readShortArray(); - this.floats = dataInput.readFloatArray(); - this.ints = dataInput.readIntArray(); - this.longs = dataInput.readLongArray(); - this.strings = dataInput.readUTFArray(); - - this.booleansNull = dataInput.readBooleanArray(); - this.bytesNull = dataInput.readByteArray(); - this.charsNull = dataInput.readCharArray(); - this.doublesNull = dataInput.readDoubleArray(); - this.shortsNull = dataInput.readShortArray(); - this.floatsNull = dataInput.readFloatArray(); - this.intsNull = dataInput.readIntArray(); - this.longsNull = dataInput.readLongArray(); - this.stringsNull = dataInput.readUTFArray(); - - this.byteSize = dataInput.readByte(); - this.bytesFully = Buffer.alloc(this.byteSize); - dataInput.readCopy(this.bytesFully, this.byteSize); - this.bytesOffset = Buffer.alloc(2); - dataInput.readCopy(this.bytesOffset, 2); - this.strSize = dataInput.readInt(); - this.strChars = []; - for (let j = 0; j < this.strSize; j++) { - this.strChars[j] = dataInput.readChar(); + writeData(dataOutput) { + dataOutput.writeBoolean(this.bool); + dataOutput.writeByte(this.b); + dataOutput.writeChar(this.c); + dataOutput.writeDouble(this.d); + dataOutput.writeShort(this.s); + dataOutput.writeFloat(this.f); + dataOutput.writeInt(this.i); + dataOutput.writeLong(this.l); + dataOutput.writeUTF(this.str); + + dataOutput.writeBooleanArray(this.booleans); + dataOutput.writeByteArray(this.bytes); + dataOutput.writeCharArray(this.chars); + dataOutput.writeDoubleArray(this.doubles); + dataOutput.writeShortArray(this.shorts); + dataOutput.writeFloatArray(this.floats); + dataOutput.writeIntArray(this.ints); + dataOutput.writeLongArray(this.longs); + dataOutput.writeUTFArray(this.strings); + + dataOutput.writeBooleanArray(this.booleansNull); + dataOutput.writeByteArray(this.bytesNull); + dataOutput.writeCharArray(this.charsNull); + dataOutput.writeDoubleArray(this.doublesNull); + dataOutput.writeShortArray(this.shortsNull); + dataOutput.writeFloatArray(this.floatsNull); + dataOutput.writeIntArray(this.intsNull); + dataOutput.writeLongArray(this.longsNull); + dataOutput.writeUTFArray(this.stringsNull); + + const byteSize = this.bytes.length; + dataOutput.write(byteSize); + dataOutput.write(this.bytes); + dataOutput.write(this.bytes[1]); + dataOutput.write(this.bytes[2]); + dataOutput.writeInt(this.str.length); + dataOutput.writeChars(this.str); + dataOutput.writeBytes(this.str); + dataOutput.writeByte(this.unsignedByte); + dataOutput.writeShort(this.unsignedShort); + + dataOutput.writeObject(this.portableObject); + dataOutput.writeObject(this.identifiedDataSerializableObject); + dataOutput.writeObject(this.customByteArraySerializableObject); + dataOutput.writeObject(this.customStreamSerializableObject); + + dataOutput.writeData(this.data); } - this.strBytes = Buffer.alloc(this.strSize); - dataInput.readCopy(this.strBytes, this.strSize); - this.unsignedByte = dataInput.readUnsignedByte(); - this.unsignedShort = dataInput.readUnsignedShort(); - - this.portableObject = dataInput.readObject(); - this.identifiedDataSerializableObject = dataInput.readObject(); - this.customByteArraySerializableObject = dataInput.readObject(); - this.customStreamSerializableObject = dataInput.readObject(); - - this.data = dataInput.readData(); -}; - -AnIdentifiedDataSerializable.prototype.writeData = function (dataOutput) { - dataOutput.writeBoolean(this.bool); - dataOutput.writeByte(this.b); - dataOutput.writeChar(this.c); - dataOutput.writeDouble(this.d); - dataOutput.writeShort(this.s); - dataOutput.writeFloat(this.f); - dataOutput.writeInt(this.i); - dataOutput.writeLong(this.l); - dataOutput.writeUTF(this.str); - - dataOutput.writeBooleanArray(this.booleans); - dataOutput.writeByteArray(this.bytes); - dataOutput.writeCharArray(this.chars); - dataOutput.writeDoubleArray(this.doubles); - dataOutput.writeShortArray(this.shorts); - dataOutput.writeFloatArray(this.floats); - dataOutput.writeIntArray(this.ints); - dataOutput.writeLongArray(this.longs); - dataOutput.writeUTFArray(this.strings); - - dataOutput.writeBooleanArray(this.booleansNull); - dataOutput.writeByteArray(this.bytesNull); - dataOutput.writeCharArray(this.charsNull); - dataOutput.writeDoubleArray(this.doublesNull); - dataOutput.writeShortArray(this.shortsNull); - dataOutput.writeFloatArray(this.floatsNull); - dataOutput.writeIntArray(this.intsNull); - dataOutput.writeLongArray(this.longsNull); - dataOutput.writeUTFArray(this.stringsNull); - - const byteSize = this.bytes.length; - dataOutput.write(byteSize); - dataOutput.write(this.bytes); - dataOutput.write(this.bytes[1]); - dataOutput.write(this.bytes[2]); - dataOutput.writeInt(this.str.length); - dataOutput.writeChars(this.str); - dataOutput.writeBytes(this.str); - dataOutput.writeByte(this.unsignedByte); - dataOutput.writeShort(this.unsignedShort); - - dataOutput.writeObject(this.portableObject); - dataOutput.writeObject(this.identifiedDataSerializableObject); - dataOutput.writeObject(this.customByteArraySerializableObject); - dataOutput.writeObject(this.customStreamSerializableObject); - - dataOutput.writeData(this.data); -}; + +} module.exports = AnIdentifiedDataSerializable; diff --git a/test/serialization/BinaryCompatibilityTest.js b/test/serialization/BinaryCompatibilityTest.js index c71a6b697..846c5f588 100644 --- a/test/serialization/BinaryCompatibilityTest.js +++ b/test/serialization/BinaryCompatibilityTest.js @@ -16,18 +16,18 @@ 'use strict'; const fs = require('fs'); -const ObjectDataInput = require('../../lib/serialization/ObjectData').ObjectDataInput; -const HeapData = require('../../lib/serialization/HeapData').HeapData; +const { ObjectDataInput } = require('../../lib/serialization/ObjectData'); +const { HeapData } = require('../../lib/serialization/HeapData'); const ReferenceObjects = require('./ReferenceObjects'); -const SerializationService = require('../../lib/serialization/SerializationService').SerializationServiceV1; -const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; +const { SerializationServiceV1 } = require('../../lib/serialization/SerializationService'); +const { SerializationConfigImpl } = require('../../lib/config/SerializationConfig'); const AnInnerPortable = require('./AnInnerPortable'); const AnIdentifiedDataSerializable = require('./AnIdentifiedDataSerializable'); const APortable = require('./APortable'); -const CustomByteArraySerializable = require('./CustomSerializable').CustomByteArraySerializable; -const CustomStreamSerializable = require('./CustomSerializable').CustomStreamSerializable; -const expectAlmostEqual = require('../Util').expectAlmostEqual; +const { CustomByteArraySerializable } = require('./CustomSerializable'); +const { CustomStreamSerializable } = require('./CustomSerializable'); +const { expectAlmostEqual } = require('../Util'); describe('BinaryCompatibilityTest', function () { @@ -87,32 +87,30 @@ describe('BinaryCompatibilityTest', function () { cfg.customSerializers = [ { id: ReferenceObjects.CUSTOM_BYTE_ARRAY_SERIALIZABLE_ID, - write: function (out, object) { + write: (out, obj) => { out.writeInt(8); - out.writeInt(object.i); - out.writeFloat(object.f); + out.writeInt(obj.i); + out.writeFloat(obj.f); }, - read: function (inp) { - const len = inp.readInt(); - const buf = Buffer.alloc(len); - inp.readCopy(buf, len); + read: (inp) => { + const buf = inp.readByteArray(); return new CustomByteArraySerializable(buf.readInt32BE(0), buf.readFloatBE(4)); } }, { id: ReferenceObjects.CUSTOM_STREAM_SERIALIZABLE_ID, - write: function (out, object) { - out.writeInt(object.int); - out.writeFloat(object.float); + write: (out, obj) => { + out.writeInt(obj.int); + out.writeFloat(obj.float); }, - read: function (inp) { + read: (inp) => { return new CustomStreamSerializable(inp.readInt(), inp.readFloat()); } } ]; cfg.isBigEndian = isBigEndian; cfg.defaultNumberType = defaultNumberType; - return new SerializationService(cfg) + return new SerializationServiceV1(cfg) } before(function () { @@ -120,13 +118,11 @@ describe('BinaryCompatibilityTest', function () { const input = new ObjectDataInput(fs.readFileSync(__dirname + '/' + createFileName(version)), 0, null, true, true); while (input.available() > 0) { const utflen = input.readUnsignedShort(); - const namebuf = Buffer.alloc(utflen); - input.readCopy(namebuf, utflen); + const namebuf = input.readRaw(utflen); const objectKey = namebuf.toString(); const len = input.readInt(); if (len !== NULL_LENGTH) { - const otherBuffer = Buffer.alloc(len); - input.readCopy(otherBuffer, len); + const otherBuffer = input.readRaw(len); dataMap[objectKey] = new HeapData(otherBuffer); } } @@ -136,31 +132,29 @@ describe('BinaryCompatibilityTest', function () { }); for (const vn in objects) { - (function () { - const varName = vn; - const object = objects[varName]; - if (objects.hasOwnProperty(varName)) { - versions.forEach(function (version) { - isBigEndianValues.forEach(function (isBigEndian) { - it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version, function () { + const varName = vn; + const object = objects[varName]; + if (objects.hasOwnProperty(varName)) { + versions.forEach(function (version) { + isBigEndianValues.forEach(function (isBigEndian) { + it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version, function () { + this.timeout(10000); + const key = createObjectKey(varName, version, isBigEndian); + const service = createSerializationService(isBigEndian, 'integer'); + const deserialized = service.toObject(dataMap[key]); + expectAlmostEqual(deserialized, object); + }); + if (!ReferenceObjects.skipOnSerialize[varName]) { + it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version + ' serialize deserialize', function () { this.timeout(10000); - const key = createObjectKey(varName, version, isBigEndian); - const service = createSerializationService(isBigEndian, 'integer'); - const deserialized = service.toObject(dataMap[key]); + const service = createSerializationService(isBigEndian, stripArticle(varName).toLowerCase()); + const data = service.toData(object); + const deserialized = service.toObject(data); expectAlmostEqual(deserialized, object); }); - if (!ReferenceObjects.skipOnSerialize[varName]) { - it(varName + '-' + convertEndiannesToByteOrder(isBigEndian) + '-' + version + ' serialize deserialize', function () { - this.timeout(10000); - const service = createSerializationService(isBigEndian, stripArticle(varName).toLowerCase()); - const data = service.toData(object); - const deserialized = service.toObject(data); - expectAlmostEqual(deserialized, object); - }); - } - }); + } }); - } - })(); + }); + } } }); diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index 9cb3f337d..4cca150a5 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -24,7 +24,7 @@ describe('DefaultSerializersLiveTest', function () { let cluster, client; let map; - before(function () { + before(async function () { return RC.createCluster(null, null).then(function (res) { cluster = res; }).then(function () { @@ -39,7 +39,7 @@ describe('DefaultSerializersLiveTest', function () { }); }); - after(function () { + after(async function () { client.shutdown(); return RC.terminateCluster(cluster.id); }); @@ -58,87 +58,74 @@ describe('DefaultSerializersLiveTest', function () { 'result = ""+foo();' } - it('string', function () { - return map.put('testStringKey', 'testStringValue').then(function () { - return RC.executeOnController(cluster.id, generateGet('testStringKey'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('testStringValue'); - }) + it('string', async function () { + await map.put('testStringKey', 'testStringValue'); + const response = await RC.executeOnController(cluster.id, generateGet('testStringKey'), 1); + expect(response.result.toString()).to.equal('testStringValue'); }); - it('utf8 sample string test', function () { - return map.put('key', 'Iñtërnâtiônàlizætiøn').then(function () { - return RC.executeOnController(cluster.id, generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('Iñtërnâtiônàlizætiøn'); - }); + it('utf8 sample string test', async function () { + await map.put('key', 'Iñtërnâtiônàlizætiøn'); + const response = await RC.executeOnController(cluster.id, generateGet('key'), 1); + expect(response.result.toString()).to.equal('Iñtërnâtiônàlizætiøn'); }); - it('number', function () { - return map.put('a', 23).then(function () { - return RC.executeOnController(cluster.id, generateGet('a'), 1); - }).then(function (response) { - return expect(Number.parseInt(response.result.toString())).to.equal(23); - }) + it('number', async function () { + await map.put('a', 23); + const response = await RC.executeOnController(cluster.id, generateGet('a'), 1); + expect(Number.parseInt(response.result.toString())).to.equal(23); }); - it('array', function () { - return map.put('a', ['a', 'v', 'vg']).then(function () { - return RC.executeOnController(cluster.id, generateGet('a'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal(['a', 'v', 'vg'].toString()); - }) + it('array', async function () { + await map.put('a', ['a', 'v', 'vg']); + const response = await RC.executeOnController(cluster.id, generateGet('a'), 1); + expect(response.result.toString()).to.equal(['a', 'v', 'vg'].toString()); }); - it('emoji string test on client', function () { - return map.put('key', '1⚐中💦2😭‍🙆😔5').then(function () { - return map.get('key'); - }).then(function (response) { - return expect(response).to.equal('1⚐中💦2😭‍🙆😔5'); - }); + it('buffer on client', async function () { + await map.put('foo', Buffer.from('bar')); + const response = await map.get('foo'); + expect(Buffer.isBuffer(response)).to.be.true; + expect(response.toString()).to.equal('bar'); }); - it('utf8 characters test on client', function () { - return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}').then(function () { - return map.get('key'); - }).then(function (response) { - return expect(response).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); - }); + it('emoji string test on client', async function () { + await map.put('key', '1⚐中💦2😭‍🙆😔5'); + const response = await map.get('key'); + expect(response).to.equal('1⚐中💦2😭‍🙆😔5'); }); - it('utf8 characters test on client with surrogates', function () { - return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06').then(function () { - return map.get('key'); - }).then(function (response) { - return expect(response).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); - }); + it('utf8 characters test on client', async function () { + await map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + const response = await map.get('key'); + expect(response).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); }); - it('emoji string test on RC', function () { - return map.put('key', '1⚐中💦2😭‍🙆😔5').then(function () { - return RC.executeOnController(cluster.id, generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('1⚐中💦2😭‍🙆😔5'); - }); + it('utf8 characters test on client with surrogates', async function () { + await map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06'); + const response = await map.get('key'); + expect(response).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); }); - it('utf8 characters test on RC', function () { - return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}').then(function () { - return RC.executeOnController(cluster.id, generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); - }); + it('emoji string test on RC', async function () { + await map.put('key', '1⚐中💦2😭‍🙆😔5'); + const response = await RC.executeOnController(cluster.id, generateGet('key'), 1); + expect(response.result.toString()).to.equal('1⚐中💦2😭‍🙆😔5'); }); - it('utf8 characters test on RC with surrogates', function () { - return map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06').then(function () { - return RC.executeOnController(cluster.id, generateGet('key'), 1); - }).then(function (response) { - return expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); - }); + it('utf8 characters test on RC', async function () { + await map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + const response = await RC.executeOnController(cluster.id, generateGet('key'), 1); + expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); }); - it('rest value', function () { + it('utf8 characters test on RC with surrogates', async function () { + await map.put('key', '\u0040\u0041\u01DF\u06A0\u12E0\uD834\uDF06'); + const response = await RC.executeOnController(cluster.id, generateGet('key'), 1); + expect(response.result.toString()).to.equal('\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}'); + }); + + it('rest value', async function () { // Make sure that the object is properly de-serialized at the server const restValue = new RestValue(); restValue.value = '{\'test\':\'data\'}'; @@ -152,14 +139,10 @@ describe('DefaultSerializersLiveTest', function () { 'result = "{\\"contentType\\": \\"" + new String(contentType) + "\\", ' + '\\"value\\": \\"" + new String(value) + "\\"}"\n'; - return map.put('key', restValue) - .then(function () { - return RC.executeOnController(cluster.id, script, 1); - }) - .then(function (response) { - const result = JSON.parse(response.result.toString()); - expect(result.contentType).to.equal(restValue.contentType); - expect(result.value).to.equal(restValue.value); - }); + await map.put('key', restValue); + const response = await RC.executeOnController(cluster.id, script, 1); + const result = JSON.parse(response.result.toString()); + expect(result.contentType).to.equal(restValue.contentType); + expect(result.value).to.equal(restValue.value); }); }); diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index 5ca962661..fa51d20cc 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -17,10 +17,10 @@ const expect = require('chai').expect; const Long = require('long'); -const SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; -const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; -const Predicates = require('../../.').Predicates; -const RestValue = require('../../lib/core/RestValue').RestValue; +const { SerializationServiceV1 } = require('../../lib/serialization/SerializationService'); +const { SerializationConfigImpl } = require('../../lib/config/SerializationConfig'); +const { Predicates } = require('../../.'); +const { RestValue } = require('../../lib/core/RestValue'); describe('DefaultSerializersTest', function () { @@ -42,11 +42,13 @@ describe('DefaultSerializersTest', function () { '1⚐中💦2😭‍🙆😔5', 'Iñtërnâtiônàlizætiøn', '\u0040\u0041\u01DF\u06A0\u12E0\u{1D306}', + Buffer.from('abc'), [12, 56, 54, 12], [43546.6, 2343.4, 8988, 4], [23545798.6], null, {abc: 'abc', 'five': 5}, + [{foo: 'bar'}, {bar: 'baz'}], Predicates.sql('test'), Predicates.and(Predicates.alwaysTrue(), Predicates.alwaysTrue()), Predicates.between('this', 0, 1), diff --git a/test/serialization/IdentifiedDataSerializableTest.js b/test/serialization/IdentifiedDataSerializableTest.js index 8f93b65ee..20998523f 100644 --- a/test/serialization/IdentifiedDataSerializableTest.js +++ b/test/serialization/IdentifiedDataSerializableTest.js @@ -20,10 +20,11 @@ const { SerializationConfigImpl } = require('../../lib/config/SerializationConfi const { SerializationServiceV1 } = require('../../lib/serialization/SerializationService'); const Util = require('../Util'); -describe('IdentifiedDataSerializableTest', function () { - const IdentifiedDataClass = function (a_byte, a_boolean, a_character, a_short, an_integer, - a_long, a_float, a_double, a_string, bytes, booleans, - chars, shorts, integers, longs, floats, doubles, strings) { +class IdentifiedDataClass { + + constructor(a_byte, a_boolean, a_character, a_short, an_integer, + a_long, a_float, a_double, a_string, bytes, booleans, + chars, shorts, integers, longs, floats, doubles, strings) { this.a_byte = a_byte; this.a_boolean = a_boolean; this.a_character = a_character; @@ -45,9 +46,9 @@ describe('IdentifiedDataSerializableTest', function () { this.factoryId = 1; this.classId = 1; - }; + } - IdentifiedDataClass.prototype.readData = function (inp) { + readData(inp) { this.a_byte = inp.readByte(); this.a_boolean = inp.readBoolean(); this.a_character = inp.readChar(); @@ -67,9 +68,9 @@ describe('IdentifiedDataSerializableTest', function () { this.floats = inp.readFloatArray(); this.doubles = inp.readDoubleArray(); this.strings = inp.readUTFArray(); - }; + } - IdentifiedDataClass.prototype.writeData = function (outp) { + writeData(outp) { outp.writeByte(this.a_byte); outp.writeBoolean(this.a_boolean); outp.writeChar(this.a_character); @@ -89,7 +90,11 @@ describe('IdentifiedDataSerializableTest', function () { outp.writeFloatArray(this.floats); outp.writeDoubleArray(this.doubles); outp.writeUTFArray(this.strings); - }; + } + +} + +describe('IdentifiedDataSerializableTest', function () { const identifiedFactory = (classId) => { if (classId === 1) { @@ -105,7 +110,7 @@ describe('IdentifiedDataSerializableTest', function () { service = new SerializationServiceV1(cfg); const dd = new IdentifiedDataClass( 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', [99, 100, 101], [true, false, false, true], + 'hazelcast', Buffer.from([0x99, 0x100, 0x101]), [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], diff --git a/test/serialization/ObjectDataTest.js b/test/serialization/ObjectDataTest.js index 02b3c5bce..fb782d1e9 100644 --- a/test/serialization/ObjectDataTest.js +++ b/test/serialization/ObjectDataTest.js @@ -22,7 +22,7 @@ const ObjectData = require('../../lib/serialization/ObjectData'); const ODInp = ObjectData.ObjectDataInput; const ODOut = ObjectData.ObjectDataOutput; -describe('ObjectData Test', function () { +describe('ObjectDataTest', function () { const out = new ODOut(null, true); before(function () { @@ -31,8 +31,7 @@ describe('ObjectData Test', function () { out.writeBoolean(true); out.writeBooleanArray([true, false, false, true, true]); out.writeByte(255 | 0); - out.writeByteArray([0 | 0, 1 | 0, 65535 | 0]); - out.writeBytes('bytes'); + out.writeByteArray(Buffer.from('bytes')); out.writeChar('∂'); out.writeCharArray(['h', 'a', 'z', 'e', 'l']); out.writeChars('cast'); @@ -66,14 +65,9 @@ describe('ObjectData Test', function () { expect(inp.readBoolean()).to.be.true; expect(inp.readBooleanArray()).to.deep.equal([true, false, false, true, true]); expect(inp.readByte()).to.equal(255); - expect(inp.readByteArray()).to.deep.equal([0, 1, 255]); - const readBytes = []; - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - readBytes.push(inp.readByte()); - expect(String.fromCharCode.apply(null, readBytes)).to.equal('bytes'); + const readBytes = inp.readByteArray(); + expect(Buffer.isBuffer(readBytes)).to.be.true; + expect(readBytes.toString()).to.equal('bytes'); expect(inp.readChar()).to.equal('∂'); expect(inp.readCharArray()).to.deep.equal(['h', 'a', 'z', 'e', 'l']); expect(inp.readCharArray().join('')).to.equal('cast'); diff --git a/test/serialization/PortableObjects.js b/test/serialization/PortableObjects.js index fc6fef132..176c11873 100644 --- a/test/serialization/PortableObjects.js +++ b/test/serialization/PortableObjects.js @@ -15,242 +15,269 @@ */ 'use strict'; -function InnerPortable(p1, p2) { - this.p1 = p1; - this.p2 = p2; - this.factoryId = 10; - this.classId = 222; -} +class InnerPortable { + + constructor(p1, p2) { + this.p1 = p1; + this.p2 = p2; + this.factoryId = 10; + this.classId = 222; + } + + readPortable(reader) { + this.p1 = reader.readUTF('p1'); + this.p2 = reader.readUTF('p2'); + } + + writePortable(writer) { + writer.writeUTF('p1', this.p1); + writer.writeUTF('p2', this.p2); + } -InnerPortable.prototype.readPortable = function (reader) { - this.p1 = reader.readUTF('p1'); - this.p2 = reader.readUTF('p2'); -}; - -InnerPortable.prototype.writePortable = function (writer) { - writer.writeUTF('p1', this.p1); - writer.writeUTF('p2', this.p2); -}; - -function PortableObject( - a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, a_string, a_portable, - bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables - ) { - this.a_byte = a_byte; - this.a_boolean = a_boolean; - this.a_character = a_character; - this.a_short = a_short; - this.an_integer = an_integer; - this.a_long = a_long; - this.a_float = a_float; - this.a_double = a_double; - this.a_string = a_string; - this.a_portable = a_portable; - this.a_null_portable = null; - this.bytes = bytes; - this.booleans = booleans; - this.chars = chars; - this.shorts = shorts; - this.integers = integers; - this.longs = longs; - this.floats = floats; - this.doubles = doubles; - this.strings = strings; - this.portables = portables; - this.factoryId = 10; - this.classId = 111; } -PortableObject.prototype.writePortable = function (writer) { - writer.writeByte('a_byte', this.a_byte); - writer.writeBoolean('a_boolean', this.a_boolean); - writer.writeChar('a_char', this.a_character); - writer.writeShort('a_short', this.a_short); - writer.writeInt('an_integer', this.an_integer); - writer.writeLong('a_long', this.a_long); - writer.writeFloat('a_float', this.a_float); - writer.writeDouble('a_double', this.a_double); - writer.writeUTF('a_string', this.a_string); - writer.writePortable('a_portable', this.a_portable); - const tmpInnerObj = new InnerPortable(); - writer.writeNullPortable('a_null_portable', tmpInnerObj.factoryId, tmpInnerObj.classId); - - writer.writeByteArray('bytes', this.bytes); - writer.writeBooleanArray('booleans', this.booleans); - writer.writeCharArray('chars', this.chars); - writer.writeShortArray('shorts', this.shorts); - writer.writeIntArray('integers', this.integers); - writer.writeLongArray('longs', this.longs); - writer.writeFloatArray('floats', this.floats); - writer.writeDoubleArray('doubles', this.doubles); - writer.writeUTFArray('strings', this.strings); - writer.writePortableArray('portables', this.portables); -}; - -PortableObject.prototype.readPortable = function (reader) { - this.a_byte = reader.readByte('a_byte'); - this.a_boolean = reader.readBoolean('a_boolean'); - this.a_character = reader.readChar('a_char'); - this.a_short = reader.readShort('a_short'); - this.an_integer = reader.readInt('an_integer'); - this.a_long = reader.readLong('a_long'); - this.a_float = reader.readFloat('a_float'); - this.a_double = reader.readDouble('a_double'); - this.a_string = reader.readUTF('a_string'); - this.a_portable = reader.readPortable('a_portable'); - this.a_null_portable = reader.readPortable('a_null_portable'); - - this.bytes = reader.readByteArray('bytes'); - this.booleans = reader.readBooleanArray('booleans'); - this.chars = reader.readCharArray('chars'); - this.shorts = reader.readShortArray('shorts'); - this.integers = reader.readIntArray('integers'); - this.longs = reader.readLongArray('longs'); - this.floats = reader.readFloatArray('floats'); - this.doubles = reader.readDoubleArray('doubles'); - this.strings = reader.readUTFArray('strings'); - this.portables = reader.readPortableArray('portables'); -}; - -function PortableObjectV2( - a_new_prop, a_byte, a_boolean, a_character, a_short, an_integer, a_long, a_float, a_double, - a_portable, bytes, booleans, chars, shorts, integers, longs, floats, doubles, strings, portables - ) { - this.a_new_prop = a_new_prop;// this prop is newly added - this.a_byte = a_byte; - this.a_boolean = a_boolean; - this.a_character = a_character; - this.a_short = a_short; - this.an_integer = an_integer; - this.a_long = a_long; - this.a_float = a_float; //this is a double in this version - this.a_double = a_double; - //a_string is removed - this.a_portable = a_portable; - this.a_null_portable = null; - this.bytes = bytes; - this.booleans = booleans; - this.chars = chars; - this.shorts = shorts; - this.integers = integers; - this.longs = longs; - this.floats = floats; - this.doubles = doubles; - this.strings = strings; - this.portables = portables; - - this.factoryId = 10; - this.classId = 111; - this.version = 2; +class PortableObject { + + constructor(a_byte, a_boolean, a_character, a_short, an_integer, + a_long, a_float, a_double, a_string, a_portable, + bytes, booleans, chars, shorts, integers, longs, + floats, doubles, strings, portables) { + this.a_byte = a_byte; + this.a_boolean = a_boolean; + this.a_character = a_character; + this.a_short = a_short; + this.an_integer = an_integer; + this.a_long = a_long; + this.a_float = a_float; + this.a_double = a_double; + this.a_string = a_string; + this.a_portable = a_portable; + this.a_null_portable = null; + this.bytes = bytes; + this.booleans = booleans; + this.chars = chars; + this.shorts = shorts; + this.integers = integers; + this.longs = longs; + this.floats = floats; + this.doubles = doubles; + this.strings = strings; + this.portables = portables; + this.factoryId = 10; + this.classId = 111; + } + + writePortable(writer) { + writer.writeByte('a_byte', this.a_byte); + writer.writeBoolean('a_boolean', this.a_boolean); + writer.writeChar('a_char', this.a_character); + writer.writeShort('a_short', this.a_short); + writer.writeInt('an_integer', this.an_integer); + writer.writeLong('a_long', this.a_long); + writer.writeFloat('a_float', this.a_float); + writer.writeDouble('a_double', this.a_double); + writer.writeUTF('a_string', this.a_string); + writer.writePortable('a_portable', this.a_portable); + const tmpInnerObj = new InnerPortable(); + writer.writeNullPortable('a_null_portable', tmpInnerObj.factoryId, tmpInnerObj.classId); + + writer.writeByteArray('bytes', this.bytes); + writer.writeBooleanArray('booleans', this.booleans); + writer.writeCharArray('chars', this.chars); + writer.writeShortArray('shorts', this.shorts); + writer.writeIntArray('integers', this.integers); + writer.writeLongArray('longs', this.longs); + writer.writeFloatArray('floats', this.floats); + writer.writeDoubleArray('doubles', this.doubles); + writer.writeUTFArray('strings', this.strings); + writer.writePortableArray('portables', this.portables); + } + + readPortable(reader) { + this.a_byte = reader.readByte('a_byte'); + this.a_boolean = reader.readBoolean('a_boolean'); + this.a_character = reader.readChar('a_char'); + this.a_short = reader.readShort('a_short'); + this.an_integer = reader.readInt('an_integer'); + this.a_long = reader.readLong('a_long'); + this.a_float = reader.readFloat('a_float'); + this.a_double = reader.readDouble('a_double'); + this.a_string = reader.readUTF('a_string'); + this.a_portable = reader.readPortable('a_portable'); + this.a_null_portable = reader.readPortable('a_null_portable'); + + this.bytes = reader.readByteArray('bytes'); + this.booleans = reader.readBooleanArray('booleans'); + this.chars = reader.readCharArray('chars'); + this.shorts = reader.readShortArray('shorts'); + this.integers = reader.readIntArray('integers'); + this.longs = reader.readLongArray('longs'); + this.floats = reader.readFloatArray('floats'); + this.doubles = reader.readDoubleArray('doubles'); + this.strings = reader.readUTFArray('strings'); + this.portables = reader.readPortableArray('portables'); + } + } -PortableObjectV2.prototype.writePortable = function (writer) { - writer.writeUTF('a_new_prop', this.a_new_prop); - writer.writeByte('a_byte', this.a_byte); - writer.writeBoolean('a_boolean', this.a_boolean); - writer.writeChar('a_char', this.a_character); - writer.writeShort('a_short', this.a_short); - writer.writeInt('an_integer', this.an_integer); - writer.writeLong('a_long', this.a_long); - writer.writeDouble('a_float', this.a_float); //Floats are Double - writer.writeDouble('a_double', this.a_double); - writer.writePortable('a_portable', this.a_portable); - const tmpInnerObj = new InnerPortable(); - writer.writeNullPortable('a_null_portable', tmpInnerObj.factoryId, tmpInnerObj.classId); - - writer.writeByteArray('bytes', this.bytes); - writer.writeBooleanArray('booleans', this.booleans); - writer.writeCharArray('chars', this.chars); - writer.writeShortArray('shorts', this.shorts); - writer.writeIntArray('integers', this.integers); - writer.writeLongArray('longs', this.longs); - writer.writeFloatArray('floats', this.floats); - writer.writeDoubleArray('doubles', this.doubles); - writer.writeUTFArray('strings', this.strings); - writer.writePortableArray('portables', this.portables); -}; - -PortableObjectV2.prototype.readPortable = function (reader) { - this.a_new_prop = reader.readUTF('a_new_prop'); - this.a_byte = reader.readByte('a_byte'); - this.a_boolean = reader.readBoolean('a_boolean'); - this.a_character = reader.readChar('a_char'); - this.a_short = reader.readShort('a_short'); - this.an_integer = reader.readInt('an_integer'); - this.a_long = reader.readLong('a_long'); - this.a_float = reader.readDouble('a_float'); // Floats are double - this.a_double = reader.readDouble('a_double'); - this.a_portable = reader.readPortable('a_portable'); - this.a_null_portable = reader.readPortable('a_null_portable'); - - this.bytes = reader.readByteArray('bytes'); - this.booleans = reader.readBooleanArray('booleans'); - this.chars = reader.readCharArray('chars'); - this.shorts = reader.readShortArray('shorts'); - this.integers = reader.readIntArray('integers'); - this.longs = reader.readLongArray('longs'); - this.floats = reader.readFloatArray('floats'); - this.doubles = reader.readDoubleArray('doubles'); - this.strings = reader.readUTFArray('strings'); - this.portables = reader.readPortableArray('portables'); -}; - -function SimplePortable(str) { - this.aString = str; - this.factoryId = 10; - this.classId = 21; +class PortableObjectV2{ + + constructor(a_new_prop, a_byte, a_boolean, a_character, a_short, an_integer, + a_long, a_float, a_double, a_portable, bytes, booleans, chars, + shorts, integers, longs, floats, doubles, strings, portables) { + this.a_new_prop = a_new_prop;// this prop is newly added + this.a_byte = a_byte; + this.a_boolean = a_boolean; + this.a_character = a_character; + this.a_short = a_short; + this.an_integer = an_integer; + this.a_long = a_long; + this.a_float = a_float; //this is a double in this version + this.a_double = a_double; + //a_string is removed + this.a_portable = a_portable; + this.a_null_portable = null; + this.bytes = bytes; + this.booleans = booleans; + this.chars = chars; + this.shorts = shorts; + this.integers = integers; + this.longs = longs; + this.floats = floats; + this.doubles = doubles; + this.strings = strings; + this.portables = portables; + + this.factoryId = 10; + this.classId = 111; + this.version = 2; + } + + writePortable(writer) { + writer.writeUTF('a_new_prop', this.a_new_prop); + writer.writeByte('a_byte', this.a_byte); + writer.writeBoolean('a_boolean', this.a_boolean); + writer.writeChar('a_char', this.a_character); + writer.writeShort('a_short', this.a_short); + writer.writeInt('an_integer', this.an_integer); + writer.writeLong('a_long', this.a_long); + writer.writeDouble('a_float', this.a_float); //Floats are Double + writer.writeDouble('a_double', this.a_double); + writer.writePortable('a_portable', this.a_portable); + const tmpInnerObj = new InnerPortable(); + writer.writeNullPortable('a_null_portable', tmpInnerObj.factoryId, tmpInnerObj.classId); + + writer.writeByteArray('bytes', this.bytes); + writer.writeBooleanArray('booleans', this.booleans); + writer.writeCharArray('chars', this.chars); + writer.writeShortArray('shorts', this.shorts); + writer.writeIntArray('integers', this.integers); + writer.writeLongArray('longs', this.longs); + writer.writeFloatArray('floats', this.floats); + writer.writeDoubleArray('doubles', this.doubles); + writer.writeUTFArray('strings', this.strings); + writer.writePortableArray('portables', this.portables); + } + + readPortable(reader) { + this.a_new_prop = reader.readUTF('a_new_prop'); + this.a_byte = reader.readByte('a_byte'); + this.a_boolean = reader.readBoolean('a_boolean'); + this.a_character = reader.readChar('a_char'); + this.a_short = reader.readShort('a_short'); + this.an_integer = reader.readInt('an_integer'); + this.a_long = reader.readLong('a_long'); + this.a_float = reader.readDouble('a_float'); // Floats are double + this.a_double = reader.readDouble('a_double'); + this.a_portable = reader.readPortable('a_portable'); + this.a_null_portable = reader.readPortable('a_null_portable'); + + this.bytes = reader.readByteArray('bytes'); + this.booleans = reader.readBooleanArray('booleans'); + this.chars = reader.readCharArray('chars'); + this.shorts = reader.readShortArray('shorts'); + this.integers = reader.readIntArray('integers'); + this.longs = reader.readLongArray('longs'); + this.floats = reader.readFloatArray('floats'); + this.doubles = reader.readDoubleArray('doubles'); + this.strings = reader.readUTFArray('strings'); + this.portables = reader.readPortableArray('portables'); + } + } -SimplePortable.prototype.readPortable = function (reader) { - this.aString = reader.readUTF('aString'); -}; +class SimplePortable { + + constructor(str) { + this.aString = str; + this.factoryId = 10; + this.classId = 21; + } -SimplePortable.prototype.writePortable = function (writer) { - writer.writeUTF('aString', this.aString); -}; + readPortable(reader) { + this.aString = reader.readUTF('aString'); + } + + writePortable(writer) { + writer.writeUTF('aString', this.aString); + } -function SimplePortableV3(innerObject) { - this.innerObject = innerObject; - this.factoryId = 10; - this.classId = 21; - this.version = 3; } -SimplePortableV3.prototype.readPortable = function (reader) { - this.innerObject = reader.readPortable('innerObject'); -}; +class SimplePortableV3 { + + constructor(innerObject) { + this.innerObject = innerObject; + this.factoryId = 10; + this.classId = 21; + this.version = 3; + } + + readPortable(reader) { + this.innerObject = reader.readPortable('innerObject'); + } -SimplePortableV3.prototype.writePortable = function (writer) { - writer.writePortable('innerObject', this.innerObject); -}; + writePortable(writer) { + writer.writePortable('innerObject', this.innerObject); + } -function Parent(child) { - this.child = child; - this.factoryId = 1; - this.classId = 1; } -Parent.prototype.writePortable = function (writer) { - writer.writePortable('child', this.child); -}; +class Parent { -Parent.prototype.readPortable = function (reader) { - this.child = reader.readPortable('child'); -}; + constructor(child) { + this.child = child; + this.factoryId = 1; + this.classId = 1; + } + + writePortable(writer) { + writer.writePortable('child', this.child); + } + + readPortable(reader) { + this.child = reader.readPortable('child'); + } -function Child(name) { - this.name = name; - this.factoryId = 1; - this.classId = 2; } -Child.prototype.writePortable = function (writer) { - writer.writeUTF('name', this.name); -}; +class Child { + + constructor(name) { + this.name = name; + this.factoryId = 1; + this.classId = 2; + } -Child.prototype.readPortable = function (reader) { - this.name = reader.readUTF('name'); -}; + writePortable(writer) { + writer.writeUTF('name', this.name); + } + + readPortable(reader) { + this.name = reader.readUTF('name'); + } + +} exports.PortableObject = PortableObject; exports.PortableObjectV2 = PortableObjectV2; diff --git a/test/serialization/PortableSerializationTest.js b/test/serialization/PortableSerializationTest.js index f0dbde7b1..089b63d04 100644 --- a/test/serialization/PortableSerializationTest.js +++ b/test/serialization/PortableSerializationTest.js @@ -15,15 +15,16 @@ */ 'use strict'; -const SerializationConfigImpl = require('../../lib/config/SerializationConfig').SerializationConfigImpl; -const SerializationServiceV1 = require('../../lib/serialization/SerializationService').SerializationServiceV1; const Long = require('long'); const Util = require('../Util'); - -const PortableObject = require('./PortableObjects').PortableObject; -const PortableObjectV2 = require('./PortableObjects').PortableObjectV2; -const InnerPortable = require('./PortableObjects').InnerPortable; -const SimplePortableV3 = require('./PortableObjects').SimplePortableV3; +const { SerializationConfigImpl } = require('../../lib/config/SerializationConfig'); +const { SerializationServiceV1 } = require('../../lib/serialization/SerializationService'); +const { + PortableObject, + PortableObjectV2, + InnerPortable, + SimplePortableV3 +} = require('./PortableObjects'); describe('PortableSerializationTest', function () { @@ -44,10 +45,12 @@ describe('PortableSerializationTest', function () { it('write-read', function () { const service = createSerializationService(PortableObject); const emp = new PortableObject( - 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], - [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], - [43645.325, 887.56756], ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], + 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, 'hazelcast', + new InnerPortable('a', 'b'), Buffer.from([0x99, 0x100, 0x101]), [true, false, false, true], + ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], + [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], + [233.2, 65.88, 657.345], [43645.325, 887.56756], + ['hazelcast', 'ankara', 'istanbul', 'london', 'palo alto'], [new InnerPortable('elma', 'armut'), new InnerPortable('masa', 'sandalye')] ); @@ -62,7 +65,7 @@ describe('PortableSerializationTest', function () { const emp = new PortableObjectV2( 'a_new_value', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], + new InnerPortable('a', 'b'), Buffer.from([0x99, 0x100, 0x101]), [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], @@ -81,8 +84,8 @@ describe('PortableSerializationTest', function () { const newService = createSerializationService(PortableObjectV2); const empv1 = new PortableObject( - 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - 'hazelcast', new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], + 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, 'hazelcast', + new InnerPortable('a', 'b'), Buffer.from([0x99, 0x100, 0x101]), [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], @@ -91,7 +94,7 @@ describe('PortableSerializationTest', function () { ); const empv2 = new PortableObjectV2( undefined, 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], + new InnerPortable('a', 'b'), Buffer.from([0x99, 0x100, 0x101]), [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], @@ -110,7 +113,7 @@ describe('PortableSerializationTest', function () { const innerPortableV2 = new PortableObjectV2( 'propstring', 99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533, - new InnerPortable('a', 'b'), [99, 100, 101], [true, false, false, true], + new InnerPortable('a', 'b'), Buffer.from([0x99, 0x100, 0x101]), [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345], [Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345], [43645.325, 887.56756], diff --git a/test/serialization/ReferenceObjects.js b/test/serialization/ReferenceObjects.js index 87cdefc03..270491407 100644 --- a/test/serialization/ReferenceObjects.js +++ b/test/serialization/ReferenceObjects.js @@ -45,7 +45,7 @@ for (let ci = 65535 - to.aString.length; ci > 0; ci--) { } to.booleans = [true, false, true]; -to.bytes = [112, 4, -1, 4, 112, -35, 43]; +to.bytes = Buffer.from([112, 4, -1, 4, 112, -35, 43]); to.chars = ['a', 'b', 'c']; to.doubles = [-897543.3678909, 11.1, 22.2, 33.3]; to.shorts = [-500, 2, 3]; From 570f20b67f1bbbad40230131f1bf3a1593f35b3b Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 25 Aug 2020 11:32:00 +0300 Subject: [PATCH 280/685] Add support for boomerang backups (#573) Also includes the following: * Add related unit tests for InvocationService and Invocation * Slightly improve code quality in InvocationService, Invocation and ClientMessage * Migrate ClientLabelTest to async/await syntax --- DOCUMENTATION.md | 21 ++ src/HazelcastClient.ts | 1 + src/config/Config.ts | 22 +- src/config/ConfigBuilder.ts | 2 + src/core/HazelcastError.ts | 7 + src/invocation/InvocationService.ts | 233 ++++++++++++++---- src/listener/ListenerMessageCodec.ts | 4 + src/listener/ListenerService.ts | 4 +- src/protocol/ClientMessage.ts | 19 +- src/protocol/ErrorFactory.ts | 148 +++++++---- src/util/BitsUtil.ts | 18 -- test/config/ConfigBuilderTest.js | 4 + test/config/SchemaValidationTest.js | 2 +- .../configurations}/config-schema.json | 4 + test/config/configurations/full.json | 1 + test/integration/ClientBackupAcksTest.js | 119 +++++++++ test/integration/ClientLabelTest.js | 41 ++- test/invocation/InvocationServiceTest.js | 84 +++++++ test/invocation/InvocationTest.js | 181 ++++++++++++++ test/nearcache/LostInvalidationsTest.js | 18 +- test/unit/protocol/ClientMessageTest.js | 4 +- 21 files changed, 776 insertions(+), 161 deletions(-) rename test/{ => config/configurations}/config-schema.json (98%) create mode 100644 test/integration/ClientBackupAcksTest.js create mode 100644 test/invocation/InvocationServiceTest.js create mode 100644 test/invocation/InvocationTest.js diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index b54a89a76..3f15535c6 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -36,6 +36,7 @@ * [5.4. Setting Connection Timeout](#54-setting-connection-timeout) * [5.5. Enabling Client TLS/SSL](#55-enabling-client-tlsssl) * [5.6. Enabling Hazelcast Cloud Discovery](#56-enabling-hazelcast-cloud-discovery) + * [5.7. Configuring Backup Acknowledgment](#57-configuring-backup-acknowledgment) * [6. Client Connection Strategy](#6-client-connection-strategy) * [6.1. Configuring Client Connection Retry](#61-configuring-client-connection-retry) * [7. Using Node.js Client with Hazelcast IMDG](#7-using-nodejs-client-with-hazelcast-imdg) @@ -1011,6 +1012,26 @@ const cfg = { To be able to connect to the provided IP addresses, you should use secure TLS/SSL connection between the client and members. Therefore, you should set an SSL configuration as described in the previous section. +## 5.7. Configuring Backup Acknowledgment + +When an operation with sync backup is sent by a client to the Hazelcast member(s), the acknowledgment of the operation's backup is sent to the client by the backup replica member(s). This improves the performance of the client operations. + +To disable backup acknowledgement, you should use the `backupAckToClientEnabled` configuration option. + +```javascript +const cfg = { + backupAckToClientEnabled: false +}; +``` + +Its default value is `true`. This option has no effect for unisocket clients. + +You can also fine-tune this feature using entries of the `properties` config option as described below: + +- `hazelcast.client.operation.backup.timeout.millis`: Default value is `5000` milliseconds. If an operation has +backups, this property specifies how long (in milliseconds) the invocation waits for acks from the backup replicas. If acks are not received from some of the backups, there will not be any rollback on the other successful replicas. + +- `hazelcast.client.operation.fail.on.indeterminate.state`: Default value is `false`. When it is `true`, if an operation has sync backups and acks are not received from backup replicas in time, or the member which owns primary replica of the target partition leaves the cluster, then the invocation fails. However, even if the invocation fails, there will not be any rollback on other successful replicas. # 6. Client Connection Strategy diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 7b533950b..3e6e1d35f 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -468,6 +468,7 @@ export class HazelcastClient { .then(() => { this.listenerService.start(); this.proxyManager.init(); + this.invocationService.start(); this.loadBalancer.initLoadBalancer(this.clusterService, this.config); this.statistics.start(); return this.sendStateToCluster(); diff --git a/src/config/Config.ts b/src/config/Config.ts index 9e4605471..9899dee53 100644 --- a/src/config/Config.ts +++ b/src/config/Config.ts @@ -40,8 +40,9 @@ export interface ClientConfig { clusterName?: string; /** - * Name of the client instance. By default, set to `hz.client_${CLIENT_ID}`, where - * `CLIENT_ID` starts from `0` and it is incremented by `1` for each new client. + * Name of the client instance. By default, set to `hz.client_${CLIENT_ID}`, + * where `CLIENT_ID` starts from `0` and it is incremented by `1` + * for each new client. */ instanceName?: string; @@ -131,10 +132,21 @@ export interface ClientConfig { customLogger?: ILogger; /** - * Custom credentials to be used as a part of authentication on the cluster. + * Custom credentials to be used as a part of authentication on + * the cluster. */ customCredentials?: any; + /** + * Enables client to get backup acknowledgements directly from + * the member that backups are applied, which reduces number of hops + * and increases performance for smart clients. + * + * Enabled by default for smart clients. This option has no effect + * for unisocket clients. + */ + backupAckToClientEnabled?: boolean; + /** * User-defined properties. */ @@ -150,6 +162,7 @@ export class ClientConfigImpl implements ClientConfig { 'hazelcast.client.heartbeat.timeout': 60000, 'hazelcast.client.invocation.retry.pause.millis': 1000, 'hazelcast.client.invocation.timeout.millis': 120000, + 'hazelcast.client.internal.clean.resources.millis': 100, 'hazelcast.client.cloud.url': 'https://coordinator.hazelcast.cloud', 'hazelcast.client.statistics.enabled': false, 'hazelcast.client.statistics.period.seconds': Statistics.PERIOD_SECONDS_DEFAULT_VALUE, @@ -161,6 +174,8 @@ export class ClientConfigImpl implements ClientConfig { 'hazelcast.client.autopipelining.threshold.bytes': 8192, 'hazelcast.client.socket.no.delay': true, 'hazelcast.client.shuffle.member.list': true, + 'hazelcast.client.operation.backup.timeout.millis': 5000, + 'hazelcast.client.operation.fail.on.indeterminate.state': false, }; instanceName: string; @@ -177,6 +192,7 @@ export class ClientConfigImpl implements ClientConfig { clusterName = 'dev'; clientLabels: string[] = []; loadBalancer = new LoadBalancerConfigImpl(); + backupAckToClientEnabled = true; private configPatternMatcher = new ConfigPatternMatcher(); diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 23a91f9d9..723dafb56 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -90,6 +90,8 @@ export class ConfigBuilder { this.handleLogger(value); } else if (key === 'customCredentials') { this.handleCredentials(value); + } else if (key === 'backupAckToClientEnabled') { + this.effectiveConfig.backupAckToClientEnabled = tryGetBoolean(value); } } } diff --git a/src/core/HazelcastError.ts b/src/core/HazelcastError.ts index 03d0f5552..e93d06fdf 100644 --- a/src/core/HazelcastError.ts +++ b/src/core/HazelcastError.ts @@ -295,3 +295,10 @@ export class ReachedMaxSizeError extends HazelcastError { Object.setPrototypeOf(this, ReachedMaxSizeError.prototype); } } + +export class IndeterminateOperationStateError extends HazelcastError { + constructor(msg: string, cause?: Error) { + super(msg, cause); + Object.setPrototypeOf(this, IndeterminateOperationStateError.prototype); + } +} diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 29dd5ead9..387999bf9 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -22,6 +22,7 @@ import { ClientNotActiveError, HazelcastInstanceNotActiveError, InvocationTimeoutError, + IndeterminateOperationStateError, IOError, RetryableHazelcastError, TargetDisconnectedError, @@ -29,16 +30,26 @@ import { UUID } from '../core'; import {ClientConnection} from '../network/ClientConnection'; -import {DeferredPromise} from '../util/Util'; import {ILogger} from '../logging/ILogger'; -import {ClientMessage} from '../protocol/ClientMessage'; +import {ClientMessage, IS_BACKUP_AWARE_FLAG} from '../protocol/ClientMessage'; +import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; +import {ClientLocalBackupListenerCodec} from '../codec/ClientLocalBackupListenerCodec'; import {EXCEPTION_MESSAGE_TYPE} from '../codec/builtin/ErrorsCodec'; import {ClientConnectionManager} from '../network/ClientConnectionManager'; import {PartitionServiceImpl} from '../PartitionService'; +import { + scheduleWithRepetition, + cancelRepetitionTask, + Task, + DeferredPromise +} from '../util/Util'; const MAX_FAST_INVOCATION_COUNT = 5; const PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS = 'hazelcast.client.invocation.retry.pause.millis'; const PROPERTY_INVOCATION_TIMEOUT_MILLIS = 'hazelcast.client.invocation.timeout.millis'; +const PROPERTY_CLEAN_RESOURCES_MILLIS = 'hazelcast.client.internal.clean.resources.millis'; +const PROPERTY_BACKUP_TIMEOUT_MILLIS = 'hazelcast.client.operation.backup.timeout.millis'; +const PROPERTY_FAIL_ON_INDETERMINATE_STATE = 'hazelcast.client.operation.fail.on.indeterminate.state'; /** * A request to be sent to a hazelcast node. @@ -80,6 +91,26 @@ export class Invocation { */ deferred: Promise.Resolver; + /** + * Contains the pending response from the primary. It is pending because it could be that backups need to complete. + */ + pendingResponseMessage: ClientMessage; + + /** + * Number of backups acks received. + */ + backupsAcksReceived = 0; + + /** + * Number of expected backups. It is set correctly as soon as the pending response is set. + */ + backupsAcksExpected = -1; + + /** + * The time in millis when the response of the primary has been received. + */ + pendingResponseReceivedMillis = -1; + invokeCount = 0; /** @@ -96,7 +127,7 @@ export class Invocation { constructor(client: HazelcastClient, request: ClientMessage) { this.client = client; this.invocationService = client.getInvocationService(); - this.deadline = Date.now() + this.invocationService.getInvocationTimeoutMillis(); + this.deadline = Date.now() + this.invocationService.invocationTimeoutMillis; this.request = request; } @@ -132,6 +163,73 @@ export class Invocation { return false; } + + notify(clientMessage: ClientMessage): void { + assert(clientMessage != null, 'Response can not be null'); + const expectedBackups = clientMessage.getNumberOfBackupAcks(); + if (expectedBackups > this.backupsAcksReceived) { + this.pendingResponseReceivedMillis = Date.now(); + this.backupsAcksExpected = expectedBackups; + this.pendingResponseMessage = clientMessage; + return; + } + this.complete(clientMessage); + } + + notifyBackupComplete(): void { + this.backupsAcksReceived++; + if (this.pendingResponseMessage == null) { + return; + } + if (this.backupsAcksExpected !== this.backupsAcksReceived) { + return; + } + this.complete(this.pendingResponseMessage); + } + + detectAndHandleBackupTimeout(timeoutMillis: number): void { + if (this.pendingResponseMessage == null) { + return; + } + if (this.backupsAcksExpected === this.backupsAcksReceived) { + return; + } + const expirationTime = this.pendingResponseReceivedMillis + timeoutMillis; + const timeoutReached = expirationTime > 0 && expirationTime < Date.now(); + if (!timeoutReached) { + return; + } + if (this.invocationService.shouldFailOnIndeterminateState) { + this.completeWithError(new IndeterminateOperationStateError('Invocation ' + + this.request.getCorrelationId() + ' failed because of missed backup acks')); + return; + } + this.complete(this.pendingResponseMessage); + } + + complete(clientMessage: ClientMessage): void { + this.deferred.resolve(clientMessage); + this.invocationService.deregisterInvocation(this.request.getCorrelationId()); + } + + completeWithError(err: Error): void { + this.deferred.reject(err); + this.invocationService.deregisterInvocation(this.request.getCorrelationId()); + } +} + +const backupListenerCodec: ListenerMessageCodec = { + encodeAddRequest(localOnly: boolean): ClientMessage { + return ClientLocalBackupListenerCodec.encodeRequest(); + }, + + decodeAddResponse(msg: ClientMessage): UUID { + return ClientLocalBackupListenerCodec.decodeResponse(msg).response; + }, + + encodeRemoveRequest(listenerId: UUID): ClientMessage { + return null; + } } /** @@ -140,37 +238,72 @@ export class Invocation { */ export class InvocationService { - doInvoke: (invocation: Invocation) => void; + private readonly doInvoke: (invocation: Invocation) => void; + private readonly eventHandlers: Map = new Map(); + private readonly pending: Map = new Map(); + private readonly client: HazelcastClient; + readonly invocationRetryPauseMillis: number; + readonly invocationTimeoutMillis: number; + readonly shouldFailOnIndeterminateState: boolean; + private readonly operationBackupTimeoutMillis: number; + private readonly backupAckToClientEnabled: boolean; + private readonly logger: ILogger; + private readonly connectionManager: ClientConnectionManager; + private readonly partitionService: PartitionServiceImpl; + private readonly cleanResourcesMillis: number; private correlationCounter = 1; - private eventHandlers: { [id: number]: Invocation } = {}; - private pending: { [id: number]: Invocation } = {}; - private client: HazelcastClient; - private readonly invocationRetryPauseMillis: number; - private readonly invocationTimeoutMillis: number; - private logger: ILogger; + private cleanResourcesTask: Task; private isShutdown: boolean; - private connectionManager: ClientConnectionManager; - private partitionService: PartitionServiceImpl; - constructor(hazelcastClient: HazelcastClient) { - this.client = hazelcastClient; - this.connectionManager = hazelcastClient.getConnectionManager(); - this.partitionService = hazelcastClient.getPartitionService() as PartitionServiceImpl; + constructor(client: HazelcastClient) { + this.client = client; + this.connectionManager = client.getConnectionManager(); + this.partitionService = client.getPartitionService() as PartitionServiceImpl; this.logger = this.client.getLoggingService().getLogger(); - if (hazelcastClient.getConfig().network.smartRouting) { + const config = client.getConfig(); + if (config.network.smartRouting) { this.doInvoke = this.invokeSmart; } else { this.doInvoke = this.invokeNonSmart; } this.invocationRetryPauseMillis = - this.client.getConfig().properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS] as number; + config.properties[PROPERTY_INVOCATION_RETRY_PAUSE_MILLIS] as number; this.invocationTimeoutMillis = - this.client.getConfig().properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS] as number; + config.properties[PROPERTY_INVOCATION_TIMEOUT_MILLIS] as number; + this.operationBackupTimeoutMillis = + config.properties[PROPERTY_BACKUP_TIMEOUT_MILLIS] as number; + this.shouldFailOnIndeterminateState = + config.properties[PROPERTY_FAIL_ON_INDETERMINATE_STATE] as boolean; + this.cleanResourcesMillis = + config.properties[PROPERTY_CLEAN_RESOURCES_MILLIS] as number; + this.backupAckToClientEnabled = config.network.smartRouting && config.backupAckToClientEnabled; this.isShutdown = false; } + start(): void { + if (this.backupAckToClientEnabled) { + const listenerService = this.client.getListenerService(); + listenerService.registerListener(backupListenerCodec, this.backupEventHandler.bind(this)); + this.cleanResourcesTask = this.scheduleCleanResourcesTask(this.cleanResourcesMillis); + } + } + + private scheduleCleanResourcesTask(periodMillis: number): Task { + return scheduleWithRepetition(() => { + for (const pendingInvocation of this.pending.values()) { + pendingInvocation.detectAndHandleBackupTimeout(this.operationBackupTimeoutMillis); + } + }, periodMillis, periodMillis); + } + shutdown(): void { + if (this.isShutdown) { + return; + } this.isShutdown = true; + if (this.cleanResourcesTask != null) { + cancelRepetitionTask(this.cleanResourcesTask); + } } invoke(invocation: Invocation): Promise { @@ -237,49 +370,48 @@ export class InvocationService { return this.invoke(new Invocation(this.client, request)); } - getInvocationTimeoutMillis(): number { - return this.invocationTimeoutMillis; - } - - getInvocationRetryPauseMillis(): number { - return this.invocationRetryPauseMillis; - } - /** * Removes the handler for all event handlers with a specific correlation id. - * @param id correlation id */ - removeEventHandler(id: number): void { - if (this.eventHandlers.hasOwnProperty('' + id)) { - delete this.eventHandlers[id]; - } + removeEventHandler(correlationId: number): void { + this.eventHandlers.delete(correlationId); + } + + backupEventHandler(clientMessage: ClientMessage): void { + ClientLocalBackupListenerCodec.handle(clientMessage, (correlationId: Long) => { + const invocation = this.pending.get(correlationId.toNumber()); + if (invocation === undefined) { + this.logger.trace('InvocationService', 'Invocation not found for backup event, ' + + 'invocation id ' + correlationId); + return; + } + invocation.notifyBackupComplete(); + }); } /** - * Extract codec specific properties in a protocol message and resolves waiting promise. - * @param clientMessage + * Extracts codec specific properties in a protocol message and resolves waiting promise. */ processResponse(clientMessage: ClientMessage): void { const correlationId = clientMessage.getCorrelationId(); - const messageType = clientMessage.getMessageType(); - if (clientMessage.startFrame.hasEventFlag()) { - setImmediate(() => { - if (this.eventHandlers[correlationId] !== undefined) { - this.eventHandlers[correlationId].handler(clientMessage); + if (clientMessage.startFrame.hasEventFlag() || clientMessage.startFrame.hasBackupEventFlag()) { + process.nextTick(() => { + const eventHandler = this.eventHandlers.get(correlationId); + if (eventHandler !== undefined) { + eventHandler.handler(clientMessage); } }); return; } - const pendingInvocation = this.pending[correlationId]; - const deferred = pendingInvocation.deferred; + const pendingInvocation = this.pending.get(correlationId); + const messageType = clientMessage.getMessageType(); if (messageType === EXCEPTION_MESSAGE_TYPE) { const remoteError = this.client.getErrorFactory().createErrorFromClientMessage(clientMessage); this.notifyError(pendingInvocation, remoteError); } else { - delete this.pending[correlationId]; - deferred.resolve(clientMessage); + pendingInvocation.notify(clientMessage); } } @@ -369,6 +501,9 @@ export class InvocationService { if (this.isShutdown) { return Promise.reject(new ClientNotActiveError('Client is shutdown.')); } + if (this.backupAckToClientEnabled) { + invocation.request.getStartFrame().addFlag(IS_BACKUP_AWARE_FLAG); + } this.registerInvocation(invocation); return this.write(invocation, connection); } @@ -380,7 +515,7 @@ export class InvocationService { private notifyError(invocation: Invocation, error: Error): void { const correlationId = invocation.request.getCorrelationId(); if (this.rejectIfNotRetryable(invocation, error)) { - delete this.pending[correlationId]; + this.pending.delete(correlationId); return; } this.logger.debug('InvocationService', @@ -388,7 +523,7 @@ export class InvocationService { if (invocation.invokeCount < MAX_FAST_INVOCATION_COUNT) { this.doInvoke(invocation); } else { - setTimeout(this.doInvoke.bind(this, invocation), this.getInvocationRetryPauseMillis()); + setTimeout(this.doInvoke.bind(this, invocation), this.invocationRetryPauseMillis); } } @@ -428,8 +563,12 @@ export class InvocationService { message.setPartitionId(-1); } if (invocation.hasOwnProperty('handler')) { - this.eventHandlers[correlationId] = invocation; + this.eventHandlers.set(correlationId, invocation); } - this.pending[correlationId] = invocation; + this.pending.set(correlationId, invocation); + } + + deregisterInvocation(correlationId: number): void { + this.pending.delete(correlationId); } } diff --git a/src/listener/ListenerMessageCodec.ts b/src/listener/ListenerMessageCodec.ts index bb1e55e8a..186cbe584 100644 --- a/src/listener/ListenerMessageCodec.ts +++ b/src/listener/ListenerMessageCodec.ts @@ -20,7 +20,11 @@ import {UUID} from '../core/UUID'; /** @internal */ export interface ListenerMessageCodec { + encodeAddRequest: (localOnly: boolean) => ClientMessage; + decodeAddResponse: (msg: ClientMessage) => UUID; + encodeRemoveRequest: (listenerId: UUID) => ClientMessage; + } diff --git a/src/listener/ListenerService.ts b/src/listener/ListenerService.ts index a60907680..a653be55d 100644 --- a/src/listener/ListenerService.ts +++ b/src/listener/ListenerService.ts @@ -118,7 +118,7 @@ export class ListenerService { registerListener(codec: ListenerMessageCodec, listenerHandlerFn: Function): Promise { const activeConnections = this.client.getConnectionManager().getActiveConnections(); - const userRegistrationKey: string = UuidUtil.generate().toString(); + const userRegistrationKey = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; const deferred = DeferredPromise(); const registerRequest = codec.encodeAddRequest(this.isSmart()); @@ -133,7 +133,7 @@ export class ListenerService { if (connectionsOnUserKey.has(connection)) { continue; } - // New correlation id will be set on the invoke call + // new correlation id will be set on the invoke call const requestCopy = registerRequest.copyWithNewCorrelationId(); const invocation = new Invocation(this.client, requestCopy); invocation.handler = listenerHandlerFn as any; diff --git a/src/protocol/ClientMessage.ts b/src/protocol/ClientMessage.ts index 1440ab7f8..f07f196e5 100644 --- a/src/protocol/ClientMessage.ts +++ b/src/protocol/ClientMessage.ts @@ -37,15 +37,19 @@ const BEGIN_DATA_STRUCTURE_FLAG = 1 << 12; const END_DATA_STRUCTURE_FLAG = 1 << 11; const IS_NULL_FLAG = 1 << 10; const IS_EVENT_FLAG = 1 << 9; +/** @internal */ +export const IS_BACKUP_AWARE_FLAG = 1 << 8; +const IS_BACKUP_EVENT_FLAG = 1 << 7; /** @internal */ export const SIZE_OF_FRAME_LENGTH_AND_FLAGS = BitsUtil.INT_SIZE_IN_BYTES + BitsUtil.SHORT_SIZE_IN_BYTES; /** @internal */ export class Frame { + content: Buffer; - flags: number; next: Frame; + flags: number; constructor(content: Buffer, flags?: number) { this.content = content; @@ -89,6 +93,10 @@ export class Frame { return this.isFlagSet(this.flags, IS_EVENT_FLAG); } + hasBackupEventFlag(): boolean { + return this.isFlagSet(this.flags, IS_BACKUP_EVENT_FLAG); + } + isFinalFrame(): boolean { return this.isFlagSet(this.flags, IS_FINAL_FLAG); } @@ -105,6 +113,10 @@ export class Frame { return this.isFlagSet(this.flags, END_FRAGMENT_FLAG); } + addFlag(flag: number): void { + this.flags |= flag; + } + private isFlagSet(flags: number, flagMask: number): boolean { const i = flags & flagMask; return i === flagMask; @@ -120,6 +132,7 @@ export const END_FRAME = new Frame(Buffer.allocUnsafe(0), END_DATA_STRUCTURE_FLA /** @internal */ export class ClientMessage { + startFrame: Frame; endFrame: Frame; private retryable: boolean; @@ -197,8 +210,8 @@ export class ClientMessage { this.startFrame.content.writeInt32LE(partitionId, PARTITION_ID_OFFSET); } - getHeaderFlags(): number { - return this.startFrame.flags; + getNumberOfBackupAcks(): number { + return this.startFrame.content.readUInt8(RESPONSE_BACKUP_ACKS_OFFSET); } isRetryable(): boolean { diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index d1e862c68..aaaaaf816 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -29,6 +29,7 @@ import { HazelcastInstanceNotActiveError, IllegalStateError, InvocationTimeoutError, + IndeterminateOperationStateError, IOError, MemberLeftError, NoDataMemberInClusterError, @@ -64,56 +65,104 @@ export class ClientErrorFactory { private codeToErrorConstructor: Map = new Map(); constructor() { - this.register(ClientProtocolErrorCodes.ARRAY_INDEX_OUT_OF_BOUNDS, (m, c) => new RangeError(m)); - this.register(ClientProtocolErrorCodes.ARRAY_STORE, (m, c) => new TypeError(m)); - this.register(ClientProtocolErrorCodes.AUTHENTICATION, (m, c) => new AuthenticationError(m, c)); - this.register(ClientProtocolErrorCodes.CALLER_NOT_MEMBER, (m, c) => new CallerNotMemberError(m, c)); - this.register(ClientProtocolErrorCodes.CANCELLATION, (m, c) => new CancellationError(m, c)); - this.register(ClientProtocolErrorCodes.CLASS_CAST, (m, c) => new ClassCastError(m, c)); - this.register(ClientProtocolErrorCodes.CLASS_NOT_FOUND, (m, c) => new ClassNotFoundError(m, c)); - this.register(ClientProtocolErrorCodes.CONCURRENT_MODIFICATION, (m, c) => new ConcurrentModificationError(m, c)); - this.register(ClientProtocolErrorCodes.CONFIG_MISMATCH, (m, c) => new ConfigMismatchError(m, c)); - this.register(ClientProtocolErrorCodes.DISTRIBUTED_OBJECT_DESTROYED, (m, c) => new DistributedObjectDestroyedError(m, c)); - this.register(ClientProtocolErrorCodes.EOF, (m, c) => new IOError(m, c)); - this.register(ClientProtocolErrorCodes.HAZELCAST, (m, c) => new HazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.ARRAY_INDEX_OUT_OF_BOUNDS, + (m, c) => new RangeError(m)); + this.register(ClientProtocolErrorCodes.ARRAY_STORE, + (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.AUTHENTICATION, + (m, c) => new AuthenticationError(m, c)); + this.register(ClientProtocolErrorCodes.CALLER_NOT_MEMBER, + (m, c) => new CallerNotMemberError(m, c)); + this.register(ClientProtocolErrorCodes.CANCELLATION, + (m, c) => new CancellationError(m, c)); + this.register(ClientProtocolErrorCodes.CLASS_CAST, + (m, c) => new ClassCastError(m, c)); + this.register(ClientProtocolErrorCodes.CLASS_NOT_FOUND, + (m, c) => new ClassNotFoundError(m, c)); + this.register(ClientProtocolErrorCodes.CONCURRENT_MODIFICATION, + (m, c) => new ConcurrentModificationError(m, c)); + this.register(ClientProtocolErrorCodes.CONFIG_MISMATCH, + (m, c) => new ConfigMismatchError(m, c)); + this.register(ClientProtocolErrorCodes.DISTRIBUTED_OBJECT_DESTROYED, + (m, c) => new DistributedObjectDestroyedError(m, c)); + this.register(ClientProtocolErrorCodes.EOF, + (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST, + (m, c) => new HazelcastError(m, c)); this.register(ClientProtocolErrorCodes.HAZELCAST_INSTANCE_NOT_ACTIVE, (m, c) => new HazelcastInstanceNotActiveError(m, c)); - this.register(ClientProtocolErrorCodes.HAZELCAST_OVERLOAD, (m, c) => new HazelcastError(m, c)); - this.register(ClientProtocolErrorCodes.HAZELCAST_SERIALIZATION, (m, c) => new HazelcastSerializationError(m, c)); - this.register(ClientProtocolErrorCodes.IO, (m, c) => new IOError(m, c)); - this.register(ClientProtocolErrorCodes.ILLEGAL_ARGUMENT, (m, c) => new TypeError(m)); - this.register(ClientProtocolErrorCodes.ILLEGAL_STATE, (m, c) => new IllegalStateError(m, c)); - this.register(ClientProtocolErrorCodes.INDEX_OUT_OF_BOUNDS, (m, c) => new RangeError(m)); - this.register(ClientProtocolErrorCodes.INTERRUPTED, (m, c) => new Error(m)); - this.register(ClientProtocolErrorCodes.INVALID_ADDRESS, (m, c) => new TypeError(m)); - this.register(ClientProtocolErrorCodes.INVALID_CONFIGURATION, (m, c) => new TypeError(m)); - this.register(ClientProtocolErrorCodes.MEMBER_LEFT, (m, c) => new MemberLeftError(m, c)); - this.register(ClientProtocolErrorCodes.NEGATIVE_ARRAY_SIZE, (m, c) => new RangeError(m)); - this.register(ClientProtocolErrorCodes.NO_SUCH_ELEMENT, (m, c) => new ReferenceError(m)); - this.register(ClientProtocolErrorCodes.NOT_SERIALIZABLE, (m, c) => new IOError(m, c)); - this.register(ClientProtocolErrorCodes.NULL_POINTER, (m, c) => new ReferenceError(m)); - this.register(ClientProtocolErrorCodes.OPERATION_TIMEOUT, (m, c) => new InvocationTimeoutError(m, c)); - this.register(ClientProtocolErrorCodes.PARTITION_MIGRATING, (m, c) => new PartitionMigratingError(m, c)); - this.register(ClientProtocolErrorCodes.QUERY, (m, c) => new QueryError(m, c)); - this.register(ClientProtocolErrorCodes.QUERY_RESULT_SIZE_EXCEEDED, (m, c) => new QueryError(m, c)); - this.register(ClientProtocolErrorCodes.SPLIT_BRAIN_PROTECTION, (m, c) => new SplitBrainProtectionError(m, c)); - this.register(ClientProtocolErrorCodes.REACHED_MAX_SIZE, (m, c) => new ReachedMaxSizeError(m, c)); - this.register(ClientProtocolErrorCodes.RETRYABLE_HAZELCAST, (m, c) => new RetryableHazelcastError(m, c)); - this.register(ClientProtocolErrorCodes.RETRYABLE_IO, (m, c) => new RetryableIOError(m, c)); - this.register(ClientProtocolErrorCodes.SOCKET, (m, c) => new IOError(m, c)); - this.register(ClientProtocolErrorCodes.STALE_SEQUENCE, (m, c) => new StaleSequenceError(m, c)); - this.register(ClientProtocolErrorCodes.TARGET_DISCONNECTED, (m, c) => new TargetDisconnectedError(m, c)); - this.register(ClientProtocolErrorCodes.TARGET_NOT_MEMBER, (m, c) => new TargetNotMemberError(m, c)); - this.register(ClientProtocolErrorCodes.TOPIC_OVERLOAD, (m, c) => new TopicOverloadError(m, c)); - this.register(ClientProtocolErrorCodes.TRANSACTION, (m, c) => new TransactionError(m, c)); - this.register(ClientProtocolErrorCodes.TRANSACTION_NOT_ACTIVE, (m, c) => new TransactionNotActiveError(m, c)); - this.register(ClientProtocolErrorCodes.TRANSACTION_TIMED_OUT, (m, c) => new TransactionTimedOutError(m, c)); - this.register(ClientProtocolErrorCodes.UNSUPPORTED_OPERATION, (m, c) => new UnsupportedOperationError(m, c)); - this.register(ClientProtocolErrorCodes.NO_DATA_MEMBER, (m, c) => new NoDataMemberInClusterError(m, c)); - this.register(ClientProtocolErrorCodes.STALE_TASK_ID, (m, c) => new StaleTaskIdError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST_OVERLOAD, + (m, c) => new HazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.HAZELCAST_SERIALIZATION, + (m, c) => new HazelcastSerializationError(m, c)); + this.register(ClientProtocolErrorCodes.IO, + (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.ILLEGAL_ARGUMENT, + (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.ILLEGAL_STATE, + (m, c) => new IllegalStateError(m, c)); + this.register(ClientProtocolErrorCodes.INDEX_OUT_OF_BOUNDS, + (m, c) => new RangeError(m)); + this.register(ClientProtocolErrorCodes.INTERRUPTED, + (m, c) => new Error(m)); + this.register(ClientProtocolErrorCodes.INVALID_ADDRESS, + (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.INVALID_CONFIGURATION, + (m, c) => new TypeError(m)); + this.register(ClientProtocolErrorCodes.MEMBER_LEFT, + (m, c) => new MemberLeftError(m, c)); + this.register(ClientProtocolErrorCodes.NEGATIVE_ARRAY_SIZE, + (m, c) => new RangeError(m)); + this.register(ClientProtocolErrorCodes.NO_SUCH_ELEMENT, + (m, c) => new ReferenceError(m)); + this.register(ClientProtocolErrorCodes.NOT_SERIALIZABLE, + (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.NULL_POINTER, + (m, c) => new ReferenceError(m)); + this.register(ClientProtocolErrorCodes.OPERATION_TIMEOUT, + (m, c) => new InvocationTimeoutError(m, c)); + this.register(ClientProtocolErrorCodes.PARTITION_MIGRATING, + (m, c) => new PartitionMigratingError(m, c)); + this.register(ClientProtocolErrorCodes.QUERY, + (m, c) => new QueryError(m, c)); + this.register(ClientProtocolErrorCodes.QUERY_RESULT_SIZE_EXCEEDED, + (m, c) => new QueryError(m, c)); + this.register(ClientProtocolErrorCodes.SPLIT_BRAIN_PROTECTION, + (m, c) => new SplitBrainProtectionError(m, c)); + this.register(ClientProtocolErrorCodes.REACHED_MAX_SIZE, + (m, c) => new ReachedMaxSizeError(m, c)); + this.register(ClientProtocolErrorCodes.RETRYABLE_HAZELCAST, + (m, c) => new RetryableHazelcastError(m, c)); + this.register(ClientProtocolErrorCodes.RETRYABLE_IO, + (m, c) => new RetryableIOError(m, c)); + this.register(ClientProtocolErrorCodes.SOCKET, + (m, c) => new IOError(m, c)); + this.register(ClientProtocolErrorCodes.STALE_SEQUENCE, + (m, c) => new StaleSequenceError(m, c)); + this.register(ClientProtocolErrorCodes.TARGET_DISCONNECTED, + (m, c) => new TargetDisconnectedError(m, c)); + this.register(ClientProtocolErrorCodes.TARGET_NOT_MEMBER, + (m, c) => new TargetNotMemberError(m, c)); + this.register(ClientProtocolErrorCodes.TOPIC_OVERLOAD, + (m, c) => new TopicOverloadError(m, c)); + this.register(ClientProtocolErrorCodes.TRANSACTION, + (m, c) => new TransactionError(m, c)); + this.register(ClientProtocolErrorCodes.TRANSACTION_NOT_ACTIVE, + (m, c) => new TransactionNotActiveError(m, c)); + this.register(ClientProtocolErrorCodes.TRANSACTION_TIMED_OUT, + (m, c) => new TransactionTimedOutError(m, c)); + this.register(ClientProtocolErrorCodes.UNSUPPORTED_OPERATION, + (m, c) => new UnsupportedOperationError(m, c)); + this.register(ClientProtocolErrorCodes.NO_DATA_MEMBER, + (m, c) => new NoDataMemberInClusterError(m, c)); + this.register(ClientProtocolErrorCodes.STALE_TASK_ID, + (m, c) => new StaleTaskIdError(m, c)); this.register(ClientProtocolErrorCodes.FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION, (m, c) => new NodeIdOutOfRangeError(m, c)); - this.register(ClientProtocolErrorCodes.CONSISTENCY_LOST_EXCEPTION, (m, c) => new ConsistencyLostError(m, c)); + this.register(ClientProtocolErrorCodes.CONSISTENCY_LOST_EXCEPTION, + (m, c) => new ConsistencyLostError(m, c)); + this.register(ClientProtocolErrorCodes.INDETERMINATE_OPERATION_STATE, + (m, c) => new IndeterminateOperationStateError(m, c)); } createErrorFromClientMessage(clientMessage: ClientMessage): Error { @@ -125,12 +174,11 @@ export class ClientErrorFactory { if (errorHolderIdx === errorHolders.length) { return null; } - const errorHolder = errorHolders[errorHolderIdx]; - const factoryFunc = this.codeToErrorConstructor.get(errorHolder.errorCode); + const factoryFn = this.codeToErrorConstructor.get(errorHolder.errorCode); let error: Error; - if (factoryFunc != null) { - error = factoryFunc(errorHolder.message, this.createError(errorHolders, errorHolderIdx + 1)); + if (factoryFn != null) { + error = factoryFn(errorHolder.message, this.createError(errorHolders, errorHolderIdx + 1)); } else { error = new UndefinedErrorCodeError(errorHolder.message, errorHolder.className); } diff --git a/src/util/BitsUtil.ts b/src/util/BitsUtil.ts index db03a01b8..55541ca0d 100644 --- a/src/util/BitsUtil.ts +++ b/src/util/BitsUtil.ts @@ -28,26 +28,8 @@ export class BitsUtil { static readonly DOUBLE_SIZE_IN_BYTES = 8; static readonly UUID_SIZE_IN_BYTES = BitsUtil.BOOLEAN_SIZE_IN_BYTES + 2 * BitsUtil.LONG_SIZE_IN_BYTES; - static readonly BIG_ENDIAN = 2; - static readonly LITTLE_ENDIAN = 1; - - static readonly BEGIN_FLAG = 0x80; - static readonly END_FLAG = 0x40; - static readonly BEGIN_END_FLAG = BitsUtil.BEGIN_FLAG | BitsUtil.END_FLAG; - static readonly LISTENER_FLAG = 0x01; - static readonly NULL_ARRAY_LENGTH = -1; - static readonly FRAME_LENGTH_FIELD_OFFSET = 0; - static readonly VERSION_FIELD_OFFSET = BitsUtil.FRAME_LENGTH_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; - static readonly FLAGS_FIELD_OFFSET = BitsUtil.VERSION_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - static readonly TYPE_FIELD_OFFSET = BitsUtil.FLAGS_FIELD_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; - static readonly CORRELATION_ID_FIELD_OFFSET = BitsUtil.TYPE_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; - static readonly PARTITION_ID_FIELD_OFFSET = BitsUtil.CORRELATION_ID_FIELD_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; - static readonly DATA_OFFSET_FIELD_OFFSET = BitsUtil.PARTITION_ID_FIELD_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; - - static readonly HEADER_SIZE = BitsUtil.DATA_OFFSET_FIELD_OFFSET + BitsUtil.SHORT_SIZE_IN_BYTES; - static writeUInt32(buffer: Buffer, pos: number, val: number, isBigEndian: boolean): void { if (isBigEndian) { buffer.writeUInt32BE(val, pos); diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 8e245e989..42195c5eb 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -128,6 +128,10 @@ describe('ConfigBuilderTest', function () { expect(networkCfg.ssl.sslOptions.servername).to.equal('foo.bar.com'); }); + it('backupAckToClientEnabled', function () { + expect(fullConfig.backupAckToClientEnabled).to.be.false; + }); + it('properties', function () { const properties = fullConfig.properties; expect(properties['hazelcast.client.heartbeat.interval']).to.equal(1000); diff --git a/test/config/SchemaValidationTest.js b/test/config/SchemaValidationTest.js index 275bfe442..34437d5b0 100644 --- a/test/config/SchemaValidationTest.js +++ b/test/config/SchemaValidationTest.js @@ -25,7 +25,7 @@ describe('SchemaValidationTest', function () { let schema; before(function () { - schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../config-schema.json'), 'utf8')); + schema = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'configurations/config-schema.json'), 'utf8')); }); function validateCandidate(candidate) { diff --git a/test/config-schema.json b/test/config/configurations/config-schema.json similarity index 98% rename from test/config-schema.json rename to test/config/configurations/config-schema.json index 1856184ef..d9e8e7413 100644 --- a/test/config-schema.json +++ b/test/config/configurations/config-schema.json @@ -105,6 +105,10 @@ } } }, + "backupAckToClientEnabled": { + "type": "boolean", + "default": true + }, "connectionStrategy": { "type": "object", "properties": { diff --git a/test/config/configurations/full.json b/test/config/configurations/full.json index 498e39a81..afb2265e3 100644 --- a/test/config/configurations/full.json +++ b/test/config/configurations/full.json @@ -42,6 +42,7 @@ "discoveryToken": "EXAMPLE_TOKEN" } }, + "backupAckToClientEnabled": false, "connectionStrategy": { "asyncStart": true, "reconnectMode": "async", diff --git a/test/integration/ClientBackupAcksTest.js b/test/integration/ClientBackupAcksTest.js new file mode 100644 index 000000000..7cb048906 --- /dev/null +++ b/test/integration/ClientBackupAcksTest.js @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { expect } = require('chai'); +const sinon = require('sinon'); +const sandbox = sinon.createSandbox(); +const { Client, IndeterminateOperationStateError } = require('../../'); +const RC = require('../RC'); +const { ClientLocalBackupListenerCodec } = require('../../lib/codec/ClientLocalBackupListenerCodec'); + +/** + * Tests backup acks to client (a.k.a. boomerang backups). + * + * Data structures use sync backups with backup count `1` by default, + * so there is no need for additional member side configuration. + */ +describe('ClientBackupAcksTest', function () { + + let cluster; + let client; + + before(async function () { + cluster = await RC.createCluster(null, null); + await RC.startMember(cluster.id); + await RC.startMember(cluster.id); + }); + + afterEach(async function () { + sandbox.restore(); + return client.shutdown(); + }); + + after(async function () { + return RC.terminateCluster(cluster.id); + }); + + it('should receive backup acks in smart mode', async function () { + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.operation.fail.on.indeterminate.state': true + } + }); + const map = await client.getMap('test-map'); + + // it's enough for this operation to succeed + await map.set('foo', 'bar'); + }); + + it('should throw when backup acks were lost in smart mode when prop is set', async function () { + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.operation.backup.timeout.millis': 300, + 'hazelcast.client.operation.fail.on.indeterminate.state': true + } + }); + // replace backup ack handler with a fake to emulate backup acks loss + sandbox.replace(ClientLocalBackupListenerCodec, 'handle', sinon.fake()); + const map = await client.getMap('test-map'); + + try { + await map.set('foo', 'bar'); + } catch (err) { + expect(err).to.be.instanceof(IndeterminateOperationStateError); + } + }); + + it('should not throw when backup acks were lost in smart mode when prop is not set', async function () { + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.operation.backup.timeout.millis': 300 + } + }); + // replace backup ack handler with a fake to emulate backup acks loss + sinon.replace(ClientLocalBackupListenerCodec, 'handle', sinon.fake()); + const map = await client.getMap('test-map'); + + // it's enough for this operation to succeed + await map.set('foo', 'bar'); + }); + + it('should receive ack in smart mode when acks to client are disabled', async function () { + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + backupAckToClientEnabled: false + }); + const map = await client.getMap('test-map'); + + // it's enough for this operation to succeed + await map.set('foo', 'bar'); + }); + + it('should receive ack in unisocket mode', async function () { + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + smartRouting: false + }); + const map = await client.getMap('test-map'); + + // it's enough for this operation to succeed + await map.set('foo', 'bar'); + }); +}); diff --git a/test/integration/ClientLabelTest.js b/test/integration/ClientLabelTest.js index b16526fd3..32085934f 100644 --- a/test/integration/ClientLabelTest.js +++ b/test/integration/ClientLabelTest.js @@ -16,46 +16,39 @@ 'use strict'; -const expect = require('chai').expect; -const Client = require('../../.').Client; -const Controller = require('../RC'); +const { expect } = require('chai'); +const { Client } = require('../../.'); +const RC = require('../RC'); describe('ClientLabelTest', function () { this.timeout(32000); let cluster, client; - before(function () { - return Controller.createCluster(null, null) - .then((c) => { - cluster = c; - return Controller.startMember(cluster.id); - }); + before(async function () { + cluster = await RC.createCluster(null, null); + return RC.startMember(cluster.id); }); - afterEach(function () { + afterEach(async function () { return client.shutdown(); }); - after(function () { - return Controller.terminateCluster(cluster.id); + after(async function () { + return RC.terminateCluster(cluster.id); }); - it('labels should be received on member side', function () { - return Client.newHazelcastClient({ + it('labels should be received on member side', async function () { + client = await Client.newHazelcastClient({ clusterName: cluster.id, clientLabels: ['testLabel'] - }).then((c) => { - client = c; - - const script = 'var client = instance_0.getClientService().getConnectedClients().iterator().next();\n' + - 'result = client.getLabels().iterator().next();\n'; - - return Controller.executeOnController(cluster.id, script, 1); - }).then((res) => { - expect(res.result).to.not.be.null; - expect(res.result.toString()).to.equal('testLabel'); }); + + const script = 'var client = instance_0.getClientService().getConnectedClients().iterator().next();\n' + + 'result = client.getLabels().iterator().next();\n'; + const res = await RC.executeOnController(cluster.id, script, 1); + expect(res.result).to.not.be.null; + expect(res.result.toString()).to.equal('testLabel'); }); }); diff --git a/test/invocation/InvocationServiceTest.js b/test/invocation/InvocationServiceTest.js new file mode 100644 index 000000000..1f0915a20 --- /dev/null +++ b/test/invocation/InvocationServiceTest.js @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const expect = require('chai').expect; +const sinon = require('sinon'); +const sandbox = sinon.createSandbox(); +const { Client, ClientConfigImpl } = require('../../'); +const { InvocationService } = require('../../lib/invocation/InvocationService'); +const { ListenerService } = require('../../lib/listener/ListenerService'); +const { PartitionServiceImpl } = require('../../lib/PartitionService'); +const { LoggingService } = require('../../lib/logging/LoggingService'); + +describe('InvocationServiceTest', function () { + + let service; + + function mockClient(config) { + const clientStub = sandbox.stub(Client.prototype); + clientStub.getConfig.returns(config); + const listenerServiceStub = sandbox.stub(ListenerService.prototype); + clientStub.getListenerService.returns(listenerServiceStub); + const partitionServiceStub = sandbox.stub(PartitionServiceImpl.prototype); + clientStub.getPartitionService.returns(partitionServiceStub); + const loggingServiceStub = sandbox.stub(LoggingService.prototype); + clientStub.getLoggingService.returns(loggingServiceStub); + return clientStub; + } + + afterEach(function () { + sandbox.restore(); + if (service != null) { + service.shutdown(); + } + }); + + it('should start clean resource task and register listener when client is smart and acks are enabled', function () { + const config = new ClientConfigImpl(); + const client = mockClient(config); + + service = new InvocationService(client); + service.start(); + + expect(service.cleanResourcesTask).to.be.not.undefined; + expect(client.getListenerService().registerListener.calledOnce).to.be.true; + }); + + it('should not start clean resource task and register listener when client is unisocket', function () { + const config = new ClientConfigImpl(); + config.network.smartRouting = false; + const client = mockClient(config); + + service = new InvocationService(client); + service.start(); + + expect(service.cleanResourcesTask).to.be.undefined; + expect(client.getListenerService().registerListener.notCalled).to.be.true; + }); + + it('should not start clean resource task and register listener when acks are disabled', function () { + const config = new ClientConfigImpl(); + config.backupAckToClientEnabled = false; + const client = mockClient(config); + + service = new InvocationService(client); + service.start(); + + expect(service.cleanResourcesTask).to.be.undefined; + expect(client.getListenerService().registerListener.notCalled).to.be.true; + }); +}); diff --git a/test/invocation/InvocationTest.js b/test/invocation/InvocationTest.js new file mode 100644 index 000000000..562ed49ac --- /dev/null +++ b/test/invocation/InvocationTest.js @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const expect = require('chai').expect; +const sinon = require('sinon'); +const sandbox = sinon.createSandbox(); +const { Client, IndeterminateOperationStateError } = require('../../'); +const { Invocation, InvocationService } = require('../../lib/invocation/InvocationService'); +const { ClientMessage } = require('../../lib/protocol/ClientMessage'); + +describe('InvocationTest', function () { + + let clientStub; + let serviceStub; + + beforeEach(function () { + clientStub = sandbox.stub(Client.prototype); + serviceStub = sandbox.stub(InvocationService.prototype); + clientStub.getInvocationService.returns(serviceStub); + }); + + afterEach(function () { + sandbox.restore(); + }); + + it('notify: should complete when no expected backups', function () { + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + messageStub.getNumberOfBackupAcks.returns(0); + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.notify(messageStub); + + expect(completeStub.withArgs(messageStub).calledOnce).to.be.true; + }); + + it('notify: should not complete when expected and no received backups', function () { + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + messageStub.getNumberOfBackupAcks.returns(1); + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.notify(messageStub); + + expect(completeStub.notCalled).to.be.true; + expect(invocation.pendingResponseReceivedMillis).to.be.greaterThan(0); + expect(invocation.backupsAcksExpected).to.be.equal(1); + expect(invocation.pendingResponseMessage).to.be.equal(messageStub); + }); + + it('notify: should complete when expected and received backups are equal', function () { + const invocation = new Invocation(clientStub); + invocation.backupsAcksReceived = 1; + const messageStub = sandbox.stub(ClientMessage.prototype); + messageStub.getNumberOfBackupAcks.returns(1); + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.notify(messageStub); + + expect(completeStub.withArgs(messageStub).calledOnce).to.be.true; + }); + + it('notifyBackupComplete: should not complete when no pending message', function () { + const invocation = new Invocation(clientStub); + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.notifyBackupComplete(); + + expect(completeStub.notCalled).to.be.true; + expect(invocation.backupsAcksReceived).to.be.equal(1); + }); + + it('notifyBackupComplete: should not complete when not all acks received', function () { + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + invocation.pendingResponseMessage = messageStub; + invocation.backupsAcksReceived = 1; + invocation.backupsAcksExpected = 3; + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.notifyBackupComplete(); + + expect(completeStub.notCalled).to.be.true; + expect(invocation.backupsAcksReceived).to.be.equal(2); + }); + + it('notifyBackupComplete: should complete when all acks received', function () { + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + invocation.pendingResponseMessage = messageStub; + invocation.backupsAcksReceived = 1; + invocation.backupsAcksExpected = 2; + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.notifyBackupComplete(); + + expect(completeStub.withArgs(messageStub).calledOnce).to.be.true; + expect(invocation.backupsAcksReceived).to.be.equal(2); + }); + + it('detectAndHandleBackupTimeout: should not complete when all acks received', function () { + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + invocation.pendingResponseMessage = messageStub; + invocation.backupsAcksReceived = 1; + invocation.backupsAcksExpected = 1; + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.detectAndHandleBackupTimeout(1); + + expect(completeStub.notCalled).to.be.true; + }); + + it('detectAndHandleBackupTimeout: should not complete when not all acks received and timeout not reached', function () { + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + invocation.pendingResponseMessage = messageStub; + invocation.backupsAcksReceived = 1; + invocation.backupsAcksExpected = 1; + + invocation.pendingResponseReceivedMillis = 40; + sandbox.useFakeTimers(40); // 40 + 1 > 40 + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.detectAndHandleBackupTimeout(1); + + expect(completeStub.notCalled).to.be.true; + }); + + it('detectAndHandleBackupTimeout: should complete when not all acks received and timeout reached', function () { + serviceStub.shouldFailOnIndeterminateState = false; + + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + invocation.pendingResponseMessage = messageStub; + invocation.backupsAcksReceived = 0; + invocation.backupsAcksExpected = 1; + + invocation.pendingResponseReceivedMillis = 40; + sandbox.useFakeTimers(42); // 40 + 1 < 42 + + const completeStub = sandbox.stub(invocation, 'complete'); + invocation.detectAndHandleBackupTimeout(1); + + expect(completeStub.withArgs(messageStub).calledOnce).to.be.true; + }); + + it('detectAndHandleBackupTimeout: should complete with error when prop is set', function () { + serviceStub.shouldFailOnIndeterminateState = true; + + const invocation = new Invocation(clientStub); + const messageStub = sandbox.stub(ClientMessage.prototype); + invocation.pendingResponseMessage = messageStub; + invocation.request = messageStub; + invocation.backupsAcksReceived = 0; + invocation.backupsAcksExpected = 1; + + invocation.pendingResponseReceivedMillis = 40; + sandbox.useFakeTimers(42); // 40 + 1 < 42 + + const completeWithErrorStub = sandbox.stub(invocation, 'completeWithError'); + invocation.detectAndHandleBackupTimeout(1); + + expect(completeWithErrorStub.calledOnce).to.be.true; + expect(completeWithErrorStub.args[0][0]).to.be.instanceof(IndeterminateOperationStateError); + }); +}); diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index 18dafb912..55d09db87 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -15,18 +15,17 @@ */ 'use strict'; -const RC = require('../RC'); -const Client = require('../../').Client; const expect = require('chai').expect; const fs = require('fs'); -const Util = require('../Util'); +const RC = require('../RC'); +const { Client } = require('../../'); const { DeferredPromise } = require('../../lib/util/Util'); +const Util = require('../Util'); -describe('LostInvalidation', function () { +describe('LostInvalidationTest', function () { this.timeout(30000); let cluster; - let member; let client; let modifyingClient; @@ -38,10 +37,10 @@ describe('LostInvalidation', function () { const clientRegistrationKey = client.getListenerService().activeRegistrations .get(listenerId).get(client.getConnectionManager().getRandomConnection()); const correlationId = clientRegistrationKey.correlationId; - const handler = client.getInvocationService().eventHandlers[correlationId].handler; + const handler = client.getInvocationService().eventHandlers.get(correlationId).handler; const deferred = DeferredPromise(); let numberOfBlockedInvalidations = 0; - client.getInvocationService().eventHandlers[correlationId].handler = function () { + client.getInvocationService().eventHandlers.get(correlationId).handler = () => { numberOfBlockedInvalidations++; if (notifyAfterNumberOfEvents !== undefined && notifyAfterNumberOfEvents === numberOfBlockedInvalidations) { deferred.resolve(); @@ -55,7 +54,7 @@ describe('LostInvalidation', function () { } function unblockInvalidationEvents(client, metadata) { - client.getInvocationService().eventHandlers[metadata.correlationId].handler = metadata.handler; + client.getInvocationService().eventHandlers.get(metadata.correlationId).handler = metadata.handler; } before(function () { @@ -63,9 +62,6 @@ describe('LostInvalidation', function () { .then(function (resp) { cluster = resp; return RC.startMember(cluster.id); - }) - .then(function (m) { - member = m; }); }); diff --git a/test/unit/protocol/ClientMessageTest.js b/test/unit/protocol/ClientMessageTest.js index 5895bd732..beecf16e7 100644 --- a/test/unit/protocol/ClientMessageTest.js +++ b/test/unit/protocol/ClientMessageTest.js @@ -39,7 +39,7 @@ describe('ClientMessageTest', function () { const cmDecode = ClientMessage.createForDecode(cmEncode.startFrame); expect(cmEncode.getMessageType()).to.equal(cmDecode.getMessageType()); - expect(cmEncode.getHeaderFlags()).to.equal(cmDecode.getHeaderFlags()); + expect(cmEncode.getStartFrame().flags).to.equal(cmDecode.getStartFrame().flags); expect(cmEncode.getCorrelationId()).to.equal(cmDecode.getCorrelationId()); expect(cmEncode.getPartitionId()).to.equal(cmDecode.getPartitionId()); expect(cmEncode.getTotalFrameLength()).to.equal(cmDecode.getTotalFrameLength()); @@ -68,7 +68,7 @@ describe('ClientMessageTest', function () { expect(originalFrame.flags).to.equal(copyFrame.flags); expect(originalMessage.getMessageType()).to.equal(copyMessage.getMessageType()); - expect(originalMessage.getHeaderFlags()).to.equal(copyMessage.getHeaderFlags()); + expect(originalMessage.getStartFrame().flags).to.equal(copyMessage.getStartFrame().flags); expect(originalMessage.getPartitionId()).to.equal(copyMessage.getPartitionId()); expect(originalMessage.getTotalFrameLength()).to.equal(copyMessage.getTotalFrameLength()); expect(copyMessage.getCorrelationId()).to.equal(-1); From 8b6a6ea21ef7de0044e80842f0864a703d2c80d4 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 25 Aug 2020 11:41:56 +0300 Subject: [PATCH 281/685] Change minimal Node.js version to 10 (#574) Also includes the following: * Update dev dependency versions * Fix linter errors and disable some warnings * Fix potential unhandled promise rejection in ReliableTopicProxy#trySendMessage --- .eslintrc.js | 2 ++ DOCUMENTATION.md | 2 +- package.json | 20 +++++------ src/invocation/RegistrationKey.ts | 16 ++++----- src/listener/ListenerService.ts | 4 ++- src/network/ClientConnection.ts | 5 +-- src/protocol/ClientMessage.ts | 3 ++ src/proxy/MapProxy.ts | 9 +++-- src/proxy/NearCachedMapProxy.ts | 6 ++-- src/proxy/ProxyManager.ts | 2 +- src/proxy/ReplicatedMapProxy.ts | 9 +++-- src/proxy/topic/ReliableTopicProxy.ts | 20 +++++------ src/serialization/ObjectData.ts | 4 +-- src/serialization/SerializationService.ts | 22 ++++++------ src/serialization/SerializationUtil.ts | 6 ++-- .../portable/MorphingPortableReader.ts | 34 ++++++++++--------- 16 files changed, 91 insertions(+), 73 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 50d669f8c..a50b3c81a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -26,6 +26,8 @@ module.exports = { 'plugin:@typescript-eslint/recommended', ], rules: { + '@typescript-eslint/no-var-requires': 0, + '@typescript-eslint/explicit-module-boundary-types': 0, '@typescript-eslint/interface-name-prefix': 0, '@typescript-eslint/no-empty-interface': 0, '@typescript-eslint/no-explicit-any': 0, diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 3f15535c6..451f5cb3a 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -135,7 +135,7 @@ This chapter provides information on how to get started with your Hazelcast Node ## 1.1. Requirements - Windows, Linux or MacOS -- Node.js 8 or newer +- Node.js 10 or newer - Java 8 or newer - Hazelcast IMDG 4.0 or newer - Latest Hazelcast Node.js client diff --git a/package.json b/package.json index f38d70cb7..e0dd7506a 100644 --- a/package.json +++ b/package.json @@ -11,26 +11,26 @@ "@types/long": "4.0.1" }, "devDependencies": { - "@types/node": "^8.10.60", - "@typescript-eslint/eslint-plugin": "^2.34.0", - "@typescript-eslint/parser": "^2.34.0", + "@types/node": "^10.17.28", + "@typescript-eslint/eslint-plugin": "^3.10.0", + "@typescript-eslint/parser": "^3.10.0", "chai": "^4.2.0", "chai-as-promised": "^7.1.1", - "eslint": "^6.8.0", + "eslint": "^7.7.0", "jsonschema": "^1.2.6", - "mocha": "^7.2.0", - "mocha-junit-reporter": "^1.23.3", + "mocha": "^8.1.1", + "mocha-junit-reporter": "^2.0.0", "mousse": "^0.3.1", "nyc": "^15.1.0", "rimraf": "^3.0.2", - "sinon": "^9.0.2", + "sinon": "^9.0.3", "thrift": "^0.12.0", "typedoc": "^0.18.0", - "typescript": "^3.9.5", - "winston": "^3.2.1" + "typescript": "^3.9.7", + "winston": "^3.3.3" }, "engines": { - "node": ">=8" + "node": ">=10" }, "scripts": { "clean": "rimraf lib *.jar *.log", diff --git a/src/invocation/RegistrationKey.ts b/src/invocation/RegistrationKey.ts index 0a22ca4bd..1ca73d916 100644 --- a/src/invocation/RegistrationKey.ts +++ b/src/invocation/RegistrationKey.ts @@ -16,22 +16,22 @@ /** @ignore *//** */ import {ListenerMessageCodec} from '../listener/ListenerMessageCodec'; -import {ClientMessage} from '../protocol/ClientMessage'; +import {ClientMessage, ClientMessageHandler} from '../protocol/ClientMessage'; /** @internal */ export class RegistrationKey { private readonly userRegistrationId: string; - private registerHandlerFunc: Function; + private registerHandlerFn: ClientMessageHandler; private registerRequest: ClientMessage; private codec: ListenerMessageCodec; constructor(regId: string, codec: ListenerMessageCodec, registerRequest?: ClientMessage, - registerHandlerFunc?: Function) { + registerHandlerFn?: ClientMessageHandler) { this.userRegistrationId = regId; - this.registerHandlerFunc = registerHandlerFunc; + this.registerHandlerFn = registerHandlerFn; this.registerRequest = registerRequest; this.codec = codec; } @@ -52,12 +52,12 @@ export class RegistrationKey { this.codec = value; } - getHandler(): Function { - return this.registerHandlerFunc; + getHandler(): ClientMessageHandler { + return this.registerHandlerFn; } - setHandler(handler: Function): void { - this.registerHandlerFunc = handler; + setHandler(handler: ClientMessageHandler): void { + this.registerHandlerFn = handler; } getUserRegistrationKey(): string { diff --git a/src/listener/ListenerService.ts b/src/listener/ListenerService.ts index a653be55d..7b1c8e8f4 100644 --- a/src/listener/ListenerService.ts +++ b/src/listener/ListenerService.ts @@ -22,6 +22,7 @@ import {ClientConnection} from '../network/ClientConnection'; import {ClientEventRegistration} from '../invocation/ClientEventRegistration'; import {Invocation} from '../invocation/InvocationService'; import {RegistrationKey} from '../invocation/RegistrationKey'; +import {ClientMessageHandler} from '../protocol/ClientMessage'; import {ListenerMessageCodec} from './ListenerMessageCodec'; import {DeferredPromise} from '../util/Util'; import {UuidUtil} from '../util/UuidUtil'; @@ -116,7 +117,8 @@ export class ListenerService { return deferred.promise; } - registerListener(codec: ListenerMessageCodec, listenerHandlerFn: Function): Promise { + registerListener(codec: ListenerMessageCodec, + listenerHandlerFn: ClientMessageHandler): Promise { const activeConnections = this.client.getConnectionManager().getActiveConnections(); const userRegistrationKey = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index f72989e2a..d2219b0cc 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -22,6 +22,7 @@ import {BitsUtil} from '../util/BitsUtil'; import {BuildInfo} from '../BuildInfo'; import {HazelcastClient} from '../HazelcastClient'; import {AddressImpl, IOError, UUID} from '../core'; +import {ClientMessageHandler} from '../protocol/ClientMessage'; import {DeferredPromise} from '../util/Util'; import {ILogger} from '../logging/ILogger'; import { @@ -250,7 +251,7 @@ export class FragmentedClientMessageHandler { this.logger = logger; } - handleFragmentedMessage(clientMessage: ClientMessage, callback: Function): void { + handleFragmentedMessage(clientMessage: ClientMessage, callback: ClientMessageHandler): void { const fragmentationFrame = clientMessage.startFrame; const fragmentationId = clientMessage.getFragmentationId(); clientMessage.dropFragmentationFrame(); @@ -413,7 +414,7 @@ export class ClientConnection { * Registers a function to pass received data on 'data' events on this connection. * @param callback */ - registerResponseCallback(callback: Function): void { + registerResponseCallback(callback: ClientMessageHandler): void { this.socket.on('data', (buffer: Buffer) => { this.lastReadTimeMillis = Date.now(); this.reader.append(buffer); diff --git a/src/protocol/ClientMessage.ts b/src/protocol/ClientMessage.ts index f07f196e5..a627f8ab1 100644 --- a/src/protocol/ClientMessage.ts +++ b/src/protocol/ClientMessage.ts @@ -287,3 +287,6 @@ export class ClientMessage { return Buffer.concat(buffers, totalLength); } } + +/** @internal */ +export type ClientMessageHandler = (message: ClientMessage) => void; diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 1eed2c2b2..d6192bffe 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -89,6 +89,9 @@ import {IndexUtil} from '../util/IndexUtil'; import {PagingPredicateHolder} from '../protocol/PagingPredicateHolder'; import {MapEntriesWithPagingPredicateCodec} from '../codec/MapEntriesWithPagingPredicateCodec'; +type EntryEventHander = (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, + uuid: UUID, numberOfAffectedEntries: number) => void; + /** @internal */ export class MapProxy extends BaseProxy implements IMap { aggregate(aggregator: Aggregator): Promise { @@ -691,7 +694,7 @@ export class MapProxy extends BaseProxy implements IMap { } } const toObject = this.toObject.bind(this); - const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, eventType: number, + const entryEventHandler = (key: Data, value: Data, oldValue: Data, mergingValue: Data, eventType: number, uuid: UUID, numberOfAffectedEntries: number): void => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; @@ -736,7 +739,7 @@ export class MapProxy extends BaseProxy implements IMap { } }; let codec: ListenerMessageCodec; - let listenerHandler: Function; + let listenerHandler: (message: ClientMessage, handler: EntryEventHander) => void; if (key && predicate) { const keyData = this.toData(key); const predicateData = this.toData(predicate); @@ -755,7 +758,7 @@ export class MapProxy extends BaseProxy implements IMap { listenerHandler = MapAddEntryListenerCodec.handle; } return this.client.getListenerService() - .registerListener(codec, (m: ClientMessage) => { + .registerListener(codec, (m: ClientMessage): void => { listenerHandler(m, entryEventHandler); }); } diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 7b0054eb4..5bae3f7d4 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -15,6 +15,7 @@ */ /** @ignore *//** */ +import * as Long from 'long'; import * as Promise from 'bluebird'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; @@ -27,8 +28,7 @@ import {NearCache} from '../nearcache/NearCache'; import {StaleReadDetectorImpl} from '../nearcache/StaleReadDetector'; import {Data} from '../serialization/Data'; import {MapProxy} from './MapProxy'; -import {ClientMessage} from '../protocol/ClientMessage'; -import * as Long from 'long'; +import {ClientMessage, ClientMessageHandler} from '../protocol/ClientMessage'; /** @internal */ export class NearCachedMapProxy extends MapProxy { @@ -228,7 +228,7 @@ export class NearCachedMapProxy extends MapProxy { }; } - private createNearCacheEventHandler(): Promise { + private createNearCacheEventHandler(): Promise { const repairingTask = this.client.getRepairingTask(); return repairingTask.registerAndGetHandler(this.getName(), this.nearCache).then((repairingHandler) => { const staleReadDetector = new StaleReadDetectorImpl( diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index b4d1aec3b..cb455e33b 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -164,7 +164,7 @@ export class ProxyManager { } public addDistributedObjectListener(distributedObjectListener: DistributedObjectListener): Promise { - const handler = function (clientMessage: ClientMessage): void { + const handler = (clientMessage: ClientMessage): void => { const converterFunc = (objectName: string, serviceName: string, eventType: string): void => { eventType = eventType.toLowerCase(); const distributedObjectEvent = new DistributedObjectEvent(eventType, serviceName, objectName); diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index ba552bf91..87ae56366 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -51,6 +51,9 @@ import {MapEvent} from './MapListener'; import {ClientMessage} from '../protocol/ClientMessage'; import {deserializeEntryList} from '../serialization/SerializationUtil'; +type EntryEventHander = (key: Data, value: Data, oldValue: Data, mergingValue: Data, + eventType: number, uuid: UUID, numberOfAffectedEntries: number) => void + export class ReplicatedMapProxy extends PartitionSpecificProxy implements ReplicatedMap { put(key: K, value: V, ttl: Long | number = 0): Promise { @@ -200,7 +203,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements private addEntryListenerInternal(listener: EntryListener, predicate: Predicate, key: K): Promise { const toObject = this.toObject.bind(this); - const entryEventHandler = (key: K, value: V, oldValue: V, mergingValue: V, + const entryEventHandler = (key: Data, value: Data, oldValue: Data, mergingValue: Data, event: number, uuid: UUID, numberOfAffectedEntries: number): void => { const member = this.client.getClusterService().getMember(uuid); const name = this.name; @@ -233,7 +236,9 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements listener[mapEventMethod].apply(null, [mapEvent]); } }; - let listenerHandler: Function; + let listenerHandler: (message: ClientMessage, + handler: EntryEventHander, + toObjectFn: (data: Data) => any) => void; let codec: ListenerMessageCodec; if (key && predicate) { const keyData = this.toData(key); diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 6ed14cdcb..00a3b410d 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -23,6 +23,7 @@ import {TopicOverloadError} from '../../core'; import {AddressImpl} from '../../core/Address'; import {SerializationService} from '../../serialization/SerializationService'; import {UuidUtil} from '../../util/UuidUtil'; +import {DeferredPromise} from '../../util/Util'; import {BaseProxy} from '../BaseProxy'; import {Ringbuffer} from '../Ringbuffer'; import {ITopic} from '../ITopic'; @@ -142,28 +143,23 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } private addWithBackoff(reliableTopicMessage: ReliableTopicMessage): Promise { - let resolve: Function; - const promise = new Promise(function (): void { - resolve = arguments[0]; - }); - - this.trySendMessage(reliableTopicMessage, TOPIC_INITIAL_BACKOFF, resolve); - - return promise; + const deferred = DeferredPromise(); + this.trySendMessage(reliableTopicMessage, TOPIC_INITIAL_BACKOFF, deferred); + return deferred.promise; } - private trySendMessage(message: ReliableTopicMessage, delay: number, resolve: Function): void { + private trySendMessage(message: ReliableTopicMessage, delay: number, deferred: Promise.Resolver): void { this.ringbuffer.add(message, OverflowPolicy.FAIL).then((seq: Long) => { if (seq.toNumber() === -1) { let newDelay = delay *= 2; if (newDelay > TOPIC_MAX_BACKOFF) { newDelay = TOPIC_MAX_BACKOFF; } - this.trySendMessage(message, newDelay, resolve); + this.trySendMessage(message, newDelay, deferred); } else { - resolve(); + deferred.resolve(); } - }); + }).catch(deferred.reject); } } diff --git a/src/serialization/ObjectData.ts b/src/serialization/ObjectData.ts index c3a384a4b..c1a4469f4 100644 --- a/src/serialization/ObjectData.ts +++ b/src/serialization/ObjectData.ts @@ -225,7 +225,7 @@ export class ObjectDataOutput implements DataOutput { } } - private writeArray(func: Function, arr: any[]): void { + private writeArray(func: (val: any) => void, arr: any[]): void { const len = (arr != null) ? arr.length : BitsUtil.NULL_ARRAY_LENGTH; this.writeInt(len); if (len > 0) { @@ -522,7 +522,7 @@ export class ObjectDataInput implements DataInput { return raw; } - private readArray(func: Function, pos?: number): T[] { + private readArray(func: () => any, pos?: number): T[] { const backupPos = this.pos; if (pos !== undefined) { this.pos = pos; diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index f2488196a..14e1ab653 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -71,6 +71,16 @@ export interface SerializationService { } +type PartitionStrategy = (obj: any) => number; + +const defaultPartitionStrategy = (obj: any): number => { + if (obj == null || !obj['getPartitionHash']) { + return 0; + } else { + return obj.getPartitionHash(); + } +} + /** @internal */ export class SerializationServiceV1 implements SerializationService { @@ -95,7 +105,7 @@ export class SerializationServiceV1 implements SerializationService { } } - toData(object: any, partitioningStrategy: any = this.defaultPartitionStrategy): Data { + toData(object: any, partitioningStrategy: PartitionStrategy = defaultPartitionStrategy): Data { if (this.isData(object)) { return object as Data; } @@ -338,15 +348,7 @@ export class SerializationServiceV1 implements SerializationService { return serializer; } - protected calculatePartitionHash(object: any, strategy: Function): number { + protected calculatePartitionHash(object: any, strategy: PartitionStrategy): number { return strategy(object); } - - private defaultPartitionStrategy(obj: any): number { - if (obj == null || !obj['getPartitionHash']) { - return 0; - } else { - return obj.getPartitionHash(); - } - } } diff --git a/src/serialization/SerializationUtil.ts b/src/serialization/SerializationUtil.ts index 953f14e58..aa34c8e57 100644 --- a/src/serialization/SerializationUtil.ts +++ b/src/serialization/SerializationUtil.ts @@ -18,7 +18,8 @@ import {Data} from './Data'; /** @internal */ -export function deserializeEntryList(toObject: Function, entrySet: Array<[Data, Data]>): Array<[K, V]> { +export function deserializeEntryList(toObject: (data: Data) => any, + entrySet: Array<[Data, Data]>): Array<[K, V]> { const deserializedSet: Array<[K, V]> = []; entrySet.forEach(function (entry): void { deserializedSet.push([toObject(entry[0]), toObject(entry[1])]); @@ -27,7 +28,8 @@ export function deserializeEntryList(toObject: Function, entrySet: Array<[ } /** @internal */ -export function serializeList(toData: Function, input: any[]): Data[] { +export function serializeList(toData: (obj: any) => Data, + input: any[]): Data[] { return input.map((each) => { return toData(each); }); diff --git a/src/serialization/portable/MorphingPortableReader.ts b/src/serialization/portable/MorphingPortableReader.ts index afdf6b2c4..a3d907b16 100644 --- a/src/serialization/portable/MorphingPortableReader.ts +++ b/src/serialization/portable/MorphingPortableReader.ts @@ -133,62 +133,64 @@ export class MorphingPortableReader extends DefaultPortableReader { } readPortableArray(fieldName: string): Portable[] { - return this.validateCompatibleAndCall(fieldName, FieldType.PORTABLE_ARRAY, super.readPortableArray); + return this.validateCompatibleAndRead(fieldName, FieldType.PORTABLE_ARRAY, super.readPortableArray); } readUTFArray(fieldName: string): string[] { - return this.validateCompatibleAndCall(fieldName, FieldType.UTF_ARRAY, super.readUTFArray); + return this.validateCompatibleAndRead(fieldName, FieldType.UTF_ARRAY, super.readUTFArray); } readShortArray(fieldName: string): number[] { - return this.validateCompatibleAndCall(fieldName, FieldType.SHORT_ARRAY, super.readShortArray); + return this.validateCompatibleAndRead(fieldName, FieldType.SHORT_ARRAY, super.readShortArray); } readFloatArray(fieldName: string): number[] { - return this.validateCompatibleAndCall(fieldName, FieldType.FLOAT_ARRAY, super.readFloatArray); + return this.validateCompatibleAndRead(fieldName, FieldType.FLOAT_ARRAY, super.readFloatArray); } readDoubleArray(fieldName: string): number[] { - return this.validateCompatibleAndCall(fieldName, FieldType.DOUBLE_ARRAY, super.readDoubleArray); + return this.validateCompatibleAndRead(fieldName, FieldType.DOUBLE_ARRAY, super.readDoubleArray); } readLongArray(fieldName: string): Long[] { - return this.validateCompatibleAndCall(fieldName, FieldType.LONG_ARRAY, super.readLongArray); + return this.validateCompatibleAndRead(fieldName, FieldType.LONG_ARRAY, super.readLongArray); } readIntArray(fieldName: string): number[] { - return this.validateCompatibleAndCall(fieldName, FieldType.INT_ARRAY, super.readIntArray); + return this.validateCompatibleAndRead(fieldName, FieldType.INT_ARRAY, super.readIntArray); } readCharArray(fieldName: string): string[] { - return this.validateCompatibleAndCall(fieldName, FieldType.CHAR_ARRAY, super.readCharArray); + return this.validateCompatibleAndRead(fieldName, FieldType.CHAR_ARRAY, super.readCharArray); } readBooleanArray(fieldName: string): boolean[] { - return this.validateCompatibleAndCall(fieldName, FieldType.BOOLEAN_ARRAY, super.readBooleanArray); + return this.validateCompatibleAndRead(fieldName, FieldType.BOOLEAN_ARRAY, super.readBooleanArray); } readByteArray(fieldName: string): Buffer { - return this.validateCompatibleAndCall(fieldName, FieldType.BYTE_ARRAY, super.readByteArray); + return this.validateCompatibleAndRead(fieldName, FieldType.BYTE_ARRAY, super.readByteArray); } readChar(fieldName: string): string { - return this.validateCompatibleAndCall(fieldName, FieldType.CHAR, super.readChar); + return this.validateCompatibleAndRead(fieldName, FieldType.CHAR, super.readChar); } readByte(fieldName: string): number { - return this.validateCompatibleAndCall(fieldName, FieldType.BYTE, super.readByte); + return this.validateCompatibleAndRead(fieldName, FieldType.BYTE, super.readByte); } readBoolean(fieldName: string): boolean { - return this.validateCompatibleAndCall(fieldName, FieldType.BOOLEAN, super.readBoolean); + return this.validateCompatibleAndRead(fieldName, FieldType.BOOLEAN, super.readBoolean); } readUTF(fieldName: string): string { - return this.validateCompatibleAndCall(fieldName, FieldType.UTF, super.readUTF); + return this.validateCompatibleAndRead(fieldName, FieldType.UTF, super.readUTF); } - private validateCompatibleAndCall(fieldName: string, expectedType: FieldType, superFunc: Function): any { + private validateCompatibleAndRead(fieldName: string, + expectedType: FieldType, + readFn: (fieldName: string) => any): any { const fd = this.classDefinition.getField(fieldName); if (fd === null) { return undefined; @@ -196,7 +198,7 @@ export class MorphingPortableReader extends DefaultPortableReader { if (fd.getType() !== expectedType) { throw this.createIncompatibleClassChangeError(fd, expectedType); } - return superFunc.call(this, fieldName); + return readFn.call(this, fieldName); } private createIncompatibleClassChangeError(fd: FieldDefinition, expectedType: FieldType): Error { From ce052cad0e24b3e0c39b6b81a2dd9745a710b79b Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Wed, 26 Aug 2020 17:35:12 +0300 Subject: [PATCH 282/685] Add serverStackTrace property in HazelcastError class (#576) Also includes the following: * Introduce new errors to be used in ClientErrorFactory * Improve unknown server exception handling * Add ClientErrorFactoryTest --- src/core/HazelcastError.ts | 262 +++++++++++++------ src/protocol/ErrorFactory.ts | 128 +++++---- src/protocol/StackTraceElement.ts | 5 +- test/unit/protocol/ClientErrorFactoryTest.js | 91 +++++++ 4 files changed, 349 insertions(+), 137 deletions(-) create mode 100644 test/unit/protocol/ClientErrorFactoryTest.js diff --git a/src/core/HazelcastError.ts b/src/core/HazelcastError.ts index e93d06fdf..051497d46 100644 --- a/src/core/HazelcastError.ts +++ b/src/core/HazelcastError.ts @@ -22,45 +22,80 @@ export interface HazelcastErrorConstructor { } /** - * Base class for all specific errors thrown by Hazelcast client. + * Represents a stack trace element of server-side exception. + */ +export interface ServerErrorStackElement { + + /** + * Class name. + */ + className: string; + + /** + * Method name. + */ + methodName: string; + + /** + * Name of the file containing the class. + */ + fileName: string; + + /** + * Line number from the class. + */ + lineNumber: number; + +} + +/** + * Base class for all specific exceptions thrown by Hazelcast client. */ export class HazelcastError extends Error { + /** + * Cause of this exception. + */ cause: Error; - stack: string; - constructor(msg: string, cause?: Error) { + /** + * Server-side stack trace. + */ + serverStackTrace?: ServerErrorStackElement[]; + + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { super(msg); this.cause = cause; + this.serverStackTrace = serverStackTrace; Error.captureStackTrace(this, HazelcastError); Object.setPrototypeOf(this, HazelcastError.prototype); } } export class HazelcastSerializationError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, HazelcastSerializationError.prototype); } } export class AuthenticationError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, AuthenticationError.prototype); } } export class ClientNotActiveError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ClientNotActiveError.prototype); } } export class ClientNotAllowedInClusterError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ClientNotAllowedInClusterError.prototype); } } @@ -73,232 +108,295 @@ export class ClientOfflineError extends HazelcastError { } export class InvalidConfigurationError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, InvalidConfigurationError.prototype); } } export class IllegalStateError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, IllegalStateError.prototype); } } export class StaleSequenceError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, StaleSequenceError.prototype); } } export class TopicOverloadError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, TopicOverloadError.prototype); } } export class IOError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, IOError.prototype); } } -export class UndefinedErrorCodeError extends HazelcastError { - constructor(msg: string, className: string) { - super('Class name: ' + className + ' , Message: ' + msg); - Object.setPrototypeOf(this, UndefinedErrorCodeError.prototype); - } -} - export class InvocationTimeoutError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, InvocationTimeoutError.prototype); } } export class RetryableHazelcastError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, RetryableHazelcastError.prototype); } } export class TargetNotMemberError extends RetryableHazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, TargetNotMemberError.prototype); } } export class CallerNotMemberError extends RetryableHazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, CallerNotMemberError.prototype); } } export class CancellationError extends IllegalStateError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, CancellationError.prototype); } } export class ClassCastError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ClassCastError.prototype); } } export class ClassNotFoundError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ClassNotFoundError.prototype); } } export class ConcurrentModificationError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ConcurrentModificationError.prototype); } } export class ConfigMismatchError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ConfigMismatchError.prototype); } } export class DistributedObjectDestroyedError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, DistributedObjectDestroyedError.prototype); } } export class HazelcastInstanceNotActiveError extends IllegalStateError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, HazelcastInstanceNotActiveError.prototype); } } export class MemberLeftError extends RetryableHazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, MemberLeftError.prototype); } } export class PartitionMigratingError extends RetryableHazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, PartitionMigratingError.prototype); } } export class QueryError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, QueryError.prototype); } } export class TransactionError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, TransactionError.prototype); } } export class TransactionNotActiveError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, TransactionNotActiveError.prototype); } } export class TransactionTimedOutError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, TransactionTimedOutError.prototype); } } export class SplitBrainProtectionError extends TransactionError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, SplitBrainProtectionError.prototype); } } export class RetryableIOError extends RetryableHazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, RetryableIOError.prototype); } } export class TargetDisconnectedError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, TargetDisconnectedError.prototype); } } export class UnsupportedOperationError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, UnsupportedOperationError.prototype); } } export class ConsistencyLostError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ConsistencyLostError.prototype); } } export class NoDataMemberInClusterError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, NoDataMemberInClusterError.prototype); } } export class StaleTaskIdError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, StaleTaskIdError.prototype); } } export class NodeIdOutOfRangeError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, NodeIdOutOfRangeError.prototype); } } export class ReachedMaxSizeError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, ReachedMaxSizeError.prototype); } } export class IndeterminateOperationStateError extends HazelcastError { - constructor(msg: string, cause?: Error) { - super(msg, cause); + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); Object.setPrototypeOf(this, IndeterminateOperationStateError.prototype); } } + +export class ArrayIndexOutOfBoundsError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, ArrayIndexOutOfBoundsError.prototype); + } +} + +export class ArrayStoreError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, ArrayStoreError.prototype); + } +} + +export class IllegalArgumentError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, IllegalArgumentError.prototype); + } +} + +export class IndexOutOfBoundsError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, IndexOutOfBoundsError.prototype); + } +} + +export class InterruptedError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, InterruptedError.prototype); + } +} + +export class InvalidAddressError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, InvalidAddressError.prototype); + } +} + +export class NegativeArraySizeError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, NegativeArraySizeError.prototype); + } +} + +export class NoSuchElementError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, NoSuchElementError.prototype); + } +} + +export class NullPointerError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, NullPointerError.prototype); + } +} + +export class UndefinedErrorCodeError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, UndefinedErrorCodeError.prototype); + } +} diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index aaaaaf816..ba7c2184b 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -16,6 +16,8 @@ /** @ignore *//** */ import { + ArrayIndexOutOfBoundsError, + ArrayStoreError, AuthenticationError, CallerNotMemberError, CancellationError, @@ -31,9 +33,17 @@ import { InvocationTimeoutError, IndeterminateOperationStateError, IOError, + IllegalArgumentError, + IndexOutOfBoundsError, + InvalidAddressError, + InvalidConfigurationError, + InterruptedError, MemberLeftError, + NegativeArraySizeError, + NoSuchElementError, NoDataMemberInClusterError, NodeIdOutOfRangeError, + NullPointerError, PartitionMigratingError, QueryError, SplitBrainProtectionError, @@ -56,8 +66,9 @@ import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; import {ClientMessage} from '../protocol/ClientMessage'; import {ErrorsCodec} from '../codec/builtin/ErrorsCodec'; import {ErrorHolder} from './ErrorHolder'; +import {StackTraceElement} from './StackTraceElement'; -type ErrorFactory = (msg: string, cause: Error) => Error; +type ErrorFactory = (msg: string, cause: Error, serverStackTrace: StackTraceElement[]) => Error; /** @internal */ export class ClientErrorFactory { @@ -66,103 +77,103 @@ export class ClientErrorFactory { constructor() { this.register(ClientProtocolErrorCodes.ARRAY_INDEX_OUT_OF_BOUNDS, - (m, c) => new RangeError(m)); + (m, c, s) => new ArrayIndexOutOfBoundsError(m, c, s)); this.register(ClientProtocolErrorCodes.ARRAY_STORE, - (m, c) => new TypeError(m)); + (m, c, s) => new ArrayStoreError(m, c, s)); this.register(ClientProtocolErrorCodes.AUTHENTICATION, - (m, c) => new AuthenticationError(m, c)); + (m, c, s) => new AuthenticationError(m, c, s)); this.register(ClientProtocolErrorCodes.CALLER_NOT_MEMBER, - (m, c) => new CallerNotMemberError(m, c)); + (m, c, s) => new CallerNotMemberError(m, c, s)); this.register(ClientProtocolErrorCodes.CANCELLATION, - (m, c) => new CancellationError(m, c)); + (m, c, s) => new CancellationError(m, c, s)); this.register(ClientProtocolErrorCodes.CLASS_CAST, - (m, c) => new ClassCastError(m, c)); + (m, c, s) => new ClassCastError(m, c, s)); this.register(ClientProtocolErrorCodes.CLASS_NOT_FOUND, - (m, c) => new ClassNotFoundError(m, c)); + (m, c, s) => new ClassNotFoundError(m, c, s)); this.register(ClientProtocolErrorCodes.CONCURRENT_MODIFICATION, - (m, c) => new ConcurrentModificationError(m, c)); + (m, c, s) => new ConcurrentModificationError(m, c, s)); this.register(ClientProtocolErrorCodes.CONFIG_MISMATCH, - (m, c) => new ConfigMismatchError(m, c)); + (m, c, s) => new ConfigMismatchError(m, c, s)); this.register(ClientProtocolErrorCodes.DISTRIBUTED_OBJECT_DESTROYED, - (m, c) => new DistributedObjectDestroyedError(m, c)); + (m, c, s) => new DistributedObjectDestroyedError(m, c, s)); this.register(ClientProtocolErrorCodes.EOF, - (m, c) => new IOError(m, c)); + (m, c, s) => new IOError(m, c, s)); this.register(ClientProtocolErrorCodes.HAZELCAST, - (m, c) => new HazelcastError(m, c)); + (m, c, s) => new HazelcastError(m, c, s)); this.register(ClientProtocolErrorCodes.HAZELCAST_INSTANCE_NOT_ACTIVE, - (m, c) => new HazelcastInstanceNotActiveError(m, c)); + (m, c, s) => new HazelcastInstanceNotActiveError(m, c, s)); this.register(ClientProtocolErrorCodes.HAZELCAST_OVERLOAD, - (m, c) => new HazelcastError(m, c)); + (m, c, s) => new HazelcastError(m, c, s)); this.register(ClientProtocolErrorCodes.HAZELCAST_SERIALIZATION, - (m, c) => new HazelcastSerializationError(m, c)); + (m, c, s) => new HazelcastSerializationError(m, c, s)); + this.register(ClientProtocolErrorCodes.INDETERMINATE_OPERATION_STATE, + (m, c, s) => new IndeterminateOperationStateError(m, c, s)); this.register(ClientProtocolErrorCodes.IO, - (m, c) => new IOError(m, c)); + (m, c, s) => new IOError(m, c, s)); this.register(ClientProtocolErrorCodes.ILLEGAL_ARGUMENT, - (m, c) => new TypeError(m)); + (m, c, s) => new IllegalArgumentError(m, c, s)); this.register(ClientProtocolErrorCodes.ILLEGAL_STATE, - (m, c) => new IllegalStateError(m, c)); + (m, c, s) => new IllegalStateError(m, c, s)); this.register(ClientProtocolErrorCodes.INDEX_OUT_OF_BOUNDS, - (m, c) => new RangeError(m)); + (m, c, s) => new IndexOutOfBoundsError(m, c, s)); this.register(ClientProtocolErrorCodes.INTERRUPTED, - (m, c) => new Error(m)); + (m, c, s) => new InterruptedError(m, c, s)); this.register(ClientProtocolErrorCodes.INVALID_ADDRESS, - (m, c) => new TypeError(m)); + (m, c, s) => new InvalidAddressError(m, c, s)); this.register(ClientProtocolErrorCodes.INVALID_CONFIGURATION, - (m, c) => new TypeError(m)); + (m, c, s) => new InvalidConfigurationError(m, c, s)); this.register(ClientProtocolErrorCodes.MEMBER_LEFT, - (m, c) => new MemberLeftError(m, c)); + (m, c, s) => new MemberLeftError(m, c, s)); this.register(ClientProtocolErrorCodes.NEGATIVE_ARRAY_SIZE, - (m, c) => new RangeError(m)); + (m, c, s) => new NegativeArraySizeError(m, c, s)); this.register(ClientProtocolErrorCodes.NO_SUCH_ELEMENT, - (m, c) => new ReferenceError(m)); + (m, c, s) => new NoSuchElementError(m, c, s)); this.register(ClientProtocolErrorCodes.NOT_SERIALIZABLE, - (m, c) => new IOError(m, c)); + (m, c, s) => new IOError(m, c, s)); this.register(ClientProtocolErrorCodes.NULL_POINTER, - (m, c) => new ReferenceError(m)); + (m, c, s) => new NullPointerError(m, c, s)); this.register(ClientProtocolErrorCodes.OPERATION_TIMEOUT, - (m, c) => new InvocationTimeoutError(m, c)); + (m, c, s) => new InvocationTimeoutError(m, c, s)); this.register(ClientProtocolErrorCodes.PARTITION_MIGRATING, - (m, c) => new PartitionMigratingError(m, c)); + (m, c, s) => new PartitionMigratingError(m, c, s)); this.register(ClientProtocolErrorCodes.QUERY, - (m, c) => new QueryError(m, c)); + (m, c, s) => new QueryError(m, c, s)); this.register(ClientProtocolErrorCodes.QUERY_RESULT_SIZE_EXCEEDED, - (m, c) => new QueryError(m, c)); + (m, c, s) => new QueryError(m, c, s)); this.register(ClientProtocolErrorCodes.SPLIT_BRAIN_PROTECTION, - (m, c) => new SplitBrainProtectionError(m, c)); + (m, c, s) => new SplitBrainProtectionError(m, c, s)); this.register(ClientProtocolErrorCodes.REACHED_MAX_SIZE, - (m, c) => new ReachedMaxSizeError(m, c)); + (m, c, s) => new ReachedMaxSizeError(m, c, s)); this.register(ClientProtocolErrorCodes.RETRYABLE_HAZELCAST, - (m, c) => new RetryableHazelcastError(m, c)); + (m, c, s) => new RetryableHazelcastError(m, c, s)); this.register(ClientProtocolErrorCodes.RETRYABLE_IO, - (m, c) => new RetryableIOError(m, c)); + (m, c, s) => new RetryableIOError(m, c, s)); this.register(ClientProtocolErrorCodes.SOCKET, - (m, c) => new IOError(m, c)); + (m, c, s) => new IOError(m, c, s)); this.register(ClientProtocolErrorCodes.STALE_SEQUENCE, - (m, c) => new StaleSequenceError(m, c)); + (m, c, s) => new StaleSequenceError(m, c, s)); this.register(ClientProtocolErrorCodes.TARGET_DISCONNECTED, - (m, c) => new TargetDisconnectedError(m, c)); + (m, c, s) => new TargetDisconnectedError(m, c, s)); this.register(ClientProtocolErrorCodes.TARGET_NOT_MEMBER, - (m, c) => new TargetNotMemberError(m, c)); + (m, c, s) => new TargetNotMemberError(m, c, s)); this.register(ClientProtocolErrorCodes.TOPIC_OVERLOAD, - (m, c) => new TopicOverloadError(m, c)); + (m, c, s) => new TopicOverloadError(m, c, s)); this.register(ClientProtocolErrorCodes.TRANSACTION, - (m, c) => new TransactionError(m, c)); + (m, c, s) => new TransactionError(m, c, s)); this.register(ClientProtocolErrorCodes.TRANSACTION_NOT_ACTIVE, - (m, c) => new TransactionNotActiveError(m, c)); + (m, c, s) => new TransactionNotActiveError(m, c, s)); this.register(ClientProtocolErrorCodes.TRANSACTION_TIMED_OUT, - (m, c) => new TransactionTimedOutError(m, c)); + (m, c, s) => new TransactionTimedOutError(m, c, s)); this.register(ClientProtocolErrorCodes.UNSUPPORTED_OPERATION, - (m, c) => new UnsupportedOperationError(m, c)); + (m, c, s) => new UnsupportedOperationError(m, c, s)); this.register(ClientProtocolErrorCodes.NO_DATA_MEMBER, - (m, c) => new NoDataMemberInClusterError(m, c)); + (m, c, s) => new NoDataMemberInClusterError(m, c, s)); this.register(ClientProtocolErrorCodes.STALE_TASK_ID, - (m, c) => new StaleTaskIdError(m, c)); + (m, c, s) => new StaleTaskIdError(m, c, s)); this.register(ClientProtocolErrorCodes.FLAKE_ID_NODE_ID_OUT_OF_RANGE_EXCEPTION, - (m, c) => new NodeIdOutOfRangeError(m, c)); + (m, c, s) => new NodeIdOutOfRangeError(m, c, s)); this.register(ClientProtocolErrorCodes.CONSISTENCY_LOST_EXCEPTION, - (m, c) => new ConsistencyLostError(m, c)); - this.register(ClientProtocolErrorCodes.INDETERMINATE_OPERATION_STATE, - (m, c) => new IndeterminateOperationStateError(m, c)); + (m, c, s) => new ConsistencyLostError(m, c, s)); } createErrorFromClientMessage(clientMessage: ClientMessage): Error { @@ -170,7 +181,7 @@ export class ClientErrorFactory { return this.createError(errorHolders, 0); } - createError(errorHolders: ErrorHolder[], errorHolderIdx: number): Error { + private createError(errorHolders: ErrorHolder[], errorHolderIdx: number): Error { if (errorHolderIdx === errorHolders.length) { return null; } @@ -178,9 +189,18 @@ export class ClientErrorFactory { const factoryFn = this.codeToErrorConstructor.get(errorHolder.errorCode); let error: Error; if (factoryFn != null) { - error = factoryFn(errorHolder.message, this.createError(errorHolders, errorHolderIdx + 1)); + error = factoryFn( + errorHolder.message, + this.createError(errorHolders, errorHolderIdx + 1), + errorHolder.stackTraceElements + ); } else { - error = new UndefinedErrorCodeError(errorHolder.message, errorHolder.className); + const msg = 'Class name: ' + errorHolder.className + ', Message: ' + errorHolder.message; + error = new UndefinedErrorCodeError( + msg, + this.createError(errorHolders, errorHolderIdx + 1), + errorHolder.stackTraceElements + ); } return error; } diff --git a/src/protocol/StackTraceElement.ts b/src/protocol/StackTraceElement.ts index 27c2fc486..71ba16db6 100644 --- a/src/protocol/StackTraceElement.ts +++ b/src/protocol/StackTraceElement.ts @@ -15,8 +15,11 @@ */ /** @ignore *//** */ +import {ServerErrorStackElement} from '../core'; + /** @internal */ -export class StackTraceElement { +export class StackTraceElement implements ServerErrorStackElement { + className: string; methodName: string; fileName: string; diff --git a/test/unit/protocol/ClientErrorFactoryTest.js b/test/unit/protocol/ClientErrorFactoryTest.js new file mode 100644 index 000000000..c946adc20 --- /dev/null +++ b/test/unit/protocol/ClientErrorFactoryTest.js @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { expect } = require('chai'); +const { IllegalStateError, UndefinedErrorCodeError } = require('../../../'); +const { ClientErrorFactory } = require('../../../lib/protocol/ErrorFactory'); +const { ClientProtocolErrorCodes } = require('../../../lib/protocol/ClientProtocolErrorCodes'); + +describe('ClientErrorFactoryTest', function () { + + const factory = new ClientErrorFactory(); + + function createErrorHolder(code) { + return { + errorCode: code, + className: 'foo.bar.Baz1', + message: 'error: foo bar', + stackTraceElements: [ + { + className: 'foo.bar.Baz2', + methodName: 'foobar', + fileName: 'FooBar.java', + lineNumber: 42 + } + ] + }; + } + + function assertKnownError(error, clazz, code) { + expect(error).to.be.instanceOf(clazz); + expect(error.message).to.be.equal('error: foo bar'); + expect(error.serverStackTrace).to.deep.equal(createErrorHolder(code).stackTraceElements); + } + + function assertUnknownError(error) { + expect(error).to.be.instanceOf(UndefinedErrorCodeError); + expect(error.message).to.contain('error: foo bar'); + expect(error.message).to.contain('foo.bar.Baz1'); + expect(error.serverStackTrace).to.deep.equal(createErrorHolder(-1).stackTraceElements); + } + + it('createError: should create error with no cause', function () { + const code = ClientProtocolErrorCodes.ILLEGAL_STATE; + const error = factory.createError([createErrorHolder(code)], 0); + + assertKnownError(error, IllegalStateError, code); + expect(error.cause).to.be.null; + }); + + it('createError: should create error with given cause', function () { + const code = ClientProtocolErrorCodes.ILLEGAL_STATE; + const error = factory.createError([createErrorHolder(code), createErrorHolder(code)], 0); + + assertKnownError(error, IllegalStateError, code); + + const cause = error.cause; + assertKnownError(cause, IllegalStateError, code); + expect(cause.cause).to.be.null; + }); + + it('createError: should create UndefinedErrorCodeError for single exception with unknown code', function () { + const error = factory.createError([createErrorHolder(-1)], 0); + + assertUnknownError(error); + expect(error.cause).to.be.null; + }); + + it('createError: should create UndefinedErrorCodeError with known cause for chain of exceptions', function () { + const knownCode = ClientProtocolErrorCodes.ILLEGAL_STATE; + const error = factory.createError([createErrorHolder(-1), createErrorHolder(knownCode)], 0); + + assertUnknownError(error); + + const cause = error.cause; + assertKnownError(cause, IllegalStateError, knownCode); + }); +}); From a4ffe04a1f6ffea9aa05c7374bbcc3f70caa2b79 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 27 Aug 2020 12:57:37 +0300 Subject: [PATCH 283/685] Add CP AtomicLong support (#577) Also includes the following: * Update code samples and documentation * Improve tsdoc and code style --- DOCUMENTATION.md | 79 +++++--- code_samples/atomic_long.js | 34 ++++ code_samples/org-website/AtomicLongSample.js | 36 ++++ src/HazelcastClient.ts | 23 ++- src/codec/AtomicLongAddAndGetCodec.ts | 65 +++++++ src/codec/AtomicLongAlterCodec.ts | 68 +++++++ src/codec/AtomicLongApplyCodec.ts | 65 +++++++ src/codec/AtomicLongCompareAndSetCodec.ts | 67 +++++++ src/codec/AtomicLongGetAndAddCodec.ts | 65 +++++++ src/codec/AtomicLongGetAndSetCodec.ts | 65 +++++++ src/codec/AtomicLongGetCodec.ts | 63 +++++++ src/codec/CPGroupCreateCPGroupCodec.ts | 60 +++++++ src/codec/CPGroupDestroyCPObjectCodec.ts | 47 +++++ src/codec/CPSessionCloseSessionCodec.ts | 63 +++++++ src/codec/CPSessionCreateSessionCodec.ts | 69 +++++++ src/codec/CPSessionGenerateThreadIdCodec.ts | 61 +++++++ src/codec/CPSessionHeartbeatSessionCodec.ts | 48 +++++ src/codec/FencedLockGetLockOwnershipCodec.ts | 72 ++++++++ src/codec/FencedLockLockCodec.ts | 70 ++++++++ src/codec/FencedLockTryLockCodec.ts | 72 ++++++++ src/codec/FencedLockUnlockCodec.ts | 70 ++++++++ src/codec/SemaphoreAcquireCodec.ts | 74 ++++++++ src/codec/SemaphoreAvailablePermitsCodec.ts | 62 +++++++ src/codec/SemaphoreChangeCodec.ts | 72 ++++++++ src/codec/SemaphoreDrainCodec.ts | 70 ++++++++ src/codec/SemaphoreGetSemaphoreTypeCodec.ts | 59 ++++++ src/codec/SemaphoreInitCodec.ts | 64 +++++++ src/codec/SemaphoreReleaseCodec.ts | 72 ++++++++ src/codec/custom/RaftGroupIdCodec.ts | 58 ++++++ src/proxy/BaseProxy.ts | 22 +-- src/proxy/FlakeIdGenerator.ts | 8 +- src/proxy/IAtomicLong.ts | 108 +++++++++++ src/proxy/IList.ts | 3 + src/proxy/IMap.ts | 3 + src/proxy/IQueue.ts | 3 + src/proxy/ISet.ts | 3 + src/proxy/ITopic.ts | 9 + src/proxy/ListProxy.ts | 6 +- src/proxy/MapProxy.ts | 39 ++-- src/proxy/MultiMap.ts | 3 + src/proxy/MultiMapProxy.ts | 14 +- src/proxy/PNCounter.ts | 8 +- src/proxy/ProxyManager.ts | 7 +- src/proxy/QueueProxy.ts | 6 +- src/proxy/ReplicatedMapProxy.ts | 6 +- src/proxy/Ringbuffer.ts | 6 + src/proxy/SetProxy.ts | 3 +- src/proxy/cpsubsystem/AtomicLongProxy.ts | 119 ++++++++++++ src/proxy/cpsubsystem/BaseCPProxy.ts | 61 +++++++ src/proxy/cpsubsystem/CPProxyManager.ts | 93 ++++++++++ src/proxy/cpsubsystem/RaftGroupId.ts | 32 ++++ src/proxy/index.ts | 1 + src/serialization/portable/PortableContext.ts | 2 +- test/cpsubsystem/AtomicLongProxyTest.js | 169 ++++++++++++++++++ test/cpsubsystem/hazelcast_cpsubsystem.xml | 25 +++ test/integration/ClientBackupAcksTest.js | 2 + test/invocation/InvocationTest.js | 2 +- test/map/MapStoreTest.js | 30 ++-- .../proxy/cpsubsystem/CPProxyManagerTest.js | 57 ++++++ 59 files changed, 2517 insertions(+), 126 deletions(-) create mode 100644 code_samples/atomic_long.js create mode 100644 code_samples/org-website/AtomicLongSample.js create mode 100644 src/codec/AtomicLongAddAndGetCodec.ts create mode 100644 src/codec/AtomicLongAlterCodec.ts create mode 100644 src/codec/AtomicLongApplyCodec.ts create mode 100644 src/codec/AtomicLongCompareAndSetCodec.ts create mode 100644 src/codec/AtomicLongGetAndAddCodec.ts create mode 100644 src/codec/AtomicLongGetAndSetCodec.ts create mode 100644 src/codec/AtomicLongGetCodec.ts create mode 100644 src/codec/CPGroupCreateCPGroupCodec.ts create mode 100644 src/codec/CPGroupDestroyCPObjectCodec.ts create mode 100644 src/codec/CPSessionCloseSessionCodec.ts create mode 100644 src/codec/CPSessionCreateSessionCodec.ts create mode 100644 src/codec/CPSessionGenerateThreadIdCodec.ts create mode 100644 src/codec/CPSessionHeartbeatSessionCodec.ts create mode 100644 src/codec/FencedLockGetLockOwnershipCodec.ts create mode 100644 src/codec/FencedLockLockCodec.ts create mode 100644 src/codec/FencedLockTryLockCodec.ts create mode 100644 src/codec/FencedLockUnlockCodec.ts create mode 100644 src/codec/SemaphoreAcquireCodec.ts create mode 100644 src/codec/SemaphoreAvailablePermitsCodec.ts create mode 100644 src/codec/SemaphoreChangeCodec.ts create mode 100644 src/codec/SemaphoreDrainCodec.ts create mode 100644 src/codec/SemaphoreGetSemaphoreTypeCodec.ts create mode 100644 src/codec/SemaphoreInitCodec.ts create mode 100644 src/codec/SemaphoreReleaseCodec.ts create mode 100644 src/codec/custom/RaftGroupIdCodec.ts create mode 100644 src/proxy/IAtomicLong.ts create mode 100644 src/proxy/cpsubsystem/AtomicLongProxy.ts create mode 100644 src/proxy/cpsubsystem/BaseCPProxy.ts create mode 100644 src/proxy/cpsubsystem/CPProxyManager.ts create mode 100644 src/proxy/cpsubsystem/RaftGroupId.ts create mode 100644 test/cpsubsystem/AtomicLongProxyTest.js create mode 100644 test/cpsubsystem/hazelcast_cpsubsystem.xml create mode 100644 test/unit/proxy/cpsubsystem/CPProxyManagerTest.js diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 451f5cb3a..98173b07a 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -60,7 +60,9 @@ * [7.4.9. Using PN Counter](#749-using-pn-counter) * [7.4.10. Using Flake ID Generator](#7410-using-flake-id-generator) * [7.4.10.1. Configuring Flake ID Generator](#74101-configuring-flake-id-generator) - * [7.4.11. Using Lock, Semaphore and Atomic Long](#7411-using-lock-semaphore-and-atomic-long) + * [7.4.11. CP Subsystem](#7411-cp-subsystem) + * [7.4.11.1. Using Atomic Long](#74111-using-atomic-long) + * [7.4.11.2. Using Lock and Semaphore](#74112-using-lock-and-semaphore) * [7.5. Distributed Events](#75-distributed-events) * [7.5.1. Listening for Cluster Events](#751-listening-for-cluster-events) * [7.5.1.1. Membership Listener](#7511-membership-listener) @@ -1247,11 +1249,11 @@ const map = await client.getReplicatedMap('my-replicated-map'); // Put and get a value from the Replicated Map // (key/value is replicated to all members) const replacedValue = await map.put('key', 'value'); -// Will print 'replaced value = null' as it's the first update -console.log('replaced value = ' + replacedValue); +// Will print 'Replaced value: null' as it's the first update +console.log('Replaced value:', replacedValue); const value = map.get('key'); // The value is retrieved from a random member in the cluster -console.log('value = ' + value); +console.log('Value:', value); ``` Hazelcast Replicated Map uses `EntryListener` to listen to the events that occur when the entries are added to, updated in or evicted/removed from the Replicated Map. See the [Entry Listener section](#7522-entry-listener) for information on how to create an entry listener object and register it. @@ -1270,12 +1272,12 @@ await queue.offer('item'); // Poll the Queue and return the string let item = queue.poll(); // Timed-restricted operations -await queue.offer('anotheritem', 500); -await queue.poll(5000); +await queue.offer('anotheritem', 500); // waits up to 500 millis +await queue.poll(5000); // waits up to 5000 millis // Indefinitely-waiting operations await queue.put('yetanotheritem'); -const value = queue.take(); -console.log(value); +const item = queue.take(); +console.log('Item:', item); ``` Hazelcast Queue uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Queue. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. @@ -1298,7 +1300,7 @@ await set.add('item2'); await set.add('item3'); // Get the items. Note that there are no duplicates const values = await set.toArray(); -console.log(values); +console.log('Values:', values); ``` Hazelcast Set uses `ItemListener` to listen to the events that occur when the items are added to or removed from the Set. See the [Item Listener section](#7523-item-listener) for information on how to create an item listener object and register it. @@ -1317,10 +1319,10 @@ await list.add('item1'); await list.add('item2'); // Remove the first element const value = await list.removeAt(0); -console.log(value); +console.log('Value:', value); // There is only one element left const len = await list.size(); -console.log(len); +console.log('Length:', len); // Clear the list await list.clear(); ``` @@ -1343,9 +1345,9 @@ await rb.add(200); // If you want to start from the next item, call rb.tailSequence()+1 const sequence = await rb.headSequence(); let value = await rb.readOne(sequence); -console.log(value); +console.log('Value:', value); value = await rb.readOne(sequence.add(1)); -console.log(value); +console.log('Next value:', value); ``` ### 7.4.8. Using Reliable Topic @@ -1359,7 +1361,7 @@ A Reliable Topic usage example is shown below. const topic = await client.getReliableTopic('my-distributed-topic'); // Add a Listener to the Topic topic.addMessageListener((message) => { - console.log(message); + console.log('Message:', message); }); // Publish a message to the Topic await topic.publish('Hello to the distributed world!'); @@ -1397,23 +1399,23 @@ Hazelcast `PNCounter` (Positive-Negative Counter) is a CRDT positive-negative co A PN Counter usage example is shown below. ```javascript -// Get a Topic called 'my-pn-counter' +// Get a PN Counter called 'my-pn-counter' const pnCounter = await client.getPNCounter('my-pn-counter'); // Get the current value let value = await pnCounter.get(); -console.log('Counter started with value ' + value); // 0 +console.log('Counter started with value:', value); // 0 // Increment and get value = await pnCounter.addAndGet(5); -console.log('Value after operation is ' + value); // 5 +console.log('Value after operation:', value); // 5 // Get and increment value = await pnCounter.getAndAdd(2); -console.log('Value before operation was ' + value); // 5 +console.log('Value before operation:', value); // 5 value = await pnCounter.get(); -console.log('New value is ' + value); // 7 +console.log('New value:', value); // 7 value = await pnCounter.decrementAndGet(); -console.log('Decremented counter by one. New value is ' + value); // 6 +console.log('Decremented counter by one. New value:', value); // 6 ``` ### 7.4.10. Using Flake ID Generator @@ -1423,11 +1425,11 @@ Hazelcast `FlakeIdGenerator` is used to generate cluster-wide unique identifiers A Flake ID Generator usage example is shown below. ```javascript -// Get a Topic called 'my-flake-id-generator' +// Get a Flake ID Generator called 'my-flake-id-generator' const flakeIdGenerator = await client.getFlakeIdGenerator('my-flake-id-generator'); -// Generate an id +// Generate an id (returns a Long) const id = flakeIdGenerator.newId(); -console.log('New id: ' + id.toString()); +console.log('New id:', id.toString()); ``` #### 7.4.10.1 Configuring Flake ID Generator @@ -1454,11 +1456,38 @@ The following are the descriptions of configuration elements and attributes: > **NOTE: When you use `default` as the Flake ID Generator configuration key, it has a special meaning. Hazelcast client will use that configuration as the default one for all Flake ID Generators, unless there is a specific configuration for the generator.** -### 7.4.11. Using Lock, Semaphore and Atomic Long +### 7.4.11. CP Subsystem Hazelcast IMDG 4.0 introduces CP concurrency primitives with respect to the [CAP principle](http://awoc.wolski.fi/dlib/big-data/Brewer_podc_keynote_2000.pdf), i.e., they always maintain [linearizability](https://aphyr.com/posts/313-strong-consistency-models) and prefer consistency to availability during network partitions and client or server failures. -These new implementations are accessed using the [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) which cannot be used with the Node.js client yet. We plan to implement support for the CP Subsystem in the upcoming 4.0 release of Hazelcast Node.js client. In the meantime, since there is no way to access old non-CP primitives using IMDG 4.x, we removed their implementations, code samples and documentations. They will be back once we implement them. +Before using Atomic Long, Lock, and Semaphore, CP Subsystem has to be enabled on cluster-side. Refer to [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) documentation for more information. + +> **NOTE: If you call the `DistributedObject.destroy()` method on a CP data structure, that data structure is terminated on the underlying CP group and cannot be reinitialized until the CP group is force-destroyed on the cluster side. For this reason, please make sure that you are completely done with a CP data structure before destroying its proxy.** + +#### 7.4.11.1. Using Atomic Long + +Hazelcast `IAtomicLong` is the distributed implementation of atomic 64-bit integer counter. It offers various atomic operations such as `get`, `set`, `getAndSet`, `compareAndSet` and `incrementAndGet`. This data structure is a part of CP Subsystem. + +An Atomic Long usage example is shown below. + +```javascript +// Get an AtomicLong called 'my-atomic-long' +const atomicLong = await client.getAtomicLong('my-atomic-long'); +// Get current value (returns a Long) +const value = await atomicLong.get(); +console.log('Value:', value); +// Increment by 42 +await atomicLong.addAndGet(42); +// Set to 0 atomically if the current value is 42 +const result = atomicLong.compareAndSet(42, 0); +console.log('CAS operation result:', result); +``` + +`IAtomicLong` implementation does not offer exactly-once / effectively-once execution semantics. It goes with at-least-once execution semantics by default and can cause an API call to be committed multiple times in case of CP member failures. It can be tuned to offer at-most-once execution semantics. Please see [`fail-on-indeterminate-operation-state`](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#cp-subsystem-configuration) server-side setting. + +#### 7.4.11.2. Using Lock and Semaphore + +These new implementations are accessed using the [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) which cannot be used with the Node.js client yet. We plan to implement these data structures in the upcoming 4.0 release of Hazelcast Node.js client. In the meantime, since there is no way to access old non-CP primitives using IMDG 4.x, we removed their implementations, code samples and documentations. They will be back once we implement them. ## 7.5. Distributed Events diff --git a/code_samples/atomic_long.js b/code_samples/atomic_long.js new file mode 100644 index 000000000..b0dd6a883 --- /dev/null +++ b/code_samples/atomic_long.js @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { Client } = require('hazelcast-client'); + +(async () => { + try { + const client = await Client.newHazelcastClient(); + + const viewCounter = await client.getAtomicLong('views'); + const value = await viewCounter.get(); + console.log('Value:', value); + const newValue = await viewCounter.addAndGet(42); + console.log('New value:', newValue); + + client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/AtomicLongSample.js b/code_samples/org-website/AtomicLongSample.js new file mode 100644 index 000000000..253b5193f --- /dev/null +++ b/code_samples/org-website/AtomicLongSample.js @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + // Note: CP Subsystem has to be enabled on the cluster + const hz = await Client.newHazelcastClient(); + // Get the AtomicLong counter from Cluster + const counter = await hz.getAtomicLong('counter'); + // Add and get the counter + const value = await counter.addAndGet(3); + console.log('Counter value is', value); + // Shutdown this Hazelcast client + hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 3e6e1d35f..0bb8996da 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -45,9 +45,11 @@ import { MultiMap, ReplicatedMap, Ringbuffer, - PNCounter + PNCounter, + IAtomicLong } from './proxy'; import {ProxyManager, NAMESPACE_SEPARATOR} from './proxy/ProxyManager'; +import {CPProxyManager} from './proxy/cpsubsystem/CPProxyManager'; import {LockReferenceIdGenerator} from './proxy/LockReferenceIdGenerator'; import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; import {AddressProvider} from './connection/AddressProvider'; @@ -99,6 +101,8 @@ export class HazelcastClient { /** @internal */ private readonly proxyManager: ProxyManager; /** @internal */ + private readonly cpProxyManager: CPProxyManager; + /** @internal */ private readonly nearCacheManager: NearCacheManager; /** @internal */ private readonly lockReferenceIdGenerator: LockReferenceIdGenerator; @@ -129,6 +133,7 @@ export class HazelcastClient { this.addressProvider = this.createAddressProvider(); this.connectionManager = new ClientConnectionManager(this); this.invocationService = new InvocationService(this); + this.cpProxyManager = new CPProxyManager(this); this.proxyManager = new ProxyManager(this); this.clusterService = new ClusterService(this); this.lifecycleService = new LifecycleServiceImpl(this); @@ -297,6 +302,22 @@ export class HazelcastClient { return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE) as Promise; } + /** + * Returns the distributed AtomicLong instance with given name. + * The instance is created on CP Subsystem. + * + * If no group name is given within the `name` argument, then the + * AtomicLong instance will be created on the DEFAULT CP group. + * If a group name is given, like `.getAtomicLong('myLong@group1')`, + * the given group will be initialized first, if not initialized + * already, and then the instance will be created on this group. + * @param name + * @returns {Promise} + */ + getAtomicLong(name: string): Promise { + return this.cpProxyManager.getOrCreateProxy(name, CPProxyManager.ATOMIC_LONG_SERVICE) as Promise; + } + /** * Returns configuration that this instance started with. * Returned configuration object should not be modified. diff --git a/src/codec/AtomicLongAddAndGetCodec.ts b/src/codec/AtomicLongAddAndGetCodec.ts new file mode 100644 index 000000000..840d2519c --- /dev/null +++ b/src/codec/AtomicLongAddAndGetCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x090300 +const REQUEST_MESSAGE_TYPE = 590592; +// hex: 0x090301 +// RESPONSE_MESSAGE_TYPE = 590593 + +const REQUEST_DELTA_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_DELTA_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface AtomicLongAddAndGetResponseParams { + response: Long; +} + +/** @internal */ +export class AtomicLongAddAndGetCodec { + static encodeRequest(groupId: RaftGroupId, name: string, delta: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_DELTA_OFFSET, delta); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): AtomicLongAddAndGetResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as AtomicLongAddAndGetResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/AtomicLongAlterCodec.ts b/src/codec/AtomicLongAlterCodec.ts new file mode 100644 index 000000000..cadb5da9d --- /dev/null +++ b/src/codec/AtomicLongAlterCodec.ts @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import * as Long from 'long'; + +// hex: 0x090200 +const REQUEST_MESSAGE_TYPE = 590336; +// hex: 0x090201 +// RESPONSE_MESSAGE_TYPE = 590337 + +const REQUEST_RETURN_VALUE_TYPE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_RETURN_VALUE_TYPE_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface AtomicLongAlterResponseParams { + response: Long; +} + +/** @internal */ +export class AtomicLongAlterCodec { + static encodeRequest(groupId: RaftGroupId, name: string, _function: Data, returnValueType: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_RETURN_VALUE_TYPE_OFFSET, returnValueType); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, _function); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): AtomicLongAlterResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as AtomicLongAlterResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/AtomicLongApplyCodec.ts b/src/codec/AtomicLongApplyCodec.ts new file mode 100644 index 000000000..7c0c374b7 --- /dev/null +++ b/src/codec/AtomicLongApplyCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; +import {Data} from '../serialization/Data'; +import {DataCodec} from './builtin/DataCodec'; +import {CodecUtil} from './builtin/CodecUtil'; + +// hex: 0x090100 +const REQUEST_MESSAGE_TYPE = 590080; +// hex: 0x090101 +// RESPONSE_MESSAGE_TYPE = 590081 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +/** @internal */ +export interface AtomicLongApplyResponseParams { + response: Data; +} + +/** @internal */ +export class AtomicLongApplyCodec { + static encodeRequest(groupId: RaftGroupId, name: string, _function: Data): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + DataCodec.encode(clientMessage, _function); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): AtomicLongApplyResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + const response = {} as AtomicLongApplyResponseParams; + response.response = CodecUtil.decodeNullable(clientMessage, DataCodec.decode); + + return response; + } +} diff --git a/src/codec/AtomicLongCompareAndSetCodec.ts b/src/codec/AtomicLongCompareAndSetCodec.ts new file mode 100644 index 000000000..7b11fc1ea --- /dev/null +++ b/src/codec/AtomicLongCompareAndSetCodec.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x090400 +const REQUEST_MESSAGE_TYPE = 590848; +// hex: 0x090401 +// RESPONSE_MESSAGE_TYPE = 590849 + +const REQUEST_EXPECTED_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_UPDATED_OFFSET = REQUEST_EXPECTED_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_UPDATED_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface AtomicLongCompareAndSetResponseParams { + response: boolean; +} + +/** @internal */ +export class AtomicLongCompareAndSetCodec { + static encodeRequest(groupId: RaftGroupId, name: string, expected: Long, updated: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_EXPECTED_OFFSET, expected); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_UPDATED_OFFSET, updated); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): AtomicLongCompareAndSetResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as AtomicLongCompareAndSetResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/AtomicLongGetAndAddCodec.ts b/src/codec/AtomicLongGetAndAddCodec.ts new file mode 100644 index 000000000..061971b93 --- /dev/null +++ b/src/codec/AtomicLongGetAndAddCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x090600 +const REQUEST_MESSAGE_TYPE = 591360; +// hex: 0x090601 +// RESPONSE_MESSAGE_TYPE = 591361 + +const REQUEST_DELTA_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_DELTA_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface AtomicLongGetAndAddResponseParams { + response: Long; +} + +/** @internal */ +export class AtomicLongGetAndAddCodec { + static encodeRequest(groupId: RaftGroupId, name: string, delta: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_DELTA_OFFSET, delta); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): AtomicLongGetAndAddResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as AtomicLongGetAndAddResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/AtomicLongGetAndSetCodec.ts b/src/codec/AtomicLongGetAndSetCodec.ts new file mode 100644 index 000000000..fe32d4def --- /dev/null +++ b/src/codec/AtomicLongGetAndSetCodec.ts @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x090700 +const REQUEST_MESSAGE_TYPE = 591616; +// hex: 0x090701 +// RESPONSE_MESSAGE_TYPE = 591617 + +const REQUEST_NEW_VALUE_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_NEW_VALUE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface AtomicLongGetAndSetResponseParams { + response: Long; +} + +/** @internal */ +export class AtomicLongGetAndSetCodec { + static encodeRequest(groupId: RaftGroupId, name: string, newValue: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(false); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_NEW_VALUE_OFFSET, newValue); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): AtomicLongGetAndSetResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as AtomicLongGetAndSetResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/AtomicLongGetCodec.ts b/src/codec/AtomicLongGetCodec.ts new file mode 100644 index 000000000..8223a4061 --- /dev/null +++ b/src/codec/AtomicLongGetCodec.ts @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; + +// hex: 0x090500 +const REQUEST_MESSAGE_TYPE = 591104; +// hex: 0x090501 +// RESPONSE_MESSAGE_TYPE = 591105 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface AtomicLongGetResponseParams { + response: Long; +} + +/** @internal */ +export class AtomicLongGetCodec { + static encodeRequest(groupId: RaftGroupId, name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): AtomicLongGetResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as AtomicLongGetResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/CPGroupCreateCPGroupCodec.ts b/src/codec/CPGroupCreateCPGroupCodec.ts new file mode 100644 index 000000000..bd1b26b6d --- /dev/null +++ b/src/codec/CPGroupCreateCPGroupCodec.ts @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; + +// hex: 0x1E0100 +const REQUEST_MESSAGE_TYPE = 1966336; +// hex: 0x1E0101 +// RESPONSE_MESSAGE_TYPE = 1966337 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +/** @internal */ +export interface CPGroupCreateCPGroupResponseParams { + groupId: RaftGroupId; +} + +/** @internal */ +export class CPGroupCreateCPGroupCodec { + static encodeRequest(proxyName: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, proxyName); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): CPGroupCreateCPGroupResponseParams { + // empty initial frame + clientMessage.nextFrame(); + + const response = {} as CPGroupCreateCPGroupResponseParams; + response.groupId = RaftGroupIdCodec.decode(clientMessage); + + return response; + } +} diff --git a/src/codec/CPGroupDestroyCPObjectCodec.ts b/src/codec/CPGroupDestroyCPObjectCodec.ts new file mode 100644 index 000000000..bb24087d7 --- /dev/null +++ b/src/codec/CPGroupDestroyCPObjectCodec.ts @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x1E0200 +const REQUEST_MESSAGE_TYPE = 1966592; +// hex: 0x1E0201 +// RESPONSE_MESSAGE_TYPE = 1966593 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; + +/** @internal */ +export class CPGroupDestroyCPObjectCodec { + static encodeRequest(groupId: RaftGroupId, serviceName: string, objectName: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, serviceName); + StringCodec.encode(clientMessage, objectName); + return clientMessage; + } +} diff --git a/src/codec/CPSessionCloseSessionCodec.ts b/src/codec/CPSessionCloseSessionCodec.ts new file mode 100644 index 000000000..a98e975d0 --- /dev/null +++ b/src/codec/CPSessionCloseSessionCodec.ts @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; + +// hex: 0x1F0200 +const REQUEST_MESSAGE_TYPE = 2032128; +// hex: 0x1F0201 +// RESPONSE_MESSAGE_TYPE = 2032129 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface CPSessionCloseSessionResponseParams { + response: boolean; +} + +/** @internal */ +export class CPSessionCloseSessionCodec { + static encodeRequest(groupId: RaftGroupId, sessionId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): CPSessionCloseSessionResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as CPSessionCloseSessionResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/CPSessionCreateSessionCodec.ts b/src/codec/CPSessionCreateSessionCodec.ts new file mode 100644 index 000000000..968b49595 --- /dev/null +++ b/src/codec/CPSessionCreateSessionCodec.ts @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; + +// hex: 0x1F0100 +const REQUEST_MESSAGE_TYPE = 2031872; +// hex: 0x1F0101 +// RESPONSE_MESSAGE_TYPE = 2031873 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_SESSION_ID_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_TTL_MILLIS_OFFSET = RESPONSE_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_HEARTBEAT_MILLIS_OFFSET = RESPONSE_TTL_MILLIS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +/** @internal */ +export interface CPSessionCreateSessionResponseParams { + sessionId: Long; + ttlMillis: Long; + heartbeatMillis: Long; +} + +/** @internal */ +export class CPSessionCreateSessionCodec { + static encodeRequest(groupId: RaftGroupId, endpointName: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, endpointName); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): CPSessionCreateSessionResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as CPSessionCreateSessionResponseParams; + response.sessionId = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_SESSION_ID_OFFSET); + response.ttlMillis = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_TTL_MILLIS_OFFSET); + response.heartbeatMillis = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_HEARTBEAT_MILLIS_OFFSET); + + return response; + } +} diff --git a/src/codec/CPSessionGenerateThreadIdCodec.ts b/src/codec/CPSessionGenerateThreadIdCodec.ts new file mode 100644 index 000000000..b5087df00 --- /dev/null +++ b/src/codec/CPSessionGenerateThreadIdCodec.ts @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import * as Long from 'long'; + +// hex: 0x1F0400 +const REQUEST_MESSAGE_TYPE = 2032640; +// hex: 0x1F0401 +// RESPONSE_MESSAGE_TYPE = 2032641 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface CPSessionGenerateThreadIdResponseParams { + response: Long; +} + +/** @internal */ +export class CPSessionGenerateThreadIdCodec { + static encodeRequest(groupId: RaftGroupId): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): CPSessionGenerateThreadIdResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as CPSessionGenerateThreadIdResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/CPSessionHeartbeatSessionCodec.ts b/src/codec/CPSessionHeartbeatSessionCodec.ts new file mode 100644 index 000000000..d492e68ac --- /dev/null +++ b/src/codec/CPSessionHeartbeatSessionCodec.ts @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; + +// hex: 0x1F0300 +const REQUEST_MESSAGE_TYPE = 2032384; +// hex: 0x1F0301 +// RESPONSE_MESSAGE_TYPE = 2032385 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +/** @internal */ +export class CPSessionHeartbeatSessionCodec { + static encodeRequest(groupId: RaftGroupId, sessionId: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + return clientMessage; + } +} diff --git a/src/codec/FencedLockGetLockOwnershipCodec.ts b/src/codec/FencedLockGetLockOwnershipCodec.ts new file mode 100644 index 000000000..4508c6d76 --- /dev/null +++ b/src/codec/FencedLockGetLockOwnershipCodec.ts @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; +import * as Long from 'long'; + +// hex: 0x070400 +const REQUEST_MESSAGE_TYPE = 459776; +// hex: 0x070401 +// RESPONSE_MESSAGE_TYPE = 459777 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_FENCE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; +const RESPONSE_LOCK_COUNT_OFFSET = RESPONSE_FENCE_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_SESSION_ID_OFFSET = RESPONSE_LOCK_COUNT_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_THREAD_ID_OFFSET = RESPONSE_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +/** @internal */ +export interface FencedLockGetLockOwnershipResponseParams { + fence: Long; + lockCount: number; + sessionId: Long; + threadId: Long; +} + +/** @internal */ +export class FencedLockGetLockOwnershipCodec { + static encodeRequest(groupId: RaftGroupId, name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): FencedLockGetLockOwnershipResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as FencedLockGetLockOwnershipResponseParams; + response.fence = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_FENCE_OFFSET); + response.lockCount = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_LOCK_COUNT_OFFSET); + response.sessionId = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_SESSION_ID_OFFSET); + response.threadId = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_THREAD_ID_OFFSET); + + return response; + } +} diff --git a/src/codec/FencedLockLockCodec.ts b/src/codec/FencedLockLockCodec.ts new file mode 100644 index 000000000..7b0f38f6a --- /dev/null +++ b/src/codec/FencedLockLockCodec.ts @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x070100 +const REQUEST_MESSAGE_TYPE = 459008; +// hex: 0x070101 +// RESPONSE_MESSAGE_TYPE = 459009 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INVOCATION_UID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INVOCATION_UID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface FencedLockLockResponseParams { + response: Long; +} + +/** @internal */ +export class FencedLockLockCodec { + static encodeRequest(groupId: RaftGroupId, name: string, sessionId: Long, threadId: Long, invocationUid: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_INVOCATION_UID_OFFSET, invocationUid); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): FencedLockLockResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as FencedLockLockResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/FencedLockTryLockCodec.ts b/src/codec/FencedLockTryLockCodec.ts new file mode 100644 index 000000000..5c88956df --- /dev/null +++ b/src/codec/FencedLockTryLockCodec.ts @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x070200 +const REQUEST_MESSAGE_TYPE = 459264; +// hex: 0x070201 +// RESPONSE_MESSAGE_TYPE = 459265 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INVOCATION_UID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_MS_OFFSET = REQUEST_INVOCATION_UID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface FencedLockTryLockResponseParams { + response: Long; +} + +/** @internal */ +export class FencedLockTryLockCodec { + static encodeRequest(groupId: RaftGroupId, name: string, sessionId: Long, threadId: Long, invocationUid: UUID, timeoutMs: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_INVOCATION_UID_OFFSET, invocationUid); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_MS_OFFSET, timeoutMs); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): FencedLockTryLockResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as FencedLockTryLockResponseParams; + response.response = FixSizedTypesCodec.decodeLong(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/FencedLockUnlockCodec.ts b/src/codec/FencedLockUnlockCodec.ts new file mode 100644 index 000000000..3ec69ef5b --- /dev/null +++ b/src/codec/FencedLockUnlockCodec.ts @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x070300 +const REQUEST_MESSAGE_TYPE = 459520; +// hex: 0x070301 +// RESPONSE_MESSAGE_TYPE = 459521 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INVOCATION_UID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INVOCATION_UID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface FencedLockUnlockResponseParams { + response: boolean; +} + +/** @internal */ +export class FencedLockUnlockCodec { + static encodeRequest(groupId: RaftGroupId, name: string, sessionId: Long, threadId: Long, invocationUid: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_INVOCATION_UID_OFFSET, invocationUid); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): FencedLockUnlockResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as FencedLockUnlockResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/SemaphoreAcquireCodec.ts b/src/codec/SemaphoreAcquireCodec.ts new file mode 100644 index 000000000..f28903ecd --- /dev/null +++ b/src/codec/SemaphoreAcquireCodec.ts @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0C0200 +const REQUEST_MESSAGE_TYPE = 786944; +// hex: 0x0C0201 +// RESPONSE_MESSAGE_TYPE = 786945 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INVOCATION_UID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_PERMITS_OFFSET = REQUEST_INVOCATION_UID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_TIMEOUT_MS_OFFSET = REQUEST_PERMITS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_TIMEOUT_MS_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface SemaphoreAcquireResponseParams { + response: boolean; +} + +/** @internal */ +export class SemaphoreAcquireCodec { + static encodeRequest(groupId: RaftGroupId, name: string, sessionId: Long, threadId: Long, invocationUid: UUID, permits: number, timeoutMs: Long): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_INVOCATION_UID_OFFSET, invocationUid); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_PERMITS_OFFSET, permits); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_TIMEOUT_MS_OFFSET, timeoutMs); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): SemaphoreAcquireResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as SemaphoreAcquireResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/SemaphoreAvailablePermitsCodec.ts b/src/codec/SemaphoreAvailablePermitsCodec.ts new file mode 100644 index 000000000..ba47a1dd0 --- /dev/null +++ b/src/codec/SemaphoreAvailablePermitsCodec.ts @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0C0600 +const REQUEST_MESSAGE_TYPE = 787968; +// hex: 0x0C0601 +// RESPONSE_MESSAGE_TYPE = 787969 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface SemaphoreAvailablePermitsResponseParams { + response: number; +} + +/** @internal */ +export class SemaphoreAvailablePermitsCodec { + static encodeRequest(groupId: RaftGroupId, name: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): SemaphoreAvailablePermitsResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as SemaphoreAvailablePermitsResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/SemaphoreChangeCodec.ts b/src/codec/SemaphoreChangeCodec.ts new file mode 100644 index 000000000..998f88e5a --- /dev/null +++ b/src/codec/SemaphoreChangeCodec.ts @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0C0500 +const REQUEST_MESSAGE_TYPE = 787712; +// hex: 0x0C0501 +// RESPONSE_MESSAGE_TYPE = 787713 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INVOCATION_UID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_PERMITS_OFFSET = REQUEST_INVOCATION_UID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_PERMITS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface SemaphoreChangeResponseParams { + response: boolean; +} + +/** @internal */ +export class SemaphoreChangeCodec { + static encodeRequest(groupId: RaftGroupId, name: string, sessionId: Long, threadId: Long, invocationUid: UUID, permits: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_INVOCATION_UID_OFFSET, invocationUid); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_PERMITS_OFFSET, permits); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): SemaphoreChangeResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as SemaphoreChangeResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/SemaphoreDrainCodec.ts b/src/codec/SemaphoreDrainCodec.ts new file mode 100644 index 000000000..8e277afc1 --- /dev/null +++ b/src/codec/SemaphoreDrainCodec.ts @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0C0400 +const REQUEST_MESSAGE_TYPE = 787456; +// hex: 0x0C0401 +// RESPONSE_MESSAGE_TYPE = 787457 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INVOCATION_UID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_INVOCATION_UID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface SemaphoreDrainResponseParams { + response: number; +} + +/** @internal */ +export class SemaphoreDrainCodec { + static encodeRequest(groupId: RaftGroupId, name: string, sessionId: Long, threadId: Long, invocationUid: UUID): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_INVOCATION_UID_OFFSET, invocationUid); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): SemaphoreDrainResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as SemaphoreDrainResponseParams; + response.response = FixSizedTypesCodec.decodeInt(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/SemaphoreGetSemaphoreTypeCodec.ts b/src/codec/SemaphoreGetSemaphoreTypeCodec.ts new file mode 100644 index 000000000..131bab829 --- /dev/null +++ b/src/codec/SemaphoreGetSemaphoreTypeCodec.ts @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0C0700 +const REQUEST_MESSAGE_TYPE = 788224; +// hex: 0x0C0701 +// RESPONSE_MESSAGE_TYPE = 788225 + +const REQUEST_INITIAL_FRAME_SIZE = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface SemaphoreGetSemaphoreTypeResponseParams { + response: boolean; +} + +/** @internal */ +export class SemaphoreGetSemaphoreTypeCodec { + static encodeRequest(proxyName: string): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + StringCodec.encode(clientMessage, proxyName); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): SemaphoreGetSemaphoreTypeResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as SemaphoreGetSemaphoreTypeResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/SemaphoreInitCodec.ts b/src/codec/SemaphoreInitCodec.ts new file mode 100644 index 000000000..a49005a78 --- /dev/null +++ b/src/codec/SemaphoreInitCodec.ts @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0C0100 +const REQUEST_MESSAGE_TYPE = 786688; +// hex: 0x0C0101 +// RESPONSE_MESSAGE_TYPE = 786689 + +const REQUEST_PERMITS_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_PERMITS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface SemaphoreInitResponseParams { + response: boolean; +} + +/** @internal */ +export class SemaphoreInitCodec { + static encodeRequest(groupId: RaftGroupId, name: string, permits: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_PERMITS_OFFSET, permits); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): SemaphoreInitResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as SemaphoreInitResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/SemaphoreReleaseCodec.ts b/src/codec/SemaphoreReleaseCodec.ts new file mode 100644 index 000000000..e29008e2e --- /dev/null +++ b/src/codec/SemaphoreReleaseCodec.ts @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {BitsUtil} from '../util/BitsUtil'; +import {FixSizedTypesCodec} from './builtin/FixSizedTypesCodec'; +import {ClientMessage, Frame, RESPONSE_BACKUP_ACKS_OFFSET, PARTITION_ID_OFFSET} from '../protocol/ClientMessage'; +import * as Long from 'long'; +import {UUID} from '../core/UUID'; +import {RaftGroupId} from '../proxy/cpsubsystem/RaftGroupId'; +import {RaftGroupIdCodec} from './custom/RaftGroupIdCodec'; +import {StringCodec} from './builtin/StringCodec'; + +// hex: 0x0C0300 +const REQUEST_MESSAGE_TYPE = 787200; +// hex: 0x0C0301 +// RESPONSE_MESSAGE_TYPE = 787201 + +const REQUEST_SESSION_ID_OFFSET = PARTITION_ID_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const REQUEST_THREAD_ID_OFFSET = REQUEST_SESSION_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_INVOCATION_UID_OFFSET = REQUEST_THREAD_ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const REQUEST_PERMITS_OFFSET = REQUEST_INVOCATION_UID_OFFSET + BitsUtil.UUID_SIZE_IN_BYTES; +const REQUEST_INITIAL_FRAME_SIZE = REQUEST_PERMITS_OFFSET + BitsUtil.INT_SIZE_IN_BYTES; +const RESPONSE_RESPONSE_OFFSET = RESPONSE_BACKUP_ACKS_OFFSET + BitsUtil.BYTE_SIZE_IN_BYTES; + +/** @internal */ +export interface SemaphoreReleaseResponseParams { + response: boolean; +} + +/** @internal */ +export class SemaphoreReleaseCodec { + static encodeRequest(groupId: RaftGroupId, name: string, sessionId: Long, threadId: Long, invocationUid: UUID, permits: number): ClientMessage { + const clientMessage = ClientMessage.createForEncode(); + clientMessage.setRetryable(true); + + const initialFrame = Frame.createInitialFrame(REQUEST_INITIAL_FRAME_SIZE); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_SESSION_ID_OFFSET, sessionId); + FixSizedTypesCodec.encodeLong(initialFrame.content, REQUEST_THREAD_ID_OFFSET, threadId); + FixSizedTypesCodec.encodeUUID(initialFrame.content, REQUEST_INVOCATION_UID_OFFSET, invocationUid); + FixSizedTypesCodec.encodeInt(initialFrame.content, REQUEST_PERMITS_OFFSET, permits); + clientMessage.addFrame(initialFrame); + clientMessage.setMessageType(REQUEST_MESSAGE_TYPE); + clientMessage.setPartitionId(-1); + + RaftGroupIdCodec.encode(clientMessage, groupId); + StringCodec.encode(clientMessage, name); + return clientMessage; + } + + static decodeResponse(clientMessage: ClientMessage): SemaphoreReleaseResponseParams { + const initialFrame = clientMessage.nextFrame(); + + const response = {} as SemaphoreReleaseResponseParams; + response.response = FixSizedTypesCodec.decodeBoolean(initialFrame.content, RESPONSE_RESPONSE_OFFSET); + + return response; + } +} diff --git a/src/codec/custom/RaftGroupIdCodec.ts b/src/codec/custom/RaftGroupIdCodec.ts new file mode 100644 index 000000000..59917600f --- /dev/null +++ b/src/codec/custom/RaftGroupIdCodec.ts @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +/* eslint-disable max-len */ +import {FixSizedTypesCodec} from '../builtin/FixSizedTypesCodec'; +import {BitsUtil} from '../../util/BitsUtil'; +import {ClientMessage, BEGIN_FRAME, END_FRAME, Frame, DEFAULT_FLAGS} from '../../protocol/ClientMessage'; +import {CodecUtil} from '../builtin/CodecUtil'; +import {RaftGroupId} from '../../proxy/cpsubsystem/RaftGroupId'; +import {StringCodec} from '../builtin/StringCodec'; + +const SEED_OFFSET = 0; +const ID_OFFSET = SEED_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; +const INITIAL_FRAME_SIZE = ID_OFFSET + BitsUtil.LONG_SIZE_IN_BYTES; + +/** @internal */ +export class RaftGroupIdCodec { + static encode(clientMessage: ClientMessage, raftGroupId: RaftGroupId): void { + clientMessage.addFrame(BEGIN_FRAME.copy()); + + const initialFrame = Frame.createInitialFrame(INITIAL_FRAME_SIZE, DEFAULT_FLAGS); + FixSizedTypesCodec.encodeLong(initialFrame.content, SEED_OFFSET, raftGroupId.seed); + FixSizedTypesCodec.encodeLong(initialFrame.content, ID_OFFSET, raftGroupId.id); + clientMessage.addFrame(initialFrame); + + StringCodec.encode(clientMessage, raftGroupId.name); + + clientMessage.addFrame(END_FRAME.copy()); + } + + static decode(clientMessage: ClientMessage): RaftGroupId { + // begin frame + clientMessage.nextFrame(); + + const initialFrame = clientMessage.nextFrame(); + const seed = FixSizedTypesCodec.decodeLong(initialFrame.content, SEED_OFFSET); + const id = FixSizedTypesCodec.decodeLong(initialFrame.content, ID_OFFSET); + + const name = StringCodec.decode(clientMessage); + + CodecUtil.fastForwardToEndFrame(clientMessage); + + return new RaftGroupId(name, seed, id); + } +} diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index bd5081eec..2cfd5ef53 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -26,7 +26,7 @@ import {UUID} from '../core/UUID'; * Common super class for any proxy. * @internal */ -export class BaseProxy { +export abstract class BaseProxy { protected client: HazelcastClient; protected readonly name: string; @@ -42,40 +42,20 @@ export class BaseProxy { return this.name; } - /** - * Returns name of the proxy. - * @returns - */ getName(): string { return this.name; } - /** - * Returns name of the service which this proxy belongs to. - * Refer to service field of {@link ProxyManager} for service names. - * @returns - */ getServiceName(): string { return this.serviceName; } - /** - * Deletes the proxy object and frees allocated resources on cluster. - * @returns - */ destroy(): Promise { return this.client.getProxyManager().destroyProxy(this.name, this.serviceName).then(() => { return this.postDestroy(); }); } - /** - * Destroys this client proxy instance locally without issuing distributed - * object destroy request to the cluster as the destroy method does. - *

- * The local destruction operation still may perform some communication - * with the cluster; for example, to unregister remote event subscriptions. - */ destroyLocally(): Promise { return this.postDestroy(); } diff --git a/src/proxy/FlakeIdGenerator.ts b/src/proxy/FlakeIdGenerator.ts index 67fa9e19d..378f6d681 100644 --- a/src/proxy/FlakeIdGenerator.ts +++ b/src/proxy/FlakeIdGenerator.ts @@ -14,6 +14,10 @@ * limitations under the License. */ +import * as Promise from 'bluebird'; +import * as Long from 'long'; +import {DistributedObject} from '../core/DistributedObject'; + /** * A cluster-wide unique ID generator. Generated IDs are `Long` primitive values * and are k-ordered (roughly ordered). IDs are in the range from `0` to `Long.MAX_VALUE`. @@ -36,10 +40,6 @@ * nodeId will be assigned from zero again. Uniqueness after the restart will be preserved thanks to * the timestamp component. */ -import * as Promise from 'bluebird'; -import * as Long from 'long'; -import {DistributedObject} from '../core/DistributedObject'; - export interface FlakeIdGenerator extends DistributedObject { /** diff --git a/src/proxy/IAtomicLong.ts b/src/proxy/IAtomicLong.ts new file mode 100644 index 000000000..a0ae15221 --- /dev/null +++ b/src/proxy/IAtomicLong.ts @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Promise from 'bluebird'; +import * as Long from 'long'; +import {DistributedObject} from '../core'; + +/** + * IAtomicLong is a redundant and highly available distributed counter + * for 64-bit integers (`long` type in java). + * + * It works on top of the Raft consensus algorithm. It offers linearizability + * during crash failures and network partitions. It is CP with respect to + * the CAP principle. If a network partition occurs, it remains available + * on at most one side of the partition. + * + * IAtomicLong implementation does not offer exactly-once / effectively-once + * execution semantics. It goes with at-least-once execution semantics + * by default and can cause an API call to be committed multiple times + * in case of CP member failures. It can be tuned to offer at-most-once + * execution semantics. Please see `fail-on-indeterminate-operation-state` + * server-side setting. + */ +export interface IAtomicLong extends DistributedObject { + + /** + * Atomically adds the given value to the current value. + * + * @param delta the value to add to the current value + * @returns the updated value, the given value added to the current value + */ + addAndGet(delta: Long | number): Promise; + + /** + * Atomically sets the value to the given updated value + * only if the current value equals the expected value. + * + * @param expect the expected value + * @param update the new value + * @returns `true` if successful; or `false` if the actual value + * was not equal to the expected value. + */ + compareAndSet(expect: Long | number, update: Long | number): Promise; + + /** + * Atomically decrements the current value by one. + * + * @returns the updated value, the current value decremented by one + */ + decrementAndGet(): Promise; + + /** + * Gets the current value. + * + * @returns the current value + */ + get(): Promise; + + /** + * Atomically adds the given value to the current value. + * + * @param delta the value to add to the current value + * @returns the old value before the add + */ + getAndAdd(delta: Long | number): Promise; + + /** + * Atomically sets the given value and returns the old value. + * + * @param newValue the new value + * @returns the old value + */ + getAndSet(newValue: Long | number): Promise; + + /** + * Atomically increments the current value by one. + * + * @returns the updated value, the current value incremented by one + */ + incrementAndGet(): Promise; + + /** + * Atomically increments the current value by one. + * + * @returns the old value + */ + getAndIncrement(): Promise; + + /** + * Atomically sets the given value. + * + * @param newValue the new value + */ + set(newValue: Long | number): Promise; +} diff --git a/src/proxy/IList.ts b/src/proxy/IList.ts index 2794a65df..0214389cb 100644 --- a/src/proxy/IList.ts +++ b/src/proxy/IList.ts @@ -19,6 +19,9 @@ import {ItemListener} from './ItemListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../core/DistributedObject'; +/** + * Concurrent and distributed list. + */ export interface IList extends DistributedObject { /** diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index 2750c61a9..7b4b759b1 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -27,6 +27,9 @@ import {IdentifiedDataSerializable} from '../serialization/Serializable'; import {Portable} from '../serialization/Portable'; import {IndexConfig} from '../config/IndexConfig'; +/** + * Concurrent, distributed, observable and queryable map. + */ export interface IMap extends DistributedObject { /** diff --git a/src/proxy/IQueue.ts b/src/proxy/IQueue.ts index fdae714fd..fbfb9c196 100644 --- a/src/proxy/IQueue.ts +++ b/src/proxy/IQueue.ts @@ -18,6 +18,9 @@ import * as Promise from 'bluebird'; import {ItemListener} from './ItemListener'; import {DistributedObject} from '../core'; +/** + * Concurrent, distributed, observable queue. + */ export interface IQueue extends DistributedObject { /** * Adds given item to the end of the queue. Operation is successful only diff --git a/src/proxy/ISet.ts b/src/proxy/ISet.ts index cddc3e5e1..5ee6ffd6f 100644 --- a/src/proxy/ISet.ts +++ b/src/proxy/ISet.ts @@ -18,6 +18,9 @@ import * as Promise from 'bluebird'; import {ItemListener} from './ItemListener'; import {DistributedObject} from '../core'; +/** + * Concurrent and distributed set. + */ export interface ISet extends DistributedObject { /** * Adds the specified element to this set if not already present. diff --git a/src/proxy/ITopic.ts b/src/proxy/ITopic.ts index 7497cccd1..8232e1d00 100644 --- a/src/proxy/ITopic.ts +++ b/src/proxy/ITopic.ts @@ -18,6 +18,15 @@ import * as Promise from 'bluebird'; import {DistributedObject} from '../core'; import {MessageListener} from './MessageListener'; +/** + * Hazelcast provides distribution mechanism for publishing messages that are + * delivered to multiple subscribers, which is also known as a publish/subscribe + * (pub/sub) messaging model. Publish and subscriptions are cluster-wide. + * + * This interface stand for reliable topic, i.e. it uses a Ringbuffer to store + * events. The events in the Ringbuffer are replicated, so they won't get + * lost when a node goes down. + */ export interface ITopic extends DistributedObject { /** diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index b9d85c1fe..c429dbfa3 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -76,13 +76,11 @@ export class ListProxy extends PartitionSpecificProxy implements IList { } addAt(index: number, element: E): Promise { - return this.encodeInvoke(ListAddWithIndexCodec, index, this.toData(element)) - .then(() => undefined); + return this.encodeInvoke(ListAddWithIndexCodec, index, this.toData(element)).then(); } clear(): Promise { - return this.encodeInvoke(ListClearCodec) - .then(() => undefined); + return this.encodeInvoke(ListClearCodec).then(); } contains(entry: E): Promise { diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index d6192bffe..4cab2e508 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -292,8 +292,7 @@ export class MapProxy extends BaseProxy implements IMap { } clear(): Promise { - return this.encodeInvokeOnRandomTarget(MapClearCodec) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(MapClearCodec).then(); } isEmpty(): Promise { @@ -346,20 +345,17 @@ export class MapProxy extends BaseProxy implements IMap { } evictAll(): Promise { - return this.encodeInvokeOnRandomTarget(MapEvictAllCodec) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(MapEvictAllCodec).then(); } flush(): Promise { - return this.encodeInvokeOnRandomTarget(MapFlushCodec) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(MapFlushCodec).then(); } lock(key: K, ttl = -1): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapLockCodec, keyData, keyData, 0, ttl, 0) - .then(() => undefined); + return this.encodeInvokeOnKey(MapLockCodec, keyData, keyData, 0, ttl, 0).then(); } isLocked(key: K): Promise { @@ -375,15 +371,13 @@ export class MapProxy extends BaseProxy implements IMap { unlock(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapUnlockCodec, keyData, keyData, 0, 0) - .then(() => undefined); + return this.encodeInvokeOnKey(MapUnlockCodec, keyData, keyData, 0, 0).then(); } forceUnlock(key: K): Promise { assertNotNull(key); const keyData = this.toData(key); - return this.encodeInvokeOnKey(MapForceUnlockCodec, keyData, keyData, 0) - .then(() => undefined); + return this.encodeInvokeOnKey(MapForceUnlockCodec, keyData, keyData, 0).then(); } keySet(): Promise { @@ -396,13 +390,11 @@ export class MapProxy extends BaseProxy implements IMap { loadAll(keys: K[] = null, replaceExistingValues = true): Promise { if (keys == null) { - return this.encodeInvokeOnRandomTarget(MapLoadAllCodec, replaceExistingValues) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(MapLoadAllCodec, replaceExistingValues).then(); } else { const toData = this.toData.bind(this); const keysData: Data[] = keys.map(toData); - return this.encodeInvokeOnRandomTarget(MapLoadGivenKeysCodec, keysData, replaceExistingValues) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(MapLoadGivenKeysCodec, keysData, replaceExistingValues).then(); } } @@ -477,8 +469,7 @@ export class MapProxy extends BaseProxy implements IMap { addIndex(indexConfig: IndexConfig): Promise { assertNotNull(indexConfig); const normalizedConfig = IndexUtil.validateAndNormalize(this.name, indexConfig); - return this.encodeInvokeOnRandomTarget(MapAddIndexCodec, normalizedConfig) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(MapAddIndexCodec, normalizedConfig).then(); } tryLock(key: K, timeout = 0, lease = -1): Promise { @@ -588,8 +579,7 @@ export class MapProxy extends BaseProxy implements IMap { } protected deleteInternal(keyData: Data): Promise { - return this.encodeInvokeOnKey(MapDeleteCodec, keyData, keyData, 0) - .then(() => undefined); + return this.encodeInvokeOnKey(MapDeleteCodec, keyData, keyData, 0).then(); } protected evictInternal(keyData: Data): Promise { @@ -609,8 +599,7 @@ export class MapProxy extends BaseProxy implements IMap { } protected putTransientInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapPutTransientCodec, keyData, keyData, valueData, 0, ttl) - .then(() => undefined); + return this.encodeInvokeOnKey(MapPutTransientCodec, keyData, keyData, valueData, 0, ttl).then(); } protected replaceInternal(keyData: Data, newValueData: Data): Promise { @@ -630,8 +619,7 @@ export class MapProxy extends BaseProxy implements IMap { } protected setInternal(keyData: Data, valueData: Data, ttl: number): Promise { - return this.encodeInvokeOnKey(MapSetCodec, keyData, keyData, valueData, 0, ttl) - .then(() => undefined); + return this.encodeInvokeOnKey(MapSetCodec, keyData, keyData, valueData, 0, ttl).then(); } protected tryPutInternal(keyData: Data, valueData: Data, timeout: number): Promise { @@ -669,8 +657,7 @@ export class MapProxy extends BaseProxy implements IMap { .then(() => this.finalizePutAll(partitionsToKeys)), ); } - return Promise.all(partitionPromises) - .then(() => undefined); + return Promise.all(partitionPromises).then(); } private addEntryListenerInternal( diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index a55b95372..ee722dbaf 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -21,6 +21,9 @@ import { ReadOnlyLazyList } from '../core'; +/** + * A specialized map whose keys can be associated with multiple values. + */ export interface MultiMap extends DistributedObject { /** diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 025129782..60fc844c7 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -160,8 +160,7 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { } clear(): Promise { - return this.encodeInvokeOnRandomTarget(MultiMapClearCodec) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(MultiMapClearCodec).then(); } valueCount(key: K): Promise { @@ -235,7 +234,7 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { lock(key: K, leaseMillis = -1): Promise { const keyData = this.toData(key); return this.encodeInvokeOnKey(MultiMapLockCodec, keyData, keyData, 1, leaseMillis, this.nextSequence()) - .then(() => undefined); + .then(); } isLocked(key: K): Promise { @@ -258,14 +257,12 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { unlock(key: K): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapUnlockCodec, keyData, keyData, 1, this.nextSequence()) - .then(() => undefined); + return this.encodeInvokeOnKey(MultiMapUnlockCodec, keyData, keyData, 1, this.nextSequence()).then(); } forceUnlock(key: K): Promise { const keyData = this.toData(key); - return this.encodeInvokeOnKey(MultiMapForceUnlockCodec, keyData, keyData, this.nextSequence()) - .then(() => undefined); + return this.encodeInvokeOnKey(MultiMapForceUnlockCodec, keyData, keyData, this.nextSequence()).then(); } putAll(pairs: Array<[K, V[]]>): Promise { @@ -298,8 +295,7 @@ export class MultiMapProxy extends BaseProxy implements MultiMap { partitionPromises.push(this.encodeInvokeOnPartition(MultiMapPutAllCodec, partitionId, pair)); }); - return Promise.all(partitionPromises) - .then(() => undefined); + return Promise.all(partitionPromises).then(); } private nextSequence(): Long { diff --git a/src/proxy/PNCounter.ts b/src/proxy/PNCounter.ts index 9bafec80a..c3fa7aedf 100644 --- a/src/proxy/PNCounter.ts +++ b/src/proxy/PNCounter.ts @@ -20,7 +20,7 @@ import {DistributedObject} from '../core/DistributedObject'; /** * PN (Positive-Negative) CRDT counter. - *

+ * * The counter supports adding and subtracting values as well as * retrieving the current counter value. * The counter guarantees that whenever two nodes have received the @@ -28,11 +28,11 @@ import {DistributedObject} from '../core/DistributedObject'; * identical, and any conflicting updates are merged automatically. * If no new updates are made to the shared state, all nodes that can * communicate will eventually have the same data. - *

+ * * The invocation is remote. This may lead to indeterminate state - * the update may be applied but the response has not been received. * In this case, the caller will be notified with a `TargetDisconnectedError` - *

+ * * The read and write methods provide monotonic read and RYW (read-your-write) * guarantees. These guarantees are session guarantees which means that if * no replica with the previously observed state is reachable, the session @@ -47,7 +47,7 @@ import {DistributedObject} from '../core/DistributedObject'; * case the session can be continued or you can reset the session by calling * the `reset()` method. If you have called the `reset()` method, * a new session is started with the next invocation to a CRDT replica. - *

+ * * NOTE: * The CRDT state is kept entirely on non-lite (data) members. If there * aren't any and the methods here are invoked, they will diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index cb455e33b..bd7fe2d23 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -130,9 +130,7 @@ export class ProxyManager { const request = ClientCreateProxiesCodec.encodeRequest(proxyEntries); request.setPartitionId(-1); const invocation = new Invocation(this.client, request); - return this.client.getInvocationService() - .invokeUrgent(invocation) - .then(() => undefined); + return this.client.getInvocationService().invokeUrgent(invocation).then(); } public getDistributedObjects(): Promise { @@ -148,8 +146,7 @@ export class ProxyManager { this.proxies.delete(serviceName + NAMESPACE_SEPARATOR + name); const clientMessage = ClientDestroyProxyCodec.encodeRequest(name, serviceName); clientMessage.setPartitionId(-1); - return this.client.getInvocationService().invokeOnRandomTarget(clientMessage) - .then(() => undefined); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).then(); } public destroyProxyLocally(namespace: string): Promise { diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index a30ff25c7..79ec541ef 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -96,8 +96,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { } clear(): Promise { - return this.encodeInvoke(QueueClearCodec) - .then(() => undefined); + return this.encodeInvoke(QueueClearCodec).then(); } contains(item: E): Promise { @@ -178,8 +177,7 @@ export class QueueProxy extends PartitionSpecificProxy implements IQueue { put(item: E): Promise { const itemData = this.toData(item); - return this.encodeInvoke(QueuePutCodec, itemData) - .then(() => undefined); + return this.encodeInvoke(QueuePutCodec, itemData).then(); } remainingCapacity(): Promise { diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index 87ae56366..c5609917a 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -71,8 +71,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements } clear(): Promise { - return this.encodeInvokeOnRandomTarget(ReplicatedMapClearCodec) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(ReplicatedMapClearCodec).then(); } get(key: K): Promise { @@ -146,8 +145,7 @@ export class ReplicatedMapProxy extends PartitionSpecificProxy implements entries.push([keyData, valueData]); } - return this.encodeInvokeOnRandomTarget(ReplicatedMapPutAllCodec, entries) - .then(() => undefined); + return this.encodeInvokeOnRandomTarget(ReplicatedMapPutAllCodec, entries).then(); } keySet(): Promise { diff --git a/src/proxy/Ringbuffer.ts b/src/proxy/Ringbuffer.ts index dd5717928..ad4095aa0 100644 --- a/src/proxy/Ringbuffer.ts +++ b/src/proxy/Ringbuffer.ts @@ -22,6 +22,12 @@ import { } from '../core'; import {OverflowPolicy} from './OverflowPolicy'; +/** + * A Ringbuffer is a data structure where the content is stored in a ring-like + * structure. A ringbuffer has a fixed capacity so it won't grow beyond + * that capacity and endanger the stability of the system. If that capacity + * is exceeded, the oldest item in the ringbuffer is overwritten. + */ export interface Ringbuffer extends DistributedObject { /** diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index 0a35c6801..eef65a2a2 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -65,8 +65,7 @@ export class SetProxy extends PartitionSpecificProxy implements ISet { } clear(): Promise { - return this.encodeInvoke(SetClearCodec) - .then(() => undefined); + return this.encodeInvoke(SetClearCodec).then(); } contains(entry: E): Promise { diff --git a/src/proxy/cpsubsystem/AtomicLongProxy.ts b/src/proxy/cpsubsystem/AtomicLongProxy.ts new file mode 100644 index 000000000..4f6a07e1c --- /dev/null +++ b/src/proxy/cpsubsystem/AtomicLongProxy.ts @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +import * as Long from 'long'; +import * as Promise from 'bluebird'; +import {HazelcastClient} from '../../HazelcastClient'; +import {BaseCPProxy} from './BaseCPProxy'; +import {IAtomicLong} from '../IAtomicLong'; +import {CPProxyManager} from './CPProxyManager'; +import {RaftGroupId} from './RaftGroupId'; +import {CPGroupDestroyCPObjectCodec} from '../../codec/CPGroupDestroyCPObjectCodec'; +import {AtomicLongAddAndGetCodec} from '../../codec/AtomicLongAddAndGetCodec'; +import {AtomicLongCompareAndSetCodec} from '../../codec/AtomicLongCompareAndSetCodec'; +import {AtomicLongGetCodec} from '../../codec/AtomicLongGetCodec'; +import {AtomicLongGetAndAddCodec} from '../../codec/AtomicLongGetAndAddCodec'; +import {AtomicLongGetAndSetCodec} from '../../codec/AtomicLongGetAndSetCodec'; + +/** @internal */ +export class AtomicLongProxy extends BaseCPProxy implements IAtomicLong { + + private readonly groupId: RaftGroupId; + private readonly objectName: string; + + constructor(client: HazelcastClient, groupId: RaftGroupId, proxyName: string, objectName: string) { + super(client, CPProxyManager.ATOMIC_LONG_SERVICE, proxyName); + this.groupId = groupId; + this.objectName = objectName; + } + + destroy(): Promise { + return this.encodeInvokeOnRandomTarget(CPGroupDestroyCPObjectCodec, + this.groupId, this.serviceName, this.objectName).then(); + } + + addAndGet(delta: Long | number): Promise { + if (!Long.isLong(delta)) { + delta = Long.fromNumber(delta as number); + } + return this.encodeInvokeOnRandomTarget(AtomicLongAddAndGetCodec, this.groupId, this.objectName, delta) + .then((clientMessage) => { + const response = AtomicLongAddAndGetCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + compareAndSet(expect: Long | number, update: Long | number): Promise { + if (!Long.isLong(expect)) { + expect = Long.fromNumber(expect as number); + } + if (!Long.isLong(update)) { + update = Long.fromNumber(update as number); + } + return this.encodeInvokeOnRandomTarget(AtomicLongCompareAndSetCodec, this.groupId, this.objectName, expect, update) + .then((clientMessage) => { + const response = AtomicLongCompareAndSetCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + decrementAndGet(): Promise { + return this.addAndGet(-1); + } + + get(): Promise { + return this.encodeInvokeOnRandomTarget(AtomicLongGetCodec, this.groupId, this.objectName) + .then((clientMessage) => { + const response = AtomicLongGetCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + getAndAdd(delta: Long | number): Promise { + if (!Long.isLong(delta)) { + delta = Long.fromNumber(delta as number); + } + return this.encodeInvokeOnRandomTarget(AtomicLongGetAndAddCodec, this.groupId, this.objectName, delta) + .then((clientMessage) => { + const response = AtomicLongGetAndAddCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + getAndSet(newValue: Long | number): Promise { + if (!Long.isLong(newValue)) { + newValue = Long.fromNumber(newValue as number); + } + return this.encodeInvokeOnRandomTarget(AtomicLongGetAndSetCodec, this.groupId, this.objectName, newValue) + .then((clientMessage) => { + const response = AtomicLongGetAndSetCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + incrementAndGet(): Promise { + return this.addAndGet(1); + } + + getAndIncrement(): Promise { + return this.getAndAdd(1); + } + + set(newValue: Long | number): Promise { + return this.getAndSet(newValue).then(); + } +} diff --git a/src/proxy/cpsubsystem/BaseCPProxy.ts b/src/proxy/cpsubsystem/BaseCPProxy.ts new file mode 100644 index 000000000..a8be508a7 --- /dev/null +++ b/src/proxy/cpsubsystem/BaseCPProxy.ts @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +import * as Promise from 'bluebird'; +import {HazelcastClient} from '../../HazelcastClient'; +import {ClientMessage} from '../../protocol/ClientMessage'; +import {UnsupportedOperationError} from '../../core'; + +/** + * Common super class for any CP Subsystem proxy. + * @internal + */ +export abstract class BaseCPProxy { + + protected client: HazelcastClient; + protected readonly proxyName: string; + protected readonly serviceName: string; + + constructor(client: HazelcastClient, serviceName: string, proxyName: string) { + this.client = client; + this.proxyName = proxyName; + this.serviceName = serviceName; + } + + getPartitionKey(): string { + throw new UnsupportedOperationError('This operation is not supported by CP Subsystem'); + } + + getName(): string { + return this.proxyName; + } + + getServiceName(): string { + return this.serviceName; + } + + /** + * Encodes a request from a codec and invokes it on any node. + * @param codec + * @param codecArguments + * @returns response message + */ + protected encodeInvokeOnRandomTarget(codec: any, ...codecArguments: any[]): Promise { + const clientMessage = codec.encodeRequest(...codecArguments); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage); + } +} diff --git a/src/proxy/cpsubsystem/CPProxyManager.ts b/src/proxy/cpsubsystem/CPProxyManager.ts new file mode 100644 index 000000000..62984bfd6 --- /dev/null +++ b/src/proxy/cpsubsystem/CPProxyManager.ts @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +import * as assert from 'assert'; +import * as Promise from 'bluebird'; +import { + DistributedObject, + IllegalStateError +} from '../../core'; +import {HazelcastClient} from '../../HazelcastClient'; +import {AtomicLongProxy} from './AtomicLongProxy'; +import {RaftGroupId} from './RaftGroupId'; +import {CPGroupCreateCPGroupCodec} from '../../codec/CPGroupCreateCPGroupCodec'; +import {assertString} from '../../util/Util'; + +const DEFAULT_GROUP_NAME = 'default'; + +/** @internal */ +export function withoutDefaultGroupName(name: string): string { + assertString(name); + name = name.trim(); + const i = name.indexOf('@'); + if (i === -1) { + return name; + } + + assert(name.indexOf('@', i + 1) === -1, 'Custom group name must be specified at most once'); + const groupName = name.slice(i + 1).trim(); + if (groupName === DEFAULT_GROUP_NAME) { + return name.slice(0, i); + } + return name; +} + +/** @internal */ +export function getObjectNameForProxy(name: string): string { + assertString(name); + const i = name.indexOf('@'); + if (i === -1) { + return name; + } + assert(i < (name.length - 1), 'Custom CP group name cannot be empty string'); + const objectName = name.slice(0, i).trim(); + assert(objectName.length > 0, 'Object name cannot be empty string'); + return objectName; +} + +/** @internal */ +export class CPProxyManager { + + public static readonly ATOMIC_LONG_SERVICE = 'hz:raft:atomicLongService'; + + private readonly client: HazelcastClient; + + constructor(client: HazelcastClient) { + this.client = client; + } + + public getOrCreateProxy(proxyName: string, serviceName: string): Promise { + proxyName = withoutDefaultGroupName(proxyName); + const objectName = getObjectNameForProxy(proxyName); + + return this.getGroupId(proxyName).then((groupId) => { + if (serviceName === CPProxyManager.ATOMIC_LONG_SERVICE) { + return new AtomicLongProxy(this.client, groupId, proxyName, objectName); + } + throw new IllegalStateError('Unexpected service name: ' + serviceName); + }); + } + + private getGroupId(proxyName: string): Promise { + const clientMessage = CPGroupCreateCPGroupCodec.encodeRequest(proxyName); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage) + .then((clientMessage) => { + const response = CPGroupCreateCPGroupCodec.decodeResponse(clientMessage); + return response.groupId; + }); + } +} diff --git a/src/proxy/cpsubsystem/RaftGroupId.ts b/src/proxy/cpsubsystem/RaftGroupId.ts new file mode 100644 index 000000000..717d63d05 --- /dev/null +++ b/src/proxy/cpsubsystem/RaftGroupId.ts @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +import * as Long from 'long'; + +/** @internal */ +export class RaftGroupId { + + name: string; + seed: Long; + id: Long; + + constructor(name: string, seed: Long, id: Long) { + this.name = name; + this.seed = seed; + this.id = id; + } +} diff --git a/src/proxy/index.ts b/src/proxy/index.ts index b0f028b41..1e2638680 100644 --- a/src/proxy/index.ts +++ b/src/proxy/index.ts @@ -35,3 +35,4 @@ export * from './ReplicatedMap'; export * from './Ringbuffer'; export * from './MessageListener'; export * from './TopicOverloadPolicy'; +export * from './IAtomicLong'; diff --git a/src/serialization/portable/PortableContext.ts b/src/serialization/portable/PortableContext.ts index daceea4f9..881b0645b 100644 --- a/src/serialization/portable/PortableContext.ts +++ b/src/serialization/portable/PortableContext.ts @@ -27,7 +27,7 @@ import {ClassDefinitionBuilder} from './ClassDefinitionBuilder'; export class PortableContext { private version: number; - private classDefContext: { [factoyId: number]: ClassDefinitionContext }; + private classDefContext: { [factoryId: number]: ClassDefinitionContext }; constructor(portableVersion: number) { this.version = portableVersion; diff --git a/test/cpsubsystem/AtomicLongProxyTest.js b/test/cpsubsystem/AtomicLongProxyTest.js new file mode 100644 index 000000000..c79bfa538 --- /dev/null +++ b/test/cpsubsystem/AtomicLongProxyTest.js @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { expect } = require('chai'); +const fs = require('fs'); +const Long = require('long'); +const RC = require('./../RC'); +const { + Client, + DistributedObjectDestroyedError +} = require('../../'); + +describe('AtomicLongProxyTest', function () { + + this.timeout(30000); + + let cluster; + let client; + let long; + + function expectLong(expected, long) { + expect(long.toString()).to.equal(Long.fromValue(expected).toString()); + } + + before(async function () { + cluster = await RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_cpsubsystem.xml', 'utf8')) + await Promise.all([ + RC.startMember(cluster.id), + RC.startMember(cluster.id), + RC.startMember(cluster.id) + ]); + client = await Client.newHazelcastClient({ clusterName: cluster.id }); + long = await client.getAtomicLong('along'); + }); + + afterEach(async function () { + // return to default value + await long.set(0); + }); + + after(async function () { + client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + it('should create AtomicLong with respect to given CP group', async function () { + const longInAnotherGroup = await client.getAtomicLong('along@mygroup'); + + const value1 = await longInAnotherGroup.incrementAndGet(); + expectLong(1, value1); + // the following value has to be 0, + // as `long` belongs to the default CP group + const value2 = await long.get(); + expectLong(0, value2); + }); + + it('destroy: should destroy AtomicLong and throw on operation', async function () { + const anotherLong = await client.getAtomicLong('another-long-1'); + await anotherLong.destroy(); + // the next destroy call should be ignored + await anotherLong.destroy(); + + try { + await anotherLong.get(); + } catch (err) { + expect(err).to.be.instanceOf(DistributedObjectDestroyedError); + } + }); + + it('destroy: should destroy AtomicLong and throw on getAtomitLong call', async function () { + const anotherLong = await client.getAtomicLong('another-long-2'); + await anotherLong.destroy(); + + try { + await client.getAtomicLong('another-long-2'); + } catch (err) { + expect(err).to.be.instanceOf(DistributedObjectDestroyedError); + } + }); + + it('get: should return 0 initially', async function () { + const value = await long.get(); + expectLong(0, value); + }); + + it('addAndGet: should add', async function () { + const value = await long.addAndGet(33); + expectLong(33, value); + }); + + it('getAndAdd: should return old value', async function () { + const value = await long.getAndAdd(123); + expectLong(0, value); + }); + + it('getAndAdd: should add', async function () { + await long.getAndAdd(123); + const value = await long.get(); + expectLong(123, value); + }); + + it('decrementAndGet: should decrement', async function () { + const value = await long.decrementAndGet(); + expectLong(-1, value); + }); + + it('compareAndSet: should set the value when condition is met', async function () { + await long.set(42); + const result = await long.compareAndSet(42, 13); + expect(result).to.be.true; + const value = await long.get(); + expectLong(13, value); + }); + + it('compareAndSet: should have no effect when condition is not met', async function () { + await long.set(42); + const result = await long.compareAndSet(13, 13); + expect(result).to.be.false; + const value = await long.get(); + expectLong(42, value); + }); + + it('set: should set new value', async function () { + await long.set(1001); + const value = await long.get(); + expectLong(1001, value); + }); + + it('getAndSet: should return old value', async function () { + const value = await long.getAndSet(-123); + expectLong(0, value); + }); + + it('getAndSet: should set the value', async function () { + await long.getAndSet(-123); + const value = await long.get(); + expectLong(-123, value); + }); + + it('incrementAndGet: should increment', async function () { + const value = await long.incrementAndGet(); + expectLong(1, value); + }); + + it('getAndIncrement: should return old value', async function () { + const value = await long.getAndIncrement(); + expectLong(0, value); + }); + + it('getAndIncrement: should increment', async function () { + await long.getAndIncrement(); + const value = await long.get(); + expectLong(1, value); + }); +}); diff --git a/test/cpsubsystem/hazelcast_cpsubsystem.xml b/test/cpsubsystem/hazelcast_cpsubsystem.xml new file mode 100644 index 000000000..b64556ba3 --- /dev/null +++ b/test/cpsubsystem/hazelcast_cpsubsystem.xml @@ -0,0 +1,25 @@ + + + + + 3 + 3 + + diff --git a/test/integration/ClientBackupAcksTest.js b/test/integration/ClientBackupAcksTest.js index 7cb048906..22b12e436 100644 --- a/test/integration/ClientBackupAcksTest.js +++ b/test/integration/ClientBackupAcksTest.js @@ -30,6 +30,8 @@ const { ClientLocalBackupListenerCodec } = require('../../lib/codec/ClientLocalB */ describe('ClientBackupAcksTest', function () { + this.timeout(15000); + let cluster; let client; diff --git a/test/invocation/InvocationTest.js b/test/invocation/InvocationTest.js index 562ed49ac..ffcb3a338 100644 --- a/test/invocation/InvocationTest.js +++ b/test/invocation/InvocationTest.js @@ -15,7 +15,7 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const sinon = require('sinon'); const sandbox = sinon.createSandbox(); const { Client, IndeterminateOperationStateError } = require('../../'); diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index 4ff3bb303..d6e2d3190 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -15,15 +15,15 @@ */ 'use strict'; -const expect = require("chai").expect; +const expect = require('chai').expect; const fs = require('fs'); -const HazelcastClient = require("../../lib/index.js").Client; const RC = require('./../RC'); -const fillMap = require('../Util').fillMap; -const promiseWaitMilliseconds = require('../Util').promiseWaitMilliseconds; +const { Client } = require('../../lib/index.js'); +const { fillMap } = require('../Util'); +const { promiseWaitMilliseconds } = require('../Util'); const Util = require('../Util'); -describe('MapStore', function () { +describe('MapStoreTest', function () { let cluster; let client; @@ -37,7 +37,7 @@ describe('MapStore', function () { return RC.startMember(cluster.id); }) .then(function (member) { - return HazelcastClient.newHazelcastClient({ clusterName: cluster.id }); + return Client.newHazelcastClient({ clusterName: cluster.id }); }) .then(function (hazelcastClient) { client = hazelcastClient; @@ -208,21 +208,21 @@ describe('MapStore', function () { updated: event => { map.removeEntryListener(listenerId) .then(() => { - if (event.oldValue === "1") { + if (event.oldValue === '1') { done(); } else { - done(new Error("Old value for the received event does not match with expected value! " + - "Expected: 1, received: " + event.oldValue)); + done(new Error('Old value for the received event does not match with expected value! ' + + 'Expected: 1, received: ' + event.oldValue)); } }); }, } map.evictAll() - .then(() => map.put("1", "1")) + .then(() => map.put('1', '1')) .then(() => map.addEntryListener(listener, null, true)) .then(id => { listenerId = id; - return map.putAll([["1", "2"]]); + return map.putAll([['1', '2']]); }); }); @@ -236,18 +236,18 @@ describe('MapStore', function () { if (event.oldValue == null) { done(); } else { - done(new Error("Old value for the received event does not match with expected value! " + - "Expected: null, received: " + event.oldValue)); + done(new Error('Old value for the received event does not match with expected value! ' + + 'Expected: null, received: ' + event.oldValue)); } }); }, } map.evictAll() - .then(() => map.put("1", "1")) + .then(() => map.put('1', '1')) .then(() => map.addEntryListener(listener, null, true)) .then(id => { listenerId = id; - return map.setAll([["1", "2"]]); + return map.setAll([['1', '2']]); }); }); }); diff --git a/test/unit/proxy/cpsubsystem/CPProxyManagerTest.js b/test/unit/proxy/cpsubsystem/CPProxyManagerTest.js new file mode 100644 index 000000000..1a6f29865 --- /dev/null +++ b/test/unit/proxy/cpsubsystem/CPProxyManagerTest.js @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { expect } = require('chai'); +const { AssertionError } = require('assert'); +const { + withoutDefaultGroupName, + getObjectNameForProxy +} = require('../../../../lib/proxy/cpsubsystem/CPProxyManager'); + +describe('CPProxyManagerTest', function () { + + it('withoutDefaultGroupName: should remove default group from result', function () { + expect(withoutDefaultGroupName('test@default')).to.be.equal('test'); + expect(withoutDefaultGroupName('test@custom')).to.be.equal('test@custom'); + }); + + it('withoutDefaultGroupName: should throw for non-string', function () { + expect(() => withoutDefaultGroupName(42)).to.throw(AssertionError); + }); + + it('withoutDefaultGroupName: should throw when group is specified multiple times', function () { + expect(() => withoutDefaultGroupName('test@default@@default')).to.throw(AssertionError); + }); + + it('getObjectNameForProxy: should remove group from result', function () { + expect(getObjectNameForProxy('test@default')).to.be.equal('test'); + expect(getObjectNameForProxy('test@custom')).to.be.equal('test'); + }); + + it('getObjectNameForProxy: should throw for non-string', function () { + expect(() => getObjectNameForProxy(42)).to.throw(AssertionError); + }); + + it('getObjectNameForProxy: should throw when object name is empty', function () { + expect(() => getObjectNameForProxy('@default')).to.throw(AssertionError); + expect(() => getObjectNameForProxy(' @default')).to.throw(AssertionError); + }); + + it('getObjectNameForProxy: should throw when group name is empty', function () { + expect(() => getObjectNameForProxy('test@')).to.throw(AssertionError); + }); +}); From 0613bb6e88f43b7ed8b580db9de3507bec127cfd Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 27 Aug 2020 14:35:50 +0300 Subject: [PATCH 284/685] Add test to verify that member list is not broken after hot restart (#575) Also includes the following: * Update RC version and thrift generated code to 0.8-SNAPSHOT * Improve code style in tests and ClientConnectionManager * Migrate AutoPipeliningDisabledTest to async/await --- download-remote-controller.js | 9 +- scripts/dev-test-rc.sh | 2 +- scripts/download-rc.bat | 6 +- scripts/download-rc.sh | 4 +- src/invocation/ClusterService.ts | 6 - src/network/ClientConnectionManager.ts | 103 ++++---- test/AutoPipeliningDisabledTest.js | 44 ++-- test/ClientHotRestartEventTest.js | 88 +++++++ test/RC.js | 10 + test/Util.js | 64 +++-- test/remote_controller/Controller.js | 4 + test/remote_controller/RemoteController.js | 240 ++++++++++++++++++ .../remote-controller_types.js | 2 + 13 files changed, 467 insertions(+), 115 deletions(-) create mode 100644 test/ClientHotRestartEventTest.js diff --git a/download-remote-controller.js b/download-remote-controller.js index 476f5891b..798c2db5a 100644 --- a/download-remote-controller.js +++ b/download-remote-controller.js @@ -14,11 +14,11 @@ * limitations under the License. */ -var child_process = require('child_process'); -var path = require('path'); +const child_process = require('child_process'); +const path = require('path'); -var scriptName = path.join('scripts', 'download-rc'); -var options = { +let scriptName = path.join('scripts', 'download-rc'); +const options = { stdio: [0, 1, 2] }; @@ -27,4 +27,5 @@ if (process.platform === 'win32') { } else if (process.platform === 'linux' || process.platform === 'darwin') { scriptName = scriptName + '.sh' } + child_process.execFileSync(scriptName, options); diff --git a/scripts/dev-test-rc.sh b/scripts/dev-test-rc.sh index 2047b0a09..db5f9201e 100755 --- a/scripts/dev-test-rc.sh +++ b/scripts/dev-test-rc.sh @@ -3,7 +3,7 @@ HZ_VERSION="4.0.2" HAZELCAST_TEST_VERSION="4.0.2" HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.7-SNAPSHOT" +HAZELCAST_RC_VERSION="0.8-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" diff --git a/scripts/download-rc.bat b/scripts/download-rc.bat index 4e25c9027..9a90ca973 100644 --- a/scripts/download-rc.bat +++ b/scripts/download-rc.bat @@ -3,7 +3,7 @@ set HZ_TEST_VERSION="4.0.2" set HAZELCAST_TEST_VERSION=%HZ_TEST_VERSION% set HAZELCAST_VERSION=%HZ_VERSION% set HAZELCAST_ENTERPRISE_VERSION=%HZ_VERSION% -set HAZELCAST_RC_VERSION="0.7-SNAPSHOT" +set HAZELCAST_RC_VERSION="0.8-SNAPSHOT" set SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" set RELEASE_REPO="http://repo1.maven.apache.org/maven2" set ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" @@ -28,7 +28,7 @@ if errorlevel 1 ( ) if exist hazelcast-remote-controller-%HAZELCAST_RC_VERSION%.jar ( - echo remote controller already exist, not downloading from maven. + echo remote controller already exists, not downloading from maven. ) else ( echo Downloading: remote-controller jar com.hazelcast:hazelcast-remote-controller:%HAZELCAST_RC_VERSION% call mvn -q dependency:get -DrepoUrl=%SNAPSHOT_REPO% -Dartifact=com.hazelcast:hazelcast-remote-controller:%HAZELCAST_RC_VERSION% -Ddest=hazelcast-remote-controller-%HAZELCAST_RC_VERSION%.jar @@ -95,5 +95,3 @@ start /min "hazelcast-remote-controller" cmd /c "java -Dhazelcast.enterprise.lic echo wait for Hazelcast to start ... ping -n 15 127.0.0.1 > nul - - diff --git a/scripts/download-rc.sh b/scripts/download-rc.sh index b57893df2..21337d864 100755 --- a/scripts/download-rc.sh +++ b/scripts/download-rc.sh @@ -5,7 +5,7 @@ HAZELCAST_TEST_VERSION=${HZ_TEST_VERSION} HAZELCAST_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_VERSION=${HZ_VERSION} HAZELCAST_ENTERPRISE_TEST_VERSION=${HZ_VERSION} -HAZELCAST_RC_VERSION="0.7-SNAPSHOT" +HAZELCAST_RC_VERSION="0.8-SNAPSHOT" SNAPSHOT_REPO="https://oss.sonatype.org/content/repositories/snapshots" RELEASE_REPO="http://repo1.maven.apache.org/maven2" ENTERPRISE_RELEASE_REPO="https://repository.hazelcast.com/release/" @@ -30,7 +30,7 @@ else fi if [ -f "hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar" ]; then - echo "remote controller already exist, not downloading from maven." + echo "remote controller already exists, not downloading from maven." else echo "Downloading: remote-controller jar com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION}" mvn -q dependency:get -DrepoUrl=${SNAPSHOT_REPO} -Dartifact=com.hazelcast:hazelcast-remote-controller:${HAZELCAST_RC_VERSION} -Ddest=hazelcast-remote-controller-${HAZELCAST_RC_VERSION}.jar diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index ab93bed99..a80f9e6b0 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -168,12 +168,6 @@ export class ClusterService implements Cluster { } } - reset(): void { - this.logger.trace('ClusterService', 'Resetting the cluster snapshot'); - this.initialListFetched = DeferredPromise(); - this.memberListSnapshot = EMPTY_SNAPSHOT; - } - handleMembersViewEvent(memberListVersion: number, memberInfos: MemberInfo[]): void { if (this.memberListSnapshot === EMPTY_SNAPSHOT) { this.applyInitialState(memberListVersion, memberInfos); diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index 9105cf9a5..4e24dd862 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -256,7 +256,7 @@ export class ClientConnectionManager extends EventEmitter { .then((translated) => { translatedAddress = translated; if (translatedAddress == null) { - throw new RangeError(`Address Translator could not translate address ${address}`); + throw new RangeError(`Address translator could not translate address ${address}`); } return this.triggerConnect(translatedAddress); }) @@ -299,25 +299,24 @@ export class ClientConnectionManager extends EventEmitter { const memberUuid = connection.getRemoteUuid(); if (endpoint == null) { - this.logger.trace('ConnectionManager', 'Destroying ' + connection + - ', but it has endpoint set to null -> not removing it from a connection map'); + this.logger.trace('ConnectionManager', 'Destroying ' + connection + + ', but it has endpoint set to null -> not removing it from a connection map'); return; } if (memberUuid != null && this.activeConnections.delete(memberUuid.toString())) { - this.logger.info('ConnectionManager', 'Removed connection to endpoint: ' + - endpoint + ':' + memberUuid + ', connection: ' + connection); + this.logger.info('ConnectionManager', 'Removed connection to endpoint: ' + + endpoint + ':' + memberUuid + ', connection: ' + connection); if (this.activeConnections.size === 0) { if (this.clientState === ClientState.INITIALIZED_ON_CLUSTER) { this.emitLifecycleEvent(LifecycleState.DISCONNECTED); } this.triggerClusterReconnection(); } - this.emitConnectionRemovedEvent(connection); } else { - this.logger.trace('ConnectionManager', 'Destroying a connection, but there is no mapping ' + - endpoint + ':' + memberUuid + '->' + connection + ' in the connection map.)'); + this.logger.trace('ConnectionManager', 'Destroying a connection, but there is no mapping ' + + endpoint + ':' + memberUuid + '->' + connection + ' in the connection map.)'); } } @@ -356,8 +355,8 @@ export class ClientConnectionManager extends EventEmitter { } }) .catch((error: Error) => { - this.logger.warn('ConnectionManager', 'Could not connect to any cluster, shutting down ' + - 'the client: ' + error.message); + this.logger.warn('ConnectionManager', 'Could not connect to any cluster, shutting down ' + + 'the client: ' + error.message); this.shutdownClient(); }); @@ -373,10 +372,9 @@ export class ClientConnectionManager extends EventEmitter { if (isConnected) { return; } - this.logger.info('ConnectionManager', 'Unable to connect any address from the cluster ' + - 'with the name: ' + this.client.getConfig().clusterName + - '. The following addresses were tried: ' + - Array.from(triedAddresses)); + this.logger.info('ConnectionManager', 'Unable to connect any address from the cluster ' + + 'with the name: ' + this.client.getConfig().clusterName + + '. The following addresses were tried: ' + Array.from(triedAddresses)); const message = this.client.getLifecycleService().isRunning() ? 'Unable to connect any cluster.' : 'Client is being shutdown.'; @@ -408,13 +406,15 @@ export class ClientConnectionManager extends EventEmitter { }); }) .catch(ClientNotAllowedInClusterError, InvalidConfigurationError, (error: Error) => { - this.logger.warn('ConnectionManager', 'Stopped trying on the cluster: ' + - this.client.getConfig().clusterName + ' reason: ' + error.message); + this.logger.warn('ConnectionManager', 'Stopped trying on the cluster: ' + + this.client.getConfig().clusterName + ' reason: ' + error.message); return false; }); } - private tryConnectingToAddress(index: number, addresses: AddressImpl[], triedAddresses: Set): Promise { + private tryConnectingToAddress(index: number, + addresses: AddressImpl[], + triedAddresses: Set): Promise { if (index >= addresses.length) { return Promise.resolve(false); } @@ -436,8 +436,8 @@ export class ClientConnectionManager extends EventEmitter { this.logger.info('ConnectionManager', 'Trying to connect to ' + address); return this.getOrConnect(address) .catch((error) => { - this.logger.warn('ConnectionManager', 'Error during initial connection to ' + address + ' ' + - error); + this.logger.warn('ConnectionManager', 'Error during initial connection to ' + + address + ' ' + error); return null; }); } @@ -458,8 +458,8 @@ export class ClientConnectionManager extends EventEmitter { return addressProvider.loadAddresses() .catch((error: Error) => { - this.logger.warn('ConnectionManager', 'Error from AddressProvider ' + addressProvider + - ', error: ' + error.message); + this.logger.warn('ConnectionManager', 'Error from AddressProvider ' + + addressProvider + ', error: ' + error.message); return new Array(); }) .then((providerAddresses) => { @@ -575,8 +575,8 @@ export class ClientConnectionManager extends EventEmitter { const addressProvider = this.client.getAddressProvider(); return addressProvider.translate(target) .catch((error: Error) => { - this.logger.warn('ConnectionManager', 'Failed to translate address ' + target + - ' via address provider ' + error.message); + this.logger.warn('ConnectionManager', 'Failed to translate address ' + + target + ' via address provider ' + error.message); return Promise.reject(error); }); } @@ -610,7 +610,6 @@ export class ClientConnectionManager extends EventEmitter { for (const member of this.client.getClusterService().getMembers()) { const address = member.address; - if (this.getConnectionFromAddress(address) == null) { if (this.connectingAddresses.has(address)) { continue; @@ -648,20 +647,19 @@ export class ClientConnectionManager extends EventEmitter { let error: Error; switch (response.status) { case AuthenticationStatus.CREDENTIALS_FAILED: - error = new AuthenticationError('Authentication failed. The configured cluster name on ' + - 'the client does not match the one configured in the cluster or ' + - 'the credentials set in the client security config could not be authenticated'); + error = new AuthenticationError('Authentication failed. The configured cluster name on ' + + 'the client does not match the one configured in the cluster or ' + + 'the credentials set in the client security config could not be authenticated'); break; case AuthenticationStatus.SERIALIZATION_VERSION_MISMATCH: - error = new IllegalStateError('Server serialization version ' + - 'does not match to client.'); + error = new IllegalStateError('Server serialization version does not match to client.'); break; case AuthenticationStatus.NOT_ALLOWED_IN_CLUSTER: error = new ClientNotAllowedInClusterError('Client is not allowed in the cluster'); break; default: - error = new AuthenticationError('Authentication status code not supported. Status: ' + - response.status); + error = new AuthenticationError('Authentication status code not supported. Status: ' + + response.status); } connection.close('Failed to authenticate connection', error); return Promise.reject(error); @@ -680,8 +678,8 @@ export class ClientConnectionManager extends EventEmitter { const initialConnection = this.activeConnections.size === 0; const changedCluster = initialConnection && this.clusterId != null && !newClusterId.equals(this.clusterId); if (changedCluster) { - this.logger.warn('ConnectionManager', 'Switching from current cluster: ' + this.clusterId + - ' to new cluster: ' + newClusterId); + this.logger.warn('ConnectionManager', 'Switching from current cluster: ' + + this.clusterId + ' to new cluster: ' + newClusterId); this.client.onClusterRestart(); } @@ -697,9 +695,9 @@ export class ClientConnectionManager extends EventEmitter { } } - this.logger.info('ConnectionManager', 'Authenticated with server ' + - response.address + ':' + response.memberUuid + ', server version: ' + response.serverHazelcastVersion + - ', local address: ' + connection.getLocalAddress()); + this.logger.info('ConnectionManager', 'Authenticated with server ' + + response.address + ':' + response.memberUuid + ', server version: ' + + response.serverHazelcastVersion + ', local address: ' + connection.getLocalAddress()); this.emitConnectionAddedEvent(connection); // It could happen that this connection is already closed and @@ -710,7 +708,6 @@ export class ClientConnectionManager extends EventEmitter { if (!connection.isAlive()) { this.onConnectionClose(connection); } - } private encodeAuthenticationRequest(): ClientMessage { @@ -736,40 +733,40 @@ export class ClientConnectionManager extends EventEmitter { private checkPartitionCount(newPartitionCount: number): void { const partitionService = this.client.getPartitionService() as PartitionServiceImpl; if (!partitionService.checkAndSetPartitionCount(newPartitionCount)) { - throw new ClientNotAllowedInClusterError('Client can not work with this cluster because it has a different ' + - 'partition count. Expected partition count: ' + partitionService.getPartitionCount() + - ', member partition count: ' + newPartitionCount); + throw new ClientNotAllowedInClusterError('Client can not work with this cluster because it has a different ' + + 'partition count. Expected partition count: ' + partitionService.getPartitionCount() + + ', member partition count: ' + newPartitionCount); } } private initializeClientOnCluster(targetClusterId: UUID): Promise { if (!targetClusterId.equals(this.clusterId)) { - this.logger.warn('ConnectionManager', 'Won\'t send client state to cluster: ' + targetClusterId + - ' because switched to a new cluster: ' + this.clusterId); + this.logger.warn('ConnectionManager', 'Will not send client state to cluster: ' + + targetClusterId + ', switched to a new cluster: ' + this.clusterId); return; } return this.client.sendStateToCluster() .then(() => { if (targetClusterId.equals(this.clusterId)) { - this.logger.trace('ConnectionManager', 'Client state is sent to cluster: ' + - targetClusterId); + this.logger.trace('ConnectionManager', 'Client state is sent to cluster: ' + + targetClusterId); this.clientState = ClientState.INITIALIZED_ON_CLUSTER; this.emitLifecycleEvent(LifecycleState.CONNECTED); } else { - this.logger.warn('ConnectionManager', 'Cannot set client state to initialized on ' + - 'cluster because current cluster id: ' + this.clusterId + ' is different than expected cluster id: ' + - targetClusterId); + this.logger.warn('ConnectionManager', 'Cannot set client state to initialized on ' + + 'cluster because current cluster id: ' + this.clusterId + + ' is different than expected cluster id: ' + targetClusterId); } }) .catch((error: Error) => { const clusterName = this.client.getConfig().clusterName; - this.logger.warn('ConnectionManager', 'Failure during sending state to the cluster: ' + - error.message); + this.logger.warn('ConnectionManager', 'Failure during sending state to the cluster: ' + + error.message); if (targetClusterId.equals(this.clusterId)) { - this.logger.warn('ConnectionManager', 'Retrying sending state to the cluster: ' + - targetClusterId + ', name: ' + clusterName); + this.logger.warn('ConnectionManager', 'Retrying sending state to the cluster: ' + + targetClusterId + ', name: ' + clusterName); return this.initializeClientOnCluster(targetClusterId); } }); @@ -777,14 +774,12 @@ export class ClientConnectionManager extends EventEmitter { private tryConnectToAllClusterMembers(members: MemberImpl[]): Promise { const promises: Array> = []; - for (const member of members) { promises.push(this.getOrConnect(member.address) .catch(() => { - // No-op + // no-op })); } - return Promise.all(promises) .then(() => undefined); } diff --git a/test/AutoPipeliningDisabledTest.js b/test/AutoPipeliningDisabledTest.js index 74188f90c..b1d823ef7 100644 --- a/test/AutoPipeliningDisabledTest.js +++ b/test/AutoPipeliningDisabledTest.js @@ -15,7 +15,7 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const RC = require('./RC'); const { Client } = require('../.'); @@ -25,49 +25,35 @@ describe('AutoPipeliningDisabledTest', function () { let client; let map; - const createClient = (clusterId) => { - return Client.newHazelcastClient({ - clusterName: clusterId, + before(async function () { + this.timeout(32000); + cluster = await RC.createCluster(null, null); + await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ + clusterName: cluster.id, properties: { ['hazelcast.client.autopipelining.enabled']: false } }); - }; - - before(function () { - this.timeout(32000); - return RC.createCluster(null, null).then(c => { - cluster = c; - return RC.startMember(cluster.id); - }).then(_ => { - return createClient(cluster.id); - }).then(c => { - client = c; - }); }); - beforeEach(function () { - return client.getMap('test').then(m => { - map = m; - }); + beforeEach(async function () { + map = await client.getMap('test'); }); - afterEach(function () { + afterEach(async function () { return map.destroy(); }); - after(function () { + after(async function () { client.shutdown(); return RC.terminateCluster(cluster.id); }); - it('basic map operations work fine', function () { - return map.set('foo', 'bar') - .then(() => map.get('foo')) - .then(v => { - return expect(v).to.equal('bar'); - }); + it('basic map operations work fine', async function () { + await map.set('foo', 'bar'); + const value = await map.get('foo'); + expect(value).to.equal('bar'); }); - }); diff --git a/test/ClientHotRestartEventTest.js b/test/ClientHotRestartEventTest.js new file mode 100644 index 000000000..0585f2ae0 --- /dev/null +++ b/test/ClientHotRestartEventTest.js @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { expect } = require('chai'); +const RC = require('./RC'); +const { Client } = require('../.'); +const { + markEnterprise, + randomString, + CountingMembershipListener +} = require('./Util'); + +/** + * Verifies correct update of client member list in case when + * all members of a Hot Restart cluster were restarted. + * This test assumes cluster with a single member. + */ +describe('ClientHotRestartEventTest', function () { + + this.timeout(60000); + let client; + let cluster; + + const hotRestartDir = `/tmp/hot-restart-test-${randomString()}`; + + function createClusterConfig(port) { + return ` + + hot-restart-test + + ${port} + + + ${hotRestartDir} + + `; + } + + before(function () { + markEnterprise(this); + }); + + beforeEach(async function () { + cluster = await RC.createClusterKeepClusterName(null, createClusterConfig(5701)); + }); + + afterEach(async function () { + client.shutdown(); + return RC.terminateCluster(cluster.id); + }); + + it('should receive membership events when the member is restarted with another port and same uuid', async function () { + const member = await RC.startMember(cluster.id); + + client = await Client.newHazelcastClient({ + clusterName: cluster.id + }); + const listener = new CountingMembershipListener(1, 1); + client.getCluster().addMembershipListener(listener); + + await RC.shutdownCluster(cluster.id); + // now stop cluster, restart it with the same name and then start member with port 5702 + cluster = await RC.createClusterKeepClusterName(null, createClusterConfig(5702)); + await RC.startMember(cluster.id); + + await listener.expectedPromise; + + expect(client.getCluster().getMembers().length).to.be.equal(1); + expect(client.getCluster().getMembers()[0].uuid.toString()).to.be.equal(member.uuid); + }); +}); diff --git a/test/RC.js b/test/RC.js index 84e488327..377ccd527 100644 --- a/test/RC.js +++ b/test/RC.js @@ -29,6 +29,15 @@ function createCluster(hzVersion, config) { return deferred.promise; } +function createClusterKeepClusterName(hzVersion, config) { + const deferred = DeferredPromise(); + controller.createClusterKeepClusterName(hzVersion, config, function (err, cluster) { + if (err) return deferred.reject(err); + return deferred.resolve(cluster); + }); + return deferred.promise; +} + function startMember(clusterId) { const deferred = DeferredPromise(); controller.startMember(clusterId, function (err, member) { @@ -95,6 +104,7 @@ function executeOnController(clusterId, script, lang) { exports.exit = exit; exports.createCluster = createCluster; +exports.createClusterKeepClusterName = createClusterKeepClusterName; exports.startMember = startMember; exports.shutdownMember = shutdownMember; exports.shutdownCluster = shutdownCluster; diff --git a/test/Util.js b/test/Util.js index 0a46f0a13..78ebf0bf4 100644 --- a/test/Util.js +++ b/test/Util.js @@ -19,7 +19,7 @@ const expect = require('chai').expect; const BuildInfo = require('../lib/BuildInfo').BuildInfo; const UuidUtil = require('../lib/util/UuidUtil').UuidUtil; -const promiseLater = function (time, func) { +exports.promiseLater = function (time, func) { if (func === undefined) { func = () => {}; } @@ -30,6 +30,14 @@ const promiseLater = function (time, func) { }); }; +exports.promiseWaitMilliseconds = function (milliseconds) { + return new Promise(function (resolve) { + setTimeout(function () { + resolve(); + }, milliseconds); + }); +}; + const expectAlmostEqual = function (actual, expected) { if (expected === null) { return expect(actual).to.equal(expected); @@ -52,15 +60,16 @@ const expectAlmostEqual = function (actual, expected) { } return expect(actual).to.equal(expected); }; +exports.expectAlmostEqual = expectAlmostEqual; exports.fillMap = function (map, size, keyPrefix, valuePrefix) { - if (size == void 0) { + if (size === undefined) { size = 10; } - if (keyPrefix == void 0) { + if (keyPrefix === undefined) { keyPrefix = 'key'; } - if (valuePrefix == void 0) { + if (valuePrefix === undefined) { valuePrefix = 'val'; } const entries = []; @@ -94,21 +103,46 @@ exports.markServerVersionAtLeast = function (_this, client, expectedVersion) { } }; -exports.promiseWaitMilliseconds = function (milliseconds) { - return new Promise(function (resolve, reject) { - setTimeout(function () { - resolve(); - }, milliseconds); - }); -}; - exports.getRandomInt = function (lowerLim, upperLim) { return Math.floor(Math.random() * (upperLim - lowerLim)) + lowerLim; }; -exports.promiseLater = promiseLater; -exports.expectAlmostEqual = expectAlmostEqual; - exports.randomString = function () { return UuidUtil.generate().toString(); }; + +class CountingMembershipListener { + + constructor(expectedAdds, expectedRemoves) { + this.adds = 0; + this.expectedAdds = expectedAdds; + this.removes = 0; + this.expectedRemoves = expectedRemoves; + this.expectedPromise = new Promise((resolve) => { + this._resolve = resolve; + }); + } + + memberAdded() { + this.adds++; + this.checkCounts(); + } + + memberRemoved() { + this.removes++; + this.checkCounts(); + } + + checkCounts() { + if (this.adds < this.expectedAdds) { + return; + } + if (this.removes < this.expectedRemoves) { + return; + } + this._resolve(); + } + +} + +exports.CountingMembershipListener = CountingMembershipListener; diff --git a/test/remote_controller/Controller.js b/test/remote_controller/Controller.js index 9bc52ee32..e2aadb130 100644 --- a/test/remote_controller/Controller.js +++ b/test/remote_controller/Controller.js @@ -50,6 +50,10 @@ HzRemoteController.prototype.createCluster = function(hzVersion, xmlConfig, call return this.client.createCluster(hzVersion, xmlConfig, callback); }; +HzRemoteController.prototype.createClusterKeepClusterName = function(hzVersion, xmlConfig, callback) { + return this.client.createClusterKeepClusterName(hzVersion, xmlConfig, callback); +}; + HzRemoteController.prototype.startMember = function(clusterId, callback) { return this.client.startMember(clusterId, callback); }; diff --git a/test/remote_controller/RemoteController.js b/test/remote_controller/RemoteController.js index 9bc7d340f..0480cb4de 100644 --- a/test/remote_controller/RemoteController.js +++ b/test/remote_controller/RemoteController.js @@ -24,6 +24,8 @@ var thrift = require('thrift'); var Thrift = thrift.Thrift; var Q = thrift.Q; +var Int64 = require('node-int64'); + var ttypes = require('./remote-controller_types'); //HELPER FUNCTIONS AND STRUCTURES @@ -385,6 +387,138 @@ RemoteController_createCluster_result.prototype.write = function(output) { return; }; +var RemoteController_createClusterKeepClusterName_args = function(args) { + this.hzVersion = null; + this.xmlconfig = null; + if (args) { + if (args.hzVersion !== undefined && args.hzVersion !== null) { + this.hzVersion = args.hzVersion; + } + if (args.xmlconfig !== undefined && args.xmlconfig !== null) { + this.xmlconfig = args.xmlconfig; + } + } +}; +RemoteController_createClusterKeepClusterName_args.prototype = {}; +RemoteController_createClusterKeepClusterName_args.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == Thrift.Type.STRING) { + this.hzVersion = input.readString(); + } else { + input.skip(ftype); + } + break; + case 2: + if (ftype == Thrift.Type.STRING) { + this.xmlconfig = input.readString(); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_createClusterKeepClusterName_args.prototype.write = function(output) { + output.writeStructBegin('RemoteController_createClusterKeepClusterName_args'); + if (this.hzVersion !== null && this.hzVersion !== undefined) { + output.writeFieldBegin('hzVersion', Thrift.Type.STRING, 1); + output.writeString(this.hzVersion); + output.writeFieldEnd(); + } + if (this.xmlconfig !== null && this.xmlconfig !== undefined) { + output.writeFieldBegin('xmlconfig', Thrift.Type.STRING, 2); + output.writeString(this.xmlconfig); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + +var RemoteController_createClusterKeepClusterName_result = function(args) { + this.success = null; + this.serverException = null; + if (args instanceof ttypes.ServerException) { + this.serverException = args; + return; + } + if (args) { + if (args.success !== undefined && args.success !== null) { + this.success = new ttypes.Cluster(args.success); + } + if (args.serverException !== undefined && args.serverException !== null) { + this.serverException = args.serverException; + } + } +}; +RemoteController_createClusterKeepClusterName_result.prototype = {}; +RemoteController_createClusterKeepClusterName_result.prototype.read = function(input) { + input.readStructBegin(); + while (true) { + var ret = input.readFieldBegin(); + var ftype = ret.ftype; + var fid = ret.fid; + if (ftype == Thrift.Type.STOP) { + break; + } + switch (fid) { + case 0: + if (ftype == Thrift.Type.STRUCT) { + this.success = new ttypes.Cluster(); + this.success.read(input); + } else { + input.skip(ftype); + } + break; + case 1: + if (ftype == Thrift.Type.STRUCT) { + this.serverException = new ttypes.ServerException(); + this.serverException.read(input); + } else { + input.skip(ftype); + } + break; + default: + input.skip(ftype); + } + input.readFieldEnd(); + } + input.readStructEnd(); + return; +}; + +RemoteController_createClusterKeepClusterName_result.prototype.write = function(output) { + output.writeStructBegin('RemoteController_createClusterKeepClusterName_result'); + if (this.success !== null && this.success !== undefined) { + output.writeFieldBegin('success', Thrift.Type.STRUCT, 0); + this.success.write(output); + output.writeFieldEnd(); + } + if (this.serverException !== null && this.serverException !== undefined) { + output.writeFieldBegin('serverException', Thrift.Type.STRUCT, 1); + this.serverException.write(output); + output.writeFieldEnd(); + } + output.writeFieldStop(); + output.writeStructEnd(); + return; +}; + var RemoteController_startMember_args = function(args) { this.clusterId = null; if (args) { @@ -1742,6 +1876,69 @@ RemoteControllerClient.prototype.recv_createCluster = function(input,mtype,rseqi return callback('createCluster failed: unknown result'); }; +RemoteControllerClient.prototype.createClusterKeepClusterName = function(hzVersion, xmlconfig, callback) { + this._seqid = this.new_seqid(); + if (callback === undefined) { + var _defer = Q.defer(); + this._reqs[this.seqid()] = function(error, result) { + if (error) { + _defer.reject(error); + } else { + _defer.resolve(result); + } + }; + this.send_createClusterKeepClusterName(hzVersion, xmlconfig); + return _defer.promise; + } else { + this._reqs[this.seqid()] = callback; + this.send_createClusterKeepClusterName(hzVersion, xmlconfig); + } +}; + +RemoteControllerClient.prototype.send_createClusterKeepClusterName = function(hzVersion, xmlconfig) { + var output = new this.pClass(this.output); + var params = { + hzVersion: hzVersion, + xmlconfig: xmlconfig + }; + var args = new RemoteController_createClusterKeepClusterName_args(params); + try { + output.writeMessageBegin('createClusterKeepClusterName', Thrift.MessageType.CALL, this.seqid()); + args.write(output); + output.writeMessageEnd(); + return this.output.flush(); + } + catch (e) { + delete this._reqs[this.seqid()]; + if (typeof output.reset === 'function') { + output.reset(); + } + throw e; + } +}; + +RemoteControllerClient.prototype.recv_createClusterKeepClusterName = function(input,mtype,rseqid) { + var callback = this._reqs[rseqid] || function() {}; + delete this._reqs[rseqid]; + if (mtype == Thrift.MessageType.EXCEPTION) { + var x = new Thrift.TApplicationException(); + x.read(input); + input.readMessageEnd(); + return callback(x); + } + var result = new RemoteController_createClusterKeepClusterName_result(); + result.read(input); + input.readMessageEnd(); + + if (null !== result.serverException) { + return callback(result.serverException); + } + if (null !== result.success) { + return callback(null, result.success); + } + return callback('createClusterKeepClusterName failed: unknown result'); +}; + RemoteControllerClient.prototype.startMember = function(clusterId, callback) { this._seqid = this.new_seqid(); if (callback === undefined) { @@ -2509,6 +2706,49 @@ RemoteControllerProcessor.prototype.process_createCluster = function(seqid, inpu }); } }; +RemoteControllerProcessor.prototype.process_createClusterKeepClusterName = function(seqid, input, output) { + var args = new RemoteController_createClusterKeepClusterName_args(); + args.read(input); + input.readMessageEnd(); + if (this._handler.createClusterKeepClusterName.length === 2) { + Q.fcall(this._handler.createClusterKeepClusterName.bind(this._handler), + args.hzVersion, + args.xmlconfig + ).then(function(result) { + var result_obj = new RemoteController_createClusterKeepClusterName_result({success: result}); + output.writeMessageBegin("createClusterKeepClusterName", Thrift.MessageType.REPLY, seqid); + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }).catch(function (err) { + var result; + if (err instanceof ttypes.ServerException) { + result = new RemoteController_createClusterKeepClusterName_result(err); + output.writeMessageBegin("createClusterKeepClusterName", Thrift.MessageType.REPLY, seqid); + } else { + result = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("createClusterKeepClusterName", Thrift.MessageType.EXCEPTION, seqid); + } + result.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } else { + this._handler.createClusterKeepClusterName(args.hzVersion, args.xmlconfig, function (err, result) { + var result_obj; + if ((err === null || typeof err === 'undefined') || err instanceof ttypes.ServerException) { + result_obj = new RemoteController_createClusterKeepClusterName_result((err !== null || typeof err === 'undefined') ? err : {success: result}); + output.writeMessageBegin("createClusterKeepClusterName", Thrift.MessageType.REPLY, seqid); + } else { + result_obj = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN, err.message); + output.writeMessageBegin("createClusterKeepClusterName", Thrift.MessageType.EXCEPTION, seqid); + } + result_obj.write(output); + output.writeMessageEnd(); + output.flush(); + }); + } +}; RemoteControllerProcessor.prototype.process_startMember = function(seqid, input, output) { var args = new RemoteController_startMember_args(); args.read(input); diff --git a/test/remote_controller/remote-controller_types.js b/test/remote_controller/remote-controller_types.js index 94024b2c1..1983f9efd 100644 --- a/test/remote_controller/remote-controller_types.js +++ b/test/remote_controller/remote-controller_types.js @@ -24,6 +24,8 @@ var thrift = require('thrift'); var Thrift = thrift.Thrift; var Q = thrift.Q; +var Int64 = require('node-int64'); + var ttypes = module.exports = {}; ttypes.Lang = { From 62511a61d25d60c7cc35b6038cc8f90bbeb5baeb Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:25:02 +0300 Subject: [PATCH 285/685] Add drain event handling into PipelinedWriter (#584) --- src/network/ClientConnection.ts | 17 +++++-- test/connection/PipelinedWriterTest.js | 65 +++++++++++++++++++------- 2 files changed, 61 insertions(+), 21 deletions(-) diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index d2219b0cc..da8fa462f 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -48,6 +48,7 @@ export class PipelinedWriter extends EventEmitter { private queue: OutputQueueItem[] = []; private error: Error; private scheduled = false; + private canWrite = true; // coalescing threshold in bytes private readonly threshold: number; @@ -55,6 +56,12 @@ export class PipelinedWriter extends EventEmitter { super(); this.socket = socket; this.threshold = threshold; + + // write queued items on drain event + socket.on('drain', () => { + this.canWrite = true; + this.schedule(); + }); } write(buffer: Buffer, resolver: Promise.Resolver): void { @@ -67,7 +74,7 @@ export class PipelinedWriter extends EventEmitter { } private schedule(): void { - if (!this.scheduled) { + if (!this.scheduled && this.canWrite) { this.scheduled = true; // nextTick allows queue to be processed on the current event loop phase process.nextTick(() => this.process()); @@ -98,7 +105,7 @@ export class PipelinedWriter extends EventEmitter { // coalesce buffers and write to the socket: no further writes until flushed const merged = buffers.length === 1 ? buffers[0] : Buffer.concat(buffers, totalLength); - this.socket.write(merged as any, (err: Error) => { + this.canWrite = this.socket.write(merged as any, (err: Error) => { if (err) { this.handleError(err, resolvers); return; @@ -108,12 +115,12 @@ export class PipelinedWriter extends EventEmitter { for (const r of resolvers) { r.resolve(); } - if (this.queue.length === 0) { - // will start running on the next message + if (this.queue.length === 0 || !this.canWrite) { + // will start running on the next message or drain event this.scheduled = false; return; } - // setImmediate allows IO between writes + // setImmediate allows I/O between writes setImmediate(() => this.process()); }); } diff --git a/test/connection/PipelinedWriterTest.js b/test/connection/PipelinedWriterTest.js index fe5b70f98..3c5f115e5 100644 --- a/test/connection/PipelinedWriterTest.js +++ b/test/connection/PipelinedWriterTest.js @@ -25,51 +25,54 @@ const { DeferredPromise } = require('../../lib/util/Util'); const { PipelinedWriter } = require('../../lib/network/ClientConnection'); describe('PipelinedWriterTest', function () { + let writer; let mockSocket; - const setUpWriteSuccess = () => { + function setUpWriteSuccess(canWrite) { mockSocket = new Socket({}); sinon.stub(mockSocket, 'write').callsFake((data, cb) => { - cb(); - mockSocket.emit('data', data); + process.nextTick(cb); + process.nextTick(() => mockSocket.emit('data', data)); + return canWrite; }); writer = new PipelinedWriter(mockSocket, 8192); } - const setUpWriteFailure = (err) => { + function setUpWriteFailure(err) { mockSocket = new Socket({}); sinon.stub(mockSocket, 'write').callsFake((_, cb) => { - cb(err); + process.nextTick(() => cb(err)); + return false; }); writer = new PipelinedWriter(mockSocket, 8192); } it('writes single message into socket (without copying it)', (done) => { - setUpWriteSuccess(); + setUpWriteSuccess(true); const buffer = Buffer.from('test'); writer.write(buffer, DeferredPromise()); - mockSocket.on('data', function(data) { + mockSocket.on('data', (data) => { expect(data).to.be.equal(buffer); done(); }); }); it('writes multiple messages as one into socket', (done) => { - setUpWriteSuccess(); + setUpWriteSuccess(true); writer.write(Buffer.from('1'), DeferredPromise()); writer.write(Buffer.from('2'), DeferredPromise()); writer.write(Buffer.from('3'), DeferredPromise()); - mockSocket.on('data', function(data) { + mockSocket.on('data', (data) => { expect(data).to.be.deep.equal(Buffer.from('123')); done(); }); }); it('coalesces buffers when writing into socket', (done) => { - setUpWriteSuccess(); + setUpWriteSuccess(true); const size = 4200; const resolver1 = DeferredPromise(); @@ -81,7 +84,7 @@ describe('PipelinedWriterTest', function () { let cnt = 0; let allData = Buffer.alloc(0); - mockSocket.on('data', function(data) { + mockSocket.on('data', (data) => { allData = Buffer.concat([allData, data]); cnt += 1; if (cnt === 1) { @@ -104,7 +107,7 @@ describe('PipelinedWriterTest', function () { }); it('allows I/O in between coalesced writes into socket', (done) => { - setUpWriteSuccess(); + setUpWriteSuccess(true); const size = 9000; writer.write(Buffer.alloc(size), DeferredPromise()); @@ -117,7 +120,7 @@ describe('PipelinedWriterTest', function () { done(new Error()); } }); - mockSocket.on('data', function(data) { + mockSocket.on('data', () => { if (++cnt === 2) { done(); } @@ -125,7 +128,7 @@ describe('PipelinedWriterTest', function () { }); it('resolves single promise on write success', (done) => { - setUpWriteSuccess(); + setUpWriteSuccess(true); const resolver = DeferredPromise(); writer.write(Buffer.from('test'), resolver); @@ -133,7 +136,7 @@ describe('PipelinedWriterTest', function () { }); it('resolves multiple promises on write success', (done) => { - setUpWriteSuccess(); + setUpWriteSuccess(true); const resolver1 = DeferredPromise(); writer.write(Buffer.from('test'), resolver1); @@ -172,7 +175,7 @@ describe('PipelinedWriterTest', function () { }); it('emits write event on write success', (done) => { - setUpWriteSuccess(); + setUpWriteSuccess(true); writer.on('write', done); writer.write(Buffer.from('test'), DeferredPromise()); @@ -189,4 +192,34 @@ describe('PipelinedWriterTest', function () { }); }); + it('waits for drain event when necessary', (done) => { + setUpWriteSuccess(false); + + const buffer = Buffer.from('test'); + writer.write(buffer, DeferredPromise()); + let writes = 0; + mockSocket.on('data', () => { + if (++writes === 1) { + writer.write(buffer, DeferredPromise()); + setTimeout(done, 10); + } else { + done(new Error('Unexpected write before drain event')); + } + }); + }); + + it('writes queued items on drain event', (done) => { + setUpWriteSuccess(false); + + const buffer = Buffer.from('test'); + writer.write(buffer, DeferredPromise()); + let writes = 0; + mockSocket.on('data', () => { + if (++writes === 10) { + return done(); + } + mockSocket.emit('drain'); + writer.write(buffer, DeferredPromise()); + }); + }); }); From cf94d7021ca14a6598ef063504b7e1428b510267 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:30:44 +0300 Subject: [PATCH 286/685] [CP Subsystem] Add FencedLock support (#580) Also includes the following: * Introduce CPSubsystem component to keep the API consistent with Java client * Convert Client#shutdown into async method and updates tests accordingly * Include corresponding code samples and documentation * Migrate some tests to async/await syntax * Convert benchmark runners code base to use async/await syntax and process.hrtime * Improve tsdoc and code style --- DOCUMENTATION.md | 73 ++++- README.md | 4 +- benchmark/MapGetRunner.js | 34 +- benchmark/MapPutRunner.js | 27 +- benchmark/MapRandomOpRunner.js | 27 +- benchmark/SimpleBenchmark.js | 7 +- code_samples/aggregation.js | 2 +- code_samples/atomic_long.js | 4 +- code_samples/client_statistics.js | 2 +- code_samples/custom_serializer.js | 2 +- code_samples/distributed_object_listener.js | 2 +- code_samples/flakeid_generator.js | 2 +- code_samples/global_serializer.js | 2 +- code_samples/hazelcast_cloud_discovery.js | 2 +- code_samples/hazelcast_json_value.js | 2 +- code_samples/identified_data_serializable.js | 2 +- code_samples/jaas_sample/admin_client.js | 2 +- code_samples/jaas_sample/reader_client.js | 2 +- code_samples/lifecycle_listener.js | 2 +- code_samples/list.js | 2 +- code_samples/lock.js | 46 +++ code_samples/logging.js | 2 +- code_samples/map.js | 2 +- code_samples/map_entry_listener.js | 2 +- code_samples/near_cache.js | 2 +- code_samples/org-website/AtomicLongSample.js | 4 +- .../org-website/CustomSerializerSample.js | 2 +- .../org-website/EntryProcessorSample.js | 2 +- .../org-website/GlobalSerializerSample.js | 2 +- .../IdentifiedDataSerializableSample.js | 2 +- code_samples/org-website/ListSample.js | 2 +- code_samples/org-website/LockSample.js | 40 +++ code_samples/org-website/MapSample.js | 2 +- code_samples/org-website/MultiMapSample.js | 2 +- .../org-website/PortableSerializableSample.js | 2 +- code_samples/org-website/QuerySample.js | 2 +- code_samples/org-website/QueueSample.js | 2 +- .../org-website/ReliableTopicSample.js | 2 +- .../org-website/ReplicatedMapSample.js | 2 +- code_samples/org-website/RingBufferSample.js | 2 +- code_samples/org-website/SetSample.js | 2 +- code_samples/paging_predicate.js | 2 +- code_samples/pn_counter.js | 2 +- code_samples/portable_multiversion_sample.js | 6 +- code_samples/querying_with_SQL.js | 2 +- code_samples/queue.js | 2 +- code_samples/set.js | 2 +- code_samples/ssl_authentication.js | 2 +- src/CPSubsystem.ts | 101 ++++++ src/HazelcastClient.ts | 85 ++--- src/LifecycleService.ts | 12 +- src/core/HazelcastError.ts | 63 ++++ src/core/Member.ts | 6 +- src/index.ts | 1 + src/network/ClientConnectionManager.ts | 2 +- src/protocol/ErrorFactory.ts | 27 ++ src/proxy/FencedLock.ts | 99 ++++++ src/proxy/ProxyManager.ts | 1 - src/proxy/cpsubsystem/AtomicLongProxy.ts | 18 +- src/proxy/cpsubsystem/BaseCPProxy.ts | 23 +- src/proxy/cpsubsystem/CPProxyManager.ts | 24 +- src/proxy/cpsubsystem/CPSessionAwareProxy.ts | 67 ++++ src/proxy/cpsubsystem/CPSessionManager.ts | 205 ++++++++++++ src/proxy/cpsubsystem/FencedLockProxy.ts | 247 +++++++++++++++ src/proxy/cpsubsystem/RaftGroupId.ts | 30 +- src/proxy/index.ts | 1 + src/util/Util.ts | 5 + test/AutoPipeliningDisabledTest.js | 2 +- test/ClientHotRestartEventTest.js | 2 +- test/ClientProxyTest.js | 48 ++- test/ClientReconnectTest.js | 4 +- test/ClusterServiceTest.js | 18 +- test/HazelcastClientTest.js | 4 +- test/LifecycleServiceTest.js | 102 +++--- test/ListenersOnReconnectTest.js | 149 ++++----- test/LoggingTest.js | 76 ++--- test/LostConnectionTest.js | 45 ++- test/MembershipListenerTest.js | 4 +- ...omicLongProxyTest.js => AtomicLongTest.js} | 32 +- test/cpsubsystem/FencedLockTest.js | 298 ++++++++++++++++++ .../flakeid/FlakeIdGeneratorOutOfRangeTest.js | 100 +++--- test/flakeid/FlakeIdGeneratorProxyTest.js | 4 +- .../HJVHazelcastJsonValueSerializerTest.js | 4 +- .../HJVJsonSerializerTest.js | 4 +- .../HazelcastJsonValueQueryTest.js | 4 +- test/heartbeat/HeartbeatFromClientTest.js | 5 +- test/heartbeat/HeartbeatFromServerTest.js | 6 +- test/integration/ClientBackupAcksTest.js | 11 +- test/integration/ConnectionStrategyTest.js | 180 ++++------- test/integration/DistributedObjectsTest.js | 14 +- .../InitialMembershipListenerTest.js | 36 +-- test/list/ListProxyTest.js | 4 +- test/map/MapAggregatorsDoubleTest.js | 4 +- test/map/MapAggregatorsIntTest.js | 4 +- test/map/MapAggregatorsLongTest.js | 4 +- test/map/MapEntryProcessorTest.js | 4 +- test/map/MapPartitionAwareTest.js | 5 +- test/map/MapPredicateTest.js | 4 +- test/map/MapProxyTest.js | 4 +- test/map/MapStoreTest.js | 4 +- test/map/NearCachedMapStressTest.js | 6 +- test/map/NearCachedMapTest.js | 6 +- test/multimap/MultiMapProxyListenersTest.js | 4 +- test/multimap/MultiMapProxyLockTest.js | 6 +- test/multimap/MultiMapProxyTest.js | 4 +- .../InvalidationMetadataDistortionTest.js | 4 +- test/nearcache/LostInvalidationsTest.js | 4 +- test/nearcache/MigratedDataTest.js | 2 +- .../NearCacheSimpleInvalidationTest.js | 6 +- test/nearcache/impl/RepairingTaskTest.js | 2 +- test/pncounter/PNCounterBasicTest.js | 4 +- test/pncounter/PNCounterConsistencyTest.js | 67 ++-- .../pncounter/PNCounterWithLiteMembersTest.js | 4 +- test/queue/QueueProxyTest.js | 4 +- test/replicatedmap/ReplicatedMapProxyTest.js | 4 +- test/rest_value/RestValueTest.js | 4 +- test/ringbuffer/RingbufferProxyTest.js | 4 +- .../DefaultSerializersLiveTest.js | 4 +- .../PortableSerializersLiveTest.js | 88 +++--- .../config/CustomSerializerConfigTest.js | 4 +- test/serialization/config/FactoriesTest.js | 2 +- test/set/SetProxyTest.js | 4 +- test/ssl/ClientSSLAuthenticationTest.js | 4 +- test/ssl/ClientSSLTest.js | 72 ++--- test/statistics/StatisticsTest.js | 12 +- test/topic/ReliableTopicTest.js | 6 +- .../proxy/cpsubsystem/CPSessionManagerTest.js | 283 +++++++++++++++++ .../proxy/cpsubsystem/FencedLockProxyTest.js | 271 ++++++++++++++++ 128 files changed, 2548 insertions(+), 889 deletions(-) create mode 100644 code_samples/lock.js create mode 100644 code_samples/org-website/LockSample.js create mode 100644 src/CPSubsystem.ts create mode 100644 src/proxy/FencedLock.ts create mode 100644 src/proxy/cpsubsystem/CPSessionAwareProxy.ts create mode 100644 src/proxy/cpsubsystem/CPSessionManager.ts create mode 100644 src/proxy/cpsubsystem/FencedLockProxy.ts rename test/cpsubsystem/{AtomicLongProxyTest.js => AtomicLongTest.js} (83%) create mode 100644 test/cpsubsystem/FencedLockTest.js create mode 100644 test/unit/proxy/cpsubsystem/CPSessionManagerTest.js create mode 100644 test/unit/proxy/cpsubsystem/FencedLockProxyTest.js diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index 98173b07a..e5605a738 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -62,7 +62,8 @@ * [7.4.10.1. Configuring Flake ID Generator](#74101-configuring-flake-id-generator) * [7.4.11. CP Subsystem](#7411-cp-subsystem) * [7.4.11.1. Using Atomic Long](#74111-using-atomic-long) - * [7.4.11.2. Using Lock and Semaphore](#74112-using-lock-and-semaphore) + * [7.4.11.2. Using Lock](#74112-using-lock) + * [7.4.11.3. Using Semaphore](#74113-using-semaphore) * [7.5. Distributed Events](#75-distributed-events) * [7.5.1. Listening for Cluster Events](#751-listening-for-cluster-events) * [7.5.1.1. Membership Listener](#7511-membership-listener) @@ -367,7 +368,7 @@ const { Client } = require('hazelcast-client'); // Print some information about this client console.log(client.getLocalEndpoint()); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } @@ -1149,7 +1150,7 @@ As the final step, if you are done with your client, you can shut it down as sho ```javascript ... -client.shutdown(); +await client.shutdown(); ``` ## 7.2. Node.js Client Operation Modes @@ -1460,9 +1461,11 @@ The following are the descriptions of configuration elements and attributes: Hazelcast IMDG 4.0 introduces CP concurrency primitives with respect to the [CAP principle](http://awoc.wolski.fi/dlib/big-data/Brewer_podc_keynote_2000.pdf), i.e., they always maintain [linearizability](https://aphyr.com/posts/313-strong-consistency-models) and prefer consistency to availability during network partitions and client or server failures. +All data structures within CP Subsystem are available through `client.getCPSubsystem()` component of the client. + Before using Atomic Long, Lock, and Semaphore, CP Subsystem has to be enabled on cluster-side. Refer to [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) documentation for more information. -> **NOTE: If you call the `DistributedObject.destroy()` method on a CP data structure, that data structure is terminated on the underlying CP group and cannot be reinitialized until the CP group is force-destroyed on the cluster side. For this reason, please make sure that you are completely done with a CP data structure before destroying its proxy.** +Data structures in CP Subsystem run in CP groups. Each CP group elects its own Raft leader and runs the Raft consensus algorithm independently. The CP data structures differ from the other Hazelcast data structures in two aspects. First, an internal commit is performed on the METADATA CP group every time you fetch a proxy from this interface. Hence, callers should cache returned proxy objects. Second, if you call `DistributedObject.destroy()` on a CP data structure proxy, that data structure is terminated on the underlying CP group and cannot be reinitialized until the CP group is force-destroyed. For this reason, please make sure that you are completely done with a CP data structure before destroying its proxy. #### 7.4.11.1. Using Atomic Long @@ -1472,7 +1475,7 @@ An Atomic Long usage example is shown below. ```javascript // Get an AtomicLong called 'my-atomic-long' -const atomicLong = await client.getAtomicLong('my-atomic-long'); +const atomicLong = await client.getCPSubsystem().getAtomicLong('my-atomic-long'); // Get current value (returns a Long) const value = await atomicLong.get(); console.log('Value:', value); @@ -1485,9 +1488,63 @@ console.log('CAS operation result:', result); `IAtomicLong` implementation does not offer exactly-once / effectively-once execution semantics. It goes with at-least-once execution semantics by default and can cause an API call to be committed multiple times in case of CP member failures. It can be tuned to offer at-most-once execution semantics. Please see [`fail-on-indeterminate-operation-state`](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#cp-subsystem-configuration) server-side setting. -#### 7.4.11.2. Using Lock and Semaphore +#### 7.4.11.2. Using Lock + +Hazelcast `FencedLock` is the distributed implementation of a linearizable and distributed lock. It offers multiple operations for acquiring the lock. This data structure is a part of CP Subsystem. + +A basic Lock usage example is shown below. + +```javascript +// Get a FencedLock called 'my-lock' +const lock = await client.getCPSubsystem().getLock('my-lock'); +// Acquire the lock (returns a fencing token of Long type) +const fence = await lock.lock(); +try { + // Your guarded code goes here +} finally { + // Make sure to release the lock + await lock.unlock(fence); +} +``` + +FencedLock works on top of CP sessions. It keeps a CP session open while the lock is acquired. Please refer to [CP Session](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#cp-sessions) documentation for more information. + +Distributed locks are unfortunately *not equivalent* to single-node mutexes because of the complexities in distributed systems, such as uncertain communication patterns, and independent and partial failures. In an asynchronous network, no lock service can guarantee mutual exclusion, because there is no way to distinguish between a slow and a crashed process. Consider the following scenario, where a Hazelcast client acquires a FencedLock, then hits a long GC pause. Since it will not be able to commit session heartbeats while paused, its CP session will be eventually closed. After this moment, another Hazelcast client can acquire this lock. If the first client wakes up again, it may not immediately notice that it has lost ownership of the lock. In this case, multiple clients think they hold the lock. If they attempt to perform an operation on a shared resource, they can break the system. To prevent such situations, you can choose to use an infinite session timeout, but this time probably you are going to deal with liveliness issues. For the scenario above, even if the first client actually crashes, requests sent by 2 clients can be re-ordered in the network and hit the external resource in reverse order. + +There is a simple solution for this problem. Lock holders are ordered by a monotonic fencing token, which increments each time the lock is assigned to a new owner. This fencing token can be passed to external services or resources to ensure sequential execution of side effects performed by lock holders. + +You can read more about the fencing token idea in Martin Kleppmann's "How to do distributed locking" blog post and Google's Chubby paper. + +FencedLocks in Hazelcast Node.js client are different from the Java implementation as they *non-reentrant*. Once a caller acquires the lock, it can not acquire the lock reentrantly in the same asynchronous call chain. So, the next acquire attempt made within the same async chain will lead to a dead lock. + +```javascript +const fence = await lock.lock(); +// The following Promise will never be resolved +// (i.e., it's a dead lock) +await lock.lock(); +``` + +Considering this, you should always call the `.lock()` method only once per async call chain and make sure to release the lock as early as possible. + +As an alternative approach, you can use the `.tryLock()` method of FencedLock. It tries to acquire the lock in optimistic manner and immediately returns with either a valid fencing token or `undefined`. It also accepts an optional `timeout` argument which specifies the timeout in milliseconds to acquire the lock before giving up. + +```javascript +// Try to acquire the lock +const fence = await lock.tryLock(); +// Check for valid fencing token +if (fence !== undefined) { + try { + // Your guarded code goes here + } finally { + // Make sure to release the lock + await lock.unlock(fence); + } +} +``` + +#### 7.4.11.3. Using Semaphore -These new implementations are accessed using the [CP Subsystem](https://docs.hazelcast.org/docs/latest/manual/html-single/#cp-subsystem) which cannot be used with the Node.js client yet. We plan to implement these data structures in the upcoming 4.0 release of Hazelcast Node.js client. In the meantime, since there is no way to access old non-CP primitives using IMDG 4.x, we removed their implementations, code samples and documentations. They will be back once we implement them. +This new implementation cannot be used with the Node.js client yet. We plan to implement this data structure in the upcoming 4.0 release of Hazelcast Node.js client. In the meantime, since there is no way to access the old non-CP Semaphore primitive using IMDG 4.x, we removed its implementation, code samples and documentation. It will be back once we implement them. ## 7.5. Distributed Events @@ -1590,7 +1647,7 @@ const cfg = { }; const client = await Client.newHazelcastClient(cfg); -client.shutdown(); +await client.shutdown(); ``` **Output:** diff --git a/README.md b/README.md index c420fb675..4d7521446 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ const value = await map.get('key'); console.log(value); // Outputs 'value' // Shutdown the client -client.shutdown(); +await client.shutdown(); ``` > **NOTE: For the sake of brevity we are going to omit boilerplate parts in the above code snippet. Refer to the [Code Samples section](#16-code-samples) to see samples with the complete code.** @@ -108,7 +108,7 @@ const client = await Client.newHazelcastClient({ }); console.log('Connected to cluster'); -client.shutdown(); +await client.shutdown(); ``` Refer to [the documentation](DOCUMENTATION.md) to learn more about supported configuration options. diff --git a/benchmark/MapGetRunner.js b/benchmark/MapGetRunner.js index 11e0c8c3f..e7154ff01 100644 --- a/benchmark/MapGetRunner.js +++ b/benchmark/MapGetRunner.js @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; -const REQ_COUNT = 100000; -const BATCH_SIZE = 100; - const Benchmark = require('./SimpleBenchmark'); const Client = require('../.').Client; +const REQ_COUNT = 100000; +const BATCH_SIZE = 100; + function randomString(len) { const charSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; let res = ''; @@ -35,20 +34,23 @@ function randomString(len) { const KEY = '00000000-0000-0000-0000-000000000000'; const VAL = randomString(100 * 1024); -Client.newHazelcastClient() - .then((client) => client.getMap('default')) - .then((map) => { - return map.set(KEY, VAL) - .then(() => map); - }) - .then((map) => { +(async () => { + try { + const client = await Client.newHazelcastClient(); + const map = await client.getMap('default'); + await map.set(KEY, VAL); + const benchmark = new Benchmark({ nextOp: () => map.get(KEY), totalOpsCount: REQ_COUNT, batchSize: BATCH_SIZE }); - return benchmark.run() - .then(() => map.destroy()) - .then(() => map.client.shutdown()); - }) - .then(() => console.log('Benchmark finished')); + await benchmark.run(); + console.log('Benchmark finished'); + + await map.destroy(); + await client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/benchmark/MapPutRunner.js b/benchmark/MapPutRunner.js index 5f1f65bb4..d93cdbb5e 100644 --- a/benchmark/MapPutRunner.js +++ b/benchmark/MapPutRunner.js @@ -13,25 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; +const Benchmark = require('./SimpleBenchmark'); +const Client = require('../.').Client; + const REQ_COUNT = 1000000; const BATCH_SIZE = 100; -const Benchmark = require('./SimpleBenchmark'); -const Client = require('../.').Client; +(async () => { + try { + const client = await Client.newHazelcastClient(); + const map = await client.getMap('default'); -Client.newHazelcastClient() - .then((client) => client.getMap('default')) - .then((map) => { const benchmark = new Benchmark({ nextOp: () => map.put('foo', 'bar'), totalOpsCount: REQ_COUNT, batchSize: BATCH_SIZE }); - return benchmark.run() - .then(() => map.destroy()) - .then(() => map.client.shutdown()); - }) - .then(() => console.log('Benchmark finished')); + await benchmark.run(); + console.log('Benchmark finished'); + + await map.destroy(); + await client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/benchmark/MapRandomOpRunner.js b/benchmark/MapRandomOpRunner.js index 33305da04..8cd307590 100644 --- a/benchmark/MapRandomOpRunner.js +++ b/benchmark/MapRandomOpRunner.js @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; +const Benchmark = require('./SimpleBenchmark'); +const Client = require('../.').Client; + const REQ_COUNT = 100000; const BATCH_SIZE = 100; @@ -40,19 +42,22 @@ function randomOp(map) { return map.remove(key); } -const Benchmark = require('./SimpleBenchmark'); -const Client = require('../.').Client; +(async () => { + try { + const client = await Client.newHazelcastClient(); + const map = await client.getMap('default'); -Client.newHazelcastClient() - .then((client) => client.getMap('default')) - .then((map) => { const benchmark = new Benchmark({ nextOp: () => randomOp(map), totalOpsCount: REQ_COUNT, batchSize: BATCH_SIZE }); - return benchmark.run() - .then(() => map.destroy()) - .then(() => map.client.shutdown()); - }) - .then(() => console.log('Benchmark finished')); + await benchmark.run(); + console.log('Benchmark finished'); + + await map.destroy(); + await client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/benchmark/SimpleBenchmark.js b/benchmark/SimpleBenchmark.js index 2a6f1ccc3..771b3e35f 100644 --- a/benchmark/SimpleBenchmark.js +++ b/benchmark/SimpleBenchmark.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; class Benchmark { @@ -39,11 +38,11 @@ class Benchmark { run() { // initial batch of ops (no-op promises) const batch = new Array(this.batchSize).fill(Promise.resolve()); - const start = new Date(); + const start = process.hrtime(); return Promise.all(batch.map(this.chainNext.bind(this))) .then(() => { - const finish = new Date(); - const tookSec = (finish - start) / 1000; + const time = process.hrtime(start); + const tookSec = time[0] + time[1] * 1e-9; console.log(`Took ${tookSec} seconds for ${this.opsCount} requests`); console.log(`Ops/s: ${this.opsCount / tookSec}`); }); diff --git a/code_samples/aggregation.js b/code_samples/aggregation.js index b81174579..2d2dff8ee 100644 --- a/code_samples/aggregation.js +++ b/code_samples/aggregation.js @@ -40,7 +40,7 @@ const { const avgAge = await map.aggregate(Aggregators.numberAvg()); console.log(`Average age is ${avgAge}`); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/atomic_long.js b/code_samples/atomic_long.js index b0dd6a883..ae27848a7 100644 --- a/code_samples/atomic_long.js +++ b/code_samples/atomic_long.js @@ -21,13 +21,13 @@ const { Client } = require('hazelcast-client'); try { const client = await Client.newHazelcastClient(); - const viewCounter = await client.getAtomicLong('views'); + const viewCounter = await client.getCPSubsystem().getAtomicLong('views'); const value = await viewCounter.get(); console.log('Value:', value); const newValue = await viewCounter.addAndGet(42); console.log('New value:', newValue); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/client_statistics.js b/code_samples/client_statistics.js index 5c3b7ad02..bce2ee6ab 100644 --- a/code_samples/client_statistics.js +++ b/code_samples/client_statistics.js @@ -42,7 +42,7 @@ const { Client } = require('hazelcast-client'); // collection time and keep client running. Then, you should see // the statistics in Hazelcast Management Center await new Promise((resolve) => setTimeout(resolve, 60000)); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/custom_serializer.js b/code_samples/custom_serializer.js index 6590974a1..3f8963962 100644 --- a/code_samples/custom_serializer.js +++ b/code_samples/custom_serializer.js @@ -74,7 +74,7 @@ const giveInformation = (timeofday) => { const deserialized = await map.get(1); giveInformation(deserialized); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/distributed_object_listener.js b/code_samples/distributed_object_listener.js index 99a368135..8ec302e3b 100644 --- a/code_samples/distributed_object_listener.js +++ b/code_samples/distributed_object_listener.js @@ -34,7 +34,7 @@ const { Client } = require('hazelcast-client'); await map.destroy(); await new Promise((resolve) => setTimeout(resolve, 1000)); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/flakeid_generator.js b/code_samples/flakeid_generator.js index d4b5309ce..6eedce7d6 100644 --- a/code_samples/flakeid_generator.js +++ b/code_samples/flakeid_generator.js @@ -25,7 +25,7 @@ const { Client } = require('hazelcast-client'); const id = await flakeIdGenerator.newId(); console.log('Generated id:', id.toString()); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/global_serializer.js b/code_samples/global_serializer.js index 665b467a2..3028ce295 100644 --- a/code_samples/global_serializer.js +++ b/code_samples/global_serializer.js @@ -56,7 +56,7 @@ selfReferringObject.self = selfReferringObject; console.log(obj.self); console.log(obj.self.self); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/hazelcast_cloud_discovery.js b/code_samples/hazelcast_cloud_discovery.js index df92d9ca5..bc0b12cc1 100644 --- a/code_samples/hazelcast_cloud_discovery.js +++ b/code_samples/hazelcast_cloud_discovery.js @@ -45,7 +45,7 @@ const path = require('path'); const value = await map.get('key'); console.log(value); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/hazelcast_json_value.js b/code_samples/hazelcast_json_value.js index b6cd659f2..590bb7b32 100644 --- a/code_samples/hazelcast_json_value.js +++ b/code_samples/hazelcast_json_value.js @@ -50,7 +50,7 @@ const { console.log(employee.toString()); } - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/identified_data_serializable.js b/code_samples/identified_data_serializable.js index 00f17dc34..db8a966d1 100644 --- a/code_samples/identified_data_serializable.js +++ b/code_samples/identified_data_serializable.js @@ -58,7 +58,7 @@ class Employee { employee = await map.get('key'); console.log('Employee object:', employee); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/jaas_sample/admin_client.js b/code_samples/jaas_sample/admin_client.js index 7efc74688..38818d2e9 100644 --- a/code_samples/jaas_sample/admin_client.js +++ b/code_samples/jaas_sample/admin_client.js @@ -40,7 +40,7 @@ const { usernamePasswordCredentialsFactory } = require('./user_pass_cred_factory value = await adminMap.get('anotherKey'); console.log('Value for the "anotherKey" is', value); - adminClient.shutdown(); + await adminClient.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/jaas_sample/reader_client.js b/code_samples/jaas_sample/reader_client.js index 93fa04b3b..1a78a961f 100644 --- a/code_samples/jaas_sample/reader_client.js +++ b/code_samples/jaas_sample/reader_client.js @@ -41,7 +41,7 @@ const { usernamePasswordCredentialsFactory } = require('./user_pass_cred_factory console.log('Reader cannot put to map. Reason:', err); } - readerClient.shutdown(); + await readerClient.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/lifecycle_listener.js b/code_samples/lifecycle_listener.js index 4c6b27814..525e8830f 100644 --- a/code_samples/lifecycle_listener.js +++ b/code_samples/lifecycle_listener.js @@ -27,7 +27,7 @@ const { Client } = require('hazelcast-client'); ] }); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/list.js b/code_samples/list.js index 68cb06886..027371f36 100644 --- a/code_samples/list.js +++ b/code_samples/list.js @@ -33,7 +33,7 @@ const { Client } = require('hazelcast-client'); const removedItem = await list.removeAt(1); console.log('Removed', removedItem); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/lock.js b/code_samples/lock.js new file mode 100644 index 000000000..3d230b593 --- /dev/null +++ b/code_samples/lock.js @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { Client } = require('hazelcast-client'); + +(async () => { + try { + const client = await Client.newHazelcastClient(); + + const lock = await client.getCPSubsystem().getLock('my-lock'); + let locked = await lock.isLocked(); + console.log('Locked initially:', locked); + + const fence = await lock.lock(); + console.log('Fence token:', fence); + try { + locked = await lock.isLocked(); + console.log('Locked after lock:', locked); + + // more guarded code goes here + } finally { + await lock.unlock(fence); + } + + locked = await lock.isLocked(); + console.log('Locked after unlock:', locked); + + await client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/logging.js b/code_samples/logging.js index 73338fe2f..797f26b42 100644 --- a/code_samples/logging.js +++ b/code_samples/logging.js @@ -63,7 +63,7 @@ const winstonAdapter = { customLogger: winstonAdapter }); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/map.js b/code_samples/map.js index 2e664c90d..38cd8e697 100644 --- a/code_samples/map.js +++ b/code_samples/map.js @@ -35,7 +35,7 @@ const { Client } = require('hazelcast-client'); disappearingValue = await map.get('disappearing-key'); console.log('Disappeared value:', disappearingValue); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/map_entry_listener.js b/code_samples/map_entry_listener.js index 5a25bfa8a..9c0c462c2 100644 --- a/code_samples/map_entry_listener.js +++ b/code_samples/map_entry_listener.js @@ -39,7 +39,7 @@ const { Client } = require('hazelcast-client'); await map.put(1, 'new-value'); await map.remove(1); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/near_cache.js b/code_samples/near_cache.js index f40edcd3f..22cd24f54 100644 --- a/code_samples/near_cache.js +++ b/code_samples/near_cache.js @@ -53,7 +53,7 @@ async function do50000Gets(client, mapName) { await do50000Gets(client, nearCachedMapName); await do50000Gets(client, regularMapName); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/AtomicLongSample.js b/code_samples/org-website/AtomicLongSample.js index 253b5193f..338e61574 100644 --- a/code_samples/org-website/AtomicLongSample.js +++ b/code_samples/org-website/AtomicLongSample.js @@ -24,12 +24,12 @@ const { Client } = require('hazelcast-client'); // Note: CP Subsystem has to be enabled on the cluster const hz = await Client.newHazelcastClient(); // Get the AtomicLong counter from Cluster - const counter = await hz.getAtomicLong('counter'); + const counter = await hz.getCPSubsystem().getAtomicLong('counter'); // Add and get the counter const value = await counter.addAndGet(3); console.log('Counter value is', value); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/CustomSerializerSample.js b/code_samples/org-website/CustomSerializerSample.js index d72299d56..1ff5f825d 100644 --- a/code_samples/org-website/CustomSerializerSample.js +++ b/code_samples/org-website/CustomSerializerSample.js @@ -58,7 +58,7 @@ class CustomSerializer { // CustomSerializer will serialize/deserialize CustomSerializable objects // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/EntryProcessorSample.js b/code_samples/org-website/EntryProcessorSample.js index ac27434a7..b291c116a 100644 --- a/code_samples/org-website/EntryProcessorSample.js +++ b/code_samples/org-website/EntryProcessorSample.js @@ -59,7 +59,7 @@ function entryProcessorDataSerializableFactory(classId) { const value = await map.get('key'); console.log(value); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/GlobalSerializerSample.js b/code_samples/org-website/GlobalSerializerSample.js index 4386cf66c..38c86a6cb 100644 --- a/code_samples/org-website/GlobalSerializerSample.js +++ b/code_samples/org-website/GlobalSerializerSample.js @@ -43,7 +43,7 @@ class GlobalSerializer { // GlobalSerializer will serialize/deserialize all non-builtin types // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/IdentifiedDataSerializableSample.js b/code_samples/org-website/IdentifiedDataSerializableSample.js index 2b2bf1e44..110c95a1e 100644 --- a/code_samples/org-website/IdentifiedDataSerializableSample.js +++ b/code_samples/org-website/IdentifiedDataSerializableSample.js @@ -57,7 +57,7 @@ function sampleDataSerializableFactory(classId) { // Employee can be used here // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/ListSample.js b/code_samples/org-website/ListSample.js index df1cac25b..55380742d 100644 --- a/code_samples/org-website/ListSample.js +++ b/code_samples/org-website/ListSample.js @@ -36,7 +36,7 @@ const { Client } = require('hazelcast-client'); // Clear the list await list.clear(); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/LockSample.js b/code_samples/org-website/LockSample.js new file mode 100644 index 000000000..a910289ff --- /dev/null +++ b/code_samples/org-website/LockSample.js @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get the Distributed Lock from CP Subsystem + const lock = await hz.getCPSubsystem().getLock('my-distributed-lock'); + // Now acquire the lock and execute some guarded code + const fence = await lock.lock(); + console.log('Fence token:', fence); + try { + // Guarded code goes here + } finally { + await lock.unlock(fence); + } + // Shutdown this Hazelcast client + await hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/org-website/MapSample.js b/code_samples/org-website/MapSample.js index 709510c88..df6a31c32 100644 --- a/code_samples/org-website/MapSample.js +++ b/code_samples/org-website/MapSample.js @@ -31,7 +31,7 @@ const { Client } = require('hazelcast-client'); await map.putIfAbsent('somekey', 'somevalue'); await map.replace('key', 'value', 'newvalue'); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/MultiMapSample.js b/code_samples/org-website/MultiMapSample.js index 86cb74303..47539d84f 100644 --- a/code_samples/org-website/MultiMapSample.js +++ b/code_samples/org-website/MultiMapSample.js @@ -36,7 +36,7 @@ const { Client } = require('hazelcast-client'); // remove specific key/value pair await multiMap.remove('my-key', 'value2'); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/PortableSerializableSample.js b/code_samples/org-website/PortableSerializableSample.js index 1442c832e..ea826c5b1 100644 --- a/code_samples/org-website/PortableSerializableSample.js +++ b/code_samples/org-website/PortableSerializableSample.js @@ -61,7 +61,7 @@ function portableFactory(classId) { // Customer can be used here // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/QuerySample.js b/code_samples/org-website/QuerySample.js index 72b10ccf9..3d5c0b12c 100644 --- a/code_samples/org-website/QuerySample.js +++ b/code_samples/org-website/QuerySample.js @@ -83,7 +83,7 @@ async function generateUsers(usersMap) { console.log(result1.toArray()); console.log(result2.toArray()); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/QueueSample.js b/code_samples/org-website/QueueSample.js index f8eb163cf..cd2b0519e 100644 --- a/code_samples/org-website/QueueSample.js +++ b/code_samples/org-website/QueueSample.js @@ -36,7 +36,7 @@ const { Client } = require('hazelcast-client'); const item = await await queue.take(); console.log(item); // Shutdown this Hazelcast Client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/ReliableTopicSample.js b/code_samples/org-website/ReliableTopicSample.js index 9745fa605..0f843b759 100644 --- a/code_samples/org-website/ReliableTopicSample.js +++ b/code_samples/org-website/ReliableTopicSample.js @@ -31,7 +31,7 @@ const { Client } = require('hazelcast-client'); // Publish a message to the Topic await topic.publish('Hello to distributed world'); // Shutdown this Hazelcast Client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/ReplicatedMapSample.js b/code_samples/org-website/ReplicatedMapSample.js index 97197b998..15c4fcde1 100644 --- a/code_samples/org-website/ReplicatedMapSample.js +++ b/code_samples/org-website/ReplicatedMapSample.js @@ -33,7 +33,7 @@ const { Client } = require('hazelcast-client'); // The value is retrieved from a random member in the cluster console.log('Value for key:', value); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/RingBufferSample.js b/code_samples/org-website/RingBufferSample.js index 4eab660e5..0c1eec95b 100644 --- a/code_samples/org-website/RingBufferSample.js +++ b/code_samples/org-website/RingBufferSample.js @@ -34,7 +34,7 @@ const { Client } = require('hazelcast-client'); value = await rb.readOne(sequence.add(1)); console.log('Next value:', value); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/org-website/SetSample.js b/code_samples/org-website/SetSample.js index 292267bbe..07d0a694d 100644 --- a/code_samples/org-website/SetSample.js +++ b/code_samples/org-website/SetSample.js @@ -35,7 +35,7 @@ const { Client } = require('hazelcast-client'); const items = await set.toArray(); console.log(items); // Shutdown this Hazelcast client - hz.shutdown(); + await hz.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/paging_predicate.js b/code_samples/paging_predicate.js index cd7c56af1..c4c712801 100644 --- a/code_samples/paging_predicate.js +++ b/code_samples/paging_predicate.js @@ -90,7 +90,7 @@ class Comparator { values = await map.valuesWithPredicate(predicate); console.log('Page 3:', values); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/pn_counter.js b/code_samples/pn_counter.js index f40bd4f97..bfad91cfc 100644 --- a/code_samples/pn_counter.js +++ b/code_samples/pn_counter.js @@ -27,7 +27,7 @@ const { Client } = require('hazelcast-client'); value = await pnCounter.decrementAndGet(); console.log('Decremented counter. Current value is', value.toNumber()); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/portable_multiversion_sample.js b/code_samples/portable_multiversion_sample.js index 873349396..b24026a75 100644 --- a/code_samples/portable_multiversion_sample.js +++ b/code_samples/portable_multiversion_sample.js @@ -212,9 +212,9 @@ function portableFactory3(classId) { console.log('Failed due to:', err.message); } - client.shutdown(); - client2.shutdown(); - client3.shutdown(); + await client.shutdown(); + await client2.shutdown(); + await client3.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/querying_with_SQL.js b/code_samples/querying_with_SQL.js index e9ce2127d..e07e25905 100644 --- a/code_samples/querying_with_SQL.js +++ b/code_samples/querying_with_SQL.js @@ -49,7 +49,7 @@ class Customer { console.log(person); } - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/queue.js b/code_samples/queue.js index 05185e463..f1a27e5b6 100644 --- a/code_samples/queue.js +++ b/code_samples/queue.js @@ -32,7 +32,7 @@ const { Client } = require('hazelcast-client'); item = await queue.poll(); console.log(`Retrieved item: ${item}`); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/set.js b/code_samples/set.js index fedab9fd3..443a9ed2b 100644 --- a/code_samples/set.js +++ b/code_samples/set.js @@ -33,7 +33,7 @@ const { Client } = require('hazelcast-client'); const size = await set.size(); console.log('Set size:', size); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/code_samples/ssl_authentication.js b/code_samples/ssl_authentication.js index 65058f8cb..aed65ecae 100644 --- a/code_samples/ssl_authentication.js +++ b/code_samples/ssl_authentication.js @@ -28,7 +28,7 @@ const { Client } = require('hazelcast-client'); }); console.log('The client is authenticated using SSL'); - client.shutdown(); + await client.shutdown(); } catch (err) { console.error('Error occurred:', err); } diff --git a/src/CPSubsystem.ts b/src/CPSubsystem.ts new file mode 100644 index 000000000..c20443230 --- /dev/null +++ b/src/CPSubsystem.ts @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Promise from 'bluebird'; +import {IAtomicLong, FencedLock} from './proxy'; +import {CPProxyManager} from './proxy/cpsubsystem/CPProxyManager'; +import {CPSessionManager} from './proxy/cpsubsystem/CPSessionManager'; +import {HazelcastClient} from './HazelcastClient'; + +/** + * CP Subsystem is a component of Hazelcast that builds a strongly consistent + * layer for a set of distributed data structures. Its APIs can be used for + * implementing distributed coordination use cases, such as leader election, + * distributed locking, synchronization, and metadata management. + * + * Its data structures are CP with respect to the CAP principle, i.e., they + * always maintain linearizability and prefer consistency over availability + * during network partitions. Besides network partitions, CP Subsystem + * withstands server and client failures. + * + * Data structures in CP Subsystem run in CP groups. Each CP group elects + * its own Raft leader and runs the Raft consensus algorithm independently. + * + * The CP data structures differ from the other Hazelcast data structures + * in two aspects. First, an internal commit is performed on the METADATA CP + * group every time you fetch a proxy from this interface. Hence, callers + * should cache returned proxy objects. Second, if you call + * `DistributedObject.destroy()` on a CP data structure proxy, that data + * structure is terminated on the underlying CP group and cannot be + * reinitialized until the CP group is force-destroyed. For this + * reason, please make sure that you are completely done with a CP data + * structure before destroying its proxy. + */ +export interface CPSubsystem { + + /** + * Returns the distributed AtomicLong instance with given name. + * The instance is created on CP Subsystem. + * + * If no group name is given within the `name` argument, then the + * AtomicLong instance will be created on the DEFAULT CP group. + * If a group name is given, like `.getAtomicLong('myLong@group1')`, + * the given group will be initialized first, if not initialized + * already, and then the instance will be created on this group. + */ + getAtomicLong(name: string): Promise; + + /** + * Returns the distributed FencedLock instance instance with given name. + * The instance is created on CP Subsystem. + * + * If no group name is given within the `name` argument, then the + * FencedLock instance will be created on the DEFAULT CP group. + * If a group name is given, like `.getLong('myLock@group1')`, + * the given group will be initialized first, if not initialized + * already, and then the instance will be created on this group. + */ + getLock(name: string): Promise; + +} + +/** @internal */ +export class CPSubsystemImpl implements CPSubsystem { + + private readonly cpProxyManager: CPProxyManager; + private readonly cpSessionManager: CPSessionManager; + + constructor(client: HazelcastClient) { + this.cpProxyManager = new CPProxyManager(client); + this.cpSessionManager = new CPSessionManager(client); + } + + getAtomicLong(name: string): Promise { + return this.cpProxyManager.getOrCreateProxy(name, CPProxyManager.ATOMIC_LONG_SERVICE) as Promise; + } + + getLock(name: string): Promise { + return this.cpProxyManager.getOrCreateProxy(name, CPProxyManager.LOCK_SERVICE) as Promise; + } + + getCPSessionManager(): CPSessionManager { + return this.cpSessionManager; + } + + shutdown(): Promise { + return this.cpSessionManager.shutdown(); + } +} diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index 0bb8996da..e28909105 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -45,11 +45,10 @@ import { MultiMap, ReplicatedMap, Ringbuffer, - PNCounter, - IAtomicLong + PNCounter } from './proxy'; import {ProxyManager, NAMESPACE_SEPARATOR} from './proxy/ProxyManager'; -import {CPProxyManager} from './proxy/cpsubsystem/CPProxyManager'; +import {CPSubsystem, CPSubsystemImpl} from './CPSubsystem'; import {LockReferenceIdGenerator} from './proxy/LockReferenceIdGenerator'; import {SerializationService, SerializationServiceV1} from './serialization/SerializationService'; import {AddressProvider} from './connection/AddressProvider'; @@ -101,7 +100,7 @@ export class HazelcastClient { /** @internal */ private readonly proxyManager: ProxyManager; /** @internal */ - private readonly cpProxyManager: CPProxyManager; + private readonly cpSubsystem: CPSubsystemImpl; /** @internal */ private readonly nearCacheManager: NearCacheManager; /** @internal */ @@ -133,8 +132,8 @@ export class HazelcastClient { this.addressProvider = this.createAddressProvider(); this.connectionManager = new ClientConnectionManager(this); this.invocationService = new InvocationService(this); - this.cpProxyManager = new CPProxyManager(this); this.proxyManager = new ProxyManager(this); + this.cpSubsystem = new CPSubsystemImpl(this); this.clusterService = new ClusterService(this); this.lifecycleService = new LifecycleServiceImpl(this); this.lockReferenceIdGenerator = new LockReferenceIdGenerator(); @@ -145,7 +144,7 @@ export class HazelcastClient { /** * Creates a new client object and automatically connects to cluster. - * @param config Default {@link ClientConfig} is used when this parameter is absent. + * @param config Default client config is used when this parameter is absent. * @returns a new client instance */ static newHazelcastClient(config?: ClientConfig): Promise { @@ -157,8 +156,6 @@ export class HazelcastClient { /** * Returns the name of this Hazelcast instance. - * - * @return name of this Hazelcast instance */ getName(): string { return this.instanceName; @@ -166,7 +163,6 @@ export class HazelcastClient { /** * Gathers information of this local client. - * @returns {ClientInfo} */ getLocalEndpoint(): ClientInfo { return this.clusterService.getLocalClient(); @@ -174,7 +170,6 @@ export class HazelcastClient { /** * Gives all known distributed objects in cluster. - * @returns {Promise|Promise} */ getDistributedObjects(): Promise { const clientMessage = ClientGetDistributedObjectsCodec.encodeRequest(); @@ -213,81 +208,63 @@ export class HazelcastClient { } /** - * Returns the distributed map instance with given name. - * @param name - * @returns {Promise>} + * Returns the distributed Map instance with given name. */ getMap(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.MAP_SERVICE) as Promise>; } /** - * Returns the distributed set instance with given name. - * @param name - * @returns {Promise>} + * Returns the distributed Set instance with given name. */ getSet(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.SET_SERVICE) as Promise>; } /** - * Returns the distributed queue instance with given name. - * @param name - * @returns {Promise>} + * Returns the distributed Queue instance with given name. */ getQueue(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.QUEUE_SERVICE) as Promise>; } /** - * Returns the distributed list instance with given name. - * @param name - * @returns {Promise>} + * Returns the distributed List instance with given name. */ getList(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.LIST_SERVICE) as Promise>; } /** - * Returns the distributed multi-map instance with given name. - * @param name - * @returns {Promise>} + * Returns the distributed MultiMap instance with given name. */ getMultiMap(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.MULTIMAP_SERVICE) as Promise>; } /** - * Returns a distributed ringbuffer instance with the given name. - * @param name - * @returns {Promise>} + * Returns a distributed Ringbuffer instance with the given name. */ getRingbuffer(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.RINGBUFFER_SERVICE) as Promise>; } /** - * Returns a distributed reliable topic instance with the given name. - * @param name - * @returns {Promise>} + * Returns a distributed Reliable Topic instance with the given name. */ getReliableTopic(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.RELIABLETOPIC_SERVICE) as Promise>; } /** - * Returns the distributed replicated-map instance with given name. - * @param name - * @returns {Promise>} + * Returns the distributed Replicated Map instance with given name. */ getReplicatedMap(name: string): Promise> { return this.proxyManager.getOrCreateProxy(name, ProxyManager.REPLICATEDMAP_SERVICE) as Promise>; } /** - * Returns the distributed flake ID generator instance with given name. - * @param name - * @returns {Promise} + * Returns the distributed Flake ID Generator instance with given name. */ getFlakeIdGenerator(name: string): Promise { return this.proxyManager.getOrCreateProxy(name, ProxyManager.FLAKEID_SERVICE) as Promise; @@ -295,33 +272,22 @@ export class HazelcastClient { /** * Returns the distributed PN Counter instance with given name. - * @param name - * @returns {Promise} */ getPNCounter(name: string): Promise { return this.proxyManager.getOrCreateProxy(name, ProxyManager.PNCOUNTER_SERVICE) as Promise; } /** - * Returns the distributed AtomicLong instance with given name. - * The instance is created on CP Subsystem. - * - * If no group name is given within the `name` argument, then the - * AtomicLong instance will be created on the DEFAULT CP group. - * If a group name is given, like `.getAtomicLong('myLong@group1')`, - * the given group will be initialized first, if not initialized - * already, and then the instance will be created on this group. - * @param name - * @returns {Promise} + * Returns the CP subsystem that offers a set of in-memory linearizable + * data structures. */ - getAtomicLong(name: string): Promise { - return this.cpProxyManager.getOrCreateProxy(name, CPProxyManager.ATOMIC_LONG_SERVICE) as Promise; + getCPSubsystem(): CPSubsystem { + return this.cpSubsystem; } /** * Returns configuration that this instance started with. - * Returned configuration object should not be modified. - * @returns {ClientConfig} configuration object + * The returned object should not be modified. */ getConfig(): ClientConfig { return this.config; @@ -435,22 +401,25 @@ export class HazelcastClient { } /** @internal */ - doShutdown(): void { + doShutdown(): Promise { if (this.mapRepairingTask !== undefined) { this.mapRepairingTask.shutdown(); } this.nearCacheManager.destroyAllNearCaches(); this.proxyManager.destroy(); - this.connectionManager.shutdown(); - this.invocationService.shutdown(); this.statistics.stop(); + return this.cpSubsystem.shutdown() + .then(() => { + this.connectionManager.shutdown(); + this.invocationService.shutdown(); + }); } /** * Shuts down this client instance. */ - shutdown(): void { - this.getLifecycleService().shutdown(); + shutdown(): Promise { + return this.lifecycleService.shutdown(); } /** @internal */ diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index b7c6ef8c9..5a53e540c 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import {HazelcastClient} from './HazelcastClient'; import {ILogger} from './logging/ILogger'; @@ -74,11 +75,6 @@ export interface LifecycleService { */ isRunning(): boolean; - /** - * Shuts down the client. - */ - shutdown(): void; - } /** @internal */ @@ -122,14 +118,14 @@ export class LifecycleServiceImpl extends EventEmitter implements LifecycleServi this.emitLifecycleEvent(LifecycleState.STARTED); } - shutdown(): void { + shutdown(): Promise { if (!this.active) { return; } this.active = false; this.emitLifecycleEvent(LifecycleState.SHUTTING_DOWN); - this.client.doShutdown(); - this.emitLifecycleEvent(LifecycleState.SHUTDOWN); + return this.client.doShutdown() + .then(() => this.emitLifecycleEvent(LifecycleState.SHUTDOWN)); } } diff --git a/src/core/HazelcastError.ts b/src/core/HazelcastError.ts index 051497d46..a4678ee7a 100644 --- a/src/core/HazelcastError.ts +++ b/src/core/HazelcastError.ts @@ -394,6 +394,69 @@ export class NullPointerError extends HazelcastError { } } +export class SessionExpiredError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, SessionExpiredError.prototype); + } +} + +export class CPGroupDestroyedError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, CPGroupDestroyedError.prototype); + } +} + +export class LockOwnershipLostError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, LockOwnershipLostError.prototype); + } +} + +export class IllegalMonitorStateError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, IllegalMonitorStateError.prototype); + } +} + +export class WaitKeyCancelledError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, WaitKeyCancelledError.prototype); + } +} + +export class LeaderDemotedError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, LeaderDemotedError.prototype); + } +} + +export class StaleAppendRequestError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, StaleAppendRequestError.prototype); + } +} + +export class CannotReplicateError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, CannotReplicateError.prototype); + } +} + +export class NotLeaderError extends HazelcastError { + constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { + super(msg, cause, serverStackTrace); + Object.setPrototypeOf(this, NotLeaderError.prototype); + } +} + export class UndefinedErrorCodeError extends HazelcastError { constructor(msg: string, cause?: Error, serverStackTrace?: ServerErrorStackElement[]) { super(msg, cause, serverStackTrace); diff --git a/src/core/Member.ts b/src/core/Member.ts index bb95f2e24..e03aaa71a 100644 --- a/src/core/Member.ts +++ b/src/core/Member.ts @@ -87,10 +87,10 @@ export class MemberImpl implements Member { } id(): string { - let hashCode = this.address.toString(); + let id = this.address.toString(); if (this.uuid) { - hashCode += this.uuid.toString(); + id += this.uuid.toString(); } - return hashCode; + return id; } } diff --git a/src/index.ts b/src/index.ts index 9651e9abe..b196ecf26 100644 --- a/src/index.ts +++ b/src/index.ts @@ -29,3 +29,4 @@ export * from './serialization'; export {HazelcastClient as Client} from './HazelcastClient'; export * from './LifecycleService'; export * from './PartitionService'; +export * from './CPSubsystem'; diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index 4e24dd862..3491dee66 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -595,7 +595,7 @@ export class ClientConnectionManager extends EventEmitter { private shutdownClient(): void { try { - this.client.getLifecycleService().shutdown(); + (this.client.getLifecycleService() as LifecycleServiceImpl).shutdown(); } catch (e) { this.logger.error('ConnectionManager', `Error during client shutdown ${e}`); } diff --git a/src/protocol/ErrorFactory.ts b/src/protocol/ErrorFactory.ts index ba7c2184b..1890a9174 100644 --- a/src/protocol/ErrorFactory.ts +++ b/src/protocol/ErrorFactory.ts @@ -21,11 +21,13 @@ import { AuthenticationError, CallerNotMemberError, CancellationError, + CannotReplicateError, ClassCastError, ClassNotFoundError, ConcurrentModificationError, ConfigMismatchError, ConsistencyLostError, + CPGroupDestroyedError, DistributedObjectDestroyedError, HazelcastError, HazelcastInstanceNotActiveError, @@ -34,21 +36,27 @@ import { IndeterminateOperationStateError, IOError, IllegalArgumentError, + IllegalMonitorStateError, IndexOutOfBoundsError, InvalidAddressError, InvalidConfigurationError, InterruptedError, + LeaderDemotedError, + LockOwnershipLostError, MemberLeftError, NegativeArraySizeError, NoSuchElementError, NoDataMemberInClusterError, NodeIdOutOfRangeError, + NotLeaderError, NullPointerError, PartitionMigratingError, QueryError, + SessionExpiredError, SplitBrainProtectionError, RetryableHazelcastError, RetryableIOError, + StaleAppendRequestError, StaleSequenceError, StaleTaskIdError, TargetDisconnectedError, @@ -61,6 +69,7 @@ import { UnsupportedOperationError, HazelcastSerializationError, ReachedMaxSizeError, + WaitKeyCancelledError, } from '../core'; import {ClientProtocolErrorCodes} from './ClientProtocolErrorCodes'; import {ClientMessage} from '../protocol/ClientMessage'; @@ -174,6 +183,24 @@ export class ClientErrorFactory { (m, c, s) => new NodeIdOutOfRangeError(m, c, s)); this.register(ClientProtocolErrorCodes.CONSISTENCY_LOST_EXCEPTION, (m, c, s) => new ConsistencyLostError(m, c, s)); + this.register(ClientProtocolErrorCodes.SESSION_EXPIRED_EXCEPTION, + (m, c, s) => new SessionExpiredError(m, c, s)); + this.register(ClientProtocolErrorCodes.CP_GROUP_DESTROYED_EXCEPTION, + (m, c, s) => new CPGroupDestroyedError(m, c, s)); + this.register(ClientProtocolErrorCodes.LOCK_OWNERSHIP_LOST_EXCEPTION, + (m, c, s) => new LockOwnershipLostError(m, c, s)); + this.register(ClientProtocolErrorCodes.ILLEGAL_MONITOR_STATE, + (m, c, s) => new IllegalMonitorStateError(m, c, s)); + this.register(ClientProtocolErrorCodes.WAIT_KEY_CANCELLED_EXCEPTION, + (m, c, s) => new WaitKeyCancelledError(m, c, s)); + this.register(ClientProtocolErrorCodes.CANNOT_REPLICATE_EXCEPTION, + (m, c, s) => new CannotReplicateError(m, c, s)); + this.register(ClientProtocolErrorCodes.LEADER_DEMOTED_EXCEPTION, + (m, c, s) => new LeaderDemotedError(m, c, s)); + this.register(ClientProtocolErrorCodes.STALE_APPEND_REQUEST_EXCEPTION, + (m, c, s) => new StaleAppendRequestError(m, c, s)); + this.register(ClientProtocolErrorCodes.NOT_LEADER_EXCEPTION, + (m, c, s) => new NotLeaderError(m, c, s)); } createErrorFromClientMessage(clientMessage: ClientMessage): Error { diff --git a/src/proxy/FencedLock.ts b/src/proxy/FencedLock.ts new file mode 100644 index 000000000..bd0dcdda7 --- /dev/null +++ b/src/proxy/FencedLock.ts @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import * as Promise from 'bluebird'; +import * as Long from 'long'; +import {DistributedObject} from '../core'; + +/** + * A linearizable, distributed, non-reentrant lock. + * + * FencedLock is CP with respect to the CAP principle. It works on top + * of the Raft consensus algorithm. It offers linearizability during crash-stop + * failures and network partitions. If a network partition occurs, it remains + * available on at most one side of the partition. + * + * FencedLock works on top of CP sessions. Please refer to CP Session + * IMDG documentation section for more information. + * + * Important note: FencedLock is non-reentrant. Once a caller acquires + * the lock, it can not acquire the lock reentrantly. So, the next acquire + * attempt made within the same chain of async calls will lead to a dead lock. + */ +export interface FencedLock extends DistributedObject { + + /** + * Acquires the lock and returns the fencing token assigned to the current + * lock acquire. + * + * If the lock is not available, then the returned Promise is resolved only + * when the lock has been acquired. + * + * Fencing tokens are monotonic 64-bit integers that are incremented each + * time the lock switches from the free state to the acquired state. + * They are simply used for ordering lock holders. A lock holder can pass + * its fencing to the shared resource to fence off previous lock holders. + * When this resource receives an operation, it can validate the fencing + * token in the operation. + * + * You can read more about the fencing token idea in Martin Kleppmann's + * "How to do distributed locking" blog post and Google's Chubby paper. + * + * @returns fencing token + * @throws LockOwnershipLostError if the underlying CP session was + * closed before the client releases the lock + */ + lock(): Promise; + + /** + * Acquires the lock only if it is free and returns the fencing token + * assigned to the current lock acquire. + * + * If the lock is already held by another caller, then this method + * immediately returns `undefined`, which means a failed lock attempt. + * + * @param timeout optional timeout in milliseconds to acquire the lock + * before giving up; when it's not specified the operation + * will return immediately after the acquire attempt + * @returns fencing token (see {@link FencedLock#lock} for more + * information on fencing tokens) when lock is acquired; + * or `undefined` when attempt failed + * @throws LockOwnershipLostError if the underlying CP session was + * closed before the client releases the lock + */ + tryLock(timeout?: number): Promise; + + /** + * Releases the lock if the lock is currently held by the client. + * + * @param fence fencing token returned from `lock`/`tryLock` method. + * @throws IllegalMonitorStateError if the client does not hold + * the lock + * @throws LockOwnershipLostError if the underlying CP session was + * closed before the client releases the lock + */ + unlock(fence: Long): Promise; + + /** + * Returns whether this lock is locked or not. + * + * @return `true` if this lock is locked by any caller + * in the cluster, `false` otherwise. + * @throws LockOwnershipLostError if the underlying CP session was + * closed before the client releases the lock + */ + isLocked(): Promise; +} diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index bd7fe2d23..2738fbaa6 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -220,6 +220,5 @@ export class ProxyManager { } else { return Promise.resolve(localProxy); } - } } diff --git a/src/proxy/cpsubsystem/AtomicLongProxy.ts b/src/proxy/cpsubsystem/AtomicLongProxy.ts index 4f6a07e1c..3d12c97b0 100644 --- a/src/proxy/cpsubsystem/AtomicLongProxy.ts +++ b/src/proxy/cpsubsystem/AtomicLongProxy.ts @@ -22,7 +22,6 @@ import {BaseCPProxy} from './BaseCPProxy'; import {IAtomicLong} from '../IAtomicLong'; import {CPProxyManager} from './CPProxyManager'; import {RaftGroupId} from './RaftGroupId'; -import {CPGroupDestroyCPObjectCodec} from '../../codec/CPGroupDestroyCPObjectCodec'; import {AtomicLongAddAndGetCodec} from '../../codec/AtomicLongAddAndGetCodec'; import {AtomicLongCompareAndSetCodec} from '../../codec/AtomicLongCompareAndSetCodec'; import {AtomicLongGetCodec} from '../../codec/AtomicLongGetCodec'; @@ -32,18 +31,11 @@ import {AtomicLongGetAndSetCodec} from '../../codec/AtomicLongGetAndSetCodec'; /** @internal */ export class AtomicLongProxy extends BaseCPProxy implements IAtomicLong { - private readonly groupId: RaftGroupId; - private readonly objectName: string; - - constructor(client: HazelcastClient, groupId: RaftGroupId, proxyName: string, objectName: string) { - super(client, CPProxyManager.ATOMIC_LONG_SERVICE, proxyName); - this.groupId = groupId; - this.objectName = objectName; - } - - destroy(): Promise { - return this.encodeInvokeOnRandomTarget(CPGroupDestroyCPObjectCodec, - this.groupId, this.serviceName, this.objectName).then(); + constructor(client: HazelcastClient, + groupId: RaftGroupId, + proxyName: string, + objectName: string) { + super(client, CPProxyManager.ATOMIC_LONG_SERVICE, groupId, proxyName, objectName); } addAndGet(delta: Long | number): Promise { diff --git a/src/proxy/cpsubsystem/BaseCPProxy.ts b/src/proxy/cpsubsystem/BaseCPProxy.ts index a8be508a7..4e5251090 100644 --- a/src/proxy/cpsubsystem/BaseCPProxy.ts +++ b/src/proxy/cpsubsystem/BaseCPProxy.ts @@ -18,6 +18,8 @@ import * as Promise from 'bluebird'; import {HazelcastClient} from '../../HazelcastClient'; import {ClientMessage} from '../../protocol/ClientMessage'; +import {RaftGroupId} from './RaftGroupId'; +import {CPGroupDestroyCPObjectCodec} from '../../codec/CPGroupDestroyCPObjectCodec'; import {UnsupportedOperationError} from '../../core'; /** @@ -29,11 +31,19 @@ export abstract class BaseCPProxy { protected client: HazelcastClient; protected readonly proxyName: string; protected readonly serviceName: string; + protected readonly groupId: RaftGroupId; + protected readonly objectName: string; - constructor(client: HazelcastClient, serviceName: string, proxyName: string) { + constructor(client: HazelcastClient, + serviceName: string, + groupId: RaftGroupId, + proxyName: string, + objectName: string) { this.client = client; - this.proxyName = proxyName; this.serviceName = serviceName; + this.groupId = groupId; + this.proxyName = proxyName; + this.objectName = objectName; } getPartitionKey(): string { @@ -48,6 +58,15 @@ export abstract class BaseCPProxy { return this.serviceName; } + getGroupId(): RaftGroupId { + return this.groupId; + } + + destroy(): Promise { + return this.encodeInvokeOnRandomTarget(CPGroupDestroyCPObjectCodec, + this.groupId, this.serviceName, this.objectName).then(); + } + /** * Encodes a request from a codec and invokes it on any node. * @param codec diff --git a/src/proxy/cpsubsystem/CPProxyManager.ts b/src/proxy/cpsubsystem/CPProxyManager.ts index 62984bfd6..f4e35ef28 100644 --- a/src/proxy/cpsubsystem/CPProxyManager.ts +++ b/src/proxy/cpsubsystem/CPProxyManager.ts @@ -23,6 +23,7 @@ import { } from '../../core'; import {HazelcastClient} from '../../HazelcastClient'; import {AtomicLongProxy} from './AtomicLongProxy'; +import {FencedLockProxy} from './FencedLockProxy'; import {RaftGroupId} from './RaftGroupId'; import {CPGroupCreateCPGroupCodec} from '../../codec/CPGroupCreateCPGroupCodec'; import {assertString} from '../../util/Util'; @@ -53,6 +54,7 @@ export function getObjectNameForProxy(name: string): string { if (i === -1) { return name; } + assert(i < (name.length - 1), 'Custom CP group name cannot be empty string'); const objectName = name.slice(0, i).trim(); assert(objectName.length > 0, 'Object name cannot be empty string'); @@ -62,21 +64,25 @@ export function getObjectNameForProxy(name: string): string { /** @internal */ export class CPProxyManager { - public static readonly ATOMIC_LONG_SERVICE = 'hz:raft:atomicLongService'; + static readonly ATOMIC_LONG_SERVICE = 'hz:raft:atomicLongService'; + static readonly LOCK_SERVICE = 'hz:raft:lockService'; private readonly client: HazelcastClient; + private readonly lockProxies: Map = new Map(); constructor(client: HazelcastClient) { this.client = client; } - public getOrCreateProxy(proxyName: string, serviceName: string): Promise { + getOrCreateProxy(proxyName: string, serviceName: string): Promise { proxyName = withoutDefaultGroupName(proxyName); const objectName = getObjectNameForProxy(proxyName); return this.getGroupId(proxyName).then((groupId) => { if (serviceName === CPProxyManager.ATOMIC_LONG_SERVICE) { return new AtomicLongProxy(this.client, groupId, proxyName, objectName); + } else if (serviceName === CPProxyManager.LOCK_SERVICE) { + return this.createFencedLock(groupId, proxyName, objectName); } throw new IllegalStateError('Unexpected service name: ' + serviceName); }); @@ -90,4 +96,18 @@ export class CPProxyManager { return response.groupId; }); } + + private createFencedLock(groupId: RaftGroupId, proxyName: string, objectName: string): FencedLockProxy { + let proxy = this.lockProxies.get(proxyName); + if (proxy !== undefined) { + if (!groupId.equals(proxy.getGroupId())) { + this.lockProxies.delete(proxyName); + } else { + return proxy; + } + } + proxy = new FencedLockProxy(this.client, groupId, proxyName, objectName); + this.lockProxies.set(proxyName, proxy); + return proxy; + } } diff --git a/src/proxy/cpsubsystem/CPSessionAwareProxy.ts b/src/proxy/cpsubsystem/CPSessionAwareProxy.ts new file mode 100644 index 000000000..34000f2ba --- /dev/null +++ b/src/proxy/cpsubsystem/CPSessionAwareProxy.ts @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +import * as Long from 'long'; +import * as Promise from 'bluebird'; +import {HazelcastClient} from '../../HazelcastClient'; +import {RaftGroupId} from './RaftGroupId'; +import {BaseCPProxy} from './BaseCPProxy'; +import {CPSubsystemImpl} from '../../CPSubsystem'; +import {CPSessionManager} from './CPSessionManager'; + +/** + * Common super class for CP Subsystem proxies that make use of Raft sessions. + * @internal + */ +export abstract class CPSessionAwareProxy extends BaseCPProxy { + + protected readonly sessionManager: CPSessionManager; + private threadIdSeq = 0; + + constructor(client: HazelcastClient, + serviceName: string, + groupId: RaftGroupId, + proxyName: string, + objectName: string) { + super(client, serviceName, groupId, proxyName, objectName); + this.sessionManager = (client.getCPSubsystem() as CPSubsystemImpl).getCPSessionManager(); + } + + /** + * As Node.js client implements non-reentrant concurrent primitives, + * we generate a new "thread id" per each acquire attempt. + */ + protected nextThreadId(): number { + return this.threadIdSeq++; + } + + protected getSessionId(): Long { + return this.sessionManager.getSessionId(this.groupId); + } + + protected acquireSession(): Promise { + return this.sessionManager.acquireSession(this.groupId); + } + + protected releaseSession(sessionId: Long): void { + return this.sessionManager.releaseSession(this.groupId, sessionId); + } + + protected invalidateSession(sessionId: Long): void { + return this.sessionManager.invalidateSession(this.groupId, sessionId); + } +} diff --git a/src/proxy/cpsubsystem/CPSessionManager.ts b/src/proxy/cpsubsystem/CPSessionManager.ts new file mode 100644 index 000000000..3c2762106 --- /dev/null +++ b/src/proxy/cpsubsystem/CPSessionManager.ts @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +import * as Long from 'long'; +import * as Promise from 'bluebird'; +import {RaftGroupId} from './RaftGroupId'; +import {HazelcastClient} from '../../HazelcastClient'; +import { + IllegalStateError, + SessionExpiredError, + CPGroupDestroyedError +} from '../../core'; +import { + CPSessionCreateSessionCodec, + CPSessionCreateSessionResponseParams +} from '../../codec/CPSessionCreateSessionCodec'; +import {CPSessionCloseSessionCodec} from '../../codec/CPSessionCloseSessionCodec'; +import {CPSessionHeartbeatSessionCodec} from '../../codec/CPSessionHeartbeatSessionCodec'; +import { + scheduleWithRepetition, + cancelRepetitionTask, + Task +} from '../../util/Util'; + +/** @internal */ +export class SessionState { + + readonly id: Long; + readonly groupId: RaftGroupId; + readonly ttlMillis: number; + readonly creationTime: number; + acquireCount = 0; + + constructor(id: Long, groupId: RaftGroupId, ttlMillis: number) { + this.id = id; + this.groupId = groupId; + this.ttlMillis = ttlMillis; + this.creationTime = Date.now(); + } + + acquire(count: number): Long { + this.acquireCount += count; + return this.id; + } + + release(count: number): void { + this.acquireCount -= count; + } + + isValid(): boolean { + return this.isInUse() || !this.isExpired(Date.now()); + } + + isInUse(): boolean { + return this.acquireCount > 0; + } + + private isExpired(timestamp: number): boolean { + let expirationTime = this.creationTime + this.ttlMillis; + if (expirationTime < 0) { + expirationTime = Number.MAX_SAFE_INTEGER; + } + return timestamp > expirationTime; + } +} + +/** @internal */ +export const NO_SESSION_ID = Long.fromNumber(-1); + +/** @internal */ +export class CPSessionManager { + + private readonly client: HazelcastClient; + // map + private readonly sessions: Map = new Map(); + private heartbeatTask: Task; + private isShutdown = false; + + constructor(client: HazelcastClient) { + this.client = client; + } + + getSessionId(groupId: RaftGroupId): Long { + const session = this.sessions.get(groupId.getStringId()); + return session !== undefined ? session.id : NO_SESSION_ID; + } + + acquireSession(groupId: RaftGroupId): Promise { + return this.getOrCreateSession(groupId).then((state) => { + return state.acquire(1); + }); + } + + releaseSession(groupId: RaftGroupId, sessionId: Long): void { + const session = this.sessions.get(groupId.getStringId()); + if (session !== undefined && session.id.equals(sessionId)) { + session.release(1); + } + } + + invalidateSession(groupId: RaftGroupId, sessionId: Long): void { + const session = this.sessions.get(groupId.getStringId()); + if (session !== undefined && session.id.equals(sessionId)) { + this.sessions.delete(groupId.getStringId()); + } + } + + shutdown(): Promise { + if (this.isShutdown) { + return; + } + this.isShutdown = true; + this.cancelHeartbeatTask(); + const closePromises = []; + for (const session of this.sessions.values()) { + closePromises.push(this.requestCloseSession(session.groupId, session.id)); + } + return Promise.all(closePromises) + .catch(() => { + // no-op + }) + .then(() => this.sessions.clear()); + } + + private getOrCreateSession(groupId: RaftGroupId): Promise { + if (this.isShutdown) { + return Promise.reject(new IllegalStateError('Session manager is already shut down')); + } + const session = this.sessions.get(groupId.getStringId()); + if (session == null || !session.isValid()) { + return this.createNewSession(groupId); + } + return Promise.resolve(session); + } + + private createNewSession(groupId: RaftGroupId): Promise { + return this.requestNewSession(groupId).then((response) => { + const state = new SessionState(response.sessionId, groupId, response.ttlMillis.toNumber()); + this.sessions.set(groupId.getStringId(), state); + this.scheduleHeartbeatTask(response.heartbeatMillis.toNumber()); + return state; + }); + } + + private requestNewSession(groupId: RaftGroupId): Promise { + const clientMessage = CPSessionCreateSessionCodec.encodeRequest(groupId, this.client.getName()); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage) + .then((clientMessage) => { + const response = CPSessionCreateSessionCodec.decodeResponse(clientMessage); + return response; + }); + } + + private requestCloseSession(groupId: RaftGroupId, sessionId: Long): Promise { + const clientMessage = CPSessionCloseSessionCodec.encodeRequest(groupId, sessionId); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage) + .then((clientMessage) => { + const response = CPSessionCloseSessionCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + private requestHeartbeat(groupId: RaftGroupId, sessionId: Long): Promise { + const clientMessage = CPSessionHeartbeatSessionCodec.encodeRequest(groupId, sessionId); + return this.client.getInvocationService().invokeOnRandomTarget(clientMessage).then(); + } + + private scheduleHeartbeatTask(heartbeatMillis: number): void { + if (this.heartbeatTask !== undefined) { + return; + } + this.heartbeatTask = scheduleWithRepetition(() => { + for (const session of this.sessions.values()) { + if (session.isInUse()) { + this.requestHeartbeat(session.groupId, session.id) + .catch((err) => { + if (err instanceof SessionExpiredError || err instanceof CPGroupDestroyedError) { + this.invalidateSession(session.groupId, session.id); + } + }); + } + } + }, heartbeatMillis, heartbeatMillis); + } + + private cancelHeartbeatTask(): void { + if (this.heartbeatTask !== undefined) { + cancelRepetitionTask(this.heartbeatTask); + } + } +} diff --git a/src/proxy/cpsubsystem/FencedLockProxy.ts b/src/proxy/cpsubsystem/FencedLockProxy.ts new file mode 100644 index 000000000..535626a37 --- /dev/null +++ b/src/proxy/cpsubsystem/FencedLockProxy.ts @@ -0,0 +1,247 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +/** @ignore *//** */ + +import * as assert from 'assert'; +import * as Long from 'long'; +import * as Promise from 'bluebird'; +import {HazelcastClient} from '../../HazelcastClient'; +import {CPSessionAwareProxy} from './CPSessionAwareProxy'; +import {FencedLock} from '../FencedLock'; +import {CPProxyManager} from './CPProxyManager'; +import {NO_SESSION_ID} from './CPSessionManager'; +import {RaftGroupId} from './RaftGroupId'; +import {FencedLockLockCodec} from '../../codec/FencedLockLockCodec'; +import {FencedLockTryLockCodec} from '../../codec/FencedLockTryLockCodec'; +import {FencedLockUnlockCodec} from '../../codec/FencedLockUnlockCodec'; +import { + FencedLockGetLockOwnershipCodec, + FencedLockGetLockOwnershipResponseParams +} from '../../codec/FencedLockGetLockOwnershipCodec'; +import {assertNumber} from '../../util/Util'; +import {UuidUtil} from '../../util/UuidUtil'; +import { + IllegalMonitorStateError, + LockOwnershipLostError, + SessionExpiredError, + WaitKeyCancelledError, + UUID +} from '../../core'; + +const fenceThreadIdSymbol = Symbol('FenceThreadIdSymbol'); + +interface Fence extends Long { + [fenceThreadIdSymbol]?: number; +} + +const INVALID_FENCE = Long.fromNumber(0); + +function isValidFence(fence: Long): boolean { + return fence.greaterThan(INVALID_FENCE); +} + +/** @internal */ +export class FencedLockProxy extends CPSessionAwareProxy implements FencedLock { + + // "thread id" -> id of the session that has acquired the lock + private readonly lockedSessionIds: Map = new Map(); + + constructor(client: HazelcastClient, + groupId: RaftGroupId, + proxyName: string, + objectName: string) { + super(client, CPProxyManager.LOCK_SERVICE, groupId, proxyName, objectName); + } + + destroy(): Promise { + return super.destroy() + .then(() => this.lockedSessionIds.clear()); + } + + lock(): Promise { + const threadId = this.nextThreadId(); + const invocationUid = UuidUtil.generate(); + return this.doLock(threadId, invocationUid); + } + + private doLock(threadId: number, invocationUid: UUID): Promise { + let sessionId: Long; + return this.acquireSession() + .then((id) => { + sessionId = id; + return this.requestLock(sessionId, Long.fromNumber(threadId), invocationUid); + }) + .then((fence: Fence) => { + assert(isValidFence(fence), 'FencedLock somehow hit reentrant lock limit'); + this.lockedSessionIds.set(threadId, sessionId); + fence[fenceThreadIdSymbol] = threadId; + return fence; + }) + .catch((err) => { + if (err instanceof SessionExpiredError) { + this.invalidateSession(sessionId); + return this.doLock(threadId, invocationUid); + } + if (err instanceof WaitKeyCancelledError) { + this.releaseSession(sessionId); + throw new IllegalMonitorStateError('Lock[' + this.objectName + + '] not acquired because the lock call on the CP group was cancelled.'); + } + throw err; + }); + } + + tryLock(timeout?: number): Promise { + if (timeout === undefined) { + timeout = 0; + } + assertNumber(timeout); + const threadId = this.nextThreadId(); + const invocationUid = UuidUtil.generate(); + return this.doTryLock(timeout, threadId, invocationUid); + } + + private doTryLock(timeout: number, threadId: number, invocationUid: UUID): Promise { + const start = Date.now(); + let sessionId: Long; + return this.acquireSession() + .then((id) => { + sessionId = id; + return this.requestTryLock(sessionId, Long.fromNumber(threadId), invocationUid, timeout); + }) + .then((fence: Fence) => { + if (isValidFence(fence)) { + this.lockedSessionIds.set(threadId, sessionId); + fence[fenceThreadIdSymbol] = threadId; + return fence; + } + + this.releaseSession(sessionId); + return undefined; + }) + .catch((err) => { + if (err instanceof WaitKeyCancelledError) { + this.releaseSession(sessionId); + return undefined; + } + if (err instanceof SessionExpiredError) { + this.invalidateSession(sessionId); + + timeout -= Date.now() - start; + if (timeout < 0) { + return undefined; + } + return this.doTryLock(timeout, threadId, invocationUid); + } + throw err; + }); + } + + unlock(token: Long): Promise { + const threadId = this.extractThreadId(token); + const sessionId = this.getSessionId(); + + // the order of the following checks is important + const lockedSessionId = this.lockedSessionIds.get(threadId); + if (lockedSessionId !== undefined && !lockedSessionId.equals(sessionId)) { + this.lockedSessionIds.delete(threadId); + return Promise.reject(this.newLockOwnershipLostError(lockedSessionId)); + } + if (NO_SESSION_ID.equals(sessionId)) { + this.lockedSessionIds.delete(threadId); + return Promise.reject( + new IllegalMonitorStateError('Client is not owner of the Lock[' + this.proxyName + '].') + ); + } + + return this.requestUnlock(sessionId, Long.fromNumber(threadId), UuidUtil.generate()) + .then(() => { + this.lockedSessionIds.delete(threadId); + this.releaseSession(sessionId); + }) + .catch((err) => { + if (err instanceof SessionExpiredError) { + this.lockedSessionIds.delete(threadId); + this.invalidateSession(sessionId); + + throw this.newLockOwnershipLostError(sessionId); + } + if (err instanceof IllegalMonitorStateError) { + this.lockedSessionIds.delete(threadId); + } + throw err; + }); + } + + isLocked(): Promise { + return this.requestLockOwnershipState().then((state) => { + const locked = isValidFence(state.fence); + return locked; + }); + } + + private requestLock(sessionId: Long, threadId: Long, invocationUid: UUID): Promise { + return this.encodeInvokeOnRandomTarget( + FencedLockLockCodec, this.groupId, this.objectName, sessionId, threadId, invocationUid + ).then((clientMessage) => { + const response = FencedLockLockCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + private requestTryLock(sessionId: Long, threadId: Long, invocationUid: UUID, timeout: number): Promise { + return this.encodeInvokeOnRandomTarget( + FencedLockTryLockCodec, this.groupId, this.objectName, sessionId, threadId, invocationUid, timeout + ).then((clientMessage) => { + const response = FencedLockTryLockCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + private requestUnlock(sessionId: Long, threadId: Long, invocationUid: UUID): Promise { + return this.encodeInvokeOnRandomTarget( + FencedLockUnlockCodec, this.groupId, this.objectName, sessionId, threadId, invocationUid + ).then((clientMessage) => { + const response = FencedLockUnlockCodec.decodeResponse(clientMessage); + return response.response; + }); + } + + private requestLockOwnershipState(): Promise { + return this.encodeInvokeOnRandomTarget( + FencedLockGetLockOwnershipCodec, this.groupId, this.objectName + ).then((clientMessage) => { + const response = FencedLockGetLockOwnershipCodec.decodeResponse(clientMessage); + return response; + }); + } + + private extractThreadId(fence: Fence): number { + if (!Long.isLong(fence)) { + throw new TypeError('Fencing token should be of type Long'); + } + const threadId = fence[fenceThreadIdSymbol] as number; + if (threadId === undefined) { + throw new TypeError('Invalid fencing token provided'); + } + return threadId; + } + + private newLockOwnershipLostError(sessionId: Long) { + return new LockOwnershipLostError('Client is not owner of the Lock[' + this.proxyName + + '] because its Session[' + sessionId.toString() + '] was closed by server!'); + } +} diff --git a/src/proxy/cpsubsystem/RaftGroupId.ts b/src/proxy/cpsubsystem/RaftGroupId.ts index 717d63d05..0861609e3 100644 --- a/src/proxy/cpsubsystem/RaftGroupId.ts +++ b/src/proxy/cpsubsystem/RaftGroupId.ts @@ -20,13 +20,37 @@ import * as Long from 'long'; /** @internal */ export class RaftGroupId { - name: string; - seed: Long; - id: Long; + readonly name: string; + readonly seed: Long; + readonly id: Long; + private stringId: string; constructor(name: string, seed: Long, id: Long) { this.name = name; this.seed = seed; this.id = id; } + + getStringId(): string { + if (this.stringId !== undefined) { + return this.stringId; + } + this.stringId = this.name; + this.stringId += ':' + this.seed.toString(); + this.stringId += ':' + this.id.toString(); + return this.stringId; + } + + equals(other: RaftGroupId): boolean { + if (other == null) { + return false; + } + if (this.name !== other.name) { + return false; + } + if (!this.seed.equals(other.seed)) { + return false; + } + return this.id.equals(other.id); + } } diff --git a/src/proxy/index.ts b/src/proxy/index.ts index 1e2638680..b3ce49186 100644 --- a/src/proxy/index.ts +++ b/src/proxy/index.ts @@ -36,3 +36,4 @@ export * from './Ringbuffer'; export * from './MessageListener'; export * from './TopicOverloadPolicy'; export * from './IAtomicLong'; +export * from './FencedLock'; diff --git a/src/util/Util.ts b/src/util/Util.ts index 80432f62c..5ede77ae3 100644 --- a/src/util/Util.ts +++ b/src/util/Util.ts @@ -36,6 +36,11 @@ export function assertString(v: any): void { assert(typeof v === 'string', 'String value expected.'); } +/** @internal */ +export function assertNumber(v: any): void { + assert(typeof v === 'number', 'Number value expected.'); +} + /** @internal */ export function shuffleArray(array: T[]): void { let randomIndex: number; diff --git a/test/AutoPipeliningDisabledTest.js b/test/AutoPipeliningDisabledTest.js index b1d823ef7..711bc6dc4 100644 --- a/test/AutoPipeliningDisabledTest.js +++ b/test/AutoPipeliningDisabledTest.js @@ -46,7 +46,7 @@ describe('AutoPipeliningDisabledTest', function () { }); after(async function () { - client.shutdown(); + await client.shutdown(); return RC.terminateCluster(cluster.id); }); diff --git a/test/ClientHotRestartEventTest.js b/test/ClientHotRestartEventTest.js index 0585f2ae0..433105cac 100644 --- a/test/ClientHotRestartEventTest.js +++ b/test/ClientHotRestartEventTest.js @@ -62,7 +62,7 @@ describe('ClientHotRestartEventTest', function () { }); afterEach(async function () { - client.shutdown(); + await client.shutdown(); return RC.terminateCluster(cluster.id); }); diff --git a/test/ClientProxyTest.js b/test/ClientProxyTest.js index 7a2dc89ef..01aa0812a 100644 --- a/test/ClientProxyTest.js +++ b/test/ClientProxyTest.js @@ -27,19 +27,18 @@ const { ClientConnection } = require('../lib/network/ClientConnection'); describe('ClientProxyTest', function () { - let cluster, client, map, list; + let cluster; + let client; + let map; + let list; - afterEach(function () { + afterEach(async function () { sandbox.restore(); if (map && list) { - return map.destroy() - .then(function () { - return list.destroy(); - }) - .then(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); - }); + await map.destroy(); + await list.destroy(); + await client.shutdown(); + await RC.terminateCluster(cluster.id); } }); @@ -67,24 +66,15 @@ describe('ClientProxyTest', function () { assert.equal(mapProxy.getConnectedServerVersion(), 30700); }); - it('Proxies with the same name should be different for different services', function () { - return RC.createCluster().then(function (response) { - cluster = response; - return RC.startMember(cluster.id); - }).then(function () { - return Client.newHazelcastClient({ - clusterName: cluster.id - }); - }).then(function (res) { - client = res; - return client.getMap('Furkan').then(function (m) { - map = m; - return client.getList('Furkan'); - }).then(function (l) { - list = l; - expect(list.getServiceName()).to.be.equal('hz:impl:listService'); - expect(map.getServiceName()).to.be.equal('hz:impl:mapService'); - }); - }); + it('Proxies with the same name should be different for different services', async function () { + cluster = await RC.createCluster(); + await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ clusterName: cluster.id }); + + map = await client.getMap('Furkan'); + list = await client.getList('Furkan'); + + expect(list.getServiceName()).to.be.equal('hz:impl:listService'); + expect(map.getServiceName()).to.be.equal('hz:impl:mapService'); }); }); diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index c385c06ad..c0ff3aa43 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -24,8 +24,8 @@ describe('ClientReconnectTest', function () { let cluster, client; afterEach(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('member restarts, while map.put in progress', function () { diff --git a/test/ClusterServiceTest.js b/test/ClusterServiceTest.js index 7cc408da3..c8faec9d0 100644 --- a/test/ClusterServiceTest.js +++ b/test/ClusterServiceTest.js @@ -43,8 +43,8 @@ describe('ClusterServiceTest', function () { }); afterEach(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('should know when a new member joins to cluster', function (done) { @@ -65,7 +65,7 @@ describe('ClusterServiceTest', function () { let member2; const membershipListener = { - memberRemoved: (event) => { + memberRemoved: () => { expect(client.getClusterService().getSize()).to.be.eq(1); done(); } @@ -83,7 +83,7 @@ describe('ClusterServiceTest', function () { let member2, member3; const membershipListener = { - memberRemoved: (event) => { + memberRemoved: () => { const remainingMemberList = client.getClusterService().getMemberList(); expect(remainingMemberList).to.have.length(2); const portList = remainingMemberList.map(function (member) { @@ -120,7 +120,7 @@ describe('ClusterServiceTest', function () { clusterConnectTimeoutMillis: 2000 } } - }).catch(function (err) { + }).catch(function () { done(); }).then(function (client) { if (client) { @@ -143,16 +143,16 @@ describe('ClusterServiceTest', function () { } } }).then(function (newClient) { - newClient.shutdown(); - done(new Error('Client falsely started with wrong cluster name')); - }).catch(function (err) { + return newClient.shutdown() + .then(() => done(new Error('Client falsely started with wrong cluster name'))); + }).catch(function () { done(); }); }); it('should not run when listener was removed', function (done) { const membershipListener = { - memberAdded: (event) => { + memberAdded: () => { done(new Error('Listener falsely fired')); } }; diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 58233a7eb..83b3a11a5 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -92,8 +92,8 @@ configParams.forEach(function (cfg) { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('getDistributedObject returns empty array when there is no distributed object', function () { diff --git a/test/LifecycleServiceTest.js b/test/LifecycleServiceTest.js index f07167a4f..585d076f8 100644 --- a/test/LifecycleServiceTest.js +++ b/test/LifecycleServiceTest.js @@ -23,18 +23,17 @@ describe('LifecycleServiceTest', function () { let cluster; - before(function () { - return RC.createCluster(null, null).then(function (res) { - cluster = res; - return RC.startMember(cluster.id); - }); + before(async function () { + cluster = await RC.createCluster(null, null); + return RC.startMember(cluster.id); }); - after(function () { + after(async function () { return RC.terminateCluster(cluster.id); }); - it('client should emit STARTING, STARTED, CONNECTED, SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events in order', function (done) { + // expected order is: STARTING, STARTED, CONNECTED, SHUTTING_DOWN, DISCONNECTED and SHUTDOWN + it('client should emit events in order', function (done) { let expectedState = 'STARTING'; const listener = (state) => { if (state === 'STARTING' && expectedState === 'STARTING') { @@ -53,59 +52,62 @@ describe('LifecycleServiceTest', function () { done('Got lifecycle event ' + state + ' instead of ' + expectedState); } }; + Client.newHazelcastClient({ clusterName: cluster.id, lifecycleListeners: [ listener ] - }).then(function (client) { - client.shutdown(); - }); + }) + .then(function (client) { + return client.shutdown(); + }) + .catch(done); }); it('event listener should get SHUTTING_DOWN, DISCONNECTED and SHUTDOWN events when added after startup', function (done) { let expectedState = 'SHUTTING_DOWN'; - Client.newHazelcastClient({ - clusterName: cluster.id - }).then(function (client) { - client.lifecycleService.on('lifecycleEvent', function (state) { - if (state === 'SHUTTING_DOWN' && expectedState === 'SHUTTING_DOWN') { - expectedState = 'DISCONNECTED'; - } else if (state === 'DISCONNECTED' && expectedState === 'DISCONNECTED') { - expectedState = 'SHUTDOWN'; - } else if (state === 'SHUTDOWN' && expectedState === 'SHUTDOWN') { - done(); - } else { - done('Got lifecycle event ' + state + ' instead of ' + expectedState); - } - }); - client.shutdown(); - }); + Client.newHazelcastClient({ clusterName: cluster.id }) + .then(function (client) { + client.lifecycleService.on('lifecycleEvent', function (state) { + if (state === 'SHUTTING_DOWN' && expectedState === 'SHUTTING_DOWN') { + expectedState = 'DISCONNECTED'; + } else if (state === 'DISCONNECTED' && expectedState === 'DISCONNECTED') { + expectedState = 'SHUTDOWN'; + } else if (state === 'SHUTDOWN' && expectedState === 'SHUTDOWN') { + done(); + } else { + done('Got lifecycle event ' + state + ' instead of ' + expectedState); + } + }); + return client.shutdown(); + }) + .catch(done); }); it('isRunning returns correct values at lifecycle stages', function (done) { - Client.newHazelcastClient({ - clusterName: cluster.id - }).then(function (client) { - client.lifecycleService.on('lifecycleEvent', - function (state) { - if (state === 'STARTING') { - expect(client.lifecycleService.isRunning()).to.be.false; - } else if (state === 'STARTED') { - expect(client.lifecycleService.isRunning()).to.be.true; - } else if (state === 'CONNECTED') { - expect(client.lifecycleService.isRunning()).to.be.true; - } else if (state === 'SHUTTING_DOWN') { - expect(client.lifecycleService.isRunning()).to.be.false; - } else if (state === 'DISCONNECTED') { - expect(client.lifecycleService.isRunning()).to.be.false; - } else if (state === 'SHUTDOWN') { - expect(client.lifecycleService.isRunning()).to.be.false; - done(); - } else { - done('Got unexpected lifecycle event: ' + state); + Client.newHazelcastClient({ clusterName: cluster.id }) + .then(function (client) { + client.lifecycleService.on('lifecycleEvent', + function (state) { + if (state === 'STARTING') { + expect(client.lifecycleService.isRunning()).to.be.false; + } else if (state === 'STARTED') { + expect(client.lifecycleService.isRunning()).to.be.true; + } else if (state === 'CONNECTED') { + expect(client.lifecycleService.isRunning()).to.be.true; + } else if (state === 'SHUTTING_DOWN') { + expect(client.lifecycleService.isRunning()).to.be.false; + } else if (state === 'DISCONNECTED') { + expect(client.lifecycleService.isRunning()).to.be.false; + } else if (state === 'SHUTDOWN') { + expect(client.lifecycleService.isRunning()).to.be.false; + done(); + } else { + done('Got unexpected lifecycle event: ' + state); + } } - } - ); - client.shutdown(); - }); + ); + return client.shutdown(); + }) + .catch(done); }); }); diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index f422805b0..56b99f16e 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -25,73 +25,60 @@ describe('ListenersOnReconnectTest', function () { this.timeout(40000); let client; - const members = []; let cluster; let map; - beforeEach(function () { - return RC.createCluster(null, null).then(function (cl) { - cluster = cl; - }); + beforeEach(async function () { + cluster = await RC.createCluster(null, null); }); - afterEach(function () { - return map.destroy().then(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); - }); + afterEach(async function () { + await map.destroy(); + await client.shutdown(); + return RC.terminateCluster(cluster.id); }); - function closeTwoMembersOutOfThreeAndTestListener(done, isSmart, membersToClose, turnoffMember) { - RC.startMember(cluster.id).then(function (m) { - members[0] = m; - return RC.startMember(cluster.id); - }).then(function (m) { - members[1] = m; - return RC.startMember(cluster.id); - }).then(function (m) { - members[2] = m; - return Client.newHazelcastClient({ - clusterName: cluster.id, - network: { - smartRouting: isSmart - }, - properties: { - 'hazelcast.client.heartbeat.interval': 1000, - 'hazelcast.client.heartbeat.timeout': 3000 - } - }); - }).then(function (cl) { - client = cl; - return client.getMap('testmap'); - }).then(function (mp) { - map = mp; - const listener = { - added: (entryEvent) => { - try { - expect(entryEvent.name).to.equal('testmap'); - expect(entryEvent.key).to.equal('keyx'); - expect(entryEvent.value).to.equal('valx'); - expect(entryEvent.oldValue).to.be.equal(null); - expect(entryEvent.mergingValue).to.be.equal(null); - expect(entryEvent.member).to.not.be.equal(null); - done(); - } catch (err) { - done(err); - } - } - }; - return map.addEntryListener(listener, 'keyx', true); - }).then(function () { - return Promise.all([ - turnoffMember(cluster.id, members[membersToClose[0]].uuid), - turnoffMember(cluster.id, members[membersToClose[1]].uuid) - ]); - }).then(function () { - return Util.promiseWaitMilliseconds(5000); - }).then(function () { - return map.put('keyx', 'valx'); + async function closeTwoMembersOutOfThreeAndTestListener(done, isSmart, membersToClose, turnoffMember) { + const members = await Promise.all([ + RC.startMember(cluster.id), + RC.startMember(cluster.id), + RC.startMember(cluster.id) + ]); + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + smartRouting: isSmart + }, + properties: { + 'hazelcast.client.heartbeat.interval': 1000, + 'hazelcast.client.heartbeat.timeout': 3000 + } }); + map = await client.getMap('testmap'); + + const listener = { + added: (entryEvent) => { + try { + expect(entryEvent.name).to.equal('testmap'); + expect(entryEvent.key).to.equal('keyx'); + expect(entryEvent.value).to.equal('valx'); + expect(entryEvent.oldValue).to.be.equal(null); + expect(entryEvent.mergingValue).to.be.equal(null); + expect(entryEvent.member).to.not.be.equal(null); + done(); + } catch (err) { + done(err); + } + } + }; + await map.addEntryListener(listener, 'keyx', true); + await Promise.all([ + turnoffMember(cluster.id, members[membersToClose[0]].uuid), + turnoffMember(cluster.id, members[membersToClose[1]].uuid) + ]); + + await Util.promiseWaitMilliseconds(5000); + return map.put('keyx', 'valx'); } [true, false].forEach(function (isSmart) { @@ -104,34 +91,33 @@ describe('ListenersOnReconnectTest', function () { */ it('kill two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], RC.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], RC.terminateMember).catch(done); }); it('kill two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], RC.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], RC.terminateMember).catch(done); }); it('kill two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], RC.terminateMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], RC.terminateMember).catch(done); }); it('shutdown two members [1,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], RC.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [1, 2], RC.shutdownMember).catch(done); }); it('shutdown two members [0,1], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], RC.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 1], RC.shutdownMember).catch(done); }); it('shutdown two members [0,2], listener still receives map.put event [smart=' + isSmart + ']', function (done) { - closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], RC.shutdownMember); + closeTwoMembersOutOfThreeAndTestListener(done, isSmart, [0, 2], RC.shutdownMember).catch(done); }); it('restart member, listener still receives map.put event [smart=' + isSmart + ']', function (done) { - let member; - RC.startMember(cluster.id).then(function (m) { - member = m; - return Client.newHazelcastClient({ + async function testListener(done) { + const member = await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ clusterName: cluster.id, network: { smartRouting: isSmart @@ -140,11 +126,8 @@ describe('ListenersOnReconnectTest', function () { 'hazelcast.client.heartbeat.interval': 1000 } }); - }).then(function (cl) { - client = cl; - return client.getMap('testmap'); - }).then(function (mp) { - map = mp; + map = await client.getMap('testmap'); + const listener = { added: (entryEvent) => { try { @@ -160,16 +143,16 @@ describe('ListenersOnReconnectTest', function () { } } }; - return map.addEntryListener(listener, 'keyx', true); - }).then(function () { - return RC.terminateMember(cluster.id, member.uuid); - }).then(function () { - return RC.startMember(cluster.id); - }).then(function () { - return Util.promiseWaitMilliseconds(5000); - }).then(function () { + await map.addEntryListener(listener, 'keyx', true); + + await RC.terminateMember(cluster.id, member.uuid); + await RC.startMember(cluster.id); + + await Util.promiseWaitMilliseconds(5000); return map.put('keyx', 'valx'); - }); + } + + testListener(done).catch(done); }); }); }); diff --git a/test/LoggingTest.js b/test/LoggingTest.js index 4d19260be..feeb3d954 100644 --- a/test/LoggingTest.js +++ b/test/LoggingTest.js @@ -15,7 +15,7 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const sinon = require('sinon'); const winston = require('winston'); const RC = require('./RC'); @@ -59,14 +59,12 @@ describe('LoggingTest', function () { } }; - before(function () { - return RC.createCluster(null, null).then(function (res) { - cluster = res; - return RC.startMember(cluster.id); - }); + before(async function () { + cluster = await RC.createCluster(null, null); + return RC.startMember(cluster.id); }); - after(function () { + after(async function () { return RC.terminateCluster(cluster.id); }); @@ -74,100 +72,86 @@ describe('LoggingTest', function () { sinon.spy(console, 'log'); }); - afterEach(function () { + afterEach(async function () { if (client != null) { - client.shutdown(); + await client.shutdown(); client = null; } console.log.restore(); }); - it('winston should emit logging event', function () { + it('winston should emit logging event', async function () { let loggingHappened = false; winstonAdapter.logger.transports[0].on('logged', function (transport, level, msg, meta) { loggingHappened = true; }); - return Client.newHazelcastClient({ + client = await Client.newHazelcastClient({ clusterName: cluster.id, customLogger: winstonAdapter - }).then(function (hz) { - client = hz; - return expect(loggingHappened).to.be.true; }); + expect(loggingHappened).to.be.true; }); - it('no logging', function () { - return Client.newHazelcastClient({ + it('no logging', async function () { + client = await Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'OFF' } - }).then(function (hz) { - client = hz; - return sinon.assert.notCalled(console.log); }); + sinon.assert.notCalled(console.log); }); - it('default logging in case of empty property', function () { - return Client.newHazelcastClient({ + it('default logging in case of empty property', async function () { + client = await Client.newHazelcastClient({ clusterName: cluster.id - }).then(function (hz) { - client = hz; - return sinon.assert.called(console.log); }); + sinon.assert.called(console.log); }); - it('default logging in case of default property', function () { - return Client.newHazelcastClient({ + it('default logging in case of default property', async function () { + client = await Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'INFO' } - }).then(function (hz) { - client = hz; - return sinon.assert.called(console.log); }); + sinon.assert.called(console.log); }); it('error in case of unknown property value', function () { - return expect(Client.newHazelcastClient.bind(this, { + expect(() => Client.newHazelcastClient({ clusterName: cluster.id, customLogger: 'unknw' })).to.throw(Error); }); - it('default logging, default level', function () { - return Client.newHazelcastClient({ + it('default logging, default level', async function () { + client = await Client.newHazelcastClient({ clusterName: cluster.id - }).then(function (cl) { - client = cl; - return sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); }); + sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); }); - it('default logging, error level', function () { - return Client.newHazelcastClient({ + it('default logging, error level', async function () { + client = await Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'ERROR' } - }).then(function (cl) { - client = cl; - return sinon.assert.notCalled(console.log); }); + sinon.assert.notCalled(console.log); }); - it('default logging, trace level', function () { - return Client.newHazelcastClient({ + it('default logging, trace level', async function () { + client = await Client.newHazelcastClient({ clusterName: cluster.id, properties: { 'hazelcast.logging.level': 'TRACE' } - }).then(function (cl) { - client = cl; - sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); - sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'TRACE'); }); + sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'INFO'); + sinon.assert.calledWithMatch(console.log, '[DefaultLogger] %s at %s: %s', 'TRACE'); }); }); diff --git a/test/LostConnectionTest.js b/test/LostConnectionTest.js index 426a27725..abfb473a9 100644 --- a/test/LostConnectionTest.js +++ b/test/LostConnectionTest.js @@ -22,38 +22,33 @@ const Util = require('./Util'); describe('LostConnectionTest', function () { - let cluster, oldMember, client; + let cluster; + let oldMember; + let client; - before(function () { - return RC.createCluster(null, null).then(function (res) { - cluster = res; - }).then(function () { - return RC.startMember(cluster.id); - }).then(function (m) { - oldMember = m; - }).then(function () { - return Client.newHazelcastClient({ - clusterName: cluster.id, - properties: { - 'hazelcast.client.heartbeat.interval': 500, - 'hazelcast.client.heartbeat.timeout': 2000 - } - }); - }).then(function (cl) { - client = cl; + before(async function () { + cluster = await RC.createCluster(null, null); + oldMember = await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 500, + 'hazelcast.client.heartbeat.timeout': 2000 + } }); }); - after(function () { - client.shutdown(); + after(async function () { + await client.shutdown(); return RC.terminateCluster(cluster.id); }); it('M2 starts, M1 goes down, client connects to M2', function (done) { this.timeout(32000); + let newMember; const membershipListener = { - memberAdded: (membershipEvent) => { + memberAdded: () => { RC.shutdownMember(cluster.id, oldMember.uuid).then(function () { return Util.promiseWaitMilliseconds(4000); }).then(function () { @@ -70,8 +65,10 @@ describe('LostConnectionTest', function () { }; client.clusterService.addMembershipListener(membershipListener); - RC.startMember(cluster.id).then(function (m) { - newMember = m; - }); + RC.startMember(cluster.id) + .then((m) => { + newMember = m; + }) + .catch(done); }); }); diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index 71396bc6f..54f18920b 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -40,8 +40,8 @@ describe('MembershipListenerTest', function () { }); afterEach(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('sees member added event', function () { diff --git a/test/cpsubsystem/AtomicLongProxyTest.js b/test/cpsubsystem/AtomicLongTest.js similarity index 83% rename from test/cpsubsystem/AtomicLongProxyTest.js rename to test/cpsubsystem/AtomicLongTest.js index c79bfa538..0c709efe2 100644 --- a/test/cpsubsystem/AtomicLongProxyTest.js +++ b/test/cpsubsystem/AtomicLongTest.js @@ -15,7 +15,10 @@ */ 'use strict'; -const { expect } = require('chai'); +const chai = require('chai'); +chai.should(); +chai.use(require('chai-as-promised')); +const expect = chai.expect; const fs = require('fs'); const Long = require('long'); const RC = require('./../RC'); @@ -24,7 +27,7 @@ const { DistributedObjectDestroyedError } = require('../../'); -describe('AtomicLongProxyTest', function () { +describe('AtomicLongTest', function () { this.timeout(30000); @@ -44,7 +47,7 @@ describe('AtomicLongProxyTest', function () { RC.startMember(cluster.id) ]); client = await Client.newHazelcastClient({ clusterName: cluster.id }); - long = await client.getAtomicLong('along'); + long = await client.getCPSubsystem().getAtomicLong('along'); }); afterEach(async function () { @@ -53,12 +56,12 @@ describe('AtomicLongProxyTest', function () { }); after(async function () { - client.shutdown(); + await client.shutdown(); return RC.shutdownCluster(cluster.id); }); it('should create AtomicLong with respect to given CP group', async function () { - const longInAnotherGroup = await client.getAtomicLong('along@mygroup'); + const longInAnotherGroup = await client.getCPSubsystem().getAtomicLong('along@mygroup'); const value1 = await longInAnotherGroup.incrementAndGet(); expectLong(1, value1); @@ -69,27 +72,12 @@ describe('AtomicLongProxyTest', function () { }); it('destroy: should destroy AtomicLong and throw on operation', async function () { - const anotherLong = await client.getAtomicLong('another-long-1'); + const anotherLong = await client.getCPSubsystem().getAtomicLong('another-long-1'); await anotherLong.destroy(); // the next destroy call should be ignored await anotherLong.destroy(); - try { - await anotherLong.get(); - } catch (err) { - expect(err).to.be.instanceOf(DistributedObjectDestroyedError); - } - }); - - it('destroy: should destroy AtomicLong and throw on getAtomitLong call', async function () { - const anotherLong = await client.getAtomicLong('another-long-2'); - await anotherLong.destroy(); - - try { - await client.getAtomicLong('another-long-2'); - } catch (err) { - expect(err).to.be.instanceOf(DistributedObjectDestroyedError); - } + await expect(anotherLong.get()).to.be.rejectedWith(DistributedObjectDestroyedError); }); it('get: should return 0 initially', async function () { diff --git a/test/cpsubsystem/FencedLockTest.js b/test/cpsubsystem/FencedLockTest.js new file mode 100644 index 000000000..73b2f7acb --- /dev/null +++ b/test/cpsubsystem/FencedLockTest.js @@ -0,0 +1,298 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const chai = require('chai'); +chai.should(); +chai.use(require('chai-as-promised')); +const expect = chai.expect; +const fs = require('fs'); +const { AssertionError } = require('assert'); +const RC = require('./../RC'); +const { + Client, + DistributedObjectDestroyedError, + IllegalMonitorStateError +} = require('../../'); + +describe('FencedLockTest', function () { + + this.timeout(30000); + + let cluster; + let client; + let lock; + + let anotherLockSeq = 0; + async function getAnotherLock() { + return client.getCPSubsystem().getLock('another-lock-' + anotherLockSeq++); + } + + function expectValidFence(fence) { + expect(fence.toNumber()).to.be.greaterThan(0); + } + + function expectValidFenceSequence(fences) { + let prevFence; + for (const fence of fences) { + expectValidFence(fence); + if (prevFence !== undefined) { + expect(fence.toNumber() - prevFence.toNumber()).to.be.greaterThan(0); + } + prevFence = fence; + } + } + + function expectSingleValidFence(fences) { + let validFence; + let validCnt = 0; + for (const fence of fences) { + if (fence !== undefined && fence.toNumber() > 0) { + validCnt++; + validFence = fence; + } + } + expect(validCnt).to.be.equal(1); + return validFence; + } + + before(async function () { + cluster = await RC.createCluster(null, fs.readFileSync(__dirname + '/hazelcast_cpsubsystem.xml', 'utf8')) + await Promise.all([ + RC.startMember(cluster.id), + RC.startMember(cluster.id), + RC.startMember(cluster.id) + ]); + client = await Client.newHazelcastClient({ clusterName: cluster.id }); + lock = await client.getCPSubsystem().getLock('alock'); + }); + + after(async function () { + await client.shutdown(); + return RC.shutdownCluster(cluster.id); + }); + + it('should create FencedLock with respect to given CP group', async function () { + const lockInAnotherGroup = await client.getCPSubsystem().getLock('alock@mygroup'); + + const fence = await lockInAnotherGroup.lock(); + try { + const locked = await lock.isLocked(); + expect(locked).to.be.false; + } finally { + await lockInAnotherGroup.unlock(fence); + } + }); + + it('should release locks on client shutdown', async function () { + const anotherClient = await Client.newHazelcastClient({ clusterName: cluster.id }); + const lockOfAnotherClient = await anotherClient.getCPSubsystem().getLock('alock'); + + await lockOfAnotherClient.lock(); + let locked = await lock.isLocked(); + expect(locked).to.be.true; + + await anotherClient.shutdown(); + + await new Promise((resolve) => setTimeout(resolve, 5000)); + locked = await lock.isLocked(); + expect(locked).to.be.false; + }); + + it('destroy: should destroy FencedLock and throw on operation', async function () { + const anotherLock = await getAnotherLock(); + await anotherLock.destroy(); + // the next destroy call should be ignored + await anotherLock.destroy(); + + expect(anotherLock.isLocked()).to.be.rejectedWith(DistributedObjectDestroyedError); + }); + + it('isLocked: should return false when not locked', async function () { + const locked = await lock.isLocked(); + expect(locked).to.be.false; + }); + + it('isLocked: should return true when locked with lock', async function () { + const fence = await lock.lock(); + try { + const locked = await lock.isLocked(); + expect(locked).to.be.true; + } finally { + await lock.unlock(fence); + } + }); + + it('isLocked: should return true when locked with tryLock', async function () { + const fence = await lock.tryLock(); + try { + const locked = await lock.isLocked(); + expect(locked).to.be.true; + } finally { + await lock.unlock(fence); + } + }); + + it('lock: should return fence when not locked', async function () { + const fence = await lock.lock(); + try { + expectValidFence(fence); + } finally { + await lock.unlock(fence); + } + }); + + it('lock: should be non-reentrant', function (done) { + let unlockedByTimer = false; + lock.lock() + .then((fence) => { + setTimeout(() => { + unlockedByTimer = true; + // passes only if + lock.unlock(fence) + .catch(done); + }, 1000); + return lock.lock(); + }) + .then((fence) => { + if (unlockedByTimer) { + done(); + } + return lock.unlock(fence); + }) + .catch(done); + }); + + it('lock: should succeed for one call in case of concurrent calls', async function () { + // use separate Lock here as it will remain locked + const anotherLock = await getAnotherLock(); + + let lockCnt = 0; + const lockPromises = []; + for (let i = 0; i < 5; i++) { + lockPromises.push( + anotherLock.lock() + .then((fence) => { + expectValidFence(fence); + lockCnt++; + }) + .catch(() => { + // no-op + }) + ); + } + await Promise.race(lockPromises); + + expect(lockCnt).to.be.equal(1); + }); + + it('tryLock: should throw when timeout is not a number', async function () { + expect(() => lock.tryLock('invalid timeout')).to.throw(AssertionError); + }); + + it('tryLock: should return fence when not locked and timeout not specified', async function () { + const fence = await lock.tryLock(); + try { + expectValidFence(fence); + } finally { + await lock.unlock(fence); + } + }); + + it('tryLock: should return undefined when locked and timeout not specified', async function () { + const fence = await lock.lock(); + const invalidFence = await lock.tryLock(); + try { + expect(invalidFence).to.be.undefined; + } finally { + await lock.unlock(fence); + } + }); + + it('tryLock: should return fence when not locked and timeout specified', async function () { + const fence = await lock.tryLock(100); + try { + expectValidFence(fence); + } finally { + await lock.unlock(fence); + } + }); + + it('tryLock: should return undefined when locked and timeout specified', async function () { + const fence = await lock.lock(); + const invalidFence = await lock.tryLock(100); + try { + expect(invalidFence).to.be.undefined; + } finally { + await lock.unlock(fence); + } + }); + + it('tryLock: should keep retrying until timeout when locked', async function () { + let fence; + const start = Date.now(); + try { + fence = await lock.lock(); + await lock.tryLock(1000); + expect(Date.now() - start).to.be.greaterThan(900); + } finally { + await lock.unlock(fence); + } + }); + + it('tryLock: should succeed for one call in case of concurrent calls', async function () { + let fence; + try { + const tryLockPromises = []; + for (let i = 0; i < 5; i++) { + tryLockPromises.push(lock.tryLock()); + } + const fences = await Promise.all(tryLockPromises); + fence = expectSingleValidFence(fences); + } finally { + await lock.unlock(fence); + } + }); + + it('unlock: should throw when not locked', async function () { + const fence = await lock.lock(); + await lock.unlock(fence); + + await expect(lock.unlock(fence)).to.be.rejectedWith(IllegalMonitorStateError); + }); + + it('lock-unlock: should return monotonical fence sequence', async function () { + const fences = []; + for (let i = 0; i < 3; i++) { + const fence = await lock.lock(); + fences.push(fence); + await lock.unlock(fence); + } + + expectValidFenceSequence(fences); + }); + + it('tryLock-unlock: should return monotonical fence sequence', async function () { + const fences = []; + for (let i = 0; i < 3; i++) { + const fence = await lock.tryLock(); + fences.push(fence); + await lock.unlock(fence); + } + + expectValidFenceSequence(fences); + }); +}); diff --git a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js index 86aa70e65..7dd67cf5f 100644 --- a/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js +++ b/test/flakeid/FlakeIdGeneratorOutOfRangeTest.js @@ -23,82 +23,62 @@ const RC = require('./../RC'); const { Client, HazelcastError } = require('../../.'); const Util = require('../Util'); -describe("FlakeIdGeneratorOutOfRangeTest", function () { +describe('FlakeIdGeneratorOutOfRangeTest', function () { + + this.timeout(30000); let cluster, client; let flakeIdGenerator; - afterEach(function () { - return flakeIdGenerator.destroy().then(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); - }); + afterEach(async function () { + await flakeIdGenerator.destroy(); + await client.shutdown(); + return RC.terminateCluster(cluster.id); }); - function assignOverflowedNodeId(clusterId, instanceNum) { + async function assignOverflowedNodeId(clusterId, instanceNum) { const script = - 'function assignOverflowedNodeId() {' + - ' instance_' + instanceNum + '.getCluster().getLocalMember().setMemberListJoinVersion(100000);' + - ' return instance_' + instanceNum + '.getCluster().getLocalMember().getMemberListJoinVersion();' + - '}' + - 'result=""+assignOverflowedNodeId();'; + `function assignOverflowedNodeId() { + instance_${instanceNum}.getCluster().getLocalMember().setMemberListJoinVersion(100000); + return instance_${instanceNum}.getCluster().getLocalMember().getMemberListJoinVersion(); + } + result=""+assignOverflowedNodeId();`; return RC.executeOnController(clusterId, script, 1); } for (let repeat = 0; repeat < 10; repeat++) { - it('newId succeeds as long as there is one suitable member in the cluster (repeat: ' + repeat + '/10)', function () { - this.timeout(30000); - return RC.createCluster().then(function (response) { - cluster = response; - return RC.startMember(cluster.id); - }).then(function () { - return RC.startMember(cluster.id); - }).then(function () { - return assignOverflowedNodeId(cluster.id, Util.getRandomInt(0, 2)); - }).then(function () { - return Client.newHazelcastClient({ - clusterName: cluster.id, - network: { - smartRouting: false - } - }); - }).then(function (value) { - client = value; - return client.getFlakeIdGenerator('test'); - }).then(function (idGenerator) { - flakeIdGenerator = idGenerator; - let promise = Promise.resolve(); - for (let i = 0; i < 100; i++) { - promise = promise.then(function () { - return flakeIdGenerator.newId(); - }); + it('newId should succeed while there is at least one suitable member (repeat: ' + repeat + '/10)', async function () { + cluster = await RC.createCluster(); + await RC.startMember(cluster.id); + await RC.startMember(cluster.id); + await assignOverflowedNodeId(cluster.id, Util.getRandomInt(0, 2)); + + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + smartRouting: false } - return promise; }); + + flakeIdGenerator = await client.getFlakeIdGenerator('test'); + for (let i = 0; i < 100; i++) { + await flakeIdGenerator.newId(); + } }); } - it('throws NodeIdOutOfRangeError when there is no server with a join id smaller than 2^16', function () { - this.timeout(20000); - return RC.createCluster().then(function (response) { - cluster = response; - return RC.startMember(cluster.id); - }).then(function () { - return RC.startMember(cluster.id); - }).then(function () { - return assignOverflowedNodeId(cluster.id, 0); - }).then(function () { - return assignOverflowedNodeId(cluster.id, 1); - }).then(function () { - return Client.newHazelcastClient({ - clusterName: cluster.id - }); - }).then(function (cl) { - client = cl; - return client.getFlakeIdGenerator('test'); - }).then(function (idGenerator) { - flakeIdGenerator = idGenerator; - return expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(HazelcastError); + it('should throw when there is no server with a join id smaller than 2^16', async function () { + cluster = await RC.createCluster(); + await RC.startMember(cluster.id); + await RC.startMember(cluster.id); + await assignOverflowedNodeId(cluster.id, 0); + await assignOverflowedNodeId(cluster.id, 1); + + client = await Client.newHazelcastClient({ + clusterName: cluster.id }); + flakeIdGenerator = await client.getFlakeIdGenerator('test'); + + await expect(flakeIdGenerator.newId(flakeIdGenerator)).to.be.rejectedWith(HazelcastError); }); }); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index 2867ac898..df0fc003f 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -55,8 +55,8 @@ describe("FlakeIdGeneratorProxyTest", function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); function addToListFunction(l) { diff --git a/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js index 5a24e33b0..020b963eb 100644 --- a/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js +++ b/test/hazelcast_json_value/HJVHazelcastJsonValueSerializerTest.js @@ -55,8 +55,8 @@ describe('HazelcastJsonValue with HazelcastJsonValueSerializer', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('storing JavaScript objects', function () { diff --git a/test/hazelcast_json_value/HJVJsonSerializerTest.js b/test/hazelcast_json_value/HJVJsonSerializerTest.js index 67fc3dbcb..09a50b56c 100644 --- a/test/hazelcast_json_value/HJVJsonSerializerTest.js +++ b/test/hazelcast_json_value/HJVJsonSerializerTest.js @@ -53,8 +53,8 @@ describe('HazelcastJsonValue with JsonSerializer', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('storing JavaScript objects', function () { diff --git a/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js index 3ebe25c82..9fd05074a 100644 --- a/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js +++ b/test/hazelcast_json_value/HazelcastJsonValueQueryTest.js @@ -56,8 +56,8 @@ describe('HazelcastJsonValue query test', function () { if (!client) { return; } - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('querying over JavaScript objects', function () { diff --git a/test/heartbeat/HeartbeatFromClientTest.js b/test/heartbeat/HeartbeatFromClientTest.js index 5261eacbb..e5c402915 100644 --- a/test/heartbeat/HeartbeatFromClientTest.js +++ b/test/heartbeat/HeartbeatFromClientTest.js @@ -85,8 +85,9 @@ describe('HeartbeatFromClientTest', function () { }).then(function () { clearInterval(pushTask); expect(connectionClosedEventCount).to.equal(0); - client1.shutdown(); - client2.shutdown(); + return client1.shutdown(); + }).then(function () { + return client2.shutdown(); }); }); }); diff --git a/test/heartbeat/HeartbeatFromServerTest.js b/test/heartbeat/HeartbeatFromServerTest.js index b8299078d..957136d97 100644 --- a/test/heartbeat/HeartbeatFromServerTest.js +++ b/test/heartbeat/HeartbeatFromServerTest.js @@ -86,8 +86,7 @@ describe('HeartbeatFromServerTest', function () { if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { if (connection.closedReason === 'Heartbeat timed out' && connection.closedCause instanceof TargetDisconnectedError) { - done(); - client.shutdown(); + return client.shutdown().then(() => done()); } else { done(new Error('Connection does not closed due to heartbeat timeout. Reason: ' + connection.closedReason + ', cause: ' + connection.closedCause)); @@ -148,8 +147,7 @@ describe('HeartbeatFromServerTest', function () { client.getConnectionManager().once('connectionAdded', function (connection) { const remoteAddress = connection.getRemoteAddress(); if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { - done(); - client.shutdown(); + return client.shutdown().then(() => done()); } else { done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is added instead of ' + member2.host + ':' + member2.port)); diff --git a/test/integration/ClientBackupAcksTest.js b/test/integration/ClientBackupAcksTest.js index 22b12e436..12aa0b1fa 100644 --- a/test/integration/ClientBackupAcksTest.js +++ b/test/integration/ClientBackupAcksTest.js @@ -15,7 +15,10 @@ */ 'use strict'; -const { expect } = require('chai'); +const chai = require('chai'); +chai.should(); +chai.use(require('chai-as-promised')); +const expect = chai.expect; const sinon = require('sinon'); const sandbox = sinon.createSandbox(); const { Client, IndeterminateOperationStateError } = require('../../'); @@ -75,11 +78,7 @@ describe('ClientBackupAcksTest', function () { sandbox.replace(ClientLocalBackupListenerCodec, 'handle', sinon.fake()); const map = await client.getMap('test-map'); - try { - await map.set('foo', 'bar'); - } catch (err) { - expect(err).to.be.instanceof(IndeterminateOperationStateError); - } + await expect(map.set('foo', 'bar')).to.be.rejectedWith(IndeterminateOperationStateError); }); it('should not throw when backup acks were lost in smart mode when prop is not set', async function () { diff --git a/test/integration/ConnectionStrategyTest.js b/test/integration/ConnectionStrategyTest.js index 5e64e402d..e72f6b762 100644 --- a/test/integration/ConnectionStrategyTest.js +++ b/test/integration/ConnectionStrategyTest.js @@ -32,44 +32,40 @@ describe('ConnectionStrategyTest', function () { this.timeout(32000); let cluster, client; - beforeEach(() => { + beforeEach(function () { client = null; cluster = null; }); - afterEach(() => { + afterEach(async function () { if (client != null) { - client.shutdown(); + await client.shutdown(); } if (cluster != null) { - return RC.terminateCluster(cluster.id); + await RC.terminateCluster(cluster.id); } }); - it('client with async start throws when there is no cluster', function () { - return Client.newHazelcastClient({ + it('client with async start should throw when there is no cluster', async function () { + client = await Client.newHazelcastClient({ connectionStrategy: { asyncStart: true } - }).then((c) => { - client = c; - return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(ClientOfflineError); }); + await expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(ClientOfflineError); }); - it('client with async start throws after shutdown when there is no cluster', function () { - return Client.newHazelcastClient({ + it('client with async start should throw after shutdown when there is no cluster', async function () { + client = await Client.newHazelcastClient({ connectionStrategy: { asyncStart: true } - }).then((c) => { - client = c; - client.shutdown(); - return expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(ClientNotActiveError); - }) + }); + await client.shutdown(); + await expect(client.getMap(TestUtil.randomString())).to.be.rejectedWith(ClientNotActiveError); }); - it('client with async start connects to cluster', function () { + it('client with async start should connect to cluster', async function () { const config = { network: { clusterMembers: ['localhost:5701'] @@ -86,26 +82,17 @@ describe('ConnectionStrategyTest', function () { } }); - return RC.createCluster(null, null) - .then((c) => { - cluster = c; - config.clusterName = cluster.id; - return Client.newHazelcastClient(config); - }) - .then((c) => { - client = c; - expect(client.getLifecycleService().isRunning()).to.be.true; - return RC.startMember(cluster.id); - }) - .then(() => { - return connected.promise; - }) - .then(() => { - return client.getMap(TestUtil.randomString()); - }); + cluster = await RC.createCluster(null, null); + config.clusterName = cluster.id; + client = await Client.newHazelcastClient(config); + + expect(client.getLifecycleService().isRunning()).to.be.true; + await RC.startMember(cluster.id); + await connected.promise; + await client.getMap(TestUtil.randomString()); }); - it('client with OFF reconnect mode does not reconnect when the member dies and another starts', function () { + it('client with OFF reconnect mode should not reconnect when member dies and another starts', async function () { const config = { lifecycleListeners: [], connectionStrategy: { @@ -122,41 +109,22 @@ describe('ConnectionStrategyTest', function () { } }); - let map, member; - return RC.createCluster(null, null) - .then((c) => { - cluster = c; - config.clusterName = cluster.id; - return RC.startMember(cluster.id); - }) - .then((m) => { - member = m; - return Client.newHazelcastClient(config); - }) - .then((c) => { - client = c; - return client.getMap(TestUtil.randomString()); - }) - .then((m) => { - map = m; - // No exception at this point - return map.put(1, 5); - }) - .then(() => { - return RC.shutdownMember(cluster.id, member.uuid); - }) - .then(() => { - return RC.startMember(cluster.id); - }) - .then(() => { - return shutdown.promise; - }) - .then(() => { - return expect(map.put(1, 5)).to.be.rejectedWith(ClientNotActiveError); - }); + cluster = await RC.createCluster(null, null); + config.clusterName = cluster.id; + const member = await RC.startMember(cluster.id); + client = await Client.newHazelcastClient(config); + const map = await client.getMap(TestUtil.randomString()); + + // no exception at this point + await map.put(1, 5); + + await RC.shutdownMember(cluster.id, member.uuid); + await RC.startMember(cluster.id); + await shutdown.promise; + await expect(map.put(1, 5)).to.be.rejectedWith(ClientNotActiveError); }); - it('client with ASYNC reconnect mode reconnects when the member dies and another starts ', function () { + it('client with ASYNC reconnect mode reconnects when the member dies and another starts ', async function () { const config = { lifecycleListeners: [], connectionStrategy: { @@ -174,61 +142,37 @@ describe('ConnectionStrategyTest', function () { } }); - let member, map; - return RC.createCluster(null, null) - .then((c) => { - cluster = c; - config.clusterName = cluster.id; - return RC.startMember(cluster.id); - }) - .then((m) => { - member = m; - return Client.newHazelcastClient(config); - }) - .then((c) => { - client = c; - return client.getMap(TestUtil.randomString()); - }) - .then((m) => { - map = m; - // No exception at this point - return map.put(1, 5); - }) - .then(() => { - return RC.shutdownMember(cluster.id, member.uuid); - }) - .then(() => { - return disconnected.promise; - }) - .then(() => { - return expect(map.put(1, 5)).to.be.rejectedWith(ClientOfflineError); - }) - .then(() => { - client.getLifecycleService().on('lifecycleEvent', (state) => { - if (state === LifecycleState.CONNECTED) { - reconnected.resolve(); - } - }); - return RC.startMember(cluster.id); - }) - .then((m) => { - return reconnected.promise; - }) - .then(() => { - expect(client.getLifecycleService().isRunning()).to.be.true; - return map.put(1, 2); - }) + cluster = await RC.createCluster(null, null) + config.clusterName = cluster.id; + const member = await RC.startMember(cluster.id); + client = await Client.newHazelcastClient(config); + const map = await client.getMap(TestUtil.randomString()); + + // no exception at this point + await map.put(1, 5); + + await RC.shutdownMember(cluster.id, member.uuid); + await disconnected.promise; + await expect(map.put(1, 5)).to.be.rejectedWith(ClientOfflineError); + + client.getLifecycleService().on('lifecycleEvent', (state) => { + if (state === LifecycleState.CONNECTED) { + reconnected.resolve(); + } + }); + await RC.startMember(cluster.id); + await reconnected.promise; + + expect(client.getLifecycleService().isRunning()).to.be.true; + await map.put(1, 2); }); - it('client with async start should should reject get partition specific proxy calls when there is no cluster', function () { - return Client.newHazelcastClient({ + it('client with async start should throw on get partition specific proxy calls when no cluster', async function () { + client = await Client.newHazelcastClient({ connectionStrategy: { asyncStart: true } - }).then((c) => { - client = c; - return expect(client.getList(TestUtil.randomString())).to.be.rejectedWith(ClientOfflineError); }); + await expect(client.getList(TestUtil.randomString())).to.be.rejectedWith(ClientOfflineError); }); - }); diff --git a/test/integration/DistributedObjectsTest.js b/test/integration/DistributedObjectsTest.js index 1303a89b8..b76a16049 100644 --- a/test/integration/DistributedObjectsTest.js +++ b/test/integration/DistributedObjectsTest.js @@ -22,7 +22,7 @@ chai.use(chaiAsPromised); const expect = require('chai').expect; const Client = require('../../.').Client; -const Controller = require('../RC'); +const RC = require('../RC'); const Util = require('../Util'); describe('DistributedObjectsTest', function () { @@ -35,10 +35,10 @@ describe('DistributedObjectsTest', function () { } beforeEach(function () { - return Controller.createCluster(null, null) + return RC.createCluster(null, null) .then((c) => { cluster = c; - return Controller.startMember(cluster.id); + return RC.startMember(cluster.id); }) .then(() => { return Client.newHazelcastClient({ @@ -51,8 +51,8 @@ describe('DistributedObjectsTest', function () { }); afterEach(function () { - client.shutdown(); - return Controller.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('get distributed objects with no object on cluster', function () { @@ -122,7 +122,7 @@ describe('DistributedObjectsTest', function () { .then((objects) => { // Make sure that live objects are not deleted expect(toNamespace(objects)).to.have.deep.members(toNamespace([map, set, queue])); - otherClient.shutdown(); + return otherClient.shutdown(); }); }); @@ -174,7 +174,7 @@ describe('DistributedObjectsTest', function () { }) .then((objects) => { expect(objects).to.have.lengthOf(0); - otherClient.shutdown(); + return otherClient.shutdown(); }); }); }); diff --git a/test/integration/InitialMembershipListenerTest.js b/test/integration/InitialMembershipListenerTest.js index 1977889da..8b0d3c98e 100644 --- a/test/integration/InitialMembershipListenerTest.js +++ b/test/integration/InitialMembershipListenerTest.js @@ -19,10 +19,10 @@ const chai = require('chai'); const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); +const { expect } = require('chai'); -const expect = require('chai').expect; -const Client = require('../../.').Client; const RC = require('../RC'); +const { Client } = require('../../.'); const Util = require('../../lib/util/Util'); describe('InitialMembershipListenerTest', function () { @@ -33,26 +33,19 @@ describe('InitialMembershipListenerTest', function () { let initialMember; let client; - beforeEach(function () { - return RC.createCluster(null, null) - .then((c) => { - cluster = c; - return RC.startMember(cluster.id); - }) - .then((m) => { - initialMember = m; - }) + beforeEach(async function () { + cluster = await RC.createCluster(null, null); + initialMember = await RC.startMember(cluster.id); }); - afterEach(function () { + afterEach(async function () { if (client != null) { - client.shutdown(); + await client.shutdown(); } - return RC.terminateCluster(cluster.id); }); - it('receives available member when added before client start', function (done) { + it('should receive available member when added before client start', function (done) { const config = { clusterName: cluster.id, membershipListeners: [ @@ -73,9 +66,10 @@ describe('InitialMembershipListenerTest', function () { .then((c) => { client = c; }) + .catch(done); }); - it('receives available member when added after client start', function (done) { + it('should receive available member when added after client start', function (done) { const membershipListener = { init: (event) => { const members = event.members; @@ -91,10 +85,11 @@ describe('InitialMembershipListenerTest', function () { .then((c) => { client = c; client.getClusterService().addMembershipListener(membershipListener); - }); + }) + .catch(done); }); - it('receives events after initial event', function (done) { + it('should receive events after initial event', function (done) { let newMember; const newMemberResolved = Util.DeferredPromise(); @@ -133,9 +128,6 @@ describe('InitialMembershipListenerTest', function () { newMember = m; newMemberResolved.resolve(); }) - .catch((e) => { - done(e); - }); + .catch(done); }); - }); diff --git a/test/list/ListProxyTest.js b/test/list/ListProxyTest.js index 933ebb769..8dad07d01 100644 --- a/test/list/ListProxyTest.js +++ b/test/list/ListProxyTest.js @@ -50,8 +50,8 @@ describe('ListProxyTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('appends one item', function () { diff --git a/test/map/MapAggregatorsDoubleTest.js b/test/map/MapAggregatorsDoubleTest.js index 66bd36811..4abf94ed6 100644 --- a/test/map/MapAggregatorsDoubleTest.js +++ b/test/map/MapAggregatorsDoubleTest.js @@ -42,8 +42,8 @@ describe('MapAggregatorsDoubleTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { diff --git a/test/map/MapAggregatorsIntTest.js b/test/map/MapAggregatorsIntTest.js index 9d4cc1c12..18ea555b8 100644 --- a/test/map/MapAggregatorsIntTest.js +++ b/test/map/MapAggregatorsIntTest.js @@ -47,8 +47,8 @@ describe('MapAggregatorsIntTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { diff --git a/test/map/MapAggregatorsLongTest.js b/test/map/MapAggregatorsLongTest.js index 4673d2b0e..4fb34ed49 100644 --- a/test/map/MapAggregatorsLongTest.js +++ b/test/map/MapAggregatorsLongTest.js @@ -48,8 +48,8 @@ describe('MapAggregatorsLongTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { diff --git a/test/map/MapEntryProcessorTest.js b/test/map/MapEntryProcessorTest.js index 450882cba..44000bbad 100644 --- a/test/map/MapEntryProcessorTest.js +++ b/test/map/MapEntryProcessorTest.js @@ -53,8 +53,8 @@ describe('Entry Processor', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index 567316082..b37d42653 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -68,9 +68,8 @@ describe('MapPartitionAwareTest', function () { }); after(function () { - this.timeout(30000); - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 8f22c9071..66ab9bd6e 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -69,8 +69,8 @@ describe('MapPredicateTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); function fillMap(size) { diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index 5ad16dfbf..8cb39be94 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -74,8 +74,8 @@ describe('MapProxyTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); function generateLockScript(mapName, keyName) { diff --git a/test/map/MapStoreTest.js b/test/map/MapStoreTest.js index d6e2d3190..6f5ea8831 100644 --- a/test/map/MapStoreTest.js +++ b/test/map/MapStoreTest.js @@ -56,8 +56,8 @@ describe('MapStoreTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('loadAll with no arguments loads all keys', function () { diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index ab844aa44..ea1bd6a2b 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -67,9 +67,9 @@ describe('NearCachedMapStress', function () { }); after(function () { - client1.shutdown(); - validatingClient.shutdown(); - return RC.terminateCluster(cluster.id); + return client1.shutdown() + .then(() => validatingClient.shutdown()) + .then(() => RC.terminateCluster(cluster.id)); }); function completeOperation() { diff --git a/test/map/NearCachedMapTest.js b/test/map/NearCachedMapTest.js index b81259d7d..f62e26fae 100644 --- a/test/map/NearCachedMapTest.js +++ b/test/map/NearCachedMapTest.js @@ -73,9 +73,9 @@ describe('NearCachedMapTest', function () { }); after(function () { - client1.shutdown(); - client2.shutdown(); - return RC.terminateCluster(cluster.id); + return client1.shutdown() + .then(() => client2.shutdown()) + .then(() => RC.terminateCluster(cluster.id)); }); function getNearCacheStats(map) { diff --git a/test/multimap/MultiMapProxyListenersTest.js b/test/multimap/MultiMapProxyListenersTest.js index 0ae2cd80e..426fe87cb 100644 --- a/test/multimap/MultiMapProxyListenersTest.js +++ b/test/multimap/MultiMapProxyListenersTest.js @@ -50,8 +50,8 @@ describe("MultiMap Proxy Listener", function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); function Listener(eventName, doneCallback, expectedName, expectedKey, expectedValue, expectedOldValue, diff --git a/test/multimap/MultiMapProxyLockTest.js b/test/multimap/MultiMapProxyLockTest.js index 07b8ccd40..cb6bf68b3 100644 --- a/test/multimap/MultiMapProxyLockTest.js +++ b/test/multimap/MultiMapProxyLockTest.js @@ -61,9 +61,9 @@ describe('MultiMapProxyLockTest', function () { }); after(function () { - clientOne.shutdown(); - clientTwo.shutdown(); - return RC.terminateCluster(cluster.id); + return clientOne.shutdown() + .then(() => clientTwo.shutdown()) + .then(() => RC.terminateCluster(cluster.id)); }); diff --git a/test/multimap/MultiMapProxyTest.js b/test/multimap/MultiMapProxyTest.js index 524613e52..9e9baf439 100644 --- a/test/multimap/MultiMapProxyTest.js +++ b/test/multimap/MultiMapProxyTest.js @@ -52,8 +52,8 @@ describe('MultiMapProxyTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('adds and retrieves a single item', function () { diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index af2f7e15d..e0cc1818b 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -45,8 +45,8 @@ describe('Invalidation metadata distortion', function () { }); afterEach(function () { - client.shutdown(); - validationClient.shutdown(); + return client.shutdown() + .then(() => validationClient.shutdown()); }); function createConfig(withNearCache) { diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index 55d09db87..ad1623113 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -85,8 +85,8 @@ describe('LostInvalidationTest', function () { }); afterEach(function () { - client.shutdown(); - modifyingClient.shutdown(); + return client.shutdown() + .then(() => modifyingClient.shutdown()); }); after(function () { diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index 50555d663..2fc700725 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -91,7 +91,7 @@ describe('MigratedDataTest', function () { }); afterEach(function () { - client.shutdown(); + return client.shutdown(); }); after(function () { diff --git a/test/nearcache/NearCacheSimpleInvalidationTest.js b/test/nearcache/NearCacheSimpleInvalidationTest.js index 7005239b2..70af94987 100644 --- a/test/nearcache/NearCacheSimpleInvalidationTest.js +++ b/test/nearcache/NearCacheSimpleInvalidationTest.js @@ -56,9 +56,9 @@ describe('NearCacheSimpleInvalidationTest', function () { }); after(function () { - client.shutdown(); - updaterClient.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => updaterClient.shutdown()) + .then(() => RC.terminateCluster(cluster.id)); }); it('client observes outside invalidations', function () { diff --git a/test/nearcache/impl/RepairingTaskTest.js b/test/nearcache/impl/RepairingTaskTest.js index f2658a438..9a383e14f 100644 --- a/test/nearcache/impl/RepairingTaskTest.js +++ b/test/nearcache/impl/RepairingTaskTest.js @@ -34,7 +34,7 @@ describe('RepairingTask', function () { afterEach(function () { if (client != null) { - client.shutdown(); + return client.shutdown(); } }); diff --git a/test/pncounter/PNCounterBasicTest.js b/test/pncounter/PNCounterBasicTest.js index 82152232f..75a2e3f45 100644 --- a/test/pncounter/PNCounterBasicTest.js +++ b/test/pncounter/PNCounterBasicTest.js @@ -37,8 +37,8 @@ describe('PNCounterBasicTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { diff --git a/test/pncounter/PNCounterConsistencyTest.js b/test/pncounter/PNCounterConsistencyTest.js index 8a212bc19..76076911f 100644 --- a/test/pncounter/PNCounterConsistencyTest.js +++ b/test/pncounter/PNCounterConsistencyTest.js @@ -26,58 +26,39 @@ const { Client, ConsistencyLostError } = require('../../'); describe('PNCounterConsistencyTest', function () { + this.timeout(10000); + let cluster; let client; - beforeEach(function () { - this.timeout(10000); - return RC.createCluster(null, fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')) - .then(function (cl) { - cluster = cl; - return RC.startMember(cluster.id); - }) - .then(function () { - return RC.startMember(cluster.id); - }) - .then(function () { - return Client.newHazelcastClient({ clusterName: cluster.id }); - }) - .then(function (value) { - client = value; - }); + beforeEach(async function () { + cluster = await RC.createCluster(null, + fs.readFileSync(path.resolve(__dirname, 'hazelcast_crdtreplication_delayed.xml'), 'utf8')); + await RC.startMember(cluster.id); + await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ clusterName: cluster.id }); }); - afterEach(function () { - this.timeout(10000); - client.shutdown(); + afterEach(async function () { + await client.shutdown(); return RC.terminateCluster(cluster.id); }); - it('target replica killed, no replica is sufficiently up-to-date, get operation throws ConsistencyLostError', function () { - let pnCounter; - return client.getPNCounter('pncounter').then(function (counter) { - pnCounter = counter; - return pnCounter.getAndAdd(3) - }).then(function () { - const currentReplicaAddress = pnCounter.currentTargetReplicaAddress; - return RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); - }).then(function () { - return expect(pnCounter.addAndGet(10)).to.be.rejectedWith(ConsistencyLostError); - }); + it('target replica killed, no replica is up-to-date, get operation throws ConsistencyLostError', async function () { + const pnCounter = await client.getPNCounter('pncounter'); + await pnCounter.getAndAdd(3) + const currentReplicaAddress = pnCounter.currentTargetReplicaAddress; + await RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); + + await expect(pnCounter.addAndGet(10)).to.be.rejectedWith(ConsistencyLostError); }); - it('target replica killed, no replica is sufficiently up-to-date, get operation may proceed after calling reset', function () { - let pnCounter; - return client.getPNCounter('pncounter').then(function (counter) { - pnCounter = counter; - return pnCounter.getAndAdd(3); - }).then(function () { - const currentReplicaAddress = pnCounter.currentTargetReplicaAddress; - return RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); - }).then(function () { - return pnCounter.reset(); - }).then(function () { - return pnCounter.addAndGet(10); - }); + it('target replica killed, no replica is up-to-date, get operation proceeds after calling reset', async function () { + const pnCounter = await client.getPNCounter('pncounter'); + await pnCounter.getAndAdd(3); + const currentReplicaAddress = pnCounter.currentTargetReplicaAddress; + await RC.terminateMember(cluster.id, currentReplicaAddress.uuid.toString()); + await pnCounter.reset(); + await pnCounter.addAndGet(10); }) }); diff --git a/test/pncounter/PNCounterWithLiteMembersTest.js b/test/pncounter/PNCounterWithLiteMembersTest.js index 82f62d249..1a07f648c 100644 --- a/test/pncounter/PNCounterWithLiteMembersTest.js +++ b/test/pncounter/PNCounterWithLiteMembersTest.js @@ -45,8 +45,8 @@ describe('PNCounterWithLiteMembersTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index e3017a6b0..9d31a8dab 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -69,8 +69,8 @@ describe('QueueProxyTest', function () { } after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('size', function () { diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 4cd96e957..63fdf388a 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -54,8 +54,8 @@ describe('ReplicatedMapProxyTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('puts one entry and gets one entry', function () { diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js index 41250947a..7f46b41dd 100644 --- a/test/rest_value/RestValueTest.js +++ b/test/rest_value/RestValueTest.js @@ -45,8 +45,8 @@ describe('RestValueTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('client should receive REST events from server as RestValue', function (done) { diff --git a/test/ringbuffer/RingbufferProxyTest.js b/test/ringbuffer/RingbufferProxyTest.js index 455d130be..8905db0f6 100644 --- a/test/ringbuffer/RingbufferProxyTest.js +++ b/test/ringbuffer/RingbufferProxyTest.js @@ -51,8 +51,8 @@ describe('RingbufferProxyTest', function () { }); after(async function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('adds one item and reads back', async function () { diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index 4cca150a5..b52bc4ad9 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -40,8 +40,8 @@ describe('DefaultSerializersLiveTest', function () { }); after(async function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); function generateGet(key) { diff --git a/test/serialization/PortableSerializersLiveTest.js b/test/serialization/PortableSerializersLiveTest.js index 5dfc17a82..64912e5ce 100644 --- a/test/serialization/PortableSerializersLiveTest.js +++ b/test/serialization/PortableSerializersLiveTest.js @@ -15,17 +15,17 @@ */ 'use strict'; -const expect = require('chai').expect; -const Promise = require('bluebird'); +const { expect } = require('chai'); -const Client = require('../../.').Client; const RC = require('../RC'); -const SimplePortable = require('./PortableObjects').SimplePortable; -const InnerPortable = require('./PortableObjects').InnerPortable; +const { Client } = require('../../.'); +const { SimplePortable } = require('./PortableObjects'); +const { InnerPortable } = require('./PortableObjects'); describe('PortableSerializersLiveTest', function () { - let cluster, client; + let cluster; + let client; let map; function getClientConfig(clusterName) { @@ -47,62 +47,46 @@ describe('PortableSerializersLiveTest', function () { }; } - before(function () { - return RC.createCluster(null, null).then(function (res) { - cluster = res; - }).then(function () { - return RC.startMember(cluster.id); - }).then(function (m) { - return Client.newHazelcastClient(getClientConfig(cluster.id)); - }).then(function (cl) { - client = cl; - return client.getMap('test'); - }).then(function (mp) { - map = mp; - }); + before(async function () { + cluster = await RC.createCluster(null, null); + await RC.startMember(cluster.id); + client = await Client.newHazelcastClient(getClientConfig(cluster.id)); + map = await client.getMap('test'); }); - after(function () { - client.shutdown(); + after(async function () { + await client.shutdown(); return RC.terminateCluster(cluster.id); }); - it('client can write and read two different serializable objects of the same factory', function () { + it('client can write and read two different serializable objects of the same factory', async function () { const simplePortable = new SimplePortable('atext'); const innerPortable = new InnerPortable('str1', 'str2'); - return map.put('simpleportable', simplePortable).then(function () { - return map.put('innerportable', innerPortable); - }).then(function () { - return map.get('simpleportable'); - }).then(function (sp) { - return map.get('innerportable').then(function (ip) { - expect(sp).to.deep.equal(simplePortable); - expect(ip).to.deep.equal(innerPortable); - return Promise.resolve(); - }); - }); + await map.put('simpleportable', simplePortable); + await map.put('innerportable', innerPortable); + + const sp = await map.get('simpleportable'); + const ip = await map.get('innerportable'); + + expect(sp).to.deep.equal(simplePortable); + expect(ip).to.deep.equal(innerPortable); }); - it('client can read two different serializable objects of the same factory (written by another client)', function () { + it('client can read two different serializable objects of the same factory (written by another client)', async function () { const simplePortable = new SimplePortable('atext'); const innerPortable = new InnerPortable('str1', 'str2'); - return map.putAll([['simpleportable', simplePortable], ['innerportable', innerPortable]]).then(function () { - client.shutdown(); - }).then(function () { - return Client.newHazelcastClient(getClientConfig(cluster.id)); - }).then(function (cl) { - client = cl; - return client.getMap('test'); - }).then(function (mp) { - map = mp; - return map.get('simpleportable'); - }).then(function (sp) { - return map.get('innerportable').then(function (ip) { - expect(sp).to.deep.equal(simplePortable); - expect(ip).to.deep.equal(innerPortable); - return Promise.resolve(); - }); - }); - }); + await map.putAll([ + ['simpleportable', simplePortable], + ['innerportable', innerPortable] + ]); + await client.shutdown(); + client = await Client.newHazelcastClient(getClientConfig(cluster.id)); + map = await client.getMap('test'); + const sp = await map.get('simpleportable'); + const ip = await map.get('innerportable'); + + expect(sp).to.deep.equal(simplePortable); + expect(ip).to.deep.equal(innerPortable); + }); }); diff --git a/test/serialization/config/CustomSerializerConfigTest.js b/test/serialization/config/CustomSerializerConfigTest.js index 63bbaec5f..66e009d40 100644 --- a/test/serialization/config/CustomSerializerConfigTest.js +++ b/test/serialization/config/CustomSerializerConfigTest.js @@ -33,8 +33,8 @@ describe('CustomSerializerConfigTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); function createConfig(clusterName) { diff --git a/test/serialization/config/FactoriesTest.js b/test/serialization/config/FactoriesTest.js index 752f997c5..e700864b4 100644 --- a/test/serialization/config/FactoriesTest.js +++ b/test/serialization/config/FactoriesTest.js @@ -39,7 +39,7 @@ describe('FactoriesTest', function () { afterEach(function () { if (client != null) { - client.shutdown(); + return client.shutdown(); } }); diff --git a/test/set/SetProxyTest.js b/test/set/SetProxyTest.js index bb8d200c4..0a3cf322b 100644 --- a/test/set/SetProxyTest.js +++ b/test/set/SetProxyTest.js @@ -49,8 +49,8 @@ describe('SetProxyTest', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('adds one item', function () { diff --git a/test/ssl/ClientSSLAuthenticationTest.js b/test/ssl/ClientSSLAuthenticationTest.js index e38a5b7d4..405a9fa51 100644 --- a/test/ssl/ClientSSLAuthenticationTest.js +++ b/test/ssl/ClientSSLAuthenticationTest.js @@ -120,7 +120,7 @@ describe('ClientSSLAuthenticationTest', function () { './client1-key.pem', './client1-cert.pem', './server1-cert.pem' )); }).then(function (client) { - client.shutdown(); + return client.shutdown(); }); }); @@ -154,7 +154,7 @@ describe('ClientSSLAuthenticationTest', function () { './client1-key.pem', './client1-cert.pem', './server1-cert.pem' )); }).then(function (client) { - client.shutdown(); + return client.shutdown(); }); }); diff --git a/test/ssl/ClientSSLTest.js b/test/ssl/ClientSSLTest.js index d9d2e33e2..2fee2ada3 100644 --- a/test/ssl/ClientSSLTest.js +++ b/test/ssl/ClientSSLTest.js @@ -26,6 +26,8 @@ const { markEnterprise } = require('../Util'); describe('ClientSSLTest', function () { + this.timeout(20000); + let cluster; let client; let serverConfig; @@ -35,66 +37,60 @@ describe('ClientSSLTest', function () { }); beforeEach(function () { - this.timeout(20000); serverConfig = fs.readFileSync(__dirname + '/hazelcast-ssl.xml', 'utf8'); }); - afterEach(function () { - this.timeout(20000); + afterEach(async function () { if (client) { - client.shutdown(); + await client.shutdown(); client = null; } return RC.terminateCluster(cluster.id); }); - function createCluster(sConfig) { - return RC.createCluster(null, sConfig).then(function (response) { - cluster = response; - return RC.startMember(cluster.id); - }); + async function createCluster(sConfig) { + cluster = await RC.createCluster(null, sConfig); + return RC.startMember(cluster.id); } - it('should not be able to connect to the server with invalid certificate', function () { + it('should not be able to connect to the server with invalid certificate', async function () { const sConfig = serverConfig .replace('[serverCertificate]', 'com/hazelcast/nio/ssl-mutual-auth/server1.keystore') .replace('[password]', 'password'); - return createCluster(sConfig).then(function () { - return expect(Client.newHazelcastClient({ - clusterName: cluster.id, - network: { - clusterMembers: ['127.0.0.1:5701'], - ssl: { - enabled: true - } - }, - connectionStrategy: { - connectionRetry: { - clusterConnectTimeoutMillis: 1000 - } + await createCluster(sConfig); + + await expect(Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + clusterMembers: ['127.0.0.1:5701'], + ssl: { + enabled: true } - })).to.be.rejectedWith(IllegalStateError); - }) + }, + connectionStrategy: { + connectionRetry: { + clusterConnectTimeoutMillis: 1000 + } + } + })).to.be.rejectedWith(IllegalStateError); }); - it('should be able to connect to the server with valid certificate', function () { + it('should be able to connect to the server with valid certificate', async function () { const sConfig = serverConfig .replace('[serverCertificate]', 'com/hazelcast/nio/ssl/letsencrypt.jks') .replace('[password]', '123456'); - return createCluster(sConfig).then(function () { - return Client.newHazelcastClient({ - clusterName: cluster.id, - network: { - clusterMembers: ['127.0.0.1:5701'], - ssl: { - enabled: true - } + await createCluster(sConfig); + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + clusterMembers: ['127.0.0.1:5701'], + ssl: { + enabled: true } - }); - }).then(function (hazelcastClient) { - client = hazelcastClient; - return expect(client.lifecycleService.isRunning()).to.be.true; + } }); + + expect(client.lifecycleService.isRunning()).to.be.true; }); }); diff --git a/test/statistics/StatisticsTest.js b/test/statistics/StatisticsTest.js index daf2c5987..f6abd2e3a 100644 --- a/test/statistics/StatisticsTest.js +++ b/test/statistics/StatisticsTest.js @@ -90,8 +90,8 @@ describe('StatisticsTest (default period)', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); beforeEach(function () { @@ -193,8 +193,8 @@ describe('StatisticsTest (non-default period)', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('should not change before period', function () { @@ -248,8 +248,8 @@ describe('StatisticsTest (negative period)', function () { }); after(function () { - client.shutdown(); - return RC.terminateCluster(cluster.id); + return client.shutdown() + .then(() => RC.terminateCluster(cluster.id)); }); it('should be enabled via configuration', function () { diff --git a/test/topic/ReliableTopicTest.js b/test/topic/ReliableTopicTest.js index 1d8cdd44f..1c83012fe 100644 --- a/test/topic/ReliableTopicTest.js +++ b/test/topic/ReliableTopicTest.js @@ -67,9 +67,9 @@ describe('ReliableTopicTest', function () { }); after(async function () { - clientOne.shutdown(); - clientTwo.shutdown(); - return RC.terminateCluster(cluster.id); + return clientOne.shutdown() + .then(() => clientTwo.shutdown()) + .then(() => RC.terminateCluster(cluster.id)); }); it('writes and reads messages', function (done) { diff --git a/test/unit/proxy/cpsubsystem/CPSessionManagerTest.js b/test/unit/proxy/cpsubsystem/CPSessionManagerTest.js new file mode 100644 index 000000000..cc712ef4a --- /dev/null +++ b/test/unit/proxy/cpsubsystem/CPSessionManagerTest.js @@ -0,0 +1,283 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const chai = require('chai'); +chai.should(); +chai.use(require('chai-as-promised')); +const expect = chai.expect; +const sinon = require('sinon'); +const sandbox = sinon.createSandbox(); +const Long = require('long'); +const { + Client, + IllegalStateError, + SessionExpiredError +} = require('../../../../'); +const { + SessionState, + CPSessionManager +} = require('../../../../lib/proxy/cpsubsystem/CPSessionManager'); +const { RaftGroupId } = require('../../../../lib/proxy/cpsubsystem/RaftGroupId'); + +describe('CPSessionManagerTest', function () { + + afterEach(function () { + sandbox.restore(); + }); + + describe('SessionState', function () { + + it('acquire: should increment counter', function () { + const state = new SessionState(Long.fromNumber(42), null, 1000); + + expect(state.acquireCount).to.be.equal(0); + + const id = state.acquire(5); + expect(id.toNumber()).to.be.equal(42); + expect(state.acquireCount).to.be.equal(5); + }); + + it('release: should decrement counter', function () { + const state = new SessionState(Long.fromNumber(42), null, 1000); + + state.acquire(3); + expect(state.acquireCount).to.be.equal(3); + + state.release(2); + expect(state.acquireCount).to.be.equal(1); + }); + + it('isInUse: should consider current acquire count', function () { + const state = new SessionState(Long.fromNumber(42), null, 1000); + + expect(state.acquireCount).to.be.equal(0); + expect(state.isInUse()).to.be.false; + + state.acquire(1); + expect(state.isInUse()).to.be.true; + }); + + it('isValid: should consider current acquire count', function () { + sandbox.useFakeTimers(0); + const state = new SessionState(Long.fromNumber(42), null, 1000); + + // session should be expired now + sandbox.useFakeTimers(2000); + expect(state.isValid()).to.be.false; + + state.acquire(1); + expect(state.isValid()).to.be.true; + }); + + it('isValid: should consider current acquire count', function () { + sandbox.useFakeTimers(0); + const state = new SessionState(Long.fromNumber(42), null, 1000); + + // session should be expired now + sandbox.useFakeTimers(2000); + expect(state.isValid()).to.be.false; + + state.acquire(1); + expect(state.isValid()).to.be.true; + }); + + it('isValid: should consider current time', function () { + sandbox.useFakeTimers(0); + const state = new SessionState(Long.fromNumber(42), null, 1000); + + expect(state.isValid()).to.be.true; + + // session should be expired now + sandbox.useFakeTimers(2000); + expect(state.isValid()).to.be.false; + }); + }); + + describe('CPProxySessionManager', function () { + + const GROUP_ID = 42; + const GROUP_ID_AS_STRING = prepareGroupId().getStringId(); + const SESSION_ID = 24; + const TTL_MILLIS = 1000; + const HEARTBEAT_MILLIS = 100; + + let clientStub; + let sessionManager; + + function prepareGroupId() { + return new RaftGroupId('test', Long.fromNumber(0), Long.fromNumber(GROUP_ID)); + } + + function prepareSessionState(groupId) { + return new SessionState(Long.fromNumber(SESSION_ID), groupId, TTL_MILLIS); + } + + function stubRequestNewSession() { + const stub = sandbox.stub(sessionManager, 'requestNewSession'); + stub.returns(Promise.resolve({ + sessionId: Long.fromNumber(SESSION_ID), + ttlMillis: Long.fromNumber(TTL_MILLIS), + heartbeatMillis: Long.fromNumber(HEARTBEAT_MILLIS) + })); + return stub; + } + + beforeEach(function () { + clientStub = sandbox.stub(Client.prototype); + sessionManager = new CPSessionManager(clientStub); + }); + + afterEach(async function () { + // prevents from requestCloseSession calls + sessionManager.sessions.clear(); + return sessionManager.shutdown(); + }); + + it('getSessionId: should return no session id for unknown session', function () { + const id = sessionManager.getSessionId(prepareGroupId()); + expect(id.toNumber()).to.be.equal(-1); + }); + + it('getSessionId: should return session id for known session', function () { + sessionManager.sessions.set(GROUP_ID_AS_STRING, prepareSessionState()); + let id = sessionManager.getSessionId(prepareGroupId()); + expect(id.toNumber()).to.be.equal(SESSION_ID); + }); + + it('acquireSession: should reject when shut down', async function () { + await sessionManager.shutdown(); + + expect(sessionManager.acquireSession(prepareGroupId(42))).to.be.rejectedWith(IllegalStateError); + }); + + it('acquireSession: should create new session for unknown group id', async function () { + stubRequestNewSession(); + + const id = await sessionManager.acquireSession(prepareGroupId()); + expect(id.toNumber()).to.be.equal(SESSION_ID); + expect(sessionManager.sessions.get(GROUP_ID_AS_STRING).acquireCount).to.be.equal(1); + }); + + it('acquireSession: should create new session for existing invalid session', async function () { + const requestNewSessionStub = stubRequestNewSession(); + + const groupId = prepareGroupId(); + const state = prepareSessionState(groupId); + sandbox.stub(state, 'isValid').returns(false); + sessionManager.sessions.set(GROUP_ID_AS_STRING, state); + + const id = await sessionManager.acquireSession(groupId); + expect(id.toNumber()).to.be.equal(SESSION_ID); + expect(requestNewSessionStub.withArgs(state.groupId).calledOnce).to.be.true; + expect(sessionManager.sessions.get(GROUP_ID_AS_STRING).acquireCount).to.be.equal(1); + }); + + it('acquireSession: should not create new session for existing valid session', async function () { + const requestNewSessionStub = stubRequestNewSession(); + sessionManager.sessions.set(GROUP_ID_AS_STRING, prepareSessionState()); + + const id = await sessionManager.acquireSession(prepareGroupId()); + expect(id.toNumber()).to.be.equal(SESSION_ID); + expect(requestNewSessionStub.notCalled).to.be.true; + expect(sessionManager.sessions.get(GROUP_ID_AS_STRING).acquireCount).to.be.equal(1); + }); + + it('releaseSession: should decrement acquire counter for known session', function () { + sessionManager.sessions.set(GROUP_ID_AS_STRING, prepareSessionState()); + + sessionManager.releaseSession(prepareGroupId(), Long.fromNumber(SESSION_ID)); + expect(sessionManager.sessions.get(GROUP_ID_AS_STRING).acquireCount).to.be.equal(-1); + }); + + it('releaseSession: should not decrement acquire counter for unknown session', function () { + sessionManager.sessions.set(GROUP_ID_AS_STRING, prepareSessionState()); + + sessionManager.releaseSession(prepareGroupId(), Long.fromNumber(1)); + expect(sessionManager.sessions.get(GROUP_ID_AS_STRING).acquireCount).to.be.equal(0); + }); + + it('invalidateSession: should forget known session', function () { + sessionManager.sessions.set(GROUP_ID_AS_STRING, prepareSessionState()); + + sessionManager.invalidateSession(prepareGroupId(), Long.fromNumber(SESSION_ID)); + expect(sessionManager.sessions.size).to.be.equal(0); + }); + + it('invalidateSession: should do nothing when called for unknown session', function () { + sessionManager.sessions.set(GROUP_ID_AS_STRING, prepareSessionState()); + + sessionManager.invalidateSession(prepareGroupId(), Long.fromNumber(1)); + expect(sessionManager.sessions.size).to.be.equal(1); + }); + + it('shutdown: should cancel heartbeat task', async function () { + sessionManager.heartbeatTask = {}; + const cancelStub = sandbox.stub(sessionManager, 'cancelHeartbeatTask'); + + await sessionManager.shutdown(); + expect(cancelStub.calledOnce).to.be.true; + }); + + it('shutdown: should close known sessions', async function () { + const groupId = prepareGroupId(); + const state = prepareSessionState(groupId); + sessionManager.sessions.set(GROUP_ID_AS_STRING, state); + const closeSessionStub = sandbox.stub(sessionManager, 'requestCloseSession'); + closeSessionStub.returns(Promise.resolve()); + + await sessionManager.shutdown(); + expect(closeSessionStub.withArgs(state.groupId, state.id).calledOnce).to.be.true; + expect(sessionManager.sessions.size).to.be.equal(0); + }); + + it('heartbeatTask: should send heartbeats periodically', function (done) { + stubRequestNewSession(); + + const requestHeartbeatStub = sandbox.stub(sessionManager, 'requestHeartbeat'); + requestHeartbeatStub.returns(Promise.resolve()); + + const groupId = prepareGroupId(); + sessionManager.acquireSession(groupId) + .then((sessionId) => { + setTimeout(() => { + expect(requestHeartbeatStub.withArgs(groupId, sessionId).callCount).to.be.greaterThan(1); + expect(sessionManager.sessions.size).to.be.equal(1); + done(); + }, HEARTBEAT_MILLIS * 5); + }) + .catch(done); + }); + + it('heartbeatTask: should invalidate sessions when error received', function (done) { + stubRequestNewSession(); + + sandbox.replace(sessionManager, 'requestHeartbeat', function () { + return Promise.reject(new SessionExpiredError()); + }); + + const groupId = prepareGroupId(); + sessionManager.acquireSession(groupId) + .then(() => { + setTimeout(() => { + expect(sessionManager.sessions.size).to.be.equal(0); + done(); + }, HEARTBEAT_MILLIS * 5); + }) + .catch(done); + }); + }); +}); diff --git a/test/unit/proxy/cpsubsystem/FencedLockProxyTest.js b/test/unit/proxy/cpsubsystem/FencedLockProxyTest.js new file mode 100644 index 000000000..38c3b4424 --- /dev/null +++ b/test/unit/proxy/cpsubsystem/FencedLockProxyTest.js @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const chai = require('chai'); +chai.should(); +chai.use(require('chai-as-promised')); +const expect = chai.expect; +const sinon = require('sinon'); +const sandbox = sinon.createSandbox(); +const Long = require('long'); +const { + Client, + IllegalMonitorStateError, + LockOwnershipLostError, + SessionExpiredError, + WaitKeyCancelledError +} = require('../../../../'); +const { FencedLockProxy } = require('../../../../lib/proxy/cpsubsystem/FencedLockProxy'); +const { CPSessionManager } = require('../../../../lib/proxy/cpsubsystem/CPSessionManager'); +const { RaftGroupId } = require('../../../../lib/proxy/cpsubsystem/RaftGroupId'); + +describe('FencedLockProxyTest', function () { + + let clientStub; + let cpSessionManagerStub; + let proxy; + + function prepareGroupId() { + return new RaftGroupId('test', Long.fromNumber(0), Long.fromNumber(42)); + } + + function prepareAcquireSession(sessionId) { + cpSessionManagerStub.acquireSession.returns(Promise.resolve(Long.fromNumber(sessionId))); + } + + function prepareGetSession(sessionId) { + cpSessionManagerStub.getSessionId.returns(Long.fromNumber(sessionId)); + } + + async function prepareForUnlock(lockedSessionId, currentSessionId) { + prepareAcquireSession(lockedSessionId); + stubRequestLock(2); + prepareGetSession(currentSessionId); + + return proxy.lock(); + } + + function stubRequest(methodName, result, firstCallErr) { + let called = 0; + const stub = sandbox.stub(proxy, methodName).callsFake(() => { + if (++called === 1 && firstCallErr !== undefined) { + return Promise.reject(firstCallErr); + } + if (result !== undefined && typeof result === 'number') { + return Promise.resolve(Long.fromNumber(result)); + } + return Promise.resolve(result); + }); + return stub; + } + + function stubRequestLock(fence, firstCallErr) { + return stubRequest('requestLock', fence, firstCallErr); + } + + function stubRequestTryLock(fence, firstCallErr) { + return stubRequest('requestTryLock', fence, firstCallErr); + } + + function stubRequestUnlock(firstCallErr) { + return stubRequest('requestUnlock', undefined, firstCallErr); + } + + function stubRequestLockOwnershipState(state, firstCallErr) { + return stubRequest('requestLockOwnershipState', { + fence: Long.fromNumber(state.fence), + sessionId: Long.fromNumber(state.sessionId), + threadId: Long.fromNumber(state.threadId) + }, firstCallErr); + } + + beforeEach(function () { + clientStub = sandbox.stub(Client.prototype); + cpSessionManagerStub = sandbox.stub(CPSessionManager.prototype); + clientStub.getCPSubsystem.returns({ + getCPSessionManager: () => cpSessionManagerStub + }); + proxy = new FencedLockProxy(clientStub, prepareGroupId(), 'mylock@mygroup', 'mylock'); + }); + + afterEach(function () { + sandbox.restore(); + }); + + it('lock: should return fence on successful acquire', async function () { + prepareAcquireSession(1); + stubRequestLock(2); + + const fence = await proxy.lock(); + expect(fence.toNumber()).to.be.equal(2); + }); + + it('lock: should keep trying to acquire on expired session error', async function () { + prepareAcquireSession(1); + stubRequestLock(2, new SessionExpiredError()); + + const fence = await proxy.lock(); + expect(fence.toNumber()).to.be.equal(2); + expect(cpSessionManagerStub.invalidateSession.calledOnce).to.be.true; + }); + + it('lock: should throw on wait key cancelled error', async function () { + prepareAcquireSession(1); + stubRequestLock(2, new WaitKeyCancelledError()); + + await expect(proxy.lock()).to.be.rejectedWith(IllegalMonitorStateError); + expect(cpSessionManagerStub.releaseSession.calledOnce).to.be.true; + }); + + it('lock: should throw on unexpected error', async function () { + prepareAcquireSession(1); + stubRequestLock(2, new Error()); + + await expect(proxy.lock()).to.be.rejectedWith(Error); + }); + + it('tryLock: should return fence on successful acquire', async function () { + prepareAcquireSession(1); + stubRequestTryLock(2); + + const fence = await proxy.tryLock(); + expect(fence.toNumber()).to.be.equal(2); + }); + + it('tryLock: should return release session on failed acquire', async function () { + prepareAcquireSession(1); + stubRequestTryLock(0); + + const fence = await proxy.tryLock(); + expect(fence).to.be.undefined; + expect(cpSessionManagerStub.releaseSession.calledOnce).to.be.true; + }); + + it('tryLock: should return undefined on expired session error and no timeout', async function () { + sandbox.useFakeTimers(0); + prepareAcquireSession(1); + stubRequestTryLock(2, new SessionExpiredError()); + + const promise = proxy.tryLock(); + // advance time as if requests were real + sandbox.useFakeTimers(100); + const fence = await promise; + + expect(fence).to.be.undefined; + expect(cpSessionManagerStub.invalidateSession.calledOnce).to.be.true; + }); + + it('tryLock: should keep trying on expired session error and specified timeout', async function () { + sandbox.useFakeTimers(0); + prepareAcquireSession(1); + stubRequestTryLock(2, new SessionExpiredError()); + + const promise = proxy.tryLock(1000); + // advance time as if requests were real + sandbox.useFakeTimers(100); + const fence = await promise; + + expect(fence.toNumber()).to.be.equal(2); + expect(cpSessionManagerStub.invalidateSession.calledOnce).to.be.true; + }); + + it('tryLock: should return undefined on wait key cancelled error', async function () { + prepareAcquireSession(1); + stubRequestTryLock(2, new WaitKeyCancelledError()); + + const fence = await proxy.tryLock(); + + expect(fence).to.be.undefined; + expect(cpSessionManagerStub.releaseSession.calledOnce).to.be.true; + }); + + it('tryLock: should throw on unexpected error', async function () { + prepareAcquireSession(1); + stubRequestTryLock(2, new Error()); + + await expect(proxy.tryLock()).to.be.rejectedWith(Error); + }); + + it('unlock: should release session when lock held', async function () { + const fence = await prepareForUnlock(1, 1); + stubRequestUnlock(); + + await proxy.unlock(fence); + expect(cpSessionManagerStub.releaseSession.calledOnce).to.be.true; + }); + + it('unlock: should throw on no argument', function () { + expect(() => proxy.unlock()).to.throw(TypeError); + }); + + it('unlock: should throw on invalid fence given', function () { + expect(() => proxy.unlock(Long.fromNumber(1))).to.throw(TypeError); + }); + + it('unlock: should throw when session id has changed', async function () { + const fence = await prepareForUnlock(1, 2); + + await expect(proxy.unlock(fence)).to.be.rejectedWith(LockOwnershipLostError); + }); + + it('unlock: should throw when no active session id and no lock is held', async function () { + const fence = await prepareForUnlock(1, -1); + // clean up internal map as if the lock is not held + proxy.lockedSessionIds.clear(); + + await expect(proxy.unlock(fence)).to.be.rejectedWith(IllegalMonitorStateError); + }); + + it('unlock: should throw on expired session error', async function () { + const fence = await prepareForUnlock(1, 1); + stubRequestUnlock(new SessionExpiredError()); + + await expect(proxy.unlock(fence)).to.be.rejectedWith(LockOwnershipLostError); + expect(cpSessionManagerStub.invalidateSession.calledOnce).to.be.true; + }); + + it('isLocked: should return true when lock is held', async function () { + prepareGetSession(1); + stubRequestLockOwnershipState({ + fence: 2, + sessionId: 3, + threadId: 3 + }); + + const result = await proxy.isLocked(); + expect(result).to.be.true; + }); + + it('isLocked: should return true when lock is held', async function () { + prepareGetSession(1); + stubRequestLockOwnershipState({ + fence: 0, + sessionId: 0, + threadId: 0 + }); + + const result = await proxy.isLocked(); + expect(result).to.be.false; + }); + + it('isLocked: should throw on unexpected error', async function () { + prepareGetSession(1); + stubRequestLockOwnershipState({}, new Error()); + + await expect(proxy.isLocked()).to.be.rejectedWith(Error); + }); +}); From 3d7a0c2b811db66f535f21ec1d087108e997c803 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:44:52 +0300 Subject: [PATCH 287/685] Add default serializer for UUID (#586) --- src/core/UUID.ts | 8 +- src/serialization/DefaultSerializers.ts | 138 ++++++++++-------- src/serialization/SerializationService.ts | 2 + src/util/Util.ts | 4 +- .../DefaultSerializersLiveTest.js | 19 ++- test/serialization/DefaultSerializersTest.js | 10 +- 6 files changed, 112 insertions(+), 69 deletions(-) diff --git a/src/core/UUID.ts b/src/core/UUID.ts index fbfeb5428..1c5ae8d78 100644 --- a/src/core/UUID.ts +++ b/src/core/UUID.ts @@ -37,12 +37,16 @@ export class UUID { this.leastSignificant = leastSig; } - /** @internal */ equals(other: UUID): boolean { if (other == null) { return false; } - return other.mostSignificant.equals(this.mostSignificant) && other.leastSignificant.equals(this.leastSignificant); + return other.mostSignificant.equals(this.mostSignificant) + && other.leastSignificant.equals(this.leastSignificant); + } + + static isUUID(obj: any) { + return obj instanceof UUID; } toString(): string { diff --git a/src/serialization/DefaultSerializers.ts b/src/serialization/DefaultSerializers.ts index dc702ace0..de65d4d20 100644 --- a/src/serialization/DefaultSerializers.ts +++ b/src/serialization/DefaultSerializers.ts @@ -23,46 +23,49 @@ import { IdentifiedDataSerializable, IdentifiedDataSerializableFactory } from './Serializable'; -import {HazelcastJsonValue} from '../core'; +import { + HazelcastJsonValue, + UUID +} from '../core'; /** @internal */ -export class StringSerializer implements Serializer { +export class StringSerializer implements Serializer { id = -11; - read(input: DataInput): any { + read(input: DataInput): string { return input.readUTF(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: string): void { output.writeUTF(object); } } /** @internal */ -export class DoubleSerializer implements Serializer { +export class DoubleSerializer implements Serializer { id = -10; - read(input: DataInput): any { + read(input: DataInput): number { return input.readDouble(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number): void { output.writeDouble(object); } } /** @internal */ -export class BooleanSerializer implements Serializer { +export class BooleanSerializer implements Serializer { id = -4; - read(input: DataInput): any { + read(input: DataInput): boolean { return input.readBoolean(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: boolean): void { output.writeBoolean(object); } } @@ -71,11 +74,11 @@ export class BooleanSerializer implements Serializer { export const NULL_TYPE_ID = 0; /** @internal */ -export class NullSerializer implements Serializer { +export class NullSerializer implements Serializer { id = NULL_TYPE_ID; - read(input: DataInput): any { + read(input: DataInput): null { return null; } @@ -85,91 +88,91 @@ export class NullSerializer implements Serializer { } /** @internal */ -export class ShortSerializer implements Serializer { +export class ShortSerializer implements Serializer { id = -6; - read(input: DataInput): any { + read(input: DataInput): number { return input.readShort(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number): void { output.writeShort(object); } } /** @internal */ -export class IntegerSerializer implements Serializer { +export class IntegerSerializer implements Serializer { id = -7; - read(input: DataInput): any { + read(input: DataInput): number { return input.readInt(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number): void { output.writeInt(object); } } /** @internal */ -export class LongSerializer implements Serializer { +export class LongSerializer implements Serializer { id = -8; - read(input: DataInput): any { + read(input: DataInput): Long { return input.readLong(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: Long): void { output.writeLong(object); } } /** @internal */ -export class FloatSerializer implements Serializer { +export class FloatSerializer implements Serializer { id = -9; - read(input: DataInput): any { + read(input: DataInput): number { return input.readFloat(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number): void { output.writeFloat(object); } } /** @internal */ -export class DateSerializer implements Serializer { +export class DateSerializer implements Serializer { id = -25; - read(input: DataInput): any { + read(input: DataInput): Date { return new Date(input.readLong().toNumber()); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: Date): void { output.writeLong(Long.fromNumber(object.getMilliseconds())); } } /** @internal */ -export class BooleanArraySerializer implements Serializer { +export class BooleanArraySerializer implements Serializer { id = -13; - read(input: DataInput): any { + read(input: DataInput): boolean[] { return input.readBooleanArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: boolean[]): void { output.writeBooleanArray(object); } } /** @internal */ -export class ShortArraySerializer implements Serializer { +export class ShortArraySerializer implements Serializer { id = -15; @@ -177,125 +180,125 @@ export class ShortArraySerializer implements Serializer { return input.readShortArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number[]): void { output.writeShortArray(object); } } /** @internal */ -export class IntegerArraySerializer implements Serializer { +export class IntegerArraySerializer implements Serializer { id = -16; - read(input: DataInput): any { + read(input: DataInput): number[] { return input.readIntArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number[]): void { output.writeIntArray(object); } } /** @internal */ -export class LongArraySerializer implements Serializer { +export class LongArraySerializer implements Serializer { id = -17; - read(input: DataInput): any { + read(input: DataInput): Long[] { return input.readLongArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: Long[]): void { output.writeLongArray(object); } } /** @internal */ -export class DoubleArraySerializer implements Serializer { +export class DoubleArraySerializer implements Serializer { id = -19; - read(input: DataInput): any { + read(input: DataInput): number[] { return input.readDoubleArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number[]): void { output.writeDoubleArray(object); } } /** @internal */ -export class StringArraySerializer implements Serializer { +export class StringArraySerializer implements Serializer { id = -20; - read(input: DataInput): any { + read(input: DataInput): string[] { return input.readUTFArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: string[]): void { output.writeUTFArray(object); } } /** @internal */ -export class ByteSerializer implements Serializer { +export class ByteSerializer implements Serializer { id = -3; - read(input: DataInput): any { + read(input: DataInput): number { return input.readByte(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: number): void { output.writeByte(object); } } /** @internal */ -export class ByteArraySerializer implements Serializer { +export class ByteArraySerializer implements Serializer { id = -12; - read(input: DataInput): any { + read(input: DataInput): Buffer { return input.readByteArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: Buffer): void { output.writeByteArray(object); } } /** @internal */ -export class CharSerializer implements Serializer { +export class CharSerializer implements Serializer { id = -5; - read(input: DataInput): any { + read(input: DataInput): string { return input.readChar(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: string): void { output.writeChar(object); } } /** @internal */ -export class CharArraySerializer implements Serializer { +export class CharArraySerializer implements Serializer { id = -14; - read(input: DataInput): any { + read(input: DataInput): string[] { return input.readCharArray(); } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: string[]): void { output.writeCharArray(object); } } /** @internal */ -export class FloatArraySerializer implements Serializer { +export class FloatArraySerializer implements Serializer { id = -18; @@ -323,11 +326,11 @@ export class JavaClassSerializer implements Serializer { } /** @internal */ -export class LinkedListSerializer implements Serializer { +export class LinkedListSerializer implements Serializer { id = -30; - read(input: DataInput): any { + read(input: DataInput): any[] { const size = input.readInt(); let result: any = null; if (size > BitsUtil.NULL_ARRAY_LENGTH) { @@ -339,7 +342,7 @@ export class LinkedListSerializer implements Serializer { return result; } - write(output: DataOutput, object: any): void { + write(output: DataOutput, object: any[]): void { // no-op } } @@ -410,3 +413,18 @@ export class HazelcastJsonValueSerializer extends JsonSerializer { return new HazelcastJsonValue(input.readUTF()); } } + +/** @internal */ +export class UuidSerializer implements Serializer { + + id = -21; + + read(input: DataInput): UUID { + return new UUID(input.readLong(), input.readLong()); + } + + write(output: DataOutput, uuid: UUID): void { + output.writeLong(uuid.mostSignificant); + output.writeLong(uuid.leastSignificant); + } +} diff --git a/src/serialization/SerializationService.ts b/src/serialization/SerializationService.ts index 14e1ab653..a922eba0a 100644 --- a/src/serialization/SerializationService.ts +++ b/src/serialization/SerializationService.ts @@ -50,6 +50,7 @@ import { ShortSerializer, StringArraySerializer, StringSerializer, + UuidSerializer } from './DefaultSerializers'; import {DATA_OFFSET, HeapData} from './HeapData'; import {ObjectDataInput, PositionalObjectDataOutput} from './ObjectData'; @@ -265,6 +266,7 @@ export class SerializationServiceV1 implements SerializationService { this.registerSerializer('stringArray', new StringArraySerializer()); this.registerSerializer('javaClass', new JavaClassSerializer()); this.registerSerializer('floatArray', new FloatArraySerializer()); + this.registerSerializer('uuid', new UuidSerializer()); this.registerIdentifiedFactories(); this.registerSerializer('!portable', new PortableSerializer(this.serializationConfig)); if (this.serializationConfig.jsonStringDeserializationPolicy === JsonStringDeserializationPolicy.EAGER) { diff --git a/src/util/Util.ts b/src/util/Util.ts index 5ede77ae3..98e452ce2 100644 --- a/src/util/Util.ts +++ b/src/util/Util.ts @@ -19,7 +19,7 @@ import * as assert from 'assert'; import * as Long from 'long'; import * as Promise from 'bluebird'; import * as Path from 'path'; -import {AddressImpl} from '../core/Address'; +import {AddressImpl, UUID} from '../core'; /** @internal */ export function assertNotNull(v: any): void { @@ -65,6 +65,8 @@ export function getType(obj: any): string { return 'long'; } if (Buffer.isBuffer(obj)) { return 'buffer'; + } if (UUID.isUUID(obj)) { + return 'uuid'; } else { const t = typeof obj; if (t !== 'object') { diff --git a/test/serialization/DefaultSerializersLiveTest.js b/test/serialization/DefaultSerializersLiveTest.js index b52bc4ad9..e0eb9f330 100644 --- a/test/serialization/DefaultSerializersLiveTest.js +++ b/test/serialization/DefaultSerializersLiveTest.js @@ -15,9 +15,10 @@ */ 'use strict'; -const expect = require('chai').expect; +const Long = require('long'); +const { expect } = require('chai'); const RC = require('../RC'); -const { Client, RestValue } = require('../../'); +const { Client, RestValue, UUID } = require('../../'); describe('DefaultSerializersLiveTest', function () { @@ -145,4 +146,18 @@ describe('DefaultSerializersLiveTest', function () { expect(result.contentType).to.equal(restValue.contentType); expect(result.value).to.equal(restValue.value); }); + + it('UUID', async function () { + // Make sure that the object is properly de-serialized at the server + const uuid = new UUID(Long.fromNumber(24), Long.fromNumber(42)); + + const script = 'var map = instance_0.getMap("' + map.getName() + '");\n' + + 'var uuid = map.get("key");\n' + + 'result = "\\"" + uuid.toString() + "\\"";\n'; + + await map.put('key', uuid); + const response = await RC.executeOnController(cluster.id, script, 1); + const result = JSON.parse(response.result); + expect(result).to.equal(uuid.toString()); + }); }); diff --git a/test/serialization/DefaultSerializersTest.js b/test/serialization/DefaultSerializersTest.js index fa51d20cc..706db5cc4 100644 --- a/test/serialization/DefaultSerializersTest.js +++ b/test/serialization/DefaultSerializersTest.js @@ -15,18 +15,19 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const Long = require('long'); const { SerializationServiceV1 } = require('../../lib/serialization/SerializationService'); const { SerializationConfigImpl } = require('../../lib/config/SerializationConfig'); -const { Predicates } = require('../../.'); -const { RestValue } = require('../../lib/core/RestValue'); +const { Predicates } = require('../../'); +const { RestValue, UUID } = require('../../lib/'); describe('DefaultSerializersTest', function () { const restValue = new RestValue(); restValue.value = '{"test":"data"}'; restValue.contentType = 'text/plain'; + const uuid = new UUID(Long.fromNumber(1), Long.fromNumber(2)); const parameters = [ 14, @@ -68,7 +69,8 @@ describe('DefaultSerializersTest', function () { Predicates.alwaysTrue(), Predicates.alwaysFalse(), Predicates.paging(Predicates.greaterEqual('this', 10), 10), - restValue + restValue, + uuid ]; parameters.forEach(function (obj) { From 1b1269ab71ece7c61ac4a8265a8dda3135bd3890 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:05:37 +0300 Subject: [PATCH 288/685] Reuse coalescing buffer in PipelinedWriter (#585) Also includes the following: * Add proper closing for PipelinedWriter * Fix flakiness in InvocationTest --- src/network/ClientConnection.ts | 93 +++++++++++++++++--------- src/util/Util.ts | 19 ++++++ test/connection/PipelinedWriterTest.js | 47 ++++++++----- test/invocation/InvocationTest.js | 2 + test/unit/UtilTest.js | 48 +++++++++++++ test/unit/UuidTest.js | 3 +- 6 files changed, 165 insertions(+), 47 deletions(-) create mode 100644 test/unit/UtilTest.js diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index da8fa462f..4b10e898d 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -23,7 +23,7 @@ import {BuildInfo} from '../BuildInfo'; import {HazelcastClient} from '../HazelcastClient'; import {AddressImpl, IOError, UUID} from '../core'; import {ClientMessageHandler} from '../protocol/ClientMessage'; -import {DeferredPromise} from '../util/Util'; +import {DeferredPromise, copyBuffers} from '../util/Util'; import {ILogger} from '../logging/ILogger'; import { ClientMessage, @@ -31,31 +31,38 @@ import { SIZE_OF_FRAME_LENGTH_AND_FLAGS } from '../protocol/ClientMessage'; -const FROZEN_ARRAY = Object.freeze([]) as OutputQueueItem[]; +const FROZEN_ARRAY = Object.freeze([]); const PROPERTY_PIPELINING_ENABLED = 'hazelcast.client.autopipelining.enabled'; const PROPERTY_PIPELINING_THRESHOLD = 'hazelcast.client.autopipelining.threshold.bytes'; const PROPERTY_NO_DELAY = 'hazelcast.client.socket.no.delay'; -interface OutputQueueItem { - buffer: Buffer; - resolver: Promise.Resolver; +abstract class Writer extends EventEmitter { + + abstract write(buffer: Buffer, resolver: Promise.Resolver): void; + + abstract close(): void; + } /** @internal */ -export class PipelinedWriter extends EventEmitter { +export class PipelinedWriter extends Writer { private readonly socket: net.Socket; - private queue: OutputQueueItem[] = []; + private queuedBufs: Buffer[] = []; + private queuedResolvers: Promise.Resolver[] = []; private error: Error; private scheduled = false; private canWrite = true; // coalescing threshold in bytes private readonly threshold: number; + // reusable buffer for coalescing + private readonly coalesceBuf: Buffer; constructor(socket: net.Socket, threshold: number) { super(); this.socket = socket; this.threshold = threshold; + this.coalesceBuf = Buffer.allocUnsafe(threshold); // write queued items on drain event socket.on('drain', () => { @@ -69,10 +76,18 @@ export class PipelinedWriter extends EventEmitter { // if there was a write error, it's useless to keep writing to the socket return process.nextTick(() => resolver.reject(this.error)); } - this.queue.push({ buffer, resolver }); + this.queuedBufs.push(buffer); + this.queuedResolvers.push(resolver); this.schedule(); } + close(): void { + this.canWrite = false; + // no more items can be added now + this.queuedResolvers = FROZEN_ARRAY as Promise.Resolver[]; + this.queuedBufs = FROZEN_ARRAY as Buffer[]; + } + private schedule(): void { if (!this.scheduled && this.canWrite) { this.scheduled = true; @@ -86,16 +101,17 @@ export class PipelinedWriter extends EventEmitter { return; } - const buffers: Buffer[] = []; - const resolvers: Array> = []; let totalLength = 0; - - while (this.queue.length > 0 && totalLength < this.threshold) { - const item = this.queue.shift(); - const data = item.buffer; - totalLength += data.length; - buffers.push(data); - resolvers.push(item.resolver); + let queueIdx = 0; + while (queueIdx < this.queuedBufs.length && totalLength < this.threshold) { + const buf = this.queuedBufs[queueIdx]; + // if the next buffer exceeds the threshold, + // try to take multiple queued buffers which fit this.coalesceBuf + if (queueIdx > 0 && totalLength + buf.length > this.threshold) { + break; + } + totalLength += buf.length; + queueIdx++; } if (totalLength === 0) { @@ -103,19 +119,33 @@ export class PipelinedWriter extends EventEmitter { return; } - // coalesce buffers and write to the socket: no further writes until flushed - const merged = buffers.length === 1 ? buffers[0] : Buffer.concat(buffers, totalLength); - this.canWrite = this.socket.write(merged as any, (err: Error) => { + const buffers = this.queuedBufs.slice(0, queueIdx); + this.queuedBufs = this.queuedBufs.slice(queueIdx); + const resolvers = this.queuedResolvers.slice(0, queueIdx); + this.queuedResolvers = this.queuedResolvers.slice(queueIdx); + + let buf; + if (buffers.length === 1) { + // take the only buffer + buf = buffers[0]; + } else { + // coalesce buffers + copyBuffers(this.coalesceBuf, buffers, totalLength); + buf = this.coalesceBuf.slice(0, totalLength); + } + + // write to the socket: no further writes until flushed + this.canWrite = this.socket.write(buf, (err: Error) => { if (err) { this.handleError(err, resolvers); return; } this.emit('write'); - for (const r of resolvers) { - r.resolve(); + for (const resolver of resolvers) { + resolver.resolve(); } - if (this.queue.length === 0 || !this.canWrite) { + if (this.queuedBufs.length === 0 || !this.canWrite) { // will start running on the next message or drain event this.scheduled = false; return; @@ -130,17 +160,15 @@ export class PipelinedWriter extends EventEmitter { for (const r of sentResolvers) { r.reject(this.error); } - // no more items can be added now - const q = this.queue; - this.queue = FROZEN_ARRAY; - for (const it of q) { - it.resolver.reject(this.error); + for (const resolver of this.queuedResolvers) { + resolver.reject(this.error); } + this.close(); } } /** @internal */ -export class DirectWriter extends EventEmitter { +export class DirectWriter extends Writer { private readonly socket: net.Socket; @@ -159,6 +187,10 @@ export class DirectWriter extends EventEmitter { resolver.resolve(); }); } + + close(): void { + // no-op + } } /** @internal */ @@ -296,7 +328,7 @@ export class ClientConnection { private closedCause: Error; private connectedServerVersion: number; private readonly socket: net.Socket; - private readonly writer: PipelinedWriter | DirectWriter; + private readonly writer: Writer; private readonly reader: ClientMessageReader; private readonly logger: ILogger; private readonly fragmentedMessageHandler: FragmentedClientMessageHandler; @@ -381,6 +413,7 @@ export class ClientConnection { this.logClose(); this.socket.end(); + this.writer.close(); this.client.getConnectionManager().onConnectionClose(this); } diff --git a/src/util/Util.ts b/src/util/Util.ts index 98e452ce2..4023a4f3e 100644 --- a/src/util/Util.ts +++ b/src/util/Util.ts @@ -273,3 +273,22 @@ export function DeferredPromise(): Promise.Resolver { promise, } as Promise.Resolver; } + +/** + * Copy contents of the given array of buffers into the target buffer. + * + * @param target target buffer + * @param sources source buffers + * @param totalLength total length of all source buffers + * @internal + */ +export function copyBuffers(target: Buffer, sources: Buffer[], totalLength: number): void { + if (target.length < totalLength) { + throw new RangeError('Target length ' + target.length + ' is less than requested ' + totalLength); + } + let pos = 0; + for (const source of sources) { + source.copy(target, pos); + pos += source.length; + } +} diff --git a/test/connection/PipelinedWriterTest.js b/test/connection/PipelinedWriterTest.js index 3c5f115e5..2f3479123 100644 --- a/test/connection/PipelinedWriterTest.js +++ b/test/connection/PipelinedWriterTest.js @@ -26,6 +26,7 @@ const { PipelinedWriter } = require('../../lib/network/ClientConnection'); describe('PipelinedWriterTest', function () { + const THRESHOLD = 8192; let writer; let mockSocket; @@ -36,7 +37,7 @@ describe('PipelinedWriterTest', function () { process.nextTick(() => mockSocket.emit('data', data)); return canWrite; }); - writer = new PipelinedWriter(mockSocket, 8192); + writer = new PipelinedWriter(mockSocket, THRESHOLD); } function setUpWriteFailure(err) { @@ -45,10 +46,10 @@ describe('PipelinedWriterTest', function () { process.nextTick(() => cb(err)); return false; }); - writer = new PipelinedWriter(mockSocket, 8192); + writer = new PipelinedWriter(mockSocket, THRESHOLD); } - it('writes single message into socket (without copying it)', (done) => { + it('writes single small message into socket (without copying it)', (done) => { setUpWriteSuccess(true); const buffer = Buffer.from('test'); @@ -59,39 +60,53 @@ describe('PipelinedWriterTest', function () { }); }); - it('writes multiple messages as one into socket', (done) => { + it('writes single large message into socket (without copying it)', (done) => { + setUpWriteSuccess(true); + + const buffer = Buffer.allocUnsafe(THRESHOLD * 2); + writer.write(buffer, DeferredPromise()); + mockSocket.on('data', (data) => { + expect(data).to.be.equal(buffer); + done(); + }); + }); + + it('writes multiple small messages as one into socket', (done) => { setUpWriteSuccess(true); writer.write(Buffer.from('1'), DeferredPromise()); writer.write(Buffer.from('2'), DeferredPromise()); writer.write(Buffer.from('3'), DeferredPromise()); mockSocket.on('data', (data) => { - expect(data).to.be.deep.equal(Buffer.from('123')); + expect(Buffer.compare(data, Buffer.from('123'))).to.be.equal(0); done(); }); }); - it('coalesces buffers when writing into socket', (done) => { + it('coalesces buffers when writing into socket (1/2 of threshold)', (done) => { setUpWriteSuccess(true); - const size = 4200; + const size = THRESHOLD / 2; + const data1 = Buffer.alloc(size).fill('1'); const resolver1 = DeferredPromise(); - writer.write(Buffer.alloc(size), resolver1); + writer.write(data1, resolver1); + const data2 = Buffer.alloc(size).fill('2'); const resolver2 = DeferredPromise(); - writer.write(Buffer.alloc(size), resolver2); + writer.write(data2, resolver2); + const data3 = Buffer.alloc(size).fill('3'); const resolver3 = DeferredPromise(); - writer.write(Buffer.alloc(size), resolver3); + writer.write(data3, resolver3); let cnt = 0; let allData = Buffer.alloc(0); mockSocket.on('data', (data) => { allData = Buffer.concat([allData, data]); - cnt += 1; + cnt++; if (cnt === 1) { - expect(data).to.be.deep.equal(Buffer.alloc(size * 2)); + expect(Buffer.compare(data, Buffer.concat([data1, data2]))).to.be.equal(0); } if (cnt === 2) { - expect(data).to.be.deep.equal(Buffer.alloc(size)); + expect(Buffer.compare(data, data3)).to.be.equal(0); } }); @@ -101,7 +116,7 @@ describe('PipelinedWriterTest', function () { resolver3.promise ]).then(() => { expect(cnt).to.be.equal(2); - expect(allData).to.be.deep.equal(Buffer.alloc(size * 3)); + expect(Buffer.compare(allData, Buffer.concat([data1, data2, data3]))).to.be.equal(0); done(); }); }); @@ -109,7 +124,7 @@ describe('PipelinedWriterTest', function () { it('allows I/O in between coalesced writes into socket', (done) => { setUpWriteSuccess(true); - const size = 9000; + const size = THRESHOLD * 2; writer.write(Buffer.alloc(size), DeferredPromise()); writer.write(Buffer.alloc(size), DeferredPromise()); let cnt = 0; @@ -187,7 +202,7 @@ describe('PipelinedWriterTest', function () { writer.on('write', () => done(new Error())); const resolver = DeferredPromise(); writer.write(Buffer.from('test'), resolver); - resolver.promise.catch(_ => { + resolver.promise.catch(() => { done(); }); }); diff --git a/test/invocation/InvocationTest.js b/test/invocation/InvocationTest.js index ffcb3a338..616ee7f5c 100644 --- a/test/invocation/InvocationTest.js +++ b/test/invocation/InvocationTest.js @@ -20,6 +20,7 @@ const sinon = require('sinon'); const sandbox = sinon.createSandbox(); const { Client, IndeterminateOperationStateError } = require('../../'); const { Invocation, InvocationService } = require('../../lib/invocation/InvocationService'); +const { LifecycleServiceImpl } = require('../../lib/LifecycleService'); const { ClientMessage } = require('../../lib/protocol/ClientMessage'); describe('InvocationTest', function () { @@ -31,6 +32,7 @@ describe('InvocationTest', function () { clientStub = sandbox.stub(Client.prototype); serviceStub = sandbox.stub(InvocationService.prototype); clientStub.getInvocationService.returns(serviceStub); + clientStub.getLifecycleService.returns(sandbox.stub(LifecycleServiceImpl.prototype)); }); afterEach(function () { diff --git a/test/unit/UtilTest.js b/test/unit/UtilTest.js new file mode 100644 index 000000000..caae79208 --- /dev/null +++ b/test/unit/UtilTest.js @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +'use strict'; + +const { expect } = require('chai'); +const { copyBuffers } = require('../../lib/util/Util'); + +describe('UtilTest', function () { + + it('copyBuffers: throws on invalid total length', function () { + expect(() => copyBuffers(Buffer.from([0x1]), [ Buffer.from([0x2]) ], 3)) + .to.throw(RangeError); + }); + + it('copyBuffers: writes single buffer of less length', function () { + const target = Buffer.from('abc'); + const sources = [ Buffer.from('d') ]; + copyBuffers(target, sources, 1); + + expect(Buffer.compare(target, Buffer.from('dbc'))).to.be.equal(0); + }); + + it('copyBuffers: writes multiple buffers of same total length', function () { + const target = Buffer.from('abc'); + const sources = [ + Buffer.from('d'), + Buffer.from('e'), + Buffer.from('f') + ]; + copyBuffers(target, sources, 3); + + expect(Buffer.compare(target, Buffer.from('def'))).to.be.equal(0); + }); +}); diff --git a/test/unit/UuidTest.js b/test/unit/UuidTest.js index c62af52cf..0972a8770 100644 --- a/test/unit/UuidTest.js +++ b/test/unit/UuidTest.js @@ -20,7 +20,8 @@ const UUID = require('../../lib/core/UUID').UUID; const expect = require('chai').expect; const Long = require('long'); -describe('UUID', function () { +describe('UuidTest', function () { + it('with small most significant high bits', function () { const uuid = new UUID(new Long(-99999, 1), new Long(213231, -213321)); // Should pad first part with zeros From 051c1729cc270011bec2d2bab5c0e752512bda11 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 10 Sep 2020 14:20:27 +0300 Subject: [PATCH 289/685] Add MC compatibility note into client stats documentation (#589) --- DOCUMENTATION.md | 2 ++ README.md | 2 +- code_samples/client_statistics.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index e5605a738..db32188dc 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -2594,6 +2594,8 @@ const cfg = { After enabling the client statistics, you can monitor your clients using Hazelcast Management Center. Please refer to the [Monitoring Clients section](https://docs.hazelcast.org/docs/management-center/latest/manual/html/index.html#monitoring-clients) in the Hazelcast Management Center Reference Manual for more information on the client statistics. +> **NOTE: Statistics sent by Hazelcast Node.js client 4.0 are compatible with Management Center 4.0. Management Center 4.2020.08 and newer versions will be supported in version 4.1 of the client.** + ### 7.9.2. Logging Configuration By default, Hazelcast Node.js client uses a default logger which logs to the `stdout` with the `INFO` log level. You can change the log level using the `hazelcast.logging.level` entry of the `properties` config option. diff --git a/README.md b/README.md index 4d7521446..98fbfc1c8 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ Test script automatically downloads `hazelcast-remote-controller` and Hazelcast ## License -[Apache 2 License](LICENSE). +[Apache 2.0 License](LICENSE). ## Copyright diff --git a/code_samples/client_statistics.js b/code_samples/client_statistics.js index bce2ee6ab..859aab8c0 100644 --- a/code_samples/client_statistics.js +++ b/code_samples/client_statistics.js @@ -40,7 +40,7 @@ const { Client } = require('hazelcast-client'); // At this point, we have 1 near cache miss, 2 near cache hits // in client's near cache statistics. Sleep more than statistics // collection time and keep client running. Then, you should see - // the statistics in Hazelcast Management Center + // the statistics in Hazelcast Management Center 4.0 await new Promise((resolve) => setTimeout(resolve, 60000)); await client.shutdown(); } catch (err) { From 908b0a20d73785769e154a0995d2061f4d493481 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 10 Sep 2020 15:08:32 +0300 Subject: [PATCH 290/685] Remove bluebird dependency (#587) --- package.json | 2 - src/CPSubsystem.ts | 1 - src/HazelcastClient.ts | 1 - src/LifecycleService.ts | 1 - src/connection/AddressProvider.ts | 1 - src/connection/BasicSSLOptionsFactory.ts | 4 +- src/connection/DefaultAddressProvider.ts | 1 - src/connection/SSLOptionsFactory.ts | 1 - src/core/DistributedObject.ts | 2 - .../HazelcastCloudAddressProvider.ts | 1 - src/discovery/HazelcastCloudDiscovery.ts | 5 +- src/invocation/ClusterService.ts | 12 ++- src/invocation/InvocationService.ts | 6 +- src/listener/ListenerService.ts | 9 +- src/nearcache/MetadataFetcher.ts | 9 +- src/nearcache/NearCache.ts | 16 +++- src/nearcache/RepairingTask.ts | 1 - src/network/ClientConnection.ts | 17 ++-- src/network/ClientConnectionManager.ts | 96 ++++++++++--------- src/network/WaitStrategy.ts | 4 +- src/proxy/BaseProxy.ts | 1 - src/proxy/FencedLock.ts | 1 - src/proxy/FlakeIdGenerator.ts | 1 - src/proxy/IAtomicLong.ts | 1 - src/proxy/IList.ts | 1 - src/proxy/IMap.ts | 1 - src/proxy/IQueue.ts | 1 - src/proxy/ISet.ts | 1 - src/proxy/ITopic.ts | 1 - src/proxy/ListProxy.ts | 1 - src/proxy/MapProxy.ts | 1 - src/proxy/MultiMap.ts | 1 - src/proxy/MultiMapProxy.ts | 1 - src/proxy/NearCachedMapProxy.ts | 1 - src/proxy/PNCounter.ts | 1 - src/proxy/PNCounterProxy.ts | 1 - src/proxy/PartitionSpecificProxy.ts | 1 - src/proxy/ProxyManager.ts | 5 +- src/proxy/QueueProxy.ts | 1 - src/proxy/ReplicatedMap.ts | 1 - src/proxy/ReplicatedMapProxy.ts | 1 - src/proxy/Ringbuffer.ts | 1 - src/proxy/SetProxy.ts | 1 - src/proxy/cpsubsystem/AtomicLongProxy.ts | 1 - src/proxy/cpsubsystem/BaseCPProxy.ts | 1 - src/proxy/cpsubsystem/CPProxyManager.ts | 1 - src/proxy/cpsubsystem/CPSessionAwareProxy.ts | 1 - src/proxy/cpsubsystem/CPSessionManager.ts | 1 - src/proxy/cpsubsystem/FencedLockProxy.ts | 1 - src/proxy/flakeid/AutoBatcher.ts | 12 ++- src/proxy/flakeid/FlakeIdGeneratorProxy.ts | 1 - src/proxy/ringbuffer/RingbufferProxy.ts | 1 - src/proxy/topic/ReliableTopicProxy.ts | 10 +- src/util/Util.ts | 69 ++++++++++++- test/HazelcastClientTest.js | 4 +- test/ListenersOnReconnectTest.js | 1 - test/MembershipListenerTest.js | 8 +- test/RC.js | 20 ++-- test/connection/DirectWriterTest.js | 18 ++-- test/connection/PipelinedWriterTest.js | 52 +++++----- test/discovery/HazelcastCloudProviderTest.js | 1 - test/flakeid/FlakeIdGeneratorProxyTest.js | 3 +- test/heartbeat/HeartbeatFromServerTest.js | 87 ++++++++--------- test/integration/ConnectionStrategyTest.js | 10 +- .../InitialMembershipListenerTest.js | 4 +- test/map/MapPartitionAwareTest.js | 5 +- test/map/MapPredicateTest.js | 3 +- test/map/MapProxyTest.js | 3 +- test/map/NearCachedMapStressTest.js | 4 +- test/multimap/MultiMapProxyLockTest.js | 3 +- test/multimap/MultiMapProxyTest.js | 5 +- .../InvalidationMetadataDistortionTest.js | 5 +- test/nearcache/LostInvalidationsTest.js | 4 +- test/nearcache/MigratedDataTest.js | 6 +- test/queue/QueueProxyTest.js | 1 - test/replicatedmap/ReplicatedMapProxyTest.js | 7 +- test/rest_value/RestValueTest.js | 8 +- test/ringbuffer/RingbufferProxyTest.js | 3 +- test/unit/UtilTest.js | 96 ++++++++++++++++++- 79 files changed, 391 insertions(+), 286 deletions(-) diff --git a/package.json b/package.json index e0dd7506a..773c904c0 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,6 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "dependencies": { - "bluebird": "3.7.2", - "@types/bluebird": "3.5.32", "long": "4.0.0", "@types/long": "4.0.1" }, diff --git a/src/CPSubsystem.ts b/src/CPSubsystem.ts index c20443230..aca794a56 100644 --- a/src/CPSubsystem.ts +++ b/src/CPSubsystem.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {IAtomicLong, FencedLock} from './proxy'; import {CPProxyManager} from './proxy/cpsubsystem/CPProxyManager'; import {CPSessionManager} from './proxy/cpsubsystem/CPSessionManager'; diff --git a/src/HazelcastClient.ts b/src/HazelcastClient.ts index e28909105..08bc8e4b2 100644 --- a/src/HazelcastClient.ts +++ b/src/HazelcastClient.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import { ClientInfo, Cluster, diff --git a/src/LifecycleService.ts b/src/LifecycleService.ts index 5a53e540c..28b7cfd20 100644 --- a/src/LifecycleService.ts +++ b/src/LifecycleService.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import {HazelcastClient} from './HazelcastClient'; import {ILogger} from './logging/ILogger'; diff --git a/src/connection/AddressProvider.ts b/src/connection/AddressProvider.ts index 3f25b127f..24faca347 100644 --- a/src/connection/AddressProvider.ts +++ b/src/connection/AddressProvider.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {AddressImpl} from '../core/Address'; /** diff --git a/src/connection/BasicSSLOptionsFactory.ts b/src/connection/BasicSSLOptionsFactory.ts index f5dd3d3d6..23e9d01fe 100644 --- a/src/connection/BasicSSLOptionsFactory.ts +++ b/src/connection/BasicSSLOptionsFactory.ts @@ -14,8 +14,8 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import * as fs from 'fs'; +import {promisify} from 'util'; import {Properties} from '../config/Properties'; import {HazelcastError} from '../core'; import { @@ -44,7 +44,7 @@ export class BasicSSLOptionsFactory implements SSLOptionsFactory { const promises = []; - const readFile = Promise.promisify(fs.readFile); + const readFile = promisify(fs.readFile); const caPath = getStringOrUndefined(properties.caPath); const keyPath = getStringOrUndefined(properties.keyPath); diff --git a/src/connection/DefaultAddressProvider.ts b/src/connection/DefaultAddressProvider.ts index 521bb620a..f199677e6 100644 --- a/src/connection/DefaultAddressProvider.ts +++ b/src/connection/DefaultAddressProvider.ts @@ -17,7 +17,6 @@ import {AddressProvider} from './AddressProvider'; import {ClientNetworkConfigImpl} from '../config/ClientNetworkConfig'; -import * as Promise from 'bluebird'; import {AddressImpl} from '../core/Address'; /** diff --git a/src/connection/SSLOptionsFactory.ts b/src/connection/SSLOptionsFactory.ts index 4905f2d6c..532d848f8 100644 --- a/src/connection/SSLOptionsFactory.ts +++ b/src/connection/SSLOptionsFactory.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {Properties} from '../config/Properties'; /** diff --git a/src/core/DistributedObject.ts b/src/core/DistributedObject.ts index 0ed7c397f..67aac4c90 100644 --- a/src/core/DistributedObject.ts +++ b/src/core/DistributedObject.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; - /** * Base interface for distributed objects. */ diff --git a/src/discovery/HazelcastCloudAddressProvider.ts b/src/discovery/HazelcastCloudAddressProvider.ts index 012e5bbb7..b18b0d50e 100644 --- a/src/discovery/HazelcastCloudAddressProvider.ts +++ b/src/discovery/HazelcastCloudAddressProvider.ts @@ -17,7 +17,6 @@ import {HazelcastCloudDiscovery} from './HazelcastCloudDiscovery'; import {AddressProvider} from '../connection/AddressProvider'; -import * as Promise from 'bluebird'; import {ILogger} from '../logging/ILogger'; import {AddressImpl} from '../core/Address'; diff --git a/src/discovery/HazelcastCloudDiscovery.ts b/src/discovery/HazelcastCloudDiscovery.ts index 5c77554a8..a9528f9d4 100644 --- a/src/discovery/HazelcastCloudDiscovery.ts +++ b/src/discovery/HazelcastCloudDiscovery.ts @@ -15,10 +15,9 @@ */ /** @ignore *//** */ -import {AddressHelper, DeferredPromise} from '../util/Util'; +import {AddressHelper, deferredPromise} from '../util/Util'; import {get} from 'https'; import {IncomingMessage} from 'http'; -import * as Promise from 'bluebird'; import {Properties} from '../config/Properties'; import * as URL from 'url'; import {AddressImpl} from '../core/Address'; @@ -59,7 +58,7 @@ export class HazelcastCloudDiscovery { } callService(): Promise> { - const deferred = DeferredPromise>(); + const deferred = deferredPromise>(); const url = URL.parse(this.endpointUrl); const endpointUrlOptions = { diff --git a/src/invocation/ClusterService.ts b/src/invocation/ClusterService.ts index a80f9e6b0..299a14ee4 100644 --- a/src/invocation/ClusterService.ts +++ b/src/invocation/ClusterService.ts @@ -15,11 +15,14 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {ClientConnection} from '../network/ClientConnection'; import {HazelcastClient} from '../HazelcastClient'; import {MemberSelector} from '../core/MemberSelector'; -import {assertNotNull, DeferredPromise} from '../util/Util'; +import { + assertNotNull, + deferredPromise, + timedPromise +} from '../util/Util'; import {UuidUtil} from '../util/UuidUtil'; import {ILogger} from '../logging/ILogger'; import {ClientConnectionManager} from '../network/ClientConnectionManager'; @@ -63,7 +66,7 @@ export class ClusterService implements Cluster { private memberListSnapshot: MemberListSnapshot = EMPTY_SNAPSHOT; private listeners: Map = new Map(); private logger: ILogger; - private initialListFetched = DeferredPromise(); + private initialListFetched = deferredPromise(); private connectionManager: ClientConnectionManager; private readonly labels: Set; @@ -154,8 +157,7 @@ export class ClusterService implements Cluster { } waitInitialMemberListFetched(): Promise { - return this.initialListFetched.promise - .timeout(INITIAL_MEMBERS_TIMEOUT_IN_MILLIS) + return timedPromise(this.initialListFetched.promise, INITIAL_MEMBERS_TIMEOUT_IN_MILLIS) .catch((error) => { return Promise.reject(new IllegalStateError('Could not get initial member list from the cluster!', error)); }); diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 387999bf9..3ef8a62d9 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -16,7 +16,6 @@ /** @ignore *//** */ import * as assert from 'assert'; -import * as Promise from 'bluebird'; import {HazelcastClient} from '../HazelcastClient'; import { ClientNotActiveError, @@ -41,6 +40,7 @@ import { scheduleWithRepetition, cancelRepetitionTask, Task, + deferredPromise, DeferredPromise } from '../util/Util'; @@ -89,7 +89,7 @@ export class Invocation { /** * Promise managing object. */ - deferred: Promise.Resolver; + deferred: DeferredPromise; /** * Contains the pending response from the primary. It is pending because it could be that backups need to complete. @@ -307,7 +307,7 @@ export class InvocationService { } invoke(invocation: Invocation): Promise { - invocation.deferred = DeferredPromise(); + invocation.deferred = deferredPromise(); const newCorrelationId = this.correlationCounter++; invocation.request.setCorrelationId(newCorrelationId); this.doInvoke(invocation); diff --git a/src/listener/ListenerService.ts b/src/listener/ListenerService.ts index 7b1c8e8f4..59c330b08 100644 --- a/src/listener/ListenerService.ts +++ b/src/listener/ListenerService.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {HazelcastClient} from '../HazelcastClient'; import {HazelcastError} from '../core'; import {ClientConnection} from '../network/ClientConnection'; @@ -24,7 +23,7 @@ import {Invocation} from '../invocation/InvocationService'; import {RegistrationKey} from '../invocation/RegistrationKey'; import {ClientMessageHandler} from '../protocol/ClientMessage'; import {ListenerMessageCodec} from './ListenerMessageCodec'; -import {DeferredPromise} from '../util/Util'; +import {deferredPromise} from '../util/Util'; import {UuidUtil} from '../util/UuidUtil'; import {ILogger} from '../logging/ILogger'; @@ -89,7 +88,7 @@ export class ListenerService { } invokeRegistrationFromRecord(userRegistrationKey: string, connection: ClientConnection): Promise { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); const activeRegsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (activeRegsOnUserKey !== undefined && activeRegsOnUserKey.has(connection)) { deferred.resolve(activeRegsOnUserKey.get(connection)); @@ -122,7 +121,7 @@ export class ListenerService { const activeConnections = this.client.getConnectionManager().getActiveConnections(); const userRegistrationKey = UuidUtil.generate().toString(); let connectionsOnUserKey: Map; - const deferred = DeferredPromise(); + const deferred = deferredPromise(); const registerRequest = codec.encodeAddRequest(this.isSmart()); connectionsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (connectionsOnUserKey === undefined) { @@ -161,7 +160,7 @@ export class ListenerService { } deregisterListener(userRegistrationKey: string): Promise { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); const registrationsOnUserKey = this.activeRegistrations.get(userRegistrationKey); if (registrationsOnUserKey === undefined) { deferred.resolve(false); diff --git a/src/nearcache/MetadataFetcher.ts b/src/nearcache/MetadataFetcher.ts index de22eb2e9..492844328 100644 --- a/src/nearcache/MetadataFetcher.ts +++ b/src/nearcache/MetadataFetcher.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {MapFetchNearCacheInvalidationMetadataCodec} from '../codec/MapFetchNearCacheInvalidationMetadataCodec'; import {dataMemberSelector} from '../core/MemberSelector'; import {UUID} from '../core/UUID'; @@ -50,9 +49,11 @@ export class MetadataFetcher { fetchMetadata(handlers: Map): Promise { const objectNames = this.getObjectNames(handlers); const promises = this.scanMembers(objectNames); - return Promise.each(promises, (clientMessage: ClientMessage) => { - this.processResponse(clientMessage, handlers); - }).then(() => undefined); + return Promise.all(promises).then((clientMessages: ClientMessage[]) => { + clientMessages.forEach((response) => { + this.processResponse(response, handlers); + }); + }); } protected processResponse(responseMessage: ClientMessage, handlers: Map): void { diff --git a/src/nearcache/NearCache.ts b/src/nearcache/NearCache.ts index 17ebe8a2f..29c2cf254 100644 --- a/src/nearcache/NearCache.ts +++ b/src/nearcache/NearCache.ts @@ -21,11 +21,17 @@ import {InMemoryFormat} from '../config/InMemoryFormat'; import {NearCacheConfigImpl} from '../config/NearCacheConfig'; import {Data} from '../serialization/Data'; import {SerializationService} from '../serialization/SerializationService'; -import {DeferredPromise, shuffleArray} from '../util/Util'; +import { + deferredPromise, + DeferredPromise, + shuffleArray +} from '../util/Util'; import {DataKeyedHashMap} from './DataStoreHashMap'; import {DataRecord} from './DataRecord'; -import {StaleReadDetector, alwaysFreshDetector} from './StaleReadDetector'; -import * as Promise from 'bluebird'; +import { + StaleReadDetector, + alwaysFreshDetector +} from './StaleReadDetector'; /** @internal */ export interface NearCacheStatistics { @@ -86,7 +92,7 @@ export class NearCacheImpl implements NearCache { private hitCount = 0; private creationTime = Date.now(); private compareFunc: (x: DataRecord, y: DataRecord) => number; - private ready: Promise.Resolver; + private ready: DeferredPromise; constructor(nearCacheConfig: NearCacheConfigImpl, serializationService: SerializationService) { this.serializationService = serializationService; @@ -111,7 +117,7 @@ export class NearCacheImpl implements NearCache { this.evictionCandidatePool = []; this.internalStore = new DataKeyedHashMap(); - this.ready = DeferredPromise(); + this.ready = deferredPromise(); } setReady(): void { diff --git a/src/nearcache/RepairingTask.ts b/src/nearcache/RepairingTask.ts index 6e47f262f..f5321bf2b 100644 --- a/src/nearcache/RepairingTask.ts +++ b/src/nearcache/RepairingTask.ts @@ -22,7 +22,6 @@ import {MetadataFetcher} from './MetadataFetcher'; import {NearCache} from './NearCache'; import {RepairingHandler} from './RepairingHandler'; import {PartitionServiceImpl} from '../PartitionService'; -import * as Promise from 'bluebird'; import {ILogger} from '../logging/ILogger'; import {UUID} from '../core/UUID'; diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index 4b10e898d..7d4775f3a 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import * as net from 'net'; import {EventEmitter} from 'events'; import {BitsUtil} from '../util/BitsUtil'; @@ -23,7 +22,7 @@ import {BuildInfo} from '../BuildInfo'; import {HazelcastClient} from '../HazelcastClient'; import {AddressImpl, IOError, UUID} from '../core'; import {ClientMessageHandler} from '../protocol/ClientMessage'; -import {DeferredPromise, copyBuffers} from '../util/Util'; +import {copyBuffers, deferredPromise, DeferredPromise} from '../util/Util'; import {ILogger} from '../logging/ILogger'; import { ClientMessage, @@ -38,7 +37,7 @@ const PROPERTY_NO_DELAY = 'hazelcast.client.socket.no.delay'; abstract class Writer extends EventEmitter { - abstract write(buffer: Buffer, resolver: Promise.Resolver): void; + abstract write(buffer: Buffer, resolver: DeferredPromise): void; abstract close(): void; @@ -49,7 +48,7 @@ export class PipelinedWriter extends Writer { private readonly socket: net.Socket; private queuedBufs: Buffer[] = []; - private queuedResolvers: Promise.Resolver[] = []; + private queuedResolvers: DeferredPromise[] = []; private error: Error; private scheduled = false; private canWrite = true; @@ -71,7 +70,7 @@ export class PipelinedWriter extends Writer { }); } - write(buffer: Buffer, resolver: Promise.Resolver): void { + write(buffer: Buffer, resolver: DeferredPromise): void { if (this.error) { // if there was a write error, it's useless to keep writing to the socket return process.nextTick(() => resolver.reject(this.error)); @@ -84,7 +83,7 @@ export class PipelinedWriter extends Writer { close(): void { this.canWrite = false; // no more items can be added now - this.queuedResolvers = FROZEN_ARRAY as Promise.Resolver[]; + this.queuedResolvers = FROZEN_ARRAY as DeferredPromise[]; this.queuedBufs = FROZEN_ARRAY as Buffer[]; } @@ -155,7 +154,7 @@ export class PipelinedWriter extends Writer { }); } - private handleError(err: any, sentResolvers: Array>): void { + private handleError(err: any, sentResolvers: Array>): void { this.error = new IOError(err); for (const r of sentResolvers) { r.reject(this.error); @@ -177,7 +176,7 @@ export class DirectWriter extends Writer { this.socket = socket; } - write(buffer: Buffer, resolver: Promise.Resolver): void { + write(buffer: Buffer, resolver: DeferredPromise): void { this.socket.write(buffer as any, (err: any) => { if (err) { resolver.reject(new IOError(err)); @@ -385,7 +384,7 @@ export class ClientConnection { } write(buffer: Buffer): Promise { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); this.writer.write(buffer, deferred); return deferred.promise; } diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index 3491dee66..02098a128 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import {HazelcastClient} from '../HazelcastClient'; import { @@ -38,10 +37,12 @@ import * as tls from 'tls'; import { AddressHelper, cancelRepetitionTask, + deferredPromise, DeferredPromise, scheduleWithRepetition, shuffleArray, Task, + timedPromise } from '../util/Util'; import {BasicSSLOptionsFactory} from '../connection/BasicSSLOptionsFactory'; import {ILogger} from '../logging/ILogger'; @@ -120,7 +121,7 @@ export class ClientConnectionManager extends EventEmitter { private waitStrategy: WaitStrategy; private loadBalancer: LoadBalancer; private activeConnections = new Map(); - private pendingConnections = new Map>(); + private pendingConnections = new Map>(); private clusterId: UUID; private clientState = ClientState.INITIAL; private connectToClusterTaskSubmitted: boolean; @@ -243,7 +244,7 @@ export class ClientConnectionManager extends EventEmitter { return pendingConnection.promise; } - const connectionResolver: Promise.Resolver = DeferredPromise(); + const connectionResolver: DeferredPromise = deferredPromise(); this.pendingConnections.set(addressKey, connectionResolver); const processResponseCallback = (msg: ClientMessage): void => { @@ -269,9 +270,11 @@ export class ClientConnectionManager extends EventEmitter { .then(() => connectionResolver.resolve(clientConnection)) .catch((error) => connectionResolver.reject(error)); - return connectionResolver.promise - .timeout(this.connectionTimeoutMillis, new HazelcastError(`Connection timed out to address ${address}.`)) - .finally(() => this.pendingConnections.delete(addressKey)); + return timedPromise( + connectionResolver.promise, + this.connectionTimeoutMillis, + new HazelcastError(`Connection timed out to address ${address}.`) + ).finally(() => this.pendingConnections.delete(addressKey)); } public getRandomConnection(): ClientConnection { @@ -405,10 +408,14 @@ export class ClientConnectionManager extends EventEmitter { return false; }); }) - .catch(ClientNotAllowedInClusterError, InvalidConfigurationError, (error: Error) => { - this.logger.warn('ConnectionManager', 'Stopped trying on the cluster: ' - + this.client.getConfig().clusterName + ' reason: ' + error.message); - return false; + .catch((error: Error) => { + if (error instanceof ClientNotAllowedInClusterError + || error instanceof InvalidConfigurationError) { + this.logger.warn('ConnectionManager', 'Stopped trying on the cluster: ' + + this.client.getConfig().clusterName + ' reason: ' + error.message); + return false; + } + throw error; }); } @@ -486,7 +493,7 @@ export class ClientConnectionManager extends EventEmitter { private initiateCommunication(socket: net.Socket): Promise { // Send the protocol version - const deferred = DeferredPromise(); + const deferred = deferredPromise(); socket.write(BINARY_PROTOCOL_VERSION as any, (err: Error) => { if (err) { deferred.reject(err); @@ -526,7 +533,7 @@ export class ClientConnectionManager extends EventEmitter { } private connectTLSSocket(address: AddressImpl, configOpts: any): Promise { - const connectionResolver = DeferredPromise(); + const connectionResolver = deferredPromise(); const socket = tls.connect(address.port, address.host, configOpts); socket.once('secureConnect', () => { connectionResolver.resolve(socket); @@ -545,7 +552,7 @@ export class ClientConnectionManager extends EventEmitter { } private connectNetSocket(address: AddressImpl): Promise { - const connectionResolver = DeferredPromise(); + const connectionResolver = deferredPromise(); const socket = net.connect(address.port, address.host); socket.once('connect', () => { connectionResolver.resolve(socket); @@ -632,39 +639,38 @@ export class ClientConnectionManager extends EventEmitter { const request = this.encodeAuthenticationRequest(); const invocation = new Invocation(this.client, request); invocation.connection = connection; - return this.client.getInvocationService() - .invokeUrgent(invocation) - .timeout(this.authenticationTimeout) - .catch((e) => { - connection.close('Failed to authenticate connection', e); - throw e; - }) - .then((responseMessage) => { - const response = ClientAuthenticationCodec.decodeResponse(responseMessage); - if (response.status === AuthenticationStatus.AUTHENTICATED) { - this.handleSuccessfulAuth(connection, response); - } else { - let error: Error; - switch (response.status) { - case AuthenticationStatus.CREDENTIALS_FAILED: - error = new AuthenticationError('Authentication failed. The configured cluster name on ' - + 'the client does not match the one configured in the cluster or ' - + 'the credentials set in the client security config could not be authenticated'); - break; - case AuthenticationStatus.SERIALIZATION_VERSION_MISMATCH: - error = new IllegalStateError('Server serialization version does not match to client.'); - break; - case AuthenticationStatus.NOT_ALLOWED_IN_CLUSTER: - error = new ClientNotAllowedInClusterError('Client is not allowed in the cluster'); - break; - default: - error = new AuthenticationError('Authentication status code not supported. Status: ' - + response.status); - } - connection.close('Failed to authenticate connection', error); - return Promise.reject(error); + return timedPromise( + this.client.getInvocationService().invokeUrgent(invocation), + this.authenticationTimeout + ).catch((e) => { + connection.close('Failed to authenticate connection', e); + throw e; + }).then((responseMessage) => { + const response = ClientAuthenticationCodec.decodeResponse(responseMessage); + if (response.status === AuthenticationStatus.AUTHENTICATED) { + this.handleSuccessfulAuth(connection, response); + } else { + let error: Error; + switch (response.status) { + case AuthenticationStatus.CREDENTIALS_FAILED: + error = new AuthenticationError('Authentication failed. The configured cluster name on ' + + 'the client does not match the one configured in the cluster or ' + + 'the credentials set in the client security config could not be authenticated'); + break; + case AuthenticationStatus.SERIALIZATION_VERSION_MISMATCH: + error = new IllegalStateError('Server serialization version does not match to client.'); + break; + case AuthenticationStatus.NOT_ALLOWED_IN_CLUSTER: + error = new ClientNotAllowedInClusterError('Client is not allowed in the cluster'); + break; + default: + error = new AuthenticationError('Authentication status code not supported. Status: ' + + response.status); } - }); + connection.close('Failed to authenticate connection', error); + throw error; + } + }); } private handleSuccessfulAuth(connection: ClientConnection, response: ClientAuthenticationResponseParams): void { diff --git a/src/network/WaitStrategy.ts b/src/network/WaitStrategy.ts index dd39824d4..1a9f896dc 100644 --- a/src/network/WaitStrategy.ts +++ b/src/network/WaitStrategy.ts @@ -16,7 +16,7 @@ /** @ignore *//** */ import {ILogger} from '../logging/ILogger'; -import * as Promise from 'bluebird'; +import {delayedPromise} from '../util/Util'; /** @internal */ export class WaitStrategy { @@ -71,7 +71,7 @@ export class WaitStrategy { actualSleepTime + ' ms, attempt: ' + this.attempt + ', cluster connect timeout: ' + this.clusterConnectTimeoutMillis + ' ms, max backoff millis: ' + this.maxBackoffMillis); - return Promise.delay(actualSleepTime) + return delayedPromise(actualSleepTime) .then(() => { this.currentBackoffMillis = Math.min(Math.round(currentTimeMillis * this.multiplier), this.maxBackoffMillis); return true; diff --git a/src/proxy/BaseProxy.ts b/src/proxy/BaseProxy.ts index 2cfd5ef53..1db6cf981 100644 --- a/src/proxy/BaseProxy.ts +++ b/src/proxy/BaseProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {BuildInfo} from '../BuildInfo'; import {HazelcastClient} from '../HazelcastClient'; import {Data} from '../serialization/Data'; diff --git a/src/proxy/FencedLock.ts b/src/proxy/FencedLock.ts index bd0dcdda7..30e0ccefc 100644 --- a/src/proxy/FencedLock.ts +++ b/src/proxy/FencedLock.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import {DistributedObject} from '../core'; diff --git a/src/proxy/FlakeIdGenerator.ts b/src/proxy/FlakeIdGenerator.ts index 378f6d681..31cb212ef 100644 --- a/src/proxy/FlakeIdGenerator.ts +++ b/src/proxy/FlakeIdGenerator.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import {DistributedObject} from '../core/DistributedObject'; diff --git a/src/proxy/IAtomicLong.ts b/src/proxy/IAtomicLong.ts index a0ae15221..038268b2c 100644 --- a/src/proxy/IAtomicLong.ts +++ b/src/proxy/IAtomicLong.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import {DistributedObject} from '../core'; diff --git a/src/proxy/IList.ts b/src/proxy/IList.ts index 0214389cb..4a087bf21 100644 --- a/src/proxy/IList.ts +++ b/src/proxy/IList.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {ItemListener} from './ItemListener'; import {ReadOnlyLazyList} from '../core/ReadOnlyLazyList'; import {DistributedObject} from '../core/DistributedObject'; diff --git a/src/proxy/IMap.ts b/src/proxy/IMap.ts index 7b4b759b1..7e3bdee7b 100644 --- a/src/proxy/IMap.ts +++ b/src/proxy/IMap.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {Aggregator} from '../aggregation/Aggregator'; import {SimpleEntryView} from '../core/SimpleEntryView'; import {MapListener} from './MapListener'; diff --git a/src/proxy/IQueue.ts b/src/proxy/IQueue.ts index fbfb9c196..858be0998 100644 --- a/src/proxy/IQueue.ts +++ b/src/proxy/IQueue.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {ItemListener} from './ItemListener'; import {DistributedObject} from '../core'; diff --git a/src/proxy/ISet.ts b/src/proxy/ISet.ts index 5ee6ffd6f..8e539a738 100644 --- a/src/proxy/ISet.ts +++ b/src/proxy/ISet.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {ItemListener} from './ItemListener'; import {DistributedObject} from '../core'; diff --git a/src/proxy/ITopic.ts b/src/proxy/ITopic.ts index 8232e1d00..a6c9a697b 100644 --- a/src/proxy/ITopic.ts +++ b/src/proxy/ITopic.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {DistributedObject} from '../core'; import {MessageListener} from './MessageListener'; diff --git a/src/proxy/ListProxy.ts b/src/proxy/ListProxy.ts index c429dbfa3..039259014 100644 --- a/src/proxy/ListProxy.ts +++ b/src/proxy/ListProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {ListAddAllCodec} from '../codec/ListAddAllCodec'; import {ListAddAllWithIndexCodec} from '../codec/ListAddAllWithIndexCodec'; import {ListAddCodec} from '../codec/ListAddCodec'; diff --git a/src/proxy/MapProxy.ts b/src/proxy/MapProxy.ts index 4cab2e508..b7d86d354 100644 --- a/src/proxy/MapProxy.ts +++ b/src/proxy/MapProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {Aggregator} from '../aggregation/Aggregator'; import {MapAddEntryListenerCodec} from '../codec/MapAddEntryListenerCodec'; import {MapAddEntryListenerToKeyCodec} from '../codec/MapAddEntryListenerToKeyCodec'; diff --git a/src/proxy/MultiMap.ts b/src/proxy/MultiMap.ts index ee722dbaf..7a80acb91 100644 --- a/src/proxy/MultiMap.ts +++ b/src/proxy/MultiMap.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import {EntryListener} from './EntryListener'; import { DistributedObject, diff --git a/src/proxy/MultiMapProxy.ts b/src/proxy/MultiMapProxy.ts index 60fc844c7..0fbabed9d 100644 --- a/src/proxy/MultiMapProxy.ts +++ b/src/proxy/MultiMapProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import {MultiMapForceUnlockCodec} from '../codec/MultiMapForceUnlockCodec'; import {MultiMapIsLockedCodec} from '../codec/MultiMapIsLockedCodec'; diff --git a/src/proxy/NearCachedMapProxy.ts b/src/proxy/NearCachedMapProxy.ts index 5bae3f7d4..70ce48568 100644 --- a/src/proxy/NearCachedMapProxy.ts +++ b/src/proxy/NearCachedMapProxy.ts @@ -16,7 +16,6 @@ /** @ignore *//** */ import * as Long from 'long'; -import * as Promise from 'bluebird'; import {MapAddNearCacheInvalidationListenerCodec} from '../codec/MapAddNearCacheInvalidationListenerCodec'; import {MapRemoveEntryListenerCodec} from '../codec/MapRemoveEntryListenerCodec'; import {EventType} from './EventType'; diff --git a/src/proxy/PNCounter.ts b/src/proxy/PNCounter.ts index c3fa7aedf..d11a8961a 100644 --- a/src/proxy/PNCounter.ts +++ b/src/proxy/PNCounter.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import {DistributedObject} from '../core/DistributedObject'; diff --git a/src/proxy/PNCounterProxy.ts b/src/proxy/PNCounterProxy.ts index c4867e590..977ee4363 100644 --- a/src/proxy/PNCounterProxy.ts +++ b/src/proxy/PNCounterProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import {PNCounterAddCodec} from '../codec/PNCounterAddCodec'; import {PNCounterGetCodec} from '../codec/PNCounterGetCodec'; diff --git a/src/proxy/PartitionSpecificProxy.ts b/src/proxy/PartitionSpecificProxy.ts index 443ca7014..c83450189 100644 --- a/src/proxy/PartitionSpecificProxy.ts +++ b/src/proxy/PartitionSpecificProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {HazelcastClient} from '../HazelcastClient'; import {BaseProxy} from './BaseProxy'; import {ClientMessage} from '../protocol/ClientMessage'; diff --git a/src/proxy/ProxyManager.ts b/src/proxy/ProxyManager.ts index 2738fbaa6..fea4fb80c 100644 --- a/src/proxy/ProxyManager.ts +++ b/src/proxy/ProxyManager.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {ClientAddDistributedObjectListenerCodec} from '../codec/ClientAddDistributedObjectListenerCodec'; import {ClientCreateProxyCodec} from '../codec/ClientCreateProxyCodec'; import {ClientDestroyProxyCodec} from '../codec/ClientDestroyProxyCodec'; @@ -36,7 +35,7 @@ import {RingbufferProxy} from './ringbuffer/RingbufferProxy'; import {SetProxy} from './SetProxy'; import {ReliableTopicProxy} from './topic/ReliableTopicProxy'; import {DistributedObjectEvent, DistributedObjectListener} from '../core/DistributedObjectListener'; -import {DeferredPromise} from '../util/Util'; +import {deferredPromise} from '../util/Util'; import {ClientMessage} from '../protocol/ClientMessage'; import {UUID} from '../core/UUID'; import {ClientCreateProxiesCodec} from '../codec/ClientCreateProxiesCodec'; @@ -90,7 +89,7 @@ export class ProxyManager { return this.proxies.get(fullName); } - const deferred = DeferredPromise(); + const deferred = deferredPromise(); this.proxies.set(fullName, deferred.promise); let createProxyPromise: Promise; diff --git a/src/proxy/QueueProxy.ts b/src/proxy/QueueProxy.ts index 79ec541ef..170b9411f 100644 --- a/src/proxy/QueueProxy.ts +++ b/src/proxy/QueueProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {QueueAddAllCodec} from '../codec/QueueAddAllCodec'; import {QueueAddListenerCodec} from '../codec/QueueAddListenerCodec'; import {QueueClearCodec} from '../codec/QueueClearCodec'; diff --git a/src/proxy/ReplicatedMap.ts b/src/proxy/ReplicatedMap.ts index 93e261361..ec24692b3 100644 --- a/src/proxy/ReplicatedMap.ts +++ b/src/proxy/ReplicatedMap.ts @@ -15,7 +15,6 @@ */ import * as Long from 'long'; -import * as Promise from 'bluebird'; import {EntryListener} from './EntryListener'; import { DistributedObject, diff --git a/src/proxy/ReplicatedMapProxy.ts b/src/proxy/ReplicatedMapProxy.ts index c5609917a..8d2a13c77 100644 --- a/src/proxy/ReplicatedMapProxy.ts +++ b/src/proxy/ReplicatedMapProxy.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import { Predicate, diff --git a/src/proxy/Ringbuffer.ts b/src/proxy/Ringbuffer.ts index ad4095aa0..bb561ecac 100644 --- a/src/proxy/Ringbuffer.ts +++ b/src/proxy/Ringbuffer.ts @@ -14,7 +14,6 @@ * limitations under the License. */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import { DistributedObject, diff --git a/src/proxy/SetProxy.ts b/src/proxy/SetProxy.ts index eef65a2a2..02d13730f 100644 --- a/src/proxy/SetProxy.ts +++ b/src/proxy/SetProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {SetAddAllCodec} from '../codec/SetAddAllCodec'; import {SetAddCodec} from '../codec/SetAddCodec'; import {SetAddListenerCodec} from '../codec/SetAddListenerCodec'; diff --git a/src/proxy/cpsubsystem/AtomicLongProxy.ts b/src/proxy/cpsubsystem/AtomicLongProxy.ts index 3d12c97b0..2706ad2fc 100644 --- a/src/proxy/cpsubsystem/AtomicLongProxy.ts +++ b/src/proxy/cpsubsystem/AtomicLongProxy.ts @@ -16,7 +16,6 @@ /** @ignore *//** */ import * as Long from 'long'; -import * as Promise from 'bluebird'; import {HazelcastClient} from '../../HazelcastClient'; import {BaseCPProxy} from './BaseCPProxy'; import {IAtomicLong} from '../IAtomicLong'; diff --git a/src/proxy/cpsubsystem/BaseCPProxy.ts b/src/proxy/cpsubsystem/BaseCPProxy.ts index 4e5251090..1e0623c9a 100644 --- a/src/proxy/cpsubsystem/BaseCPProxy.ts +++ b/src/proxy/cpsubsystem/BaseCPProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {HazelcastClient} from '../../HazelcastClient'; import {ClientMessage} from '../../protocol/ClientMessage'; import {RaftGroupId} from './RaftGroupId'; diff --git a/src/proxy/cpsubsystem/CPProxyManager.ts b/src/proxy/cpsubsystem/CPProxyManager.ts index f4e35ef28..151d1fa2f 100644 --- a/src/proxy/cpsubsystem/CPProxyManager.ts +++ b/src/proxy/cpsubsystem/CPProxyManager.ts @@ -16,7 +16,6 @@ /** @ignore *//** */ import * as assert from 'assert'; -import * as Promise from 'bluebird'; import { DistributedObject, IllegalStateError diff --git a/src/proxy/cpsubsystem/CPSessionAwareProxy.ts b/src/proxy/cpsubsystem/CPSessionAwareProxy.ts index 34000f2ba..b40d14997 100644 --- a/src/proxy/cpsubsystem/CPSessionAwareProxy.ts +++ b/src/proxy/cpsubsystem/CPSessionAwareProxy.ts @@ -16,7 +16,6 @@ /** @ignore *//** */ import * as Long from 'long'; -import * as Promise from 'bluebird'; import {HazelcastClient} from '../../HazelcastClient'; import {RaftGroupId} from './RaftGroupId'; import {BaseCPProxy} from './BaseCPProxy'; diff --git a/src/proxy/cpsubsystem/CPSessionManager.ts b/src/proxy/cpsubsystem/CPSessionManager.ts index 3c2762106..434afa902 100644 --- a/src/proxy/cpsubsystem/CPSessionManager.ts +++ b/src/proxy/cpsubsystem/CPSessionManager.ts @@ -16,7 +16,6 @@ /** @ignore *//** */ import * as Long from 'long'; -import * as Promise from 'bluebird'; import {RaftGroupId} from './RaftGroupId'; import {HazelcastClient} from '../../HazelcastClient'; import { diff --git a/src/proxy/cpsubsystem/FencedLockProxy.ts b/src/proxy/cpsubsystem/FencedLockProxy.ts index 535626a37..428ce5937 100644 --- a/src/proxy/cpsubsystem/FencedLockProxy.ts +++ b/src/proxy/cpsubsystem/FencedLockProxy.ts @@ -17,7 +17,6 @@ import * as assert from 'assert'; import * as Long from 'long'; -import * as Promise from 'bluebird'; import {HazelcastClient} from '../../HazelcastClient'; import {CPSessionAwareProxy} from './CPSessionAwareProxy'; import {FencedLock} from '../FencedLock'; diff --git a/src/proxy/flakeid/AutoBatcher.ts b/src/proxy/flakeid/AutoBatcher.ts index 7ee234e43..49ae6535d 100644 --- a/src/proxy/flakeid/AutoBatcher.ts +++ b/src/proxy/flakeid/AutoBatcher.ts @@ -15,10 +15,12 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import {EventEmitter} from 'events'; import * as Long from 'long'; -import {DeferredPromise} from '../../util/Util'; +import { + deferredPromise, + DeferredPromise +} from '../../util/Util'; /** @internal */ export class Batch { @@ -61,7 +63,7 @@ export class AutoBatcher { private static readonly NEW_BATCH_AVAILABLE = 'newBatch'; - private queue: Array> = []; + private queue: Array> = []; private batch: Batch; private requestInFlight = false; private supplier: () => Promise; @@ -89,7 +91,7 @@ export class AutoBatcher { } nextId(): Promise { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); this.queue.push(deferred); this.processIdRequests(); return deferred.promise; @@ -111,7 +113,7 @@ export class AutoBatcher { } private rejectAll(e: Error): void { - this.queue.forEach((deferred: Promise.Resolver) => { + this.queue.forEach((deferred: DeferredPromise) => { deferred.reject(e); }); this.queue = []; diff --git a/src/proxy/flakeid/FlakeIdGeneratorProxy.ts b/src/proxy/flakeid/FlakeIdGeneratorProxy.ts index 0defe3044..d46bcff46 100644 --- a/src/proxy/flakeid/FlakeIdGeneratorProxy.ts +++ b/src/proxy/flakeid/FlakeIdGeneratorProxy.ts @@ -15,7 +15,6 @@ */ /** @ignore *//** */ -import * as Promise from 'bluebird'; import * as Long from 'long'; import {FlakeIdGeneratorNewIdBatchCodec} from '../../codec/FlakeIdGeneratorNewIdBatchCodec'; import {FlakeIdGeneratorConfigImpl} from '../../config/FlakeIdGeneratorConfig'; diff --git a/src/proxy/ringbuffer/RingbufferProxy.ts b/src/proxy/ringbuffer/RingbufferProxy.ts index 2284cddad..caa9fdd5b 100644 --- a/src/proxy/ringbuffer/RingbufferProxy.ts +++ b/src/proxy/ringbuffer/RingbufferProxy.ts @@ -16,7 +16,6 @@ /** @ignore *//** */ import * as Long from 'long'; -import * as Promise from 'bluebird'; import {RingbufferAddAllCodec} from '../../codec/RingbufferAddAllCodec'; import {RingbufferAddCodec} from '../../codec/RingbufferAddCodec'; import {RingbufferCapacityCodec} from '../../codec/RingbufferCapacityCodec'; diff --git a/src/proxy/topic/ReliableTopicProxy.ts b/src/proxy/topic/ReliableTopicProxy.ts index 00a3b410d..50b9a9348 100644 --- a/src/proxy/topic/ReliableTopicProxy.ts +++ b/src/proxy/topic/ReliableTopicProxy.ts @@ -16,14 +16,16 @@ /** @ignore *//** */ import * as Long from 'long'; -import * as Promise from 'bluebird'; import {OverflowPolicy} from '../OverflowPolicy'; import {HazelcastClient} from '../../HazelcastClient'; import {TopicOverloadError} from '../../core'; import {AddressImpl} from '../../core/Address'; import {SerializationService} from '../../serialization/SerializationService'; import {UuidUtil} from '../../util/UuidUtil'; -import {DeferredPromise} from '../../util/Util'; +import { + deferredPromise, + DeferredPromise +} from '../../util/Util'; import {BaseProxy} from '../BaseProxy'; import {Ringbuffer} from '../Ringbuffer'; import {ITopic} from '../ITopic'; @@ -143,12 +145,12 @@ export class ReliableTopicProxy extends BaseProxy implements ITopic { } private addWithBackoff(reliableTopicMessage: ReliableTopicMessage): Promise { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); this.trySendMessage(reliableTopicMessage, TOPIC_INITIAL_BACKOFF, deferred); return deferred.promise; } - private trySendMessage(message: ReliableTopicMessage, delay: number, deferred: Promise.Resolver): void { + private trySendMessage(message: ReliableTopicMessage, delay: number, deferred: DeferredPromise): void { this.ringbuffer.add(message, OverflowPolicy.FAIL).then((seq: Long) => { if (seq.toNumber() === -1) { let newDelay = delay *= 2; diff --git a/src/util/Util.ts b/src/util/Util.ts index 4023a4f3e..0b9223841 100644 --- a/src/util/Util.ts +++ b/src/util/Util.ts @@ -17,7 +17,6 @@ import * as assert from 'assert'; import * as Long from 'long'; -import * as Promise from 'bluebird'; import * as Path from 'path'; import {AddressImpl, UUID} from '../core'; @@ -260,18 +259,78 @@ export function cancelRepetitionTask(task: Task): void { } /** @internal */ -export function DeferredPromise(): Promise.Resolver { +export interface DeferredPromise { + + promise: Promise; + resolve: (result: T) => void; + reject: (err: Error) => void; + +} + +/** + * Returns a deferred promise. + * @internal + */ +export function deferredPromise(): DeferredPromise { let resolve: any; let reject: any; - const promise = new Promise(function (): void { + const promise = new Promise(function (): void { resolve = arguments[0]; reject = arguments[1]; }); return { resolve, reject, - promise, - } as Promise.Resolver; + promise + }; +} + +/** + * Returns a promise that is resolved after the specified timeout. + * @param timeout timeout in milliseconds. + * @internal + */ +export function delayedPromise(timeout: number): Promise { + return new Promise((resolve) => setTimeout(resolve, timeout)); +} + +/** + * Returns a Promise that will be fulfilled with the wrapped promise's + * resolve value or rejection reason. However, if the wrapped promise is + * not resolved or rejected within the given timeout, the returned + * promise is rejected with an `Error` or the given error. + * + * @param wrapped wrapped promise + * @param timeout timeout in millisecond + * @param err optional error for the timeout case + * @internal + */ +export function timedPromise(wrapped: Promise, timeout: number, err?: Error): Promise { + const deferred = deferredPromise(); + let timed = false; + + const timer = setTimeout(() => { + if (err) { + deferred.reject(err); + } else { + deferred.reject(new Error('Operation did not finish within timeout: ' + timeout)); + } + timed = true; + }, timeout); + + wrapped.then((result) => { + if (!timed) { + deferred.resolve(result); + clearTimeout(timer); + } + }).catch((err) => { + if (!timed) { + deferred.reject(err); + clearTimeout(timer); + } + }); + + return deferred.promise; } /** diff --git a/test/HazelcastClientTest.js b/test/HazelcastClientTest.js index 83b3a11a5..6ef2119d5 100644 --- a/test/HazelcastClientTest.js +++ b/test/HazelcastClientTest.js @@ -18,7 +18,7 @@ const expect = require('chai').expect; const RC = require('./RC'); const { Client } = require('../.'); -const { DeferredPromise } = require('../lib/util/Util'); +const { deferredPromise } = require('../lib/util/Util'); const dummyConfig = { network: { @@ -55,7 +55,7 @@ ManagedObjects.prototype.destroyAll = function () { }; ManagedObjects.prototype.destroy = function (name) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); this.managedObjects.filter((el) => { if (el.getName() === name) { el.destroy().then(function () { diff --git a/test/ListenersOnReconnectTest.js b/test/ListenersOnReconnectTest.js index 56b99f16e..f5f08f7a6 100644 --- a/test/ListenersOnReconnectTest.js +++ b/test/ListenersOnReconnectTest.js @@ -16,7 +16,6 @@ 'use strict'; const expect = require('chai').expect; -const Promise = require('bluebird'); const RC = require('./RC'); const { Client } = require('../.'); const Util = require('./Util'); diff --git a/test/MembershipListenerTest.js b/test/MembershipListenerTest.js index 54f18920b..af03b4dda 100644 --- a/test/MembershipListenerTest.js +++ b/test/MembershipListenerTest.js @@ -18,7 +18,7 @@ const expect = require('chai').expect; const RC = require('./RC'); const Client = require('../.').Client; -const { DeferredPromise } = require('../lib/util/Util'); +const { deferredPromise } = require('../lib/util/Util'); const { MemberEvent } = require('../lib/core'); describe('MembershipListenerTest', function () { @@ -46,7 +46,7 @@ describe('MembershipListenerTest', function () { it('sees member added event', function () { let newMember; - const listenerCalledResolver = DeferredPromise(); + const listenerCalledResolver = deferredPromise(); const membershipListener = { memberAdded: (membershipEvent) => { @@ -68,7 +68,7 @@ describe('MembershipListenerTest', function () { it('sees member added event and other listener\'s event ', function () { let newMember; - const listenerCalledResolver = DeferredPromise(); + const listenerCalledResolver = deferredPromise(); let listenedSecondListener = false; const membershipListener = { @@ -115,7 +115,7 @@ describe('MembershipListenerTest', function () { it('sees member removed event', function () { let newMember; - const listenerCalledResolver = DeferredPromise(); + const listenerCalledResolver = deferredPromise(); const membershipListener = { memberRemoved: (membershipEvent) => { diff --git a/test/RC.js b/test/RC.js index 377ccd527..da4e1cb63 100644 --- a/test/RC.js +++ b/test/RC.js @@ -16,12 +16,12 @@ 'use strict'; const RC = require('./remote_controller/Controller'); -const { DeferredPromise } = require('../lib/util/Util'); +const { deferredPromise } = require('../lib/util/Util'); const controller = new RC('localhost', 9701); function createCluster(hzVersion, config) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.createCluster(hzVersion, config, function (err, cluster) { if (err) return deferred.reject(err); return deferred.resolve(cluster); @@ -30,7 +30,7 @@ function createCluster(hzVersion, config) { } function createClusterKeepClusterName(hzVersion, config) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.createClusterKeepClusterName(hzVersion, config, function (err, cluster) { if (err) return deferred.reject(err); return deferred.resolve(cluster); @@ -39,7 +39,7 @@ function createClusterKeepClusterName(hzVersion, config) { } function startMember(clusterId) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.startMember(clusterId, function (err, member) { if (err) return deferred.reject(err); return deferred.resolve(member); @@ -48,7 +48,7 @@ function startMember(clusterId) { } function exit() { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.exit(function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -57,7 +57,7 @@ function exit() { } function shutdownMember(clusterId, memberUuid) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.shutdownMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -66,7 +66,7 @@ function shutdownMember(clusterId, memberUuid) { } function shutdownCluster(clusterId) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.shutdownCluster(clusterId, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -75,7 +75,7 @@ function shutdownCluster(clusterId) { } function terminateMember(clusterId, memberUuid) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.terminateMember(clusterId, memberUuid, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -84,7 +84,7 @@ function terminateMember(clusterId, memberUuid) { } function terminateCluster(clusterId) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.terminateCluster(clusterId, function (err, res) { if (err) return deferred.reject(err); return deferred.resolve(res); @@ -93,7 +93,7 @@ function terminateCluster(clusterId) { } function executeOnController(clusterId, script, lang) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); controller.executeOnController(clusterId, script, lang, function (err, res) { if (err) return deferred.reject(err); if (res.success === false) return deferred.reject(res.message); diff --git a/test/connection/DirectWriterTest.js b/test/connection/DirectWriterTest.js index c570dc68a..2c5a95da1 100644 --- a/test/connection/DirectWriterTest.js +++ b/test/connection/DirectWriterTest.js @@ -20,7 +20,7 @@ const Socket = require('net').Socket; const sinon = require('sinon'); const expect = require('chai').expect; -const { DeferredPromise } = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); const { DirectWriter } = require('../../lib/network/ClientConnection'); describe('DirectWriterTest', function () { @@ -54,7 +54,7 @@ describe('DirectWriterTest', function () { done(); }); - queue.write(buffer, DeferredPromise()); + queue.write(buffer, deferredPromise()); }); it('writes multiple messages separately into socket', (done) => { @@ -68,15 +68,15 @@ describe('DirectWriterTest', function () { } }); - queue.write(Buffer.from('test'), DeferredPromise()); - queue.write(Buffer.from('test'), DeferredPromise()); - queue.write(Buffer.from('test'), DeferredPromise()); + queue.write(Buffer.from('test'), deferredPromise()); + queue.write(Buffer.from('test'), deferredPromise()); + queue.write(Buffer.from('test'), deferredPromise()); }); it('resolves promise on write success', (done) => { setUpWriteSuccess(); - const resolver = DeferredPromise(); + const resolver = deferredPromise(); queue.write(Buffer.from('test'), resolver); resolver.promise.then(done); }); @@ -85,7 +85,7 @@ describe('DirectWriterTest', function () { const err = new Error(); setUpWriteFailure(err); - const resolver = DeferredPromise(); + const resolver = deferredPromise(); queue.write(Buffer.from('test'), resolver); resolver.promise.catch((err) => { expect(err).to.be.equal(err); @@ -97,14 +97,14 @@ describe('DirectWriterTest', function () { setUpWriteSuccess(); queue.on('write', done); - queue.write(Buffer.from('test'), DeferredPromise()); + queue.write(Buffer.from('test'), deferredPromise()); }); it('does not emit write event on write failure', (done) => { setUpWriteFailure(new Error()); queue.on('write', () => done(new Error())); - const resolver = DeferredPromise(); + const resolver = deferredPromise(); queue.write(Buffer.from('test'), resolver); resolver.promise.catch(_ => { done(); diff --git a/test/connection/PipelinedWriterTest.js b/test/connection/PipelinedWriterTest.js index 2f3479123..f4f6448c0 100644 --- a/test/connection/PipelinedWriterTest.js +++ b/test/connection/PipelinedWriterTest.js @@ -13,15 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; -const Socket = require('net').Socket; +const { Socket } = require('net'); const sinon = require('sinon'); -const expect = require('chai').expect; -const Promise = require('bluebird'); +const { expect } = require('chai'); -const { DeferredPromise } = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); const { PipelinedWriter } = require('../../lib/network/ClientConnection'); describe('PipelinedWriterTest', function () { @@ -53,7 +51,7 @@ describe('PipelinedWriterTest', function () { setUpWriteSuccess(true); const buffer = Buffer.from('test'); - writer.write(buffer, DeferredPromise()); + writer.write(buffer, deferredPromise()); mockSocket.on('data', (data) => { expect(data).to.be.equal(buffer); done(); @@ -64,7 +62,7 @@ describe('PipelinedWriterTest', function () { setUpWriteSuccess(true); const buffer = Buffer.allocUnsafe(THRESHOLD * 2); - writer.write(buffer, DeferredPromise()); + writer.write(buffer, deferredPromise()); mockSocket.on('data', (data) => { expect(data).to.be.equal(buffer); done(); @@ -74,9 +72,9 @@ describe('PipelinedWriterTest', function () { it('writes multiple small messages as one into socket', (done) => { setUpWriteSuccess(true); - writer.write(Buffer.from('1'), DeferredPromise()); - writer.write(Buffer.from('2'), DeferredPromise()); - writer.write(Buffer.from('3'), DeferredPromise()); + writer.write(Buffer.from('1'), deferredPromise()); + writer.write(Buffer.from('2'), deferredPromise()); + writer.write(Buffer.from('3'), deferredPromise()); mockSocket.on('data', (data) => { expect(Buffer.compare(data, Buffer.from('123'))).to.be.equal(0); done(); @@ -88,13 +86,13 @@ describe('PipelinedWriterTest', function () { const size = THRESHOLD / 2; const data1 = Buffer.alloc(size).fill('1'); - const resolver1 = DeferredPromise(); + const resolver1 = deferredPromise(); writer.write(data1, resolver1); const data2 = Buffer.alloc(size).fill('2'); - const resolver2 = DeferredPromise(); + const resolver2 = deferredPromise(); writer.write(data2, resolver2); const data3 = Buffer.alloc(size).fill('3'); - const resolver3 = DeferredPromise(); + const resolver3 = deferredPromise(); writer.write(data3, resolver3); let cnt = 0; @@ -125,8 +123,8 @@ describe('PipelinedWriterTest', function () { setUpWriteSuccess(true); const size = THRESHOLD * 2; - writer.write(Buffer.alloc(size), DeferredPromise()); - writer.write(Buffer.alloc(size), DeferredPromise()); + writer.write(Buffer.alloc(size), deferredPromise()); + writer.write(Buffer.alloc(size), deferredPromise()); let cnt = 0; // the second write is queued with setImmediate, // thus, callback in this setImmediate must not see cnt === 0 or cnt === 2 @@ -145,7 +143,7 @@ describe('PipelinedWriterTest', function () { it('resolves single promise on write success', (done) => { setUpWriteSuccess(true); - const resolver = DeferredPromise(); + const resolver = deferredPromise(); writer.write(Buffer.from('test'), resolver); resolver.promise.then(done); }); @@ -153,9 +151,9 @@ describe('PipelinedWriterTest', function () { it('resolves multiple promises on write success', (done) => { setUpWriteSuccess(true); - const resolver1 = DeferredPromise(); + const resolver1 = deferredPromise(); writer.write(Buffer.from('test'), resolver1); - const resolver2 = DeferredPromise(); + const resolver2 = deferredPromise(); writer.write(Buffer.from('test'), resolver2); Promise.all([resolver1.promise, resolver2.promise]).then(() => done()); }); @@ -164,7 +162,7 @@ describe('PipelinedWriterTest', function () { const err = new Error(); setUpWriteFailure(err); - const resolver = DeferredPromise(); + const resolver = deferredPromise(); writer.write(Buffer.from('test'), resolver); resolver.promise.catch((err) => { expect(err).to.be.equal(err); @@ -176,9 +174,9 @@ describe('PipelinedWriterTest', function () { const err = new Error(); setUpWriteFailure(err); - const resolver1 = DeferredPromise(); + const resolver1 = deferredPromise(); writer.write(Buffer.from('test'), resolver1); - const resolver2 = DeferredPromise(); + const resolver2 = deferredPromise(); writer.write(Buffer.from('test'), resolver2); resolver1.promise.catch((err) => { expect(err).to.be.equal(err); @@ -193,14 +191,14 @@ describe('PipelinedWriterTest', function () { setUpWriteSuccess(true); writer.on('write', done); - writer.write(Buffer.from('test'), DeferredPromise()); + writer.write(Buffer.from('test'), deferredPromise()); }); it('does not emit write event on write failure', (done) => { setUpWriteFailure(new Error()); writer.on('write', () => done(new Error())); - const resolver = DeferredPromise(); + const resolver = deferredPromise(); writer.write(Buffer.from('test'), resolver); resolver.promise.catch(() => { done(); @@ -211,11 +209,11 @@ describe('PipelinedWriterTest', function () { setUpWriteSuccess(false); const buffer = Buffer.from('test'); - writer.write(buffer, DeferredPromise()); + writer.write(buffer, deferredPromise()); let writes = 0; mockSocket.on('data', () => { if (++writes === 1) { - writer.write(buffer, DeferredPromise()); + writer.write(buffer, deferredPromise()); setTimeout(done, 10); } else { done(new Error('Unexpected write before drain event')); @@ -227,14 +225,14 @@ describe('PipelinedWriterTest', function () { setUpWriteSuccess(false); const buffer = Buffer.from('test'); - writer.write(buffer, DeferredPromise()); + writer.write(buffer, deferredPromise()); let writes = 0; mockSocket.on('data', () => { if (++writes === 10) { return done(); } mockSocket.emit('drain'); - writer.write(buffer, DeferredPromise()); + writer.write(buffer, deferredPromise()); }); }); }); diff --git a/test/discovery/HazelcastCloudProviderTest.js b/test/discovery/HazelcastCloudProviderTest.js index 205b280cd..fd2e6ed9c 100644 --- a/test/discovery/HazelcastCloudProviderTest.js +++ b/test/discovery/HazelcastCloudProviderTest.js @@ -17,7 +17,6 @@ const sinon = require('sinon'); const expect = require('chai').expect; -const Promise = require('bluebird'); const { LogLevel } = require('../../lib/'); const { IllegalStateError } = require('../../'); diff --git a/test/flakeid/FlakeIdGeneratorProxyTest.js b/test/flakeid/FlakeIdGeneratorProxyTest.js index df0fc003f..ce10b1ce9 100644 --- a/test/flakeid/FlakeIdGeneratorProxyTest.js +++ b/test/flakeid/FlakeIdGeneratorProxyTest.js @@ -15,8 +15,7 @@ */ 'use strict'; -const expect = require('chai').expect; -const Promise = require('bluebird'); +const { expect } = require('chai'); const Long = require('long'); const RC = require('./../RC'); const { Client } = require('../../'); diff --git a/test/heartbeat/HeartbeatFromServerTest.js b/test/heartbeat/HeartbeatFromServerTest.js index 957136d97..1b9e97981 100644 --- a/test/heartbeat/HeartbeatFromServerTest.js +++ b/test/heartbeat/HeartbeatFromServerTest.js @@ -18,47 +18,46 @@ const RC = require('../RC'); const Util = require('../Util'); const { Client } = require('../../'); -const { DeferredPromise } = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); const { AddressImpl, TargetDisconnectedError } = require('../../lib/core'); describe('HeartbeatFromServerTest', function () { this.timeout(50000); let cluster; + let client; function simulateHeartbeatLost(client, address, timeout) { const connection = client.connectionManager.getConnectionFromAddress(address); connection.lastReadTimeMillis = connection.getLastReadTimeMillis() - timeout; } - function warmUpConnectionToAddressWithRetry(client, address, retryCount) { - return client.connectionManager.getOrConnect(address).then(function (conn) { - if (conn != null) { - return conn; - } else if (conn == null && retryCount > 0) { - return Util.promiseWaitMilliseconds(300).then(function () { - return warmUpConnectionToAddressWithRetry(client, address, retryCount - 1); - }); - } else { - throw new Error('Could not warm up connection to ' + address); - } - }); + async function warmUpConnectionToAddressWithRetry(client, address, retryCount) { + const conn = await client.connectionManager.getOrConnect(address); + if (conn != null) { + return conn; + } else if (conn == null && retryCount > 0) { + await Util.promiseWaitMilliseconds(300); + return warmUpConnectionToAddressWithRetry(client, address, retryCount - 1); + } else { + throw new Error('Could not warm up connection to ' + address); + } } - beforeEach(function () { - return RC.createCluster(null, null).then(function (resp) { - cluster = resp; - }); + beforeEach(async function () { + cluster = await RC.createCluster(null, null); }); - afterEach(function () { + afterEach(async function () { + if (client != null) { + await client.shutdown(); + } return RC.terminateCluster(cluster.id); }); it('connectionRemoved fired when second member stops heartbeating', function (done) { - let client; - const memberAddedPromise = new DeferredPromise(); - RC.startMember(cluster.id).then(function () { + const memberAddedPromise = new deferredPromise(); + RC.startMember(cluster.id).then(() => { return Client.newHazelcastClient({ clusterName: cluster.id, properties: { @@ -66,11 +65,11 @@ describe('HeartbeatFromServerTest', function () { 'hazelcast.client.heartbeat.timeout': 2000 } }); - }).then(function (resp) { - client = resp; - }).then(function () { + }).then((c) => { + client = c; + }).then(() => { const membershipListener = { - memberAdded: function (membershipEvent) { + memberAdded: (membershipEvent) => { const address = new AddressImpl(membershipEvent.member.address.host, membershipEvent.member.address.port); warmUpConnectionToAddressWithRetry(client, address); memberAddedPromise.resolve(); @@ -78,15 +77,15 @@ describe('HeartbeatFromServerTest', function () { }; client.clusterService.addMembershipListener(membershipListener); - }).then(function () { + }).then(() => { return RC.startMember(cluster.id); - }).then(function (member2) { - client.getConnectionManager().once('connectionRemoved', function (connection) { + }).then((member2) => { + client.getConnectionManager().once('connectionRemoved', (connection) => { const remoteAddress = connection.getRemoteAddress(); if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { if (connection.closedReason === 'Heartbeat timed out' && connection.closedCause instanceof TargetDisconnectedError) { - return client.shutdown().then(() => done()); + done(); } else { done(new Error('Connection does not closed due to heartbeat timeout. Reason: ' + connection.closedReason + ', cause: ' + connection.closedCause)); @@ -97,17 +96,16 @@ describe('HeartbeatFromServerTest', function () { } }); - return memberAddedPromise.promise.then(function () { + return memberAddedPromise.promise.then(() => { simulateHeartbeatLost(client, new AddressImpl(member2.host, member2.port), 2000); }); }).catch(done); }); it('connectionAdded fired when second member comes back', function (done) { - let client; let member2; - const memberAddedPromise = new DeferredPromise(); - RC.startMember(cluster.id).then(function (m) { + const memberAddedPromise = new deferredPromise(); + RC.startMember(cluster.id).then(() => { return Client.newHazelcastClient({ clusterName: cluster.id, properties: { @@ -115,27 +113,24 @@ describe('HeartbeatFromServerTest', function () { 'hazelcast.client.heartbeat.timeout': 2000 } }); - }).then(function (resp) { - client = resp; + }).then((c) => { + client = c; const membershipListener = { - memberAdded: function (membershipEvent) { - memberAddedPromise.resolve(); - } + memberAdded: memberAddedPromise.resolve }; - client.clusterService.addMembershipListener(membershipListener); return RC.startMember(cluster.id); - }).then(function (resp) { - member2 = resp; + }).then((m) => { + member2 = m; return memberAddedPromise.promise; - }).then(function () { + }).then(() => { return warmUpConnectionToAddressWithRetry(client, new AddressImpl(member2.host, member2.port), 3); }).then(() => { - client.getConnectionManager().once('connectionRemoved', function (connection) { + client.getConnectionManager().once('connectionRemoved', (connection) => { const remoteAddress = connection.getRemoteAddress(); if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { if (!(connection.closedReason === 'Heartbeat timed out' - || connection.closedCause instanceof TargetDisconnectedError)) { + || connection.closedCause instanceof TargetDisconnectedError)) { done(new Error('Connection does not closed due to heartbeat timeout. Reason: ' + connection.closedReason + ', cause: ' + connection.closedCause)); } @@ -144,10 +139,10 @@ describe('HeartbeatFromServerTest', function () { + member2.host + ':' + member2.port)); } }); - client.getConnectionManager().once('connectionAdded', function (connection) { + client.getConnectionManager().once('connectionAdded', (connection) => { const remoteAddress = connection.getRemoteAddress(); if (remoteAddress.host === member2.host && remoteAddress.port === member2.port) { - return client.shutdown().then(() => done()); + done(); } else { done(new Error(remoteAddress.host + ':' + remoteAddress.port + ' is added instead of ' + member2.host + ':' + member2.port)); diff --git a/test/integration/ConnectionStrategyTest.js b/test/integration/ConnectionStrategyTest.js index e72f6b762..d03676521 100644 --- a/test/integration/ConnectionStrategyTest.js +++ b/test/integration/ConnectionStrategyTest.js @@ -23,7 +23,7 @@ chai.use(chaiAsPromised); const RC = require('../RC'); const { Client, ClientOfflineError, ClientNotActiveError } = require('../../'); const TestUtil = require('../Util'); -const Util = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); const { ReconnectMode } = require('../../lib/config/ConnectionStrategyConfig'); const { LifecycleState } = require('../../lib/LifecycleService'); @@ -75,7 +75,7 @@ describe('ConnectionStrategyTest', function () { asyncStart: true } }; - const connected = Util.DeferredPromise(); + const connected = deferredPromise(); config.lifecycleListeners.push((state) => { if (state === LifecycleState.CONNECTED) { connected.resolve(); @@ -102,7 +102,7 @@ describe('ConnectionStrategyTest', function () { } } }; - const shutdown = Util.DeferredPromise(); + const shutdown = deferredPromise(); config.lifecycleListeners.push((state) => { if (state === LifecycleState.SHUTDOWN) { shutdown.resolve(); @@ -134,8 +134,8 @@ describe('ConnectionStrategyTest', function () { } } }; - const disconnected = Util.DeferredPromise(); - const reconnected = Util.DeferredPromise(); + const disconnected = deferredPromise(); + const reconnected = deferredPromise(); config.lifecycleListeners.push((state) => { if (state === LifecycleState.DISCONNECTED) { disconnected.resolve(); diff --git a/test/integration/InitialMembershipListenerTest.js b/test/integration/InitialMembershipListenerTest.js index 8b0d3c98e..41b6aa428 100644 --- a/test/integration/InitialMembershipListenerTest.js +++ b/test/integration/InitialMembershipListenerTest.js @@ -23,7 +23,7 @@ const { expect } = require('chai'); const RC = require('../RC'); const { Client } = require('../../.'); -const Util = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); describe('InitialMembershipListenerTest', function () { @@ -91,7 +91,7 @@ describe('InitialMembershipListenerTest', function () { it('should receive events after initial event', function (done) { let newMember; - const newMemberResolved = Util.DeferredPromise(); + const newMemberResolved = deferredPromise(); const membershipListener = { init: (event) => { diff --git a/test/map/MapPartitionAwareTest.js b/test/map/MapPartitionAwareTest.js index b37d42653..57514505e 100644 --- a/test/map/MapPartitionAwareTest.js +++ b/test/map/MapPartitionAwareTest.js @@ -15,10 +15,9 @@ */ 'use strict'; -const Client = require('../../.').Client; +const { expect } = require('chai'); const RC = require('../RC'); -const expect = require('chai').expect; -const Promise = require('bluebird'); +const { Client } = require('../../.'); describe('MapPartitionAwareTest', function () { diff --git a/test/map/MapPredicateTest.js b/test/map/MapPredicateTest.js index 66ab9bd6e..42ae02ee0 100644 --- a/test/map/MapPredicateTest.js +++ b/test/map/MapPredicateTest.js @@ -15,9 +15,8 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const assert = require('assert'); -const Promise = require('bluebird'); const fs = require('fs'); const RC = require('./../RC'); diff --git a/test/map/MapProxyTest.js b/test/map/MapProxyTest.js index 8cb39be94..79105ae18 100644 --- a/test/map/MapProxyTest.js +++ b/test/map/MapProxyTest.js @@ -15,8 +15,7 @@ */ 'use strict'; -const expect = require('chai').expect; -const Promise = require('bluebird'); +const { expect } = require('chai'); const fs = require('fs'); const RC = require('./../RC'); diff --git a/test/map/NearCachedMapStressTest.js b/test/map/NearCachedMapStressTest.js index ea1bd6a2b..f0ddc4869 100644 --- a/test/map/NearCachedMapStressTest.js +++ b/test/map/NearCachedMapStressTest.js @@ -20,7 +20,7 @@ const fs = require('fs'); const RC = require('../RC'); const Client = require('../../.').Client; -const { DeferredPromise } = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); const { getRandomInt } = require('../Util'); describe('NearCachedMapStress', function () { @@ -34,7 +34,7 @@ describe('NearCachedMapStress', function () { const mapName = 'stressncmap'; const concurrencyLevel = 32; const totalNumOperations = 100000; - const completedDeferred = DeferredPromise(); + const completedDeferred = deferredPromise(); const putPercent = 15; const removePercent = 20; const getPercent = 100 - putPercent - removePercent; diff --git a/test/multimap/MultiMapProxyLockTest.js b/test/multimap/MultiMapProxyLockTest.js index cb6bf68b3..3981893ac 100644 --- a/test/multimap/MultiMapProxyLockTest.js +++ b/test/multimap/MultiMapProxyLockTest.js @@ -15,8 +15,7 @@ */ 'use strict'; -const expect = require('chai').expect; -const Promise = require('bluebird'); +const { expect } = require('chai'); const RC = require('./../RC'); const Client = require('../..').Client; diff --git a/test/multimap/MultiMapProxyTest.js b/test/multimap/MultiMapProxyTest.js index 9e9baf439..ced2adc51 100644 --- a/test/multimap/MultiMapProxyTest.js +++ b/test/multimap/MultiMapProxyTest.js @@ -15,10 +15,9 @@ */ 'use strict'; -const expect = require('chai').expect; -const Promise = require('bluebird'); +const { expect } = require('chai'); const RC = require('./../RC'); -const Client = require('../..').Client; +const { Client } = require('../..'); const Util = require('../Util'); describe('MultiMapProxyTest', function () { diff --git a/test/nearcache/InvalidationMetadataDistortionTest.js b/test/nearcache/InvalidationMetadataDistortionTest.js index e0cc1818b..add091745 100644 --- a/test/nearcache/InvalidationMetadataDistortionTest.js +++ b/test/nearcache/InvalidationMetadataDistortionTest.js @@ -15,11 +15,10 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const fs = require('fs'); -const Promise = require('bluebird'); const RC = require('../RC'); -const Client = require('../..').Client; +const { Client } = require('../..'); const identifiedFactory = require('../javaclasses/IdentifiedFactory'); const DistortInvalidationMetadataEntryProcessor = require('../javaclasses/DistortInvalidationMetadataEntryProcessor'); diff --git a/test/nearcache/LostInvalidationsTest.js b/test/nearcache/LostInvalidationsTest.js index ad1623113..9eddfa2f7 100644 --- a/test/nearcache/LostInvalidationsTest.js +++ b/test/nearcache/LostInvalidationsTest.js @@ -19,7 +19,7 @@ const expect = require('chai').expect; const fs = require('fs'); const RC = require('../RC'); const { Client } = require('../../'); -const { DeferredPromise } = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); const Util = require('../Util'); describe('LostInvalidationTest', function () { @@ -38,7 +38,7 @@ describe('LostInvalidationTest', function () { .get(listenerId).get(client.getConnectionManager().getRandomConnection()); const correlationId = clientRegistrationKey.correlationId; const handler = client.getInvocationService().eventHandlers.get(correlationId).handler; - const deferred = DeferredPromise(); + const deferred = deferredPromise(); let numberOfBlockedInvalidations = 0; client.getInvocationService().eventHandlers.get(correlationId).handler = () => { numberOfBlockedInvalidations++; diff --git a/test/nearcache/MigratedDataTest.js b/test/nearcache/MigratedDataTest.js index 2fc700725..6be48e6d1 100644 --- a/test/nearcache/MigratedDataTest.js +++ b/test/nearcache/MigratedDataTest.js @@ -20,7 +20,7 @@ const fs = require('fs'); const RC = require('../RC'); const { Client } = require('../../'); const Util = require('../Util'); -const { DeferredPromise } = require('../../lib/util/Util'); +const { deferredPromise } = require('../../lib/util/Util'); describe('MigratedDataTest', function () { @@ -33,7 +33,7 @@ describe('MigratedDataTest', function () { const mapName = 'ncmap'; function waitForPartitionTableEvent(partitionService) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); const expectedPartitionCount = partitionService.partitionCount; function checkPartitionTable(remainingTries) { @@ -50,7 +50,7 @@ describe('MigratedDataTest', function () { } function waitUntilPartitionMovesTo(partitionService, partitionId, uuid) { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); (function resolveOrTimeout(remainingTries) { if (partitionService.getPartitionOwner(partitionId).toString() === uuid) { deferred.resolve(); diff --git a/test/queue/QueueProxyTest.js b/test/queue/QueueProxyTest.js index 9d31a8dab..57f4c9a05 100644 --- a/test/queue/QueueProxyTest.js +++ b/test/queue/QueueProxyTest.js @@ -19,7 +19,6 @@ const chai = require('chai'); const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); chai.use(chaiAsPromised); -const Promise = require('bluebird'); const fs = require('fs'); const RC = require('./../RC'); diff --git a/test/replicatedmap/ReplicatedMapProxyTest.js b/test/replicatedmap/ReplicatedMapProxyTest.js index 63fdf388a..364a68bd3 100644 --- a/test/replicatedmap/ReplicatedMapProxyTest.js +++ b/test/replicatedmap/ReplicatedMapProxyTest.js @@ -15,13 +15,12 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const fs = require('fs'); const path = require('path'); -const Promise = require('bluebird'); const RC = require('./../RC'); -const Client = require('../..').Client; -const Predicates = require('../..').Predicates; +const { Client } = require('../..'); +const { Predicates } = require('../..'); describe('ReplicatedMapProxyTest', function () { diff --git a/test/rest_value/RestValueTest.js b/test/rest_value/RestValueTest.js index 7f46b41dd..a164429d6 100644 --- a/test/rest_value/RestValueTest.js +++ b/test/rest_value/RestValueTest.js @@ -16,13 +16,13 @@ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const fs = require('fs'); const http = require('http'); const querystring = require('querystring'); -const Client = require('../../lib').Client; const RC = require('../RC'); -const { DeferredPromise } = require('../../lib/util/Util'); +const Client = require('../../lib').Client; +const { deferredPromise } = require('../../lib/util/Util'); describe('RestValueTest', function () { @@ -69,7 +69,7 @@ describe('RestValueTest', function () { return queue.addItemListener(itemListener, true); }) .then(() => { - const deferred = DeferredPromise(); + const deferred = deferredPromise(); const options = { hostname: member.host, diff --git a/test/ringbuffer/RingbufferProxyTest.js b/test/ringbuffer/RingbufferProxyTest.js index 8905db0f6..74f5e958f 100644 --- a/test/ringbuffer/RingbufferProxyTest.js +++ b/test/ringbuffer/RingbufferProxyTest.js @@ -16,10 +16,9 @@ 'use strict'; const { expect } = require('chai'); -const Promise = require('bluebird'); const fs = require('fs'); -const { Client, StaleSequenceError } = require('../../'); const RC = require('./../RC'); +const { Client, StaleSequenceError } = require('../../'); const PrefixFilter = require('../javaclasses/PrefixFilter'); describe('RingbufferProxyTest', function () { diff --git a/test/unit/UtilTest.js b/test/unit/UtilTest.js index caae79208..94749cfb5 100644 --- a/test/unit/UtilTest.js +++ b/test/unit/UtilTest.js @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 'use strict'; const { expect } = require('chai'); -const { copyBuffers } = require('../../lib/util/Util'); +const { + copyBuffers, + deferredPromise, + timedPromise +} = require('../../lib/util/Util'); describe('UtilTest', function () { @@ -45,4 +48,93 @@ describe('UtilTest', function () { expect(Buffer.compare(target, Buffer.from('def'))).to.be.equal(0); }); + + it('deferredPromise: resolves promise on resolve call', function (done) { + const deferred = deferredPromise(); + let resolveCalled = false; + + deferred.promise + .then(() => { + expect(resolveCalled).to.be.true; + done(); + }) + .catch(done); + + setTimeout(() => { + deferred.resolve(); + resolveCalled = true; + }, 50); + }); + + it('deferredPromise: rejects promise on reject call', function (done) { + const deferred = deferredPromise(); + const rejectWith = new Error(); + let rejectCalled = false; + + deferred.promise + .catch((err) => { + expect(rejectCalled).to.be.true; + expect(err).to.be.equal(rejectWith); + done(); + }) + .catch(done); + + setTimeout(() => { + deferred.reject(rejectWith); + rejectCalled = true; + }, 50); + }); + + it('timedPromise: rejects by timeout with default error', function (done) { + const deferred = deferredPromise(); + const timed = timedPromise(deferred.promise, 50); + + timed + .catch((err) => { + expect(err).to.be.instanceOf(Error); + expect(err.message).to.contain('Operation did not finish within timeout'); + done(); + }) + .catch(done); + }); + + it('timedPromise: rejects by timeout with given error', function (done) { + const deferred = deferredPromise(); + const rejectWith = new Error(); + const timed = timedPromise(deferred.promise, 50, rejectWith); + + timed + .catch((err) => { + expect(err).to.be.equal(rejectWith); + done(); + }) + .catch(done); + }); + + it('timedPromise: resolves when wrapper promise is resolved in time', function (done) { + const deferred = deferredPromise(); + const timed = timedPromise(deferred.promise, 50); + + deferred.resolve(42); + timed + .then((result) => { + expect(result).to.be.equal(42); + done(); + }) + .catch(done); + }); + + it('timedPromise: rejects when wrapper promise is rejected in time', function (done) { + const deferred = deferredPromise(); + const rejectWith = new Error(); + const timed = timedPromise(deferred.promise, 50); + + deferred.reject(rejectWith); + timed + .catch((err) => { + expect(err).to.be.equal(rejectWith); + done(); + }) + .catch(done); + }); }); From c7b1993188539672f8fcba517a3f73225797a68b Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 10 Sep 2020 15:24:26 +0300 Subject: [PATCH 291/685] Implement redo operation option (#590) --- src/config/ClientNetworkConfig.ts | 10 +- src/config/ConfigBuilder.ts | 2 + src/invocation/InvocationService.ts | 8 +- test/ClientReconnectTest.js | 63 ++++----- test/ClientRedoEnabledTest.js | 120 ++++++++++++++++++ test/config/ConfigBuilderTest.js | 5 +- test/config/configurations/config-schema.json | 4 + test/config/configurations/full.json | 1 + 8 files changed, 171 insertions(+), 42 deletions(-) create mode 100644 test/ClientRedoEnabledTest.js diff --git a/src/config/ClientNetworkConfig.ts b/src/config/ClientNetworkConfig.ts index 6d8c06bd4..ac5e5c27d 100644 --- a/src/config/ClientNetworkConfig.ts +++ b/src/config/ClientNetworkConfig.ts @@ -39,9 +39,15 @@ export interface ClientNetworkConfig { */ connectionTimeout: number; - // TODO not implemented yet /** - * Enables redo operations behavior. + * When set to `true`, the client will redo the operations that were executing on + * the server in case if the client lost connection. This can happen because of + * network problems, or simply because the member died. However it is not clear + * whether the operation was performed or not. For idempotent operations this is + * harmless, but for non idempotent ones retrying can cause to undesirable effects. + * Note that the redo can be processed on any member. + * + * By default, set to `false`. */ redoOperation?: boolean; diff --git a/src/config/ConfigBuilder.ts b/src/config/ConfigBuilder.ts index 723dafb56..747aeecbe 100644 --- a/src/config/ConfigBuilder.ts +++ b/src/config/ConfigBuilder.ts @@ -141,6 +141,8 @@ export class ConfigBuilder { this.handleClusterMembers(jsonObject[key]); } else if (key === 'smartRouting') { this.effectiveConfig.network.smartRouting = tryGetBoolean(jsonObject[key]); + } else if (key === 'redoOperation') { + this.effectiveConfig.network.redoOperation = tryGetBoolean(jsonObject[key]); } else if (key === 'connectionTimeout') { this.effectiveConfig.network.connectionTimeout = tryGetNumber(jsonObject[key]); } else if (key === 'ssl') { diff --git a/src/invocation/InvocationService.ts b/src/invocation/InvocationService.ts index 3ef8a62d9..2fef75922 100644 --- a/src/invocation/InvocationService.ts +++ b/src/invocation/InvocationService.ts @@ -158,7 +158,7 @@ export class Invocation { } if (err instanceof TargetDisconnectedError) { - return this.request.isRetryable(); + return this.request.isRetryable() || this.invocationService.redoOperationEnabled(); } return false; @@ -251,6 +251,7 @@ export class InvocationService { private readonly connectionManager: ClientConnectionManager; private readonly partitionService: PartitionServiceImpl; private readonly cleanResourcesMillis: number; + private readonly redoOperation: boolean; private correlationCounter = 1; private cleanResourcesTask: Task; private isShutdown: boolean; @@ -276,6 +277,7 @@ export class InvocationService { config.properties[PROPERTY_FAIL_ON_INDETERMINATE_STATE] as boolean; this.cleanResourcesMillis = config.properties[PROPERTY_CLEAN_RESOURCES_MILLIS] as number; + this.redoOperation = config.network.redoOperation; this.backupAckToClientEnabled = config.network.smartRouting && config.backupAckToClientEnabled; this.isShutdown = false; } @@ -306,6 +308,10 @@ export class InvocationService { } } + redoOperationEnabled() { + return this.redoOperation; + } + invoke(invocation: Invocation): Promise { invocation.deferred = deferredPromise(); const newCorrelationId = this.correlationCounter++; diff --git a/test/ClientReconnectTest.js b/test/ClientReconnectTest.js index c0ff3aa43..f83fbdaca 100644 --- a/test/ClientReconnectTest.js +++ b/test/ClientReconnectTest.js @@ -15,53 +15,43 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const RC = require('./RC'); const { Client } = require('../.'); describe('ClientReconnectTest', function () { - let cluster, client; + this.timeout(10000); - afterEach(function () { - return client.shutdown() - .then(() => RC.terminateCluster(cluster.id)); + let cluster; + let client; + + afterEach(async function () { + await client.shutdown(); + return RC.terminateCluster(cluster.id); }); - it('member restarts, while map.put in progress', function () { - this.timeout(9000); - let member, map; - return RC.createCluster(null, null).then(function (cl) { - cluster = cl; - return RC.startMember(cluster.id); - }).then(function (m) { - member = m; - return Client.newHazelcastClient({ - clusterName: cluster.id, - properties: { - 'hazelcast.client.heartbeat.interval': 1000, - 'hazelcast.client.heartbeat.timeout': 3000 - } - }); - }).then(function (cl) { - client = cl; - return client.getMap('test'); - }).then(function (mp) { - map = mp; - return RC.terminateMember(cluster.id, member.uuid); - }).then(function () { - return RC.startMember(cluster.id); - }).then(function () { - return map.put('testkey', 'testvalue'); - }).then(function () { - return map.get('testkey'); - }).then(function (val) { - return expect(val).to.equal('testvalue'); - }) + it('member restarts, while map.put in progress', async function () { + cluster = await RC.createCluster(null, null); + const member = await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + properties: { + 'hazelcast.client.heartbeat.interval': 1000, + 'hazelcast.client.heartbeat.timeout': 3000 + } + }); + const map = await client.getMap('test'); + + await RC.terminateMember(cluster.id, member.uuid); + await RC.startMember(cluster.id); + + await map.put('testkey', 'testvalue'); + const val = await map.get('testkey'); + expect(val).to.equal('testvalue'); }); it('member restarts, while map.put in progress 2', function (done) { - this.timeout(5000); let member, map; RC.createCluster(null, null).then(function (cl) { cluster = cl; @@ -101,7 +91,6 @@ describe('ClientReconnectTest', function () { }); it('create proxy while member is down, member comes back', function (done) { - this.timeout(10000); let member, map; RC.createCluster(null, null).then(function (cl) { cluster = cl; diff --git a/test/ClientRedoEnabledTest.js b/test/ClientRedoEnabledTest.js new file mode 100644 index 000000000..c4bb48bf7 --- /dev/null +++ b/test/ClientRedoEnabledTest.js @@ -0,0 +1,120 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const chai = require('chai'); +chai.should(); +chai.use(require('chai-as-promised')); +const expect = chai.expect; +const RC = require('./RC'); +const { + Client, + IndexOutOfBoundsError, + IllegalMonitorStateError +} = require('../.'); + +describe('ClientRedoEnabledTest', function () { + + this.timeout(10000); + + let cluster; + let client; + + beforeEach(async function () { + cluster = await RC.createCluster(null, null); + await RC.startMember(cluster.id); + }); + + afterEach(async function () { + await client.shutdown(); + return RC.terminateCluster(cluster.id); + }); + + it('List.get should throw on out of bounds index access', async function () { + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + redoOperation: true + } + }); + + const list = await client.getList('list'); + expect(list.get(0)).to.be.rejectedWith(IndexOutOfBoundsError); + }); + + it('Map.unlock should throw when not locked', async function () { + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + redoOperation: true + } + }); + + const map = await client.getMap('map'); + expect(map.unlock('foo')).to.be.rejectedWith(IllegalMonitorStateError); + }); + + it('should redo operations in smart mode when member goes down', async function () { + const memberTwo = await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + redoOperation: true + } + }); + const map = await client.getMap('map'); + + setTimeout(() => { + RC.shutdownMember(cluster.id, memberTwo.uuid) + .catch(() => { + // no-op + }); + }, 0); + + for (let i = 0; i < 100; i++) { + await map.put(i, i); + } + + const size = await map.size(); + expect(size).to.be.equal(100); + }); + + it('should redo operations in unisocket mode when member goes down', async function () { + const memberTwo = await RC.startMember(cluster.id); + client = await Client.newHazelcastClient({ + clusterName: cluster.id, + network: { + redoOperation: true, + smartRouting: false + } + }); + const map = await client.getMap('map'); + + setTimeout(() => { + RC.shutdownMember(cluster.id, memberTwo.uuid) + .catch(() => { + // no-op + }); + }, 0); + + for (let i = 0; i < 100; i++) { + await map.put(i, i); + } + + const size = await map.size(); + expect(size).to.be.equal(100); + }); +}); diff --git a/test/config/ConfigBuilderTest.js b/test/config/ConfigBuilderTest.js index 42195c5eb..cc7b2cdad 100644 --- a/test/config/ConfigBuilderTest.js +++ b/test/config/ConfigBuilderTest.js @@ -15,14 +15,14 @@ */ 'use strict'; -const expect = require('chai').expect; +const { expect } = require('chai'); const path = require('path'); const { EvictionPolicy, JsonStringDeserializationPolicy, LoadBalancerType, InMemoryFormat, - TopicOverloadPolicy, + TopicOverloadPolicy } = require('../..'); const { ConfigBuilder } = require('../../lib/config/ConfigBuilder'); const { AddressHelper } = require('../../lib/util/Util'); @@ -118,6 +118,7 @@ describe('ConfigBuilderTest', function () { expect(address0.port).to.be.undefined; expect(address1.host).to.equal('127.0.0.2'); expect(address1.port).to.equal(5702); + expect(networkCfg.redoOperation).to.be.true; expect(networkCfg.smartRouting).to.be.false; expect(networkCfg.connectionTimeout).to.equal(6000); expect(networkCfg.ssl.enabled).to.be.true; diff --git a/test/config/configurations/config-schema.json b/test/config/configurations/config-schema.json index d9e8e7413..1000b242b 100644 --- a/test/config/configurations/config-schema.json +++ b/test/config/configurations/config-schema.json @@ -56,6 +56,10 @@ "type": "string" } }, + "redoOperation": { + "type": "boolean", + "default": false + }, "smartRouting": { "type": "boolean", "default": true diff --git a/test/config/configurations/full.json b/test/config/configurations/full.json index afb2265e3..8c282ad41 100644 --- a/test/config/configurations/full.json +++ b/test/config/configurations/full.json @@ -27,6 +27,7 @@ "127.0.0.9", "127.0.0.2:5702" ], + "redoOperation": true, "smartRouting": false, "connectionTimeout": 6000, "ssl": { From 408f1e00e096e756d4c400c3e3333ee9cf03fe68 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Thu, 10 Sep 2020 16:07:18 +0300 Subject: [PATCH 292/685] Revert single queue in PipelinedWriter (#588) Also includes the following: * Fix ClientConnectionManager shut down order --- src/network/ClientConnection.ts | 51 +++++++++++++------------- src/network/ClientConnectionManager.ts | 3 +- src/util/Util.ts | 14 ++++--- test/unit/UtilTest.js | 10 ++--- 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/network/ClientConnection.ts b/src/network/ClientConnection.ts index 7d4775f3a..e9534cad4 100644 --- a/src/network/ClientConnection.ts +++ b/src/network/ClientConnection.ts @@ -30,7 +30,7 @@ import { SIZE_OF_FRAME_LENGTH_AND_FLAGS } from '../protocol/ClientMessage'; -const FROZEN_ARRAY = Object.freeze([]); +const FROZEN_ARRAY = Object.freeze([]) as OutputQueueItem[]; const PROPERTY_PIPELINING_ENABLED = 'hazelcast.client.autopipelining.enabled'; const PROPERTY_PIPELINING_THRESHOLD = 'hazelcast.client.autopipelining.threshold.bytes'; const PROPERTY_NO_DELAY = 'hazelcast.client.socket.no.delay'; @@ -40,15 +40,20 @@ abstract class Writer extends EventEmitter { abstract write(buffer: Buffer, resolver: DeferredPromise): void; abstract close(): void; +} + +interface OutputQueueItem { + + buffer: Buffer; + resolver: DeferredPromise; } /** @internal */ export class PipelinedWriter extends Writer { private readonly socket: net.Socket; - private queuedBufs: Buffer[] = []; - private queuedResolvers: DeferredPromise[] = []; + private queue: OutputQueueItem[] = []; private error: Error; private scheduled = false; private canWrite = true; @@ -75,16 +80,14 @@ export class PipelinedWriter extends Writer { // if there was a write error, it's useless to keep writing to the socket return process.nextTick(() => resolver.reject(this.error)); } - this.queuedBufs.push(buffer); - this.queuedResolvers.push(resolver); + this.queue.push({ buffer, resolver }); this.schedule(); } close(): void { this.canWrite = false; // no more items can be added now - this.queuedResolvers = FROZEN_ARRAY as DeferredPromise[]; - this.queuedBufs = FROZEN_ARRAY as Buffer[]; + this.queue = FROZEN_ARRAY; } private schedule(): void { @@ -102,8 +105,8 @@ export class PipelinedWriter extends Writer { let totalLength = 0; let queueIdx = 0; - while (queueIdx < this.queuedBufs.length && totalLength < this.threshold) { - const buf = this.queuedBufs[queueIdx]; + while (queueIdx < this.queue.length && totalLength < this.threshold) { + const buf = this.queue[queueIdx].buffer; // if the next buffer exceeds the threshold, // try to take multiple queued buffers which fit this.coalesceBuf if (queueIdx > 0 && totalLength + buf.length > this.threshold) { @@ -118,33 +121,31 @@ export class PipelinedWriter extends Writer { return; } - const buffers = this.queuedBufs.slice(0, queueIdx); - this.queuedBufs = this.queuedBufs.slice(queueIdx); - const resolvers = this.queuedResolvers.slice(0, queueIdx); - this.queuedResolvers = this.queuedResolvers.slice(queueIdx); + const writeBatch = this.queue.slice(0, queueIdx); + this.queue = this.queue.slice(queueIdx); let buf; - if (buffers.length === 1) { + if (writeBatch.length === 1) { // take the only buffer - buf = buffers[0]; + buf = writeBatch[0].buffer; } else { // coalesce buffers - copyBuffers(this.coalesceBuf, buffers, totalLength); + copyBuffers(this.coalesceBuf, writeBatch, totalLength); buf = this.coalesceBuf.slice(0, totalLength); } // write to the socket: no further writes until flushed this.canWrite = this.socket.write(buf, (err: Error) => { if (err) { - this.handleError(err, resolvers); + this.handleError(err, writeBatch); return; } this.emit('write'); - for (const resolver of resolvers) { - resolver.resolve(); + for (const item of writeBatch) { + item.resolver.resolve(); } - if (this.queuedBufs.length === 0 || !this.canWrite) { + if (this.queue.length === 0 || !this.canWrite) { // will start running on the next message or drain event this.scheduled = false; return; @@ -154,13 +155,13 @@ export class PipelinedWriter extends Writer { }); } - private handleError(err: any, sentResolvers: Array>): void { + private handleError(err: any, sentResolvers: OutputQueueItem[]): void { this.error = new IOError(err); - for (const r of sentResolvers) { - r.reject(this.error); + for (const item of sentResolvers) { + item.resolver.reject(this.error); } - for (const resolver of this.queuedResolvers) { - resolver.reject(this.error); + for (const item of this.queue) { + item.resolver.reject(this.error); } this.close(); } diff --git a/src/network/ClientConnectionManager.ts b/src/network/ClientConnectionManager.ts index 02098a128..9cc891dbe 100644 --- a/src/network/ClientConnectionManager.ts +++ b/src/network/ClientConnectionManager.ts @@ -182,13 +182,14 @@ export class ClientConnectionManager extends EventEmitter { pending.reject(new ClientNotActiveError('Hazelcast client is shutting down')); }); + // HeartbeatManager should be shut down before connections are closed + this.heartbeatManager.shutdown(); this.activeConnections.forEach((connection) => { connection.close('Hazelcast client is shutting down', null); }); this.removeAllListeners(CONNECTION_REMOVED_EVENT_NAME); this.removeAllListeners(CONNECTION_ADDED_EVENT_NAME); - this.heartbeatManager.shutdown(); } public getConnection(uuid: UUID): ClientConnection { diff --git a/src/util/Util.ts b/src/util/Util.ts index 0b9223841..65deaaadc 100644 --- a/src/util/Util.ts +++ b/src/util/Util.ts @@ -333,21 +333,25 @@ export function timedPromise(wrapped: Promise, timeout: number, err?: Erro return deferred.promise; } +type Binary = { + buffer: Buffer; +} + /** - * Copy contents of the given array of buffers into the target buffer. + * Copy contents of the given array of objects with buffers into the target buffer. * * @param target target buffer - * @param sources source buffers + * @param sources source objects that contain buffers * @param totalLength total length of all source buffers * @internal */ -export function copyBuffers(target: Buffer, sources: Buffer[], totalLength: number): void { +export function copyBuffers(target: Buffer, sources: Binary[], totalLength: number): void { if (target.length < totalLength) { throw new RangeError('Target length ' + target.length + ' is less than requested ' + totalLength); } let pos = 0; for (const source of sources) { - source.copy(target, pos); - pos += source.length; + source.buffer.copy(target, pos); + pos += source.buffer.length; } } diff --git a/test/unit/UtilTest.js b/test/unit/UtilTest.js index 94749cfb5..8fc92d686 100644 --- a/test/unit/UtilTest.js +++ b/test/unit/UtilTest.js @@ -25,13 +25,13 @@ const { describe('UtilTest', function () { it('copyBuffers: throws on invalid total length', function () { - expect(() => copyBuffers(Buffer.from([0x1]), [ Buffer.from([0x2]) ], 3)) + expect(() => copyBuffers(Buffer.from([0x1]), [ { buffer: Buffer.from([0x2]) } ], 3)) .to.throw(RangeError); }); it('copyBuffers: writes single buffer of less length', function () { const target = Buffer.from('abc'); - const sources = [ Buffer.from('d') ]; + const sources = [ { buffer: Buffer.from('d') } ]; copyBuffers(target, sources, 1); expect(Buffer.compare(target, Buffer.from('dbc'))).to.be.equal(0); @@ -40,9 +40,9 @@ describe('UtilTest', function () { it('copyBuffers: writes multiple buffers of same total length', function () { const target = Buffer.from('abc'); const sources = [ - Buffer.from('d'), - Buffer.from('e'), - Buffer.from('f') + { buffer: Buffer.from('d') }, + { buffer: Buffer.from('e') }, + { buffer: Buffer.from('f') } ]; copyBuffers(target, sources, 3); From 044875889b547e32584a7ade74bd65ca0342e311 Mon Sep 17 00:00:00 2001 From: Andrey Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Tue, 15 Sep 2020 10:21:15 +0300 Subject: [PATCH 293/685] Add CP Semaphore support (#582) Also includes the following: * Improve tsdoc and code style --- DOCUMENTATION.md | 58 +++- code_samples/org-website/SemaphoreSample.js | 46 +++ code_samples/semaphore.js | 42 +++ src/CPSubsystem.ts | 20 +- src/proxy/FencedLock.ts | 2 +- src/proxy/ISemaphore.ts | 164 +++++++++ src/proxy/cpsubsystem/CPProxyManager.ts | 26 +- src/proxy/cpsubsystem/CPSessionAwareProxy.ts | 8 +- src/proxy/cpsubsystem/CPSessionManager.ts | 27 +- src/proxy/cpsubsystem/FencedLockProxy.ts | 10 +- .../cpsubsystem/SessionAwareSemaphoreProxy.ts | 305 +++++++++++++++++ .../cpsubsystem/SessionlessSemaphoreProxy.ts | 187 +++++++++++ src/proxy/index.ts | 1 + src/util/Util.ts | 17 +- test/cpsubsystem/FencedLockTest.js | 7 +- test/cpsubsystem/SemaphoreCommonTest.js | 236 +++++++++++++ test/cpsubsystem/SessionAwareSemaphoreTest.js | 93 ++++++ test/cpsubsystem/SessionlessSemaphoreTest.js | 108 ++++++ test/cpsubsystem/hazelcast_cpsubsystem.xml | 10 + .../proxy/cpsubsystem/CPSessionManagerTest.js | 36 +- .../proxy/cpsubsystem/FencedLockProxyTest.js | 12 +- .../cpsubsystem/SemaphoreProxyCommonTest.js | 151 +++++++++ .../SessionAwareSemaphoreProxyTest.js | 312 ++++++++++++++++++ 23 files changed, 1838 insertions(+), 40 deletions(-) create mode 100644 code_samples/org-website/SemaphoreSample.js create mode 100644 code_samples/semaphore.js create mode 100644 src/proxy/ISemaphore.ts create mode 100644 src/proxy/cpsubsystem/SessionAwareSemaphoreProxy.ts create mode 100644 src/proxy/cpsubsystem/SessionlessSemaphoreProxy.ts create mode 100644 test/cpsubsystem/SemaphoreCommonTest.js create mode 100644 test/cpsubsystem/SessionAwareSemaphoreTest.js create mode 100644 test/cpsubsystem/SessionlessSemaphoreTest.js create mode 100644 test/unit/proxy/cpsubsystem/SemaphoreProxyCommonTest.js create mode 100644 test/unit/proxy/cpsubsystem/SessionAwareSemaphoreProxyTest.js diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index db32188dc..eab502a36 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -1479,18 +1479,22 @@ const atomicLong = await client.getCPSubsystem().getAtomicLong('my-atomic-long') // Get current value (returns a Long) const value = await atomicLong.get(); console.log('Value:', value); +// Prints: +// Value: 0 // Increment by 42 await atomicLong.addAndGet(42); // Set to 0 atomically if the current value is 42 const result = atomicLong.compareAndSet(42, 0); console.log('CAS operation result:', result); +// Prints: +// CAS operation result: true ``` -`IAtomicLong` implementation does not offer exactly-once / effectively-once execution semantics. It goes with at-least-once execution semantics by default and can cause an API call to be committed multiple times in case of CP member failures. It can be tuned to offer at-most-once execution semantics. Please see [`fail-on-indeterminate-operation-state`](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#cp-subsystem-configuration) server-side setting. +AtomicLong implementation does not offer exactly-once / effectively-once execution semantics. It goes with at-least-once execution semantics by default and can cause an API call to be committed multiple times in case of CP member failures. It can be tuned to offer at-most-once execution semantics. Please see [`fail-on-indeterminate-operation-state`](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#cp-subsystem-configuration) server-side setting. #### 7.4.11.2. Using Lock -Hazelcast `FencedLock` is the distributed implementation of a linearizable and distributed lock. It offers multiple operations for acquiring the lock. This data structure is a part of CP Subsystem. +Hazelcast `FencedLock` is the distributed implementation of a linearizable lock. It offers multiple operations for acquiring the lock. This data structure is a part of CP Subsystem. A basic Lock usage example is shown below. @@ -1524,9 +1528,9 @@ const fence = await lock.lock(); await lock.lock(); ``` -Considering this, you should always call the `.lock()` method only once per async call chain and make sure to release the lock as early as possible. +Considering this, you should always call the `lock()` method only once per async call chain and make sure to release the lock as early as possible. -As an alternative approach, you can use the `.tryLock()` method of FencedLock. It tries to acquire the lock in optimistic manner and immediately returns with either a valid fencing token or `undefined`. It also accepts an optional `timeout` argument which specifies the timeout in milliseconds to acquire the lock before giving up. +As an alternative approach, you can use the `tryLock()` method of FencedLock. It tries to acquire the lock in optimistic manner and immediately returns with either a valid fencing token or `undefined`. It also accepts an optional `timeout` argument which specifies the timeout in milliseconds to acquire the lock before giving up. ```javascript // Try to acquire the lock @@ -1544,7 +1548,51 @@ if (fence !== undefined) { #### 7.4.11.3. Using Semaphore -This new implementation cannot be used with the Node.js client yet. We plan to implement this data structure in the upcoming 4.0 release of Hazelcast Node.js client. In the meantime, since there is no way to access the old non-CP Semaphore primitive using IMDG 4.x, we removed its implementation, code samples and documentation. It will be back once we implement them. +Hazelcast `ISemaphore` is the distributed implementation of a linearizable and distributed lock. It offers multiple operations for acquiring the permits. This data structure is a part of CP Subsystem. + +Semaphore is a cluster-wide counting semaphore. Conceptually, it maintains a set of permits. Each `acquire()` waits if necessary until a permit is available, and then takes it. Dually, each `release()` adds a permit, potentially releasing a waiting acquirer. However, no actual permit objects are used; the semaphore just keeps a count of the number available and acts accordingly. + +A basic Semaphore usage example is shown below. + +```javascript +// Get a Semaphore called 'my-semaphore' +const semaphore = await client.getCPSubsystem().getSemaphore('my-semaphore'); +// Try to initialize the semaphore +// (this operation does nothing if the semaphore is already initialized) +await semaphore.init(3); +// Acquire 3 permits out of 3 +await semaphore.acquire(3); +// Release 2 permits +await semaphore.release(2); +// Check available permits +const available = await semaphore.availablePermits(); +console.log('Available:', available); +// Prints: +// Available: 1 +``` + +Beware of the increased risk of indefinite postponement when using the multiple-permit acquire. If permits are released one by one, a caller waiting for one permit will acquire it before a caller waiting for multiple permits regardless of the call order. Correct usage of a semaphore is established by programming convention in the application. + +As an alternative, potentially safer approach to the multiple-permit acquire, you can use the `tryAcquire()` method of Semaphore. It tries to acquire the permits in optimistic manner and immediately returns with a `boolean` operation result. It also accepts an optional `timeout` argument which specifies the timeout in milliseconds to acquire the permits before giving up. + +```javascript +// Try to acquire 2 permits +const success = await semaphore.tryAcquire(2); +// Check for valid fencing token +if (success) { + try { + // Your guarded code goes here + } finally { + // Make sure to release the permits + await semaphore.release(2); + } +} +``` + + Semaphore data structure has two variations: + + * The default implementation is session-aware. In this one, when a caller makes its very first `acquire()` call, it starts a new CP session with the underlying CP group. Then, liveliness of the caller is tracked via this CP session. When the caller fails, permits acquired by this caller are automatically and safely released. However, the session-aware version comes with a limitation, that is, a Hazelcast client cannot release permits before acquiring them first. In other words, a client can release only the permits it has acquired earlier. + * The second implementation is sessionless. This one does not perform auto-cleanup of acquired permits on failures. Acquired permits are not bound to callers and permits can be released without acquiring first. However, you need to handle failed permit owners on your own. If a Hazelcast server or a client fails while holding some permits, they will not be automatically released. You can use the sessionless CP Semaphore implementation by enabling JDK compatibility `jdk-compatible` server-side setting. Refer to [Semaphore configuration](https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#semaphore-configuration) documentation for more details. ## 7.5. Distributed Events diff --git a/code_samples/org-website/SemaphoreSample.js b/code_samples/org-website/SemaphoreSample.js new file mode 100644 index 000000000..dedbbd1dc --- /dev/null +++ b/code_samples/org-website/SemaphoreSample.js @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { Client } = require('hazelcast-client'); + +(async () => { + try { + // Start the Hazelcast Client and connect to an already running + // Hazelcast Cluster on 127.0.0.1 + const hz = await Client.newHazelcastClient(); + // Get the Distributed Semaphore from CP Subsystem + const semaphore = await client.getCPSubsystem().getSemaphore('my-semaphore'); + // Initialize the semaphore + const initialized = await semaphore.init(3); + console.log('Initialized:', initialized); + // Check number of available permits + let available = await semaphore.availablePermits(); + console.log('Available:', available); + // Now acquire permits + await semaphore.acquire(3); + available = await semaphore.availablePermits(); + console.log('Available after acquire:', available); + // Release some permits + await semaphore.release(2); + available = await semaphore.availablePermits(); + console.log('Available after release:', available); + // Shutdown this Hazelcast client + await hz.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/code_samples/semaphore.js b/code_samples/semaphore.js new file mode 100644 index 000000000..ed6643476 --- /dev/null +++ b/code_samples/semaphore.js @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ +'use strict'; + +const { Client } = require('hazelcast-client'); + +(async () => { + try { + const client = await Client.newHazelcastClient(); + + const semaphore = await client.getCPSubsystem().getSemaphore('my-semaphore'); + const initialized = await semaphore.init(3); + console.log('Initialized:', initialized); + let available = await semaphore.availablePermits(); + console.log('Available:', available); + + await semaphore.acquire(3); + available = await semaphore.availablePermits(); + console.log('Available after acquire:', available); + + await semaphore.release(2); + available = await semaphore.availablePermits(); + console.log('Available after release:', available); + + await client.shutdown(); + } catch (err) { + console.error('Error occurred:', err); + } +})(); diff --git a/src/CPSubsystem.ts b/src/CPSubsystem.ts index aca794a56..78d9b39ea 100644 --- a/src/CPSubsystem.ts +++ b/src/CPSubsystem.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import {IAtomicLong, FencedLock} from './proxy'; +import {IAtomicLong, FencedLock, ISemaphore} from './proxy'; import {CPProxyManager} from './proxy/cpsubsystem/CPProxyManager'; import {CPSessionManager} from './proxy/cpsubsystem/CPSessionManager'; import {HazelcastClient} from './HazelcastClient'; @@ -63,12 +63,24 @@ export interface CPSubsystem { * * If no group name is given within the `name` argument, then the * FencedLock instance will be created on the DEFAULT CP group. - * If a group name is given, like `.getLong('myLock@group1')`, + * If a group name is given, like `.getLock('myLock@group1')`, * the given group will be initialized first, if not initialized * already, and then the instance will be created on this group. */ getLock(name: string): Promise; + /** + * Returns the distributed Semaphore instance instance with given name. + * The instance is created on CP Subsystem. + * + * If no group name is given within the `name` argument, then the + * Semaphore instance will be created on the DEFAULT CP group. + * If a group name is given, like `.getSemaphore('mySemaphore@group1')`, + * the given group will be initialized first, if not initialized + * already, and then the instance will be created on this group. + */ + getSemaphore(name: string): Promise; + } /** @internal */ @@ -90,6 +102,10 @@ export class CPSubsystemImpl implements CPSubsystem { return this.cpProxyManager.getOrCreateProxy(name, CPProxyManager.LOCK_SERVICE) as Promise; } + getSemaphore(name: string): Promise { + return this.cpProxyManager.getOrCreateProxy(name, CPProxyManager.SEMAPHORE_SERVICE) as Promise; + } + getCPSessionManager(): CPSessionManager { return this.cpSessionManager; } diff --git a/src/proxy/FencedLock.ts b/src/proxy/FencedLock.ts index 30e0ccefc..97b4f273f 100644 --- a/src/proxy/FencedLock.ts +++ b/src/proxy/FencedLock.ts @@ -18,7 +18,7 @@ import * as Long from 'long'; import {DistributedObject} from '../core'; /** - * A linearizable, distributed, non-reentrant lock. + * A linearizable, distributed lock. * * FencedLock is CP with respect to the CAP principle. It works on top * of the Raft consensus algorithm. It offers linearizability during crash-stop diff --git a/src/proxy/ISemaphore.ts b/src/proxy/ISemaphore.ts new file mode 100644 index 000000000..536b252a4 --- /dev/null +++ b/src/proxy/ISemaphore.ts @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved. + * + * Licensed 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. + */ + +import {DistributedObject} from '../core'; + +/** + * A linearizable, distributed semaphore. + * + * ISemaphore works on top of the Raft consensus algorithm. It offers + * linearizability during crash failures and network partitions. It is CP with + * respect to the CAP principle. If a network partition occurs, it remains + * available on at most one side of the partition. + * + * ISemaphore is a cluster-wide counting semaphore. Conceptually, it maintains + * a set of permits. Each `acquire()` waits if necessary until a permit + * is available, and then takes it. Dually, each `release()` adds a + * permit, potentially releasing a waiting acquirer. However, no actual permit + * objects are used; the semaphore just keeps a count of the number available + * and acts accordingly. + * + * This data structure also provides convenience methods to work + * with multiple permits at once. Beware of the increased risk of + * indefinite postponement when using the multiple-permit acquire. If permits + * are released one by one, a caller waiting for one permit will acquire + * it before a caller waiting for multiple permits regardless of the call + * order. + * + * Correct usage of a semaphore is established by programming convention + * in the application. + * + * ISemaphore has two variations: + *